This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via f48920d84f72235c5141e32772d5c8a447f9900e (commit) via 596c71d07fb2fc564844684a5692d598edf3d647 (commit) via cafef39aa21b4786c2317967689ec741055d0b97 (commit) via 52d57e97483ba466b0f23fa9eb524eb4b6288ba0 (commit) from 42c2acc2187861abc00420c3e272cebd8aa53db3 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit f48920d84f72235c5141e32772d5c8a447f9900e Author: Daniel Weismüller daniel.weismueller@ipfire.org Date: Fri Oct 18 16:59:49 2019 +0200

core137: Remove imq0 and unload imq module after QoS has been stopped

Signed-off-by: Daniel Weismüller daniel.weismueller@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 596c71d07fb2fc564844684a5692d598edf3d647 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 18 23:07:44 2019 +0200

kernel: update to 4.14.150

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit cafef39aa21b4786c2317967689ec741055d0b97 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 18 20:39:47 2019 +0200

Revert "suricata: Enable rust support"

This reverts commit 5b87687cb1d37d81dbc701706e40f40f2cb16348.

commit 52d57e97483ba466b0f23fa9eb524eb4b6288ba0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 18 20:37:50 2019 +0200

rust: disabled build

rust build code with illegal instructions on armv5tel so this need more checking

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 3 +-- config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 +-- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 +-- config/kernel/kernel.config.i586-ipfire | 3 +-- config/kernel/kernel.config.i586-ipfire-pae | 3 +-- config/kernel/kernel.config.x86_64-ipfire | 3 +-- config/rootfiles/common/suricata | 2 -- config/rootfiles/core/137/update.sh | 6 ++++++ lfs/linux | 8 ++++---- lfs/rust | 2 ++ lfs/suricata | 4 +--- 11 files changed, 19 insertions(+), 21 deletions(-)

Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index e4634855c..778b05a9a 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.146-ipfire Kernel Configuration +# Linux/arm64 4.14.150-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -5032,7 +5032,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index b07ee985d..fcbac3bcd 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.146-ipfire-kirkwood Kernel Configuration +# Linux/arm 4.14.150-ipfire-kirkwood Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -4583,7 +4583,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 5185e0e7e..fc74eb142 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.146-ipfire-multi Kernel Configuration +# Linux/arm 4.14.150-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -5487,7 +5487,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index fd8b7a9fe..4eaae6f74 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.146-ipfire Kernel Configuration +# Linux/x86 4.14.150-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5227,7 +5227,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 49f9d7dad..526adbbcb 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.146-ipfire-pae Kernel Configuration +# Linux/x86 4.14.150-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5212,7 +5212,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 7f345d65c..c9563234e 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.146-ipfire Kernel Configuration +# Linux/x86 4.14.150-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -5068,7 +5068,6 @@ CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m CONFIG_USB_ADUTUX=m CONFIG_USB_SEVSEG=m -# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set CONFIG_USB_LCD=m # CONFIG_USB_CYPRESS_CY7C63 is not set diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata index 41b02525d..ac48dbce9 100644 --- a/config/rootfiles/common/suricata +++ b/config/rootfiles/common/suricata @@ -1,7 +1,5 @@ etc/suricata etc/suricata/suricata.yaml -#root/.cargo -#root/.cargo/.package-cache usr/bin/suricata #usr/share/doc/suricata #usr/share/doc/suricata/AUTHORS diff --git a/config/rootfiles/core/137/update.sh b/config/rootfiles/core/137/update.sh index da87f9430..dcbd8112a 100644 --- a/config/rootfiles/core/137/update.sh +++ b/config/rootfiles/core/137/update.sh @@ -83,6 +83,12 @@ rm -rf /lib/modules # Stop services /usr/local/bin/qosctrl stop

+# Delete imq0 if it is still present after QoS has been stopped +if [ -d "/sys/class/net/imq0" ]; then + ip link del dev imq0 + modprobe -r imq +fi + # Extract files extract_files

diff --git a/lfs/linux b/lfs/linux index 677e9afed..c8bcdbb97 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@

include Config

-VER = 4.14.149 -ARM_PATCHES = 4.14.149-ipfire0 +VER = 4.14.150 +ARM_PATCHES = 4.14.150-ipfire0

THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz

-$(DL_FILE)_MD5 = c01c629217ca0b7a604f6e29585b74f0 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = cc8c0146a076ad32e0d20078378bf1e3 +$(DL_FILE)_MD5 = 61358e7be9bfc17adb4c418355d957db +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = e4931541ffe21dd29ca2447620de6693

install : $(TARGET)

diff --git a/lfs/rust b/lfs/rust index 47e9a0ea5..950599069 100644 --- a/lfs/rust +++ b/lfs/rust @@ -32,6 +32,8 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP)-$(RUST_BOOTSTRAP) TARGET = $(DIR_INFO)/$(THISAPP)

+SUP_ARCH = none + ifeq "$(BUILD_ARCH)" "i586" RUST_ARCH = i686 else diff --git a/lfs/suricata b/lfs/suricata index f6e4a593c..12dcfe08c 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -82,9 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-python \ --with-libjansson-libraries=/usr/lib \ --with-libjansson-includes=/usr/include \ - --disable-suricata-update \ - --enable-rust - + --disable-suricata-update cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && make install-conf

hooks/post-receive -- IPFire 2.x development tree