Merge branch 'master' into next

diff --git a/config/rootfiles/oldcore/123/filelists/files b/config/rootfiles/oldcore/123/filelists/files
index 3ff006fe5baed8f2fe161466df01bea236f18693..e2be472f63d4538afc09dea53d834b0489561fd8 100644 (file)
--- 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 (symlink)
index 0000000..f424713
--- /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 (symlink)
index 0000000..2e24c42
--- /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 76eff74bb349571a884204cf62327c0ecdcad7a9..964a238628bc1bb40b800bb2857d1cd28370927a 100644 (file)
--- 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 349f3667c06ab1b1e7e3c28f65aa7bad954b0b78..217bc9850eee09a6bdf4a3758651b4cedac844d6 100644 (file)
--- 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 5e7b334cd2a8944f11ec93d9a467fbaea8540126..003c477f6670e47dc3c956042fda5a8c8df0b84a 100644 (file)
--- 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