IPFire-SCM September 2023

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a7b9b7a2eb9a842d72eacd11813853881a257f8
by Michael Tremer 28 Sep '23

28 Sep '23

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 3a7b9b7a2eb9a842d72eacd11813853881a257f8 (commit) via a98abe9290a7267b4258ab21e7fd735f48024d88 (commit) via 89604acef2a862d6098a90f93a04bfe03e6843f9 (commit) via a38402929e5c0c91fa14fe6c347bef9796099e8a (commit) from 91fe9748c92bd5a80e60b9467878f95da5bc7e8e (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 3a7b9b7a2eb9a842d72eacd11813853881a257f8 Merge: 91fe9748c a98abe929 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 28 10:43:48 2023 +0000 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libslirp | 7 +++++++ config/rootfiles/packages/qemu | 5 +++++ lfs/{libusbredir => libslirp} | 18 +++++++++++------- lfs/qemu | 11 ++++++----- lfs/qemu-ga | 4 ++-- make.sh | 1 + 6 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 config/rootfiles/packages/libslirp copy lfs/{libusbredir => libslirp} (88%) Difference in files: diff --git a/config/rootfiles/packages/libslirp b/config/rootfiles/packages/libslirp new file mode 100644 index 000000000..b50dad1ef --- /dev/null +++ b/config/rootfiles/packages/libslirp @@ -0,0 +1,7 @@ +#usr/include/slirp +#usr/include/slirp/libslirp-version.h +#usr/include/slirp/libslirp.h +#usr/lib/libslirp.so +usr/lib/libslirp.so.0 +usr/lib/libslirp.so.0.4.0 +#usr/lib/pkgconfig/slirp.pc diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index e69e28322..efc0cbd2e 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -18,7 +18,12 @@ usr/bin/qemu-system-i386 usr/bin/qemu-system-riscv64 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 +#usr/include/fdt.h +#usr/include/libfdt.h +#usr/include/libfdt_env.h usr/include/qemu-plugin.h +#usr/lib/libfdt.a +#usr/lib/pkgconfig/libfdt.pc usr/libexec/qemu-bridge-helper #usr/share/applications/qemu.desktop #usr/share/icons/hicolor/128x128/apps/qemu.png diff --git a/lfs/libslirp b/lfs/libslirp new file mode 100644 index 000000000..cdbb7981f --- /dev/null +++ b/lfs/libslirp @@ -0,0 +1,92 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +SUMMARY = A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services. + + +VER = 4.7.0 + +THISAPP = libslirp-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libslirp +PAK_VER = 1 + +DEPS = + +SERVICES = + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = ccea2413c1dc6148e80851496955d5a991f37e359dc30946fd901627ce5d100b4ea065189b87dd79f574f15cac0e7468063d347efac9251f7180d3d291b1b2e5 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/qemu b/lfs/qemu index 8af87e75e..1e46f14a1 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -27,7 +27,7 @@ include Config SUMMARY = Machine emulator and virtualizer # If you update the version also qemu-ga !!! -VER = 8.0.3 +VER = 8.1.1 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 39 +PAK_VER = 40 -DEPS = alsa elfutils libusbredir spice libseccomp +DEPS = alsa elfutils libusbredir spice libseccomp libslirp SERVICES = @@ -61,7 +61,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 +$(DL_FILE)_BLAKE2 = 71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340 install : $(TARGET) @@ -106,7 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-usb-redir \ --enable-seccomp \ --disable-docs \ - --disable-sdl + --disable-sdl \ + --enable-slirp cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/qemu-ga b/lfs/qemu-ga index db5bf8db8..b05f43a76 100644 --- a/lfs/qemu-ga +++ b/lfs/qemu-ga @@ -26,11 +26,11 @@ include Config SUMMARY = Guest agent for QEMU -VER = 8.0.3 +VER = 8.1.1 THISAPP = qemu-ga-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu-ga -PAK_VER = 5 +PAK_VER = 6 DEPS = diff --git a/make.sh b/make.sh index 1a948f8dd..e8aae4cf0 100755 --- a/make.sh +++ b/make.sh @@ -1494,6 +1494,7 @@ buildipfire() { lfsmake2 sdl2 lfsmake2 libusbredir lfsmake2 libseccomp + lfsmake2 libslirp lfsmake2 qemu lfsmake2 netsnmpd lfsmake2 nagios_nrpe hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. a98abe9290a7267b4258ab21e7fd735f48024d88
by Michael Tremer 28 Sep '23

28 Sep '23

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 a98abe9290a7267b4258ab21e7fd735f48024d88 (commit) via 89604acef2a862d6098a90f93a04bfe03e6843f9 (commit) via a38402929e5c0c91fa14fe6c347bef9796099e8a (commit) from 4322d0c7276f305db3bcf4f09889cb828e54b514 (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 a98abe9290a7267b4258ab21e7fd735f48024d88 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 28 12:37:01 2023 +0200 libslirp: Add the slirp library as this is required for the net user backend in qemu - Looking through some of the changelog and some mail list communications it looks like qemu decided they did noty want to maintain their own bundled version of libslirp when the majority of OS's had their own version now in place. Ubuntu 18.04 did not have libslirp but qemu stopped supporting that version from qemu-7.1 - So it looks like all OS's have a standard libslirp available now and qemu have taken the decision to no longer have their own version but to use the system version. That was always possible to do if use of the system version was explicitly defined but the default was to use the bundled version. - No evidence that libslirp is deprecated. - The last version of libslirp was released a year ago but it looks like every month or so there are a couple of commits merged. The last was a month ago. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 89604acef2a862d6098a90f93a04bfe03e6843f9 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 28 12:37:00 2023 +0200 qemu-ga: Update to version 8.1.1 - Update from version 8.0.3 to 8.1.1 - Update of rootfile not required - Changelog 8.1 https://wiki.qemu.org/ChangeLog/8.1 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a38402929e5c0c91fa14fe6c347bef9796099e8a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 28 12:36:59 2023 +0200 qemu: Update to version 8.1.1 and add libslirp for net user backend - Update from version 8.0.3 to 8.1.1 - In CU179 the update of qemu caused at least one user to have a problem starting his qemu system as the qemu bundled slirp library used for the net user backend was removed in version 7.2. Unfortunately no user tested qemu in the CU179 Testing phase, or if they did they are not using the net user backend. - This patch adds the --enable-slirp option to configure and installs libslirp in a separate patch. - I can't test if this now works as I don't use qemu anywhere. - Changelog is too large to include here. 8.1 https://wiki.qemu.org/ChangeLog/8.1 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libslirp | 7 +++++++ config/rootfiles/packages/qemu | 5 +++++ lfs/{libusbredir => libslirp} | 18 +++++++++++------- lfs/qemu | 11 ++++++----- lfs/qemu-ga | 4 ++-- make.sh | 1 + 6 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 config/rootfiles/packages/libslirp copy lfs/{libusbredir => libslirp} (88%) Difference in files: diff --git a/config/rootfiles/packages/libslirp b/config/rootfiles/packages/libslirp new file mode 100644 index 000000000..b50dad1ef --- /dev/null +++ b/config/rootfiles/packages/libslirp @@ -0,0 +1,7 @@ +#usr/include/slirp +#usr/include/slirp/libslirp-version.h +#usr/include/slirp/libslirp.h +#usr/lib/libslirp.so +usr/lib/libslirp.so.0 +usr/lib/libslirp.so.0.4.0 +#usr/lib/pkgconfig/slirp.pc diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index e69e28322..efc0cbd2e 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -18,7 +18,12 @@ usr/bin/qemu-system-i386 usr/bin/qemu-system-riscv64 usr/bin/qemu-system-x86_64 usr/bin/qemu-x86_64 +#usr/include/fdt.h +#usr/include/libfdt.h +#usr/include/libfdt_env.h usr/include/qemu-plugin.h +#usr/lib/libfdt.a +#usr/lib/pkgconfig/libfdt.pc usr/libexec/qemu-bridge-helper #usr/share/applications/qemu.desktop #usr/share/icons/hicolor/128x128/apps/qemu.png diff --git a/lfs/libslirp b/lfs/libslirp new file mode 100644 index 000000000..cdbb7981f --- /dev/null +++ b/lfs/libslirp @@ -0,0 +1,92 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +SUMMARY = A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services. + + +VER = 4.7.0 + +THISAPP = libslirp-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libslirp +PAK_VER = 1 + +DEPS = + +SERVICES = + + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = ccea2413c1dc6148e80851496955d5a991f37e359dc30946fd901627ce5d100b4ea065189b87dd79f574f15cac0e7468063d347efac9251f7180d3d291b1b2e5 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/qemu b/lfs/qemu index 8af87e75e..1e46f14a1 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -27,7 +27,7 @@ include Config SUMMARY = Machine emulator and virtualizer # If you update the version also qemu-ga !!! -VER = 8.0.3 +VER = 8.1.1 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 39 +PAK_VER = 40 -DEPS = alsa elfutils libusbredir spice libseccomp +DEPS = alsa elfutils libusbredir spice libseccomp libslirp SERVICES = @@ -61,7 +61,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 +$(DL_FILE)_BLAKE2 = 71220fad7c9f74bed6211879f01566ac1e52835feb3d45eaa1b2fe1d5f95d9fa5db53b7aec72b4ef098c03d0c4070076c907fb3e6b839002de6f56ee5ab44340 install : $(TARGET) @@ -106,7 +106,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-usb-redir \ --enable-seccomp \ --disable-docs \ - --disable-sdl + --disable-sdl \ + --enable-slirp cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/qemu-ga b/lfs/qemu-ga index db5bf8db8..b05f43a76 100644 --- a/lfs/qemu-ga +++ b/lfs/qemu-ga @@ -26,11 +26,11 @@ include Config SUMMARY = Guest agent for QEMU -VER = 8.0.3 +VER = 8.1.1 THISAPP = qemu-ga-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu-ga -PAK_VER = 5 +PAK_VER = 6 DEPS = diff --git a/make.sh b/make.sh index acb692140..7cab222af 100755 --- a/make.sh +++ b/make.sh @@ -1494,6 +1494,7 @@ buildipfire() { lfsmake2 sdl2 lfsmake2 libusbredir lfsmake2 libseccomp + lfsmake2 libslirp lfsmake2 qemu lfsmake2 netsnmpd lfsmake2 nagios_nrpe hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 91fe9748c92bd5a80e60b9467878f95da5bc7e8e
by Michael Tremer 28 Sep '23

28 Sep '23

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 94845e08bc2ca9e24e208630979bdcddb84b2682
by Michael Tremer 28 Sep '23

28 Sep '23

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 94845e08bc2ca9e24e208630979bdcddb84b2682 (commit) via 461ad995ae8b3443c35ae5a6e7a64d8f65e0995f (commit) via f8648b956351abb936bae94c9cce84b95b7ca23c (commit) via 8e6bf12f14c87854d311682d04e2269a6d96bbc3 (commit) via 475fd9e73a0c873df71929c55b205125a1651a7f (commit) via e0efec97ca1b8979a407865d97d86b44fb6dc859 (commit) via b725a6990fd9ad84273fea908fa7572f89ca0080 (commit) via 8c5e71db2a53b3b443598a53dd01e43832234ca5 (commit) via e5ad33d9eeffbdeb1abbf2575853d880890ed228 (commit) via 14bd32221ecb35fc919c6a808621c63cff423094 (commit) via db1ffe0f5f527e99355c8d14defe41ac37d96925 (commit) via 4322d0c7276f305db3bcf4f09889cb828e54b514 (commit) via 0f334f0ef36c8751fccbdbdbe3c1cae7b7306f7f (commit) via 6d5aecef8c4136fff8c9832324d4614b2b07c3c3 (commit) via 90147c2c330eccc64391cd05e5f2427d3ae11160 (commit) from 7f782be5e35a91d4a5d7e936799b561531f6ebfb (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 94845e08bc2ca9e24e208630979bdcddb84b2682 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 28 09:36:54 2023 +0000 core181: Fix arch-dependendant filelists I created those in a wrong place :( Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 461ad995ae8b3443c35ae5a6e7a64d8f65e0995f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 28 09:35:33 2023 +0000 core181: Ship OpenVPN changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f8648b956351abb936bae94c9cce84b95b7ca23c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Sep 25 18:41:56 2023 +0200 update.sh: Adds code to update an existing ovpnconfig with pass or no-pass - The code checks first if ovpnconfig exists and is not empty. - Then it makes all net2net connections no-pass since they do not use encryption - Then it cycles through all .p12 files and checks with openssl if a password exists or not. If a password is present then pass is added to index 41 and if not then no-pass is added to index 41 - I had to add a blank line to the top of the ovpnconfig file otherwise the awk code treated the first line as a blank line and missed it out of the update. This was the problem that was discovered during the previous Testing Release evaluation. Tested out this time with several existing entries both encrypted and insecure and with additional entries of both added in afterwards and all connection entries were maintained - road warrior and net2net. - This code should be left in update.sh for future Core Updates in case people don't update with Core Update 175 but leave it till later. This code works fine on code that already has pass or no-pass entered into index 41 in ovpnconfig Fixes: Bug#11048 Suggested-by: Erik Kapfer <ummeegge(a)ipfire.org> Suggested-by: Adolf Belka <adolf.belka(a)ipfire.org> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e6bf12f14c87854d311682d04e2269a6d96bbc3 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Sep 25 18:41:55 2023 +0200 web-user-interface: Addition of new icon for secure connection certificate download - This uses a padlock icon from https://commons.wikimedia.org/wiki/File:Encrypted.png - The license for this image is the following:- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library 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 version 2.1 and version 3 of the GNU Lesser General Public License for more details. - Based on the above license I believe it can be used by IPFire covered by the GNU General Public License that is used for it. - The icon image was made by taking the existing openvpn.png file and superimposing the padlock icon on top of it as a 12x12 pixel format and naming it openvpn_encrypted.png Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 475fd9e73a0c873df71929c55b205125a1651a7f Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Sep 25 18:41:54 2023 +0200 nl.pl: Change language text for secure icon wording Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e0efec97ca1b8979a407865d97d86b44fb6dc859 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Sep 25 18:41:53 2023 +0200 en.pl: Change language text for secure icon wording Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b725a6990fd9ad84273fea908fa7572f89ca0080 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Sep 25 18:41:52 2023 +0200 de.pl: Change language text for secure icon wording Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c5e71db2a53b3b443598a53dd01e43832234ca5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Sep 25 18:41:51 2023 +0200 ovpnmain.cgi: Fix for bug#11048 - insecure download icon shown for connections with a password - At long last I have re-visited the patch submission for bug #11048 and fixed the issues that caused the problems last time I evaluated it in Testing. - The insecure package download icon is shown if entry 41 in /var/ipfire/ovpn/ovpnconfig is set to no-pass. The code block on ovpnmain.cgi that deals with this checks if the connection is a host and if the first password entry is a null. Then it adds no-pass to ovpnconfig. - The same block of code is also used for when he connection is edited. However at this stage the password entry is back to null because the password value is only kept until the connection has been saved. Therefore doing an edit results in the password value being taken as null even for connections with a password. - This fix enters no-pass if the connection type is host and the password is null, pass if the connection type is host and the password has characters. If the connection type is net then no-pass is used as net2net connections dop not have encrypted certificates. - The code has been changed to show a different icon for unencrypted and encrypted certificates. - Separate patches are provided for the language file change, the provision of a new icon and the code for the update.sh script for the Core Update to update all existing connections, if any exist, to have either pass or no-pass in index 41. - This patch set was a joint collaboration between Erik Kapfer and Adolf Belka - Patch set, including the code for the Core Update 180 update.sh script has been tested on a vm testbed Fixes: Bug#11048 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Suggested-by: Adolf Belka <adolf.belka(a)ipfire.org> Suggested-by: Erik Kapfer <ummeegge(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e5ad33d9eeffbdeb1abbf2575853d880890ed228 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Sep 16 16:44:38 2023 +0200 kernel: update 6.1.53 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 14bd32221ecb35fc919c6a808621c63cff423094 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Sep 9 17:04:20 2023 +0200 kernel: update to 6.1.52 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit db1ffe0f5f527e99355c8d14defe41ac37d96925 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 28 09:25:16 2023 +0000 Start Core Update 181 (with a kernel) Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/extrahd/extrahd.pl | 17 +++++ config/kernel/kernel.config.aarch64-ipfire | 81 ++------------------- config/kernel/kernel.config.riscv64-ipfire | 79 ++------------------ config/kernel/kernel.config.x86_64-ipfire | 73 ++----------------- config/rootfiles/common/aarch64/linux | 4 +- config/rootfiles/common/bind | 14 ++-- config/rootfiles/common/riscv64/linux | 6 +- config/rootfiles/common/web-user-interface | 1 + config/rootfiles/common/x86_64/linux | 4 +- config/rootfiles/core/{180 => 181}/exclude | 0 .../124 => core/181}/filelists/aarch64/linux | 0 .../core/{180 => 181}/filelists/core-files | 0 config/rootfiles/core/181/filelists/files | 2 + config/rootfiles/core/181/filelists/riscv64/linux | 1 + .../100 => core/181}/filelists/x86_64/linux | 0 .../rootfiles/{oldcore/178 => core/181}/update.sh | 35 +++++++-- config/rootfiles/{core => oldcore}/180/exclude | 0 .../180/filelists/aarch64/binutils | 0 .../{core => oldcore}/180/filelists/aarch64/boost | 0 .../{core => oldcore}/180/filelists/aarch64/gcc | 0 .../{core => oldcore}/180/filelists/aarch64/glibc | 0 .../180/filelists/aarch64/util-linux | 0 .../rootfiles/oldcore/{100 => 180}/filelists/bind | 0 .../{core => oldcore}/180/filelists/core-files | 0 .../{core => oldcore}/180/filelists/dhcpcd | 0 .../{core => oldcore}/180/filelists/files | 1 + .../{core => oldcore}/180/filelists/freetype | 0 .../rootfiles/{core => oldcore}/180/filelists/gzip | 0 .../{core => oldcore}/180/filelists/hwdata | 0 .../{core => oldcore}/180/filelists/iana-etc | 0 .../{core => oldcore}/180/filelists/json-c | 0 .../rootfiles/{core => oldcore}/180/filelists/krb5 | 0 .../{core => oldcore}/180/filelists/libedit | 0 .../{core => oldcore}/180/filelists/libnl-3 | 0 .../{core => oldcore}/180/filelists/libtiff | 0 .../rootfiles/{core => oldcore}/180/filelists/mpfr | 0 .../{core => oldcore}/180/filelists/openssh | 0 .../rootfiles/{core => oldcore}/180/filelists/ppp | 0 .../{core => oldcore}/180/filelists/procps | 0 .../180/filelists/riscv64/binutils | 0 .../{core => oldcore}/180/filelists/riscv64/boost | 0 .../{core => oldcore}/180/filelists/riscv64/gcc | 0 .../{core => oldcore}/180/filelists/riscv64/glibc | 0 .../180/filelists/riscv64/util-linux | 0 .../{core => oldcore}/180/filelists/sqlite | 0 .../{core => oldcore}/180/filelists/squid | 0 .../{core => oldcore}/180/filelists/suricata | 0 .../rootfiles/{core => oldcore}/180/filelists/tcl | 0 .../{core => oldcore}/180/filelists/tzdata | 0 .../rootfiles/{core => oldcore}/180/filelists/udev | 0 .../{core => oldcore}/180/filelists/unbound | 0 .../{core => oldcore}/180/filelists/vnstat | 0 .../rootfiles/{core => oldcore}/180/filelists/wget | 0 .../{core => oldcore}/180/filelists/whois | 0 .../{core => oldcore}/180/filelists/wireless-regdb | 0 .../180/filelists/x86_64/binutils | 0 .../{core => oldcore}/180/filelists/x86_64/boost | 0 .../{core => oldcore}/180/filelists/x86_64/gcc | 0 .../{core => oldcore}/180/filelists/x86_64/glibc | 0 .../180/filelists/x86_64/util-linux | 0 .../rootfiles/{core => oldcore}/180/filelists/zlib | 0 config/rootfiles/{core => oldcore}/180/update.sh | 0 html/cgi-bin/ovpnmain.cgi | 75 +++++++++++-------- html/html/images/openvpn_encrypted.png | Bin 0 -> 7004 bytes langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/nl/cgi-bin/nl.pl | 3 +- lfs/bind | 4 +- lfs/linux | 4 +- make.sh | 2 +- 70 files changed, 136 insertions(+), 274 deletions(-) copy config/rootfiles/core/{180 => 181}/exclude (100%) copy config/rootfiles/{oldcore/124 => core/181}/filelists/aarch64/linux (100%) copy config/rootfiles/core/{180 => 181}/filelists/core-files (100%) create mode 100644 config/rootfiles/core/181/filelists/files create mode 120000 config/rootfiles/core/181/filelists/riscv64/linux copy config/rootfiles/{oldcore/100 => core/181}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/178 => core/181}/update.sh (69%) rename config/rootfiles/{core => oldcore}/180/exclude (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/binutils (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/boost (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/aarch64/util-linux (100%) copy config/rootfiles/oldcore/{100 => 180}/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/180/filelists/core-files (100%) rename config/rootfiles/{core => oldcore}/180/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/180/filelists/files (91%) rename config/rootfiles/{core => oldcore}/180/filelists/freetype (100%) rename config/rootfiles/{core => oldcore}/180/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/180/filelists/hwdata (100%) rename config/rootfiles/{core => oldcore}/180/filelists/iana-etc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/json-c (100%) rename config/rootfiles/{core => oldcore}/180/filelists/krb5 (100%) rename config/rootfiles/{core => oldcore}/180/filelists/libedit (100%) rename config/rootfiles/{core => oldcore}/180/filelists/libnl-3 (100%) rename config/rootfiles/{core => oldcore}/180/filelists/libtiff (100%) rename config/rootfiles/{core => oldcore}/180/filelists/mpfr (100%) rename config/rootfiles/{core => oldcore}/180/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/180/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/180/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/binutils (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/boost (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/gcc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/glibc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/riscv64/util-linux (100%) rename config/rootfiles/{core => oldcore}/180/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/180/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/180/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/180/filelists/tcl (100%) rename config/rootfiles/{core => oldcore}/180/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/180/filelists/udev (100%) rename config/rootfiles/{core => oldcore}/180/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/180/filelists/vnstat (100%) rename config/rootfiles/{core => oldcore}/180/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/180/filelists/whois (100%) rename config/rootfiles/{core => oldcore}/180/filelists/wireless-regdb (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/boost (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/180/filelists/x86_64/util-linux (100%) rename config/rootfiles/{core => oldcore}/180/filelists/zlib (100%) rename config/rootfiles/{core => oldcore}/180/update.sh (100%) create mode 100644 html/html/images/openvpn_encrypted.png Difference in files: diff --git a/config/extrahd/extrahd.pl b/config/extrahd/extrahd.pl index cc85228d5..bcde077d0 100644 --- a/config/extrahd/extrahd.pl +++ b/config/extrahd/extrahd.pl @@ -116,7 +116,21 @@ extrahd_umount() { done < /var/ipfire/extrahd/devices } +handle_udev_event() { + case "${ACTION}" in + add) + if [ -n "${ID_FS_UUID}" ]; then + extrahd_mount "UUID=${ID_FS_UUID}" || return $? + fi + ;; + esac + + return 0 +} + main() { + ( echo "$@"; set ) > /tmp/extrahd.$$ + local command="${1}" shift @@ -129,6 +143,9 @@ main() { umount) extrahd_umount "${@}" || rc="${rc}" ;; + udev-event) + handle_udev_event "${@}" || rc="${rc}" + ;; scanhd) exec /usr/local/bin/scanhd "${@}" ;; diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 74dec8565..96944c3d5 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.45-ipfire Kernel Configuration +# Linux/arm64 6.1.53-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -5053,78 +5053,9 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# -# CONFIG_VIDEO_AR0521 is not set -# CONFIG_VIDEO_HI556 is not set -# CONFIG_VIDEO_HI846 is not set -# CONFIG_VIDEO_HI847 is not set -# CONFIG_VIDEO_IMX208 is not set -# CONFIG_VIDEO_IMX214 is not set -# CONFIG_VIDEO_IMX219 is not set -# CONFIG_VIDEO_IMX258 is not set -# CONFIG_VIDEO_IMX274 is not set -# CONFIG_VIDEO_IMX290 is not set -# CONFIG_VIDEO_IMX319 is not set -# CONFIG_VIDEO_IMX334 is not set -# CONFIG_VIDEO_IMX335 is not set -# CONFIG_VIDEO_IMX355 is not set -# CONFIG_VIDEO_IMX412 is not set -# CONFIG_VIDEO_MT9M001 is not set -# CONFIG_VIDEO_MT9M032 is not set -CONFIG_VIDEO_MT9M111=m -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set -# CONFIG_VIDEO_MT9T112 is not set +# CONFIG_VIDEO_CAMERA_SENSOR is not set CONFIG_VIDEO_MT9V011=m -# CONFIG_VIDEO_MT9V032 is not set -# CONFIG_VIDEO_MT9V111 is not set -# CONFIG_VIDEO_NOON010PC30 is not set -# CONFIG_VIDEO_OG01A1B is not set -# CONFIG_VIDEO_OV02A10 is not set -# CONFIG_VIDEO_OV08D10 is not set -# CONFIG_VIDEO_OV13858 is not set -# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m -# CONFIG_VIDEO_OV2659 is not set -# CONFIG_VIDEO_OV2680 is not set -# CONFIG_VIDEO_OV2685 is not set -# CONFIG_VIDEO_OV2740 is not set -# CONFIG_VIDEO_OV5640 is not set -# CONFIG_VIDEO_OV5645 is not set -# CONFIG_VIDEO_OV5647 is not set -# CONFIG_VIDEO_OV5648 is not set -# CONFIG_VIDEO_OV5670 is not set -# CONFIG_VIDEO_OV5675 is not set -# CONFIG_VIDEO_OV5693 is not set -# CONFIG_VIDEO_OV5695 is not set -# CONFIG_VIDEO_OV6650 is not set -# CONFIG_VIDEO_OV7251 is not set -# CONFIG_VIDEO_OV7640 is not set -# CONFIG_VIDEO_OV7670 is not set -# CONFIG_VIDEO_OV772X is not set -# CONFIG_VIDEO_OV7740 is not set -# CONFIG_VIDEO_OV8856 is not set -# CONFIG_VIDEO_OV8865 is not set -# CONFIG_VIDEO_OV9282 is not set -# CONFIG_VIDEO_OV9640 is not set -# CONFIG_VIDEO_OV9650 is not set -# CONFIG_VIDEO_OV9734 is not set -# CONFIG_VIDEO_RDACM20 is not set -# CONFIG_VIDEO_RDACM21 is not set -# CONFIG_VIDEO_RJ54N1 is not set -# CONFIG_VIDEO_S5K4ECGX is not set -# CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_S5K6A3 is not set -# CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_SR030PC30 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_CCS is not set -# CONFIG_VIDEO_ET8EK8 is not set -# CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices # # Lens drivers diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire index aabf98371..fc2bbaf1e 100644 --- a/config/kernel/kernel.config.riscv64-ipfire +++ b/config/kernel/kernel.config.riscv64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.1.42-ipfire Kernel Configuration +# Linux/riscv 6.1.53-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -4332,75 +4332,9 @@ CONFIG_MEDIA_ATTACH=y # CONFIG_VIDEO_IR_I2C=m -# -# Camera sensor devices -# -# CONFIG_VIDEO_AR0521 is not set -# CONFIG_VIDEO_HI556 is not set -# CONFIG_VIDEO_HI846 is not set -# CONFIG_VIDEO_HI847 is not set -# CONFIG_VIDEO_IMX208 is not set -# CONFIG_VIDEO_IMX214 is not set -# CONFIG_VIDEO_IMX219 is not set -# CONFIG_VIDEO_IMX258 is not set -# CONFIG_VIDEO_IMX274 is not set -# CONFIG_VIDEO_IMX290 is not set -# CONFIG_VIDEO_IMX319 is not set -# CONFIG_VIDEO_IMX334 is not set -# CONFIG_VIDEO_IMX335 is not set -# CONFIG_VIDEO_IMX355 is not set -# CONFIG_VIDEO_IMX412 is not set -# CONFIG_VIDEO_MT9M001 is not set -# CONFIG_VIDEO_MT9M032 is not set -CONFIG_VIDEO_MT9M111=m -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set -# CONFIG_VIDEO_MT9T112 is not set +# CONFIG_VIDEO_CAMERA_SENSOR is not set CONFIG_VIDEO_MT9V011=m -# CONFIG_VIDEO_MT9V032 is not set -# CONFIG_VIDEO_MT9V111 is not set -# CONFIG_VIDEO_NOON010PC30 is not set -# CONFIG_VIDEO_OG01A1B is not set -# CONFIG_VIDEO_OV02A10 is not set -# CONFIG_VIDEO_OV08D10 is not set -# CONFIG_VIDEO_OV13858 is not set -# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m -# CONFIG_VIDEO_OV2659 is not set -# CONFIG_VIDEO_OV2680 is not set -# CONFIG_VIDEO_OV2685 is not set -# CONFIG_VIDEO_OV5640 is not set -# CONFIG_VIDEO_OV5645 is not set -# CONFIG_VIDEO_OV5647 is not set -# CONFIG_VIDEO_OV5648 is not set -# CONFIG_VIDEO_OV5670 is not set -# CONFIG_VIDEO_OV5675 is not set -# CONFIG_VIDEO_OV5693 is not set -# CONFIG_VIDEO_OV5695 is not set -# CONFIG_VIDEO_OV6650 is not set -# CONFIG_VIDEO_OV7251 is not set -CONFIG_VIDEO_OV7640=m -CONFIG_VIDEO_OV7670=m -# CONFIG_VIDEO_OV772X is not set -# CONFIG_VIDEO_OV7740 is not set -# CONFIG_VIDEO_OV8856 is not set -# CONFIG_VIDEO_OV8865 is not set -# CONFIG_VIDEO_OV9282 is not set -# CONFIG_VIDEO_OV9640 is not set -# CONFIG_VIDEO_OV9650 is not set -# CONFIG_VIDEO_RDACM20 is not set -# CONFIG_VIDEO_RDACM21 is not set -# CONFIG_VIDEO_RJ54N1 is not set -# CONFIG_VIDEO_S5K4ECGX is not set -# CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_S5K6A3 is not set -# CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_SR030PC30 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_CCS is not set -# CONFIG_VIDEO_ET8EK8 is not set -# CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices # # Lens drivers @@ -6936,6 +6870,7 @@ CONFIG_DEBUG_MISC=y # # Compile-time checks and compiler options # +CONFIG_AS_HAS_NON_CONST_LEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 7c052fe08..129e0d209 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.45-ipfire Kernel Configuration +# Linux/x86 6.1.53-ipfire Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130100 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24000 +CONFIG_AS_VERSION=24100 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24000 +CONFIG_LD_VERSION=24100 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -4761,72 +4761,11 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# -# CONFIG_VIDEO_AR0521 is not set -# CONFIG_VIDEO_HI556 is not set -# CONFIG_VIDEO_HI846 is not set -# CONFIG_VIDEO_HI847 is not set -# CONFIG_VIDEO_IMX208 is not set -# CONFIG_VIDEO_IMX214 is not set -# CONFIG_VIDEO_IMX219 is not set -# CONFIG_VIDEO_IMX258 is not set -# CONFIG_VIDEO_IMX274 is not set -# CONFIG_VIDEO_IMX290 is not set -# CONFIG_VIDEO_IMX319 is not set -# CONFIG_VIDEO_IMX355 is not set -# CONFIG_VIDEO_MT9M001 is not set -# CONFIG_VIDEO_MT9M032 is not set -CONFIG_VIDEO_MT9M111=m -# CONFIG_VIDEO_MT9P031 is not set -# CONFIG_VIDEO_MT9T001 is not set -# CONFIG_VIDEO_MT9T112 is not set +# CONFIG_VIDEO_CAMERA_SENSOR is not set CONFIG_VIDEO_MT9V011=m -# CONFIG_VIDEO_MT9V032 is not set -# CONFIG_VIDEO_MT9V111 is not set -# CONFIG_VIDEO_NOON010PC30 is not set -# CONFIG_VIDEO_OG01A1B is not set -# CONFIG_VIDEO_OV02A10 is not set -# CONFIG_VIDEO_OV08D10 is not set -# CONFIG_VIDEO_OV13858 is not set -# CONFIG_VIDEO_OV13B10 is not set CONFIG_VIDEO_OV2640=m -# CONFIG_VIDEO_OV2659 is not set -# CONFIG_VIDEO_OV2680 is not set -# CONFIG_VIDEO_OV2685 is not set -# CONFIG_VIDEO_OV2740 is not set -# CONFIG_VIDEO_OV5647 is not set -# CONFIG_VIDEO_OV5648 is not set -# CONFIG_VIDEO_OV5670 is not set -# CONFIG_VIDEO_OV5675 is not set -# CONFIG_VIDEO_OV5693 is not set -# CONFIG_VIDEO_OV5695 is not set -# CONFIG_VIDEO_OV6650 is not set -# CONFIG_VIDEO_OV7251 is not set CONFIG_VIDEO_OV7640=m CONFIG_VIDEO_OV7670=m -# CONFIG_VIDEO_OV772X is not set -# CONFIG_VIDEO_OV7740 is not set -# CONFIG_VIDEO_OV8856 is not set -# CONFIG_VIDEO_OV8865 is not set -# CONFIG_VIDEO_OV9640 is not set -# CONFIG_VIDEO_OV9650 is not set -# CONFIG_VIDEO_OV9734 is not set -# CONFIG_VIDEO_RDACM20 is not set -# CONFIG_VIDEO_RDACM21 is not set -# CONFIG_VIDEO_RJ54N1 is not set -# CONFIG_VIDEO_S5K4ECGX is not set -# CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_S5K6A3 is not set -# CONFIG_VIDEO_S5K6AA is not set -# CONFIG_VIDEO_SR030PC30 is not set -# CONFIG_VIDEO_VS6624 is not set -# CONFIG_VIDEO_CCS is not set -# CONFIG_VIDEO_ET8EK8 is not set -# CONFIG_VIDEO_M5MOLS is not set -# end of Camera sensor devices # # Lens drivers diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 5ed37b7e0..754df396e 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -17587,6 +17587,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -19159,8 +19161,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index eeeee6e94..ca3f17011 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -271,24 +271,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.40.so +usr/lib/libbind9-9.16.44.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.40.so +usr/lib/libdns-9.16.44.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.40.so +usr/lib/libirs-9.16.44.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.40.so +usr/lib/libisc-9.16.44.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.40.so +usr/lib/libisccc-9.16.44.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.40.so +usr/lib/libisccfg-9.16.44.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.40.so +usr/lib/libns-9.16.44.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux index bd5439ea4..48660ee40 100644 --- a/config/rootfiles/common/riscv64/linux +++ b/config/rootfiles/common/riscv64/linux @@ -6147,7 +6147,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/asm-generic/bitops/sched.h #lib/modules/KVER-ipfire/build/include/asm-generic/bitsperlong.h #lib/modules/KVER-ipfire/build/include/asm-generic/bug.h -#lib/modules/KVER-ipfire/build/include/asm-generic/bugs.h #lib/modules/KVER-ipfire/build/include/asm-generic/cache.h #lib/modules/KVER-ipfire/build/include/asm-generic/cacheflush.h #lib/modules/KVER-ipfire/build/include/asm-generic/checksum.h @@ -6370,6 +6369,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ASYNC_TX_DMA #lib/modules/KVER-ipfire/build/include/config/ASYNC_XOR #lib/modules/KVER-ipfire/build/include/config/AS_HAS_INSN +#lib/modules/KVER-ipfire/build/include/config/AS_HAS_NON_CONST_LEB128 #lib/modules/KVER-ipfire/build/include/config/AS_IS_GNU #lib/modules/KVER-ipfire/build/include/config/AS_VERSION #lib/modules/KVER-ipfire/build/include/config/AT76C50X_USB @@ -16723,6 +16723,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -18295,8 +18297,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 52f879d35..6c2a40cc2 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -235,6 +235,7 @@ srv/web/ipfire/html/images/off.gif srv/web/ipfire/html/images/on.gif srv/web/ipfire/html/images/openvpn.gif srv/web/ipfire/html/images/openvpn.png +srv/web/ipfire/html/images/openvpn_encrypted.png srv/web/ipfire/html/images/package-x-generic.png srv/web/ipfire/html/images/printer-error.png srv/web/ipfire/html/images/printer.png diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index f2b488ef9..4ff096b5b 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -17676,6 +17676,8 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/net/dccp/Makefile #lib/modules/KVER-ipfire/build/net/dccp/ccids #lib/modules/KVER-ipfire/build/net/dccp/ccids/Kconfig +#lib/modules/KVER-ipfire/build/net/devlink +#lib/modules/KVER-ipfire/build/net/devlink/Makefile #lib/modules/KVER-ipfire/build/net/dns_resolver #lib/modules/KVER-ipfire/build/net/dns_resolver/Kconfig #lib/modules/KVER-ipfire/build/net/dns_resolver/Makefile @@ -19244,8 +19246,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/af_unix/Makefile -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf -#lib/modules/KVER-ipfire/build/tools/testing/selftests/net/bpf/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/forwarding/Makefile #lib/modules/KVER-ipfire/build/tools/testing/selftests/net/mptcp diff --git a/config/rootfiles/core/180/exclude b/config/rootfiles/core/181/exclude similarity index 100% rename from config/rootfiles/core/180/exclude rename to config/rootfiles/core/181/exclude diff --git a/config/rootfiles/core/181/filelists/aarch64/linux b/config/rootfiles/core/181/filelists/aarch64/linux new file mode 120000 index 000000000..3a2532bc7 --- /dev/null +++ b/config/rootfiles/core/181/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/180/filelists/core-files b/config/rootfiles/core/181/filelists/core-files similarity index 100% rename from config/rootfiles/core/180/filelists/core-files rename to config/rootfiles/core/181/filelists/core-files diff --git a/config/rootfiles/core/181/filelists/files b/config/rootfiles/core/181/filelists/files new file mode 100644 index 000000000..7d390413f --- /dev/null +++ b/config/rootfiles/core/181/filelists/files @@ -0,0 +1,2 @@ +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/html/images/openvpn_encrypted.png diff --git a/config/rootfiles/core/181/filelists/riscv64/linux b/config/rootfiles/core/181/filelists/riscv64/linux new file mode 120000 index 000000000..c8e8350ca --- /dev/null +++ b/config/rootfiles/core/181/filelists/riscv64/linux @@ -0,0 +1 @@ +../../../../common/riscv64/linux \ No newline at end of file diff --git a/config/rootfiles/core/181/filelists/x86_64/linux b/config/rootfiles/core/181/filelists/x86_64/linux new file mode 120000 index 000000000..0615b5b9a --- /dev/null +++ b/config/rootfiles/core/181/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/181/update.sh b/config/rootfiles/core/181/update.sh new file mode 100644 index 000000000..e6098a3c9 --- /dev/null +++ b/config/rootfiles/core/181/update.sh @@ -0,0 +1,170 @@ +#!/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) 2023 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=181 + +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 + +# Stop services + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks prior to the kernel update +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# Check diskspace on root +ROOTSPACE=$( df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1 ) + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +# Remove the old kernel +rm -rvf \ + /boot/System.map-* \ + /boot/config-* \ + /boot/ipfirerd-* \ + /boot/initramfs-* \ + /boot/vmlinuz-* \ + /boot/uImage-* \ + /boot/zImage-* \ + /boot/uInit-* \ + /boot/dtb-* \ + /lib/modules + +# Extract files +extract_files + +# Remove files +#rm -rvf \ + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# Rebuild initial ramdisks +dracut --regenerate-all --force +KVER="xxxKVERxxx" +case "$(uname -m)" in + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac + +# remove lm_sensor config after collectd was started +# to re-search sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version in uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +## Modify ovpnconfig according to bug 11048 for pass, no-pass modification in ovpnconfig index +# Check if ovpnconfig exists and is not empty +if [ -s /var/ipfire/ovpn/ovpnconfig ]; then + # Add blank line at top of ovpnconfig otherwise the first roadwarrior entry is treated like a blank line and missed out from update + awk 'NR==1{print ""}1' /var/ipfire/ovpn/ovpnconfig > /var/ipfire/ovpn/tmp_file && mv /var/ipfire/ovpn/tmp_file /var/ipfire/ovpn/ovpnconfig + + # Make all N2N connections 'no-pass' since they do not use encryption + awk '{FS=OFS=","} {if($5=="net") {$43="no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new + + # Evaluate roadwarrior connection names for *.p12 files + for y in $(awk -F',' '/host/ { print $3 }' /var/ipfire/ovpn/ovpnconfig); do + # Sort all unencrypted roadwarriors out and set 'no-pass' in [43] index + if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${y}.p12 -noout -password pass:'' 2>&1 | grep 'Encrypted data') ]]; then + awk -v var="$y" '{FS=OFS=","} {if($3==var) {$43="no-pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new + fi + # Sort all encrypted roadwarriors out and set 'pass' in [43] index + if [[ -n $(openssl pkcs12 -info -in /var/ipfire/ovpn/certs/${y}.p12 -noout -password pass:'' 2>&1 | grep 'verify error') ]]; then + awk -v var="$y" '{FS=OFS=","} {if($3==var) {$43="pass"; print $0}}' /var/ipfire/ovpn/ovpnconfig >> /var/ipfire/ovpn/ovpnconfig.new + fi + done +fi + +# Replace existing ovpnconfig with updated index +mv /var/ipfire/ovpn/ovpnconfig.new /var/ipfire/ovpn/ovpnconfig +# Set correct ownership +chown nobody:nobody /var/ipfire/ovpn/ovpnconfig + +# 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/180/exclude b/config/rootfiles/oldcore/180/exclude new file mode 100644 index 000000000..8ee1c3c2f --- /dev/null +++ b/config/rootfiles/oldcore/180/exclude @@ -0,0 +1,35 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +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/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/lib/location/ipset +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/180/filelists/aarch64/binutils b/config/rootfiles/oldcore/180/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/binutils rename to config/rootfiles/oldcore/180/filelists/aarch64/binutils diff --git a/config/rootfiles/core/180/filelists/aarch64/boost b/config/rootfiles/oldcore/180/filelists/aarch64/boost similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/boost rename to config/rootfiles/oldcore/180/filelists/aarch64/boost diff --git a/config/rootfiles/core/180/filelists/aarch64/gcc b/config/rootfiles/oldcore/180/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/gcc rename to config/rootfiles/oldcore/180/filelists/aarch64/gcc diff --git a/config/rootfiles/core/180/filelists/aarch64/glibc b/config/rootfiles/oldcore/180/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/glibc rename to config/rootfiles/oldcore/180/filelists/aarch64/glibc diff --git a/config/rootfiles/core/180/filelists/aarch64/util-linux b/config/rootfiles/oldcore/180/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/180/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/180/filelists/aarch64/util-linux diff --git a/config/rootfiles/oldcore/180/filelists/bind b/config/rootfiles/oldcore/180/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/oldcore/180/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/180/filelists/core-files b/config/rootfiles/oldcore/180/filelists/core-files new file mode 100644 index 000000000..0dec37e53 --- /dev/null +++ b/config/rootfiles/oldcore/180/filelists/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/180/filelists/dhcpcd b/config/rootfiles/oldcore/180/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/180/filelists/dhcpcd rename to config/rootfiles/oldcore/180/filelists/dhcpcd diff --git a/config/rootfiles/core/180/filelists/files b/config/rootfiles/oldcore/180/filelists/files similarity index 91% rename from config/rootfiles/core/180/filelists/files rename to config/rootfiles/oldcore/180/filelists/files index 8b44a36b1..986085e5e 100644 --- a/config/rootfiles/core/180/filelists/files +++ b/config/rootfiles/oldcore/180/filelists/files @@ -9,3 +9,4 @@ opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi var/ipfire/main/manualpages +var/ipfire/extrahd/bin/extrahd.pl diff --git a/config/rootfiles/core/180/filelists/freetype b/config/rootfiles/oldcore/180/filelists/freetype similarity index 100% rename from config/rootfiles/core/180/filelists/freetype rename to config/rootfiles/oldcore/180/filelists/freetype diff --git a/config/rootfiles/core/180/filelists/gzip b/config/rootfiles/oldcore/180/filelists/gzip similarity index 100% rename from config/rootfiles/core/180/filelists/gzip rename to config/rootfiles/oldcore/180/filelists/gzip diff --git a/config/rootfiles/core/180/filelists/hwdata b/config/rootfiles/oldcore/180/filelists/hwdata similarity index 100% rename from config/rootfiles/core/180/filelists/hwdata rename to config/rootfiles/oldcore/180/filelists/hwdata diff --git a/config/rootfiles/core/180/filelists/iana-etc b/config/rootfiles/oldcore/180/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/180/filelists/iana-etc rename to config/rootfiles/oldcore/180/filelists/iana-etc diff --git a/config/rootfiles/core/180/filelists/json-c b/config/rootfiles/oldcore/180/filelists/json-c similarity index 100% rename from config/rootfiles/core/180/filelists/json-c rename to config/rootfiles/oldcore/180/filelists/json-c diff --git a/config/rootfiles/core/180/filelists/krb5 b/config/rootfiles/oldcore/180/filelists/krb5 similarity index 100% rename from config/rootfiles/core/180/filelists/krb5 rename to config/rootfiles/oldcore/180/filelists/krb5 diff --git a/config/rootfiles/core/180/filelists/libedit b/config/rootfiles/oldcore/180/filelists/libedit similarity index 100% rename from config/rootfiles/core/180/filelists/libedit rename to config/rootfiles/oldcore/180/filelists/libedit diff --git a/config/rootfiles/core/180/filelists/libnl-3 b/config/rootfiles/oldcore/180/filelists/libnl-3 similarity index 100% rename from config/rootfiles/core/180/filelists/libnl-3 rename to config/rootfiles/oldcore/180/filelists/libnl-3 diff --git a/config/rootfiles/core/180/filelists/libtiff b/config/rootfiles/oldcore/180/filelists/libtiff similarity index 100% rename from config/rootfiles/core/180/filelists/libtiff rename to config/rootfiles/oldcore/180/filelists/libtiff diff --git a/config/rootfiles/core/180/filelists/mpfr b/config/rootfiles/oldcore/180/filelists/mpfr similarity index 100% rename from config/rootfiles/core/180/filelists/mpfr rename to config/rootfiles/oldcore/180/filelists/mpfr diff --git a/config/rootfiles/core/180/filelists/openssh b/config/rootfiles/oldcore/180/filelists/openssh similarity index 100% rename from config/rootfiles/core/180/filelists/openssh rename to config/rootfiles/oldcore/180/filelists/openssh diff --git a/config/rootfiles/core/180/filelists/ppp b/config/rootfiles/oldcore/180/filelists/ppp similarity index 100% rename from config/rootfiles/core/180/filelists/ppp rename to config/rootfiles/oldcore/180/filelists/ppp diff --git a/config/rootfiles/core/180/filelists/procps b/config/rootfiles/oldcore/180/filelists/procps similarity index 100% rename from config/rootfiles/core/180/filelists/procps rename to config/rootfiles/oldcore/180/filelists/procps diff --git a/config/rootfiles/core/180/filelists/riscv64/binutils b/config/rootfiles/oldcore/180/filelists/riscv64/binutils similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/binutils rename to config/rootfiles/oldcore/180/filelists/riscv64/binutils diff --git a/config/rootfiles/core/180/filelists/riscv64/boost b/config/rootfiles/oldcore/180/filelists/riscv64/boost similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/boost rename to config/rootfiles/oldcore/180/filelists/riscv64/boost diff --git a/config/rootfiles/core/180/filelists/riscv64/gcc b/config/rootfiles/oldcore/180/filelists/riscv64/gcc similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/gcc rename to config/rootfiles/oldcore/180/filelists/riscv64/gcc diff --git a/config/rootfiles/core/180/filelists/riscv64/glibc b/config/rootfiles/oldcore/180/filelists/riscv64/glibc similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/glibc rename to config/rootfiles/oldcore/180/filelists/riscv64/glibc diff --git a/config/rootfiles/core/180/filelists/riscv64/util-linux b/config/rootfiles/oldcore/180/filelists/riscv64/util-linux similarity index 100% rename from config/rootfiles/core/180/filelists/riscv64/util-linux rename to config/rootfiles/oldcore/180/filelists/riscv64/util-linux diff --git a/config/rootfiles/core/180/filelists/sqlite b/config/rootfiles/oldcore/180/filelists/sqlite similarity index 100% rename from config/rootfiles/core/180/filelists/sqlite rename to config/rootfiles/oldcore/180/filelists/sqlite diff --git a/config/rootfiles/core/180/filelists/squid b/config/rootfiles/oldcore/180/filelists/squid similarity index 100% rename from config/rootfiles/core/180/filelists/squid rename to config/rootfiles/oldcore/180/filelists/squid diff --git a/config/rootfiles/core/180/filelists/suricata b/config/rootfiles/oldcore/180/filelists/suricata similarity index 100% rename from config/rootfiles/core/180/filelists/suricata rename to config/rootfiles/oldcore/180/filelists/suricata diff --git a/config/rootfiles/core/180/filelists/tcl b/config/rootfiles/oldcore/180/filelists/tcl similarity index 100% rename from config/rootfiles/core/180/filelists/tcl rename to config/rootfiles/oldcore/180/filelists/tcl diff --git a/config/rootfiles/core/180/filelists/tzdata b/config/rootfiles/oldcore/180/filelists/tzdata similarity index 100% rename from config/rootfiles/core/180/filelists/tzdata rename to config/rootfiles/oldcore/180/filelists/tzdata diff --git a/config/rootfiles/core/180/filelists/udev b/config/rootfiles/oldcore/180/filelists/udev similarity index 100% rename from config/rootfiles/core/180/filelists/udev rename to config/rootfiles/oldcore/180/filelists/udev diff --git a/config/rootfiles/core/180/filelists/unbound b/config/rootfiles/oldcore/180/filelists/unbound similarity index 100% rename from config/rootfiles/core/180/filelists/unbound rename to config/rootfiles/oldcore/180/filelists/unbound diff --git a/config/rootfiles/core/180/filelists/vnstat b/config/rootfiles/oldcore/180/filelists/vnstat similarity index 100% rename from config/rootfiles/core/180/filelists/vnstat rename to config/rootfiles/oldcore/180/filelists/vnstat diff --git a/config/rootfiles/core/180/filelists/wget b/config/rootfiles/oldcore/180/filelists/wget similarity index 100% rename from config/rootfiles/core/180/filelists/wget rename to config/rootfiles/oldcore/180/filelists/wget diff --git a/config/rootfiles/core/180/filelists/whois b/config/rootfiles/oldcore/180/filelists/whois similarity index 100% rename from config/rootfiles/core/180/filelists/whois rename to config/rootfiles/oldcore/180/filelists/whois diff --git a/config/rootfiles/core/180/filelists/wireless-regdb b/config/rootfiles/oldcore/180/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/180/filelists/wireless-regdb rename to config/rootfiles/oldcore/180/filelists/wireless-regdb diff --git a/config/rootfiles/core/180/filelists/x86_64/binutils b/config/rootfiles/oldcore/180/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/binutils rename to config/rootfiles/oldcore/180/filelists/x86_64/binutils diff --git a/config/rootfiles/core/180/filelists/x86_64/boost b/config/rootfiles/oldcore/180/filelists/x86_64/boost similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/boost rename to config/rootfiles/oldcore/180/filelists/x86_64/boost diff --git a/config/rootfiles/core/180/filelists/x86_64/gcc b/config/rootfiles/oldcore/180/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/gcc rename to config/rootfiles/oldcore/180/filelists/x86_64/gcc diff --git a/config/rootfiles/core/180/filelists/x86_64/glibc b/config/rootfiles/oldcore/180/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/glibc rename to config/rootfiles/oldcore/180/filelists/x86_64/glibc diff --git a/config/rootfiles/core/180/filelists/x86_64/util-linux b/config/rootfiles/oldcore/180/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/180/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/180/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/180/filelists/zlib b/config/rootfiles/oldcore/180/filelists/zlib similarity index 100% rename from config/rootfiles/core/180/filelists/zlib rename to config/rootfiles/oldcore/180/filelists/zlib diff --git a/config/rootfiles/core/180/update.sh b/config/rootfiles/oldcore/180/update.sh similarity index 100% rename from config/rootfiles/core/180/update.sh rename to config/rootfiles/oldcore/180/update.sh diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 5afe54f55..eb89c5095 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -4370,9 +4370,15 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'}; - if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { - $confighash{$key}[41] = "no-pass"; - } + if ($confighash{$key}[41] eq "") { + if (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} eq "")) { + $confighash{$key}[41] = "no-pass"; + } elsif (($cgiparams{'TYPE'} eq 'host') && ($cgiparams{'CERT_PASS1'} ne "")) { + $confighash{$key}[41] = "pass"; + } elsif ($cgiparams{'TYPE'} eq 'net') { + $confighash{$key}[41] = "no-pass"; + } + } $confighash{$key}[42] = 'HOTP/T30/6'; $confighash{$key}[43] = $cgiparams{'OTP_STATE'}; @@ -5512,20 +5518,24 @@ END } - print <<END; - <td align='center' $col1>$active</td> + if ($confighash{$key}[41] eq "pass") { + print <<END; + <td align='center' $col1>$active</td> - <form method='post' name='frm${key}a'><td align='center' $col> - <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> - <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> - <input type='hidden' name='KEY' value='$key' /> - </td></form> + <form method='post' name='frm${key}a'><td align='center' $col> + <input type='image' name='$Lang::tr{'dl client arch'}' src='/images/openvpn_encrypted.png' + alt='$Lang::tr{'dl client arch'}' title='$Lang::tr{'dl client arch'}' border='0' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> + <input type='hidden' name='MODE' value='secure' /> + <input type='hidden' name='KEY' value='$key' /> + </td></form> END - ; - if ($confighash{$key}[41] eq "no-pass") { + ; } elsif ($confighash{$key}[41] eq "no-pass") { print <<END; - <form method='post' name='frm${key}g'><td align='center' $col> + <td align='center' $col1>$active</td> + + <form method='post' name='frm${key}a'><td align='center' $col> <input type='image' name='$Lang::tr{'dl client arch insecure'}' src='/images/openvpn.png' alt='$Lang::tr{'dl client arch insecure'}' title='$Lang::tr{'dl client arch insecure'}' border='0' /> <input type='hidden' name='ACTION' value='$Lang::tr{'dl client arch'}' /> @@ -5533,7 +5543,7 @@ END <input type='hidden' name='KEY' value='$key' /> </td></form> END - } else { + ; } else { print "<td $col> </td>"; } @@ -5609,30 +5619,33 @@ END # If the config file contains entries, print Key to action icons if ( $id ) { print <<END; - <table border='0'> - <tr> + <table width='85%' border='0'> + <tr> <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> - <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> - <td class='base'>$Lang::tr{'click to disable'}</td> + <td>    <img src='/images/openvpn.png' alt='?RELOAD'/></td> + <td class='base'>$Lang::tr{'dl client arch insecure'}</td> + <td>    <img src='/images/openvpn_encrypted.png' alt='?RELOAD'/></td> + <td class='base'>$Lang::tr{'dl client arch'}</td> <td>    <img src='/images/info.gif' alt='$Lang::tr{'show certificate'}' /></td> <td class='base'>$Lang::tr{'show certificate'}</td> + <td>    <img src='/images/qr-code.png' alt='$Lang::tr{'show otp qrcode'}'/></td> + <td class='base'>$Lang::tr{'show otp qrcode'}</td> + </tr> + <tr> + <td>  </td> + <td>    <img src='/images/media-floppy.png' alt='?FLOPPY' /></td> + <td class='base'>$Lang::tr{'download certificate'}</td> + <td>  <img src='/images/off.gif' alt='?OFF' /></td> + <td class='base'>$Lang::tr{'click to enable'}</td> + <td>  <img src='/images/on.gif' alt='$Lang::tr{'click to disable'}' /></td> + <td class='base'>$Lang::tr{'click to disable'}</td> + <td>    <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td> <td class='base'>$Lang::tr{'edit'}</td> <td>    <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td> <td class='base'>$Lang::tr{'remove'}</td> - </tr> - <tr> - <td>  </td> - <td>  <img src='/images/off.gif' alt='?OFF' /></td> - <td class='base'>$Lang::tr{'click to enable'}</td> - <td>    <img src='/images/media-floppy.png' alt='?FLOPPY' /></td> - <td class='base'>$Lang::tr{'download certificate'}</td> - <td>    <img src='/images/openvpn.png' alt='?RELOAD'/></td> - <td class='base'>$Lang::tr{'dl client arch'}</td> - <td>    <img src='/images/qr-code.png' alt='$Lang::tr{'show otp qrcode'}'/></td> - <td class='base'>$Lang::tr{'show otp qrcode'}</td> - </tr> - </table><br> + </tr> + </table><br> END ; } diff --git a/html/html/images/openvpn_encrypted.png b/html/html/images/openvpn_encrypted.png new file mode 100644 index 000000000..873c6c461 Binary files /dev/null and b/html/html/images/openvpn_encrypted.png differ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0c2f1af53..140806130 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -818,7 +818,7 @@ 'display hostname in window title' => 'Hostname im Fenstertitel anzeigen', 'display traffic at home' => 'Berechneten Traffic auf der Startseite anzeigen', 'display webinterface effects' => 'Überblendeffekte einschalten', -'dl client arch' => 'Client Paket herunterladen (zip)', +'dl client arch' => 'Verschlüsseltes Client Paket herunterladen (zip)', 'dl client arch insecure' => 'Ungesichertes Client-Paket herunterladen (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'Einstellungen des DMZ-Schlupfloches', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 90d6f7739..7bbf7cd32 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -859,7 +859,7 @@ 'display hostname in window title' => 'Display hostname in window title', 'display traffic at home' => 'Display calculated traffic on startpage', 'display webinterface effects' => 'Activate effects', -'dl client arch' => 'Download Client Package (zip)', +'dl client arch' => 'Download Encrypted Client Package (zip)', 'dl client arch insecure' => 'Download insecure Client Package (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'DMZ pinhole configuration', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 4da924a74..898d42d28 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -731,7 +731,8 @@ 'display hostname in window title' => 'Toon hostnaam in venstertitel', 'display traffic at home' => 'Toon netwerkverkeer op startpagina', 'display webinterface effects' => 'Activeer effecten', -'dl client arch' => 'Download clientpakket (zip)', +'dl client arch' => 'Download versleuteld clientpakket (zip)', +'dl client arch insecure' => 'Download onveilig clientpakket (zip)', 'dmz' => 'DMZ', 'dmz pinhole configuration' => 'DMZ pinhole configuratie', 'dmz pinhole rule added' => 'DMZ pinhole regel toegevoegd; DMZ regel wordt herstart.', diff --git a/lfs/bind b/lfs/bind index 850e3f93a..6779bb3d9 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.40 +VER = 9.16.44 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1ebfec11cc6902480113b1edadcbdb2f819050d779aaa1556ef79491c580a28106d3eff186da89bdecec03025e4e672342602f54e6b0e6f9619a181a1399e070 +$(DL_FILE)_BLAKE2 = cdca8289639d900ab8162e4b0252a495fa0c579b9399326c7df42699346c2f0bca24762dad29de187f142c0896f4012c3f5f3785126d325e7d30ccb73f1530d8 install : $(TARGET) diff --git a/lfs/linux b/lfs/linux index 52f1fe167..7dedf390e 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@ include Config -VER = 6.1.45 +VER = 6.1.53 ARM_PATCHES = 6.1.y-ipfire2 THISAPP = linux-$(VER) @@ -75,7 +75,7 @@ objects = \ $(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 = 1889f12c4bf9d09a5c3d3addbe5de7989ebacdc89c01973b33e8e11faa989eb7a0f1666c3a78ffeb6b315ec1599ab51490a97079f2d4c2109c8888a88dcf03b7 +$(DL_FILE)_BLAKE2 = c5c082fa08e331ae968e27f6a0aed41f7793ea38c3a32311e4f9b7dda3cf1ce74dfd7f3e4c783f0dd4269b543eddd53e086e523d324da5e7a996aa4d8e6701ea arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3 install : $(TARGET) diff --git a/make.sh b/make.sh index acb692140..1a948f8dd 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,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.27" # Version number -CORE="180" # Core Level (Filename) +CORE="181" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4322d0c7276f305db3bcf4f09889cb828e54b514
by Michael Tremer 28 Sep '23

28 Sep '23

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 4322d0c7276f305db3bcf4f09889cb828e54b514 (commit) via 0f334f0ef36c8751fccbdbdbe3c1cae7b7306f7f (commit) via 6d5aecef8c4136fff8c9832324d4614b2b07c3c3 (commit) via 90147c2c330eccc64391cd05e5f2427d3ae11160 (commit) from 7f782be5e35a91d4a5d7e936799b561531f6ebfb (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 4322d0c7276f305db3bcf4f09889cb828e54b514 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 28 09:19:07 2023 +0000 core180: Ship bind Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0f334f0ef36c8751fccbdbdbe3c1cae7b7306f7f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Sep 22 21:04:56 2023 +0200 bind: Update to 9.16.44 For details see: https://downloads.isc.org/isc/bind9/9.16.44/doc/arm/html/notes.html#notes-f… Changes since 9.16.40: 9.16.44: "Previously, sending a specially crafted message over the control channel could cause the packet-parsing code to run out of available stack memory, causing named to terminate unexpectedly. This has been fixed. (CVE-2023-3341)" 9.16.43: "Processing already-queued queries received over TCP could cause an assertion failure, when the server was reconfigured at the same time or the cache was being flushed. This has been fixed." 9.16.42: "The overmem cleaning process has been improved, to prevent the cache from significantly exceeding the configured max-cache-size limit. (CVE-2023-2828) A query that prioritizes stale data over lookup triggers a fetch to refresh the stale data in cache. If the fetch is aborted for exceeding the recursion quota, it was possible for named to enter an infinite callback loop and crash due to stack overflow. This has been fixed. (CVE-2023-2911) Previously, it was possible for a delegation from cache to be returned to the client after the stale-answer-client-timeout duration. This has been fixed." 9.16.41: "When removing delegations from an opt-out range, empty-non-terminal NSEC3 records generated by those delegations were not cleaned up. This has been fixed." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6d5aecef8c4136fff8c9832324d4614b2b07c3c3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 28 09:18:12 2023 +0000 core180: Ship extrahd.pl Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 90147c2c330eccc64391cd05e5f2427d3ae11160 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 27 17:04:08 2023 +0200 extrahd: add forgotten udev_event handler to mount partitions via udev Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/extrahd/extrahd.pl | 17 +++++++++++++++++ config/rootfiles/common/bind | 14 +++++++------- .../rootfiles/{oldcore/100 => core/180}/filelists/bind | 0 config/rootfiles/core/180/filelists/files | 1 + lfs/bind | 4 ++-- 5 files changed, 27 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/100 => core/180}/filelists/bind (100%) Difference in files: diff --git a/config/extrahd/extrahd.pl b/config/extrahd/extrahd.pl index cc85228d5..bcde077d0 100644 --- a/config/extrahd/extrahd.pl +++ b/config/extrahd/extrahd.pl @@ -116,7 +116,21 @@ extrahd_umount() { done < /var/ipfire/extrahd/devices } +handle_udev_event() { + case "${ACTION}" in + add) + if [ -n "${ID_FS_UUID}" ]; then + extrahd_mount "UUID=${ID_FS_UUID}" || return $? + fi + ;; + esac + + return 0 +} + main() { + ( echo "$@"; set ) > /tmp/extrahd.$$ + local command="${1}" shift @@ -129,6 +143,9 @@ main() { umount) extrahd_umount "${@}" || rc="${rc}" ;; + udev-event) + handle_udev_event "${@}" || rc="${rc}" + ;; scanhd) exec /usr/local/bin/scanhd "${@}" ;; diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index eeeee6e94..ca3f17011 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -271,24 +271,24 @@ usr/bin/nsupdate #usr/include/pk11/site.h #usr/include/pkcs11 #usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.40.so +usr/lib/libbind9-9.16.44.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.40.so +usr/lib/libdns-9.16.44.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.40.so +usr/lib/libirs-9.16.44.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.40.so +usr/lib/libisc-9.16.44.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.40.so +usr/lib/libisccc-9.16.44.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.40.so +usr/lib/libisccfg-9.16.44.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.40.so +usr/lib/libns-9.16.44.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/core/180/filelists/bind b/config/rootfiles/core/180/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/180/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/180/filelists/files b/config/rootfiles/core/180/filelists/files index 8b44a36b1..986085e5e 100644 --- a/config/rootfiles/core/180/filelists/files +++ b/config/rootfiles/core/180/filelists/files @@ -9,3 +9,4 @@ opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/index.cgi var/ipfire/main/manualpages +var/ipfire/extrahd/bin/extrahd.pl diff --git a/lfs/bind b/lfs/bind index 850e3f93a..6779bb3d9 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.40 +VER = 9.16.44 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1ebfec11cc6902480113b1edadcbdb2f819050d779aaa1556ef79491c580a28106d3eff186da89bdecec03025e4e672342602f54e6b0e6f9619a181a1399e070 +$(DL_FILE)_BLAKE2 = cdca8289639d900ab8162e4b0252a495fa0c579b9399326c7df42699346c2f0bca24762dad29de187f142c0896f4012c3f5f3785126d325e7d30ccb73f1530d8 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1426e4823bb862dd38da56091fc882a58495b10a
by Michael Tremer 26 Sep '23

26 Sep '23

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1a2d32ff3c520f1fad637b9ca0dd6687a0213582
by Michael Tremer 26 Sep '23

26 Sep '23

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 3.x development tree". The branch, master has been updated via 1a2d32ff3c520f1fad637b9ca0dd6687a0213582 (commit) from 13a3dd67eda392061705a0b92588e0ee27ab1548 (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 1a2d32ff3c520f1fad637b9ca0dd6687a0213582 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 26 17:25:29 2023 +0000 curl: Update to 8.3.0 This version enables using c-ares, libidn2 and zstd, too. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: curl/curl.nm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) Difference in files: diff --git a/curl/curl.nm b/curl/curl.nm index 678df68ee..ab01052c4 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,8 +4,8 @@ ############################################################################### name = curl -version = 7.86.0 -release = 2.2 +version = 8.3.0 +release = 1 groups = Application/Internet url = https://curl.haxx.se/ @@ -24,27 +24,29 @@ source_dl = https://curl.haxx.se/download/ build requires + c-ares-devel groff - libidn-devel + libidn2-devel libssh2-devel libtool-devel nghttp2-devel openldap-devel openssl-devel zlib-devel + zstd-devel end configure_options += \ - --enable-hidden-symbols \ --disable-static \ --with-ca-bundle=/etc/pki/tls/certs/ca-bundle.crt \ - --with-libidn \ + --with-libidn2 \ --with-libssh2 \ --with-ssl \ + --enable-ares \ --enable-ldaps \ --enable-ipv6 \ --enable-manual \ - --enable-threaded-resolver + --enable-websockets # The testsuite runs services which bind to ports and # sends queries to the internet. This may fail in some hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 13a3dd67eda392061705a0b92588e0ee27ab1548
by Michael Tremer 21 Sep '23

21 Sep '23

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 3.x development tree". The branch, master has been updated via 13a3dd67eda392061705a0b92588e0ee27ab1548 (commit) via 8c4e2bd6b03cae0de5362d71492aa1a34387918a (commit) via ced38fd4a1cb65a909821685e55c62de8d5a3e53 (commit) via 945b678b293811c660bccd219f6bc7f9bbd05784 (commit) via 81604feac32145ab352717ac4f256417ec1915e5 (commit) via a1fc96fda8d00678f40e1f8fe91804b0279c465a (commit) via 561c9e03462236c92b8cbb09eff7562f31be2c29 (commit) via bfc5248283371c46b601f8ba6e7ef7bbcfa37750 (commit) via 305c96d4ebd65c20c06e7f61709e33c2507f2b88 (commit) via a1478112838d952de087e9a2cac471883b7023c7 (commit) via 8e8004369198f91195eb3109e869ce1c9c845a3e (commit) from 766d46bf415ebbc0b6611d511b7a47c57995f07d (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 13a3dd67eda392061705a0b92588e0ee27ab1548 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 20:43:30 2023 +0200 python3-pytz: Update to version 2023.3 - IPFire-3.x - Update from version 2022.6 to 2023.3 - As for python3-setuptools the source_dl had to be updated for the new version of pytz - Changelog - no info on the changes could be found but it seems to follow what tzdata updates. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8c4e2bd6b03cae0de5362d71492aa1a34387918a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 20:34:16 2023 +0200 python3-setuptools: Update to version 68.2.2-1 - IPFire-3.x - Update from version 65.6.3-1 to 68.2.2-1 - arches = noarch had to be removed otherwise the build came up with the error message that python3-setuptools could not be built for x86_64 and failed. Removing that line allowed the build to complete successfully. All the other python3 packages that I checked did not have that line in them. - The source_dl line required a change for the new version as the url is not maintained with the same structure for each version. - Changelog is too large to include here. Details can be read at the following link https://setuptools.pypa.io/en/stable/history.html Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ced38fd4a1cb65a909821685e55c62de8d5a3e53 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 17:48:09 2023 +0200 rpcsvc-proto: Update to version 1.4.4-1 - IPFire-3.x - Update from version 1.4.3-1 to 1.4.4-1 -Changelog 1.4.4 Use AC_SYS_LARGEFILE macro to control largefile support Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 945b678b293811c660bccd219f6bc7f9bbd05784 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 17:48:08 2023 +0200 rhash: Update to version 1.4.4-1 - IPFire-3.x - Update from version 1.4.3-1 to 1.4.4-1 - Changelog 1.4.4 New option --unverified to print unverified files New option --missing to print missing files New printf-format directive '%d' to print file directory Print the algorithms being calculated on -vv Renamed --maxdepth option to --max-depth Support leading and trailing spaces in a file names Support escaping of special characters in file paths Change the simple file format to fit the sfv format LibRHash: Remove obsolete rhash_timer functions (API breaking change) Bugfix: Fix slash usage with wilcards on Windows Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 81604feac32145ab352717ac4f256417ec1915e5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 17:48:07 2023 +0200 python3-tornado: Update to version 6.3.3-1 - IPFire-3.x - Update from version 6.2.0-1 to 6.3.3-1 - Changelog 6.3.3 The Content-Length header and chunked Transfer-Encoding sizes are now parsed more strictly (according to the relevant RFCs) to avoid potential request-smuggling vulnerabilities when deployed behind certain proxies. 6.3.2 Fixed an open redirect vulnerability in StaticFileHandler under certain configurations. 6.3.1 RequestHandler.set_cookie once again accepts capitalized keyword arguments for backwards compatibility. This is deprecated and in Tornado 7.0 only lowercase arguments will be accepted. 6.3.0 Highlights¶ The new Application setting xsrf_cookie_name can now be used to take advantage of the __Host cookie prefix for improved security. To use it, add {"xsrf_cookie_name": "__Host-xsrf", "xsrf_cookie_kwargs": {"secure": True}} to your Application settings. Note that this feature currently only works when HTTPS is used. WSGIContainer now supports running the application in a ThreadPoolExecutor so the event loop is no longer blocked. AsyncTestCase and AsyncHTTPTestCase, which were deprecated in Tornado 6.2, are no longer deprecated. WebSockets are now much faster at receiving large messages split into many fragments. General changes¶ Python 3.7 is no longer supported; the minimum supported Python version is 3.8. Python 3.12 is now supported. To avoid spurious deprecation warnings, users of Python 3.10 should upgrade to at least version 3.10.9, and users of Python 3.11 should upgrade to at least version 3.11.1. Tornado submodules are now imported automatically on demand. This means it is now possible to use a single import tornado statement and refer to objects in submodules such as tornado.web.RequestHandler. Deprecation notices¶ In Tornado 7.0, tornado.testing.ExpectLog will match WARNING and above regardless of the current logging configuration, unless the level argument is used. RequestHandler.get_secure_cookie is now a deprecated alias for RequestHandler.get_signed_cookie. RequestHandler.set_secure_cookie is now a deprecated alias for RequestHandler.set_signed_cookie. RequestHandler.clear_all_cookies is deprecated. No direct replacement is provided; RequestHandler.clear_cookie should be used on individual cookies. Calling the IOLoop constructor without a make_current argument, which was deprecated in Tornado 6.2, is no longer deprecated. AsyncTestCase and AsyncHTTPTestCase, which were deprecated in Tornado 6.2, are no longer deprecated. AsyncTestCase.get_new_ioloop is deprecated. tornado.auth¶ New method GoogleOAuth2Mixin.get_google_oauth_settings can now be overridden to get credentials from a source other than the Application settings. tornado.gen¶ contextvars now work properly when a @gen.coroutine calls a native coroutine. tornado.options¶ parse_config_file now recognizes single comma-separated strings (in addition to lists of strings) for options with multiple=True. tornado.web¶ New Application setting xsrf_cookie_name can be used to change the name of the XSRF cookie. This is most useful to take advantage of the __Host- cookie prefix. RequestHandler.get_secure_cookie and RequestHandler.set_secure_cookie (and related methods and attributes) have been renamed to get_signed_cookie and set_signed_cookie. This makes it more explicit what kind of security is provided, and avoids confusion with the Secure cookie attribute and __Secure- cookie prefix. The old names remain supported as deprecated aliases. RequestHandler.clear_cookie now accepts all keyword arguments accepted by set_cookie. In some cases clearing a cookie requires certain arguments to be passed the same way in which it was set. RequestHandler.clear_all_cookies now accepts additional keyword arguments for the same reason as clear_cookie. However, since the requirements for additional arguments mean that it cannot reliably clear all cookies, this method is now deprecated. tornado.websocket¶ It is now much faster (no longer quadratic) to receive large messages that have been split into many fragments. websocket_connect now accepts a resolver parameter. tornado.wsgi¶ WSGIContainer now accepts an executor parameter which can be used to run the WSGI application on a thread pool. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a1fc96fda8d00678f40e1f8fe91804b0279c465a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 17:48:06 2023 +0200 python3-setproctitle: Update to version 1.3.2-1 - IPFire-3.x - Update from version 1.3.1-1 to 1.3.2-1 - Changelog 1.3.2 Restore import-time initialization of macOS to avoid crash on thread+fork (issue #113). Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 561c9e03462236c92b8cbb09eff7562f31be2c29 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 17:48:05 2023 +0200 python3-psutil: Update to version 5.9.5-1 - IPFirer-3.x - Update from version 5.9.4-1 to 5.9.5-1 - Changelog 5.9.5 **Enhancements** - 2196_: in case of exception, display a cleaner error traceback by hiding the `KeyError` bit deriving from a missed cache hit. - 2217_: print the full traceback when a `DeprecationWarning` or `UserWarning` is raised. - 2230_, [OpenBSD]: `psutil.net_connections`_ implementation was rewritten from scratch: - We're now able to retrieve the path of AF_UNIX sockets (before it was an empty string) - The function is faster since it no longer iterates over all processes. - No longer produces duplicate connection entries. - 2238_: there are cases where `Process.cwd()`_ cannot be determined (e.g. directory no longer exists), in which case we returned either ``None`` or an empty string. This was consolidated and we now return ``""`` on all platforms. - 2239_, [UNIX]: if process is a zombie, and we can only determine part of the its truncated `Process.name()`_ (15 chars), don't fail with `ZombieProcess`_ when we try to guess the full name from the `Process.cmdline()`_. Just return the truncated name. - 2240_, [NetBSD], [OpenBSD]: add CI testing on every commit for NetBSD and OpenBSD platforms (python 3 only). **Bug fixes** - 1043_, [OpenBSD] `psutil.net_connections`_ returns duplicate entries. - 1915_, [Linux]: on certain kernels, ``"MemAvailable"`` field from ``/proc/meminfo`` returns ``0`` (possibly a kernel bug), in which case we calculate an approximation for ``available`` memory which matches "free" CLI utility. - 2164_, [Linux]: compilation fails on kernels < 2.6.27 (e.g. CentOS 5). - 2186_, [FreeBSD]: compilation fails with Clang 15. (patch by Po-Chuan Hsieh) - 2191_, [Linux]: `disk_partitions()`_: do not unnecessarily read /proc/filesystems and raise `AccessDenied`_ unless user specified `all=False` argument. - 2216_, [Windows]: fix tests when running in a virtual environment (patch by Matthieu Darbois) - 2225_, [POSIX]: `users()`_ loses precision for ``started`` attribute (off by 1 minute). - 2229_, [OpenBSD]: unable to properly recognize zombie processes. `NoSuchProcess`_ may be raised instead of `ZombieProcess`_. - 2231_, [NetBSD]: *available* `virtual_memory()`_ is higher than *total*. - 2234_, [NetBSD]: `virtual_memory()`_ metrics are wrong: *available* and *used* are too high. We now match values shown by *htop* CLI utility. - 2236_, [NetBSD]: `Process.num_threads()`_ and `Process.threads()`_ return threads that are already terminated. - 2237_, [OpenBSD], [NetBSD]: `Process.cwd()`_ may raise ``FileNotFoundError`` if cwd no longer exists. Return an empty string instead. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bfc5248283371c46b601f8ba6e7ef7bbcfa37750 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 17:48:04 2023 +0200 python3-parted-3.13.0-1 - IPFire-3.x - Update from vesrion 3.12.0-1 to 3.13.0-1 - Changelog 3.13.0 Help the _ped module garbage collection in the test suite (dcantrell) Use 'return NULL' rather than 'return (PyObject *) NULL' in pydisk.c (dcantrell) Use Py_VISIT() in *_traverse() functions (dcantrell) Free allocated memory for temporary string buffers (dcantrell) Use Py_RETURN_NONE through the _ped module code (dcantrell) Coding style updates for the C code. (dcantrell) Some minor cleanups for the test case code (dcantrell) Remove DeprecationWarning in py_ped_constraint_duplicate() (dcantrell) Drop remaining Python 2.x handling from the Makefile (dcantrell) drop six (pgajdos) Reformat all Python source code using Python black (dcantrell) Update the AUTHORS file (dcantrell) Replace outdated Red Hat sample GPLv2+ boilerplates (dcantrell) Add support for loongarch (mahailiang) tests: Add PARTITION_LINUX_HOME to flag tests (bcl) Add support for no_automount partition flag (bcl) Add new disk types - disk uuid and partition uuid (bcl) tests: Remove feature values from DiskTypeStrTestCase (bcl) Add tests for high level partition type ID / UUID (berrange) Add tests for low level partition type ID / UUID (berrange) Add test base class helper for re-opening the device (berrange) Add test base class for GPT partitions (berrange) Fix start sector for test partition (berrange) Add example for viewing and changing GPT partition type UUID (berrange) Accept device path via argv for partition dump example (berrange) Add type ID / UUID to partition dump example (berrange) Map partition type ID / UUID accessors to Partition class (berrange) Bind low level APIs for type ID and UUID accessors (berrange) tests: Remove DeviceFreeAllTestCase (bcl) Add support for new libparted disk type features in parted-3.5 (dcantrell) Small Makefile updates (dcantrell) Remove .travis.yml file (dcantrell) Rename COPYING to LICENSE (dcantrell) A few minor updates to README.md (dcantrell) Change README to README.md (dcantrell) Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 305c96d4ebd65c20c06e7f61709e33c2507f2b88 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 17:48:03 2023 +0200 python3-markupsafe-2.1.3-1 - IPFire-3.x - Update from version 2.1.1-1 to 2.1.3-1 - Changelog 2.1.3 Implement format_map, casefold, removeprefix, and removesuffix methods. #370 Fix static typing for basic str methods on Markup. #358 Use Self for annotating return types. #379 2.1.2 Fix striptags not stripping tags containing newlines. #310 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a1478112838d952de087e9a2cac471883b7023c7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 21 20:08:14 2023 +0000 dracut: Update to 059 The package has been moved to GitHub and is no longer releasing tarballs on kernel.org. It also requires sulogin. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e8004369198f91195eb3109e869ce1c9c845a3e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 21 20:07:49 2023 +0000 util-linux: Enable building sulogin This command is required by dracut and requires libxcrypt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: dracut/dracut.nm | 8 +++++--- python3-markupsafe/python3-markupsafe.nm | 2 +- python3-parted/python3-parted.nm | 2 +- python3-psutil/python3-psutil.nm | 2 +- python3-pytz/python3-pytz.nm | 4 ++-- python3-setproctitle/python3-setproctitle.nm | 2 +- python3-setuptools/python3-setuptools.nm | 5 ++--- python3-tornado/python3-tornado.nm | 2 +- rhash/rhash.nm | 2 +- rpcsvc-proto/rpcsvc-proto.nm | 2 +- util-linux/util-linux.nm | 4 +++- 11 files changed, 19 insertions(+), 16 deletions(-) Difference in files: diff --git a/dracut/dracut.nm b/dracut/dracut.nm index f2c08bb75..a2694d5ee 100644 --- a/dracut/dracut.nm +++ b/dracut/dracut.nm @@ -4,7 +4,7 @@ ############################################################################### name = dracut -version = 056 +version = 059 release = 1 groups = System/Boot @@ -16,8 +16,7 @@ description dracut is a new, event-driven initramfs infrastructure based around udev. end -source_dl = https://www.kernel.org/pub/linux/utils/boot/dracut/ -sources = %{thisapp}.tar.xz +source_dl = https://github.com/dracutdevs/dracut/archive/refs/tags/%{version}.tar.gz#/ build requires @@ -100,6 +99,9 @@ packages util-linux which zstd + + # Shell Commands + /usr/sbin/sulogin end end diff --git a/python3-markupsafe/python3-markupsafe.nm b/python3-markupsafe/python3-markupsafe.nm index 41e4b0a1f..12c9c1435 100644 --- a/python3-markupsafe/python3-markupsafe.nm +++ b/python3-markupsafe/python3-markupsafe.nm @@ -4,7 +4,7 @@ ############################################################################### name = python3-markupsafe -version = 2.1.1 +version = 2.1.3 release = 1 groups = Development/Tools diff --git a/python3-parted/python3-parted.nm b/python3-parted/python3-parted.nm index 1e5b81ce8..e32bb216f 100644 --- a/python3-parted/python3-parted.nm +++ b/python3-parted/python3-parted.nm @@ -4,7 +4,7 @@ ############################################################################### name = python3-parted -version = 3.12.0 +version = 3.13.0 release = 1 thisapp = pyparted-%{version} diff --git a/python3-psutil/python3-psutil.nm b/python3-psutil/python3-psutil.nm index 48c54c2c4..358b4395d 100644 --- a/python3-psutil/python3-psutil.nm +++ b/python3-psutil/python3-psutil.nm @@ -4,7 +4,7 @@ ############################################################################### name = python3-psutil -version = 5.9.4 +version = 5.9.5 release = 1 thisapp = psutil-release-%{version} diff --git a/python3-pytz/python3-pytz.nm b/python3-pytz/python3-pytz.nm index 93ed9aac6..1bf528521 100644 --- a/python3-pytz/python3-pytz.nm +++ b/python3-pytz/python3-pytz.nm @@ -4,7 +4,7 @@ ############################################################################### name = python3-pytz -version = 2022.6 +version = 2023.3 release = 1 thisapp = pytz-%{version} @@ -17,7 +17,7 @@ description pytz brings the Olson tz database into Python. end -source_dl = https://files.pythonhosted.org/packages/76/63/1be349ff0a44e4795d9712cc0b2d8… +source_dl = https://files.pythonhosted.org/packages/5e/32/12032aa8c673ee16707a9b6cdda2b… build requires diff --git a/python3-setproctitle/python3-setproctitle.nm b/python3-setproctitle/python3-setproctitle.nm index 924e6cdaf..1aff88745 100644 --- a/python3-setproctitle/python3-setproctitle.nm +++ b/python3-setproctitle/python3-setproctitle.nm @@ -4,7 +4,7 @@ ############################################################################### name = python3-setproctitle -version = 1.3.1 +version = 1.3.2 release = 1 thisapp = py-setproctitle-version-%{version} diff --git a/python3-setuptools/python3-setuptools.nm b/python3-setuptools/python3-setuptools.nm index d5d3d7ec9..5bf1f27bd 100644 --- a/python3-setuptools/python3-setuptools.nm +++ b/python3-setuptools/python3-setuptools.nm @@ -4,7 +4,7 @@ ############################################################################### name = python3-setuptools -version = 65.6.3 +version = 68.2.2 release = 1 thisapp = setuptools-%{version} @@ -19,10 +19,9 @@ description especially ones that have dependencies on other packages. end -source_dl = https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884… +source_dl = https://files.pythonhosted.org/packages/ef/cc/93f7213b2ab5ed383f98ce8020e63… build - arches = noarch requires python3 diff --git a/python3-tornado/python3-tornado.nm b/python3-tornado/python3-tornado.nm index f47647f3b..6a145966a 100644 --- a/python3-tornado/python3-tornado.nm +++ b/python3-tornado/python3-tornado.nm @@ -4,7 +4,7 @@ ############################################################################### name = python3-tornado -version = 6.2.0 +version = 6.3.3 release = 1 thisapp = tornado-%{version} diff --git a/rhash/rhash.nm b/rhash/rhash.nm index 534a2aa6b..e3caed046 100644 --- a/rhash/rhash.nm +++ b/rhash/rhash.nm @@ -4,7 +4,7 @@ ############################################################################### name = rhash -version = 1.4.3 +version = 1.4.4 release = 1 thisapp = RHash-%{version} diff --git a/rpcsvc-proto/rpcsvc-proto.nm b/rpcsvc-proto/rpcsvc-proto.nm index 359fe546d..4820a8efd 100644 --- a/rpcsvc-proto/rpcsvc-proto.nm +++ b/rpcsvc-proto/rpcsvc-proto.nm @@ -4,7 +4,7 @@ ############################################################################### name = rpcsvc-proto -version = 1.4.3 +version = 1.4.4 release = 1 groups = System/Libraries diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index 91a593600..d5eedeb89 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -6,7 +6,7 @@ name = util-linux ver_maj = 2.39 version = %{ver_maj}.2 -release = 2 +release = 3 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -31,6 +31,7 @@ build gettext libcap-devel libcap-ng-devel + libxcrypt-devel libudev-devel ncurses-devel pam-devel @@ -53,6 +54,7 @@ build --enable-write \ --enable-runuser \ --enable-su \ + --enable-sulogin \ --with-systemd \ --with-udev \ --disable-makeinstall-chown \ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 766d46bf415ebbc0b6611d511b7a47c57995f07d
by Michael Tremer 21 Sep '23

21 Sep '23

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 3.x development tree". The branch, master has been updated via 766d46bf415ebbc0b6611d511b7a47c57995f07d (commit) via 567f975ee9a5b0d5b23500cfe0a1bd873e58a00f (commit) via be6498df4ea31a9c26f593db7b0207db86db60da (commit) via 56848066e485d27f38d5f9c4bfecc88f132fd3c8 (commit) via 2621eb5de80142c71cf68985a88a2c477b9c5cb7 (commit) via 4d1911f4ebedbdd3a42bf5a3cacd75cf157639ca (commit) via 54654accc4cc789fb450a57beb62b18168edd4cb (commit) from fdc5bfe81fb555778895950a4003cef0ebb6a90e (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 766d46bf415ebbc0b6611d511b7a47c57995f07d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 21 17:01:35 2023 +0000 hwloc: Update to 2.9.3 This patch also fixes the testsuite by disabling the gather topology test which runs fine in the hosted build environment, but fails on my own build VM. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 567f975ee9a5b0d5b23500cfe0a1bd873e58a00f Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 15:18:08 2023 +0200 squid: Update to version 6.3-1 - IPFire-3.x - Update from version 5.7-2 to 6.3-1 - Changelog 6.3 (03 Sep 2023): - Bug 5294: ERR_CANNOT_FORWARD returned instead of ERR_DNS_FAIL - Bug 4981: Work around in-call job invalidation bugs - basic_smb_lm_auth: fix 'no previous declaration' warnings - CacheManager: require /squid-internal-mgr/ URL path prefix - ESI: Fix build [-Wsingle-bit-bitfield-constant-conversion] - ... and some documentation changes 6.2 (06 Aug 2023): - Bug 5187: Work around REQMOD satisfaction regression - Bug 5290: pure virtual call in Ftp::Client constructor - Fix memory leak when reconfiguring multiline all-of ACLs - ... and a lot of code cleanups - ... and some portability fixes on GNU/Hurd and MSWindows 6.1 (06 Jul 2023): - Bug 5278: Log %err_code for "early" request handling errors - Do not cache (and do not serve cached) cache manager responses - Fix key equality comparison in LookupTable map - Honor DNS RR TTLs larger than negative_dns_ttl - ... and some documentation changes 6.0.3 (07 Jun 2023): - Bug 5148: Log %Ss of failed tunnels as TCP_TUNNEL - Do not leak Security::CertErrors created in X509_verify_cert() - Do not erase aborted StoreMap entries that are still being read - Fix build in environments lacking syslog - Fix build failures in some environments due to time_t type conflicts in libdebug - Remove obsolete caddr_t - ... and some documentation changes 6.0.2 (30 Apr 2023): - Avoid excessive disk I/O in some environments - ... and several build and portability fixes - ... and all fixes from 5.9 6.0.1 (28 Feb 2023): - Bug 5256: Intercepting port fails to accept - Bug 5241: Block all non-localhost requests by default - Bug 5241: Block to-localhost, to-link-local requests by default - Bug 5232: Fix GCC v12 build [-Wuse-after-free] - Bug 5211: support.cc:355: "!filledCheck->sslErrors" assertion - Bug 5194: Remove all unused debug sections - Bug 5162: mgr:index URL do not produce MGR_INDEX template - Bug 5129 pt1: remove Lock use from HttpRequestMethod - Bug 5128: Translation: Fix % i typo in es/ERR_FORWARDING_DENIED - Bug 5021: Add a script to fix spelling error with codespell - Bug 4946: client_side_request.cc: "request != newRequest" - Bug 4832: '!schemeAccess' assertion on exit - Bug 4572: squidclient: Remove deprecated cache_object:// support - Bug 4528: ICAP transactions quit on async DNS lookups - Add scripts/trace-context.pl: a debugging tool - Remove cache_diff tool - Remove membanger tool - Remove pconn-banger tool - Remove recv-announce tool - Remove send-announce tool - Remove tcp-banger* tools - Remove ufsdump tool - Remove support for Gopher protocol - Remove support for unused libbsd - Remove bundled GnuRegex library - Remove CPU profiler mechanism - Remove leakfinder (--enable-leakfinder) - Remove --enable-kill-parent-hack - Remove --disable-loadable-modules - Remove unused/disabled/broken LEAK_CHECK_MODE code - Remove SCO 3.2 support - Remove m88k-specific support - Remove NeXTSTEP support - Remove HPUX compiler support - Remove CBDATA debugging - Require C++17 - cachemgr.cgi: Remove deprecated cache_object:// support - ext_kerberos_ldap_group_acl: Support -b with -D - ext_lm_group_acl: Improved username handling - negotiate_wrapper: ensure null-termination of strings - pinger: Fix MAX_PKT{4,6}_SZ to account for icmpEchoData padding - HTTP: Replaced X-Cache and X-Cache-Lookup headers with Cache-Status - HTTP: Update Host, Via, and other headers in-place when possible - HTTP: Update status code 413 compliance - RFC 9110: Reject different HTTP requests with unusual framing - RFC 9111: Stop treating Warning specially - RFC 9113: update documentation references - RFC 9218: Priority header registration - SSL-Bump: Remove step2+ stare-and-splice and peek-and-bump support - TLS: Do not send more than one self-signed certificate - TLS: Sort CA certificates in tls-cert=bundle - TLS: Preserve configured order of intermediate CA certificate chain - WCCP: Validate packets better - CI: Support "negative" squid-conf-tests - CI: Maintenance: Support custom astyle versions - CI: test-builds.sh: in case of error dump full log - CI: Add --progress option to test-builds.sh - CI: Change time_units test to also work on 32bit systems - CI: Maintenance: Update astyle version to 3.1 - Add cache_log_message directive - Add paranoid_hit_validation directive - Add tls_key_log to report TLS communication secrets - Add %busy_time logformat code - Add %transport::>connection_id logformat code - Add %request_attempts logformat code - Warn about some bad from-helper annotations - Ban acl key changes in req_header, rep_header, and note ACLs - Optimize ephemeral port reuse with IP_BIND_ADDRESS_NO_PORT - Honor httpd_suppress_version_string in more contexts - Honor ftp_port worker-queues option - Log early level-0/1 debugs() messages to cache_log - Support reliable zeroing of sensitive buffers - Do not overwrite caching bans - Do not blame cache_peer for 4xx CONNECT responses - Mimic GET reforwarding decisions when our CONNECT fails - Discarded connections do not contribute to forward_max_tries - Honor assertions during shutdown - Do not stop listening after "ERROR: NAT/TPROXY lookup failed..." - Do not skip problematic regexes in ACLs - Improve coredump_dir on FreeBSD and Solaris based OS - Avoid reverse DNS lookups when logformat %>A is unused - BUG: Unexpected state while connecting to ... server - Properly track (and mark) truncated store entries - Support "file" syntax for 'squid_error' and 'has' ACL parameters - Allow sending "squid -k ..." signals to PID 1 - Remove bogus "found KEY_PRIVATE" WARNINGs - Avoid "BUG #3329: Lost orphan ..." during accept problems - Report SMP store queues state (mgr:store_queues) - Remove 8K limit for single access.log line - Rename ./configure option --with-libxml2 to --with-xml2 - Rename ./configure option --with-libcap to --with-cap - Match ./configure --help parameter names with their defaults - Remove broken -sha1 option from server_cert_fingerprint - Fix typo in manager ACL - Fix milliseconds in certain cache.log messages - Fix ignore-cc/act-as-origin in wildcard split-stack ports - Fix comm.cc:644: "address.port() != 0" assertion - Fix StoreMap.cc "anchorAt(anchorId).reading()" assertions - Fix double-free segmentation fault on shutdown - Fix client_side_request.cc:2028 "request->method.id()" assertion - Fix reconfiguration leaking tls-cert=... memory - Fix X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY handling - Fix "mem_obj->inmem_lo == 0" assertion in StoreEntry::swapOut() - Fix TCP keepalive - Fix SslBump reconfiguration leaking public key memory - Fix socket accounting for TCP accept() - ... and many documentation changes - ... and much code cleanup and polishing - ... and all fixes from 5.8 5.9 (30 Apr 2023): - Improve reply_body_max_size matching accuracy - ... and some documentation changes - ... and many portability fixes 5.8 (28 Feb 2023): - Bug 5162: mgr:index URL do not produce MGR_INDEX template - Bug 5241: Block all non-localhost requests by default - Bug 5241: Block to-localhost, to-link-local requests by default - ext_kerberos_ldap_group_acl: Support -b with -D - Fix ACL type typo in req_header, rep_header key-changing ERRORs - ... and several compile fixes - ... and some code cleanup and polishing Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit be6498df4ea31a9c26f593db7b0207db86db60da Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 14:38:32 2023 +0200 samba: Update to version 4.19.0-1 - IPFire-3.x - Update from version 4.17.5-2 to 4.19.0-1 - This is a patch series together with updates to libldb, libtalloc, libtdb and libtevent as version 4.19.0 of samba requires newer versions of all these libs. - Changelog is a bit too large to include here. The release notes for each of the versions can be found in the left hand column of this link https://www.samba.org/samba/history/ Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 56848066e485d27f38d5f9c4bfecc88f132fd3c8 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 14:38:31 2023 +0200 libtevent: Update to version 0.15.0-1 - IPFire-3.x - Update from version 0.13.0-2 to 0.15.0-1 - This version is required by samba-4.19.0 - Changelog - I could not find any changelog info on this package. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2621eb5de80142c71cf68985a88a2c477b9c5cb7 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 14:38:30 2023 +0200 libtdb: Update to version 1.4.9-1 - IPFire-3.x - Update from version 1.4.7-2 to 1.4.9-1 - This version is required by samba-4.19.0 - Changelog - I could not find any changelog info on this package. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4d1911f4ebedbdd3a42bf5a3cacd75cf157639ca Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 14:38:29 2023 +0200 libtalloc: Update to version 2.4.1-1 - IPFire-3.x - Update from version 2.3.4-2 to 2.4.1-1 - This version is required by samba-4.19.0 - Changelog - I could not find any changelog info on this package. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 54654accc4cc789fb450a57beb62b18168edd4cb Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Sep 21 14:38:28 2023 +0200 libldb: Update to version 2.8.0-1 - IPFire-3.x - Update from version 2.6.1-2 to 2.8.0-1 - This version is required for samba-4.19.0 - Changelog - I could not find any changelog info anywhere. Apparently there is a git repo for this package but I could not find it. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: hwloc/hwloc.nm | 8 +++++--- libldb/libldb.nm | 10 +++++----- libtalloc/libtalloc.nm | 4 ++-- libtdb/libtdb.nm | 4 ++-- libtevent/libtevent.nm | 4 ++-- samba/samba.nm | 13 +++++++------ squid/squid.nm | 6 +++--- 7 files changed, 26 insertions(+), 23 deletions(-) Difference in files: diff --git a/hwloc/hwloc.nm b/hwloc/hwloc.nm index a8b8b6137..1583947cf 100644 --- a/hwloc/hwloc.nm +++ b/hwloc/hwloc.nm @@ -4,7 +4,7 @@ ############################################################################### name = hwloc -version = %{ver_maj}.0 +version = %{ver_maj}.3 ver_maj = 2.9 release = 1 @@ -39,9 +39,11 @@ build configure_options += \ --enable-plugins + # Disable the gather-topology test which fails in the build environment + export HWLOC_TEST_GATHER_TOPOLOGY=0 + test - LD_LIBRARY_PATH="%{DIR_APP}/hwloc/.libs" \ - make check XFAIL_TESTS="test-gather-topology.sh" + make check LD_LIBRARY_PATH="%{DIR_APP}/hwloc/.libs" end end diff --git a/libldb/libldb.nm b/libldb/libldb.nm index fc242ef82..70ce8ec59 100644 --- a/libldb/libldb.nm +++ b/libldb/libldb.nm @@ -4,8 +4,8 @@ ############################################################################### name = libldb -version = 2.6.1 -release = 2 +version = 2.8.0 +release = 1 thisapp = ldb-%{version} groups = System/Libraries @@ -25,9 +25,9 @@ build cmocka-devel docbook-utils docbook-xsl - libtalloc-devel >= 2.1.5 - libtdb-devel >= 1.3.8 - libtevent-devel >= 0.9.27 + libtalloc-devel >= 2.4.1 + libtdb-devel >= 1.4.9 + libtevent-devel >= 0.15.0 libtirpc-devel libxcrypt-devel lmdb-devel >= 0.9.16 diff --git a/libtalloc/libtalloc.nm b/libtalloc/libtalloc.nm index fc079ea6b..1778f1046 100644 --- a/libtalloc/libtalloc.nm +++ b/libtalloc/libtalloc.nm @@ -4,8 +4,8 @@ ############################################################################### name = libtalloc -version = 2.3.4 -release = 2 +version = 2.4.1 +release = 1 thisapp = talloc-%{version} groups = System/Libraries diff --git a/libtdb/libtdb.nm b/libtdb/libtdb.nm index b85fb53cf..aafd003e7 100644 --- a/libtdb/libtdb.nm +++ b/libtdb/libtdb.nm @@ -4,8 +4,8 @@ ############################################################################### name = libtdb -version = 1.4.7 -release = 2 +version = 1.4.9 +release = 1 thisapp = tdb-%{version} groups = System/Libraries diff --git a/libtevent/libtevent.nm b/libtevent/libtevent.nm index d179133d2..181ab4350 100644 --- a/libtevent/libtevent.nm +++ b/libtevent/libtevent.nm @@ -4,8 +4,8 @@ ############################################################################### name = libtevent -version = 0.13.0 -release = 2 +version = 0.15.0 +release = 1 thisapp = tevent-%{version} groups = System/Libraries diff --git a/samba/samba.nm b/samba/samba.nm index 1e4831359..205439fea 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -4,8 +4,8 @@ ############################################################################### name = samba -version = 4.17.5 -release = 2 +version = 4.19.0 +release = 1 groups = Networking/Daemons url = https://www.samba.org/ @@ -50,10 +50,10 @@ build libarchive-devel libattr-devel libcap-devel - libldb-devel = 2.6.1 - libtalloc-devel >= 2.1.8 - libtdb-devel >=1.3.11 - libtevent-devel >= 0.9.29 + libldb-devel >= 2.8.0 + libtalloc-devel >= 2.4.1 + libtdb-devel >= 1.4.9 + libtevent-devel >= 0.15.0 libxcrypt-devel openldap-devel openssl-devel @@ -61,6 +61,7 @@ build perl(base) perl(FindBin) perl(JSON) + perl(JSON::PP) perl(Parse::Yapp::Driver) >= 1.21 popt-devel python3-devel diff --git a/squid/squid.nm b/squid/squid.nm index 053c05543..0441ae658 100644 --- a/squid/squid.nm +++ b/squid/squid.nm @@ -4,10 +4,10 @@ ############################################################################### name = squid -major_ver = 5 -minor_ver = 7 +major_ver = 6 +minor_ver = 3 version = %{major_ver}.%{minor_ver} -release = 2 +release = 1 groups = Networking/Daemons url = https://www.squid-cache.org/ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdc5bfe81fb555778895950a4003cef0ebb6a90e
by Michael Tremer 21 Sep '23

21 Sep '23

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2023