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

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

Browse Source
This commit is contained in:
Stefan Schantl
2015-04-21 19:20:26 +02:00
parent c4e106d181 2b4830c5ab
commit a54ec49e18
6 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lfs/iptables
View File

@@ -93,9 +93,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.22/iptables-1.4.3forward-for-kernel-2.6.20forward/* \
./extensions/
# ipp2p 0.8.2-pomng
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.14-ipp2p-0.8.2-ipfire.patch
# imq
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.12-IMQ-test4.diff

17
lfs/linux
View File

@@ -24,11 +24,11 @@
include Config
VER = 3.14.38
VER = 3.14.39
RPI_PATCHES = 3.14.38-grsec-ipfire1
A7M_PATCHES = 3.14.38-grsec-ipfire1
GRS_PATCHES = grsecurity-3.1-3.14.38-201504142259.patch.xz
RPI_PATCHES = 3.14.39-grsec-ipfire1
A7M_PATCHES = 3.14.39-grsec-ipfire1
GRS_PATCHES = grsecurity-3.1-3.14.39-201504190814.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = c4d0154627e02dc43c67fa616ff1e569
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = e423c8b3a408f23b9a26f8f0f4384c50
$(DL_FILE)_MD5 = 3581855d0dbfcbe1140dfcd1406d0a91
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 5056304af0a199194abd0bcb00015f28
arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc
$(GRS_PATCHES)_MD5 = 6d6ed13c08ae96f6470c30c00e08b130
$(GRS_PATCHES)_MD5 = 2121d0bf825da9ff6321e2940f247c5e
install : $(TARGET)
@@ -118,9 +118,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Linux Intermediate Queueing Device
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-imq.patch
# ipp2p 0.8.2-ipfire
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-ipp2p-0.8.2-ipfire.patch
# Layer7-patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-layer7-filter.patch