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, next has been updated via fd313a1ae690ce95d91802fea0d94d85da084fd8 (commit) via 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f (commit) via e5eedea01de6e70c0440f0c97e418ca053382424 (commit) via 1ce35de5cc9c35a7deb95733e161b248a5cf0a64 (commit) via a019c963a2bc232a381aefbafc260b3ea3bf4f2b (commit) via 66c449c053c9e059f04e28d0ccad74840f1a528e (commit) via b38239f90715974b7744499cb65c97b961fb6ff4 (commit) via ee84b26a271139cd37fb361db9fbed21b894ffec (commit) from aa61d769b7f5eca23c7744590dfa18c1ef1d7c36 (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 fd313a1ae690ce95d91802fea0d94d85da084fd8 Merge: aa61d769b 574a71177 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Aug 29 07:43:06 2018 +0200

Merge branch 'master' into next

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

Summary of changes: config/rootfiles/oldcore/123/filelists/files | 2 ++ config/rootfiles/oldcore/{100 => 123}/filelists/i586/openssl-sse2 | 0 config/rootfiles/oldcore/{121 => 123}/filelists/xtables-addons | 0 config/rootfiles/oldcore/123/update.sh | 3 +++ lfs/intel-microcode | 6 +++--- lfs/linux | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) copy config/rootfiles/oldcore/{100 => 123}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/oldcore/{121 => 123}/filelists/xtables-addons (100%)

Difference in files: diff --git a/config/rootfiles/oldcore/123/filelists/files b/config/rootfiles/oldcore/123/filelists/files index 3ff006fe5..e2be472f6 100644 --- a/config/rootfiles/oldcore/123/filelists/files +++ b/config/rootfiles/oldcore/123/filelists/files @@ -13,6 +13,8 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/local/bin/backupiso +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 usr/sbin/dhclient usr/share/GeoIP/GeoIP.dat var/ipfire/backup/bin/backup.pl diff --git a/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/123/filelists/xtables-addons b/config/rootfiles/oldcore/123/filelists/xtables-addons new file mode 120000 index 000000000..2e24c4298 --- /dev/null +++ b/config/rootfiles/oldcore/123/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/oldcore/123/update.sh b/config/rootfiles/oldcore/123/update.sh index 76eff74bb..964a23862 100644 --- a/config/rootfiles/oldcore/123/update.sh +++ b/config/rootfiles/oldcore/123/update.sh @@ -34,6 +34,9 @@ done # Stop services /etc/init.d/squid stop

+# remove old xtables modules / some are renamend +rm -rf /lib/xtables + # Extract files extract_files

diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 349f3667c..217bc9850 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2018 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 = 20180807 +VER = 20180807a

THISAPP = microcode-$(VER) DL_FILE = $(THISAPP).tgz @@ -41,7 +41,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 49f534f1079d3c5bc178a150c1c105aa +$(DL_FILE)_MD5 = b12f8680d87c81a302e8c85712ed1a80

install : $(TARGET)

diff --git a/lfs/linux b/lfs/linux index 5e7b334cd..003c477f6 100644 --- a/lfs/linux +++ b/lfs/linux @@ -194,7 +194,7 @@ else ifeq "$(BUILD_PLATFORM)" "arm" cd $(DIR_APP) && make $(MAKETUNING) dtbs mkdir -p /boot/dtb-$(VER)-$(VERSUFIX) - cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \ + cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \ cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \ chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \ done

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