IPFire-SCM November 2019

ipfire-scm@lists.ipfire.org

1 participants
11 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 86409ab1006bd3582d55f59c399385b2c70434e2
by Arne Fitzenreiter 30 Nov '19

30 Nov '19

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 86409ab1006bd3582d55f59c399385b2c70434e2 (commit) via fff96e394545eef64d160bbc8c7c8b50f364aea8 (commit) via f938083fb5d097ea4c677ec08da91f61fa9f67d1 (commit) from 4775d54ba6ebca19dc498fd40d881b6eabd3ecb3 (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 86409ab1006bd3582d55f59c399385b2c70434e2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 1 00:45:02 2019 +0100 core139: add dhcp and network changes to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit fff96e394545eef64d160bbc8c7c8b50f364aea8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 30 22:26:00 2019 +0100 networking red: add delay to wait for carrier some nic's need some time after link up to get a carrier Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f938083fb5d097ea4c677ec08da91f61fa9f67d1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 30 22:21:42 2019 +0100 dhcpcd: 10-mtu break if carrier was lost some nic's like Intel e1000e needs a reinit to change the mtu. In this case the dhcp hook reinit the nic and terminate now to let the dhcpcd reinit the card in backgrounnd without running the rest of the hooks. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/dhcpc/dhcpcd-hooks/10-mtu | 4 ++- config/rootfiles/core/139/filelists/files | 3 +++ src/initscripts/networking/functions.network | 38 +++++++++++++++++----------- src/initscripts/networking/red | 18 +++++++++++++ 4 files changed, 47 insertions(+), 16 deletions(-) Difference in files: diff --git a/config/dhcpc/dhcpcd-hooks/10-mtu b/config/dhcpc/dhcpcd-hooks/10-mtu index 49e05192b..8eb429751 100644 --- a/config/dhcpc/dhcpcd-hooks/10-mtu +++ b/config/dhcpc/dhcpcd-hooks/10-mtu @@ -10,11 +10,13 @@ set_mtu() # test for buggy nic that lose link at mtu set... carrier=`cat /sys/class/net/$interface/carrier` if [ "$carrier" == "0" ]; then - syslog info "Warning! Carrier loss after MTU set. Reinit ..." + syslog info "Warning! Carrier loss after MTU set. Reinit needed..." ip link set "$interface" down ip link set "$interface" up + exit 1 fi } + if [ -n "$new_interface_mtu" ] && $if_up; then if [ $RED_DHCP_FORCE_MTU -ge 576 ]; then new_interface_mtu=$RED_DHCP_FORCE_MTU diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files index 3a68e3116..3ab3eece1 100644 --- a/config/rootfiles/core/139/filelists/files +++ b/config/rootfiles/core/139/filelists/files @@ -5,6 +5,8 @@ var/ipfire/langs etc/httpd/conf/vhosts.d/ipfire-interface.conf etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/red +etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/unbound etc/suricata/suricata.yaml @@ -15,5 +17,6 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/bin/pcregrep usr/sbin/convert-snort usr/lib/firewall/firewall-lib.pl +var/ipfire/dhcpc/dhcpcd-hooks/10-mtu var/ipfire/ids-functions.pl var/ipfire/proxy/calamaris/bin/mkreport diff --git a/src/initscripts/networking/functions.network b/src/initscripts/networking/functions.network index 1af3482df..17191e7a9 100644 --- a/src/initscripts/networking/functions.network +++ b/src/initscripts/networking/functions.network @@ -80,24 +80,32 @@ dhcpcd_start() { if [ "${ret}" -eq 0 ]; then . /var/ipfire/dhcpc/dhcpcd-"${device}".info - echo "" - echo_ok - boot_mesg " DHCP Assigned Settings for ${device}:" - boot_mesg_flush - boot_mesg " IP Address: $ip_address" - boot_mesg_flush - if [ -n "${RED_DHCP_HOSTNAME}" ]; then - boot_mesg " Hostname: $RED_DHCP_HOSTNAME" + if [ $ip_address ]; then + echo "" + echo_ok + boot_mesg " DHCP Assigned Settings for ${device}:" boot_mesg_flush - fi + boot_mesg " IP Address: $ip_address" + boot_mesg_flush + + if [ -n "${RED_DHCP_HOSTNAME}" ]; then + boot_mesg " Hostname: $RED_DHCP_HOSTNAME" + boot_mesg_flush + fi - boot_mesg " Subnet Mask: $subnet_mask" - boot_mesg_flush - boot_mesg " Default Gateway: $routers" - boot_mesg_flush - boot_mesg " DNS Server: $domain_name_servers" - boot_mesg_flush + boot_mesg " Subnet Mask: $subnet_mask" + boot_mesg_flush + boot_mesg " Default Gateway: $routers" + boot_mesg_flush + boot_mesg " DNS Server: $domain_name_servers" + boot_mesg_flush + else + echo "" + echo_ok + boot_mesg "DHCP for ${device} still running..." + boot_mesg_flush + fi else echo "" $(exit "${ret}") diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 20567ce51..b8d463241 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -131,6 +131,24 @@ case "${1}" in ip route add default via ${GATEWAY} dev ${DEVICE} evaluate_retval + # has carrier ? + if [ ! "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then + boot_mesg -n "Wait for carrier on ${DEVICE} " + for (( i=30; i>1; i-- )) do + if [ "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then + break; + fi + boot_mesg -n "." + sleep 2 + done + boot_mesg "" + if [ ! "$(</sys/class/net/${DEVICE}/carrier)" = "1" ]; then + echo_failure + else + echo_ok + fi + fi + run_subdir ${rc_base}/init.d/networking/red.up/ # Configure aliases only if red static hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4775d54ba6ebca19dc498fd40d881b6eabd3ecb3
by Arne Fitzenreiter 30 Nov '19

30 Nov '19

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 4775d54ba6ebca19dc498fd40d881b6eabd3ecb3 (commit) via 78756496c9f2a3bcf0bc505da046957f5d22f5b9 (commit) via 1f1c2f4364434a11ddaaef3f1778a6c284cf380f (commit) via df1aca40eb6b948854e41387f883c9dd82a7cb05 (commit) via 0786c686ea47543bc4ea3d8005ee9489dc98cb13 (commit) via b0e2dffde97822a772a5c0534263517fecf96a9d (commit) via 650aac182e0d0e7ef035c963780fbadc75aecc88 (commit) via 1a23cf7324ff8497761dc070bbb0186f1d585789 (commit) via 007b99e5402ba5e01845ab858a68aa2c908415f4 (commit) via eb0adc17d6a5486d58539c78a682c14f55bc980f (commit) via 7942ff9875ea42cd8b4619386fc2cd4be4da9b18 (commit) via ee506d5027783757a775e3aad6982d1698719023 (commit) from e557cecbddd021198c01eb1adaa38adb36b27925 (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 4775d54ba6ebca19dc498fd40d881b6eabd3ecb3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 25 11:09:58 2019 +0000 clamav: Allow downloads to take up to 10 minutes freshclam did not have a receive timeout set and a default of 60s was used. That causes that the large main database cannot be downloaded over a line with a 16 MBit/s downlink. This patch increases that timeout and should allow a successful download on slower connections, too. Suggested-by: Tim Fitzgeorge <ipfb(a)tfitzgeorge.me.uk> Fixes: #12246 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 78756496c9f2a3bcf0bc505da046957f5d22f5b9 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Nov 22 19:26:59 2019 +0100 bind: Update to 9.11.13 For details see: https://downloads.isc.org/isc/bind9/9.11.13/RELEASE-NOTES-bind-9.11.13.html "Security Fixes Set a limit on the number of concurrently served pipelined TCP queries. This flaw is disclosed in CVE-2019-6477. [GL #1264]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1f1c2f4364434a11ddaaef3f1778a6c284cf380f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Nov 21 17:57:48 2019 +0100 clamav: Update to 0.102.1 For details see: https://blog.clamav.net/2019/11/clamav-01021-and-01015-patches-have.html "Fix for the following vulnerability affecting 0.102.0 and 0.101.4 and prior: CVE-2019-15961: A Denial-of-Service (DoS) vulnerability may occur when scanning a specially crafted email file as a result of excessively long scan times. The issue is resolved by implementing several maximums in parsing MIME messages and by optimizing use of memory allocation. Build system fixes to build clamav-milter, to correctly link with libxml2 when detected, and to correctly detect fanotify for on-access scanning feature support. Signature load time is significantly reduced by changing to a more efficient algorithm for loading signature patterns and allocating the AC trie. Patch courtesy of Alberto Wu. Introduced a new configure option to statically link libjson-c with libclamav. Static linking with libjson is highly recommended to prevent crashes in applications that use libclamav alongside another JSON parsing library. Null-dereference fix in email parser when using the --gen-json metadata option. Fixes for Authenticode parsing and certificate signature (.crb database) bugs." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit df1aca40eb6b948854e41387f883c9dd82a7cb05 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 30 09:56:29 2019 +0000 core139: add unbound to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0786c686ea47543bc4ea3d8005ee9489dc98cb13 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Nov 20 17:24:01 2019 +0100 unbound: Update to 1.9.5 For details see: https://nlnetlabs.nl/pipermail/unbound-users/2019-November/011897.html "This release is a fix for vulnerability CVE-2019-18934, that can cause shell execution in ipsecmod. Bug Fixes: - Fix for the reported vulnerability. The CVE number for this vulnerability is CVE-2019-18934" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b0e2dffde97822a772a5c0534263517fecf96a9d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 30 09:54:14 2019 +0000 core139: add captive.cgi to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 650aac182e0d0e7ef035c963780fbadc75aecc88 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Nov 20 11:45:18 2019 +0100 BUG12245: captive portal - clients are not automatically removed With this patch the clients are updated and those who are expired get deleted from the hash. In addition the table of active clients is now sorted. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1a23cf7324ff8497761dc070bbb0186f1d585789 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 19 15:28:22 2019 +0000 bird: Fix path of configuration file in backup The backup did not pack the configuration file due to an incorrect path. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 007b99e5402ba5e01845ab858a68aa2c908415f4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 30 09:49:58 2019 +0000 core139: add pcregrep to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit eb0adc17d6a5486d58539c78a682c14f55bc980f Author: Erik Kapfer <ummeegge(a)ipfire.org> Date: Tue Nov 19 08:09:42 2019 +0100 pcre: Add pcregrep to core system Triggered by --> https://community.ipfire.org/t/pcregrep-on-ipfire/259 . This patch adds pcregrep only from the actual package not from pcre-compat. Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 7942ff9875ea42cd8b4619386fc2cd4be4da9b18 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Nov 30 09:48:00 2019 +0000 core139: add updated calamaris mkreport Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ee506d5027783757a775e3aad6982d1698719023 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Nov 14 19:03:46 2019 +0100 calamaris: Bug fix for proxy reports staying empty after Core 136 upgrade After upgrading to Core 136, 'calamaris' "Proxy reports" stayed empty. GUI always show "No reports available". Tested manually on console stops and throws an error: ... root@ipfire: ~ # /usr/bin/perl /var/ipfire/proxy/calamaris/bin/mkreport 1 0 2019 8 10 2019 -d 10 -P 30 -t 10 -D 2 -u -r -1 -R 100 -s Can't use 'defined(%hash)' (Maybe you should just omit the defined()?) at /var/ipfire/proxy/calamaris/bin/calamaris line 2609. ... Line 2609 was changed and reports are built again. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/bird | 2 +- config/clamav/freshclam.conf | 1 + config/rootfiles/common/bind | 12 +++++------ config/rootfiles/common/pcre | 2 +- config/rootfiles/common/unbound | 2 +- config/rootfiles/core/139/filelists/files | 3 +++ .../{oldcore/106 => core/139}/filelists/unbound | 0 html/cgi-bin/captive.cgi | 23 ++++++++++++++++++++-- lfs/bind | 4 ++-- lfs/bird | 2 +- lfs/calamaris | 5 ++++- lfs/clamav | 6 +++--- lfs/unbound | 4 ++-- .../01_calamaris_cant_use_defined_hash.patch | 12 +++++++++++ 14 files changed, 58 insertions(+), 20 deletions(-) copy config/rootfiles/{oldcore/106 => core/139}/filelists/unbound (100%) create mode 100644 src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch Difference in files: diff --git a/config/backup/includes/bird b/config/backup/includes/bird index 377010bed..b5e25ff87 100644 --- a/config/backup/includes/bird +++ b/config/backup/includes/bird @@ -1 +1 @@ -etc/bird.conf +/etc/bird.conf diff --git a/config/clamav/freshclam.conf b/config/clamav/freshclam.conf index d4131e574..28be8fec1 100644 --- a/config/clamav/freshclam.conf +++ b/config/clamav/freshclam.conf @@ -7,6 +7,7 @@ LogSyslog yes PidFile /var/run/clamav/freshclam.pid DatabaseMirror database.clamav.net +ReceiveTimeout 600 ScriptedUpdates yes diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index ff44473aa..df6bbf4b6 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -268,15 +268,15 @@ usr/bin/nsupdate #usr/lib/libbind9.la #usr/lib/libbind9.so usr/lib/libbind9.so.161 -usr/lib/libbind9.so.161.0.3 +usr/lib/libbind9.so.161.0.4 #usr/lib/libdns.la #usr/lib/libdns.so usr/lib/libdns.so.1107 -usr/lib/libdns.so.1107.0.2 +usr/lib/libdns.so.1107.1.0 #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisc.so.1100 -usr/lib/libisc.so.1100.3.2 +usr/lib/libisc.so.1104 +usr/lib/libisc.so.1104.0.0 #usr/lib/libisccc.la #usr/lib/libisccc.so usr/lib/libisccc.so.161 @@ -284,11 +284,11 @@ usr/lib/libisccc.so.161.0.1 #usr/lib/libisccfg.la #usr/lib/libisccfg.so usr/lib/libisccfg.so.163 -usr/lib/libisccfg.so.163.0.3 +usr/lib/libisccfg.so.163.0.4 #usr/lib/liblwres.la #usr/lib/liblwres.so usr/lib/liblwres.so.161 -usr/lib/liblwres.so.161.0.2 +usr/lib/liblwres.so.161.0.3 #usr/share/man/man1/dig.1 #usr/share/man/man1/host.1 #usr/share/man/man1/nslookup.1 diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index 6db5724fa..79779fb94 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -1,5 +1,5 @@ #usr/bin/pcre-config -#usr/bin/pcregrep +usr/bin/pcregrep #usr/bin/pcretest #usr/include/pcre.h #usr/include/pcre_scanner.h diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 58c520ab0..2cde9f424 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.4 +usr/lib/libunbound.so.8.1.5 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files index d22fb8314..3a68e3116 100644 --- a/config/rootfiles/core/139/filelists/files +++ b/config/rootfiles/core/139/filelists/files @@ -8,9 +8,12 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/networking/red.up/23-suricata etc/rc.d/init.d/unbound etc/suricata/suricata.yaml +srv/web/ipfire/cgi-bin/captive.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/mail.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/bin/pcregrep usr/sbin/convert-snort usr/lib/firewall/firewall-lib.pl var/ipfire/ids-functions.pl +var/ipfire/proxy/calamaris/bin/mkreport diff --git a/config/rootfiles/core/139/filelists/unbound b/config/rootfiles/core/139/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/139/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index b33287dd4..8204eb7b3 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -514,6 +514,25 @@ END } } +sub cleanup_expired_coupons +{ + my $acttime=time(); + &General::readhasharray($clients, \%clientshash) if (-e $clients); + foreach my $key (keys %clientshash) { + + #calculate endtime from clientshash + my $endtime; + if ($clientshash{$key}[3] > '0'){ + $endtime = $clientshash{$key}[2]+$clientshash{$key}[3]; + if ($acttime > $endtime) { + delete $clientshash{$key}; + } + } + } + #write back hash + &General::writehasharray("$clients", \%clientshash); +} + sub show_coupons() { &General::readhasharray($coupons, \%couponhash) if (-e $coupons); @@ -601,9 +620,9 @@ sub show_clients() { <th align='center' width='5%'>$Lang::tr{'delete'}</th> </tr> END - + &cleanup_expired_coupons(); &General::readhasharray($clients, \%clientshash) if (-e $clients); - foreach my $key (keys %clientshash) { + foreach my $key (sort {$clientshash{$a}[2] <=> $clientshash{$b}[2]} keys %clientshash) { #calculate time from clientshash (starttime) my $starttime = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime($clientshash{$key}[2])); diff --git a/lfs/bind b/lfs/bind index edc3014f6..6bb23a143 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.12 +VER = 9.11.13 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e6a55dcacc852bad9c5970c405383ea0 +$(DL_FILE)_MD5 = 17de0d024ab1eac377f1c2854dc25057 install : $(TARGET) diff --git a/lfs/bird b/lfs/bird index 7a2763b23..191f2ac04 100644 --- a/lfs/bird +++ b/lfs/bird @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bird -PAK_VER = 5 +PAK_VER = 6 DEPS = "" diff --git a/lfs/calamaris b/lfs/calamaris index 2022f84f8..32858526a 100644 --- a/lfs/calamaris +++ b/lfs/calamaris @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)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 # @@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch + cd $(DIR_APP) && cp -f calamaris $(DIR_SRC)/config/calamaris/mkreport \ /var/ipfire/proxy/calamaris/bin/ chmod 755 /var/ipfire/proxy/calamaris/bin/{calamaris,mkreport} diff --git a/lfs/clamav b/lfs/clamav index 949117bf0..9c0aab55f 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.102.0 +VER = 0.102.1 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 47 +PAK_VER = 48 DEPS = "" @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 51e1dff512350284b4b11c3dc2d00da0 +$(DL_FILE)_MD5 = 3d5f5f10a1bea212823050286c8c5b96 install : $(TARGET) diff --git a/lfs/unbound b/lfs/unbound index 5cff54d2b..126cc154d 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.9.4 +VER = 1.9.5 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c4d6305f6187deca9e579d4cc5abeaea +$(DL_FILE)_MD5 = deb7a3c52fec66323b508c0be4be4849 install : $(TARGET) diff --git a/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch b/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch new file mode 100644 index 000000000..64d66276c --- /dev/null +++ b/src/patches/calamaris/01_calamaris_cant_use_defined_hash.patch @@ -0,0 +1,12 @@ +diff U3 a/calamaris b/calamaris +--- a/calamaris Sun Jun 6 18:26:14 2004 ++++ b/calamaris Wed Nov 13 19:59:15 2019 +@@ -2606,7 +2606,7 @@ + 100, 100 * $tcp_hit / $tcp ); + } + outstop(10); +- if ( defined(%tcp_content) ) { ++ if (%tcp_content) { + outstart(11); + if ( $tcp == 0 ) { + outline( 11, 'no matching requests' ); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.23-core138, created. 699381b6993b9428e99a0055dae03e7a222ea9f9
by Arne Fitzenreiter 30 Nov '19

30 Nov '19

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 tag, v2.23-core138 has been created at 699381b6993b9428e99a0055dae03e7a222ea9f9 (commit) - Log ----------------------------------------------------------------- commit 699381b6993b9428e99a0055dae03e7a222ea9f9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 15 06:10:37 2019 +0000 core138: insert emergency core update for new intel vulnarabilities. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e557cecbddd021198c01eb1adaa38adb36b27925
by Arne Fitzenreiter 28 Nov '19

28 Nov '19

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 e557cecbddd021198c01eb1adaa38adb36b27925 (commit) from 4baee8fa4c2ede6f28a1d669d191ea64bb68ad51 (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 e557cecbddd021198c01eb1adaa38adb36b27925 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 28 18:41:18 2019 +0100 python: update to 2.7.17 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/python | 28 ++++++++++++++-------- config/rootfiles/common/armv5tel/python | 28 ++++++++++++++-------- config/rootfiles/common/i586/python | 28 ++++++++++++++-------- config/rootfiles/common/x86_64/python | 28 ++++++++++++++-------- .../127 => core/139}/filelists/aarch64/python | 0 .../127 => core/139}/filelists/armv5tel/python | 0 .../112 => core/139}/filelists/i586/python | 0 .../112 => core/139}/filelists/x86_64/python | 0 lfs/python | 4 ++-- lfs/python-optional-src | 4 ++-- 10 files changed, 76 insertions(+), 44 deletions(-) copy config/rootfiles/{oldcore/127 => core/139}/filelists/aarch64/python (100%) copy config/rootfiles/{oldcore/127 => core/139}/filelists/armv5tel/python (100%) copy config/rootfiles/{oldcore/112 => core/139}/filelists/i586/python (100%) copy config/rootfiles/{oldcore/112 => core/139}/filelists/x86_64/python (100%) Difference in files: diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python index 3259a241b..fa6064eec 100644 --- a/config/rootfiles/common/aarch64/python +++ b/config/rootfiles/common/aarch64/python @@ -800,6 +800,7 @@ usr/lib/python2.7/dis.pyc #usr/lib/python2.7/distutils/tests/__init__.py #usr/lib/python2.7/distutils/tests/__init__.pyc #usr/lib/python2.7/distutils/tests/__init__.pyo +#usr/lib/python2.7/distutils/tests/includetest.rst #usr/lib/python2.7/distutils/tests/setuptools_build_ext.py #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyc #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyo @@ -1463,8 +1464,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.15-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2043,6 +2044,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo @@ -2100,9 +2104,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2793,9 +2797,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py -#usr/lib/python2.7/test/bisect.py -#usr/lib/python2.7/test/bisect.pyc -#usr/lib/python2.7/test/bisect.pyo +#usr/lib/python2.7/test/bisect_cmd.py +#usr/lib/python2.7/test/bisect_cmd.pyc +#usr/lib/python2.7/test/bisect_cmd.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -2803,6 +2807,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/capath/6e88d7b8.0 #usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/capath/ce7b8643.0 +#usr/lib/python2.7/test/capath/efa5f9c3.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/cjkencodings #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt @@ -2985,7 +2990,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest -#usr/lib/python2.7/test/dh1024.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -2994,6 +2998,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/double_const.pyo #usr/lib/python2.7/test/empty.vbs #usr/lib/python2.7/test/exception_hierarchy.txt +#usr/lib/python2.7/test/ffdh3072.pem #usr/lib/python2.7/test/floating_points.txt #usr/lib/python2.7/test/fork_wait.py #usr/lib/python2.7/test/fork_wait.pyc @@ -3139,6 +3144,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo +#usr/lib/python2.7/test/talos-2019-0758.pem #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -3214,6 +3220,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_bastion.py #usr/lib/python2.7/test/test_bastion.pyc #usr/lib/python2.7/test/test_bastion.pyo +#usr/lib/python2.7/test/test_bdb.py +#usr/lib/python2.7/test/test_bdb.pyc +#usr/lib/python2.7/test/test_bdb.pyo #usr/lib/python2.7/test/test_bigaddrspace.py #usr/lib/python2.7/test/test_bigaddrspace.pyc #usr/lib/python2.7/test/test_bigaddrspace.pyo @@ -4395,7 +4404,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.py #usr/lib/python2.7/test/win_console_handler.pyc #usr/lib/python2.7/test/win_console_handler.pyo -#usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata #usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml diff --git a/config/rootfiles/common/armv5tel/python b/config/rootfiles/common/armv5tel/python index 586755c9b..67841c911 100644 --- a/config/rootfiles/common/armv5tel/python +++ b/config/rootfiles/common/armv5tel/python @@ -800,6 +800,7 @@ usr/lib/python2.7/dis.pyc #usr/lib/python2.7/distutils/tests/__init__.py #usr/lib/python2.7/distutils/tests/__init__.pyc #usr/lib/python2.7/distutils/tests/__init__.pyo +#usr/lib/python2.7/distutils/tests/includetest.rst #usr/lib/python2.7/distutils/tests/setuptools_build_ext.py #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyc #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyo @@ -1463,8 +1464,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.15-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2045,6 +2046,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo @@ -2102,9 +2106,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2795,9 +2799,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py -#usr/lib/python2.7/test/bisect.py -#usr/lib/python2.7/test/bisect.pyc -#usr/lib/python2.7/test/bisect.pyo +#usr/lib/python2.7/test/bisect_cmd.py +#usr/lib/python2.7/test/bisect_cmd.pyc +#usr/lib/python2.7/test/bisect_cmd.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -2805,6 +2809,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/capath/6e88d7b8.0 #usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/capath/ce7b8643.0 +#usr/lib/python2.7/test/capath/efa5f9c3.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/cjkencodings #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt @@ -2987,7 +2992,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest -#usr/lib/python2.7/test/dh1024.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -2996,6 +3000,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/double_const.pyo #usr/lib/python2.7/test/empty.vbs #usr/lib/python2.7/test/exception_hierarchy.txt +#usr/lib/python2.7/test/ffdh3072.pem #usr/lib/python2.7/test/floating_points.txt #usr/lib/python2.7/test/fork_wait.py #usr/lib/python2.7/test/fork_wait.pyc @@ -3141,6 +3146,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo +#usr/lib/python2.7/test/talos-2019-0758.pem #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -3216,6 +3222,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_bastion.py #usr/lib/python2.7/test/test_bastion.pyc #usr/lib/python2.7/test/test_bastion.pyo +#usr/lib/python2.7/test/test_bdb.py +#usr/lib/python2.7/test/test_bdb.pyc +#usr/lib/python2.7/test/test_bdb.pyo #usr/lib/python2.7/test/test_bigaddrspace.py #usr/lib/python2.7/test/test_bigaddrspace.pyc #usr/lib/python2.7/test/test_bigaddrspace.pyo @@ -4397,7 +4406,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.py #usr/lib/python2.7/test/win_console_handler.pyc #usr/lib/python2.7/test/win_console_handler.pyo -#usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata #usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml diff --git a/config/rootfiles/common/i586/python b/config/rootfiles/common/i586/python index 586755c9b..67841c911 100644 --- a/config/rootfiles/common/i586/python +++ b/config/rootfiles/common/i586/python @@ -800,6 +800,7 @@ usr/lib/python2.7/dis.pyc #usr/lib/python2.7/distutils/tests/__init__.py #usr/lib/python2.7/distutils/tests/__init__.pyc #usr/lib/python2.7/distutils/tests/__init__.pyo +#usr/lib/python2.7/distutils/tests/includetest.rst #usr/lib/python2.7/distutils/tests/setuptools_build_ext.py #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyc #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyo @@ -1463,8 +1464,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.15-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2045,6 +2046,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo @@ -2102,9 +2106,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2795,9 +2799,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py -#usr/lib/python2.7/test/bisect.py -#usr/lib/python2.7/test/bisect.pyc -#usr/lib/python2.7/test/bisect.pyo +#usr/lib/python2.7/test/bisect_cmd.py +#usr/lib/python2.7/test/bisect_cmd.pyc +#usr/lib/python2.7/test/bisect_cmd.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -2805,6 +2809,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/capath/6e88d7b8.0 #usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/capath/ce7b8643.0 +#usr/lib/python2.7/test/capath/efa5f9c3.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/cjkencodings #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt @@ -2987,7 +2992,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest -#usr/lib/python2.7/test/dh1024.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -2996,6 +3000,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/double_const.pyo #usr/lib/python2.7/test/empty.vbs #usr/lib/python2.7/test/exception_hierarchy.txt +#usr/lib/python2.7/test/ffdh3072.pem #usr/lib/python2.7/test/floating_points.txt #usr/lib/python2.7/test/fork_wait.py #usr/lib/python2.7/test/fork_wait.pyc @@ -3141,6 +3146,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo +#usr/lib/python2.7/test/talos-2019-0758.pem #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -3216,6 +3222,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_bastion.py #usr/lib/python2.7/test/test_bastion.pyc #usr/lib/python2.7/test/test_bastion.pyo +#usr/lib/python2.7/test/test_bdb.py +#usr/lib/python2.7/test/test_bdb.pyc +#usr/lib/python2.7/test/test_bdb.pyo #usr/lib/python2.7/test/test_bigaddrspace.py #usr/lib/python2.7/test/test_bigaddrspace.pyc #usr/lib/python2.7/test/test_bigaddrspace.pyo @@ -4397,7 +4406,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.py #usr/lib/python2.7/test/win_console_handler.pyc #usr/lib/python2.7/test/win_console_handler.pyo -#usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata #usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml diff --git a/config/rootfiles/common/x86_64/python b/config/rootfiles/common/x86_64/python index 350171647..5cdaf47cd 100644 --- a/config/rootfiles/common/x86_64/python +++ b/config/rootfiles/common/x86_64/python @@ -800,6 +800,7 @@ usr/lib/python2.7/dis.pyc #usr/lib/python2.7/distutils/tests/__init__.py #usr/lib/python2.7/distutils/tests/__init__.pyc #usr/lib/python2.7/distutils/tests/__init__.pyo +#usr/lib/python2.7/distutils/tests/includetest.rst #usr/lib/python2.7/distutils/tests/setuptools_build_ext.py #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyc #usr/lib/python2.7/distutils/tests/setuptools_build_ext.pyo @@ -1463,8 +1464,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/ensurepip/__main__.pyc #usr/lib/python2.7/ensurepip/__main__.pyo #usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.3-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/pip-19.2.3-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-41.2.0-py2.py3-none-any.whl #usr/lib/python2.7/ensurepip/_uninstall.py #usr/lib/python2.7/ensurepip/_uninstall.pyc #usr/lib/python2.7/ensurepip/_uninstall.pyo @@ -1926,7 +1927,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -#usr/lib/python2.7/lib-dynload/Python-2.7.15-py2.7.egg-info +#usr/lib/python2.7/lib-dynload/Python-2.7.17-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -2043,6 +2044,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_misc.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo @@ -2100,9 +2104,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.15.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.17.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2793,9 +2797,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/badsyntax_future8.py #usr/lib/python2.7/test/badsyntax_future9.py #usr/lib/python2.7/test/badsyntax_nocaret.py -#usr/lib/python2.7/test/bisect.py -#usr/lib/python2.7/test/bisect.pyc -#usr/lib/python2.7/test/bisect.pyo +#usr/lib/python2.7/test/bisect_cmd.py +#usr/lib/python2.7/test/bisect_cmd.pyc +#usr/lib/python2.7/test/bisect_cmd.pyo #usr/lib/python2.7/test/capath #usr/lib/python2.7/test/capath/0e4015b9.0 #usr/lib/python2.7/test/capath/4e1295a3.0 @@ -2803,6 +2807,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/capath/6e88d7b8.0 #usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/capath/ce7b8643.0 +#usr/lib/python2.7/test/capath/efa5f9c3.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/cjkencodings #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt @@ -2985,7 +2990,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest -#usr/lib/python2.7/test/dh1024.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -2994,6 +2998,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/double_const.pyo #usr/lib/python2.7/test/empty.vbs #usr/lib/python2.7/test/exception_hierarchy.txt +#usr/lib/python2.7/test/ffdh3072.pem #usr/lib/python2.7/test/floating_points.txt #usr/lib/python2.7/test/fork_wait.py #usr/lib/python2.7/test/fork_wait.pyc @@ -3139,6 +3144,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/symlink_support.py #usr/lib/python2.7/test/symlink_support.pyc #usr/lib/python2.7/test/symlink_support.pyo +#usr/lib/python2.7/test/talos-2019-0758.pem #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -3214,6 +3220,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_bastion.py #usr/lib/python2.7/test/test_bastion.pyc #usr/lib/python2.7/test/test_bastion.pyo +#usr/lib/python2.7/test/test_bdb.py +#usr/lib/python2.7/test/test_bdb.pyc +#usr/lib/python2.7/test/test_bdb.pyo #usr/lib/python2.7/test/test_bigaddrspace.py #usr/lib/python2.7/test/test_bigaddrspace.pyc #usr/lib/python2.7/test/test_bigaddrspace.pyo @@ -4395,7 +4404,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/win_console_handler.py #usr/lib/python2.7/test/win_console_handler.pyc #usr/lib/python2.7/test/win_console_handler.pyo -#usr/lib/python2.7/test/wrongcert.pem #usr/lib/python2.7/test/xmltestdata #usr/lib/python2.7/test/xmltestdata/expat224_utf8_bug.xml #usr/lib/python2.7/test/xmltestdata/simple-ns.xml diff --git a/config/rootfiles/core/139/filelists/aarch64/python b/config/rootfiles/core/139/filelists/aarch64/python new file mode 120000 index 000000000..b2b0103b6 --- /dev/null +++ b/config/rootfiles/core/139/filelists/aarch64/python @@ -0,0 +1 @@ +../../../../common/aarch64/python \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/armv5tel/python b/config/rootfiles/core/139/filelists/armv5tel/python new file mode 120000 index 000000000..df0dd5c06 --- /dev/null +++ b/config/rootfiles/core/139/filelists/armv5tel/python @@ -0,0 +1 @@ +../../../../common/armv5tel/python \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/i586/python b/config/rootfiles/core/139/filelists/i586/python new file mode 120000 index 000000000..a2b842b99 --- /dev/null +++ b/config/rootfiles/core/139/filelists/i586/python @@ -0,0 +1 @@ +../../../../common/i586/python \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/x86_64/python b/config/rootfiles/core/139/filelists/x86_64/python new file mode 120000 index 000000000..a593187de --- /dev/null +++ b/config/rootfiles/core/139/filelists/x86_64/python @@ -0,0 +1 @@ +../../../../common/x86_64/python \ No newline at end of file diff --git a/lfs/python b/lfs/python index 66bc3b901..c2638baec 100644 --- a/lfs/python +++ b/lfs/python @@ -26,7 +26,7 @@ include Config # If you update this make sure that you also change the VER and PAK_VER of # python-optional-src ! -VER = 2.7.15 +VER = 2.7.17 THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a80ae3cc478460b922242f43a1b4094d +$(DL_FILE)_MD5 = b3b6d2c92f42a60667814358ab9f0cfd install : $(TARGET) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index cb0ac1fa6..2439c4899 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -24,12 +24,12 @@ include Config -VER = 2.7.15 +VER = 2.7.17 include python PROG = python-optional-src -PAK_VER = 5 +PAK_VER = 6 DEPS = dist: hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4baee8fa4c2ede6f28a1d669d191ea64bb68ad51
by Arne Fitzenreiter 15 Nov '19

