IPFire-SCM April 2020

ipfire-scm@lists.ipfire.org

1 participants
46 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core143, created. 651fa25f8f4764c1280b9355ed0b410825321615
by Arne Fitzenreiter 17 Apr '20

17 Apr '20

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, core143 has been created at 651fa25f8f4764c1280b9355ed0b410825321615 (commit) - Log ----------------------------------------------------------------- commit 651fa25f8f4764c1280b9355ed0b410825321615 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 15:30:51 2020 +0000 haproxy: update config file Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f6a92fd85614fc03a07d21406a08505092b27a83 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 14 11:54:15 2020 +0000 haproxy: Update to 2.1.4 This is a security release: https://www.mail-archive.com/haproxy@formilux.org/msg36876.html Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b5fe45bbbc7d2babe0b66689abaffb9ad24ccc93 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 09:55:29 2020 +0000 core143: disable vnstat ramdisk before clean tag file 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. 03e4f8d60e5671bdc1ec90a829b1f389bcd0b8aa
by Arne Fitzenreiter 16 Apr '20

16 Apr '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 651fa25f8f4764c1280b9355ed0b410825321615
by Arne Fitzenreiter 14 Apr '20

14 Apr '20

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 651fa25f8f4764c1280b9355ed0b410825321615 (commit) from f6a92fd85614fc03a07d21406a08505092b27a83 (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 651fa25f8f4764c1280b9355ed0b410825321615 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 14 15:30:51 2020 +0000 haproxy: update config file Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/haproxy/haproxy.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/haproxy/haproxy.cfg b/config/haproxy/haproxy.cfg index 9d372f63f..32dff328f 100644 --- a/config/haproxy/haproxy.cfg +++ b/config/haproxy/haproxy.cfg @@ -60,7 +60,8 @@ defaults #--------------------------------------------------------------------- # main frontend which proxys to the backends #--------------------------------------------------------------------- -frontend main *:5000 +frontend main + bind *:5000 acl url_static path_beg -i /static /images /javascript /stylesheets acl url_static path_end -i .jpg .gif .png .css .js hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f6a92fd85614fc03a07d21406a08505092b27a83
by Arne Fitzenreiter 14 Apr '20

14 Apr '20

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 f6a92fd85614fc03a07d21406a08505092b27a83 (commit) from b5fe45bbbc7d2babe0b66689abaffb9ad24ccc93 (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 f6a92fd85614fc03a07d21406a08505092b27a83 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 14 11:54:15 2020 +0000 haproxy: Update to 2.1.4 This is a security release: https://www.mail-archive.com/haproxy@formilux.org/msg36876.html Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/haproxy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/haproxy b/lfs/haproxy index d326a090a..62a1c4d10 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -24,7 +24,7 @@ include Config -VER = 2.1.3 +VER = 2.1.4 THISAPP = haproxy-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 13 +PAK_VER = 14 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bea4726d8c99f5d9bac0e62906a1f2d0 +$(DL_FILE)_MD5 = 100cccf98aaf3ba80b5fd070866ad115 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b5fe45bbbc7d2babe0b66689abaffb9ad24ccc93
by Arne Fitzenreiter 14 Apr '20

14 Apr '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 296675c9ee3b984b5bfb5bdff032cdd2375639a3
by Arne Fitzenreiter 12 Apr '20

12 Apr '20

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 296675c9ee3b984b5bfb5bdff032cdd2375639a3 (commit) via b3e2c3ce269a0492e8e55208dc05dbf82977bfd4 (commit) from f5dba19edfdbc8f925b7fced7782d7bc3c58d998 (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 296675c9ee3b984b5bfb5bdff032cdd2375639a3 Merge: b3e2c3ce2 f5dba19ed Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 12 08:25:40 2020 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit b3e2c3ce269a0492e8e55208dc05dbf82977bfd4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 12 08:16:28 2020 +0200 dhcpcd: update to 9.00 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/dhcpcd | 4 +--- lfs/dhcpcd | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/dhcpcd b/config/rootfiles/common/dhcpcd index ffbe04ae4..672a47a30 100644 --- a/config/rootfiles/common/dhcpcd +++ b/config/rootfiles/common/dhcpcd @@ -6,12 +6,10 @@ sbin/dhcpcd #usr/share/man/man8/dhcpcd-run-hooks.8 #usr/share/man/man8/dhcpcd.8 var/ipfire/dhcpc/dhcpcd-hooks +#var/ipfire/dhcpc/dhcpcd-hooks/00-linux #var/ipfire/dhcpc/dhcpcd-hooks/01-test #var/ipfire/dhcpc/dhcpcd-hooks/02-dump #var/ipfire/dhcpc/dhcpcd-hooks/10-mtu -#var/ipfire/dhcpc/dhcpcd-hooks/10-wpa_supplicant -#var/ipfire/dhcpc/dhcpcd-hooks/15-timezone -#var/ipfire/dhcpc/dhcpcd-hooks/29-lookup-hostname #var/ipfire/dhcpc/dhcpcd-hooks/30-hostname #var/ipfire/dhcpc/dhcpcd-hooks/70-dhcpcd.exe var/ipfire/dhcpc/dhcpcd-run-hooks diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 83252e897..c9aa45b50 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 7.2.3 +VER = 9.0.0 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b7aade2cc47afa6d645f798103365402 +$(DL_FILE)_MD5 = 5360da47d4d51280dae35fe91958b63a install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f5dba19edfdbc8f925b7fced7782d7bc3c58d998
by Arne Fitzenreiter 12 Apr '20

12 Apr '20

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 89445161b066671398185384cc2a80843cc9dc04
by Arne Fitzenreiter 12 Apr '20

12 Apr '20

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 89445161b066671398185384cc2a80843cc9dc04 (commit) from b14b37ba67eb52e1423781a329e3ea459a1334f5 (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 89445161b066671398185384cc2a80843cc9dc04 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 12 08:14:26 2020 +0200 core144: start update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{143 => 144}/exclude | 0 .../{oldcore/113 => core/144}/filelists/files | 3 +-- .../rootfiles/{oldcore/140 => core/144}/update.sh | 22 ++++++++-------------- config/rootfiles/{core => oldcore}/143/exclude | 0 .../143/filelists/aarch64/binutils | 0 .../{core => oldcore}/143/filelists/aarch64/gcc | 0 .../{core => oldcore}/143/filelists/aarch64/glibc | 0 .../rootfiles/{core => oldcore}/143/filelists/apr | 0 .../143/filelists/armv5tel/binutils | 0 .../{core => oldcore}/143/filelists/armv5tel/gcc | 0 .../{core => oldcore}/143/filelists/armv5tel/glibc | 0 .../{core => oldcore}/143/filelists/cairo | 0 .../{core => oldcore}/143/filelists/coreutils | 0 .../rootfiles/{core => oldcore}/143/filelists/dma | 0 .../{core => oldcore}/143/filelists/files | 0 .../{core => oldcore}/143/filelists/hwdata | 0 .../{core => oldcore}/143/filelists/i586/binutils | 0 .../{core => oldcore}/143/filelists/i586/gcc | 0 .../{core => oldcore}/143/filelists/i586/glibc | 0 .../143/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/143/filelists/libssh | 0 .../{core => oldcore}/143/filelists/libtool | 0 .../{core => oldcore}/143/filelists/logwatch | 0 .../rootfiles/{core => oldcore}/143/filelists/ntp | 0 .../{core => oldcore}/143/filelists/openssh | 0 .../{core => oldcore}/143/filelists/openssl | 0 .../rootfiles/{core => oldcore}/143/filelists/pcre | 0 .../{core => oldcore}/143/filelists/smartmontools | 0 .../{core => oldcore}/143/filelists/strongswan | 0 .../{core => oldcore}/143/filelists/unbound | 0 .../143/filelists/x86_64/binutils | 0 .../{core => oldcore}/143/filelists/x86_64/gcc | 0 .../{core => oldcore}/143/filelists/x86_64/glibc | 0 .../rootfiles/{core => oldcore}/143/filelists/xz | 0 config/rootfiles/{core => oldcore}/143/update.sh | 0 html/cgi-bin/credits.cgi | 3 ++- make.sh | 2 +- 37 files changed, 12 insertions(+), 18 deletions(-) copy config/rootfiles/core/{143 => 144}/exclude (100%) copy config/rootfiles/{oldcore/113 => core/144}/filelists/files (51%) copy config/rootfiles/{oldcore/140 => core/144}/update.sh (89%) rename config/rootfiles/{core => oldcore}/143/exclude (100%) rename config/rootfiles/{core => oldcore}/143/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/apr (100%) rename config/rootfiles/{core => oldcore}/143/filelists/armv5tel/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/cairo (100%) rename config/rootfiles/{core => oldcore}/143/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/143/filelists/files (100%) rename config/rootfiles/{core => oldcore}/143/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/143/filelists/libssh (100%) rename config/rootfiles/{core => oldcore}/143/filelists/libtool (100%) rename config/rootfiles/{core => oldcore}/143/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/143/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/143/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/143/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/143/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/143/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/143/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/143/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/143/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/143/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/143/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/143/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/143/exclude b/config/rootfiles/core/144/exclude similarity index 100% rename from config/rootfiles/core/143/exclude rename to config/rootfiles/core/144/exclude diff --git a/config/rootfiles/core/144/filelists/files b/config/rootfiles/core/144/filelists/files new file mode 100644 index 000000000..ce4e51768 --- /dev/null +++ b/config/rootfiles/core/144/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/144/update.sh b/config/rootfiles/core/144/update.sh new file mode 100644 index 000000000..6a9c51931 --- /dev/null +++ b/config/rootfiles/core/144/update.sh @@ -0,0 +1,80 @@ +#!/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) 2020 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=144 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # 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 + +# Start services + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# 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/oldcore/143/exclude b/config/rootfiles/oldcore/143/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/143/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/143/filelists/aarch64/binutils b/config/rootfiles/oldcore/143/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/aarch64/binutils rename to config/rootfiles/oldcore/143/filelists/aarch64/binutils diff --git a/config/rootfiles/core/143/filelists/aarch64/gcc b/config/rootfiles/oldcore/143/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/aarch64/gcc rename to config/rootfiles/oldcore/143/filelists/aarch64/gcc diff --git a/config/rootfiles/core/143/filelists/aarch64/glibc b/config/rootfiles/oldcore/143/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/aarch64/glibc rename to config/rootfiles/oldcore/143/filelists/aarch64/glibc diff --git a/config/rootfiles/core/143/filelists/apr b/config/rootfiles/oldcore/143/filelists/apr similarity index 100% rename from config/rootfiles/core/143/filelists/apr rename to config/rootfiles/oldcore/143/filelists/apr diff --git a/config/rootfiles/core/143/filelists/armv5tel/binutils b/config/rootfiles/oldcore/143/filelists/armv5tel/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/armv5tel/binutils rename to config/rootfiles/oldcore/143/filelists/armv5tel/binutils diff --git a/config/rootfiles/core/143/filelists/armv5tel/gcc b/config/rootfiles/oldcore/143/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/armv5tel/gcc rename to config/rootfiles/oldcore/143/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/143/filelists/armv5tel/glibc b/config/rootfiles/oldcore/143/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/143/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/143/filelists/cairo b/config/rootfiles/oldcore/143/filelists/cairo similarity index 100% rename from config/rootfiles/core/143/filelists/cairo rename to config/rootfiles/oldcore/143/filelists/cairo diff --git a/config/rootfiles/core/143/filelists/coreutils b/config/rootfiles/oldcore/143/filelists/coreutils similarity index 100% rename from config/rootfiles/core/143/filelists/coreutils rename to config/rootfiles/oldcore/143/filelists/coreutils diff --git a/config/rootfiles/core/143/filelists/dma b/config/rootfiles/oldcore/143/filelists/dma similarity index 100% rename from config/rootfiles/core/143/filelists/dma rename to config/rootfiles/oldcore/143/filelists/dma diff --git a/config/rootfiles/core/143/filelists/files b/config/rootfiles/oldcore/143/filelists/files similarity index 100% rename from config/rootfiles/core/143/filelists/files rename to config/rootfiles/oldcore/143/filelists/files diff --git a/config/rootfiles/core/143/filelists/hwdata b/config/rootfiles/oldcore/143/filelists/hwdata similarity index 100% rename from config/rootfiles/core/143/filelists/hwdata rename to config/rootfiles/oldcore/143/filelists/hwdata diff --git a/config/rootfiles/core/143/filelists/i586/binutils b/config/rootfiles/oldcore/143/filelists/i586/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/i586/binutils rename to config/rootfiles/oldcore/143/filelists/i586/binutils diff --git a/config/rootfiles/core/143/filelists/i586/gcc b/config/rootfiles/oldcore/143/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/i586/gcc rename to config/rootfiles/oldcore/143/filelists/i586/gcc diff --git a/config/rootfiles/core/143/filelists/i586/glibc b/config/rootfiles/oldcore/143/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/i586/glibc rename to config/rootfiles/oldcore/143/filelists/i586/glibc diff --git a/config/rootfiles/core/143/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/143/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/143/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/143/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/143/filelists/libssh b/config/rootfiles/oldcore/143/filelists/libssh similarity index 100% rename from config/rootfiles/core/143/filelists/libssh rename to config/rootfiles/oldcore/143/filelists/libssh diff --git a/config/rootfiles/core/143/filelists/libtool b/config/rootfiles/oldcore/143/filelists/libtool similarity index 100% rename from config/rootfiles/core/143/filelists/libtool rename to config/rootfiles/oldcore/143/filelists/libtool diff --git a/config/rootfiles/core/143/filelists/logwatch b/config/rootfiles/oldcore/143/filelists/logwatch similarity index 100% rename from config/rootfiles/core/143/filelists/logwatch rename to config/rootfiles/oldcore/143/filelists/logwatch diff --git a/config/rootfiles/core/143/filelists/ntp b/config/rootfiles/oldcore/143/filelists/ntp similarity index 100% rename from config/rootfiles/core/143/filelists/ntp rename to config/rootfiles/oldcore/143/filelists/ntp diff --git a/config/rootfiles/core/143/filelists/openssh b/config/rootfiles/oldcore/143/filelists/openssh similarity index 100% rename from config/rootfiles/core/143/filelists/openssh rename to config/rootfiles/oldcore/143/filelists/openssh diff --git a/config/rootfiles/core/143/filelists/openssl b/config/rootfiles/oldcore/143/filelists/openssl similarity index 100% rename from config/rootfiles/core/143/filelists/openssl rename to config/rootfiles/oldcore/143/filelists/openssl diff --git a/config/rootfiles/core/143/filelists/pcre b/config/rootfiles/oldcore/143/filelists/pcre similarity index 100% rename from config/rootfiles/core/143/filelists/pcre rename to config/rootfiles/oldcore/143/filelists/pcre diff --git a/config/rootfiles/core/143/filelists/smartmontools b/config/rootfiles/oldcore/143/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/143/filelists/smartmontools rename to config/rootfiles/oldcore/143/filelists/smartmontools diff --git a/config/rootfiles/core/143/filelists/strongswan b/config/rootfiles/oldcore/143/filelists/strongswan similarity index 100% rename from config/rootfiles/core/143/filelists/strongswan rename to config/rootfiles/oldcore/143/filelists/strongswan diff --git a/config/rootfiles/core/143/filelists/unbound b/config/rootfiles/oldcore/143/filelists/unbound similarity index 100% rename from config/rootfiles/core/143/filelists/unbound rename to config/rootfiles/oldcore/143/filelists/unbound diff --git a/config/rootfiles/core/143/filelists/x86_64/binutils b/config/rootfiles/oldcore/143/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/143/filelists/x86_64/binutils rename to config/rootfiles/oldcore/143/filelists/x86_64/binutils diff --git a/config/rootfiles/core/143/filelists/x86_64/gcc b/config/rootfiles/oldcore/143/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/143/filelists/x86_64/gcc rename to config/rootfiles/oldcore/143/filelists/x86_64/gcc diff --git a/config/rootfiles/core/143/filelists/x86_64/glibc b/config/rootfiles/oldcore/143/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/143/filelists/x86_64/glibc rename to config/rootfiles/oldcore/143/filelists/x86_64/glibc diff --git a/config/rootfiles/core/143/filelists/xz b/config/rootfiles/oldcore/143/filelists/xz similarity index 100% rename from config/rootfiles/core/143/filelists/xz rename to config/rootfiles/oldcore/143/filelists/xz diff --git a/config/rootfiles/core/143/update.sh b/config/rootfiles/oldcore/143/update.sh similarity index 100% rename from config/rootfiles/core/143/update.sh rename to config/rootfiles/oldcore/143/update.sh diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index f4f22e1a2..cecc1c197 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -63,8 +63,8 @@ print <<END Michael Tremer, Arne Fitzenreiter, Christian Schmidt, -Alexander Marx, Stefan Schantl, +Alexander Marx, Matthias Fischer, Peter Müller, Jan Paul Tücking, @@ -128,6 +128,7 @@ Julian McConnell, Kay-Michael Köhler, Kim Wölfel, Logan Schmidt, +Markus Untersee, Nico Prenzel, Oliver Fuhrer, Osmar Gonzalez, diff --git a/make.sh b/make.sh index c250d56fc..03eba4ac8 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ 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.25" # Version number -CORE="143" # Core Level (Filename) +CORE="144" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b14b37ba67eb52e1423781a329e3ea459a1334f5
by Arne Fitzenreiter 10 Apr '20

10 Apr '20

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 b14b37ba67eb52e1423781a329e3ea459a1334f5 (commit) via 975bd8bc17421a4a72b8263be99d8cce6fe5606d (commit) from e7fcf874e7f36d82e5e8c5fd54d8ea321b852186 (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 b14b37ba67eb52e1423781a329e3ea459a1334f5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 10 21:41:14 2020 +0200 OpenSSH: fix login on i?86 glibc calls clock_nanosleep_time64 syscall even if it not defined in the headers for this arch and the seccomp filter kills the process with because an unknown syscall. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 975bd8bc17421a4a72b8263be99d8cce6fe5606d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 10 16:23:09 2020 +0200 Revert "Revert "OpenSSH: update to 8.2p1"" This reverts commit e7fcf874e7f36d82e5e8c5fd54d8ea321b852186. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssh | 2 ++ lfs/openssh | 7 ++++--- .../OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch | 13 +++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch Difference in files: diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index b41190a47..f2f8ea6c5 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -21,6 +21,7 @@ usr/bin/ssh-keyscan usr/lib/openssh/sftp-server usr/lib/openssh/ssh-keysign usr/lib/openssh/ssh-pkcs11-helper +usr/lib/openssh/ssh-sk-helper usr/sbin/sshd #usr/share/man/man1/scp.1 #usr/share/man/man1/sftp.1 @@ -35,4 +36,5 @@ usr/sbin/sshd #usr/share/man/man8/sftp-server.8 #usr/share/man/man8/ssh-keysign.8 #usr/share/man/man8/ssh-pkcs11-helper.8 +#usr/share/man/man8/ssh-sk-helper.8 #usr/share/man/man8/sshd.8 diff --git a/lfs/openssh b/lfs/openssh index 64e72d654..2f3eda74f 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 8.1p1 +VER = 8.2p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 513694343631a99841e815306806edf0 +$(DL_FILE)_MD5 = 3076e6413e8dbe56d33848c1054ac091 install : $(TARGET) @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/ssh \ diff --git a/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch b/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch new file mode 100644 index 000000000..5199872d9 --- /dev/null +++ b/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch @@ -0,0 +1,13 @@ +diff -Naur openssh-8.2p1.org/sandbox-seccomp-filter.c openssh-8.2p1/sandbox-seccomp-filter.c +--- openssh-8.2p1.org/sandbox-seccomp-filter.c 2020-04-10 18:14:56.152309584 +0200 ++++ openssh-8.2p1/sandbox-seccomp-filter.c 2020-04-10 21:05:45.827921765 +0200 +@@ -253,6 +253,9 @@ + #endif + #ifdef __NR_clock_nanosleep_time64 + SC_ALLOW(__NR_clock_nanosleep_time64), ++#else ++ /* on i586 glibc call syscall 407 which is not defined */ ++ SC_ALLOW(407), + #endif + #ifdef __NR_clock_gettime64 + SC_ALLOW(__NR_clock_gettime64), hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b14b37ba67eb52e1423781a329e3ea459a1334f5
by Arne Fitzenreiter 10 Apr '20

10 Apr '20

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 b14b37ba67eb52e1423781a329e3ea459a1334f5 (commit) via 975bd8bc17421a4a72b8263be99d8cce6fe5606d (commit) from e7fcf874e7f36d82e5e8c5fd54d8ea321b852186 (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 b14b37ba67eb52e1423781a329e3ea459a1334f5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 10 21:41:14 2020 +0200 OpenSSH: fix login on i?86 glibc calls clock_nanosleep_time64 syscall even if it not defined in the headers for this arch and the seccomp filter kills the process with because an unknown syscall. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 975bd8bc17421a4a72b8263be99d8cce6fe5606d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 10 16:23:09 2020 +0200 Revert "Revert "OpenSSH: update to 8.2p1"" This reverts commit e7fcf874e7f36d82e5e8c5fd54d8ea321b852186. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openssh | 2 ++ lfs/openssh | 7 ++++--- .../OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch | 13 +++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch Difference in files: diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index b41190a47..f2f8ea6c5 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -21,6 +21,7 @@ usr/bin/ssh-keyscan usr/lib/openssh/sftp-server usr/lib/openssh/ssh-keysign usr/lib/openssh/ssh-pkcs11-helper +usr/lib/openssh/ssh-sk-helper usr/sbin/sshd #usr/share/man/man1/scp.1 #usr/share/man/man1/sftp.1 @@ -35,4 +36,5 @@ usr/sbin/sshd #usr/share/man/man8/sftp-server.8 #usr/share/man/man8/ssh-keysign.8 #usr/share/man/man8/ssh-pkcs11-helper.8 +#usr/share/man/man8/ssh-sk-helper.8 #usr/share/man/man8/sshd.8 diff --git a/lfs/openssh b/lfs/openssh index 64e72d654..2f3eda74f 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 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 # @@ -24,7 +24,7 @@ include Config -VER = 8.1p1 +VER = 8.2p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 513694343631a99841e815306806edf0 +$(DL_FILE)_MD5 = 3076e6413e8dbe56d33848c1054ac091 install : $(TARGET) @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/ssh \ diff --git a/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch b/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch new file mode 100644 index 000000000..5199872d9 --- /dev/null +++ b/src/patches/OpenSSH-8.2p1_glibc-2.31_clock_nanosleep_time64.patch @@ -0,0 +1,13 @@ +diff -Naur openssh-8.2p1.org/sandbox-seccomp-filter.c openssh-8.2p1/sandbox-seccomp-filter.c +--- openssh-8.2p1.org/sandbox-seccomp-filter.c 2020-04-10 18:14:56.152309584 +0200 ++++ openssh-8.2p1/sandbox-seccomp-filter.c 2020-04-10 21:05:45.827921765 +0200 +@@ -253,6 +253,9 @@ + #endif + #ifdef __NR_clock_nanosleep_time64 + SC_ALLOW(__NR_clock_nanosleep_time64), ++#else ++ /* on i586 glibc call syscall 407 which is not defined */ ++ SC_ALLOW(407), + #endif + #ifdef __NR_clock_gettime64 + SC_ALLOW(__NR_clock_gettime64), 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 April 2020