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 fa2f6cb6df9fbbf4ddbd7f7bfcfbc995f6d1e9cc (commit) via a8b6a72bbea74f4e4e72c41db7cf1bec1c5c65aa (commit) via a5005cf4d79deb220caa01f488c4cc0d9b26ab98 (commit) via f5acea32b90e1b7ae99fedf7eba404564f3afe73 (commit) via 024220e4dfc5993d5d64abfced918340f729fe62 (commit) via 726e227876908e58af35815bc9bfaf049431fa55 (commit) from 0c3913630d15dbc7e4ac05486899a789d7ab4a12 (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 fa2f6cb6df9fbbf4ddbd7f7bfcfbc995f6d1e9cc Author: Peter Müller peter.mueller@ipfire.org Date: Fri Feb 3 16:07:55 2023 +0000

Core Update 173: Ship and restart OpenSSH

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit a8b6a72bbea74f4e4e72c41db7cf1bec1c5c65aa Author: Peter Müller peter.mueller@ipfire.org Date: Fri Feb 3 16:06:27 2023 +0000

OpenSSH: Update to 9.2p1

Please refer to https://www.openssh.com/releasenotes.html#9.2 for the release notes of this version.

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit a5005cf4d79deb220caa01f488c4cc0d9b26ab98 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Feb 3 16:02:50 2023 +0000

Core Update 173: Ship lsof

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit f5acea32b90e1b7ae99fedf7eba404564f3afe73 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Feb 3 16:02:31 2023 +0000

Core Update 173: Ship libtirpc

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 024220e4dfc5993d5d64abfced918340f729fe62 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Jan 27 15:30:02 2023 +0100

libtirpc: Convert from an addon to a core program - fixes Bug 13015

- libtirpc is required for lsof to work from CU172 onwards. rpc.h is no longer available from glibc. This would normally cause the lsof build to fail but libtirpc as an addon is built before lsof and so is present in the build and lsof is linked to it. When running lsof it fails as the linked libtirpc library is not present unless it has been installed as an addon. - This patch converts the libtirpc lfs from an addon to a core program and moves the rootfile from the packages directory to the common directory. - Tested out on my vm testbed. With CU172 lsof fails to run due to the missing libtirpc With the build based on this patch installed lsof works normally again. - Disabled the static library build in the configure options and updated the rootfile

Tested-by: Adolf Belka adolf.belka@ipfire.org Fixes: Bug#13015 Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org

commit 726e227876908e58af35815bc9bfaf049431fa55 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Feb 1 16:34:11 2023 +0000

kernel: update to 6.1.9

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

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

Summary of changes: config/rootfiles/{packages => common}/libtirpc | 1 - config/rootfiles/core/173/filelists/libtirpc | 1 + .../rootfiles/{oldcore/170 => core/173}/filelists/lsof | 0 .../{oldcore/100 => core/173}/filelists/openssh | 0 config/rootfiles/core/173/update.sh | 7 +++++++ lfs/libtirpc | 18 +++++++----------- lfs/linux | 4 ++-- lfs/openssh | 6 +++--- 8 files changed, 20 insertions(+), 17 deletions(-) rename config/rootfiles/{packages => common}/libtirpc (98%) create mode 120000 config/rootfiles/core/173/filelists/libtirpc copy config/rootfiles/{oldcore/170 => core/173}/filelists/lsof (100%) copy config/rootfiles/{oldcore/100 => core/173}/filelists/openssh (100%)

Difference in files: diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/common/libtirpc similarity index 98% rename from config/rootfiles/packages/libtirpc rename to config/rootfiles/common/libtirpc index ed7f33242..7e85a0a25 100644 --- a/config/rootfiles/packages/libtirpc +++ b/config/rootfiles/common/libtirpc @@ -34,7 +34,6 @@ etc/netconfig #usr/include/tirpc/rpcsvc #usr/include/tirpc/rpcsvc/crypt.h #usr/include/tirpc/rpcsvc/crypt.x -#usr/lib/libtirpc.a #usr/lib/libtirpc.la #usr/lib/libtirpc.so usr/lib/libtirpc.so.3 diff --git a/config/rootfiles/core/173/filelists/libtirpc b/config/rootfiles/core/173/filelists/libtirpc new file mode 120000 index 000000000..7ff318291 --- /dev/null +++ b/config/rootfiles/core/173/filelists/libtirpc @@ -0,0 +1 @@ +../../../common/libtirpc \ No newline at end of file diff --git a/config/rootfiles/core/173/filelists/lsof b/config/rootfiles/core/173/filelists/lsof new file mode 120000 index 000000000..1353d33e5 --- /dev/null +++ b/config/rootfiles/core/173/filelists/lsof @@ -0,0 +1 @@ +../../../common/lsof \ No newline at end of file diff --git a/config/rootfiles/core/173/filelists/openssh b/config/rootfiles/core/173/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/173/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/core/173/update.sh index fb7959d2c..c2bfe25b1 100644 --- a/config/rootfiles/core/173/update.sh +++ b/config/rootfiles/core/173/update.sh @@ -48,6 +48,7 @@ done /etc/rc.d/init.d/ipsec stop /usr/local/bin/openvpnctrl -k /usr/local/bin/openvpnctrl -kn2n +/etc/rc.d/init.d/sshd stop

KVER="xxxKVERxxx"

@@ -130,8 +131,14 @@ done # Filesytem cleanup /usr/local/bin/filesystem-cleanup

+# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + # Start services /etc/rc.d/init.d/apache start +if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then + /etc/init.d/sshd start +fi if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then /usr/local/bin/openvpnctrl -s /usr/local/bin/openvpnctrl -sn2n diff --git a/lfs/libtirpc b/lfs/libtirpc index ac897f2eb..09d7b6555 100644 --- a/lfs/libtirpc +++ b/lfs/libtirpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -33,12 +33,6 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libtirpc -PAK_VER = 3 - -DEPS = - -SERVICES =

CFLAGS += -fcommon

@@ -60,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

b2 : $(subst %,%_BLAKE2,$(objects))

-dist: - @$(PAK) - ############################################################################### # Downloading, checking, b2sum ############################################################################### @@ -84,7 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6 + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-gssapi \ + --disable-ipv6 \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/linux b/lfs/linux index 49afc7a2f..35e5cc05e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@

include Config

-VER = 6.1.8 +VER = 6.1.9 ARM_PATCHES = 6.1.y-ipfire0

THISAPP = linux-$(VER) @@ -78,7 +78,7 @@ 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)_BLAKE2 = 1eeab95bf09757131031ebeaa3fb66f01626ecfe3b72d0044176613d027ac6643c688a0bb8f4493ae6faa3d3bf0c89fcdff3c28d7b8375e59ed6e8bd6d856e44 +$(DL_FILE)_BLAKE2 = 6e511381b4e189bad3722ef8ac3a178e24f60c78e1614b1131f2ba000c452ad447d9c9ab028fa1d150188084aed36572188d8cb9d416409c4391c3be583952fa arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 3ef9a778c5c41ee8bf2942a48f63b21228a632a2910d2123f01155bbf571592898cffffa61c387a5a6c817b62e458947b4c406c6591b23b5401faa47b020337f

install : $(TARGET) diff --git a/lfs/openssh b/lfs/openssh index 452676b70..89f486a79 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@

include Config

-VER = 9.1p1 +VER = 9.2p1

THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

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

-$(DL_FILE)_BLAKE2 = 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5 +$(DL_FILE)_BLAKE2 = 8d0b5e43cb42cba105a1fe303c447a2b85151cb33ec7ed47747d75c5a61d0f07f0ee4b1020b79c13eb8de4b451c5a844a8afc7ebbbea7ffeceafc3bf59cb8d21

install : $(TARGET)

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