webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-15 21:43:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen

Browse Source
This commit is contained in:
Alexander Marx
2013-10-02 21:15:22 +02:00
parent 753bb74ce5 5b6acb88c6
commit 40d505ea08
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/stage2
View File

@@ -41,6 +41,7 @@ etc/resolv.conf
etc/securetty
etc/sysctl.conf
etc/syslog.conf
etc/system-release
#home
home/nobody
#lib

8
lfs/linux
View File

@@ -24,10 +24,10 @@
include Config
VER = 3.10.13
VER = 3.10.14
RPI_PATCHES = linux-3.10.10-c1af7c6
GRS_PATCHES = grsecurity-2.9.1-3.10.13-ipfire1.patch.xz
GRS_PATCHES = grsecurity-2.9.1-3.10.14-ipfire1.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = 64ffe74249442fd7452d12348955ccfd
$(DL_FILE)_MD5 = 3cd1e4b50fb9decd63754ae80f3b2414
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = ef9274b3ff5d05daaaa4bdbe86ad00fc
$(GRS_PATCHES)_MD5 = f69811dde866170bd9b4fcdcd0f1538e
$(GRS_PATCHES)_MD5 = 504b12ac9f2a3c12ccfeb1c3768f49e4
install : $(TARGET)

9
lfs/memtest
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 4.20
VER = 5.01
THISAPP = memtest86+-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
$(DL_FILE)_MD5 = 43c5832baa919e1206e251e735cdee2d
install : $(TARGET)
@@ -71,7 +71,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile
# cd $(DIR_APP) && sed -i -e "s| -fno-stack-protector||g" Makefile
cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-mkdir -p /usr/lib/memtest86+
cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+

1
tools/make-functions
View File

@@ -454,6 +454,7 @@ ipfiremake() {
CORE=$CORE \
CONFIG_ROOT=$CONFIG_ROOT \
NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
SYSTEM_RELEASE="$SYSTEM_RELEASE" \
CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
CCACHE_COMPILERCHECK="none" \