From ee84b26a271139cd37fb361db9fbed21b894ffec Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 17 Aug 2018 07:06:45 +0200 Subject: [PATCH 1/6] core123: ship openssl sse2 version on i586 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/123/filelists/i586/openssl-sse2 | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/123/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/123/filelists/i586/openssl-sse2 b/config/rootfiles/core/123/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/core/123/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file From b38239f90715974b7744499cb65c97b961fb6ff4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 17 Aug 2018 20:30:17 +0200 Subject: [PATCH 2/6] core123: ship xtables-addons. xtables are build for installed iptables version so we need to ship it even if it was not updated. Also clean /lib/xtables because some modules are renamed. Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/123/filelists/xtables-addons | 1 + config/rootfiles/core/123/update.sh | 3 +++ 2 files changed, 4 insertions(+) create mode 120000 config/rootfiles/core/123/filelists/xtables-addons diff --git a/config/rootfiles/core/123/filelists/xtables-addons b/config/rootfiles/core/123/filelists/xtables-addons new file mode 120000 index 000000000..2e24c4298 --- /dev/null +++ b/config/rootfiles/core/123/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh index 76eff74bb..964a23862 100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/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 From 66c449c053c9e059f04e28d0ccad74840f1a528e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 20 Aug 2018 16:22:20 +0200 Subject: [PATCH 3/6] gcc: x86_64 add libspp to rootfile Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/x86_64/gcc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/x86_64/gcc b/config/rootfiles/common/x86_64/gcc index b461f6532..667ec9e49 100644 --- a/config/rootfiles/common/x86_64/gcc +++ b/config/rootfiles/common/x86_64/gcc @@ -1434,8 +1434,8 @@ usr/lib/libquadmath.so.0.0.0 #usr/lib/libssp.a #usr/lib/libssp.la #usr/lib/libssp.so -#usr/lib/libssp.so.0 -#usr/lib/libssp.so.0.0.0 +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 #usr/lib/libssp_nonshared.a #usr/lib/libssp_nonshared.la #usr/lib/libstdc++.a From a019c963a2bc232a381aefbafc260b3ea3bf4f2b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 20 Aug 2018 16:23:49 +0200 Subject: [PATCH 4/6] core123: ship libssp (was missing on x86_64) Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/123/filelists/files | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files index 3ff006fe5..e2be472f6 100644 --- a/config/rootfiles/core/123/filelists/files +++ b/config/rootfiles/core/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 From 1ce35de5cc9c35a7deb95733e161b248a5cf0a64 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 24 Aug 2018 20:19:29 +0200 Subject: [PATCH 5/6] intel-microcode: update to 20180807a Signed-off-by: Arne Fitzenreiter --- lfs/intel-microcode | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 # +# Copyright (C) 2007-2018 IPFire Team # # # # 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) From 574a71177b9c209fb8ebcbe4528b37fe1cf0dc8f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 28 Aug 2018 12:39:08 +0200 Subject: [PATCH 6/6] kernel: fix dtb handling Signed-off-by: Arne Fitzenreiter --- lfs/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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