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

This commit is contained in:
Michael Tremer
2015-10-29 23:25:45 +00:00
4 changed files with 1371 additions and 12 deletions

View File

@@ -27,7 +27,7 @@ include Config
VERSUFIX = ipfire$(KCFG)
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e
VER = 3.2.4.2
VER = 3.2.7.1
THISAPP = e1000e-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = da331c268e1b928e896dfa4c71fbe4d9
$(DL_FILE)_MD5 = 8f62c220d763fa92473365e40d55bd86
install : $(TARGET)

View File

@@ -24,10 +24,10 @@
include Config
VER = 3.14.55
RPI_PATCHES = 3.14.55-grsec-ipfire1
A7M_PATCHES = 3.14.55-grsec-ipfire1
GRS_PATCHES = grsecurity-3.1ipfire-3.14.55-v1.patch.xz
VER = 3.14.56
RPI_PATCHES = 3.14.56-grsec-ipfire1
A7M_PATCHES = 3.14.56-grsec-ipfire1
GRS_PATCHES = grsecurity-3.1ipfire-3.14.56-v1.patch.xz
THISAPP = linux-$(VER)
@@ -83,10 +83,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 = 5358dcd2655874496ede6f3a8ada5054
$(DL_FILE)_MD5 = 32010dbb68e50b994bcf845635b616d5
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 4ab53e184441c895adf318a1c2874d43
arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = f29bd5c156384b0a4bb7c6e2c973ea06
$(GRS_PATCHES)_MD5 = dc0e0195a362087c71227173eab062d4
$(GRS_PATCHES)_MD5 = 2cf4583ffeb979900d362038cb1accb4
install : $(TARGET)
@@ -173,6 +173,9 @@ endif
# HyperV 2008 patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.x-hyperv-2008-fix.patch
# fix empty symbol crc's
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-genksyms_fix_typeof_handling.patch
ifeq "$(KCFG)" "-kirkwood"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-kirkwood_legacy_boot.patch

View File

@@ -72,18 +72,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/snort* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--disable-nls \
--sysconfdir=/etc/snort \
--target=i586 \
--enable-linux-smp-stats \
--enable-smb-alerts \
--enable-gre --enable-mpls \
--enable-targetbased \
--enable-decoder-preprocessor-rules \
--enable-ppm \
--enable-non-ether-decoders \
--enable-perfprofiling \
--enable-zlib \
--enable-active-response \
--enable-normalizer \
--enable-reload \

File diff suppressed because it is too large Load Diff