15 Nov '19

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 4baee8fa4c2ede6f28a1d669d191ea64bb68ad51 (commit) via 906d9265cde12f1a0e677db43c076f2263fe15df (commit) from aee6dd0ba45cf12f014050bbab234d9e4b0d03ab (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 4baee8fa4c2ede6f28a1d669d191ea64bb68ad51 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 15 16:29:42 2019 +0100 kernel: fix x86_64 rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 906d9265cde12f1a0e677db43c076f2263fe15df Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 15 16:28:02 2019 +0100 set core to 139 and pakfire to 138 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/linux | 2 +- make.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index f44266e52..0ec85621a 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -12126,7 +12126,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx #lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode -#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/auto.h +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/off.h #lib/modules/KVER-ipfire/build/include/config/x86/internode #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache/shift.h diff --git a/make.sh b/make.sh index da674fcb6..771c5ff89 100755 --- a/make.sh +++ b/make.sh @@ -26,8 +26,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.23" # Version number -CORE="138" # Core Level (Filename) -PAKFIRE_CORE="137" # Core Level (PAKFIRE) +CORE="139" # Core Level (Filename) +PAKFIRE_CORE="138" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.23-core137, created. d704e75d750b38e77d01ca32fd5a4d70470467ce
by Arne Fitzenreiter 15 Nov '19

15 Nov '19

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 tag, v2.23-core137 has been created at d704e75d750b38e77d01ca32fd5a4d70470467ce (commit) - Log ----------------------------------------------------------------- commit d704e75d750b38e77d01ca32fd5a4d70470467ce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 22 17:48:14 2019 +0200 QoS: Do no classify as default when L7 filter isn't done We need to allow some more packets to pass through the mangle chains so that the layer 7 filter can determine what protocol it finds. If L7 filter decides that a connection is of type "unknown", we mark it as default, or it is marked with the correct class. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core138, created. 699381b6993b9428e99a0055dae03e7a222ea9f9
by Arne Fitzenreiter 15 Nov '19

15 Nov '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 699381b6993b9428e99a0055dae03e7a222ea9f9
by Arne Fitzenreiter 15 Nov '19

15 Nov '19

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 699381b6993b9428e99a0055dae03e7a222ea9f9 (commit) via 9c7adf49f341d61f4bf14b3a39c719e3630c504f (commit) via bf671bb2ae7d631f3c5c5d7402ae47c6f5b45d98 (commit) via 6fb52ca1e56bfa23e9d766160f861019dc3cdb68 (commit) via b1dc936cc60e651773095ceaadbfcbeed2666f84 (commit) via b0f2208425d62bd86729161c498c2de3215a558a (commit) from e603fd28b9485202326ec1ee2452538a4304f4a2 (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 699381b6993b9428e99a0055dae03e7a222ea9f9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Nov 15 06:10:37 2019 +0000 core138: insert emergency core update for new intel vulnarabilities. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9c7adf49f341d61f4bf14b3a39c719e3630c504f Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Wed Nov 13 19:18:00 2019 +0000 intel-microcode: update to 20191112 For release notes, refer to: - https://blogs.intel.com/technology/2019/11/ipas-november-2019-intel-platfor… - https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/release… Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit bf671bb2ae7d631f3c5c5d7402ae47c6f5b45d98 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 22:12:12 2019 +0100 kernel: update to 4.14.154 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 6fb52ca1e56bfa23e9d766160f861019dc3cdb68 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 22:10:04 2019 +0100 vulnearabilities.cgi: add tsx async abort and itlb_multihit Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b1dc936cc60e651773095ceaadbfcbeed2666f84 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 17:28:38 2019 +0000 rename core138 -> core139 to insert a emergency core update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b0f2208425d62bd86729161c498c2de3215a558a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 01:55:46 2019 +0000 intel-microcode: fix rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 4 +++- .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 ++- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 ++- config/kernel/kernel.config.i586-ipfire | 6 +++++- config/kernel/kernel.config.i586-ipfire-pae | 6 +++++- config/kernel/kernel.config.x86_64-ipfire | 6 +++++- config/rootfiles/common/aarch64/linux | 2 ++ config/rootfiles/common/armv5tel/linux-kirkwood | 2 ++ config/rootfiles/common/armv5tel/linux-multi | 2 ++ config/rootfiles/common/i586/linux | 10 +++++----- config/rootfiles/common/x86_64/intel-microcode | 8 +++++++- config/rootfiles/common/x86_64/linux | 10 +++++----- config/rootfiles/core/137/filelists/IO-Socket-SSL | 1 - config/rootfiles/core/137/filelists/Net_SSLeay | 1 - config/rootfiles/core/137/filelists/bind | 1 - config/rootfiles/core/137/filelists/collectd | 1 - config/rootfiles/core/137/filelists/dhcpcd | 1 - config/rootfiles/core/137/filelists/files | 22 ---------------------- config/rootfiles/core/137/filelists/iproute2 | 1 - config/rootfiles/core/137/filelists/ipset | 1 - config/rootfiles/core/137/filelists/iptables | 1 - config/rootfiles/core/137/filelists/knot | 1 - config/rootfiles/core/137/filelists/libhtp | 1 - .../core/137/filelists/libnetfilter_queue | 1 - config/rootfiles/core/137/filelists/libpcap | 1 - config/rootfiles/core/137/filelists/libssh | 1 - config/rootfiles/core/137/filelists/pcre | 1 - config/rootfiles/core/137/filelists/strongswan | 1 - config/rootfiles/core/137/filelists/suricata | 1 - config/rootfiles/core/137/filelists/tzdata | 1 - config/rootfiles/core/137/filelists/unbound | 1 - config/rootfiles/core/137/filelists/wpa_supplicant | 1 - config/rootfiles/core/{137 => 138}/exclude | 0 .../core/{137 => 138}/filelists/aarch64/linux | 0 .../{137 => 138}/filelists/aarch64/linux-initrd | 0 .../filelists/armv5tel/linux-initrd-kirkwood | 0 .../filelists/armv5tel/linux-initrd-multi | 0 .../{137 => 138}/filelists/armv5tel/linux-kirkwood | 0 .../{137 => 138}/filelists/armv5tel/linux-multi | 0 config/rootfiles/core/138/filelists/files | 5 +++++ .../138}/filelists/i586/intel-microcode | 0 .../core/{137 => 138}/filelists/i586/linux | 0 .../core/{137 => 138}/filelists/i586/linux-initrd | 0 .../138}/filelists/x86_64/intel-microcode | 0 .../core/{137 => 138}/filelists/x86_64/linux | 0 .../{137 => 138}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/{137 => 138}/update.sh | 16 ++++------------ config/rootfiles/core/{137 => 139}/exclude | 0 .../{oldcore/66 => core/139}/filelists/bash | 0 .../121 => core/139}/filelists/ca-certificates | 0 .../{oldcore/104 => core/139}/filelists/ddns | 0 config/rootfiles/core/139/filelists/files | 16 ++++++++++++++++ .../139}/filelists/i586/intel-microcode | 0 .../100 => core/139}/filelists/i586/openssl-sse2 | 0 .../{oldcore/111 => core/139}/filelists/logwatch | 0 .../{oldcore/118 => core/139}/filelists/lz4 | 0 .../{oldcore/100 => core/139}/filelists/openssl | 0 .../{oldcore/100 => core/139}/filelists/openvpn | 0 .../{oldcore/66 => core/139}/filelists/readline | 0 .../66 => core/139}/filelists/readline-compat | 0 .../{oldcore/100 => core/139}/filelists/squid | 0 .../139}/filelists/x86_64/intel-microcode | 0 .../rootfiles/{oldcore/130 => core/139}/update.sh | 18 ++++++++++++++---- config/rootfiles/packages/linux-pae | 10 +++++----- html/cgi-bin/vulnerabilities.cgi | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ lfs/intel-microcode | 6 +++--- lfs/linux | 10 +++++----- make.sh | 4 ++-- 69 files changed, 103 insertions(+), 89 deletions(-) delete mode 120000 config/rootfiles/core/137/filelists/IO-Socket-SSL delete mode 120000 config/rootfiles/core/137/filelists/Net_SSLeay delete mode 120000 config/rootfiles/core/137/filelists/bind delete mode 120000 config/rootfiles/core/137/filelists/collectd delete mode 120000 config/rootfiles/core/137/filelists/dhcpcd delete mode 100644 config/rootfiles/core/137/filelists/files delete mode 120000 config/rootfiles/core/137/filelists/iproute2 delete mode 120000 config/rootfiles/core/137/filelists/ipset delete mode 120000 config/rootfiles/core/137/filelists/iptables delete mode 120000 config/rootfiles/core/137/filelists/knot delete mode 120000 config/rootfiles/core/137/filelists/libhtp delete mode 120000 config/rootfiles/core/137/filelists/libnetfilter_queue delete mode 120000 config/rootfiles/core/137/filelists/libpcap delete mode 120000 config/rootfiles/core/137/filelists/libssh delete mode 120000 config/rootfiles/core/137/filelists/pcre delete mode 120000 config/rootfiles/core/137/filelists/strongswan delete mode 120000 config/rootfiles/core/137/filelists/suricata delete mode 120000 config/rootfiles/core/137/filelists/tzdata delete mode 120000 config/rootfiles/core/137/filelists/unbound delete mode 120000 config/rootfiles/core/137/filelists/wpa_supplicant copy config/rootfiles/core/{137 => 138}/exclude (100%) rename config/rootfiles/core/{137 => 138}/filelists/aarch64/linux (100%) rename config/rootfiles/core/{137 => 138}/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/core/{137 => 138}/filelists/armv5tel/linux-initrd-kirkwood (100%) rename config/rootfiles/core/{137 => 138}/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/core/{137 => 138}/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/core/{137 => 138}/filelists/armv5tel/linux-multi (100%) create mode 100644 config/rootfiles/core/138/filelists/files copy config/rootfiles/{oldcore/121 => core/138}/filelists/i586/intel-microcode (100%) rename config/rootfiles/core/{137 => 138}/filelists/i586/linux (100%) rename config/rootfiles/core/{137 => 138}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/121 => core/138}/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/core/{137 => 138}/filelists/x86_64/linux (100%) rename config/rootfiles/core/{137 => 138}/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/core/{137 => 138}/update.sh (94%) rename config/rootfiles/core/{137 => 139}/exclude (100%) copy config/rootfiles/{oldcore/66 => core/139}/filelists/bash (100%) copy config/rootfiles/{oldcore/121 => core/139}/filelists/ca-certificates (100%) copy config/rootfiles/{oldcore/104 => core/139}/filelists/ddns (100%) create mode 100644 config/rootfiles/core/139/filelists/files copy config/rootfiles/{oldcore/121 => core/139}/filelists/i586/intel-microcode (100%) copy config/rootfiles/{oldcore/100 => core/139}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/111 => core/139}/filelists/logwatch (100%) copy config/rootfiles/{oldcore/118 => core/139}/filelists/lz4 (100%) copy config/rootfiles/{oldcore/100 => core/139}/filelists/openssl (100%) copy config/rootfiles/{oldcore/100 => core/139}/filelists/openvpn (100%) copy config/rootfiles/{oldcore/66 => core/139}/filelists/readline (100%) copy config/rootfiles/{oldcore/66 => core/139}/filelists/readline-compat (100%) copy config/rootfiles/{oldcore/100 => core/139}/filelists/squid (100%) copy config/rootfiles/{oldcore/121 => core/139}/filelists/x86_64/intel-microcode (100%) copy config/rootfiles/{oldcore/130 => core/139}/update.sh (89%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 778b05a9a..e79403bc7 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.150-ipfire Kernel Configuration +# Linux/arm64 4.14.154-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -1456,6 +1456,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y @@ -6822,6 +6823,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CPU_RMAP=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index fcbac3bcd..2bfb7ff36 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.150-ipfire-kirkwood Kernel Configuration +# Linux/arm 4.14.154-ipfire-kirkwood Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -6235,6 +6235,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_DQL=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index fc74eb142..7e9de39ea 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.150-ipfire-multi Kernel Configuration +# Linux/arm 4.14.154-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -7318,6 +7318,7 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CPU_RMAP=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 4eaae6f74..2732bba42 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.150-ipfire Kernel Configuration +# Linux/x86 4.14.154-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -601,6 +601,9 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -7024,6 +7027,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CHECK_SIGNATURE=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 526adbbcb..9b53ab35c 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.150-ipfire-pae Kernel Configuration +# Linux/x86 4.14.154-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -619,6 +619,9 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -7029,6 +7032,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CHECK_SIGNATURE=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index c9563234e..2fcf1e589 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.150-ipfire Kernel Configuration +# Linux/x86 4.14.154-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -611,6 +611,9 @@ CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y # CONFIG_X86_INTEL_MPX is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y @@ -6909,6 +6912,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CHECK_SIGNATURE=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index d8e93542d..f9dc8555b 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -9821,6 +9821,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sg/pool.h #lib/modules/KVER-ipfire/build/include/config/sgetmask #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire/build/include/config/sgl +#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire/build/include/config/shmem.h #lib/modules/KVER-ipfire/build/include/config/signalfd.h #lib/modules/KVER-ipfire/build/include/config/simple diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 2269896d8..9ccc006b9 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -9329,6 +9329,8 @@ boot/vmlinuz-KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/build/include/config/sg/pool.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/sgetmask #lib/modules/KVER-ipfire-kirkwood/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire-kirkwood/build/include/config/sgl +#lib/modules/KVER-ipfire-kirkwood/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/shmem.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/signalfd.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/simple diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 1e7a090d9..890e3be21 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -10752,6 +10752,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/sg/pool.h #lib/modules/KVER-ipfire-multi/build/include/config/sgetmask #lib/modules/KVER-ipfire-multi/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire-multi/build/include/config/sgl +#lib/modules/KVER-ipfire-multi/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire-multi/build/include/config/shmem.h #lib/modules/KVER-ipfire-multi/build/include/config/signalfd.h #lib/modules/KVER-ipfire-multi/build/include/config/simple diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 1fe01233f..684dbe07b 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -10838,6 +10838,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sg/pool.h #lib/modules/KVER-ipfire/build/include/config/sgetmask #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire/build/include/config/sgl +#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire/build/include/config/shmem.h #lib/modules/KVER-ipfire/build/include/config/signalfd.h #lib/modules/KVER-ipfire/build/include/config/sis190.h @@ -12164,6 +12166,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/x86/intel/mid.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/quark.h +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/off.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/usercopy.h #lib/modules/KVER-ipfire/build/include/config/x86/internode #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache @@ -14027,7 +14032,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/net.h #lib/modules/KVER-ipfire/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire/build/include/linux/netfilter #lib/modules/KVER-ipfire/build/include/linux/netfilter.h #lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset @@ -14773,7 +14777,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/sizes.h #lib/modules/KVER-ipfire/build/include/linux/skb_array.h #lib/modules/KVER-ipfire/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire/build/include/linux/slab.h #lib/modules/KVER-ipfire/build/include/linux/slab_def.h #lib/modules/KVER-ipfire/build/include/linux/slub_def.h @@ -15587,7 +15590,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/net/route.h #lib/modules/KVER-ipfire/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire/build/include/net/scm.h #lib/modules/KVER-ipfire/build/include/net/sctp #lib/modules/KVER-ipfire/build/include/net/sctp/auth.h @@ -17242,9 +17244,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/ncsi/Makefile #lib/modules/KVER-ipfire/build/net/netfilter #lib/modules/KVER-ipfire/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire/build/net/netfilter/ipset #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode index df05c2de5..2aa6f9301 100644 --- a/config/rootfiles/common/x86_64/intel-microcode +++ b/config/rootfiles/common/x86_64/intel-microcode @@ -63,8 +63,11 @@ lib/firmware/intel-ucode/06-46-01 lib/firmware/intel-ucode/06-47-01 lib/firmware/intel-ucode/06-4c-03 lib/firmware/intel-ucode/06-4c-04 +lib/firmware/intel-ucode/06-4d-08 lib/firmware/intel-ucode/06-4e-03 +lib/firmware/intel-ucode/06-55-03 lib/firmware/intel-ucode/06-55-04 +lib/firmware/intel-ucode/06-55-06 lib/firmware/intel-ucode/06-55-07 lib/firmware/intel-ucode/06-56-02 lib/firmware/intel-ucode/06-56-03 @@ -75,7 +78,10 @@ lib/firmware/intel-ucode/06-5c-09 lib/firmware/intel-ucode/06-5c-0a lib/firmware/intel-ucode/06-5e-03 lib/firmware/intel-ucode/06-5f-01 +lib/firmware/intel-ucode/06-66-03 lib/firmware/intel-ucode/06-7a-01 +lib/firmware/intel-ucode/06-7a-08 +lib/firmware/intel-ucode/06-7e-05 lib/firmware/intel-ucode/06-8e-09 lib/firmware/intel-ucode/06-8e-0a lib/firmware/intel-ucode/06-8e-0b @@ -83,8 +89,8 @@ lib/firmware/intel-ucode/06-8e-0c lib/firmware/intel-ucode/06-9e-09 lib/firmware/intel-ucode/06-9e-0a lib/firmware/intel-ucode/06-9e-0b -lib/firmware/intel-ucode/06-9e-0c lib/firmware/intel-ucode/06-9e-0d +lib/firmware/intel-ucode/06-a6-00 lib/firmware/intel-ucode/0f-00-07 lib/firmware/intel-ucode/0f-00-0a lib/firmware/intel-ucode/0f-01-02 diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 68f907faa..f44266e52 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -10850,6 +10850,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sg/pool.h #lib/modules/KVER-ipfire/build/include/config/sgetmask #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire/build/include/config/sgl +#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire/build/include/config/shmem.h #lib/modules/KVER-ipfire/build/include/config/signalfd.h #lib/modules/KVER-ipfire/build/include/config/sis190.h @@ -12122,6 +12124,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/x86/intel/memory/protection #lib/modules/KVER-ipfire/build/include/config/x86/intel/memory/protection/keys.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/auto.h #lib/modules/KVER-ipfire/build/include/config/x86/internode #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache/shift.h @@ -14042,7 +14047,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/net.h #lib/modules/KVER-ipfire/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire/build/include/linux/netfilter #lib/modules/KVER-ipfire/build/include/linux/netfilter.h #lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset @@ -14788,7 +14792,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/sizes.h #lib/modules/KVER-ipfire/build/include/linux/skb_array.h #lib/modules/KVER-ipfire/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire/build/include/linux/slab.h #lib/modules/KVER-ipfire/build/include/linux/slab_def.h #lib/modules/KVER-ipfire/build/include/linux/slub_def.h @@ -15602,7 +15605,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/net/route.h #lib/modules/KVER-ipfire/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire/build/include/net/scm.h #lib/modules/KVER-ipfire/build/include/net/sctp #lib/modules/KVER-ipfire/build/include/net/sctp/auth.h @@ -17257,9 +17259,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/ncsi/Makefile #lib/modules/KVER-ipfire/build/net/netfilter #lib/modules/KVER-ipfire/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire/build/net/netfilter/ipset #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile diff --git a/config/rootfiles/core/137/filelists/IO-Socket-SSL b/config/rootfiles/core/137/filelists/IO-Socket-SSL deleted file mode 120000 index d24492371..000000000 --- a/config/rootfiles/core/137/filelists/IO-Socket-SSL +++ /dev/null @@ -1 +0,0 @@ -../../../common/IO-Socket-SSL \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/Net_SSLeay b/config/rootfiles/core/137/filelists/Net_SSLeay deleted file mode 120000 index 13fe0560c..000000000 --- a/config/rootfiles/core/137/filelists/Net_SSLeay +++ /dev/null @@ -1 +0,0 @@ -../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/bind b/config/rootfiles/core/137/filelists/bind deleted file mode 120000 index 48a0ebaef..000000000 --- a/config/rootfiles/core/137/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/collectd b/config/rootfiles/core/137/filelists/collectd deleted file mode 120000 index 871b32f14..000000000 --- a/config/rootfiles/core/137/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/dhcpcd b/config/rootfiles/core/137/filelists/dhcpcd deleted file mode 120000 index 1e799dabb..000000000 --- a/config/rootfiles/core/137/filelists/dhcpcd +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/files b/config/rootfiles/core/137/filelists/files deleted file mode 100644 index 3b7c8d23b..000000000 --- a/config/rootfiles/core/137/filelists/files +++ /dev/null @@ -1,22 +0,0 @@ -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/credits.cgi -usr/lib/firewall/rules.pl -usr/sbin/firewall-policy -var/ipfire/langs -etc/logrotate.conf -etc/rc.d/init.d/firewall -etc/rc.d/init.d/unbound -etc/rc.d/init.d/networking/red.up/99-geoip-database -etc/sysctl.conf -srv/web/ipfire/cgi-bin/dns.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/lib/firewall/rules.pl -usr/sbin/firewall-policy -usr/local/bin/xt_geoip_update -var/ipfire/backup/bin/backup.pl -var/ipfire/qos/bin/makeqosscripts.pl -var/ipfire/suricata/ruleset-sources -srv/web/ipfire/cgi-bin/ovpnmain.cgi diff --git a/config/rootfiles/core/137/filelists/iproute2 b/config/rootfiles/core/137/filelists/iproute2 deleted file mode 120000 index 05f0f71fb..000000000 --- a/config/rootfiles/core/137/filelists/iproute2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/ipset b/config/rootfiles/core/137/filelists/ipset deleted file mode 120000 index 2b43691f2..000000000 --- a/config/rootfiles/core/137/filelists/ipset +++ /dev/null @@ -1 +0,0 @@ -../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/iptables b/config/rootfiles/core/137/filelists/iptables deleted file mode 120000 index 8caf12bcc..000000000 --- a/config/rootfiles/core/137/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/knot b/config/rootfiles/core/137/filelists/knot deleted file mode 120000 index 28e96f878..000000000 --- a/config/rootfiles/core/137/filelists/knot +++ /dev/null @@ -1 +0,0 @@ -../../../common/knot \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libhtp b/config/rootfiles/core/137/filelists/libhtp deleted file mode 120000 index 676e2c5e8..000000000 --- a/config/rootfiles/core/137/filelists/libhtp +++ /dev/null @@ -1 +0,0 @@ -../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libnetfilter_queue b/config/rootfiles/core/137/filelists/libnetfilter_queue deleted file mode 120000 index 9344b04bf..000000000 --- a/config/rootfiles/core/137/filelists/libnetfilter_queue +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnetfilter_queue \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libpcap b/config/rootfiles/core/137/filelists/libpcap deleted file mode 120000 index c7f9f52a8..000000000 --- a/config/rootfiles/core/137/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/libssh b/config/rootfiles/core/137/filelists/libssh deleted file mode 120000 index ecbb67053..000000000 --- a/config/rootfiles/core/137/filelists/libssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/libssh \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/pcre b/config/rootfiles/core/137/filelists/pcre deleted file mode 120000 index b390d9a36..000000000 --- a/config/rootfiles/core/137/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/strongswan b/config/rootfiles/core/137/filelists/strongswan deleted file mode 120000 index 90c727e26..000000000 --- a/config/rootfiles/core/137/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/suricata b/config/rootfiles/core/137/filelists/suricata deleted file mode 120000 index f671f6993..000000000 --- a/config/rootfiles/core/137/filelists/suricata +++ /dev/null @@ -1 +0,0 @@ -../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/tzdata b/config/rootfiles/core/137/filelists/tzdata deleted file mode 120000 index 5a6e3252f..000000000 --- a/config/rootfiles/core/137/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/unbound b/config/rootfiles/core/137/filelists/unbound deleted file mode 120000 index 66adf0924..000000000 --- a/config/rootfiles/core/137/filelists/unbound +++ /dev/null @@ -1 +0,0 @@ -../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/wpa_supplicant b/config/rootfiles/core/137/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03c0..000000000 --- a/config/rootfiles/core/137/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/137/exclude b/config/rootfiles/core/138/exclude similarity index 100% rename from config/rootfiles/core/137/exclude rename to config/rootfiles/core/138/exclude diff --git a/config/rootfiles/core/137/filelists/aarch64/linux b/config/rootfiles/core/138/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/137/filelists/aarch64/linux rename to config/rootfiles/core/138/filelists/aarch64/linux diff --git a/config/rootfiles/core/137/filelists/aarch64/linux-initrd b/config/rootfiles/core/138/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/137/filelists/aarch64/linux-initrd rename to config/rootfiles/core/138/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/138/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/137/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/core/138/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/138/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/core/138/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/138/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/core/138/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/137/filelists/armv5tel/linux-multi b/config/rootfiles/core/138/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/137/filelists/armv5tel/linux-multi rename to config/rootfiles/core/138/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/138/filelists/files b/config/rootfiles/core/138/filelists/files new file mode 100644 index 000000000..393ad7227 --- /dev/null +++ b/config/rootfiles/core/138/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs +srv/web/ipfire/cgi-bin/vulnerabilities.cgi diff --git a/config/rootfiles/core/138/filelists/i586/intel-microcode b/config/rootfiles/core/138/filelists/i586/intel-microcode new file mode 120000 index 000000000..f03e84778 --- /dev/null +++ b/config/rootfiles/core/138/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../../../../common/i586/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/i586/linux b/config/rootfiles/core/138/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/137/filelists/i586/linux rename to config/rootfiles/core/138/filelists/i586/linux diff --git a/config/rootfiles/core/137/filelists/i586/linux-initrd b/config/rootfiles/core/138/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/137/filelists/i586/linux-initrd rename to config/rootfiles/core/138/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/138/filelists/x86_64/intel-microcode b/config/rootfiles/core/138/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/138/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/137/filelists/x86_64/linux b/config/rootfiles/core/138/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/137/filelists/x86_64/linux rename to config/rootfiles/core/138/filelists/x86_64/linux diff --git a/config/rootfiles/core/137/filelists/x86_64/linux-initrd b/config/rootfiles/core/138/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/137/filelists/x86_64/linux-initrd rename to config/rootfiles/core/138/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/137/update.sh b/config/rootfiles/core/138/update.sh similarity index 94% rename from config/rootfiles/core/137/update.sh rename to config/rootfiles/core/138/update.sh index f2e83fc77..e65955501 100644 --- a/config/rootfiles/core/137/update.sh +++ b/config/rootfiles/core/138/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -core=137 +core=138 exit_with_error() { # Set last succesfull installed core. @@ -77,6 +77,7 @@ rm -rf /boot/zImage-*-ipfire-* rm -rf /boot/uInit-*-ipfire-* rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules +rm -f /etc/sysconfig/lm_sensors # Remove files @@ -85,6 +86,8 @@ rm -rf /lib/modules # Extract files extract_files +# update dhcpcd.conf + # update linker config ldconfig @@ -92,17 +95,6 @@ ldconfig /usr/local/bin/update-lang-cache # Start services -/usr/local/bin/ipsecctrl S -/etc/init.d/suricata restart -/etc/init.d/unbound restart -/etc/init.d/collectd restart - -# remove lm_sensor config after collectd was started -# to reserch sensors at next boot with updated kernel -rm -f /etc/sysconfig/lm_sensors - -# generate new qos script -/usr/local/bin/qosctrl generate # Search sensors again after reboot into the new kernel rm -f /etc/sysconfig/lm_sensors diff --git a/config/rootfiles/core/139/exclude b/config/rootfiles/core/139/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/core/139/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/139/filelists/bash b/config/rootfiles/core/139/filelists/bash new file mode 120000 index 000000000..de970cb1d --- /dev/null +++ b/config/rootfiles/core/139/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/ca-certificates b/config/rootfiles/core/139/filelists/ca-certificates new file mode 120000 index 000000000..320fea8f4 --- /dev/null +++ b/config/rootfiles/core/139/filelists/ca-certificates @@ -0,0 +1 @@ +../../../common/ca-certificates \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/ddns b/config/rootfiles/core/139/filelists/ddns new file mode 120000 index 000000000..739516420 --- /dev/null +++ b/config/rootfiles/core/139/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files new file mode 100644 index 000000000..d22fb8314 --- /dev/null +++ b/config/rootfiles/core/139/filelists/files @@ -0,0 +1,16 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs +etc/httpd/conf/vhosts.d/ipfire-interface.conf +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/red.up/23-suricata +etc/rc.d/init.d/unbound +etc/suricata/suricata.yaml +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/mail.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/sbin/convert-snort +usr/lib/firewall/firewall-lib.pl +var/ipfire/ids-functions.pl diff --git a/config/rootfiles/core/139/filelists/i586/intel-microcode b/config/rootfiles/core/139/filelists/i586/intel-microcode new file mode 120000 index 000000000..f03e84778 --- /dev/null +++ b/config/rootfiles/core/139/filelists/i586/intel-microcode @@ -0,0 +1 @@ +../../../../common/i586/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/i586/openssl-sse2 b/config/rootfiles/core/139/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/core/139/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/logwatch b/config/rootfiles/core/139/filelists/logwatch new file mode 120000 index 000000000..f14eabda9 --- /dev/null +++ b/config/rootfiles/core/139/filelists/logwatch @@ -0,0 +1 @@ +../../../common/logwatch \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/lz4 b/config/rootfiles/core/139/filelists/lz4 new file mode 120000 index 000000000..65c31802e --- /dev/null +++ b/config/rootfiles/core/139/filelists/lz4 @@ -0,0 +1 @@ +../../../common/lz4 \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/openssl b/config/rootfiles/core/139/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/139/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/openvpn b/config/rootfiles/core/139/filelists/openvpn new file mode 120000 index 000000000..493f3f7a4 --- /dev/null +++ b/config/rootfiles/core/139/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/readline b/config/rootfiles/core/139/filelists/readline new file mode 120000 index 000000000..84209f189 --- /dev/null +++ b/config/rootfiles/core/139/filelists/readline @@ -0,0 +1 @@ +../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/readline-compat b/config/rootfiles/core/139/filelists/readline-compat new file mode 120000 index 000000000..f96bc808c --- /dev/null +++ b/config/rootfiles/core/139/filelists/readline-compat @@ -0,0 +1 @@ +../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/squid b/config/rootfiles/core/139/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/139/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/139/filelists/x86_64/intel-microcode b/config/rootfiles/core/139/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/139/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/139/update.sh b/config/rootfiles/core/139/update.sh new file mode 100644 index 000000000..fb3105aa0 --- /dev/null +++ b/config/rootfiles/core/139/update.sh @@ -0,0 +1,75 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2019 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=139 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services + +# This update needs a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index f3966ce75..c0894cd1f 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -10836,6 +10836,8 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/sg/pool.h #lib/modules/KVER-ipfire-pae/build/include/config/sgetmask #lib/modules/KVER-ipfire-pae/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire-pae/build/include/config/sgl +#lib/modules/KVER-ipfire-pae/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire-pae/build/include/config/shmem.h #lib/modules/KVER-ipfire-pae/build/include/config/signalfd.h #lib/modules/KVER-ipfire-pae/build/include/config/sis190.h @@ -12164,6 +12166,9 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/lpss.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/pstate.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/quark.h +#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx +#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx/mode +#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx/mode/off.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/usercopy.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/internode #lib/modules/KVER-ipfire-pae/build/include/config/x86/internode/cache @@ -14097,7 +14102,6 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/linux/net.h #lib/modules/KVER-ipfire-pae/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire-pae/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire-pae/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter.h #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter/ipset @@ -14843,7 +14847,6 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/linux/sizes.h #lib/modules/KVER-ipfire-pae/build/include/linux/skb_array.h #lib/modules/KVER-ipfire-pae/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire-pae/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire-pae/build/include/linux/slab.h #lib/modules/KVER-ipfire-pae/build/include/linux/slab_def.h #lib/modules/KVER-ipfire-pae/build/include/linux/slub_def.h @@ -15657,7 +15660,6 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/net/route.h #lib/modules/KVER-ipfire-pae/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire-pae/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire-pae/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire-pae/build/include/net/scm.h #lib/modules/KVER-ipfire-pae/build/include/net/sctp #lib/modules/KVER-ipfire-pae/build/include/net/sctp/auth.h @@ -17312,9 +17314,7 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/net/ncsi/Makefile #lib/modules/KVER-ipfire-pae/build/net/netfilter #lib/modules/KVER-ipfire-pae/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire-pae/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire-pae/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire-pae/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset/Makefile diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi index a8746c30c..333b03399 100644 --- a/html/cgi-bin/vulnerabilities.cgi +++ b/html/cgi-bin/vulnerabilities.cgi @@ -30,12 +30,14 @@ require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; my %VULNERABILITIES = ( + "itlb_multihit" => "$Lang::tr{'itlb multihit'} (CVE-2018-12207)", "l1tf" => "$Lang::tr{'foreshadow'} (CVE-2018-3620)", "mds" => "$Lang::tr{'fallout zombieload ridl'} (CVE-2018-12126, CVE-2018-12130, CVE-2018-12127, CVE-2019-11091)", "meltdown" => "$Lang::tr{'meltdown'} (CVE-2017-5754)", "spec_store_bypass" => "$Lang::tr{'spectre variant 4'} (CVE-2018-3639)", "spectre_v1" => "$Lang::tr{'spectre variant 1'} (CVE-2017-5753)", "spectre_v2" => "$Lang::tr{'spectre variant 2'} (CVE-2017-5715)", + "tsx_async_abort" => "$Lang::tr{'taa zombieload2'} (CVE-2019-11135)", ); my $errormessage = ""; diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8b7e63cb8..b40ef9390 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1542,6 +1542,7 @@ 'isdn settings' => 'Additional ISDN settings:', 'isdn1' => 'Single ISDN', 'isdn2' => 'Dual ISDN', +'itlb multihit' => 'iTLB MultiHit', 'january' => 'January', 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the', 'javascript menu error2' => 'page.', @@ -2322,6 +2323,7 @@ 'system logs' => 'System Logs', 'system status information' => 'System Status Information', 'ta key' => 'TLS-Authentification-Key', +'taa zombieload2' => 'TSX Async Abort / ZombieLoad v2', 'tcp more reliable' => 'TCP (more reliable)', 'telephone not set' => 'Telephone not set.', 'template' => 'Preset', diff --git a/lfs/intel-microcode b/lfs/intel-microcode index e01ea9934..c50e73d11 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,10 +24,10 @@ include Config -VER = 20190618 +VER = 20191112 THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 18af9bd8b6c7164f0cd917080a387244 +$(DL_FILE)_MD5 = b215c5a8fd438afd867d8a42d01e27f6 install : $(TARGET) diff --git a/lfs/linux b/lfs/linux index c8bcdbb97..aac2c4868 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.150 -ARM_PATCHES = 4.14.150-ipfire0 +VER = 4.14.154 +ARM_PATCHES = 4.14.154-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 88 +PAK_VER = 89 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -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 = 61358e7be9bfc17adb4c418355d957db -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = e4931541ffe21dd29ca2447620de6693 +$(DL_FILE)_MD5 = d6cf4b51c1cd10bc48bac50f4557a0d9 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 539737e07e5634565b3f4f1b932c269b install : $(TARGET) diff --git a/make.sh b/make.sh index 170b16504..2377c40ce 100755 --- a/make.sh +++ b/make.sh @@ -26,8 +26,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.23" # Version number -CORE="137" # Core Level (Filename) -PAKFIRE_CORE="137" # Core Level (PAKFIRE) +CORE="138" # Core Level (Filename) +PAKFIRE_CORE="138" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. aee6dd0ba45cf12f014050bbab234d9e4b0d03ab
by Arne Fitzenreiter 14 Nov '19

14 Nov '19

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 aee6dd0ba45cf12f014050bbab234d9e4b0d03ab (commit) via 44b227b102964e520369d8628db342e68551966f (commit) via b007a35292928d150fcbe0053bd21e9fe6eebe0e (commit) from 9e5434d4bf822ba7c62cb8917ec8692b9aa68143 (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 aee6dd0ba45cf12f014050bbab234d9e4b0d03ab Merge: 44b227b10 9e5434d4b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 22:13:23 2019 +0100 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 44b227b102964e520369d8628db342e68551966f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 22:12:12 2019 +0100 kernel: update to 4.14.154 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b007a35292928d150fcbe0053bd21e9fe6eebe0e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 22:10:04 2019 +0100 vulnearabilities.cgi: add tsx async abort and itlb_multihit Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 4 +++- config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 ++- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 ++- config/kernel/kernel.config.i586-ipfire | 6 +++++- config/kernel/kernel.config.i586-ipfire-pae | 6 +++++- config/kernel/kernel.config.x86_64-ipfire | 6 +++++- config/rootfiles/common/aarch64/linux | 2 ++ config/rootfiles/common/armv5tel/linux-kirkwood | 2 ++ config/rootfiles/common/armv5tel/linux-multi | 2 ++ config/rootfiles/common/i586/linux | 10 +++++----- config/rootfiles/common/x86_64/linux | 10 +++++----- config/rootfiles/packages/linux-pae | 10 +++++----- html/cgi-bin/vulnerabilities.cgi | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ lfs/linux | 10 +++++----- 15 files changed, 52 insertions(+), 26 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 778b05a9a..e79403bc7 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.150-ipfire Kernel Configuration +# Linux/arm64 4.14.154-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -1456,6 +1456,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y @@ -6822,6 +6823,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CPU_RMAP=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index fcbac3bcd..2bfb7ff36 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.150-ipfire-kirkwood Kernel Configuration +# Linux/arm 4.14.154-ipfire-kirkwood Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -6235,6 +6235,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_DQL=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index fc74eb142..7e9de39ea 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.150-ipfire-multi Kernel Configuration +# Linux/arm 4.14.154-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -7318,6 +7318,7 @@ CONFIG_TEXTSEARCH_FSM=m CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CPU_RMAP=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 4eaae6f74..2732bba42 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.150-ipfire Kernel Configuration +# Linux/x86 4.14.154-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -601,6 +601,9 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -7024,6 +7027,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CHECK_SIGNATURE=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 526adbbcb..9b53ab35c 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.150-ipfire-pae Kernel Configuration +# Linux/x86 4.14.154-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -619,6 +619,9 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -7029,6 +7032,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CHECK_SIGNATURE=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index c9563234e..2fcf1e589 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.150-ipfire Kernel Configuration +# Linux/x86 4.14.154-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -611,6 +611,9 @@ CONFIG_ARCH_RANDOM=y CONFIG_X86_SMAP=y # CONFIG_X86_INTEL_MPX is not set CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_MIXED=y @@ -6909,6 +6912,7 @@ CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y +CONFIG_SGL_ALLOC=y # CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_VIRT_OPS is not set CONFIG_CHECK_SIGNATURE=y diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index d8e93542d..f9dc8555b 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -9821,6 +9821,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sg/pool.h #lib/modules/KVER-ipfire/build/include/config/sgetmask #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire/build/include/config/sgl +#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire/build/include/config/shmem.h #lib/modules/KVER-ipfire/build/include/config/signalfd.h #lib/modules/KVER-ipfire/build/include/config/simple diff --git a/config/rootfiles/common/armv5tel/linux-kirkwood b/config/rootfiles/common/armv5tel/linux-kirkwood index 2269896d8..9ccc006b9 100644 --- a/config/rootfiles/common/armv5tel/linux-kirkwood +++ b/config/rootfiles/common/armv5tel/linux-kirkwood @@ -9329,6 +9329,8 @@ boot/vmlinuz-KVER-ipfire-kirkwood #lib/modules/KVER-ipfire-kirkwood/build/include/config/sg/pool.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/sgetmask #lib/modules/KVER-ipfire-kirkwood/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire-kirkwood/build/include/config/sgl +#lib/modules/KVER-ipfire-kirkwood/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/shmem.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/signalfd.h #lib/modules/KVER-ipfire-kirkwood/build/include/config/simple diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index 1e7a090d9..890e3be21 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -10752,6 +10752,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire-multi/build/include/config/sg/pool.h #lib/modules/KVER-ipfire-multi/build/include/config/sgetmask #lib/modules/KVER-ipfire-multi/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire-multi/build/include/config/sgl +#lib/modules/KVER-ipfire-multi/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire-multi/build/include/config/shmem.h #lib/modules/KVER-ipfire-multi/build/include/config/signalfd.h #lib/modules/KVER-ipfire-multi/build/include/config/simple diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 1fe01233f..684dbe07b 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -10838,6 +10838,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sg/pool.h #lib/modules/KVER-ipfire/build/include/config/sgetmask #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire/build/include/config/sgl +#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire/build/include/config/shmem.h #lib/modules/KVER-ipfire/build/include/config/signalfd.h #lib/modules/KVER-ipfire/build/include/config/sis190.h @@ -12164,6 +12166,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/x86/intel/mid.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/quark.h +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/off.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/usercopy.h #lib/modules/KVER-ipfire/build/include/config/x86/internode #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache @@ -14027,7 +14032,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/net.h #lib/modules/KVER-ipfire/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire/build/include/linux/netfilter #lib/modules/KVER-ipfire/build/include/linux/netfilter.h #lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset @@ -14773,7 +14777,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/sizes.h #lib/modules/KVER-ipfire/build/include/linux/skb_array.h #lib/modules/KVER-ipfire/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire/build/include/linux/slab.h #lib/modules/KVER-ipfire/build/include/linux/slab_def.h #lib/modules/KVER-ipfire/build/include/linux/slub_def.h @@ -15587,7 +15590,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/net/route.h #lib/modules/KVER-ipfire/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire/build/include/net/scm.h #lib/modules/KVER-ipfire/build/include/net/sctp #lib/modules/KVER-ipfire/build/include/net/sctp/auth.h @@ -17242,9 +17244,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/ncsi/Makefile #lib/modules/KVER-ipfire/build/net/netfilter #lib/modules/KVER-ipfire/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire/build/net/netfilter/ipset #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 68f907faa..f44266e52 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -10850,6 +10850,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/sg/pool.h #lib/modules/KVER-ipfire/build/include/config/sgetmask #lib/modules/KVER-ipfire/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire/build/include/config/sgl +#lib/modules/KVER-ipfire/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire/build/include/config/shmem.h #lib/modules/KVER-ipfire/build/include/config/signalfd.h #lib/modules/KVER-ipfire/build/include/config/sis190.h @@ -12122,6 +12124,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/x86/intel/memory/protection #lib/modules/KVER-ipfire/build/include/config/x86/intel/memory/protection/keys.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/auto.h #lib/modules/KVER-ipfire/build/include/config/x86/internode #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache/shift.h @@ -14042,7 +14047,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/net.h #lib/modules/KVER-ipfire/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire/build/include/linux/netfilter #lib/modules/KVER-ipfire/build/include/linux/netfilter.h #lib/modules/KVER-ipfire/build/include/linux/netfilter/ipset @@ -14788,7 +14792,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/linux/sizes.h #lib/modules/KVER-ipfire/build/include/linux/skb_array.h #lib/modules/KVER-ipfire/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire/build/include/linux/slab.h #lib/modules/KVER-ipfire/build/include/linux/slab_def.h #lib/modules/KVER-ipfire/build/include/linux/slub_def.h @@ -15602,7 +15605,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/net/route.h #lib/modules/KVER-ipfire/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire/build/include/net/scm.h #lib/modules/KVER-ipfire/build/include/net/sctp #lib/modules/KVER-ipfire/build/include/net/sctp/auth.h @@ -17257,9 +17259,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/ncsi/Makefile #lib/modules/KVER-ipfire/build/net/netfilter #lib/modules/KVER-ipfire/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire/build/net/netfilter/ipset #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire/build/net/netfilter/ipset/Makefile diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index f3966ce75..c0894cd1f 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -10836,6 +10836,8 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/sg/pool.h #lib/modules/KVER-ipfire-pae/build/include/config/sgetmask #lib/modules/KVER-ipfire-pae/build/include/config/sgetmask/syscall.h +#lib/modules/KVER-ipfire-pae/build/include/config/sgl +#lib/modules/KVER-ipfire-pae/build/include/config/sgl/alloc.h #lib/modules/KVER-ipfire-pae/build/include/config/shmem.h #lib/modules/KVER-ipfire-pae/build/include/config/signalfd.h #lib/modules/KVER-ipfire-pae/build/include/config/sis190.h @@ -12164,6 +12166,9 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/lpss.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/pstate.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/quark.h +#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx +#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx/mode +#lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/tsx/mode/off.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/intel/usercopy.h #lib/modules/KVER-ipfire-pae/build/include/config/x86/internode #lib/modules/KVER-ipfire-pae/build/include/config/x86/internode/cache @@ -14097,7 +14102,6 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/linux/net.h #lib/modules/KVER-ipfire-pae/build/include/linux/netdev_features.h #lib/modules/KVER-ipfire-pae/build/include/linux/netdevice.h -#lib/modules/KVER-ipfire-pae/build/include/linux/netdevice.h.orig #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter.h #lib/modules/KVER-ipfire-pae/build/include/linux/netfilter/ipset @@ -14843,7 +14847,6 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/linux/sizes.h #lib/modules/KVER-ipfire-pae/build/include/linux/skb_array.h #lib/modules/KVER-ipfire-pae/build/include/linux/skbuff.h -#lib/modules/KVER-ipfire-pae/build/include/linux/skbuff.h.orig #lib/modules/KVER-ipfire-pae/build/include/linux/slab.h #lib/modules/KVER-ipfire-pae/build/include/linux/slab_def.h #lib/modules/KVER-ipfire-pae/build/include/linux/slub_def.h @@ -15657,7 +15660,6 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/include/net/route.h #lib/modules/KVER-ipfire-pae/build/include/net/rtnetlink.h #lib/modules/KVER-ipfire-pae/build/include/net/sch_generic.h -#lib/modules/KVER-ipfire-pae/build/include/net/sch_generic.h.orig #lib/modules/KVER-ipfire-pae/build/include/net/scm.h #lib/modules/KVER-ipfire-pae/build/include/net/sctp #lib/modules/KVER-ipfire-pae/build/include/net/sctp/auth.h @@ -17312,9 +17314,7 @@ boot/vmlinuz-KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/build/net/ncsi/Makefile #lib/modules/KVER-ipfire-pae/build/net/netfilter #lib/modules/KVER-ipfire-pae/build/net/netfilter/Kconfig -#lib/modules/KVER-ipfire-pae/build/net/netfilter/Kconfig.orig #lib/modules/KVER-ipfire-pae/build/net/netfilter/Makefile -#lib/modules/KVER-ipfire-pae/build/net/netfilter/Makefile.orig #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset/Kconfig #lib/modules/KVER-ipfire-pae/build/net/netfilter/ipset/Makefile diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi index a8746c30c..333b03399 100644 --- a/html/cgi-bin/vulnerabilities.cgi +++ b/html/cgi-bin/vulnerabilities.cgi @@ -30,12 +30,14 @@ require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; my %VULNERABILITIES = ( + "itlb_multihit" => "$Lang::tr{'itlb multihit'} (CVE-2018-12207)", "l1tf" => "$Lang::tr{'foreshadow'} (CVE-2018-3620)", "mds" => "$Lang::tr{'fallout zombieload ridl'} (CVE-2018-12126, CVE-2018-12130, CVE-2018-12127, CVE-2019-11091)", "meltdown" => "$Lang::tr{'meltdown'} (CVE-2017-5754)", "spec_store_bypass" => "$Lang::tr{'spectre variant 4'} (CVE-2018-3639)", "spectre_v1" => "$Lang::tr{'spectre variant 1'} (CVE-2017-5753)", "spectre_v2" => "$Lang::tr{'spectre variant 2'} (CVE-2017-5715)", + "tsx_async_abort" => "$Lang::tr{'taa zombieload2'} (CVE-2019-11135)", ); my $errormessage = ""; diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 8b7e63cb8..b40ef9390 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1542,6 +1542,7 @@ 'isdn settings' => 'Additional ISDN settings:', 'isdn1' => 'Single ISDN', 'isdn2' => 'Dual ISDN', +'itlb multihit' => 'iTLB MultiHit', 'january' => 'January', 'javascript menu error1' => 'If the drop down menus aren\'t working, disable javascript on the', 'javascript menu error2' => 'page.', @@ -2322,6 +2323,7 @@ 'system logs' => 'System Logs', 'system status information' => 'System Status Information', 'ta key' => 'TLS-Authentification-Key', +'taa zombieload2' => 'TSX Async Abort / ZombieLoad v2', 'tcp more reliable' => 'TCP (more reliable)', 'telephone not set' => 'Telephone not set.', 'template' => 'Preset', diff --git a/lfs/linux b/lfs/linux index c8bcdbb97..aac2c4868 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.150 -ARM_PATCHES = 4.14.150-ipfire0 +VER = 4.14.154 +ARM_PATCHES = 4.14.154-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 88 +PAK_VER = 89 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -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 = 61358e7be9bfc17adb4c418355d957db -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = e4931541ffe21dd29ca2447620de6693 +$(DL_FILE)_MD5 = d6cf4b51c1cd10bc48bac50f4557a0d9 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 539737e07e5634565b3f4f1b932c269b install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9e5434d4bf822ba7c62cb8917ec8692b9aa68143
by Arne Fitzenreiter 14 Nov '19

14 Nov '19

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 9e5434d4bf822ba7c62cb8917ec8692b9aa68143 (commit) from 60490558f655b7184879f5574520852d3f08a6ee (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 9e5434d4bf822ba7c62cb8917ec8692b9aa68143 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 14 17:28:38 2019 +0000 rename core138 -> core139 to insert a emergency core update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{138 => 139}/exclude | 0 config/rootfiles/core/{138 => 139}/filelists/bash | 0 config/rootfiles/core/{138 => 139}/filelists/ca-certificates | 0 config/rootfiles/core/{138 => 139}/filelists/ddns | 0 config/rootfiles/core/{138 => 139}/filelists/files | 0 config/rootfiles/core/{138 => 139}/filelists/i586/intel-microcode | 0 config/rootfiles/core/{138 => 139}/filelists/i586/openssl-sse2 | 0 config/rootfiles/core/{138 => 139}/filelists/logwatch | 0 config/rootfiles/core/{138 => 139}/filelists/lz4 | 0 config/rootfiles/core/{138 => 139}/filelists/openssl | 0 config/rootfiles/core/{138 => 139}/filelists/openvpn | 0 config/rootfiles/core/{138 => 139}/filelists/readline | 0 config/rootfiles/core/{138 => 139}/filelists/readline-compat | 0 config/rootfiles/core/{138 => 139}/filelists/squid | 0 config/rootfiles/core/{138 => 139}/filelists/x86_64/intel-microcode | 0 config/rootfiles/core/{138 => 139}/update.sh | 2 +- 16 files changed, 1 insertion(+), 1 deletion(-) rename config/rootfiles/core/{138 => 139}/exclude (100%) rename config/rootfiles/core/{138 => 139}/filelists/bash (100%) rename config/rootfiles/core/{138 => 139}/filelists/ca-certificates (100%) rename config/rootfiles/core/{138 => 139}/filelists/ddns (100%) rename config/rootfiles/core/{138 => 139}/filelists/files (100%) rename config/rootfiles/core/{138 => 139}/filelists/i586/intel-microcode (100%) rename config/rootfiles/core/{138 => 139}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/core/{138 => 139}/filelists/logwatch (100%) rename config/rootfiles/core/{138 => 139}/filelists/lz4 (100%) rename config/rootfiles/core/{138 => 139}/filelists/openssl (100%) rename config/rootfiles/core/{138 => 139}/filelists/openvpn (100%) rename config/rootfiles/core/{138 => 139}/filelists/readline (100%) rename config/rootfiles/core/{138 => 139}/filelists/readline-compat (100%) rename config/rootfiles/core/{138 => 139}/filelists/squid (100%) rename config/rootfiles/core/{138 => 139}/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/core/{138 => 139}/update.sh (99%) Difference in files: diff --git a/config/rootfiles/core/138/exclude b/config/rootfiles/core/139/exclude similarity index 100% rename from config/rootfiles/core/138/exclude rename to config/rootfiles/core/139/exclude diff --git a/config/rootfiles/core/138/filelists/bash b/config/rootfiles/core/139/filelists/bash similarity index 100% rename from config/rootfiles/core/138/filelists/bash rename to config/rootfiles/core/139/filelists/bash diff --git a/config/rootfiles/core/138/filelists/ca-certificates b/config/rootfiles/core/139/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/138/filelists/ca-certificates rename to config/rootfiles/core/139/filelists/ca-certificates diff --git a/config/rootfiles/core/138/filelists/ddns b/config/rootfiles/core/139/filelists/ddns similarity index 100% rename from config/rootfiles/core/138/filelists/ddns rename to config/rootfiles/core/139/filelists/ddns diff --git a/config/rootfiles/core/138/filelists/files b/config/rootfiles/core/139/filelists/files similarity index 100% rename from config/rootfiles/core/138/filelists/files rename to config/rootfiles/core/139/filelists/files diff --git a/config/rootfiles/core/138/filelists/i586/intel-microcode b/config/rootfiles/core/139/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/138/filelists/i586/intel-microcode rename to config/rootfiles/core/139/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/138/filelists/i586/openssl-sse2 b/config/rootfiles/core/139/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/138/filelists/i586/openssl-sse2 rename to config/rootfiles/core/139/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/138/filelists/logwatch b/config/rootfiles/core/139/filelists/logwatch similarity index 100% rename from config/rootfiles/core/138/filelists/logwatch rename to config/rootfiles/core/139/filelists/logwatch diff --git a/config/rootfiles/core/138/filelists/lz4 b/config/rootfiles/core/139/filelists/lz4 similarity index 100% rename from config/rootfiles/core/138/filelists/lz4 rename to config/rootfiles/core/139/filelists/lz4 diff --git a/config/rootfiles/core/138/filelists/openssl b/config/rootfiles/core/139/filelists/openssl similarity index 100% rename from config/rootfiles/core/138/filelists/openssl rename to config/rootfiles/core/139/filelists/openssl diff --git a/config/rootfiles/core/138/filelists/openvpn b/config/rootfiles/core/139/filelists/openvpn similarity index 100% rename from config/rootfiles/core/138/filelists/openvpn rename to config/rootfiles/core/139/filelists/openvpn diff --git a/config/rootfiles/core/138/filelists/readline b/config/rootfiles/core/139/filelists/readline similarity index 100% rename from config/rootfiles/core/138/filelists/readline rename to config/rootfiles/core/139/filelists/readline diff --git a/config/rootfiles/core/138/filelists/readline-compat b/config/rootfiles/core/139/filelists/readline-compat similarity index 100% rename from config/rootfiles/core/138/filelists/readline-compat rename to config/rootfiles/core/139/filelists/readline-compat diff --git a/config/rootfiles/core/138/filelists/squid b/config/rootfiles/core/139/filelists/squid similarity index 100% rename from config/rootfiles/core/138/filelists/squid rename to config/rootfiles/core/139/filelists/squid diff --git a/config/rootfiles/core/138/filelists/x86_64/intel-microcode b/config/rootfiles/core/139/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/138/filelists/x86_64/intel-microcode rename to config/rootfiles/core/139/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/138/update.sh b/config/rootfiles/core/139/update.sh similarity index 99% rename from config/rootfiles/core/138/update.sh rename to config/rootfiles/core/139/update.sh index 5ba7e330f..fb3105aa0 100644 --- a/config/rootfiles/core/138/update.sh +++ b/config/rootfiles/core/139/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -core=138 +core=139 exit_with_error() { # Set last succesfull installed core. hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM November 2019