IPFire-SCM May 2023

ipfire-scm@lists.ipfire.org

1 participants
30 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3737b8e98edcc536c6071a5bdb8de7fe7277984c
by Peter Müller 12 May '23

12 May '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 3737b8e98edcc536c6071a5bdb8de7fe7277984c (commit) from 15d8e278ba1ebcfd41f6d0e6b3f150ada66d8507 (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 3737b8e98edcc536c6071a5bdb8de7fe7277984c Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Fri May 12 08:47:59 2023 +0000 Revert "zabbix_agentd: Update to 6.0.16 (LTS)" This reverts commit 2c21437bef63f58a33f2c6e8955c0dfce7d208d6. https://lists.ipfire.org/pipermail/development/2023-May/015885.html - reverting this temporarily to ensure the nightly builds will run through. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/zabbix_agentd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index 4f2a8b5d8..918ad88ef 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -26,7 +26,7 @@ include Config SUMMARY = Zabbix Agent -VER = 6.0.16 +VER = 6.0.6 THISAPP = zabbix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 7 +PAK_VER = 6 DEPS = fping @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 87f7c043f30ef9902b3673e2d444e37b32ef998d178fa5718ed9aa098f841f23237d79e54985ba3a415a86433a685387af33810f53a78837be6a1aa2870ed65a +$(DL_FILE)_BLAKE2 = f9d07ca8938ae4e5e47048c32872644caeda0ecdef17513c63c63d1ce2aaa4ac0c92e6c70932bc598ff908419dae05bab32924f5973a5528b5668f7c7c2c5a17 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 15d8e278ba1ebcfd41f6d0e6b3f150ada66d8507
by Peter Müller 11 May '23

11 May '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 15d8e278ba1ebcfd41f6d0e6b3f150ada66d8507 (commit) from 30b904fb80dc589faec04d2ad590110211a45b08 (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 15d8e278ba1ebcfd41f6d0e6b3f150ada66d8507 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:34:43 2023 +0000 Run ./make.sh update-contributors Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/credits.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 079fdf494..88e832963 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -80,12 +80,12 @@ Ben Schweikert, Daniel Weismüller, Peter Pfeiffer, Daniel Glanzmann, +Robin Roevens, Heiner Schmeling, Stephan Feddersen, -Robin Roevens, Stéphane Pautrel, -Tim FitzGeorge, Jon Murphy, +Tim FitzGeorge, Jan Lentfer, Marcus Scholz, Ersan Yildirim, hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 30b904fb80dc589faec04d2ad590110211a45b08
by Peter Müller 11 May '23

11 May '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 30b904fb80dc589faec04d2ad590110211a45b08 (commit) via 31620ed428b4ef033fce55f42f97c6c393695b45 (commit) via 34864407201f4e53b68a7cbd9f50ec1a69761f0d (commit) via cf1b407f05cdf095331b478553a8fcb0c6ddb810 (commit) via b2e7b0a28b882e9a55b9d7e4bb3eb9fbf3cbfde5 (commit) via 3e501253bdb14d51e01a04d1d2172ea4b5a6ed89 (commit) via 133b2ae6bb594c969253f04eebdaa211b3adee0c (commit) via 173f1ffca394319437bd215719242229a8298bfe (commit) via cef4daddf7bef15683a9106dbe759088eb9471f8 (commit) via 0921556c85e430566ba3e2a6ed384ff46c0befc1 (commit) via ad6ad54f18042e92c4d90dcf1f9a28e341565cf4 (commit) via c797789c1f45dc76f4cf933ad3e3d24376c2b76e (commit) via 4e28814b6f9378ec1dad7bf62243bf4ccf214397 (commit) via 238a0468da6a6d1fdfa236969e5dd43029dcb85a (commit) via 908f3783ec544ea0da998c5840a47d5f138882b2 (commit) via d83b6fc6df76b9feefdb53ebd7c7516820004e92 (commit) via 9a671e7ae4cb53cba2f479e02afae864ad06298d (commit) via 34a9705d95da4d48e775c7c3ec60721d58adfc40 (commit) via e155e2f99938555576b25b1be4a31a3c0a492ae4 (commit) via b4f19c6d93503b2c1be6258715b133bde91bb674 (commit) via 957b6f92b920d511e88320ba4bf803e6b72c9b61 (commit) via ce195c328ecd4a8a632aaace236b502762d99d65 (commit) via 2c21437bef63f58a33f2c6e8955c0dfce7d208d6 (commit) via a475adc183212b07fca5808e43e035c041df7d74 (commit) via 747fbd6507aa986263a3518051c8aff81c555c1c (commit) via 4cc36e3861a144ff4c1edbfd3545e26b049d8e9c (commit) via c1ef4566cfe85f25a624ab56acd9c835a27c1688 (commit) via cb73ca19a6152689e130502a6d28fec5145ef288 (commit) from cb251d2fbb258eb1cd2484dc129c01e14c1f35af (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 30b904fb80dc589faec04d2ad590110211a45b08 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:29:21 2023 +0000 Core Update 175: Remove orphaned qpdf libraries, if present Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 31620ed428b4ef033fce55f42f97c6c393695b45 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:28:45 2023 +0000 Core Update 175: Ship more files dependant on OpenSSL Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 34864407201f4e53b68a7cbd9f50ec1a69761f0d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:19:20 2023 +0000 Housekeeping: Only mark files as executable if they have to be Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit cf1b407f05cdf095331b478553a8fcb0c6ddb810 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:11:04 2023 +0000 Core Update 175: Ship mpfr Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit b2e7b0a28b882e9a55b9d7e4bb3eb9fbf3cbfde5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu May 11 14:39:42 2023 +0200 mpfr: Update to include the latest four bug patches - The base version has not changed but patches to fix 4 bugs have been released. - Update to rootfile not required. - Bug fix changelog 1 A test of the thousands separator in tsprintf.c is based on the output from the GNU C Library up to 2.36, which is incorrect. The output has changed in 2.37 (partly fixed), so that tsprintf fails with glibc 2.37. The tsprintf-thousands patch modifies the test to conform to POSIX and also avoid the buggy case in 2.36 and below. However, this new test, which was expected to succeed, triggers a serious bug in 2.37 (bug 30068 / CVE-2023-25139). We did not modify the test again since this bug affects MPFR's mpfr_sprintf function, with a possible buffer overflow in particular cases. This bug has been fixed in the 2.37 branch. In short, this patch is useful (and needed) for a fixed glibc 2.37 and some other libraries, depending on the current locales. Corresponding changesets in the 4.2 branch: 4f03d40b5, 78ff7526d, e66bb7121. 2 The mpfr_ui_pow_ui function has infinite loop in case of overflow. This can affect mpfr_log10, which uses this function (this is how this bug was found). This bug is fixed by the ui_pow_ui-overflow patch (with testcases). Corresponding changeset in the 4.2 branch: 0216f40ed. 3 The tfprintf and tprintf tests may fail in locales where decimal_point has several bytes, such as ps_AF. This is fixed by the multibyte-decimal_point patch, which makes the tests aware of the length of decimal_point. Corresponding changeset in the 4.2 branch: 0383bea85. 4 In particular cases that are very hard to round, mpfr_rec_sqrt may yield a stack overflow due to many small allocations in the stack, based on alloca(). This is due to the fact that the working precision is increased each step (Ziv loop) by 32 or 64 bits only, until the approximate result can be rounded (thus we have an arithmetic progression here, while a geometric progression is used for the other functions), and that at each iteration, the previous allocations in the stack cannot be freed. Individual allocations in the stack are limited to 16384 bytes, so that the issue can occur only when there are many iterations in working precisions that are not too large, which is possible with an arithmetic progression. This bug is fixed by the rec_sqrt-zivloop patch, which changes the Ziv loop to use the standard MPFR_ZIV_* macros; the patch also provides a testcase obtained by a function that constructs a hard-to-round case involving large enough precisions (this function is commonly used in the MPFR testsuite, but not with so large precisions). This bug was originally reported by Fredrik Johansson. Corresponding changeset in the 4.2 branch: 934dd8842. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 3e501253bdb14d51e01a04d1d2172ea4b5a6ed89 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu May 11 14:39:41 2023 +0200 lvm2: housekeeping - remove invalid configure option - Since lvmetad was removed then the configure option --enable-lvmetad is no longer valid. A warning is now shown - configure: WARNING: unrecognized options: --enable-lvmetad Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 133b2ae6bb594c969253f04eebdaa211b3adee0c Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed May 10 22:41:10 2023 +0200 libcap: Adjust the lfs file to place pkg-config files in the correct place - libcap places the files by default in /lib and not /usr/lib etc. To fix this libcap made a symlink for the library file from /lib to /usr/lib. However the .pc files were left in /lib/pkgconfig and not /usr/lib/pkgconfig and were therefore not found by the update of rng-tools which now required libcap to be found. - Changed the prefix settings for libcap which placed the libraries and .pc files in the correct locations while keeping the executables in their existing location. - This removed the need for symlinking /usr/lib/libcap.so to /lib/libcap.so.2.67 as the libraries are now placed in /usr/lib - Installed the ipfire build with these changes into a vm system and confirmed that everything worked. Input from Michael Tremer that if ping worked then libcap was functioning correctly. - The prefixes have to be applied to both make and make install to end up with the files in the correct places. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 173f1ffca394319437bd215719242229a8298bfe Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed May 10 22:41:09 2023 +0200 rng-tools: Update to version 2.16 - This v2 version corrects an error where a debug echo statement was left in the lfs file - Update from version 2.14 to 2.16 - Update of rootfile not required - Version 2.16 required libcap to be available, which it is, but it could not be found by rng-tools. This is because rng-tools is using pkg-config and the required libcap.pc file was not stored in the standard directory location for .pc files. Therefore a patch for libcap is bundled together with this update to fix this. Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit cef4daddf7bef15683a9106dbe759088eb9471f8 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:09:23 2023 +0000 Core Update 175: Remove orphaned lvmetad initscript Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 0921556c85e430566ba3e2a6ed384ff46c0befc1 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed May 10 19:17:46 2023 +0200 initscripts: removal of lvmetad initscript - With the last update of lvm2 lvmetad was removed from lvm2. I did not recognise that lvmetad had been setup as an automatic initscript, so it no longer works as the binary is no longer provided. - This patch removes the lvmetad initscript, the reference to lvmetad in the initscript lfs file and the lvmetad initscript entries in the rootfile for each architecture. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ad6ad54f18042e92c4d90dcf1f9a28e341565cf4 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:07:33 2023 +0000 Core Update 175: Ship backup.cgi Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit c797789c1f45dc76f4cf933ad3e3d24376c2b76e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed May 10 11:52:03 2023 +0200 backup.cgi: Read and deliver the requested backup in pieces Read-in the requested backup file line by line and directly deliver this as stream to the client. This fixes the problem with very big backups on systems with very limited RAM, which resulted in an OOM kill of the CGI and delivery process. Fixes #13096. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4e28814b6f9378ec1dad7bf62243bf4ccf214397 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon May 8 19:07:23 2023 +0200 alsa: Uncomment the conf file names in the rootfile - Based on input from Arne Fitzenreiter there are conf files that alsa complains about if they are not present. This patch uncomments all the default conf files - The backup include file is also added to the rootfile. Suggested-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 238a0468da6a6d1fdfa236969e5dd43029dcb85a Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon May 8 19:07:22 2023 +0200 alsa: Fixes Bug#13087 - module removal & path correction for asound.state file - start_service added to install.sh and stop_service to uninstall.sh This ensures that the modules are loaded after install - The /etc/asound.state file was touched by the install.sh cript but the alsactl store and restore commands have default location of /var/lib/alsa/ so the touch command created an asound.state file that was then not used subsequently. It also meant that the first start of alsa would fail as it would try and restore from /var/lib/alsa/asound.state but the file did not exist. - This patch corrects the path for the touch command for asound.state - The install.sh script also checks if /etc/asound.state, that was never used, exists and if it does removes it. - Uninstalling alsa left the sound modules installed until a reboot was carried out. Uninstallation should unload the alsa kernel modules. This patch adds the modprobe -r commands to the uninstall.sh file to unload all the snd modules when alsa is uninstalled. - make_backup and restore_backup commands added to ther install.sh and uninstall.sh scripts Fixes: Bug#13087 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 908f3783ec544ea0da998c5840a47d5f138882b2 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon May 8 19:07:21 2023 +0200 alsa: Add in a backup include file for alsa specifying the asound.state file - This will backup the sound card status with the asound.state file when the addon is uninstalled so that if it is re-installed in the future the status can be rerstored. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit d83b6fc6df76b9feefdb53ebd7c7516820004e92 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon May 8 19:07:20 2023 +0200 alsa: Fix bug#13087 remove services entry - alsa has an initscript but it is not starting and stopping a traditional daemon service. The initscript loads some alsa modules and then restores the asound.state file - This patch updates the PAK_VER number and removes the services entry and explicitly adds alsa in for the initscript installation. - Additionally this patch also adds the installation of a backup include file for alsa which savces the soundcards status file asound.state Fixes: Bug#13087 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 9a671e7ae4cb53cba2f479e02afae864ad06298d Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:06:06 2023 +0000 Core Update 175: Ship and restart Squid Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 34a9705d95da4d48e775c7c3ec60721d58adfc40 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed May 3 21:00:34 2023 +0200 squid: Update to 5.9 For details see: https://github.com/squid-cache/squid/commits/v5 The translation files are back in the source code... ;-) Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> commit e155e2f99938555576b25b1be4a31a3c0a492ae4 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Tue Apr 18 20:52:00 2023 +0000 linux: Compile "Intel XHCI USB Role Switch" as a module on x86_64 From the kernel documentation: > Driver for the internal USB role switch for switching the USB data > lines between the xHCI host controller and the dwc3 gadget controller > found on various Intel SoCs. [...] This may unblock USB-LAN-adaptor usage on certain boards, as reported once in #12750. Overall affected devices seem to be scanty; nevertheless, enabling this as a module only is highly unlikely to cause any harm, so let's give it a try. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit b4f19c6d93503b2c1be6258715b133bde91bb674 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:04:12 2023 +0000 Core Update 175: Ship log.dat Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 957b6f92b920d511e88320ba4bf803e6b72c9b61 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Tue Apr 18 20:45:12 2023 +0200 Add Zabbix Agent to logviewer - Configure Zabbix Agent to log to syslog instead of its own logs. - Remove old zabbix log-dir and logrotate settings from rootfile, lfs and install-script. - Update log.dat to view Zabbix Agent logging from syslog. Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit ce195c328ecd4a8a632aaace236b502762d99d65 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Tue Apr 18 20:45:11 2023 +0200 Bugfix: compatibility with grep 3.8+ Fix "grep: warning: stray \ before /" message on Zabbix Agent ipfire.net.fw.hits item introduced by grep 3.8 in https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=40b5df3942149738529c22c… Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit 2c21437bef63f58a33f2c6e8955c0dfce7d208d6 Author: Robin Roevens <robin.roevens(a)disroot.org> Date: Tue Apr 18 20:45:10 2023 +0200 zabbix_agentd: Update to 6.0.16 (LTS) - Update from version 6.0.6 to 6.0.16 - Update of rootfile not required - Changelog No substantial changes for Agent Linux version Changelogs since 6.0.6: - https://www.zabbix.com/rn/rn6.0.7 - https://www.zabbix.com/rn/rn6.0.8 - https://www.zabbix.com/rn/rn6.0.9 - https://www.zabbix.com/rn/rn6.0.10 - https://www.zabbix.com/rn/rn6.0.11 - https://www.zabbix.com/rn/rn6.0.12 - https://www.zabbix.com/rn/rn6.0.13 - https://www.zabbix.com/rn/rn6.0.14 - https://www.zabbix.com/rn/rn6.0.15 - https://www.zabbix.com/rn/rn6.0.16 Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org> commit a475adc183212b07fca5808e43e035c041df7d74 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:02:12 2023 +0000 Core Update 175: Ship and restart Suricata Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 747fbd6507aa986263a3518051c8aff81c555c1c Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu May 11 20:01:34 2023 +0000 Core Update 175: Ship libhtp Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 4cc36e3861a144ff4c1edbfd3545e26b049d8e9c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 14 10:20:28 2023 +0200 libhtp: Update to 0.5.43 For details see: https://github.com/OISF/libhtp/releases/tag/0.5.43 "htp: do not log content-encoding: none htp: do not error on multiple 100 Continue readme: remove note on libhtp not being stable uri: fix compile warning strict-prototypes bstr: fix compile warning strict-prototypes fuzz_diff: Free the rust test object. github: add CIFuzz workflow" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> commit c1ef4566cfe85f25a624ab56acd9c835a27c1688 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 14 10:20:27 2023 +0200 suricata: Update to 6.0.11 Excerpt from changelog: "6.0.11 -- 2023-04-13 Security #5947: byte_math: Division by zero possible. (6.0.x backport) Bug #5970: detect: reload can stall if flow housekeeping takes too long (6.0.x backport) Bug #5967: flowworker: Assertion in CheckWorkQueue (6.0.x backport) Bug #5953: http: multipart data is not filled up to request.body-limit (6.0.x backport) Bug #5951: detect: multi-tenancy crash (6.0.x backport) Bug #5950: http2: quadratic complexity when reducing dynamic headers table size (6.0.x backport) Bug #5949: smtp: quadratic complexity for tx iterator with linked list (6.0.x backport) Bug #5948: fast_pattern assignment of specific content in combination with urilen results in FN (6.0.x backport) Bug #5946: flow/manager: fix unhandled division by 0 (prealloc: 0) (6.0.x backport) Bug #5942: exception/policy: flow action doesn't fall back to packet action when there's no flow (6.0.x backports) Bug #5933: smb: tx logs sometimes have duplicate `tree_id` output (6.0.x backport) Bug #5932: rfb/eve: depth in pixel format logged twice (6.0.x backport) Bug #5906: dns: unused events field can overflow as an integer Bug #5903: UBSAN: undefined shift in DetectByteMathDoMatch (6.0.x backport) Bug #5899: smb: no consistency check between NBSS length and length field for some SMB operations (6.0.x backport) Bug #5898: smb: possible evasion with trailing nbss data (6.0.x backport) Bug #5896: base64_decode not populating up to an invalid character (6.0.x backport) Bug #5895: stream: connections time out too early (6.0.x backport) Bug #5889: stream: SYN/ACK timestamp checking blocks valid traffic (6.0.x backport) Bug #5888: false-positive drop event_types possible on passed packets (6.0.x backport) Bug #5887: stream: overlap with different data false positive (6.0.x backport) Bug #5886: mime: debug assertion on fuzz input (6.0.x backport) Bug #5879: netmap: Module registration displays whether info about new API usage Bug #5863: netmap: packet stalls (6.0.x backport) Bug #5854: SMTP does not handle LF post line limit properly (6.0.x backport) Bug #5852: tcp/stream: session reuse on tcp flows w/o sessions (6.0.x backport) Feature #5853: yaml: set suricata version in generated config (6.0.x backport) Task #5985: libhtp 0.5.43 (6.0.x backport)" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> commit cb73ca19a6152689e130502a6d28fec5145ef288 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 10 14:23:24 2023 +0200 kernel: patch CVE-2023-32233 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/includes/alsa | 1 + config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/initscripts | 2 - config/rootfiles/common/libcap | 17 +- config/rootfiles/common/riscv64/initscripts | 2 - config/rootfiles/common/x86_64/initscripts | 2 - .../{oldcore/125 => core/175}/filelists/collectd | 0 config/rootfiles/core/175/filelists/files | 2 + .../{oldcore/106 => core/175}/filelists/gnupg | 0 .../{oldcore/169 => core/175}/filelists/krb5 | 0 .../{oldcore/111 => core/175}/filelists/libevent2 | 0 .../{oldcore/131 => core/175}/filelists/libhtp | 0 .../{oldcore/101 => core/175}/filelists/mpfr | 0 .../{oldcore/128 => core/175}/filelists/openldap | 0 .../{oldcore/100 => core/175}/filelists/squid | 0 .../{oldcore/131 => core/175}/filelists/suricata | 0 config/rootfiles/core/175/update.sh | 11 + config/rootfiles/packages/alsa | 187 ++++---- config/rootfiles/packages/zabbix_agentd | 2 - config/zabbix_agentd/logrotate | 9 - config/zabbix_agentd/userparameter_ipfire.conf | 2 +- .../zabbix_agentd_ipfire_mandatory.conf | 5 +- html/cgi-bin/backup.cgi | 9 +- html/cgi-bin/logs.cgi/log.dat | 6 +- lfs/alsa | 9 +- lfs/initscripts | 3 +- lfs/libcap | 13 +- lfs/libhtp | 6 +- lfs/linux | 3 + lfs/lvm2 | 1 - lfs/mpfr | 8 +- lfs/rng-tools | 8 +- lfs/squid | 13 +- lfs/suricata | 4 +- lfs/zabbix_agentd | 15 +- src/initscripts/packages/avahi | 0 src/initscripts/packages/bird | 0 src/initscripts/packages/frr | 0 src/initscripts/packages/guardian | 0 src/initscripts/packages/nqptp | 0 src/initscripts/packages/qemu-ga | 0 src/initscripts/packages/shairport-sync | 0 src/initscripts/system/conntrackd | 0 src/initscripts/system/lvmetad | 53 --- src/initscripts/system/vnstat | 0 src/paks/alsa/install.sh | 8 +- src/paks/alsa/uninstall.sh | 6 + src/paks/zabbix_agentd/install.sh | 4 +- ...etfilter_nftables_deactivate_anonymus_set.patch | 121 +++++ .../mpfr-4.2.0-cumulative-patches-1-to-4.patch | 521 +++++++++++++++++++++ src/scripts/archive.files | 0 src/scripts/captive-cleanup | 0 src/scripts/convert-dns-settings | 0 src/scripts/convert-to-location | 0 src/scripts/openvpn-metrics | 0 55 files changed, 827 insertions(+), 228 deletions(-) create mode 100644 config/backup/includes/alsa copy config/rootfiles/{oldcore/125 => core/175}/filelists/collectd (100%) copy config/rootfiles/{oldcore/106 => core/175}/filelists/gnupg (100%) copy config/rootfiles/{oldcore/169 => core/175}/filelists/krb5 (100%) copy config/rootfiles/{oldcore/111 => core/175}/filelists/libevent2 (100%) copy config/rootfiles/{oldcore/131 => core/175}/filelists/libhtp (100%) copy config/rootfiles/{oldcore/101 => core/175}/filelists/mpfr (100%) copy config/rootfiles/{oldcore/128 => core/175}/filelists/openldap (100%) copy config/rootfiles/{oldcore/100 => core/175}/filelists/squid (100%) copy config/rootfiles/{oldcore/131 => core/175}/filelists/suricata (100%) delete mode 100644 config/zabbix_agentd/logrotate mode change 100755 => 100644 src/initscripts/packages/avahi mode change 100755 => 100644 src/initscripts/packages/bird mode change 100755 => 100644 src/initscripts/packages/frr mode change 100755 => 100644 src/initscripts/packages/guardian mode change 100755 => 100644 src/initscripts/packages/nqptp mode change 100755 => 100644 src/initscripts/packages/qemu-ga mode change 100755 => 100644 src/initscripts/packages/shairport-sync mode change 100755 => 100644 src/initscripts/system/conntrackd delete mode 100755 src/initscripts/system/lvmetad mode change 100755 => 100644 src/initscripts/system/vnstat create mode 100644 src/patches/linux/linux-6.3-netfilter_nftables_deactivate_anonymus_set.patch create mode 100644 src/patches/mpfr-4.2.0-cumulative-patches-1-to-4.patch mode change 100755 => 100644 src/scripts/archive.files mode change 100755 => 100644 src/scripts/captive-cleanup mode change 100755 => 100644 src/scripts/convert-dns-settings mode change 100755 => 100644 src/scripts/convert-to-location mode change 100755 => 100644 src/scripts/openvpn-metrics Difference in files: diff --git a/config/backup/includes/alsa b/config/backup/includes/alsa new file mode 100644 index 000000000..93db0bd79 --- /dev/null +++ b/config/backup/includes/alsa @@ -0,0 +1 @@ +/var/lib/alsa/asound.state diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index db0271d94..c8985b482 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -6060,7 +6060,7 @@ CONFIG_UCSI_ACPI=m # end of USB Type-C Alternate Mode drivers CONFIG_USB_ROLE_SWITCH=m -# CONFIG_USB_ROLES_INTEL_XHCI is not set +CONFIG_USB_ROLES_INTEL_XHCI=m CONFIG_MMC=m CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK_MINORS=8 diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index dc6c0fd24..e2a8a11d5 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -29,7 +29,6 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds -etc/rc.d/init.d/lvmetad etc/rc.d/init.d/localnet etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs @@ -171,7 +170,6 @@ etc/rc.d/rc6.d/S99reboot etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules -etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S25partresize diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap index 194fc7f19..af1c22e83 100644 --- a/config/rootfiles/common/libcap +++ b/config/rootfiles/common/libcap @@ -1,11 +1,3 @@ -lib/libcap.so.2 -lib/libcap.so.2.67 -#lib/libpsx.so -#lib/libpsx.so.2 -lib/libpsx.so.2.67 -#lib/pkgconfig/libcap.pc -#lib/pkgconfig/libpsx.pc -lib/security/pam_cap.so sbin/capsh sbin/getcap sbin/getpcaps @@ -13,6 +5,15 @@ sbin/setcap #usr/include/sys/capability.h #usr/include/sys/psx_syscall.h usr/lib/libcap.so +usr/lib/libcap.so.2 +usr/lib/libcap.so.2.67 +#usr/lib/libpsx.so +#usr/lib/libpsx.so.2 +usr/lib/libpsx.so.2.67 +#usr/lib/pkgconfig/libcap.pc +#usr/lib/pkgconfig/libpsx.pc +#usr/lib/security +usr/lib/security/pam_cap.so #usr/share/man/man1/capsh.1 #usr/share/man/man3/cap_clear.3 #usr/share/man/man3/cap_clear_flag.3 diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts index 1848f8ebc..0c12af138 100644 --- a/config/rootfiles/common/riscv64/initscripts +++ b/config/rootfiles/common/riscv64/initscripts @@ -29,7 +29,6 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds -etc/rc.d/init.d/lvmetad etc/rc.d/init.d/localnet etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs @@ -170,7 +169,6 @@ etc/rc.d/rc6.d/S99reboot etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules -etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S25partresize diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 1848f8ebc..0c12af138 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -29,7 +29,6 @@ etc/rc.d/init.d/functions etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds -etc/rc.d/init.d/lvmetad etc/rc.d/init.d/localnet etc/rc.d/init.d/modules etc/rc.d/init.d/mountfs @@ -170,7 +169,6 @@ etc/rc.d/rc6.d/S99reboot etc/rc.d/rcsysinit.d/S00mountkernfs etc/rc.d/rcsysinit.d/S01sysctl etc/rc.d/rcsysinit.d/S05modules -etc/rc.d/rcsysinit.d/S09lvmetad etc/rc.d/rcsysinit.d/S10udev etc/rc.d/rcsysinit.d/S19waitdrives etc/rc.d/rcsysinit.d/S25partresize diff --git a/config/rootfiles/core/175/filelists/collectd b/config/rootfiles/core/175/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/core/175/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/files b/config/rootfiles/core/175/filelists/files index dad266e7e..d2b3c79f8 100644 --- a/config/rootfiles/core/175/filelists/files +++ b/config/rootfiles/core/175/filelists/files @@ -82,4 +82,6 @@ lib/firmware/rtlwifi/rtl8710bufw_SMIC.bin lib/firmware/rtlwifi/rtl8710bufw_UMC.bin lib/firmware/rtw88/rtw8822c_fw.bin lib/firmware/rtw89/rtw8852b_fw-1.bin +srv/web/ipfire/cgi-bin/backup.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat usr/lib/firewall/rules.pl diff --git a/config/rootfiles/core/175/filelists/gnupg b/config/rootfiles/core/175/filelists/gnupg new file mode 120000 index 000000000..a1a156447 --- /dev/null +++ b/config/rootfiles/core/175/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/krb5 b/config/rootfiles/core/175/filelists/krb5 new file mode 120000 index 000000000..082c3cbcd --- /dev/null +++ b/config/rootfiles/core/175/filelists/krb5 @@ -0,0 +1 @@ +../../../common/krb5 \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/libevent2 b/config/rootfiles/core/175/filelists/libevent2 new file mode 120000 index 000000000..42edc99c3 --- /dev/null +++ b/config/rootfiles/core/175/filelists/libevent2 @@ -0,0 +1 @@ +../../../common/libevent2 \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/libhtp b/config/rootfiles/core/175/filelists/libhtp new file mode 120000 index 000000000..676e2c5e8 --- /dev/null +++ b/config/rootfiles/core/175/filelists/libhtp @@ -0,0 +1 @@ +../../../common/libhtp \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/mpfr b/config/rootfiles/core/175/filelists/mpfr new file mode 120000 index 000000000..c8468bf42 --- /dev/null +++ b/config/rootfiles/core/175/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/openldap b/config/rootfiles/core/175/filelists/openldap new file mode 120000 index 000000000..80c324f76 --- /dev/null +++ b/config/rootfiles/core/175/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/squid b/config/rootfiles/core/175/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/175/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/suricata b/config/rootfiles/core/175/filelists/suricata new file mode 120000 index 000000000..f671f6993 --- /dev/null +++ b/config/rootfiles/core/175/filelists/suricata @@ -0,0 +1 @@ +../../../common/suricata \ No newline at end of file diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/175/update.sh index 7615a52b0..03ce4a93d 100644 --- a/config/rootfiles/core/175/update.sh +++ b/config/rootfiles/core/175/update.sh @@ -47,7 +47,9 @@ done /etc/rc.d/init.d/apache stop /etc/rc.d/init.d/ntp stop /etc/rc.d/init.d/sshd stop +/etc/rc.d/init.d/squid stop /etc/rc.d/init.d/unbound stop +/etc/rc.d/init.d/suricata stop KVER="xxxKVERxxx" @@ -103,6 +105,8 @@ extract_files # Remove files rm -rvf \ + /etc/rc.d/init.d/lvmetad \ + /etc/rc.d/rcsysinit.d/S09lvmetad \ /lib/firmware/liquidio/lio_23xx_vsw.bin \ /usr/lib/libbind9-9.16.38.so \ /usr/lib/libdns-9.16.38.so \ @@ -111,6 +115,7 @@ rm -rvf \ /usr/lib/libisccc-9.16.38.so \ /usr/lib/libisccfg-9.16.38.so \ /usr/lib/libns-9.16.38.so \ + /usr/lib/libqpdf.so.28* \ /var/ipfire/menu.d/EX-addonsvc.menu \ /var/ipfire/menu.d/EX-asterisk.menu \ /var/ipfire/menu.d/EX-bluetooth.menu @@ -134,12 +139,18 @@ chmod -v 644 /var/log/pakfire.log /etc/rc.d/init.d/firewall restart # Start services +if grep -q "ENABLE_IDS=on" /var/ipfire/suricata/settings; then + /etc/rc.d/init.d/suricata start +fi /etc/rc.d/init.d/unbound start /etc/rc.d/init.d/apache start /etc/rc.d/init.d/ntp start if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then /etc/init.d/sshd start fi +if [ -f /var/ipfire/proxy/enable ]; then + /etc/init.d/squid start +fi # Regenerate all initrds dracut --regenerate-all --force diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index 987e7f372..bce2ff5cc 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -197,7 +197,7 @@ usr/local/share/alsa #usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/mixartloader -#usr/local/share/alsa/firmware/mixartloader/miXart.conf +usr/local/share/alsa/firmware/mixartloader/miXart.conf #usr/local/share/alsa/firmware/mixartloader/miXart8.elf #usr/local/share/alsa/firmware/mixartloader/miXart8.xlx #usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx @@ -215,13 +215,13 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56 #usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56 #usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56 -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf -#usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf +usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf #usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat #usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat #usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat @@ -233,15 +233,15 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/pcxhrloader/xlxint.dat #usr/local/share/alsa/firmware/usx2yloader #usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx -#usr/local/share/alsa/firmware/usx2yloader/us122.conf +usr/local/share/alsa/firmware/usx2yloader/us122.conf #usr/local/share/alsa/firmware/usx2yloader/us122.prepad #usr/local/share/alsa/firmware/usx2yloader/us122.rbt #usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx -#usr/local/share/alsa/firmware/usx2yloader/us224.conf +usr/local/share/alsa/firmware/usx2yloader/us224.conf #usr/local/share/alsa/firmware/usx2yloader/us224.prepad #usr/local/share/alsa/firmware/usx2yloader/us224.rbt #usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx -#usr/local/share/alsa/firmware/usx2yloader/us428.conf +usr/local/share/alsa/firmware/usx2yloader/us428.conf #usr/local/share/alsa/firmware/usx2yloader/us428.prepad #usr/local/share/alsa/firmware/usx2yloader/us428.rbt #usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx @@ -255,10 +255,10 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #usr/local/share/alsa/firmware/vxloader/l_1_vp4.d56 #usr/local/share/alsa/firmware/vxloader/l_1_vx2.d56 #usr/local/share/alsa/firmware/vxloader/l_1_vxp.d56 -#usr/local/share/alsa/firmware/vxloader/vx222.conf -#usr/local/share/alsa/firmware/vxloader/vxboard.conf -#usr/local/share/alsa/firmware/vxloader/vxp440.conf -#usr/local/share/alsa/firmware/vxloader/vxpocket.conf +usr/local/share/alsa/firmware/vxloader/vx222.conf +usr/local/share/alsa/firmware/vxloader/vxboard.conf +usr/local/share/alsa/firmware/vxloader/vxp440.conf +usr/local/share/alsa/firmware/vxloader/vxpocket.conf #usr/local/share/alsa/firmware/vxloader/x1_1_vp4.rbt #usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt #usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt @@ -269,69 +269,69 @@ usr/sbin/alsaconf usr/sbin/alsactl #usr/share/aclocal/alsa.m4 usr/share/alsa -#usr/share/alsa/alsa.conf +usr/share/alsa/alsa.conf #usr/share/alsa/cards -#usr/share/alsa/cards/AACI.conf -#usr/share/alsa/cards/ATIIXP-MODEM.conf -#usr/share/alsa/cards/ATIIXP-SPDMA.conf -#usr/share/alsa/cards/ATIIXP.conf -#usr/share/alsa/cards/AU8810.conf -#usr/share/alsa/cards/AU8820.conf -#usr/share/alsa/cards/AU8830.conf -#usr/share/alsa/cards/Audigy.conf -#usr/share/alsa/cards/Audigy2.conf -#usr/share/alsa/cards/Aureon51.conf -#usr/share/alsa/cards/Aureon71.conf -#usr/share/alsa/cards/CA0106.conf -#usr/share/alsa/cards/CMI8338-SWIEC.conf -#usr/share/alsa/cards/CMI8338.conf -#usr/share/alsa/cards/CMI8738-MC6.conf -#usr/share/alsa/cards/CMI8738-MC8.conf -#usr/share/alsa/cards/CMI8788.conf -#usr/share/alsa/cards/CS46xx.conf -#usr/share/alsa/cards/EMU10K1.conf -#usr/share/alsa/cards/EMU10K1X.conf -#usr/share/alsa/cards/ENS1370.conf -#usr/share/alsa/cards/ENS1371.conf -#usr/share/alsa/cards/ES1968.conf -#usr/share/alsa/cards/Echo_Echo3G.conf -#usr/share/alsa/cards/FM801.conf -#usr/share/alsa/cards/FWSpeakers.conf -#usr/share/alsa/cards/FireWave.conf -#usr/share/alsa/cards/GUS.conf -#usr/share/alsa/cards/HDA-Intel.conf -#usr/share/alsa/cards/HdmiLpeAudio.conf -#usr/share/alsa/cards/ICE1712.conf -#usr/share/alsa/cards/ICE1724.conf -#usr/share/alsa/cards/ICH-MODEM.conf -#usr/share/alsa/cards/ICH.conf -#usr/share/alsa/cards/ICH4.conf -#usr/share/alsa/cards/Loopback.conf -#usr/share/alsa/cards/Maestro3.conf -#usr/share/alsa/cards/NFORCE.conf -#usr/share/alsa/cards/PC-Speaker.conf -#usr/share/alsa/cards/PMac.conf -#usr/share/alsa/cards/PMacToonie.conf -#usr/share/alsa/cards/PS3.conf -#usr/share/alsa/cards/RME9636.conf -#usr/share/alsa/cards/RME9652.conf -#usr/share/alsa/cards/SB-XFi.conf -#usr/share/alsa/cards/SI7018.conf -#usr/share/alsa/cards/TRID4DWAVENX.conf -#usr/share/alsa/cards/USB-Audio.conf -#usr/share/alsa/cards/VIA686A.conf -#usr/share/alsa/cards/VIA8233.conf -#usr/share/alsa/cards/VIA8233A.conf -#usr/share/alsa/cards/VIA8237.conf -#usr/share/alsa/cards/VX222.conf -#usr/share/alsa/cards/VXPocket.conf -#usr/share/alsa/cards/VXPocket440.conf -#usr/share/alsa/cards/YMF744.conf -#usr/share/alsa/cards/aliases.conf -#usr/share/alsa/cards/pistachio-card.conf -#usr/share/alsa/cards/vc4-hdmi.conf +usr/share/alsa/cards/AACI.conf +usr/share/alsa/cards/ATIIXP-MODEM.conf +usr/share/alsa/cards/ATIIXP-SPDMA.conf +usr/share/alsa/cards/ATIIXP.conf +usr/share/alsa/cards/AU8810.conf +usr/share/alsa/cards/AU8820.conf +usr/share/alsa/cards/AU8830.conf +usr/share/alsa/cards/Audigy.conf +usr/share/alsa/cards/Audigy2.conf +usr/share/alsa/cards/Aureon51.conf +usr/share/alsa/cards/Aureon71.conf +usr/share/alsa/cards/CA0106.conf +usr/share/alsa/cards/CMI8338-SWIEC.conf +usr/share/alsa/cards/CMI8338.conf +usr/share/alsa/cards/CMI8738-MC6.conf +usr/share/alsa/cards/CMI8738-MC8.conf +usr/share/alsa/cards/CMI8788.conf +usr/share/alsa/cards/CS46xx.conf +usr/share/alsa/cards/EMU10K1.conf +usr/share/alsa/cards/EMU10K1X.conf +usr/share/alsa/cards/ENS1370.conf +usr/share/alsa/cards/ENS1371.conf +usr/share/alsa/cards/ES1968.conf +usr/share/alsa/cards/Echo_Echo3G.conf +usr/share/alsa/cards/FM801.conf +usr/share/alsa/cards/FWSpeakers.conf +usr/share/alsa/cards/FireWave.conf +usr/share/alsa/cards/GUS.conf +usr/share/alsa/cards/HDA-Intel.conf +usr/share/alsa/cards/HdmiLpeAudio.conf +usr/share/alsa/cards/ICE1712.conf +usr/share/alsa/cards/ICE1724.conf +usr/share/alsa/cards/ICH-MODEM.conf +usr/share/alsa/cards/ICH.conf +usr/share/alsa/cards/ICH4.conf +usr/share/alsa/cards/Loopback.conf +usr/share/alsa/cards/Maestro3.conf +usr/share/alsa/cards/NFORCE.conf +usr/share/alsa/cards/PC-Speaker.conf +usr/share/alsa/cards/PMac.conf +usr/share/alsa/cards/PMacToonie.conf +usr/share/alsa/cards/PS3.conf +usr/share/alsa/cards/RME9636.conf +usr/share/alsa/cards/RME9652.conf +usr/share/alsa/cards/SB-XFi.conf +usr/share/alsa/cards/SI7018.conf +usr/share/alsa/cards/TRID4DWAVENX.conf +usr/share/alsa/cards/USB-Audio.conf +usr/share/alsa/cards/VIA686A.conf +usr/share/alsa/cards/VIA8233.conf +usr/share/alsa/cards/VIA8233A.conf +usr/share/alsa/cards/VIA8237.conf +usr/share/alsa/cards/VX222.conf +usr/share/alsa/cards/VXPocket.conf +usr/share/alsa/cards/VXPocket440.conf +usr/share/alsa/cards/YMF744.conf +usr/share/alsa/cards/aliases.conf +usr/share/alsa/cards/pistachio-card.conf +usr/share/alsa/cards/vc4-hdmi.conf #usr/share/alsa/ctl -#usr/share/alsa/ctl/default.conf +usr/share/alsa/ctl/default.conf #usr/share/alsa/init #usr/share/alsa/init/00main #usr/share/alsa/init/ca0106 @@ -341,23 +341,23 @@ usr/share/alsa #usr/share/alsa/init/info #usr/share/alsa/init/test #usr/share/alsa/pcm -#usr/share/alsa/pcm/center_lfe.conf -#usr/share/alsa/pcm/default.conf -#usr/share/alsa/pcm/dmix.conf -#usr/share/alsa/pcm/dpl.conf -#usr/share/alsa/pcm/dsnoop.conf -#usr/share/alsa/pcm/front.conf -#usr/share/alsa/pcm/hdmi.conf -#usr/share/alsa/pcm/iec958.conf -#usr/share/alsa/pcm/modem.conf -#usr/share/alsa/pcm/rear.conf -#usr/share/alsa/pcm/side.conf -#usr/share/alsa/pcm/surround21.conf -#usr/share/alsa/pcm/surround40.conf -#usr/share/alsa/pcm/surround41.conf -#usr/share/alsa/pcm/surround50.conf -#usr/share/alsa/pcm/surround51.conf -#usr/share/alsa/pcm/surround71.conf +usr/share/alsa/pcm/center_lfe.conf +usr/share/alsa/pcm/default.conf +usr/share/alsa/pcm/dmix.conf +usr/share/alsa/pcm/dpl.conf +usr/share/alsa/pcm/dsnoop.conf +usr/share/alsa/pcm/front.conf +usr/share/alsa/pcm/hdmi.conf +usr/share/alsa/pcm/iec958.conf +usr/share/alsa/pcm/modem.conf +usr/share/alsa/pcm/rear.conf +usr/share/alsa/pcm/side.conf +usr/share/alsa/pcm/surround21.conf +usr/share/alsa/pcm/surround40.conf +usr/share/alsa/pcm/surround41.conf +usr/share/alsa/pcm/surround50.conf +usr/share/alsa/pcm/surround51.conf +usr/share/alsa/pcm/surround71.conf #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo #usr/share/locale/eu/LC_MESSAGES/alsa-utils.mo #usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo @@ -397,4 +397,5 @@ usr/share/sounds/alsa #usr/share/sounds/alsa/Rear_Right.wav #usr/share/sounds/alsa/Side_Left.wav #usr/share/sounds/alsa/Side_Right.wav +var/ipfire/backup/addons/includes/alsa var/lib/alsa diff --git a/config/rootfiles/packages/zabbix_agentd b/config/rootfiles/packages/zabbix_agentd index 6f2c831d7..729a47ac6 100644 --- a/config/rootfiles/packages/zabbix_agentd +++ b/config/rootfiles/packages/zabbix_agentd @@ -1,4 +1,3 @@ -etc/logrotate.d/zabbix_agentd etc/rc.d/init.d/zabbix_agentd etc/sudoers.d/zabbix_agentd etc/sudoers.d/zabbix_agentd_user @@ -21,4 +20,3 @@ var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf var/ipfire/zabbix_agentd/userparameters var/ipfire/zabbix_agentd/userparameters/userparameter_pakfire.conf var/ipfire/zabbix_agentd/userparameters/userparameter_ipfire.conf -#var/log/zabbix diff --git a/config/zabbix_agentd/logrotate b/config/zabbix_agentd/logrotate deleted file mode 100644 index 83bbca9fb..000000000 --- a/config/zabbix_agentd/logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/zabbix/zabbix_agentd.log { - monthly - rotate 12 - compress - delaycompress - missingok - notifempty - create 0640 zabbix zabbix -} diff --git a/config/zabbix_agentd/userparameter_ipfire.conf b/config/zabbix_agentd/userparameter_ipfire.conf index 10c09c25d..c5a636edf 100644 --- a/config/zabbix_agentd/userparameter_ipfire.conf +++ b/config/zabbix_agentd/userparameter_ipfire.conf @@ -5,7 +5,7 @@ UserParameter=ipfire.net.gateway.pingtime,sudo /usr/sbin/fping -c 3 gateway 2>&1 # Internet Gateway availability, can be used to check Internet connection UserParameter=ipfire.net.gateway.ping,sudo /usr/sbin/fping -q -r 3 gateway; [ ! $? ]; echo $? # Firewall Filter Forward chain drops in bytes/chain (JSON), can be used for discovery of firewall chains and monitoring of firewall hits on each chain -UserParameter=ipfire.net.fw.hits.raw,sudo /usr/local/bin/getipstat -xf | grep "\/\* DROP_.* \*\/$" | awk 'BEGIN { ORS = ""; print "["} { printf "%s{\"chain\": \"%s\", \"bytes\": \"%s\"}", separator, substr($11, 6), $2; separator = ", "; } END { print"]" }' +UserParameter=ipfire.net.fw.hits.raw,sudo /usr/local/bin/getipstat -xf | grep "/\* DROP_.* \*/$" | awk 'BEGIN { ORS = ""; print "["} { printf "%s{\"chain\": \"%s\", \"bytes\": \"%s\"}", separator, substr($11, 6), $2; separator = ", "; } END { print"]" }' # Number of currently Active DHCP leases UserParameter=ipfire.dhcpd.clients,grep -s -E 'lease|bind' /var/state/dhcp/dhcpd.leases | sed ':a;/{$/{N;s/\n//;ba}' | grep "state active" | wc -l # Number of Captive Portal clients diff --git a/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf b/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf index c6be948be..f6580f3ba 100644 --- a/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf +++ b/config/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf @@ -1,8 +1,7 @@ PidFile=/var/run/zabbix/zabbix_agentd.pid -# Log rotation is managed by logrotate -LogFile=/var/log/zabbix/zabbix_agentd.log -LogFileSize=0 +# Logs go to syslog so it can be viewed in WUI logviewer +LogType=system # These paths are included in the IPFire backups. Do not put user modules # or configuration files in other locations if you want them included in the diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index 1c01cb286..3888ccbff 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -366,6 +366,13 @@ sub deliver_file() { # Deliver content open(FILE, "<$file") or die "Unable to open $file: $!"; - print <FILE>; + + # Read the file line by line and send it + # to the client. + while (<FILE>) { + print $_; + } + + # Close file handle. close(FILE); } diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 53b9073fc..01c382a0d 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -78,7 +78,8 @@ my %sections = ( 'ssh' => '(sshd(?:$.*$)?\[.*\]: )', 'unbound' => '(unbound: \[.*?\])(.*:.*$)', 'urlfilter bl' => '(installpackage\[urlfilter\]: )', - 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)' + 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)', + 'zabbix_agentd' => '(zabbix_agentd\[.*?\]: )' ); # Translations for the %sections array. @@ -112,7 +113,8 @@ my %trsections = ( 'ssh' => 'SSH', 'unbound' => 'DNS: Unbound', 'urlfilter bl' => 'URLFilter Blacklist', - 'wireless' => 'Wireless' + 'wireless' => 'Wireless', + 'zabbix_agentd' => 'Zabbix Agent' ); diff --git a/lfs/alsa b/lfs/alsa index 2d89af880..db7afe4b1 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -37,11 +37,11 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) PROG = alsa -PAK_VER = 15 +PAK_VER = 16 DEPS = -SERVICES = alsa +SERVICES = TARGET = $(DIR_INFO)/$(THISAPP) @@ -104,6 +104,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP)/alsa-firmware-$(FVER) && make install # install initscript - $(call INSTALL_INITSCRIPTS,$(SERVICES)) + $(call INSTALL_INITSCRIPTS,alsa) + # install backup include file + install -v -m 644 ${DIR_SRC}/config/backup/includes/alsa \ + /var/ipfire/backup/addons/includes/alsa @rm -rf $(DIR_SRC)/alsa* @$(POSTBUILD) diff --git a/lfs/initscripts b/lfs/initscripts index 55f0066e5..0312d8ae4 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -155,7 +155,6 @@ $(TARGET) : ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S01sysctl ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules - ln -sf ../init.d/lvmetad /etc/rc.d/rcsysinit.d/S09lvmetad ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev ln -sf ../init.d/waitdrives /etc/rc.d/rcsysinit.d/S19waitdrives ln -sf ../init.d/partresize /etc/rc.d/rcsysinit.d/S25partresize diff --git a/lfs/libcap b/lfs/libcap index 9eab679ff..63f4ef8b0 100644 --- a/lfs/libcap +++ b/lfs/libcap @@ -72,10 +72,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) # Prevent a static library from being installed cd $(DIR_APP) && sed -i '/install -m.*STA/d' libcap/Makefile - cd $(DIR_APP) && make GOLANG=no - cd $(DIR_APP) && make install GOLANG=no - rm -vf /lib/libcap.so - ln -svf /lib/libcap.so.2.67 /usr/lib/libcap.so - chmod +x /lib/libcap.so.* + cd $(DIR_APP) && make GOLANG=no \ + prefix=/usr \ + exec_prefix= \ + lib_prefix=/usr + cd $(DIR_APP) && make install GOLANG=no \ + prefix=/usr \ + exec_prefix= \ + lib_prefix=/usr @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/libhtp b/lfs/libhtp index 80963c013..0b6015cde 100644 --- a/lfs/libhtp +++ b/lfs/libhtp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 0.5.42 +VER = 0.5.43 THISAPP = libhtp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8e1446992c40c2c2e9e7dd096803752245eebf3b5e48e0215430dbfe225ae029b2e01fadca61bdd994b534a0ed140b0a0149aa9a0dde64409ebf0afdd2bf6fd7 +$(DL_FILE)_BLAKE2 = 071cadc254b7af55bf410db5689429ca7588005b2f74fbd8468f2d6eeaf00c55ae99e8dd78552a5bf11ace5c8047b28a844db343937827a428b6d8b8d9036d29 install : $(TARGET) diff --git a/lfs/linux b/lfs/linux index 489715424..a95c6aea4 100644 --- a/lfs/linux +++ b/lfs/linux @@ -147,6 +147,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Fix pmc compile dependency errors cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.0.7-platform-x86-amd-Fix-pmc-compile-dependency-errors.patch + # Patch netfilter CVE-2023-32233 + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.3-netfilter_nftables_deactivate_anonymus_set.patch + ifeq "$(BUILD_ARCH)" "aarch64" # Apply Arm-multiarch kernel patches. cd $(DIR_APP) && xzcat $(DIR_DL)/arm-multi-patches-$(ARM_PATCHES).patch.xz | patch -Np1 diff --git a/lfs/lvm2 b/lfs/lvm2 index 5b39f05f5..2f1e921fc 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -81,7 +81,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-pkgconfig \ --with-udevdir=/lib/udev/rules.d \ --with-default-locking-dir=/run/lvm \ - --enable-lvmetad \ --enable-udev_rules \ --enable-udev_sync cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/mpfr b/lfs/mpfr index 818566390..c799086d9 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -70,10 +70,10 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) -# No patches yet for version 4.2.0 -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.1-cumulative-patches-1-to-1.patch - cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ - --enable-thread-safe + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.2.0-cumulative-patches-1-to-4.patch + cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure \ + --prefix=/usr \ + --enable-thread-safe cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/rng-tools b/lfs/rng-tools index 6a85a8482..86fc0ce3d 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -24,7 +24,7 @@ include Config -VER = 6.14 +VER = 6.16 SUMMARY = This is a random number generator daemon THISAPP = rng-tools-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = rng-tools -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 177065f9ea68b68459d034d38278f866a0c9d5c499578fabcc29ceb387b49667393f23dcae9f13ff401599846e872dbada73f5e319a99dfa4605cdb77ee3e896 +$(DL_FILE)_BLAKE2 = ab1a84c9a298e71ea5cdc1e91004ac069199a0128ee9701b1b3e24b6c705c63a642ab3db260a2c6c910c185e8fc75d5775caa3b7c370f102c75fac496e9bca17 install : $(TARGET) @@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ - --prefix=/usr \ + --prefix=/usr \ --without-pkcs11 \ --without-rtlsdr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/lfs/squid b/lfs/squid index 5d79bf382..bc0682031 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,8 +24,7 @@ include Config -VER = 5.8 -LANGPACK = 20230225 +VER = 5.9 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,14 +42,11 @@ endif # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - squid-langpack-$(LANGPACK).tar.gz +objects = $(DL_FILE) -$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -squid-langpack-$(LANGPACK).tar.gz = $(URL_IPFIRE)/squid-langpack-$(LANGPACK).tar.gz +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68 -squid-langpack-$(LANGPACK).tar.gz_BLAKE2 = 169a05d16770f56e515fd633658e8bcd9464fb01ccba76256b119932c833af7bc22e3e8d3a7d5fde37638546f15822a4d1548a78af13be9f4e3b8989758250b6 +$(DL_FILE)_BLAKE2 = 898a34357f8019291379ea37c66fa312e1a6437e8f643987dd4e54d7d52728248e16129b00195c5f6e0378c0f32c9f9ade3f98ca0ec4bb952f9f443357face82 install : $(TARGET) @@ -80,7 +76,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP)/errors && tar zxf $(DIR_DL)/squid-langpack-$(LANGPACK).tar.gz cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch diff --git a/lfs/suricata b/lfs/suricata index 98710d9e2..75698b0b1 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -24,7 +24,7 @@ include Config -VER = 6.0.10 +VER = 6.0.11 THISAPP = suricata-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a2b334c0139ead0b914ba6039c116ebad30dd3b5c0d4bb751f608af83e1487a67b96224ffe61635468dc49a9e44f03a76facf2af66582ba18e364f233029b532 +$(DL_FILE)_BLAKE2 = 41b37168e6c50b32971ad8c0541f3bc1981152c8360bbfc261a9abab5dc229425bef92fe19db5d0ec7cf32abff71acca62934c411aea79f5c8f9b38bd6422ee4 install : $(TARGET) diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index d7b5a4b37..4f2a8b5d8 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -26,7 +26,7 @@ include Config SUMMARY = Zabbix Agent -VER = 6.0.6 +VER = 6.0.16 THISAPP = zabbix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 6 +PAK_VER = 7 DEPS = fping @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = f9d07ca8938ae4e5e47048c32872644caeda0ecdef17513c63c63d1ce2aaa4ac0c92e6c70932bc598ff908419dae05bab32924f5973a5528b5668f7c7c2c5a17 +$(DL_FILE)_BLAKE2 = 87f7c043f30ef9902b3673e2d444e37b32ef998d178fa5718ed9aa098f841f23237d79e54985ba3a415a86433a685387af33810f53a78837be6a1aa2870ed65a install : $(TARGET) @@ -114,10 +114,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Create directory for additional agent modules -mkdir -pv /usr/lib/zabbix - # Create directory for logging - -mkdir -pv /var/log/zabbix - chown zabbix.zabbix /var/log/zabbix - # Create directory for pid. -mkdir -pv /var/run/zabbix chown zabbix.zabbix /var/run/zabbix @@ -135,10 +131,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \ /var/ipfire/backup/addons/includes/zabbix_agentd - # Install include file for Logrotate - -mkdir -pv /etc/logrotate.d - install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/logrotate \ - /etc/logrotate.d/zabbix_agentd - @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/packages/avahi b/src/initscripts/packages/avahi old mode 100755 new mode 100644 diff --git a/src/initscripts/packages/bird b/src/initscripts/packages/bird old mode 100755 new mode 100644 diff --git a/src/initscripts/packages/frr b/src/initscripts/packages/frr old mode 100755 new mode 100644 diff --git a/src/initscripts/packages/guardian b/src/initscripts/packages/guardian old mode 100755 new mode 100644 diff --git a/src/initscripts/packages/nqptp b/src/initscripts/packages/nqptp old mode 100755 new mode 100644 diff --git a/src/initscripts/packages/qemu-ga b/src/initscripts/packages/qemu-ga old mode 100755 new mode 100644 diff --git a/src/initscripts/packages/shairport-sync b/src/initscripts/packages/shairport-sync old mode 100755 new mode 100644 diff --git a/src/initscripts/system/conntrackd b/src/initscripts/system/conntrackd old mode 100755 new mode 100644 diff --git a/src/initscripts/system/lvmetad b/src/initscripts/system/lvmetad deleted file mode 100755 index 87cf87d33..000000000 --- a/src/initscripts/system/lvmetad +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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/>. # -# # -############################################################################### - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - # Create diretory for control socket - mkdir -p /run/lvm - - boot_mesg "Starting LVM2 Metadata Daemon..." - loadproc /usr/sbin/lvmetad - ;; - - stop) - boot_mesg "Stopping LVM2 Metadata Daemon..." - killproc /usr/sbin/lvmetad - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/sbin/lvmetad - ;; - - *) - echo "Usage: ${0} {start|stop|restart|status}" - exit 1 - ;; -esac diff --git a/src/initscripts/system/vnstat b/src/initscripts/system/vnstat old mode 100755 new mode 100644 diff --git a/src/paks/alsa/install.sh b/src/paks/alsa/install.sh index 7b6b3dc80..ee0092195 100644 --- a/src/paks/alsa/install.sh +++ b/src/paks/alsa/install.sh @@ -24,7 +24,13 @@ . /opt/pakfire/lib/functions.sh extract_files groupadd audio 2>/dev/null -touch /etc/asound.state +touch /var/lib/alsa/asound.state +if [ -f /etc/asound.state ]; then + rm /etc/asound.state +fi +restore_backup ${NAME} ln -svf ../init.d/alsa /etc/rc.d/rc3.d/S65alsa ln -svf ../init.d/alsa /etc/rc.d/rc0.d/K35alsa ln -svf ../init.d/alsa /etc/rc.d/rc6.d/K35alsa +start_service ${NAME} +exit 0 diff --git a/src/paks/alsa/uninstall.sh b/src/paks/alsa/uninstall.sh index 62e27008d..ce88c294b 100644 --- a/src/paks/alsa/uninstall.sh +++ b/src/paks/alsa/uninstall.sh @@ -22,5 +22,11 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +# unload alsa related modules +modprobe -r snd_pcm_oss >/dev/null 2>&1 || failed=1 +modprobe -r snd_timer >/dev/null 2>&1 || failed=1 remove_files rm -rf /etc/rc.d/rc*.d/*alsa +exit 0 diff --git a/src/paks/zabbix_agentd/install.sh b/src/paks/zabbix_agentd/install.sh index 80632d1ec..e3f988c34 100644 --- a/src/paks/zabbix_agentd/install.sh +++ b/src/paks/zabbix_agentd/install.sh @@ -39,7 +39,6 @@ ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc0.d/K02zabbix_agentd ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc6.d/K02zabbix_agentd # Create additonal directories and set permissions -[ -d /var/log/zabbix ] || ( mkdir -pv /var/log/zabbix && chown zabbix.zabbix /var/log/zabbix ) [ -d /usr/lib/zabbix ] || ( mkdir -pv /usr/lib/zabbix && chown zabbix.zabbix /usr/lib/zabbix ) restore_backup ${NAME} @@ -66,8 +65,7 @@ grep -q "Include=/var/ipfire/zabbix_agentd/zabbix_agentd_ipfire_mandatory.conf" if [ $? -eq 1 ]; then # Remove settings that are now in our own config sed -i -e "\|^PidFile=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf - sed -i -e "\|^LogFile=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf - sed -i -e "\|^LogFileSize=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf + sed -i -e "\|^LogType=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf sed -i -e "\|^LoadModulePath=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf sed -i -e "\|^Include=/etc/zabbix_agentd/zabbix_agentd\.d/\*\.conf$|d" /etc/zabbix_agentd/zabbix_agentd.conf # Include our own config in main config diff --git a/src/patches/linux/linux-6.3-netfilter_nftables_deactivate_anonymus_set.patch b/src/patches/linux/linux-6.3-netfilter_nftables_deactivate_anonymus_set.patch new file mode 100644 index 000000000..cd75de5c2 --- /dev/null +++ b/src/patches/linux/linux-6.3-netfilter_nftables_deactivate_anonymus_set.patch @@ -0,0 +1,121 @@ +From c1592a89942e9678f7d9c8030efa777c0d57edab Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso <pablo(a)netfilter.org> +Date: Tue, 2 May 2023 10:25:24 +0200 +Subject: netfilter: nf_tables: deactivate anonymous set from preparation phase + +Toggle deleted anonymous sets as inactive in the next generation, so +users cannot perform any update on it. Clear the generation bitmask +in case the transaction is aborted. + +The following KASAN splat shows a set element deletion for a bound +anonymous set that has been already removed in the same transaction. + +[ 64.921510] ================================================================== +[ 64.923123] BUG: KASAN: wild-memory-access in nf_tables_commit+0xa24/0x1490 [nf_tables] +[ 64.924745] Write of size 8 at addr dead000000000122 by task test/890 +[ 64.927903] CPU: 3 PID: 890 Comm: test Not tainted 6.3.0+ #253 +[ 64.931120] Call Trace: +[ 64.932699] <TASK> +[ 64.934292] dump_stack_lvl+0x33/0x50 +[ 64.935908] ? nf_tables_commit+0xa24/0x1490 [nf_tables] +[ 64.937551] kasan_report+0xda/0x120 +[ 64.939186] ? nf_tables_commit+0xa24/0x1490 [nf_tables] +[ 64.940814] nf_tables_commit+0xa24/0x1490 [nf_tables] +[ 64.942452] ? __kasan_slab_alloc+0x2d/0x60 +[ 64.944070] ? nf_tables_setelem_notify+0x190/0x190 [nf_tables] +[ 64.945710] ? kasan_set_track+0x21/0x30 +[ 64.947323] nfnetlink_rcv_batch+0x709/0xd90 [nfnetlink] +[ 64.948898] ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink] + +Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> +--- + include/net/netfilter/nf_tables.h | 1 + + net/netfilter/nf_tables_api.c | 12 ++++++++++++ + net/netfilter/nft_dynset.c | 2 +- + net/netfilter/nft_lookup.c | 2 +- + net/netfilter/nft_objref.c | 2 +- + 5 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h +index 3ed21d2d56590..2e24ea1d744c2 100644 +--- a/include/net/netfilter/nf_tables.h ++++ b/include/net/netfilter/nf_tables.h +@@ -619,6 +619,7 @@ struct nft_set_binding { + }; + + enum nft_trans_phase; ++void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set); + void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, + struct nft_set_binding *binding, + enum nft_trans_phase phase); +diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c +index 8b6c61a2196cb..59fb8320ab4d7 100644 +--- a/net/netfilter/nf_tables_api.c ++++ b/net/netfilter/nf_tables_api.c +@@ -5127,12 +5127,24 @@ static void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set, + } + } + ++void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set) ++{ ++ if (nft_set_is_anonymous(set)) ++ nft_clear(ctx->net, set); ++ ++ set->use++; ++} ++EXPORT_SYMBOL_GPL(nf_tables_activate_set); ++ + void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, + struct nft_set_binding *binding, + enum nft_trans_phase phase) + { + switch (phase) { + case NFT_TRANS_PREPARE: ++ if (nft_set_is_anonymous(set)) ++ nft_deactivate_next(ctx->net, set); ++ + set->use--; + return; + case NFT_TRANS_ABORT: +diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c +index 274579b1696e0..bd19c7aec92ee 100644 +--- a/net/netfilter/nft_dynset.c ++++ b/net/netfilter/nft_dynset.c +@@ -342,7 +342,7 @@ static void nft_dynset_activate(const struct nft_ctx *ctx, + { + struct nft_dynset *priv = nft_expr_priv(expr); + +- priv->set->use++; ++ nf_tables_activate_set(ctx, priv->set); + } + + static void nft_dynset_destroy(const struct nft_ctx *ctx, +diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c +index cecf8ab90e58f..03ef4fdaa460b 100644 +--- a/net/netfilter/nft_lookup.c ++++ b/net/netfilter/nft_lookup.c +@@ -167,7 +167,7 @@ static void nft_lookup_activate(const struct nft_ctx *ctx, + { + struct nft_lookup *priv = nft_expr_priv(expr); + +- priv->set->use++; ++ nf_tables_activate_set(ctx, priv->set); + } + + static void nft_lookup_destroy(const struct nft_ctx *ctx, +diff --git a/net/netfilter/nft_objref.c b/net/netfilter/nft_objref.c +index cb37169608bab..a48dd5b5d45b1 100644 +--- a/net/netfilter/nft_objref.c ++++ b/net/netfilter/nft_objref.c +@@ -185,7 +185,7 @@ static void nft_objref_map_activate(const struct nft_ctx *ctx, + { + struct nft_objref_map *priv = nft_expr_priv(expr); + +- priv->set->use++; ++ nf_tables_activate_set(ctx, priv->set); + } + + static void nft_objref_map_destroy(const struct nft_ctx *ctx, +-- +cgit + diff --git a/src/patches/mpfr-4.2.0-cumulative-patches-1-to-4.patch b/src/patches/mpfr-4.2.0-cumulative-patches-1-to-4.patch new file mode 100644 index 000000000..e12ed4708 --- /dev/null +++ b/src/patches/mpfr-4.2.0-cumulative-patches-1-to-4.patch @@ -0,0 +1,521 @@ +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:17:39.748645280 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:17:39.792645218 +0000 +@@ -0,0 +1 @@ ++tsprintf-thousands +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:17:39.792645218 +0000 +@@ -1 +1 @@ +-4.2.0 ++4.2.0-p1 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0" ++#define MPFR_VERSION_STRING "4.2.0-p1" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:17:39.792645218 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0"; ++ return "4.2.0-p1"; + } +diff -Naurd mpfr-4.2.0-a/tests/tsprintf.c mpfr-4.2.0-b/tests/tsprintf.c +--- mpfr-4.2.0-a/tests/tsprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tsprintf.c 2023-04-17 21:17:39.784645229 +0000 +@@ -1715,7 +1715,25 @@ + check_sprintf ("000000001,000", "%'013.4Rg", x); + + #ifdef PRINTF_GROUPFLAG +- check_vsprintf ("+01,234,567 :", "%0+ -'13.10Pd:", (mpfr_prec_t) 1234567); ++ /* Do not test the thousands separator with a precision field larger ++ than the number of digits (thus needing leading zeros), such as ++ "%0+ -'13.10Pd:" (used up to MPFR 4.2.0), since the GNU libc is ++ buggy: https://sourceware.org/bugzilla/show_bug.cgi?id=23432 ++ We don't know about the other implementations. ++ This new test works fine with glibc up to 2.36, but fails with 2.37 ++ (as reported by Klaus Dittrich in the MPFR mailing-list); this is ++ actually a bug introduced in glibc 2.37, not in MPFR: ++ https://sourceware.org/bugzilla/show_bug.cgi?id=30068 ++ Since this bug can yield a buffer overflow (CVE-2023-25139), possibly ++ affecting MPFR users, let us rather require a fix in glibc. This bug ++ has been fixed in the 2.37 branch: ++ https://sourceware.org/git/?p=glibc.git;a=commit;h=07b9521fc6 ++ If we wanted to check that and avoid a failure of the test because of ++ a buggy C library (while MPFR would be consistent with the C library), ++ we could compare the MPFR output with both the correct output and the ++ output from the C library (possibly buggy). But to do that in a clean ++ way, this would require a change in the check_vsprintf() call. */ ++ check_vsprintf ("+1,234,567 :", "%0+ -'13Pd:", (mpfr_prec_t) 1234567); + #endif + + mpfr_clear (x); +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:00.464616127 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:00.512616059 +0000 +@@ -0,0 +1 @@ ++ui_pow_ui-overflow +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:17:39.792645218 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:00.512616059 +0000 +@@ -1 +1 @@ +-4.2.0-p1 ++4.2.0-p2 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p1" ++#define MPFR_VERSION_STRING "4.2.0-p2" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/ui_pow_ui.c mpfr-4.2.0-b/src/ui_pow_ui.c +--- mpfr-4.2.0-a/src/ui_pow_ui.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/ui_pow_ui.c 2023-04-17 21:18:00.504616070 +0000 +@@ -23,7 +23,7 @@ + #include "mpfr-impl.h" + + int +-mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int y, unsigned long int n, ++mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int k, unsigned long int n, + mpfr_rnd_t rnd) + { + mpfr_exp_t err; +@@ -35,22 +35,28 @@ + MPFR_ZIV_DECL (loop); + MPFR_SAVE_EXPO_DECL (expo); + ++ MPFR_LOG_FUNC ++ (("k=%lu n=%lu rnd=%d", k, n, rnd), ++ ("y[%Pu]=%.*Rg inexact=%d", ++ mpfr_get_prec (x), mpfr_log_prec, x, inexact)); ++ + if (MPFR_UNLIKELY (n <= 1)) + { + if (n == 1) +- return mpfr_set_ui (x, y, rnd); /* y^1 = y */ ++ return mpfr_set_ui (x, k, rnd); /* k^1 = k */ + else +- return mpfr_set_ui (x, 1, rnd); /* y^0 = 1 for any y */ ++ return mpfr_set_ui (x, 1, rnd); /* k^0 = 1 for any k */ + } +- else if (MPFR_UNLIKELY (y <= 1)) ++ else if (MPFR_UNLIKELY (k <= 1)) + { +- if (y == 1) ++ if (k == 1) + return mpfr_set_ui (x, 1, rnd); /* 1^n = 1 for any n > 0 */ + else + return mpfr_set_ui (x, 0, rnd); /* 0^n = 0 for any n > 0 */ + } + +- for (size_n = 0, m = n; m; size_n++, m >>= 1); ++ for (size_n = 0, m = n; m != 0; size_n++, m >>= 1) ++ ; + + MPFR_SAVE_EXPO_MARK (expo); + prec = MPFR_PREC (x) + 3 + size_n; +@@ -60,23 +66,55 @@ + for (;;) + { + int i = size_n; ++ unsigned int inex_res; + +- inexact = mpfr_set_ui (res, y, MPFR_RNDU); ++ inex_res = mpfr_set_ui (res, k, MPFR_RNDU); + err = 1; + /* now 2^(i-1) <= n < 2^i: i=1+floor(log2(n)) */ + for (i -= 2; i >= 0; i--) + { +- inexact |= mpfr_sqr (res, res, MPFR_RNDU); ++ inex_res |= mpfr_sqr (res, res, MPFR_RNDU); + err++; + if (n & (1UL << i)) +- inexact |= mpfr_mul_ui (res, res, y, MPFR_RNDU); ++ inex_res |= mpfr_mul_ui (res, res, k, MPFR_RNDU); + } ++ ++ if (MPFR_UNLIKELY (MPFR_IS_INF (res))) ++ { ++ mpfr_t kf; ++ mpz_t z; ++ int size_k; ++ MPFR_BLOCK_DECL (flags); ++ ++ /* Let's handle the overflow by calling mpfr_pow_z. ++ Alternatively, we could call mpfr_pow_ui; this would ++ need a bit shorter code below, but mpfr_pow_ui handles ++ the overflow by calling mpfr_pow_z, so that calling ++ mpfr_pow_z directly should be a bit more efficient. */ ++ ++ MPFR_ZIV_FREE (loop); ++ mpfr_clear (res); ++ for (size_k = 0, m = k; m != 0; size_k++, m >>= 1) ++ ; ++ mpfr_init2 (kf, size_k); ++ inexact = mpfr_set_ui (kf, k, MPFR_RNDN); ++ MPFR_ASSERTD (inexact == 0); ++ mpz_init (z); ++ mpz_set_ui (z, n); ++ MPFR_BLOCK (flags, inexact = mpfr_pow_z (x, kf, z, rnd);); ++ mpz_clear (z); ++ mpfr_clear (kf); ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, flags); ++ goto end; ++ } ++ + /* since the loop is executed floor(log2(n)) times, + we have err = 1+floor(log2(n)). + Since prec >= MPFR_PREC(x) + 4 + floor(log2(n)), prec > err */ + err = prec - err; + +- if (MPFR_LIKELY (inexact == 0 ++ MPFR_LOG_VAR (res); ++ if (MPFR_LIKELY (!inex_res + || MPFR_CAN_ROUND (res, err, MPFR_PREC (x), rnd))) + break; + +@@ -90,6 +128,7 @@ + + mpfr_clear (res); + ++ end: + MPFR_SAVE_EXPO_FREE (expo); + return mpfr_check_range (x, inexact, rnd); + } +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:17:39.792645218 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:00.512616059 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p1"; ++ return "4.2.0-p2"; + } +diff -Naurd mpfr-4.2.0-a/tests/tlog10.c mpfr-4.2.0-b/tests/tlog10.c +--- mpfr-4.2.0-a/tests/tlog10.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tlog10.c 2023-04-17 21:18:00.504616070 +0000 +@@ -49,6 +49,60 @@ + #define TEST_RANDOM_POS 8 + #include "tgeneric.c" + ++/* On 2023-02-13, one gets an infinite loop in mpfr_log10 on both ++ 32-bit and 64-bit hosts when the precision is not large enough ++ (precision 12 and below). */ ++static void ++bug20230213 (void) ++{ ++ mpfr_exp_t old_emin, old_emax, e; ++ mpfr_t t, x, y0, y1, y2; ++ int prec; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ e = mpfr_get_emax () - 1; ++ ++ /* The precisions of t and y0 should be large enough to avoid ++ a hard-to-round case for the target precisions. */ ++ mpfr_inits2 (64, t, y0, (mpfr_ptr) 0); ++ mpfr_set_exp_t (y0, e, MPFR_RNDN); ++ mpfr_log_ui (t, 10, MPFR_RNDN); ++ mpfr_div (y0, y0, t, MPFR_RNDN); ++ mpfr_log_ui (t, 2, MPFR_RNDN); ++ mpfr_mul (y0, y0, t, MPFR_RNDN); ++ ++ for (prec = 16; prec >= MPFR_PREC_MIN; prec--) ++ { ++ mpfr_inits2 (prec, x, y1, y2, (mpfr_ptr) 0); ++ mpfr_set (y1, y0, MPFR_RNDN); ++ ++ mpfr_set_ui_2exp (x, 1, e, MPFR_RNDN); ++ mpfr_log10 (y2, x, MPFR_RNDN); ++ MPFR_ASSERTN (MPFR_IS_PURE_FP (y2)); ++ MPFR_ASSERTN (MPFR_IS_POS (y2)); ++ ++ if (! mpfr_equal_p (y1, y2)) ++ { ++ printf ("Error in bug20230213.\n"); ++ printf ("Expected "); ++ mpfr_dump (y1); ++ printf ("Got "); ++ mpfr_dump (y2); ++ exit (1); ++ } ++ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); ++ } ++ ++ mpfr_clears (t, y0, (mpfr_ptr) 0); ++ ++ set_emin (old_emin); ++ set_emax (old_emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -112,6 +166,8 @@ + mpfr_clear (x); + mpfr_clear (y); + ++ bug20230213 (); ++ + data_check ("data/log10", mpfr_log10, "mpfr_log10"); + + tests_end_mpfr (); +diff -Naurd mpfr-4.2.0-a/tests/tui_pow.c mpfr-4.2.0-b/tests/tui_pow.c +--- mpfr-4.2.0-a/tests/tui_pow.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tui_pow.c 2023-04-17 21:18:00.504616070 +0000 +@@ -142,6 +142,37 @@ + mpfr_clear (t); + } + ++static void ++huge (void) ++{ ++ mpfr_exp_t old_emin, old_emax; ++ mpfr_t x; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ ++ mpfr_init2 (x, 8); ++ ++ /* The purpose of this test is more to check that mpfr_ui_pow_ui ++ terminates (without taking much memory) rather than checking ++ the value of x. On 2023-02-13, the +Inf case was not handled ++ in the Ziv iteration, yielding an infinite loop, affecting ++ mpfr_log10 in particular. See ++ commit 90de094f0d9c309daca707aa227470d810866616 ++ */ ++ mpfr_ui_pow_ui (x, 5, ULONG_MAX, MPFR_RNDN); ++ if (MPFR_EMAX_MAX <= ULONG_MAX) /* true with default _MPFR_EXP_FORMAT */ ++ MPFR_ASSERTN (MPFR_IS_INF (x)); ++ ++ mpfr_clear (x); ++ ++ set_emin (old_emin); ++ set_emax (old_emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -180,6 +211,7 @@ + } + + test1 (); ++ huge (); + + { + mpfr_t z, t; +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:26.860579184 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:26.904579122 +0000 +@@ -0,0 +1 @@ ++multibyte-decimal_point +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:00.512616059 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:26.904579122 +0000 +@@ -1 +1 @@ +-4.2.0-p2 ++4.2.0-p3 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p2" ++#define MPFR_VERSION_STRING "4.2.0-p3" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:00.512616059 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:26.904579122 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p2"; ++ return "4.2.0-p3"; + } +diff -Naurd mpfr-4.2.0-a/tests/tfprintf.c mpfr-4.2.0-b/tests/tfprintf.c +--- mpfr-4.2.0-a/tests/tfprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tfprintf.c 2023-04-17 21:18:26.896579133 +0000 +@@ -61,6 +61,12 @@ + exit (1); \ + } + ++#if MPFR_LCONV_DPTS ++#define DPLEN ((int) strlen (localeconv()->decimal_point)) ++#else ++#define DPLEN 1 ++#endif ++ + /* limit for random precision in random() */ + const int prec_max_printf = 5000; + +@@ -195,12 +201,12 @@ + lo, &ulo); + check_length (2, ulo, 36, lu); + check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); +- check_length (3, ush, 46, hu); ++ check_length (3, ush, 45 + DPLEN, hu); + check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); +- check_length (4, i, 29, d); ++ check_length (4, i, 28 + DPLEN, d); + check_vfprintf (fout, "a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, + &sz); +- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier "%zu" in C90 */ ++ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier "%zu" in C90 */ + check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz); + check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi); + check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr, +@@ -224,7 +230,7 @@ + + #ifdef PRINTF_L + check_vfprintf (fout, "a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); +- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier "%zu" in C90 */ ++ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier "%zu" in C90 */ + #endif + + #ifndef NPRINTF_HH +diff -Naurd mpfr-4.2.0-a/tests/tprintf.c mpfr-4.2.0-b/tests/tprintf.c +--- mpfr-4.2.0-a/tests/tprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tprintf.c 2023-04-17 21:18:26.896579133 +0000 +@@ -68,6 +68,12 @@ + exit (1); \ + } + ++#if MPFR_LCONV_DPTS ++#define DPLEN ((int) strlen (localeconv()->decimal_point)) ++#else ++#define DPLEN 1 ++#endif ++ + /* limit for random precision in random() */ + const int prec_max_printf = 5000; + /* boolean: is stdout redirected to a file ? */ +@@ -316,11 +322,11 @@ + check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo); + check_length (2, ulo, 36, lu); + check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); +- check_length (3, ush, 46, hu); ++ check_length (3, ush, 45 + DPLEN, hu); + check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); +- check_length (4, i, 29, d); ++ check_length (4, i, 28 + DPLEN, d); + check_vprintf ("a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, &sz); +- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier '%zu' in C90 */ ++ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier '%zu' in C90 */ + check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz); + check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi); + check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", +@@ -344,7 +350,7 @@ + + #ifdef PRINTF_L + check_vprintf ("a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); +- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier '%zu' in C90 */ ++ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier '%zu' in C90 */ + #endif + + #ifndef NPRINTF_HH +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:19:01.988530337 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:19:02.032530276 +0000 +@@ -0,0 +1 @@ ++rec_sqrt-zivloop +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:26.904579122 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:19:02.032530276 +0000 +@@ -1 +1 @@ +-4.2.0-p3 ++4.2.0-p4 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:19:02.032530276 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p3" ++#define MPFR_VERSION_STRING "4.2.0-p4" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/rec_sqrt.c mpfr-4.2.0-b/src/rec_sqrt.c +--- mpfr-4.2.0-a/src/rec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/rec_sqrt.c 2023-04-17 21:19:02.024530287 +0000 +@@ -463,6 +463,7 @@ + int s, cy, inex; + mpfr_limb_ptr x; + MPFR_TMP_DECL(marker); ++ MPFR_ZIV_DECL (loop); + + MPFR_LOG_FUNC + (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (u), mpfr_log_prec, u, rnd_mode), +@@ -530,6 +531,7 @@ + wp = rp + 11; + if (wp < rn * GMP_NUMB_BITS) + wp = rn * GMP_NUMB_BITS; ++ MPFR_ZIV_INIT (loop, wp); + for (;;) + { + MPFR_TMP_MARK (marker); +@@ -561,8 +563,9 @@ + } + MPFR_TMP_FREE(marker); + +- wp += GMP_NUMB_BITS; ++ MPFR_ZIV_NEXT (loop, wp); + } ++ MPFR_ZIV_FREE (loop); + cy = mpfr_round_raw (MPFR_MANT(r), x, wp, 0, rp, rnd_mode, &inex); + MPFR_EXP(r) = - (MPFR_EXP(u) - 1 - s) / 2; + if (MPFR_UNLIKELY(cy != 0)) +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:26.904579122 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:19:02.032530276 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p3"; ++ return "4.2.0-p4"; + } +diff -Naurd mpfr-4.2.0-a/tests/trec_sqrt.c mpfr-4.2.0-b/tests/trec_sqrt.c +--- mpfr-4.2.0-a/tests/trec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/trec_sqrt.c 2023-04-17 21:19:02.028530282 +0000 +@@ -242,6 +242,8 @@ + data_check ("data/rec_sqrt", mpfr_rec_sqrt, "mpfr_rec_sqrt"); + bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 4, 128, + 800, 50); ++ bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 9999, 9999, ++ 120000, 1); + + end: + tests_end_mpfr (); diff --git a/src/scripts/archive.files b/src/scripts/archive.files old mode 100755 new mode 100644 diff --git a/src/scripts/captive-cleanup b/src/scripts/captive-cleanup old mode 100755 new mode 100644 diff --git a/src/scripts/convert-dns-settings b/src/scripts/convert-dns-settings old mode 100755 new mode 100644 diff --git a/src/scripts/convert-to-location b/src/scripts/convert-to-location old mode 100755 new mode 100644 diff --git a/src/scripts/openvpn-metrics b/src/scripts/openvpn-metrics old mode 100755 new mode 100644 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5ff01db62f9e6b632aac1360fdea78d342be4311
by Michael Tremer 08 May '23

08 May '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 5ff01db62f9e6b632aac1360fdea78d342be4311 (commit) via da4f96f132f3eff10670f9c1a4b39eb865d74aa4 (commit) via e4b39d703b5ce50ab062ae66b642b3318beb0cf8 (commit) via 2d448045f35850b678c20e2be7b7be30d4f72d59 (commit) from 4c4c991fad688791d28c8e6c6956dc7bfa99e42b (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 5ff01db62f9e6b632aac1360fdea78d342be4311 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 8 13:40:07 2023 +0000 openssl: Make sure we perform a parallel build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit da4f96f132f3eff10670f9c1a4b39eb865d74aa4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 29 16:07:15 2023 +0200 systemd: Use sysusers mechanism inside the jail Change the old user/group creation mechanism to use systemd's sysusers mechanism instead. This is a bit of a tricky part, because before systemd we do not have this binary. So at first we have to push the sysusers files to the jails sysusers directory and use the previous compiled and installed systemd-sysusers binary in order to create the groups/users which are part of systemd inside the jail. After that, everything works quite normal when modifying the files or direcotry owners. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e4b39d703b5ce50ab062ae66b642b3318beb0cf8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed Mar 29 16:05:17 2023 +0200 systemd: Build manpages again This "optional" feature now has to be enabled. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2d448045f35850b678c20e2be7b7be30d4f72d59 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Mar 28 19:35:05 2023 +0200 systemd: Move some basic tools into own package The systemd-sysusers and systemd-tmpfiles tools are used by various services and the build system in order to install / build packages. Moving this tools into an own package allows us to early access them without requiremet to install the whole systemd package. Anyway the systemd package requires those tools to proper get installed and handle their own sysusers files. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: openssl/openssl.nm | 17 ++++------ systemd/systemd.nm | 98 +++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 81 insertions(+), 34 deletions(-) Difference in files: diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 58d932b1a..76d2dffc7 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -5,7 +5,7 @@ name = openssl version = 3.0.8 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Libraries @@ -54,7 +54,7 @@ build ssl_arch += enable-ec_nistp_64_gcc_128 end - build + configure = \ ./Configure \ --prefix=%{prefix} \ --libdir=%{libdir} \ @@ -72,19 +72,16 @@ build ${CFLAGS} \ ${LDFLAGS} - make all + test + make test + end + install # Clean up the .pc files for i in libcrypto.pc libssl.pc openssl.pc; do sed -i '/^Libs.private:/{s/-L[^ ]* //;s/-Wl[^ ]* //}' $i done - end - test - make test - end - - install make install DESTDIR=%{BUILDROOT} # Remove dist config @@ -102,8 +99,6 @@ packages requires += ca-certificates - conflicts += %{name} < %{thisver} - files += %{libdir}/openssl %{libdir}/engines* end diff --git a/systemd/systemd.nm b/systemd/systemd.nm index a01063828..db57e4142 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 253 -release = 2 +release = 5 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -77,7 +77,11 @@ build configure_options = \ -Dsysvinit-path= \ -Dsysvrcnd-path= \ + -Dnobody-user=nobody \ + -Dnobody-group=nobody \ + -Dfallback-hostname="localhost" \ -Dzlib=true \ + -Dman=true \ -Dsmack=false \ -Dbacklight=false \ -Dfirstboot=false \ @@ -92,9 +96,26 @@ build -Dtimedated=false \ -Dpolkit=false - prepare_cmds - %{create_groups} - end + # Assign group ids + configure_options += \ + -Dadm-gid=4 \ + -Dtty-gid=5 \ + -Ddisk-gid=6 \ + -Dlp-gid=7 \ + -Dkmem-gid=9 \ + -Dwheel-gid=10 \ + -Dcdrom-gid=11 \ + -Ddialout-gid=18 \ + -Dutmp-gid=22 \ + -Dtape-gid=33 \ + -Dkvm-gid=36 \ + -Dvideo-gid=39 \ + -Daudio-gid=63 \ + -Dusers-gid=100 \ + -Dinput-gid=104 \ + -Drender-gid=105 \ + -Dsgx-gid=106 \ + -Dsystemd-journal-gid=190 build # Call meson and pass configure options. @@ -116,6 +137,10 @@ build # Install systemd. %{meson_install} + # Use the installed files to create all users and groups + # in one shot. + %{create_groups} + # Create folder in log to store the journal. mkdir -pv %{BUILDROOT}/var/log/journal @@ -201,22 +226,17 @@ build end create_groups - # Create groups for udev. - getent group cdrom >/dev/null || groupadd -g 11 cdrom || : - getent group tape >/dev/null || groupadd -g 33 tape || : - getent group dialout >/dev/null || groupadd -g 18 dialout || : - getent group floppy >/dev/null || groupadd -g 19 floppy || : - getent group input >/dev/null || groupadd -r input || : - getent group utmp >/dev/null || groupadd -r -g 22 utmp || : - - # Create group for journald. - getent group systemd-journal >/dev/null || /usr/sbin/groupadd -r systemd-journal -end + # Create the sysusers folder in the jail. + mkdir -pv %{sysusersdir} -quality-agent - whitelist_rpath - %{prefix}/lib/systemd - end + # Copy all sysusers files from BUILDROOT into the jail's sysusers directory. + install -v -m 644 %{BUILDROOT}%{sysusersdir}/*.conf %{sysusersdir} + + # We do not have a libsystemd or systemd-sysusers binary, so + # call the installed one inside BUILDROOT to create all users and + # groups in one shot. + LD_LIBRARY_PATH="%{BUILDROOT}%{libdir}/systemd/" \ + %{BUILDROOT}%{bindir}/systemd-sysusers end packages @@ -227,6 +247,7 @@ packages python3-cairo python3-dbus python3-gobject3 + %{name}-basetools = %{thisver} %{name}-libs = %{thisver} util-linux >= 2.19 end @@ -271,10 +292,6 @@ packages /etc/vconsole.conf end - script prein - %{create_groups} - end - script postin # Reexec systemd daemon. /usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || : @@ -315,6 +332,38 @@ packages end end + package %{name}-basetools + summary = Basetools from the systemd package, like sysuses and tmpfiles. + description + This package contains some very basic tools from systemd like + systemd-sysusers and systemd-tmpfiles. + + They mostly are required in a very early stage and shipping them + in an own package allows us to handle this properly. + end + + provides + systemd-sysusers = %{thisver} + systemd-tmpfiles = %{thisver} + end + + requires + %{name}-libs = %{thisver} + end + + files + %{bindir}/%{name}-sysusers + %{bindir}/%{name}-tmpfiles + %{mandir}/man1/%{name}-sysusers* + %{mandir}/man1/%{name}-tmpfiles* + + # Only ship the sysusers.d folder without + # any config files. + %{sysusersdir} + !%{sysusersdir}/*.conf + end + end + package %{name}-libs template LIBS @@ -339,6 +388,9 @@ packages systemd < %{thisver} end + files += \ + %{libdir}/%{name} + # Add myhostname to the hosts line of /etc/nsswitch.conf script postin if [ -f "/etc/nsswitch.conf" ]; then hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cb251d2fbb258eb1cd2484dc129c01e14c1f35af
by Arne Fitzenreiter 08 May '23

08 May '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 cb251d2fbb258eb1cd2484dc129c01e14c1f35af (commit) from fae6e41cd103f32416758681d08481f4d85c4a86 (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 cb251d2fbb258eb1cd2484dc129c01e14c1f35af Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Apr 23 13:42:38 2023 +0200 bind: Update to 9.16.40 For details see: https://downloads.isc.org/isc/bind9/9.16.40/doc/arm/html/notes.html#notes-f… "Notes for BIND 9.16.40 Bug Fixes Logfiles using timestamp-style suffixes were not always correctly removed when the number of files exceeded the limit set by versions. This has been fixed for configurations which do not explicitly specify a directory path as part of the file argument in the channel specification. [GL #3959] [GL #3991] Performance of DNSSEC validation in zones with many DNSKEY records has been improved. [GL #3981]" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bind | 14 +++++++------- lfs/bind | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index aabaae6fa..eeeee6e94 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.39.so +usr/lib/libbind9-9.16.40.so #usr/lib/libbind9.la #usr/lib/libbind9.so -usr/lib/libdns-9.16.39.so +usr/lib/libdns-9.16.40.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.39.so +usr/lib/libirs-9.16.40.so #usr/lib/libirs.la #usr/lib/libirs.so -usr/lib/libisc-9.16.39.so +usr/lib/libisc-9.16.40.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.39.so +usr/lib/libisccc-9.16.40.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.39.so +usr/lib/libisccfg-9.16.40.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.39.so +usr/lib/libns-9.16.40.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/lfs/bind b/lfs/bind index 584cb7e5a..850e3f93a 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.16.39 +VER = 9.16.40 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d9fb51435dce11c8854084cc21de79df3ae6529baead76dcf27711bcff33469d1fd6fbd3366b61bc921f92850620c9b7464d4dbe08dd0c7e2f3e5e1c1100cb79 +$(DL_FILE)_BLAKE2 = 1ebfec11cc6902480113b1edadcbdb2f819050d779aaa1556ef79491c580a28106d3eff186da89bdecec03025e4e672342602f54e6b0e6f9619a181a1399e070 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fae6e41cd103f32416758681d08481f4d85c4a86
by Arne Fitzenreiter 05 May '23

05 May '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 fae6e41cd103f32416758681d08481f4d85c4a86 (commit) from 6cd5e3ffef65c962283be1f8a7e51a2e175ad9d8 (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 fae6e41cd103f32416758681d08481f4d85c4a86 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri May 5 07:20:45 2023 +0200 memtest: update to memtest86+ 6.10 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/memtest | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/memtest b/lfs/memtest index 0e10533b6..a26beaef4 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 6.01 +VER = 6.10 THISAPP = memtest86plus-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 429df2d71cb0d84bec9aa3a25023f2a9db2e8c01b32b0af1f42b689a4a7da192d5ddb77a5cb126a162aba0c1e704a2da8f5dee88caae0d9f78545e9e9c14eee9 +$(DL_FILE)_BLAKE2 = 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6cd5e3ffef65c962283be1f8a7e51a2e175ad9d8
by Arne Fitzenreiter 04 May '23

04 May '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 6cd5e3ffef65c962283be1f8a7e51a2e175ad9d8 (commit) from e023c2a4143caa194fb9f270123653c7ec5d01a2 (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 6cd5e3ffef65c962283be1f8a7e51a2e175ad9d8 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed May 3 21:11:51 2023 +0200 clamav: Update to 1.1.0 For details see: https://blog.clamav.net/2023/05/clamav-110-released.html "Major changes Added the ability to extract images embedded in HTML CSS <style> blocks. Updated to Sigtool so that the --vba option will extract VBA code from Microsoft Office documents the same way that libclamav extracts VBA. This resolves several issues where Sigtool could not extract VBA. Sigtool will also now display the normalized VBA code instead of the pre-normalized VBA code. Added a new ClamScan and ClamD option: --fail-if-cvd-older-than=days. Additionally, we introduce FailIfCvdOlderThan as a clamd.conf synonym for --fail-if-cvd-older-than. When passed, it causes ClamD to exit on startup with a non-zero return code if the virus database is older than the specified number of days. Added a new function cl_cvdgetage() to the libclamav API. This function will retrieve the age in seconds of the youngest file in a database directory, or the age of a single CVD (or CLD) file. Added a new function cl_engine_set_clcb_vba() to the libclamav API. Use this function to set a cb_vba callback function. The cb_vba callback function will be run whenever VBA is extracted from office documents. The provided data will be a normalized copy of the extracted VBA. This callback was added to support Sigtool so that it can use the same VBA extraction logic that ClamAV uses to scan documents. Other improvements Removed the vendored TomsFastMath library in favor of using OpenSSL to perform "big number"/multiprecision math operations. Work courtesy of Sebastian Andrzej Siewior. Build system: Added CMake option DO_NOT_SET_RPATH to avoid setting RPATH on Unix systems. Feature courtesy of Sebastian Andrzej Siewior. Build system: Enabled version-scripts with CMake to limit symbol exports for libclamav, libfreshclam, libclamunrar_iface, and libclamunrar shared libraries on Unix systems, excluding macOS. Improvement courtesy of Orion Poplawski and Sebastian Andrzej Siewior. Build system: Enabled users to pass in custom Rust compiler flags using the RUSTFLAGS CMake variable. Feature courtesy of Orion Poplawski. Removed a hard-coded alert for CVE-2004-0597. The CVE is old enough that it is no longer a threat and the detection had occasional false-positives. Set Git attributes to prevent Git from altering line endings for Rust vendored libraries. Third-party Rust libraries are bundled in the ClamAV release tarball. We do not commit them to our own Git repository, but community package maintainers may now store the tarball contents in Git. The Rust build system verifies the library manifest, and this change ensures that the hashes are correct. Improvement courtesy of Nicolas R. Fixed compile time warnings. Improvement courtesy of Razvan Cojocaru. Added a minor optimization when matching domain name regex signatures for PDB, WDB and CDB type signatures. Build system: Enabled the ability to select a specific Python version. When building, you may use the CMake option -D PYTHON_FIND_VER=<version> to choose a specific Python version. Feature courtesy of Matt Jolly. Added improvements to the ClamOnAcc process log output so that it is easier to diagnose bugs. Windows: Enabled the MSI installer to upgrade between feature versions more easily when ClamAV is installed to a location different from the default (i.e., not C:\Program Files\ClamAV). This means that the MSI installer can find a previous ClamAV 1.0.x installation to upgrade to ClamAV 1.1.0. Sigtool: Added the ability to change the location of the temp directory using the --tempdir option and added the ability to retain the temp files created by Sigtool using the --leave-temps option. Other minor improvements. Bug fixes Fixed the broken ExcludePUA / --exclude-pua feature. Fix courtesy of Ged Haywood and Shawn Iverson. Fixed an issue with integer endianness when parsing Windows executables on big-endian systems. Fix courtesy of Sebastian Andrzej Siewior. Fixed a possible stack overflow read when parsing WDB signatures. This issue is not a vulnerability. Fixed a possible index out of bounds when loading CRB signatures. This issue is not a vulnerability. Fixed a possible use after free when reading logical signatures. This issue is not a vulnerability. Fixed a possible heap overflow read when reading PDB signatures. This issue is not a vulnerability. Fixed a possible heap overflow read in javascript normalizer module. This issue is not a vulnerability. Fixed two bugs that would cause Freshclam to fail update when applying a CDIFF database patch if that patch adds a file to the database archive or removes a file from the database archive. This bug also caused Sigtool to fail to create such a patch. Fixed an assortment of complaints identified by Coverity static analysis. Fixed one of the Freshclam tests that was failing on some Fedora systems due to a bug printing debug-level log messages to stdout. Fix courtesy of Arjen de Korte. Correctly remove temporary files generated by the VBA and XLM extraction modules so that the files are not leaked in patched versions of ClamAV where temporary files are written directly to the temp-directory instead of writing to a unique subdirectory." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 16 ++++++++-------- lfs/clamav | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index fd3c4c0c9..d49a12d52 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -13,20 +13,20 @@ usr/bin/sigtool #usr/include/clamav.h #usr/include/libfreshclam.h usr/lib/libclamav.so -usr/lib/libclamav.so.11 -usr/lib/libclamav.so.11.0.0 +usr/lib/libclamav.so.12 +usr/lib/libclamav.so.12.0.0 usr/lib/libclammspack.so usr/lib/libclammspack.so.0 usr/lib/libclammspack.so.0.8.0 usr/lib/libclamunrar.so -usr/lib/libclamunrar.so.11 -usr/lib/libclamunrar.so.11.0.0 +usr/lib/libclamunrar.so.12 +usr/lib/libclamunrar.so.12.0.0 usr/lib/libclamunrar_iface.so -usr/lib/libclamunrar_iface.so.11 -usr/lib/libclamunrar_iface.so.11.0.0 +usr/lib/libclamunrar_iface.so.12 +usr/lib/libclamunrar_iface.so.12.0.0 usr/lib/libfreshclam.so -usr/lib/libfreshclam.so.2 -usr/lib/libfreshclam.so.2.0.2 +usr/lib/libfreshclam.so.3 +usr/lib/libfreshclam.so.3.0.0 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd #usr/share/doc/ClamAV diff --git a/lfs/clamav b/lfs/clamav index 426321c05..eeb0df5b2 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -26,7 +26,7 @@ include Config SUMMARY = Antivirus Toolkit -VER = 1.0.1 +VER = 1.1.0 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 65 +PAK_VER = 66 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8f216051eeb94a9196849c9edff2fe0c73e4aa3ca242cf72d91c1692eb2a4688f8e525f638b6870a2f934976435a4272a1f116c1cf3a7cfd194efa91f11fd135 +$(DL_FILE)_BLAKE2 = 6a30558b8e6d2f8d98eb0b990e58ec9a19d7f58b11863ec5dffe97f45c73c1ea8bb0360456193c76d178068ee5eb7f01fc44851eb7bf90d42ca9dd9431413a4f install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e023c2a4143caa194fb9f270123653c7ec5d01a2
by Arne Fitzenreiter 03 May '23

03 May '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 e023c2a4143caa194fb9f270123653c7ec5d01a2 (commit) via 9eb18b34c68c0044f62fc601580f48384496f61b (commit) via e42ea50d7a0bbeb3dcff7083039b4ab3362e6fe5 (commit) via 0a554a474eaa7c610a96811b318ee67176fb0924 (commit) via c6a1970b587faaca0b032a0ac74fc5d66a6f0b64 (commit) via 51c7cfed815b80b60b9d6553fb7cd2cb476e0596 (commit) via 1653034fae0d52f8379278ee8c6cd6be6a5f5d09 (commit) via 24c8b9e0e6abd4dc3587b5181c38967b083ef954 (commit) via 42a2077c72cfc9fc93b638794cb0f370a905d3a3 (commit) via 84c21e12ecfac026dc222417e95a15231bc57c33 (commit) via 4c802a17be2bb5f57b5db6991e727b9312b7930d (commit) via d2130887f727174d0e6416f9023ad0414d5e6536 (commit) via bf043437f8d4bc525758ba6d483b704247433580 (commit) via 5d4a957339caf4a5c5a8647da2f26f9e53987de4 (commit) via 9d0add9f8244b445f6863b4be66f49926249e7e9 (commit) via 3df5187dfc42e0da2578a80057af57ddb37b435b (commit) via 7101e472a0901963ecf4556734633b72473ea09b (commit) via 25ac6657c10f4c8af026ecf5c165e1ddf2768540 (commit) via 827665788bd7700423dd6b9fe277c1277b7cff0e (commit) via 757ed7dbc18ff73c433540d192ad643e24faea32 (commit) via 237b88914d4449388a14474ea64afd90136c1814 (commit) via 0b208a9ccbba9015d4dd9acc01f22890c09556c7 (commit) from 6a0c5ef65a5fb96890c774840ecb24f390437855 (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 e023c2a4143caa194fb9f270123653c7ec5d01a2 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:54:00 2023 +0200 minidlna: bump PAK_VER due to ffmpeg library sobump Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9eb18b34c68c0044f62fc601580f48384496f61b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:59 2023 +0200 shairport-sync: bump PAK_VER due to ffmpeg library sobump Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e42ea50d7a0bbeb3dcff7083039b4ab3362e6fe5 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:58 2023 +0200 mpd: bump PAK_VER due to ffmpeg library sobump Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0a554a474eaa7c610a96811b318ee67176fb0924 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:57 2023 +0200 ffmpeg: Update to version 6.0 - Update from version 5.1.2 to 6.0 - Update of rootfile - sobump occurs so find-dependencies checked and the addons mpd, shairport-sync & minidlna will be bumped to the next PAK_VER as a patch set with this change. - Changelog version 6.0: - Radiance HDR image support - ddagrab (Desktop Duplication) video capture filter - ffmpeg -shortest_buf_duration option - ffmpeg now requires threading to be built - ffmpeg now runs every muxer in a separate thread - Add new mode to cropdetect filter to detect crop-area based on motion vectors and edges - VAAPI decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9 - WBMP (Wireless Application Protocol Bitmap) image format - a3dscope filter - bonk decoder and demuxer - Micronas SC-4 audio decoder - LAF demuxer - APAC decoder and demuxer - Media 100i decoders - DTS to PTS reorder bsf - ViewQuest VQC decoder - backgroundkey filter - nvenc AV1 encoding support - MediaCodec decoder via NDKMediaCodec - MediaCodec encoder - oneVPL support for QSV - QSV AV1 encoder - QSV decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9 - showcwt multimedia filter - corr video filter - adrc audio filter - afdelaysrc audio filter - WADY DPCM decoder and demuxer - CBD2 DPCM decoder - ssim360 video filter - ffmpeg CLI new options: -stats_enc_pre[_fmt], -stats_enc_post[_fmt], -stats_mux_pre[_fmt] - hstack_vaapi, vstack_vaapi and xstack_vaapi filters - XMD ADPCM decoder and demuxer - media100 to mjpegb bsf - ffmpeg CLI new option: -fix_sub_duration_heartbeat - WavArc decoder and demuxer - CrystalHD decoders deprecated - SDNS demuxer - RKA decoder and demuxer - filtergraph syntax in ffmpeg CLI now supports passing file contents as option values, by prefixing option name with '/' - hstack_qsv, vstack_qsv and xstack_qsv filters For more details about the changes you have to review the commits in the git repo https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n6.0 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit c6a1970b587faaca0b032a0ac74fc5d66a6f0b64 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 3 07:53:29 2023 +0000 core175: ship zstd Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 51c7cfed815b80b60b9d6553fb7cd2cb476e0596 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:21 2023 +0200 zstd: Update to version 1.5.5 - Update from version 1.5.4 to 1.5.5 - Update of rootfile - Changelog v1.5.5 (Apr 2023) fix: fix rare corruption bug affecting the high compression mode, reported by @danlark1 (#3517, @terrelln) perf: improve mid-level compression speed (#3529, #3533, #3543, @yoniko and #3552, @terrelln) lib: deprecated bufferless block-level API (#3534) by @terrelln cli: mmap large dictionaries to save memory, by @daniellerozenblit cli: improve speed of --patch-from mode (~+50%) (#3545) by @daniellerozenblit cli: improve i/o speed (~+10%) when processing lots of small files (#3479) by @felixhandte cli: zstd no longer crashes when requested to write into write-protected directory (#3541) by @felixhandte cli: fix decompression into block device using -o, reported by @georgmu (#3583) build: fix zstd CLI compiled with lzma support but not zlib support (#3494) by @Hello71 build: fix cmake does no longer require 3.18 as minimum version (#3510) by @kou build: fix MSVC+ClangCL linking issue (#3569) by @tru build: fix zstd-dll, version of zstd CLI that links to the dynamic library (#3496) by @yoniko build: fix MSVC warnings (#3495) by @embg doc: updated zstd specification to clarify corner cases, by @Cyan4973 doc: document how to create fat binaries for macos (#3568) by @rickmark misc: improve seekable format ingestion speed (~+100%) for very small chunk sizes (#3544) by @Cyan4973 misc: tests/fullbench can benchmark multiple files (#3516) by @dloidolt Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 1653034fae0d52f8379278ee8c6cd6be6a5f5d09 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:20 2023 +0200 opus: Update to version 1.4 - Updsate from version 1.3.1 to 1.4 - Update of rootfile - Changelog opus 1.4 major release brings the following improvements and fixes: Improved tuning of the Opus in-band FEC (LBRR). See https://gitlab.xiph.org/xiph/opus/-/issues/2360 for details Added a OPUS_SET_INBAND_FEC(2) option that turns on FEC, but does not force SILK mode (FEC will be disabled in CELT mode) Improved tuning and various fixes to DTX Added Meson support, improved CMake support In addition to the improvements above, this release includes many minor bug fixes. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 24c8b9e0e6abd4dc3587b5181c38967b083ef954 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:19 2023 +0200 nfs: Update to version 2.6.3 - Update from version 2.6.2 to 2.6.3 - Update of rootfile - Changelog is available in sourceforge at the following url https://sourceforge.net/projects/nfs/files/nfs-utils/2.6.3/ Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 42a2077c72cfc9fc93b638794cb0f370a905d3a3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 3 07:49:30 2023 +0000 core175: ship lvm2 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 84c21e12ecfac026dc222417e95a15231bc57c33 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:18 2023 +0200 lvm2: Update to version 2.03.21 - Update from version 2.02.188 to 2.03.21 - Update of rootfile - Changelog version 2.03.21 - 21st April 2023 Fix activation of vdo-pool for with 0 length headers (converted pools). Avoid printing internal init messages when creation integration devices. Allow (write)cache over raid+integrity LV. version 2.03.20 - 21st March 2023 Fix segfault if using -S|--select with log/report_command_log=1 setting. Configure now fails when requested lvmlockd dependencies are missing. Add some configure Gentoo enhancements for static builds. version 2.03.19 - 21st February 2023 Configure supports --with-systemd-run executed from udev rules. Enhancement for build with MuslC systemd and non-bash system shells (dash). Do not reset SYSTEMD_READY variable in udev for PVs on MD and loop devices. Ensure udev is processing origin LV before its thick snapshots LVs. Fix and improve runtime memory size detection for VDO volumes. version 2.03.18 - 22nd December 2022 Fix issues reported by coverity scan. Fix warning for thin pool overprovisioning on lvextend (2.03.17). Add support for writecache metadata_only and pause_writeback settings. Fix missing error messages in lvmdbusd. Version 2.03.17 - 10th November 2022 Add new options (--fs, --fsmode) for FS handling when resizing LVs. Fix 'lvremove -S|--select LV' to not also remove its historical LV right away. Fix lv_active field type to binary so --select and --binary applies properly. Switch to use mallinfo2 and use it only with glibc. Error out in lvm shell if using a cmd argument not supported in the shell. Fix lvm shell's lastlog command to report previous pre-command failures. Extend VDO and VDOPOOL without flushing and locking fs. Add --valuesonly option to lvmconfig to print only values without keys. Updates configure with recent autoconf tooling. Fix lvconvert --test --type vdo-pool execution. Add json_std output format for more JSON standard compliant version of output. Fix vdo_slab_size_mb value for converted VDO volume. Fix many corner cases in device_id, including handling of S/N duplicates. Fix various issues in lvmdbusd. Version 2.03.16 - 18th May 2022 Fix segfault when handling selection with historical LVs. Add support --vdosettings with lvcreate, lvconvert, lvchange. Filtering multipath devices respects blacklist setting from multipath configuration. lvmdevices support for removing by device id using --deviceidtype and --deldev. Display writecache block size with lvs -o writecache_block_size. Improve cachesettings description in man lvmcache. Fix lossing of delete message on thin-pool extension. Version 2.03.15 - 07th February 2022 Remove service based autoactivation. global/event_activation = 0 is NOOP. Improve support for metadata profiles for --type writecache. Use cache or active DM device when available with new kernels. Introduce function to utilize UUIDs from DM_DEVICE_LIST. Increase some hash table size to better support large device sets. Version 2.03.14 - 20th October 2021 Device scanning is skipping directories on different filesystems. Print info message with too many or too large archived files. Reduce metadata readings during scanning phase. Optimize computation of crc32 check sum with multiple PVs. Enhance recover path on cache creation failure. Filter out unsupported MQ/SMQ cache policy setting. Fix memleak in mpath filter. Support newer location for VDO statistics. Add support for VDO async-unsafe write policy. Improve lvm_import_vdo script. Support VDO LV with lvcreate -ky. Fix lvconvert for VDO LV bigger then 2T. Create VDO LVs automatically without zeroing. Rename vdoimport to lvm_import_vdo. Version 2.03.13 - 11th August 2021 Changes in udev support: - obtain_device_list_from_udev defaults to 0. - see devices/external_device_info_source, devices/obtain_device_list_from_udev, and devices/multipath_wwids_file help in lvm.conf Fix devices file handling of loop with deleted backing file. Fix devices file handling of scsi_debug WWIDs. Fix many static analysis issues. Support --poolmetadataspare with vgsplit and vgmerge. Fix detection of active components of external origin volume. Add vdoimport tool to support conversion of VDO volumes. Support configurable allocation/vdo_pool_header_size. Fix handling of lvconvert --type vdo-pool --virtualsize. Simplified handling of archive() and backup() internal calls. Add 'idm' locking type for IDM lock manager. Fix load of kvdo target when it is not present in memory (2.03.12). Version 2.03.12 - 07th May 2021 Allow attaching cache to thin data volume. Fix memleak when generating list of outdated pvs. Better hyphenation usage in man pages. Replace use of deprecated security_context_t with char*. Configure supports AIO_LIBS and AIO_CFLAGS. Improve build process for static builds. New --setautoactivation option to modify LV or VG auto activation. New metadata based autoactivation property for LVs and VGs. Improve signal handling with lvmpolld. Signal handler can interrupt command also for SIGTERM. Lvreduce --yes support. Add configure option --with/out-symvers for non-glibc builds. Report error when the filesystem is missing on fsadm resized volume. Handle better blockdev with --getsize64 support for fsadm. Do not include editline/history.h when using editline library. Support error and zero segtype for thin-pool data for testing. Support mixed extension for striped, error and zero segtypes. Support resize also for stacked virtual volumes. Skip dm-zero devices just like with dm-error target. Reduce ioctl() calls when checking target status. Merge polling does not fail, when LV is found to be already merged. Poll volumes with at least 100ms delays. Do not flush dm cache when cached LV is going to be removed. New lvmlockctl_kill_command configuration option. Support interruption while waiting on device close before deactivation. Flush thin-pool messages before removing more thin volumes. Improve hash function with less collisions and make it faster. Reduce ioctl count when deactivating volumes. Reduce number of metadata parsing. Enhance performance of lvremove and vgremove commands. Support interruption when taking archive and backup. Accelerate large lvremoves. Speedup search for cached device nodes. Speedup command initialization. Add devices file feature, off by default for now. Support extension of writecached volumes. Fix problem with unbound variable usage within fsadm. Fix IMSM MD RAID detection on 4k devices. Check for presence of VDO target before starting any conversion. Support metatadata profiles with volume VDO pool conversions. Support -Zn for conversion of already formated VDO pools. Avoid removing LVs on error path of lvconvert during creation volumes. Fix crashing lvdisplay when thin volume was waiting for merge. Support option --errorwhenfull when converting volume to thin-pool. Improve thin-performance profile support conversion to thin-pool. Add workaround to avoid read of internal 'converted' devices. Prohibit merging snapshot into the read-only thick snapshot origin. Restore support for flipping rw/r permissions for thin snapshot origin. Support resize of cached volumes. Disable autoactivation with global/event_activation=0. Check if lvcreate passes read_only_volume_list with tags and skips zeroing. Allocation prints better error when metadata cannot fit on a single PV. Pvmove can better resolve full thin-pool tree move. Limit pool metadata spare to 16GiB. Improves conversion and allocation of pool metadata. Support thin pool metadata 15.88GiB, adds 64MiB, thin_pool_crop_metadata=0. Enhance lvdisplay to report raid available/partial. Support online rename of VDO pools. Improve removal of pmspare when last pool is removed. Fix problem with wiping of converted LVs. Fix memleak in scanning (2.03.11). Fix corner case allocation for thin-pools. Version 2.03.11 - 08th January 2021 Fix pvck handling MDA at offset different from 4096. Partial or degraded activation of writecache is not allowed. Enhance error handling for fsadm and handle correct fsck result. Dmeventd lvm plugin ignores higher reserved_stack lvm.conf values. Support using BLKZEROOUT for clearing devices. Support interruption when wipping LVs. Support interruption for bcache waiting. Fix bcache when device has too many failing writes. Fix bcache waiting for IO completion with failing disks. Configure use own python path name order to prefer using python3. Add configure --enable-editline support as an alternative to readline. Enhance reporting and error handling when creating thin volumes. Enable vgsplit for VDO volumes. Lvextend of vdo pool volumes ensure at least 1 new VDO slab is added. Use revert_lv() on reload error path after vg_revert(). Configure --with-integrity enabled. Restore lost signal blocking while VG lock is held. Improve estimation of needed extents when creating thin-pool. Use extra 1% when resizing thin-pool metadata LV with --use-policy. Enhance --use-policy percentage rounding. Configure --with-vdo and --with-writecache as internal segments. Improving VDO man page examples. Allow pvmove of writecache origin. Report integrity fields. Integrity volumes defaults to journal mode. Switch code base to use flexible array syntax. Fix 64bit math when calculation cachevol size. Preserve uint32_t for seqno handling. Switch from mmap to plain read when loading regular files. Update lvmvdo man page and better explain DISCARD usage. Version 2.03.10 - 09th August 2020 Add writecache and integrity support to lvmdbusd. Generate unique cachevol name when default required from lvcreate. Converting RAID1 volume to one with same number of legs now succeeds with a warning. Fix conversion to raid from striped lagging type. Fix conversion to 'mirrored' mirror log with larger regionsize. Zero pool metadata on allocation (disable with allocation/zero_metadata=0). Failure in zeroing or wiping will fail command (bypass with -Zn, -Wn). Add lvcreate of new cache or writecache lv with single command. Fix running out of free buffers for async writing for larger writes. Add integrity with raid capability. Fix support for lvconvert --repair used by foreign apps (i.e. Docker). Version 2.03.09 - 26th March 2020 Fix formatting of vdopool (vdo_slab_size_mb was smaller by 2 bits). Fix showing of a dm kernel error when uncaching a volume with cachevol. Version 2.03.08 - 11th February 2020 Prevent problematic snapshots of writecache volumes. Add error handling for failing allocation in _reserve_area(). Fix memleak in syncing of internal cache. Fix pvck dump_current_text memleak. Fix lvmlockd result code on error path for _query_lock_lv(). Update pvck man page and help output. Reject invalid writecache high/low_watermark setting. Report writecache status. Accept more output lines from vdo_format. Prohibit reshaping of stacked raid LVs. Avoid running cache input arg validation when creating vdo pool. Prevent raid reshaping of stacked volumes. Added VDO lvmdbusd methods for enable/disable compression & dedupe. Added VDO lvmdbusd method for converting LV to VDO pool. Version 2.03.07 - 30th November 2019 Subcommand in vgck for repairing headers and metadata. Ensure minimum required region size on striped RaidLV creation. Fix resize of thin-pool with data and metadata of different segtype. Improve mirror type leg splitting. Improve error path handling in daemons on shutdown. Fix activation order when removing merged snapshot. Experimental VDO support for lvmdbusd. Version 2.03.06 - 23rd October 2019 Add _cpool suffix to cache-pool LV name when used by caching LV. No longer store extra UUID for cmeta and cdata cachevol layer. Enhance activation of cache devices with cachevols. Add _cvol in list of protected suffixes and start use it with DM UUID. Rename LV converted to cachevol to use _cvol suffix. Use normal LVs for wiping of cachevols. Reload cleanered cache DM only with cleaner policy. Fix cmd return when zeroing of cachevol fails. Extend lvs to show all VDO properties. Preserve VDO write policy with vdopool. Increase default vdo bio threads to 4. Continue report when cache_status fails. Add support for DM_DEVICE_GET_TARGET_VERSION into device_mapper. Fix cmirrord usage of header files from device_mapper subdir. Allow standalone activation of VDO pool just like for thin-pools. Activate thin-pool layered volume as 'read-only' device. Ignore crypto devices with UUID signature CRYPT-SUBDEV. Enhance validation for thin and cache pool conversion and swapping. Improve internal removal of cached devices. Synchronize with udev when dropping snapshot. Add missing device synchronization point before removing pvmove node. Correctly set read_ahead for LVs when pvmove is finished. Remove unsupported OPTIONS+="event_timeout" udev rule from 11-dm-lvm.rules. Prevent creating VGs with PVs with different logical block sizes. Fix metadata writes from corrupting with large physical block size. Version 2.03.05 - 15th June 2019 Fix command definition for pvchange -a. Add vgck --updatemetadata command that will repair metadata problems. Improve VG reading to work if one good copy of metadata is found. Report/display/scan commands that read VGs will no longer write/repair. Move metadata repairs from VG reading to VG writing. Add config setting md_component_checks to control MD component checks. Add end of device MD component checks when dev has no udev info. Version 2.03.04 - 10th June 2019 Remove unused_duplicate_devs from cmd causing segfault in dmeventd. Version 2.03.03 - 07th June 2019 Report no_discard_passdown for cache LVs with lvs -o+kernel_discards. Add pvck --dump option to extract metadata. Fix signal delivery checking race in libdaemon (lvmetad). Add missing Before=shutdown.target to LVM2 services to fix shutdown ordering. Skip autoactivation for a PV when PV size does not match device size. Remove first-pvscan-initialization which should no longer be needed. Add remote refresh through lvmlockd/dlm for shared LVs after lvextend. Ignore foreign and shared PVs for pvscan online files. Add config setting to control fields in debug file and verbose output. Add command[pid] and timestamp to debug file and verbose output. Fix missing growth of _pmsmare volume when extending _tmeta volume. Automatically grow thin metadata, when thin data gets too big. Add synchronization with udev before removing cached devices. Add support for caching VDO LVs and VDOPOOL LVs. Add support for vgsplit with cached devices. Query mpath device only once per command for its state. Use device INFO instead of STATUS when checking for mpath device uuid. Change default io_memory_size from 4 to 8 MiB. Add config setting io_memory_size to set bcache size. Fix pvscan autoactivation for concurrent pvscans. Change scan_lvs default to 0 so LVs are not scanned for PVs. Thin-pool selects power-of-2 chunk size by default. Cache selects power-of-2 chunk size by default. Support reszing for VDOPoolLV and VDOLV. Improve -lXXX%VG modifier which improves cache segment estimation. Ensure migration_threshold for cache is at least 8 chunks. Restore missing man info lvcreate --zero for thin-pools. Drop misleadning comment for metadata minimum_io_size for VDO segment. Add device hints to reduce scanning. Introduce LVM_SUPPRESS_SYSLOG to suppress syslog usage by generator. Fix generator quering lvmconfig unpresent config option. Fix memleak on bcache error path code. Fix missing unlock on lvm2 dmeventd plugin error path initialization. Improve Makefile dependency tracking. Move VDO support towards V2 target (6.2) support. Version 2.03.02 - 18th December 2018 Fix missing proper initialization of pv_list struct when adding pv. Fix (de)activation of RaidLVs with visible SubLVs. Prohibit mirrored 'mirror' log via lvcreate and lvconvert. Use sync io if async io_setup fails, or use_aio=0 is set in config. Fix more issues reported by coverity scan. Version 2.03.01 - 31st October 2018 Version 2.03.00 - 10th October 2018 Add hot fix to avoiding locking collision when monitoring thin-pools. Allow raid4 -> linear conversion request. Fix lvconvert striped/raid0/raid0_meta -> raid6 regression. Add 'lvm2-activation-generator:' prefix for kmsg messages logged by generator. Add After=rbdmap.service to {lvm2-activation-net,blk-availability}.service. Reduce max concurrent aios to avoid EMFILE with many devices. Fix lvconvert conversion attempts to linear. Fix lvconvert raid0/raid0_meta -> striped regression. Fix lvconvert --splitmirror for mirror type (2.02.178). Do not pair cache policy and cache metadata format. lvconvert: reject conversions on raid1 LVs with split tracked SubLVs lvconvert: reject conversions on raid1 split tracked SubLVs Add basic creation support for VDO target. Never send any discard ioctl with test mode. Fix thin-pool alloc which needs same PV for data and metadata. Extend list of non-memlocked areas with newly linked libs. Enhance vgcfgrestore to check for active LVs in restored VG. Configure supports --disable-silent-rules for verbose builds. Fix unmonitoring of merging snapshots. Cache can uses metadata format 2 with cleaner policy. Fix check if resized PV can also fit metadata area. Avoid showing internal error in lvs output or pvmoved LVs. Remove clvmd Remove lvmlib (api) Remove lvmetad Use versionsort to fix archive file expiry beyond 100000 files. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4c802a17be2bb5f57b5db6991e727b9312b7930d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 3 07:47:09 2023 +0000 core175: ship libxml2 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d2130887f727174d0e6416f9023ad0414d5e6536 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:17 2023 +0200 libxml2: Update to version 2.11.1 - Update from version 2.10.3 to 2.11.1 - Update of rootfile - Changelog There were two CVE's in version 2.10.4 v2.11.1: Apr 30 2023 Fixes build and ABI issues. - cmake: Fix va_copy detection (Luca Niccoli) - libxml.m4: Fix quoting - Link with --undefined-version - libxml2.syms: Revert removal of version information v2.11.0: Apr 28 2023 ### Major changes Protection against entity expansion attacks, also known as "billion laughs" has been greatly improved. Malicious files should be detected reliably now and false positives should be reduced. It is possible though that large documents which make heavy use of entities are rejected now. This release finally fixes symbol visibility on UNIX systems. Internal symbols will now be hidden. While these symbols were never declared in public headers, it was still possible to declare them manually. Now this won't work. All symbol information has been removed from the ELF version script to fix link errors with --no-undefined-version. The version nodes are kept so it should still be possible to run binaries linked against older versions. About 90 memory errors in code paths handling malloc failures have been fixed. While these issues shouldn't impact security, this improves robustness under memory pressure. The XInclude engine has been reworked to properly support nested includes. Several cases of quadratic behavior in the XML push parser have been fixed. Refactoring has begun on some buffering and encoding code with the goal of simplifying this part of the code base and improving error reporting. Other highlights: - Consolidated private header files. - Major rework of the autoconf build. - Deprecated several outdated and internal functions. Special thanks to Google's Open Source Security Subsidies program for sponsoring much of the work on this release! Ongoing work on libxml2 relies on funding. For a list of important open issues see <https://gitlab.gnome.org/GNOME/libxml2/-/issues/507> ### Security - Fix use-after-free in xmlParseContentInternal() (David Kilzer) - xmllint: Fix use-after-free with --maxmem - parser: Fix OOB read when formatting error message - entities: Rework entity amplification checks ### Regressions - parser: Fix regression in xmlParserNodeInfo accounting ### Bug fixes - Fix memory errors in code handling malloc failures - encoding: Fix error code in asciiToUTF8 - xpath: number('-') should return NaN - xmlParseStartTag2() contains typo when checking for default definitions for an attribute in a namespace (David Kilzer) - uri: Fix handling of port numbers - error: Make sure that error messages are valid UTF-8 - xinclude: Fix nested includes ### Improvements - xmllint: Validate --maxmem integer option - xmlValidatePopElement() can return invalid value (-1) (David Kilzer) - parser: Rework EBCDIC code page detection - parser: Limit name length in xmlParseEncName - parser: Rework shrinking of input buffers - html: Rely on CUR_CHAR to grow the input buffer - parser: Rely on CUR_CHAR/NEXT to grow the input buffer - valid: Make xmlValidateElement non-recursive - html: Fix quadratic behavior in htmlParseTryOrFinish - xmllint: Fix memory leak with --pattern --stream - parser: Stop calling xmlParserInputShrink - html: Impose some length limits - valid: Allow xmlFreeValidCtxt(NULL) - parser: Stop calling xmlParserInputGrow - xinclude: Fix quadratic behavior in xmlXIncludeLoadTxt - xinclude: Abort immediately if max depth was exceeded - xpath: Only report the first error - error: Don't move past current position - error: Limit number of parser errors - parser: Lower entity nesting limit with XML_PARSE_HUGE - parser: Don't increase depth twice when parsing internal entities - parser: Improve detection of entity loops - parser: Only report a single entity error - libxml.h: Remove dubious definition of LIBXML_STATIC - html: Improve parsing of nested lists - memory: Don't use locks in xmlMemUsed - encoding: Remove unused variable xmlDefaultCharEncodingHandler - Rework initialization code - Add .editorconfig - parser: Merge misc, prolog and epilog cases in push parser - parser: Fix 'consumed' accounting when switching encodings - html: Fix check for end of comment in push parser - parser: Fix push parser with 1-3 byte initial chunk - parser: Rewrite push parser boundary checks - reader: Switch to xmlParserInputBufferCreateMem - html: Don't escape ASCII chars in href attributes - io: Don't shrink memory input buffers - parser: Don't call xmlSHRINK from push parser - parser: Ignore cdata argument in xmlParseCharData - parser: Rework push parser parser progress checks - io: Fix a few integer overflows in I/O statistics - io: Rework xmlParserInputBufferGrow with encodings - io: Remove xmlInputReadCallbackNop - io: Check for memory buffer early in xmlParserInputGrow - parser: Fix error message in xmlParseCommentComplex - Bypass proxy in nanoHTTP for hosts in "no_proxy" (Markus Jörg) - schemas: Fix infinite loop in xmlSchemaCheckElemSubstGroup - threads: Remove check for pthread_equal - xinclude: Rework XInclude cache - xinclude: Remove inefficient refcounting scheme - xmllint: Improve handling of empty XPath node sets - parser: Fix potential memory leak in xmlParseAttValueInternal - error: Don't use initGenericErrorDefaultFunc - xpath: Lower XPath recursion limit on Windows - Stop including sys/types.h - Don't define WIN32 macro - Make xmlNewSAXParserCtx take a const sax handler - Consolidate private header files - Remove internal macros from parserInternals.h - Move some HTML functions to correct header file - xmllint: Stop calling xmlSAXDefaultVersion - Introduce xmlNewSAXParserCtxt and htmlNewSAXParserCtxt - Don't mess with parser options in htmlParseDocument - Remove useless call to htmlDefaultSAXHandlerInit - Remove htmlDefaultSAXHandler from non-SAX1 build - Don't initialize SAX handler in htmlReadMemory - Fix htmlReadMemory mixing up XML and HTML functions - Don't use default SAX handler to report unrelated errors - Create stream with buffer in xmlNewStringInputStream - xmlcatalog: Fix memory leaks ### Code quality - xzlib: Fix implicit sign change in xz_open - parser: Simplify calculation of available buffer space - parser: Use size_t when subtracting input buffer pointers - parser: Check for integer overflow when updating checkIndex - xpath: Fix harmless integer overflow in xmlXPathTranslateFunction - schematron: Use logical and - relaxng: Remove useless if statement - schemas: Remove useless if statement - pattern: Merge identical branches - regexp: Add sanity check in xmlRegCalloc2 - regexp: Simplify xmlRegAtomPush - encoding: Cast toupper argument to unsigned char - uri: Add explicit cast in xmlSaveUri - buf: Fix return value of xmlBufGetInputBase - parser: Fix integer overflow of input ID - parser: Remove useless ent->etype test in xmlParseReference - parser: Remove useless ent->children tests in xmlParseReference - xmlmemory.c: Remove xmlMemContentShow - libxml.h: Add comments and indentation - libxml.h: Don't include stdio.h - xmlexports.h: Disable docs for internal macro XMLPUBLIC - parser: Simplify xmlParseConditionalSections - io: Rearrange code in xmlSwitchInputEncodingInt - warnings: Fix -Wstrict-prototypes warning - warnings: Remove set-but-unused variables - Fix compiler warnings in SAX2.c - Fix unused variable warning in python/types.c - Fix compiler warning in examples - Fix compiler warnings in fuzzing code - Remove unused code in nanohttp.c - Remove or annotate char casts - Don't use sizeof(xmlChar) or sizeof(char) - Remove explicit integer casts ### Deprecations - parser: Deprecate more internal functions - parser: Deprecate some parser input functions - parser: Deprecate xmlString*DecodeEntities - threads: Deprecate some internal functions - buf: Deprecate static/immutable buffers - Deprecate internal parser functions - Deprecate old HTML SAX API - Generate deprecation warnings for old SAX API - Mark more functions setting globals as deprecated - Mark more parser functions as deprecated - Mark most SAX1 functions as deprecated - Deprecate some global variables ### Portability - autoconf: Warn about outdated C compilers - win32: Remove broken libxml2.def.src - Remove symbols from version script - catalog.c: Silence a cast warning on VS 2022 (Lukáš Tyrychtr) - libxml.h: Remove ancient LynxOS setup - Use python3 not python (Ross Burton) - xstc/fixup-tests.py: port to Python 3 (Ross Burton) - xstc/fixup-tests.py: unify whitespace (Ross Burton) - Remove hacky heuristic from b2dc5675 (Alex Richardson) - Avoid creating an out-of-bounds pointer by rewriting a check (Alex Richardson) - Hide internal functions - Correctly relocate internal pointers after realloc() (Alex Richardson) - Visual Studio builds: Allow silencing deprecation warnings (Chun-wei Fan) - Visual Studio: Define XML_DEPRECATED (Chun-wei Fan) - xmllint: Include <io.h> on Windows - warnings: Work around MSVC bug - sources: Silence C4013 warnings on Visual Studio (Chun-wei Fan) - python/setup.py.in: Improve Windows import patching (Chun-wei Fan) - python: Create .pyd on Windows - Fix Python build on Windows - Fix Windows compiler warnings in python/types.c - Fix libxml_PyFileGet - Remove BeOS support - Fix libxml_PyFileGet with stdout on macOS - Migrate from PyEval_ to PyObject_ - Port build_glob.py to Python 3 - Port genChRanges.py to Python 3 - xmlexports.h: Remove LIBXML_FASTCALL optimization - Remove XMLCALL and XMLCDECL macros from public headers - Remove XMLDECL macro from .c files ### Build systems - cmake: Link against `dl` and `dld` only when `LIBXML2_WITH_MODULES` is enabled (Alexander Kutelev) - autotools: Fix make distcheck - Remove RPM build, Makefile.tests, README.tests - libxml.m4: deprecate AM_PATH_XML2, wrap PKG_CHECK_MODULES instead (Ross Burton) - libxml.m4: fix -Wstrict-prototypes (Sam James) - cmake: Build static library with -DLIBXML_STATIC - autotools: Don't use version script on Windows - autotools: Fix winsock detection - autotools: Only add network libraries if HTTP/FTP enabled - autotools: Disable parallel Python build - python: Don't output missing generators during build - build: Remove check for broken ss_family - http: Simplify IPv6 checks - autotools: Fix network checks on Windows - Fix detection of GNU libiconv - cmake: Fix Python installation - cmake: Don't check for Python 2 - configure.ac: Also check for MSYS host - Improve network library detection - Detect ws2_32 with AC_SEARCH_LIBS - Rework network configure checks - Remove arg cast configure checks - Fix dlopen check - Remove HAVE_WIN32_THREADS configuration flag - Rework dlopen and pthread detection - Fix test in configure.ac - cmake: Enable GCC compiler warnings - Always link with -no-undefined - Use AM_CFLAGS and AM_LDFLAGS consistently - Remove -Wredundant-decls - Call AC_CHECK_* with multiple arguments - configure.ac: Remove checks for unused programs - Rework library detection in configure.ac - Rearrange configure.ac - Consolidate zlib and lzma detection - Remove "runtime debugging" - Consolidate simple API modules in configure.ac - Fix dependency resolution in configure.ac - Fix --with-valid --without-regexps build - Fix --with-schemas --without-xpath build - Don't build unneeded .c source files - Move xmlIsXHTML to tree.c - Cleanup distribution settings in Makefile.am - Also clean *.pyc files for Python 2 - Don't distribute libxml2.spec ### Tests - testchar: Add test for memory pull parser with encoding - fuzz: Also test init function of URI fuzzer - fuzz: Separate fuzzer for DTD validation - gitlab-ci: Enable all "integer" sanitizers - fuzz: Inject random malloc failures - fuzz: Support variable integer sizes in fuzz data - fuzz: Fix duplicate detection in fuzzEntityRecorder - fuzz: Set filename in xmlFuzzEntityLoader - fuzz: Allow xmlFuzzReadString(NULL) - fuzz: Fix Makefile dependencies - fuzz: Add test/recurse to seed corpus - fuzz: Add separate XInclude fuzzer - runsuite: Some errors are expected - testrecurse: Test entity expansion stats - testapi.c: Initialize catalog early - gentest.py: Fix memory leak in API tests - tests: Enable "runsuite" test - python/tests/reader2: use absolute paths everywhere (Ross Burton) - python/tests/reader2: always exit(1) if a test fails (Ross Burton) - testModule: exit if the module can't be opened (Ross Burton) - CI: disable modules in gcc:static build (Ross Burton) - CI: fix CI on MinGW builds (Ross Burton) - python: Fix memory leak checks - tests: Check that xmlInitParser doesn't allocate memory - tests: Fix use-after-free in Python tests - tests: Remove unneeded #includes - gitlab-ci: Make Test-Msvc exit if ctest fails - gitlab-ci: Treat compiler warnings as errors on MSVC - test: Add test for push parser boundaries - gitlab-ci: Upgrade image to Ubuntu 22.10, reenable MSan - gitlab-ci: Reenable LeakSanitizer - gitlab-ci: Fix llvm-symbolizer - xinclude: Don't create result doc for test with errors - xinclude: Also test error messages - gitlab-ci: Allow cast-align warnings from clang - gitlab-ci: Fix tar invocation - gitlab-ci: Move MSVC test to separate script - gitlab-ci: Fix SUFFIX, remove MINGW_PATH - gitlab-ci: Consolidate CMake test scripts - gitlab-ci: Only install MinGW autotools if needed - gitlab-ci: Only install cmake MinGW package if needed - gitlab-ci: Install 7-Zip using the .msi - Use $MSYSTEM and 'bash -lc' in MinGW CI - Add CI job for MinGW/Autotools - Consolidate CI scripts - Allow empty MINGW_PACKAGE_PREFIX - Move Dockerfile to .gitlab-ci directory - testapi: Disable on Windows for now - Disable fuzzer tests if glob.h wasn't found - Move automata test to runtest.c - Fix testapi when building --without-sax1 # Documentation - doc: Remove ancient files - Remove ancient TODOs - html: Fix htmlInitAutoClose documentation - doc: Mention new location of XML catalog as breaking change - doc: Mention potentially breaking changes in NEWS - doc: Remove xmlDllMain from documentation and version script - doc: Mention ${sysconfdir} in man pages - doc: Document xmlcatalog --convert - doc: Document xmllint --nodict and --pedantic - doc: Fix indentation in source XML files - xmllint: Document --quiet option - Improve cross-references in API docs - Improve documentation of globals - Fix documentation parser - Support comments for global variables in documentation - Fix update call in apibuild.py - Don't index anything in DOC_DISABLE sections - Fix warnings from apibuild.py - Start with documentation for maintainers v2.10.4: Apr 11 2023 ### Security - [CVE-2023-29469] Hashing of empty dict strings isn't deterministic - [CVE-2023-28484] Fix null deref in xmlSchemaFixupComplexType - schemas: Fix null-pointer-deref in xmlSchemaCheckCOSSTDerivedOK ### Regressions - SAX2: Ignore namespaces in HTML documents - io: Fix "buffer full" error with certain buffer sizes Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit bf043437f8d4bc525758ba6d483b704247433580 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 3 07:44:39 2023 +0000 core175: ship iproute2 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 5d4a957339caf4a5c5a8647da2f26f9e53987de4 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:15 2023 +0200 iproute2: Update to version 6.3.0 - Update from version 6.2.0 to 6.3.0 - Update of rootfile not required - Changelog can only be reviewed by looking at the commits in the git repo https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/ Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9d0add9f8244b445f6863b4be66f49926249e7e9 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue May 2 19:53:14 2023 +0200 harfbuzz: Update to version 7.2.0 - Update from version 7.0.1 to 7.2.0 - Update of rootfile - Changelog Overview of changes leading to 7.2.0 - Add Tifinagh to the list of scripts that can natively be either right-to-left or left-to-right, to improve handling of its glyph positioning. (Simon Cozens) - Return also single substitution from hb_ot_layout_lookup_get_glyph_alternates() (Behdad Esfahbod) - Fix 4.2.0 regression in applying across syllables in syllabic scripts. (Behdad Esfahbod) - Add flag to avoid glyph substitution closure during subsetting, and the corresponding “--no-layout-closure” option to “hb-subset” command line tool. (Garret Rieger) - Support instancing COLRv1 table. (Qunxin Liu) - Don’t drop used user-defined name table entries during subsetting. (Qunxin Liu) - Optimize handling of “gvar” table. (Behdad Esfahbod) - Various subsetter bug fixes and improvements. (Garret Rieger, Qunxin Liu) - Various documentation improvements. (Behdad Esfahbod, Josef Friedrich) - New API: +HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE +HB_UNICODE_COMBINING_CLASS_CCC132 - Deprecated API: +HB_UNICODE_COMBINING_CLASS_CCC133 Overview of changes leading to 7.1.0 - New experimental hb_shape_justify() API that uses font variations to expand or shrink the text to a given advance. (Behdad Esfahbod) - Various build and bug fixes. (Behdad Esfahbod, Garret Rieger, Qunxin Liu) - New API: +hb_font_set_variation() Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3df5187dfc42e0da2578a80057af57ddb37b435b Author: Jon Murphy <jon.murphy(a)ipfire.org> Date: Wed Apr 26 15:37:13 2023 -0500 dbus: Fixes Bug#13094 - Check for existing user before `useradd` - The dbus install.sh script useradd command causes an error: "failed adding user 'messagebus', exit code: 9" - This patch adds a check to only do the useradd if the user does not exist. - See the bump PAK_VER for dbus that Adolf publised. See this patch: https://lists.ipfire.org/pipermail/development/2023-April/015816.html Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 7101e472a0901963ecf4556734633b72473ea09b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Apr 26 14:32:29 2023 +0200 dbus: Fixes Bug#13094 - dbus daemon continues running after uninstall - The uninstall.sh script had stop_service ${NAME} but the package name is dbus while the initscript is named messagebus. Therefore the stop_service never stops the dbus daemon. - This patch changes the line to stop_service messagebus - The install.sh script already has start_service messagebus - Bump PAK_VER for dbus Fixes: Bug#13094 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 25ac6657c10f4c8af026ecf5c165e1ddf2768540 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Apr 26 14:32:28 2023 +0200 cups: Fixes Bug#12924 - Can't access https pages in cups - Version 2.4.2 had some bugs that caused the self signed certificates to not be read or created properly. The two involved bug fix patches are applied in this submission. - Corrected the configure options related to avahi and TLS. Using Openssl for the TLS. - Built .ipfire package installed into vm testbed and tested. With existing 2.4.2 any https pages come up with an error for the secure connection. With this version the https admin page opens up and config file was able to be successfully modified via it. Fixes: Bug#12924 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 827665788bd7700423dd6b9fe277c1277b7cff0e Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Wed Apr 19 14:31:41 2023 +0200 sdl2: Update to version 2.26.5 - Update from version 2.26.4 to 2.26.5 - Update of rootfile - Changelog 2.26.5 The minimum deployment target on macOS is now 10.11, due to changes in the latest Xcode update Fixed incorrect modifier keys handling on macOS Fixed occasional duplicate controller visible on macOS Fixed handling of third party PS4 controller input reports Added support for the trigger buttons on the Victrix Pro FS for PS5 Added mapping for Flydigi Vader 2 with the latest firmware (6.0.4.9) Added mapping for DualSense Edge Wireless Controller on Linux Added mapping for Hori Pokken Tournament DX Pro Pad Improved the speed and quality of audio resampling Fixed crash on Linux if dbus can't be initialized Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 757ed7dbc18ff73c433540d192ad643e24faea32 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 3 07:34:21 2023 +0000 core175: ship libpcap Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 237b88914d4449388a14474ea64afd90136c1814 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 14 10:27:26 2023 +0200 libpcap: Update to 1.10.4 For details see: https://git.tcpdump.org/libpcap/blob/HEAD:/CHANGES#l50 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0b208a9ccbba9015d4dd9acc01f22890c09556c7 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 14 10:27:25 2023 +0200 tcpdump: Update to 4.99.4 For details see: https://git.tcpdump.org/tcpdump/blob/HEAD:/CHANGES#l60 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/harfbuzz | 7 +- config/rootfiles/common/libpcap | 3 +- config/rootfiles/common/libxml2 | 2 +- config/rootfiles/common/lvm2 | 16 +- config/rootfiles/common/zstd | 2 +- .../{oldcore/106 => core/175}/filelists/iproute2 | 0 .../{oldcore/109 => core/175}/filelists/libpcap | 0 .../{oldcore/101 => core/175}/filelists/libxml2 | 0 .../{oldcore/125 => core/175}/filelists/lvm2 | 0 .../{oldcore/149 => core/175}/filelists/zstd | 0 config/rootfiles/packages/ffmpeg | 56 ++-- config/rootfiles/packages/nfs | 3 +- config/rootfiles/packages/opus | 2 +- config/rootfiles/packages/sdl2 | 2 +- lfs/cups | 8 +- lfs/dbus | 2 +- lfs/ffmpeg | 8 +- lfs/harfbuzz | 4 +- lfs/iproute2 | 4 +- lfs/libpcap | 4 +- lfs/libxml2 | 6 +- lfs/lvm2 | 6 +- lfs/minidlna | 4 +- lfs/mpd | 4 +- lfs/nfs | 6 +- lfs/opus | 8 +- lfs/sdl2 | 6 +- lfs/shairport-sync | 4 +- lfs/tcpdump | 6 +- lfs/zstd | 4 +- src/paks/dbus/install.sh | 4 +- src/paks/dbus/uninstall.sh | 2 +- ..._certificate_generation_bugs_with_openssl.patch | 337 +++++++++++++++++++++ ...2_Fix_default_cupsd_keychain_with_OpenSSL.patch | 16 + 34 files changed, 449 insertions(+), 87 deletions(-) copy config/rootfiles/{oldcore/106 => core/175}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/109 => core/175}/filelists/libpcap (100%) copy config/rootfiles/{oldcore/101 => core/175}/filelists/libxml2 (100%) copy config/rootfiles/{oldcore/125 => core/175}/filelists/lvm2 (100%) copy config/rootfiles/{oldcore/149 => core/175}/filelists/zstd (100%) create mode 100644 src/patches/cups-2.4.2_Fix_TLS_certificate_generation_bugs_with_openssl.patch create mode 100644 src/patches/cups-2.4.2_Fix_default_cupsd_keychain_with_OpenSSL.patch Difference in files: diff --git a/config/rootfiles/common/harfbuzz b/config/rootfiles/common/harfbuzz index b18e30a18..4798653a2 100644 --- a/config/rootfiles/common/harfbuzz +++ b/config/rootfiles/common/harfbuzz @@ -44,15 +44,15 @@ #usr/lib/libharfbuzz-cairo.la #usr/lib/libharfbuzz-cairo.so usr/lib/libharfbuzz-cairo.so.0 -usr/lib/libharfbuzz-cairo.so.0.60701.0 +usr/lib/libharfbuzz-cairo.so.0.60720.0 #usr/lib/libharfbuzz-subset.la #usr/lib/libharfbuzz-subset.so usr/lib/libharfbuzz-subset.so.0 -usr/lib/libharfbuzz-subset.so.0.60701.0 +usr/lib/libharfbuzz-subset.so.0.60720.0 #usr/lib/libharfbuzz.la #usr/lib/libharfbuzz.so usr/lib/libharfbuzz.so.0 -usr/lib/libharfbuzz.so.0.60701.0 +usr/lib/libharfbuzz.so.0.60720.0 #usr/lib/pkgconfig/harfbuzz-cairo.pc #usr/lib/pkgconfig/harfbuzz-subset.pc #usr/lib/pkgconfig/harfbuzz.pc @@ -127,6 +127,7 @@ usr/lib/libharfbuzz.so.0.60701.0 #usr/share/gtk-doc/html/harfbuzz/api-index-5-3-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-6-0-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-7-0-0.html +#usr/share/gtk-doc/html/harfbuzz/api-index-7-1-0.html #usr/share/gtk-doc/html/harfbuzz/api-index-full.html #usr/share/gtk-doc/html/harfbuzz/apple-advanced-typography-api.html #usr/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 2371b4601..43c9140ea 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -2,7 +2,6 @@ #usr/include/pcap #usr/include/pcap-bpf.h #usr/include/pcap-namedb.h -#usr/include/pcap-util.h #usr/include/pcap.h #usr/include/pcap/bluetooth.h #usr/include/pcap/bpf.h @@ -22,7 +21,7 @@ #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.10.3 +usr/lib/libpcap.so.1.10.4 #usr/lib/pkgconfig/libpcap.pc #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap diff --git a/config/rootfiles/common/libxml2 b/config/rootfiles/common/libxml2 index e9ecb599b..46def714f 100644 --- a/config/rootfiles/common/libxml2 +++ b/config/rootfiles/common/libxml2 @@ -54,7 +54,7 @@ #usr/lib/libxml2.la #usr/lib/libxml2.so usr/lib/libxml2.so.2 -usr/lib/libxml2.so.2.10.3 +usr/lib/libxml2.so.2.11.1 #usr/lib/pkgconfig/libxml-2.0.pc #usr/share/aclocal/libxml.m4 #usr/share/doc/libxml2 diff --git a/config/rootfiles/common/lvm2 b/config/rootfiles/common/lvm2 index 258f3201f..bd1329e54 100644 --- a/config/rootfiles/common/lvm2 +++ b/config/rootfiles/common/lvm2 @@ -9,15 +9,17 @@ etc/lvm/lvm.conf #etc/lvm/profile/metadata_profile_template.profile #etc/lvm/profile/thin-generic.profile #etc/lvm/profile/thin-performance.profile +#etc/lvm/profile/vdo-small.profile lib/udev/rules.d/10-dm.rules lib/udev/rules.d/11-dm-lvm.rules lib/udev/rules.d/13-dm-disk.rules -lib/udev/rules.d/69-dm-lvm-metad.rules +lib/udev/rules.d/69-dm-lvm.rules lib/udev/rules.d/95-dm-notify.rules #usr/include/libdevmapper.h #usr/lib/libdevmapper.so usr/lib/libdevmapper.so.1.02 #usr/lib/pkgconfig/devmapper.pc +#usr/libexec/lvresize_fs_helper usr/sbin/blkdeactivate usr/sbin/dmsetup usr/sbin/dmstats @@ -28,11 +30,11 @@ usr/sbin/lvcreate usr/sbin/lvdisplay usr/sbin/lvextend usr/sbin/lvm -usr/sbin/lvmconf +usr/sbin/lvm_import_vdo usr/sbin/lvmconfig +usr/sbin/lvmdevices usr/sbin/lvmdiskscan usr/sbin/lvmdump -usr/sbin/lvmetad usr/sbin/lvmsadc usr/sbin/lvmsar usr/sbin/lvreduce @@ -61,6 +63,7 @@ usr/sbin/vgexport usr/sbin/vgextend usr/sbin/vgimport usr/sbin/vgimportclone +usr/sbin/vgimportdevices usr/sbin/vgmerge usr/sbin/vgmknodes usr/sbin/vgreduce @@ -70,11 +73,13 @@ usr/sbin/vgs usr/sbin/vgscan usr/sbin/vgsplit #usr/share/man/man5/lvm.conf.5 +#usr/share/man/man7/lvmautoactivation.7 #usr/share/man/man7/lvmcache.7 #usr/share/man/man7/lvmraid.7 #usr/share/man/man7/lvmreport.7 #usr/share/man/man7/lvmsystemid.7 #usr/share/man/man7/lvmthin.7 +#usr/share/man/man7/lvmvdo.7 #usr/share/man/man8/blkdeactivate.8 #usr/share/man/man8/dmsetup.8 #usr/share/man/man8/dmstats.8 @@ -89,11 +94,11 @@ usr/sbin/vgsplit #usr/share/man/man8/lvm-fullreport.8 #usr/share/man/man8/lvm-lvpoll.8 #usr/share/man/man8/lvm.8 -#usr/share/man/man8/lvmconf.8 +#usr/share/man/man8/lvm_import_vdo.8 #usr/share/man/man8/lvmconfig.8 +#usr/share/man/man8/lvmdevices.8 #usr/share/man/man8/lvmdiskscan.8 #usr/share/man/man8/lvmdump.8 -#usr/share/man/man8/lvmetad.8 #usr/share/man/man8/lvmsadc.8 #usr/share/man/man8/lvmsar.8 #usr/share/man/man8/lvreduce.8 @@ -122,6 +127,7 @@ usr/sbin/vgsplit #usr/share/man/man8/vgextend.8 #usr/share/man/man8/vgimport.8 #usr/share/man/man8/vgimportclone.8 +#usr/share/man/man8/vgimportdevices.8 #usr/share/man/man8/vgmerge.8 #usr/share/man/man8/vgmknodes.8 #usr/share/man/man8/vgreduce.8 diff --git a/config/rootfiles/common/zstd b/config/rootfiles/common/zstd index 235613949..58eb75b3f 100644 --- a/config/rootfiles/common/zstd +++ b/config/rootfiles/common/zstd @@ -10,7 +10,7 @@ usr/bin/zstdmt #usr/lib/libzstd.a #usr/lib/libzstd.so usr/lib/libzstd.so.1 -usr/lib/libzstd.so.1.5.4 +usr/lib/libzstd.so.1.5.5 #usr/lib/pkgconfig/libzstd.pc #usr/share/man/man1/unzstd.1 #usr/share/man/man1/zstd.1 diff --git a/config/rootfiles/core/175/filelists/iproute2 b/config/rootfiles/core/175/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/175/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/libpcap b/config/rootfiles/core/175/filelists/libpcap new file mode 120000 index 000000000..c7f9f52a8 --- /dev/null +++ b/config/rootfiles/core/175/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/libxml2 b/config/rootfiles/core/175/filelists/libxml2 new file mode 120000 index 000000000..242e69fa3 --- /dev/null +++ b/config/rootfiles/core/175/filelists/libxml2 @@ -0,0 +1 @@ +../../../common/libxml2 \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/lvm2 b/config/rootfiles/core/175/filelists/lvm2 new file mode 120000 index 000000000..d640870b7 --- /dev/null +++ b/config/rootfiles/core/175/filelists/lvm2 @@ -0,0 +1 @@ +../../../common/lvm2 \ No newline at end of file diff --git a/config/rootfiles/core/175/filelists/zstd b/config/rootfiles/core/175/filelists/zstd new file mode 120000 index 000000000..d6d4a3bf1 --- /dev/null +++ b/config/rootfiles/core/175/filelists/zstd @@ -0,0 +1 @@ +../../../common/zstd \ No newline at end of file diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index fd27ea788..89c48bc0a 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -46,6 +46,7 @@ usr/bin/ffprobe #usr/include/libavutil/adler32.h #usr/include/libavutil/aes.h #usr/include/libavutil/aes_ctr.h +#usr/include/libavutil/ambient_viewing_environment.h #usr/include/libavutil/attributes.h #usr/include/libavutil/audio_fifo.h #usr/include/libavutil/avassert.h @@ -147,29 +148,29 @@ usr/bin/ffprobe #usr/include/libswscale/version.h #usr/include/libswscale/version_major.h #usr/lib/libavcodec.so -usr/lib/libavcodec.so.59 -usr/lib/libavcodec.so.59.37.100 +usr/lib/libavcodec.so.60 +usr/lib/libavcodec.so.60.3.100 #usr/lib/libavdevice.so -usr/lib/libavdevice.so.59 -usr/lib/libavdevice.so.59.7.100 +usr/lib/libavdevice.so.60 +usr/lib/libavdevice.so.60.1.100 #usr/lib/libavfilter.so -usr/lib/libavfilter.so.8 -usr/lib/libavfilter.so.8.44.100 +usr/lib/libavfilter.so.9 +usr/lib/libavfilter.so.9.3.100 #usr/lib/libavformat.so -usr/lib/libavformat.so.59 -usr/lib/libavformat.so.59.27.100 +usr/lib/libavformat.so.60 +usr/lib/libavformat.so.60.3.100 #usr/lib/libavutil.so -usr/lib/libavutil.so.57 -usr/lib/libavutil.so.57.28.100 +usr/lib/libavutil.so.58 +usr/lib/libavutil.so.58.2.100 #usr/lib/libpostproc.so -usr/lib/libpostproc.so.56 -usr/lib/libpostproc.so.56.6.100 +usr/lib/libpostproc.so.57 +usr/lib/libpostproc.so.57.1.100 #usr/lib/libswresample.so usr/lib/libswresample.so.4 -usr/lib/libswresample.so.4.7.100 +usr/lib/libswresample.so.4.10.100 #usr/lib/libswscale.so -usr/lib/libswscale.so.6 -usr/lib/libswscale.so.6.7.100 +usr/lib/libswscale.so.7 +usr/lib/libswscale.so.7.1.100 #usr/lib/pkgconfig/libavcodec.pc #usr/lib/pkgconfig/libavdevice.pc #usr/lib/pkgconfig/libavfilter.pc @@ -216,27 +217,28 @@ usr/lib/libswscale.so.6.7.100 #usr/share/ffmpeg/examples #usr/share/ffmpeg/examples/Makefile #usr/share/ffmpeg/examples/README +#usr/share/ffmpeg/examples/avio_http_serve_files.c #usr/share/ffmpeg/examples/avio_list_dir.c -#usr/share/ffmpeg/examples/avio_reading.c +#usr/share/ffmpeg/examples/avio_read_callback.c #usr/share/ffmpeg/examples/decode_audio.c +#usr/share/ffmpeg/examples/decode_filter_audio.c +#usr/share/ffmpeg/examples/decode_filter_video.c #usr/share/ffmpeg/examples/decode_video.c -#usr/share/ffmpeg/examples/demuxing_decoding.c +#usr/share/ffmpeg/examples/demux_decode.c #usr/share/ffmpeg/examples/encode_audio.c #usr/share/ffmpeg/examples/encode_video.c #usr/share/ffmpeg/examples/extract_mvs.c #usr/share/ffmpeg/examples/filter_audio.c -#usr/share/ffmpeg/examples/filtering_audio.c -#usr/share/ffmpeg/examples/filtering_video.c -#usr/share/ffmpeg/examples/http_multiclient.c #usr/share/ffmpeg/examples/hw_decode.c -#usr/share/ffmpeg/examples/metadata.c -#usr/share/ffmpeg/examples/muxing.c -#usr/share/ffmpeg/examples/qsvdec.c -#usr/share/ffmpeg/examples/remuxing.c -#usr/share/ffmpeg/examples/resampling_audio.c -#usr/share/ffmpeg/examples/scaling_video.c +#usr/share/ffmpeg/examples/mux.c +#usr/share/ffmpeg/examples/qsv_decode.c +#usr/share/ffmpeg/examples/qsv_transcode.c +#usr/share/ffmpeg/examples/remux.c +#usr/share/ffmpeg/examples/resample_audio.c +#usr/share/ffmpeg/examples/scale_video.c +#usr/share/ffmpeg/examples/show_metadata.c +#usr/share/ffmpeg/examples/transcode.c #usr/share/ffmpeg/examples/transcode_aac.c -#usr/share/ffmpeg/examples/transcoding.c #usr/share/ffmpeg/examples/vaapi_encode.c #usr/share/ffmpeg/examples/vaapi_transcode.c #usr/share/ffmpeg/ffprobe.xsd diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index ff53abec9..e4c3c5219 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -24,13 +24,12 @@ usr/lib/libnfsidmap/static.so #usr/lib/libnfsidmap/umich_ldap.a #usr/lib/libnfsidmap/umich_ldap.la usr/lib/libnfsidmap/umich_ldap.so -#usr/lib/modprobe.d -#usr/lib/modprobe.d/50-nfs.conf #usr/lib/pkgconfig/libnfsidmap.pc #usr/lib/udev/rules.d/99-nfs.rules #usr/libexec/nfsrahead #usr/sbin/blkmapd usr/sbin/exportfs +usr/sbin/fsidd usr/sbin/mountstats usr/sbin/nfsconf usr/sbin/nfsdcld diff --git a/config/rootfiles/packages/opus b/config/rootfiles/packages/opus index a2591f99e..398135c3d 100644 --- a/config/rootfiles/packages/opus +++ b/config/rootfiles/packages/opus @@ -8,6 +8,6 @@ #usr/lib/libopus.la #usr/lib/libopus.so usr/lib/libopus.so.0 -usr/lib/libopus.so.0.8.0 +usr/lib/libopus.so.0.9.0 #usr/lib/pkgconfig/opus.pc #usr/share/aclocal/opus.m4 diff --git a/config/rootfiles/packages/sdl2 b/config/rootfiles/packages/sdl2 index b54783ef8..9a8fc77f5 100644 --- a/config/rootfiles/packages/sdl2 +++ b/config/rootfiles/packages/sdl2 @@ -82,7 +82,7 @@ #usr/lib/cmake/SDL2/sdl2-config-version.cmake #usr/lib/cmake/SDL2/sdl2-config.cmake usr/lib/libSDL2-2.0.so.0 -usr/lib/libSDL2-2.0.so.0.2600.4 +usr/lib/libSDL2-2.0.so.0.2600.5 #usr/lib/libSDL2.la usr/lib/libSDL2.so #usr/lib/libSDL2_test.a diff --git a/lfs/cups b/lfs/cups index 6485f8df4..f1b8df1c7 100644 --- a/lfs/cups +++ b/lfs/cups @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 33 +PAK_VER = 34 DEPS = avahi cups-filters dbus ghostscript @@ -80,6 +80,8 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cups-2.4.2_Fix_default_cupsd_keychain_with_OpenSSL.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cups-2.4.2_Fix_TLS_certificate_generation_bugs_with_openssl.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && \ ./configure \ @@ -87,9 +89,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --sysconfdir=/var/ipfire \ --localstatedir=/var \ --enable-debug \ - --enable-avahi \ + --with-dnssd=avahi \ --enable-dbus \ - --enable-gnutls \ + --with-tls=openssl \ --enable-libusb cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/dbus b/lfs/dbus index 7d123e4ef..f6f9c90a5 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 9 +PAK_VER = 10 DEPS = diff --git a/lfs/ffmpeg b/lfs/ffmpeg index c9a27397f..d989846d5 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Library for working with various multimedia formats -VER = 5.1.2 +VER = 6.0 THISAPP = ffmpeg-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 14 +PAK_VER = 15 DEPS = sdl2 lame libvorbis xvid @@ -52,7 +52,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4e2682f040205e6344ff1f2cf8ac69c35cac90a14634a2cd4b41fffc0e09264586b014327f7e9cb6417d12210894cdbc180541c07ad02e782bdf79af9f22991f +$(DL_FILE)_BLAKE2 = c70884911f3a3e40fe87473f241a2a56b303f5abe7f1d7fa797d05e29e00971f98cbf37832c1c3dc5fa949a5beddef05a6ec55ae6668091976ea870ad93c0e8d install : $(TARGET) diff --git a/lfs/harfbuzz b/lfs/harfbuzz index 17186b203..15cc9ff13 100644 --- a/lfs/harfbuzz +++ b/lfs/harfbuzz @@ -24,7 +24,7 @@ include Config -VER = 7.0.1 +VER = 7.2.0 THISAPP = harfbuzz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4a8844093b627b8d5d2e6f7b735781334f2715fe5146bb135ba19fb5a38f2a38248028b447d985fbde4505cd66721766a727fa7fe1300efd31259c7cafb8b6f2 +$(DL_FILE)_BLAKE2 = 247746d6a0f132a0d6b0c461d9e96a4fe76bc08bca4d05b28a034de60afee8e049d798fdf3962b892b33424245d8f00a63d6068b034e80ad9d7733180e8533c1 install : $(TARGET) diff --git a/lfs/iproute2 b/lfs/iproute2 index f9e24fd09..c773291f3 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@ include Config -VER = 6.2.0 +VER = 6.3.0 THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d3bfaecf33ffc7861e983e8db0d6a63f4767b6c01b5346e88f51c65ed6279c4be29412ed18b8f98ed54d60a84455b73fe7745142fd0fc0f3e327a29e8bcce986 +$(DL_FILE)_BLAKE2 = a7b48c59c8a30f56ca810136f4d9f681fe38359999c260227a6229b972ce70b233d2865a6543cf3f70ed586825f9191c22d459a9fc5cc8c7dbf3ab417064c8a7 install : $(TARGET) diff --git a/lfs/libpcap b/lfs/libpcap index 3f1de9b5a..0dfe562bf 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -24,7 +24,7 @@ include Config -VER = 1.10.3 +VER = 1.10.4 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3614042f7d8cd5a25221f52d2ed09f9f44643cdc0901ff21041ddb7ba85193c667036f7d989c8b59e6e205d630e062da46533110914dd287013a9ff80b31e97f +$(DL_FILE)_BLAKE2 = 05a7eafc1e1817f7844008db89d8fb10cd2525c22f7ee6c9e3d582b14229412f38ccced5e9d80a96dd459ef9eab12eccb5c1dd4978ddc9f66267469212005e4c install : $(TARGET) diff --git a/lfs/libxml2 b/lfs/libxml2 index ddcfdbff7..92fe88f2a 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.10.3 +VER = 2.11.1 THISAPP = libxml2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 +$(DL_FILE)_BLAKE2 = 4ae2c8583ff2fb590b29ffc250baae8d4d3978c6cb9d1d7fadbd3d9aa1d38a69ed0aeb0c9036efb060f869154e6f6d6ea6464ecbb05c7e788b7d93b1c2fa932d install : $(TARGET) diff --git a/lfs/lvm2 b/lfs/lvm2 index 7e327a021..5b39f05f5 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 2.02.188 +VER = 2.03.21 THISAPP = LVM2.$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 +$(DL_FILE)_BLAKE2 = 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 install : $(TARGET) diff --git a/lfs/minidlna b/lfs/minidlna index 82a9d7f38..1ef104743 100644 --- a/lfs/minidlna +++ b/lfs/minidlna @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = minidlna -PAK_VER = 11 +PAK_VER = 12 DEPS = ffmpeg flac libexif libid3tag libogg diff --git a/lfs/mpd b/lfs/mpd index 053a56ab1..9010e70f8 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 30 +PAK_VER = 31 SUP_ARCH = aarch64 x86_64 DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt diff --git a/lfs/nfs b/lfs/nfs index 877b9985e..4df6efa6f 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -26,7 +26,7 @@ include Config SUMMARY = Support Utilities for Kernel nfsd -VER = 2.6.2 +VER = 2.6.3 THISAPP = nfs-utils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 19 +PAK_VER = 20 DEPS = rpcbind @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = ac5aeec051f10e7cd9593d21ecd07eddc87fd6d98e5aaa0db5c6af5ec223c05d856a877469a340c68364bbb317ec2ee3cfe79b7f9ff444028c8f851838f59853 +$(DL_FILE)_BLAKE2 = 1aafa7d49006a62e862a592e30c4f9ba762d6c1973cacd7b89709706cc69617aae8d23000f78841f3a09bf81140222904976536114f3fb78f6230defb039ae9b install : $(TARGET) diff --git a/lfs/opus b/lfs/opus index 8ebb95fc7..e91c6a0e1 100644 --- a/lfs/opus +++ b/lfs/opus @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Opus Audio Codec Library -VER = 1.3.1 +VER = 1.4 THISAPP = opus-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = opus -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb +$(DL_FILE)_BLAKE2 = 21f11df745cb868f4da1586d678901045fd9bd0c0590628015f3adc2522c88b0660df88096abe975051fec3188b76b93762c4a01907c2ab2b23c40fde79cf6ad install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) diff --git a/lfs/sdl2 b/lfs/sdl2 index 829f959e9..df15c2e02 100644 --- a/lfs/sdl2 +++ b/lfs/sdl2 @@ -24,7 +24,7 @@ include Config -VER = 2.26.4 +VER = 2.26.5 SUMMARY = Simple DirectMedia Layer Library THISAPP = SDL2-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sdl2 -PAK_VER = 10 +PAK_VER = 11 DEPS = alsa @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 9843df277d1cd5f4e7ebb89cde6d069e8b635b6d8f10c2104badcc2089fcdd3ca4e620c322a687c1a0346817c17978a7c99729b55a48dc57937bb9df6435b4ff +$(DL_FILE)_BLAKE2 = f0363306ee031d399001259ac32e62cea2130d7aafb4594d8a11b76e073630aa43b7abe288eed54c77c46604f2fd4e4fcd455cccf29e847d963ff50153d8d707 install : $(TARGET) diff --git a/lfs/shairport-sync b/lfs/shairport-sync index 5ffd085f7..946aedeec 100644 --- a/lfs/shairport-sync +++ b/lfs/shairport-sync @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = shairport-sync -PAK_VER = 10 +PAK_VER = 11 DEPS = alac alsa avahi ffmpeg libdaemon libplist nqptp soxr diff --git a/lfs/tcpdump b/lfs/tcpdump index a3e9705c7..4015577ce 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -26,7 +26,7 @@ include Config SUMMARY = A Packet Sniffer -VER = 4.99.3 +VER = 4.99.4 THISAPP = tcpdump-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tcpdump -PAK_VER = 15 +PAK_VER = 16 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8e8adda6df40f3a79cbeb80bd01d43834e0b3ec44c8227bda2260b43ea0852f76beb02199120cca16adae0d793841cf684e7e276e520f49479a1b04ab1dc4821 +$(DL_FILE)_BLAKE2 = f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d install : $(TARGET) diff --git a/lfs/zstd b/lfs/zstd index 1c2447f54..068f972a3 100644 --- a/lfs/zstd +++ b/lfs/zstd @@ -24,7 +24,7 @@ include Config -VER = 1.5.4 +VER = 1.5.5 THISAPP = zstd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = ffc5fcbbdf4ab04bc14b5037308bf4e879d4cbaaf863462ea1e8af3f1b86b935ee6036e49298c83ac42b00472c003e32c263c977f0ae7d64f31d9ae63c5c28cb +$(DL_FILE)_BLAKE2 = 7680e27a0adacfb809d9fc81e06d3f99bf74df30374d3b5cb2d58f667dd1b7d5c41697e608592709e17c0e32277f20a6d615edee409b5d7cdcb15da2799a2350 install : $(TARGET) diff --git a/src/paks/dbus/install.sh b/src/paks/dbus/install.sh index bf4e5a6d5..e4f2abda2 100644 --- a/src/paks/dbus/install.sh +++ b/src/paks/dbus/install.sh @@ -17,13 +17,13 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2023 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh extract_files -useradd messagebus +id -u messagebus &>/dev/null || useradd -r -d /var/empty -s /bin/false messagebus # Create start links ln -svf ../init.d/messagebus /etc/rc.d/rc3.d/S15messagebus diff --git a/src/paks/dbus/uninstall.sh b/src/paks/dbus/uninstall.sh index 49fc30e30..1c0573735 100644 --- a/src/paks/dbus/uninstall.sh +++ b/src/paks/dbus/uninstall.sh @@ -22,7 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -stop_service ${NAME} +stop_service messagebus # Remove start files rm -rf /etc/rc.d/rc*.d/*messagebus diff --git a/src/patches/cups-2.4.2_Fix_TLS_certificate_generation_bugs_with_openssl.patch b/src/patches/cups-2.4.2_Fix_TLS_certificate_generation_bugs_with_openssl.patch new file mode 100644 index 000000000..a356474d2 --- /dev/null +++ b/src/patches/cups-2.4.2_Fix_TLS_certificate_generation_bugs_with_openssl.patch @@ -0,0 +1,337 @@ +--- cups-2.4.2/cups/tls-openssl.c.orig 2022-05-26 08:17:21.000000000 +0200 ++++ cups-2.4.2/cups/tls-openssl.c 2023-04-24 20:13:16.431108315 +0200 +@@ -1,7 +1,7 @@ + /* + * TLS support code for CUPS using OpenSSL/LibreSSL. + * +- * Copyright © 2020-2022 by OpenPrinting ++ * Copyright © 2020-2023 by OpenPrinting + * Copyright © 2007-2019 by Apple Inc. + * Copyright © 1997-2007 by Easy Software Products, all rights reserved. + * +@@ -35,7 +35,8 @@ + static time_t http_get_date(X509 *cert, int which); + //static void http_load_crl(void); + static const char *http_make_path(char *buffer, size_t bufsize, const char *dirname, const char *filename, const char *ext); +-static void http_x509_add_san(X509 *cert, const char *name); ++static int http_x509_add_ext(X509 *cert, int nid, const char *value); ++static void http_x509_add_san(GENERAL_NAMES *gens, const char *name); + + + /* +@@ -79,11 +80,15 @@ + cups_lang_t *language; // Default language info + time_t curtime; // Current time + X509_NAME *name; // Subject/issuer name ++ ASN1_INTEGER *serial; // Serial number ++ ASN1_TIME *notBefore, // Initial date ++ *notAfter; // Expiration date + BIO *bio; // Output file + char temp[1024], // Temporary directory name + crtfile[1024], // Certificate filename + keyfile[1024]; // Private key filename + const char *common_ptr; // Pointer into common name ++ GENERAL_NAMES *gens; // Names for SubjectAltName certificate extension + + + DEBUG_printf(("cupsMakeServerCredentials(path=\"%s\", common_name=\"%s\", num_alt_names=%d, alt_names=%p, expiration_date=%d)", path, common_name, num_alt_names, alt_names, (int)expiration_date)); +@@ -104,7 +109,7 @@ + // Create the encryption key... + DEBUG_puts("1cupsMakeServerCredentials: Creating key pair."); + +- if ((rsa = RSA_generate_key(2048, RSA_F4, NULL, NULL)) == NULL) ++ if ((rsa = RSA_generate_key(3072, RSA_F4, NULL, NULL)) == NULL) + { + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to create key pair."), 1); + return (0); +@@ -131,25 +136,43 @@ + return (0); + } + +- curtime = time(NULL); +- language = cupsLangDefault(); ++ curtime = time(NULL); ++ ++ notBefore = ASN1_TIME_new(); ++ ASN1_TIME_set(notBefore, curtime); ++ X509_set_notBefore(cert, notBefore); ++ ASN1_TIME_free(notBefore); ++ ++ notAfter = ASN1_TIME_new(); ++ ASN1_TIME_set(notAfter, expiration_date); ++ X509_set_notAfter(cert, notAfter); ++ ASN1_TIME_free(notAfter); ++ ++ serial = ASN1_INTEGER_new(); ++ ASN1_INTEGER_set(serial, (int)curtime); ++ X509_set_serialNumber(cert, serial); ++ ASN1_INTEGER_free(serial); + +- ASN1_TIME_set(X509_get_notBefore(cert), curtime); +- ASN1_TIME_set(X509_get_notAfter(cert), expiration_date); +- ASN1_INTEGER_set(X509_get_serialNumber(cert), (int)curtime); + X509_set_pubkey(cert, pkey); + +- name = X509_get_subject_name(cert); ++ language = cupsLangDefault(); ++ name = X509_NAME_new(); + if (strlen(language->language) == 5) +- X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned char *)language->language + 3, -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, SN_countryName, MBSTRING_ASC, (unsigned char *)language->language + 3, -1, -1, 0); + else +- X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned char *)"US", -1, -1, 0); +- X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned char *)"Unknown", -1, -1, 0); +- X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char *)common_name, -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, SN_countryName, MBSTRING_ASC, (unsigned char *)"US", -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, SN_commonName, MBSTRING_ASC, (unsigned char *)common_name, -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, SN_organizationName, MBSTRING_ASC, (unsigned char *)common_name, -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, SN_organizationalUnitName, MBSTRING_ASC, (unsigned char *)"Unknown", -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, SN_stateOrProvinceName, MBSTRING_ASC, (unsigned char *)"Unknown", -1, -1, 0); ++ X509_NAME_add_entry_by_txt(name, SN_localityName, MBSTRING_ASC, (unsigned char *)"Unknown", -1, -1, 0); + + X509_set_issuer_name(cert, name); ++ X509_set_subject_name(cert, name); ++ X509_NAME_free(name); + +- http_x509_add_san(cert, common_name); ++ gens = sk_GENERAL_NAME_new_null(); ++ http_x509_add_san(gens, common_name); + if ((common_ptr = strstr(common_name, ".local")) == NULL) + { + // Add common_name.local to the list, too... +@@ -161,7 +184,7 @@ + *localptr = '\0'; + strlcat(localname, ".local", sizeof(localname)); + +- http_x509_add_san(cert, localname); ++ http_x509_add_san(gens, localname); + } + + if (num_alt_names > 0) +@@ -171,10 +194,22 @@ + for (i = 0; i < num_alt_names; i ++) + { + if (strcmp(alt_names[i], "localhost")) +- http_x509_add_san(cert, alt_names[i]); ++ http_x509_add_san(gens, alt_names[i]); + } + } + ++ // Add extension with DNS names and free buffer for GENERAL_NAME ++ X509_add1_ext_i2d(cert, NID_subject_alt_name, gens, 0, X509V3_ADD_DEFAULT); ++ sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free); ++ ++ // Add extensions that are required to make Chrome happy... ++ http_x509_add_ext(cert, NID_basic_constraints, "critical,CA:FALSE,pathlen:0"); ++ http_x509_add_ext(cert, NID_key_usage, "critical,digitalSignature,keyEncipherment"); ++ http_x509_add_ext(cert, NID_ext_key_usage, "1.3.6.1.5.5.7.3.1"); ++ http_x509_add_ext(cert, NID_subject_key_identifier, "hash"); ++ http_x509_add_ext(cert, NID_authority_key_identifier, "keyid,issuer"); ++ X509_set_version(cert, 2); // v3 ++ + X509_sign(cert, pkey, EVP_sha256()); + + // Save them... +@@ -959,6 +994,7 @@ + const char *cn, // Common name to lookup + *cnptr; // Pointer into common name + int have_creds = 0; // Have credentials? ++ int key_status, crt_status; // Key and certificate load status + + context = SSL_CTX_new(TLS_server_method()); + +@@ -1002,6 +1038,8 @@ + else + cn = tls_common_name; + ++ _cupsMutexLock(&tls_mutex); ++ + if (cn) + { + // First look in the CUPS keystore... +@@ -1042,20 +1080,41 @@ + { + DEBUG_printf(("4_httpTLSStart: Auto-create credentials for \"%s\".", cn)); + +- if (!cupsMakeServerCredentials(tls_keypath, cn, 0, NULL, time(NULL) + 365 * 86400)) ++ if (!cupsMakeServerCredentials(tls_keypath, cn, 0, NULL, time(NULL) + 3650 * 86400)) + { + DEBUG_puts("4_httpTLSStart: cupsMakeServerCredentials failed."); + http->error = errno = EINVAL; + http->status = HTTP_STATUS_ERROR; + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Unable to create server credentials."), 1); +- SSL_CTX_free(context); ++ SSL_CTX_free(context); ++ _cupsMutexUnlock(&tls_mutex); + + return (-1); + } + } + +- SSL_CTX_use_PrivateKey_file(context, keyfile, SSL_FILETYPE_PEM); +- SSL_CTX_use_certificate_file(context, crtfile, SSL_FILETYPE_PEM); ++ _cupsMutexUnlock(&tls_mutex); ++ ++ DEBUG_printf(("4_httpTLSStart: Using private key file '%s'.", keyfile)); ++ DEBUG_printf(("4_httpTLSStart: Using certificate file '%s'.", crtfile)); ++ ++ crt_status = SSL_CTX_use_certificate_chain_file(context, crtfile); ++ key_status = SSL_CTX_use_PrivateKey_file(context, keyfile, SSL_FILETYPE_PEM); ++ ++ if (!key_status || !crt_status) ++ { ++ // Unable to load private key or certificate... ++ DEBUG_puts("4_httpTLSStart: Unable to use private key or certificate chain file."); ++ if ((error = ERR_get_error()) != 0) ++ _cupsSetError(IPP_STATUS_ERROR_CUPS_PKI, ERR_error_string(error, NULL), 0); ++ ++ http->status = HTTP_STATUS_ERROR; ++ http->error = EIO; ++ ++ SSL_CTX_free(context); ++ ++ return (-1); ++ } + } + + // Set TLS options... +@@ -1068,6 +1127,8 @@ + strlcat(cipherlist, ":!SHA1:!SHA256:!SHA384", sizeof(cipherlist)); + strlcat(cipherlist, ":@STRENGTH", sizeof(cipherlist)); + ++ DEBUG_printf(("4_httpTLSStart: cipherlist='%s', tls_min_version=%d, tls_max_version=%d", cipherlist, tls_min_version, tls_max_version)); ++ + SSL_CTX_set_min_proto_version(context, versions[tls_min_version]); + SSL_CTX_set_max_proto_version(context, versions[tls_max_version]); + SSL_CTX_set_cipher_list(context, cipherlist); +@@ -1094,7 +1155,8 @@ + + if (http->mode == _HTTP_MODE_CLIENT) + { +- // Negotiate as a server... ++ // Negotiate as a client... ++ DEBUG_puts("4_httpTLSStart: Calling SSL_connect..."); + if (SSL_connect(http->tls) < 1) + { + // Failed +@@ -1109,12 +1171,15 @@ + SSL_free(http->tls); + http->tls = NULL; + ++ DEBUG_printf(("4_httpTLSStart: Returning -1 (%s)", ERR_error_string(error, NULL))); ++ + return (-1); + } + } + else + { + // Negotiate as a server... ++ DEBUG_puts("4_httpTLSStart: Calling SSL_accept..."); + if (SSL_accept(http->tls) < 1) + { + // Failed +@@ -1129,10 +1194,14 @@ + SSL_free(http->tls); + http->tls = NULL; + ++ DEBUG_printf(("4_httpTLSStart: Returning -1 (%s)", ERR_error_string(error, NULL))); ++ + return (-1); + } + } + ++ DEBUG_puts("4_httpTLSStart: Returning 0."); ++ + return (0); + } + +@@ -1152,6 +1221,8 @@ + SSL_shutdown(http->tls); + SSL_CTX_free(context); + SSL_free(http->tls); ++ ++ http->tls = NULL; + } + + +@@ -1564,32 +1635,62 @@ + + + // +-// 'http_x509_add_san()' - Add a subjectAltName extension to an X.509 certificate. ++// 'http_x509_add_ext()' - Add an extension to a certificate. + // + +-static void +-http_x509_add_san(X509 *cert, // I - Certificate +- const char *name) // I - Hostname ++static int // O - 1 on success, 0 on failure ++http_x509_add_ext(X509 *cert, // I - Certificate ++ int nid, // I - Extension ID ++ const char *value) // I - Value + { +- char dns_name[1024]; // DNS: prefixed hostname +- X509_EXTENSION *san_ext; // Extension for subjectAltName +- ASN1_OCTET_STRING *san_asn1; // ASN1 string ++ int ret; // Return value ++ X509_EXTENSION *ex = NULL; // Extension ++ X509V3_CTX ctx; // Certificate context + + +- // The subjectAltName value for DNS names starts with a DNS: prefix... +- snprintf(dns_name, sizeof(dns_name), "DNS: %s", name); ++ DEBUG_printf(("3http_x509_add_ext(cert=%p, nid=%d, value=\"%s\")", (void *)cert, nid, value)); + +- if ((san_asn1 = ASN1_OCTET_STRING_new()) == NULL) +- return; ++ // Don't use a configuration database... ++ X509V3_set_ctx_nodb(&ctx); + +- ASN1_OCTET_STRING_set(san_asn1, (unsigned char *)dns_name, strlen(dns_name)); +- if ((san_ext = X509_EXTENSION_create_by_NID(NULL, NID_subject_alt_name, 0, san_asn1)) == NULL) ++ // Self-signed certificates use the same issuer and subject... ++ X509V3_set_ctx(&ctx, /*issuer*/cert, /*subject*/cert, /*req*/NULL, /*crl*/NULL, /*flags*/0); ++ ++ // Create and add the extension... ++ if ((ex = X509V3_EXT_conf_nid(/*conf*/NULL, &ctx, nid, value)) == NULL) + { +- ASN1_OCTET_STRING_free(san_asn1); +- return; ++ DEBUG_puts("4http_x509_add_ext: Unable to create extension, returning false."); ++ return (0); + } + +- X509_add_ext(cert, san_ext, -1); +- X509_EXTENSION_free(san_ext); +- ASN1_OCTET_STRING_free(san_asn1); ++ ret = X509_add_ext(cert, ex, -1) != 0; ++ ++ DEBUG_printf(("4http_x509_add_ext: X509_add_ext returned %s.", ret ? "true" : "false")); ++ ++ // Free the extension and return... ++ X509_EXTENSION_free(ex); ++ ++ return (ret); ++} ++ ++ ++// ++// 'http_x509_add_san()' - Add a subjectAltName to GENERAL_NAMES used for ++// the extension to an X.509 certificate. ++// ++ ++static void ++http_x509_add_san(GENERAL_NAMES *gens, // I - Concatenation of DNS names ++ const char *name) // I - Hostname ++{ ++ GENERAL_NAME *gen_dns = GENERAL_NAME_new(); ++ // DNS: name ++ ASN1_IA5STRING *ia5 = ASN1_IA5STRING_new(); ++ // Hostname string ++ ++ ++ // Set the strings and push it on the GENERAL_NAMES list... ++ ASN1_STRING_set(ia5, name, strlen(name)); ++ GENERAL_NAME_set0_value(gen_dns, GEN_DNS, ia5); ++ sk_GENERAL_NAME_push(gens, gen_dns); + } diff --git a/src/patches/cups-2.4.2_Fix_default_cupsd_keychain_with_OpenSSL.patch b/src/patches/cups-2.4.2_Fix_default_cupsd_keychain_with_OpenSSL.patch new file mode 100644 index 000000000..ebd3a4843 --- /dev/null +++ b/src/patches/cups-2.4.2_Fix_default_cupsd_keychain_with_OpenSSL.patch @@ -0,0 +1,16 @@ +--- cups-2.4.2/scheduler/conf.c.orig 2022-05-26 08:17:21.000000000 +0200 ++++ cups-2.4.2/scheduler/conf.c 2023-04-23 15:37:48.521145700 +0200 +@@ -605,11 +605,11 @@ + ClassifyOverride = 0; + + #ifdef HAVE_TLS +-# ifdef HAVE_GNUTLS ++# if defined HAVE_GNUTLS || defined HAVE_OPENSSL + cupsdSetString(&ServerKeychain, "ssl"); + # else + cupsdSetString(&ServerKeychain, "/Library/Keychains/System.keychain"); +-# endif /* HAVE_GNUTLS */ ++# endif /* HAVE_GNUTLS || HAVE_OPENSSL */ + + _httpTLSSetOptions(_HTTP_TLS_NONE, _HTTP_TLS_1_0, _HTTP_TLS_MAX); + #endif /* HAVE_TLS */ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6a0c5ef65a5fb96890c774840ecb24f390437855
by Arne Fitzenreiter 03 May '23

03 May '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 6a0c5ef65a5fb96890c774840ecb24f390437855 (commit) from c58a9c034764f18311553737fe4deef658dbfc0b (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 6a0c5ef65a5fb96890c774840ecb24f390437855 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 2 09:11:19 2023 +0200 kernel: update to 6.1.27 the layer7 patch is rebased to apply without fuzzing. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 9 +++++---- config/kernel/kernel.config.x86_64-ipfire | 3 +-- lfs/linux | 7 ++++--- .../linux/{linux-6.1-layer7.patch => linux-6.1.27-layer7.patch} | 8 ++++---- 4 files changed, 14 insertions(+), 13 deletions(-) rename src/patches/linux/{linux-6.1-layer7.patch => linux-6.1.27-layer7.patch} (99%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 92f2bca60..74ff773df 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.24-ipfire Kernel Configuration +# Linux/arm64 6.1.27-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -158,7 +158,6 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y @@ -407,6 +406,7 @@ CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y +CONFIG_CC_HAVE_SHADOW_CALL_STACK=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_KEXEC_FILE is not set @@ -693,6 +693,8 @@ CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y +# CONFIG_SHADOW_CALL_STACK is not set CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y CONFIG_LTO_NONE=y @@ -6989,7 +6991,6 @@ CONFIG_DMA_SUN6I=y # CONFIG_DW_AXI_DMAC is not set CONFIG_FSL_EDMA=m CONFIG_FSL_QDMA=m -# CONFIG_HISI_DMA is not set CONFIG_IMX_DMA=m CONFIG_IMX_SDMA=m # CONFIG_INTEL_IDMA64 is not set @@ -7735,7 +7736,6 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=m @@ -8681,6 +8681,7 @@ CONFIG_IO_STRICT_DEVMEM=y # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 867e99e9f..db0271d94 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.24-ipfire Kernel Configuration +# Linux/x86 6.1.27-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -178,7 +178,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y diff --git a/lfs/linux b/lfs/linux index 85f767799..489715424 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,8 @@ include Config -VER = 6.1.24 +VER = 6.1.27 + ARM_PATCHES = 6.1.y-ipfire2 THISAPP = linux-$(VER) @@ -75,7 +76,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 = 2f20ad999655226bc79caca109bde0f940420d87a293cf000f2d8304122bdfcc388c1a558ff26f2f551c9b6133b8fb120dbd537f914e1b88d0fbbd5408e648b0 +$(DL_FILE)_BLAKE2 = 5d7ec9a6a2652abbe4afb70174a63f58d495291d522087f9adb33864063ce54e219fd6e426793077a346338ccb4d9d753a60cb76b448146fb592ff17c2618792 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3 install : $(TARGET) @@ -113,7 +114,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -svf linux-$(VER) $(DIR_SRC)/linux # Layer7-patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.1-layer7.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-6.1.27-layer7.patch # DVB Patches cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch diff --git a/src/patches/linux/linux-6.1-layer7.patch b/src/patches/linux/linux-6.1.27-layer7.patch similarity index 99% rename from src/patches/linux/linux-6.1-layer7.patch rename to src/patches/linux/linux-6.1.27-layer7.patch index 71f120cb0..00e0ca4c2 100644 --- a/src/patches/linux/linux-6.1-layer7.patch +++ b/src/patches/linux/linux-6.1.27-layer7.patch @@ -1,8 +1,8 @@ diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 7be5bb4c94b6..9a86f7bdbfce 100644 +index 20ca1613f2e3..8024f760bbe1 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -891,6 +891,9 @@ struct sk_buff { +@@ -892,6 +892,9 @@ struct sk_buff { #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) unsigned long _nfct; @@ -103,7 +103,7 @@ index 0f060d100880..28a7d4f8be40 100644 obj-$(CONFIG_NETFILTER_XT_MATCH_STRING) += xt_string.o obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c -index 23b3fedd619a..5fa552543967 100644 +index 30ed45b1b57d..2f4640fcb6bd 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -604,6 +604,11 @@ void nf_ct_destroy(struct nf_conntrack *nfct) @@ -119,7 +119,7 @@ index 23b3fedd619a..5fa552543967 100644 nf_ct_put(ct->master); diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c -index bca839ab1ae8..69fb7b8296a2 100644 +index 460294bd4b60..b1e4b9c6d2a4 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c @@ -373,6 +373,11 @@ static int ct_seq_show(struct seq_file *s, void *v) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c58a9c034764f18311553737fe4deef658dbfc0b
by Arne Fitzenreiter 03 May '23

03 May '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 c58a9c034764f18311553737fe4deef658dbfc0b (commit) via edb153e209b31d77f23ba849c950ff23343e0e2e (commit) via 37dee2c459dc6e59c34f95f68b015d265b690b9b (commit) via 946a27a28c7812785180c564b7133064ba43feea (commit) via 8b251380b668c45b9b7974a16cbcf12e1f770dca (commit) via 2b1a701ec41e118a996bd379bfb1805146521b4a (commit) via f55ea781c3dc98e0b1dd07ae23b7cfbe408ca588 (commit) via b5784fbc3308214852e3029bccca20e0f63f35a8 (commit) from 092ff6670a71bcd74ae113e70604deeac1d86097 (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 c58a9c034764f18311553737fe4deef658dbfc0b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 28 20:35:15 2023 +0000 samba: aarch64 rootfile update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit edb153e209b31d77f23ba849c950ff23343e0e2e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 28 19:41:05 2023 +0000 kernel: arm64 rootfile update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 37dee2c459dc6e59c34f95f68b015d265b690b9b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 2 19:35:27 2023 +0000 core175: ship led and partresize initskripts Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 946a27a28c7812785180c564b7133064ba43feea Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 28 19:36:23 2023 +0000 initskripts: add OrangePi R1 Plus LTS Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 8b251380b668c45b9b7974a16cbcf12e1f770dca Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 28 19:36:22 2023 +0000 u-boot: add OrangePi R1 Plus LTS Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2b1a701ec41e118a996bd379bfb1805146521b4a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 28 19:36:21 2023 +0000 kernel: add OrangePi R1 Plus LTS Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f55ea781c3dc98e0b1dd07ae23b7cfbe408ca588 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 2 19:32:15 2023 +0000 core175: ship rules.pl Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b5784fbc3308214852e3029bccca20e0f63f35a8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Apr 25 20:40:09 2023 +0200 firewall: Allow traffic from multicast networks The multicast network segment 224.0.0.0/4 is used for a lot of different services provided by the local ISP's. (IPTV etc.) We have to allow traffic from this networks when using one of the BOGON blocklists in order to get those ISP services still accessable. https://www.iana.org/assignments/multicast-addresses/multicast-addresses.xh… Fixes 13092. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/firewall/rules.pl | 1 + config/rootfiles/common/aarch64/linux | 11 +- config/rootfiles/common/aarch64/u-boot | 2 + config/rootfiles/core/175/filelists/files | 3 + config/rootfiles/packages/aarch64/samba | 17 ++- lfs/linux | 4 +- lfs/u-boot | 19 ++- src/initscripts/system/leds | 11 ++ src/initscripts/system/partresize | 10 +- ... add-nanopi-r2c-and-orangepi-r1-plus-lts.patch} | 148 ++++++++++++++++++++- 10 files changed, 214 insertions(+), 12 deletions(-) rename src/patches/u-boot/rockchip/{add_nanopi-r2c.patch => add-nanopi-r2c-and-orangepi-r1-plus-lts.patch} (52%) Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 6c08feb86..7edb910e2 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -55,6 +55,7 @@ my @PRIVATE_NETWORKS = ( "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10", + "224.0.0.0/4", ); # MARK masks diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 8d7686427..023bf52fe 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -297,6 +297,10 @@ boot/dtb-KVER-ipfire #boot/dtb-KVER-ipfire/rockchip/rk3328-nanopi-r2c.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-nanopi-r2s-oc.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-nanopi-r2s.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus-lts-oc.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus-lts.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus-oc.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-roc-cc.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-roc-pc.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-rock-pi-e.dtb @@ -6857,7 +6861,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_DEFAULT_BPF_JIT #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_FRAME_POINTERS -#lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_HUGE_PMD_SHARE #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_LD_ORPHAN_WARN #lib/modules/KVER-ipfire/build/include/config/ARC_EMAC_CORE @@ -7763,7 +7766,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DRM_TTM #lib/modules/KVER-ipfire/build/include/config/DRM_TTM_HELPER #lib/modules/KVER-ipfire/build/include/config/DRM_UDL -#lib/modules/KVER-ipfire/build/include/config/DRM_USE_DYNAMIC_DEBUG #lib/modules/KVER-ipfire/build/include/config/DRM_V3D #lib/modules/KVER-ipfire/build/include/config/DRM_VC4 #lib/modules/KVER-ipfire/build/include/config/DRM_VC4_HDMI_CEC @@ -9275,7 +9277,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/NET_CLS_ROUTE4 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP #lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP6 -#lib/modules/KVER-ipfire/build/include/config/NET_CLS_TCINDEX #lib/modules/KVER-ipfire/build/include/config/NET_CLS_U32 #lib/modules/KVER-ipfire/build/include/config/NET_CORE #lib/modules/KVER-ipfire/build/include/config/NET_DEVLINK @@ -10086,6 +10087,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/RTC_CLASS #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_88PM80X #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_88PM860X +#lib/modules/KVER-ipfire/build/include/config/RTC_DRV_ARMADA38X #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_BQ32K #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_BQ4802 #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_DS1286 @@ -10369,7 +10371,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LINFLEXUART #lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LINFLEXUART_CONSOLE #lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LPUART -#lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LPUART_CONSOLE #lib/modules/KVER-ipfire/build/include/config/SERIAL_IMX #lib/modules/KVER-ipfire/build/include/config/SERIAL_IMX_CONSOLE #lib/modules/KVER-ipfire/build/include/config/SERIAL_IMX_EARLYCON @@ -21389,6 +21390,7 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/rtc #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-88pm80x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-88pm860x.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-armada38x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq32k.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq4802.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1286.ko.xz @@ -22181,7 +22183,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/net/sched/cls_route.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp6.ko.xz -#lib/modules/KVER-ipfire/kernel/net/sched/cls_tcindex.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/cls_u32.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/em_cmp.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/em_ipset.ko.xz diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot index 4b2dcd4fd..a9b9ed435 100644 --- a/config/rootfiles/common/aarch64/u-boot +++ b/config/rootfiles/common/aarch64/u-boot @@ -12,6 +12,8 @@ usr/share/u-boot/nanopi_r2c/u-boot-rockchip.bin usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin #usr/share/u-boot/nanopi_r4s usr/share/u-boot/nanopi_r4s/u-boot-rockchip.bin +#usr/share/u-boot/orangepi_r1_plus_lts +usr/share/u-boot/orangepi_r1_plus_lts/u-boot-rockchip.bin #usr/share/u-boot/orangepi_zero_plus usr/share/u-boot/orangepi_zero_plus/u-boot-sunxi-with-spl.bin #usr/share/u-boot/rpi diff --git a/config/rootfiles/core/175/filelists/files b/config/rootfiles/core/175/filelists/files index 78a23c7d3..dad266e7e 100644 --- a/config/rootfiles/core/175/filelists/files +++ b/config/rootfiles/core/175/filelists/files @@ -1,4 +1,6 @@ etc/rc.d/init.d/firewall +etc/rc.d/init.d/leds +etc/rc.d/init.d/partresize lib/firmware/amdgpu/dcn_3_1_4_dmcub.bin lib/firmware/amdgpu/gc_11_0_1_imu.bin lib/firmware/amdgpu/gc_11_0_1_me.bin @@ -80,3 +82,4 @@ lib/firmware/rtlwifi/rtl8710bufw_SMIC.bin lib/firmware/rtlwifi/rtl8710bufw_UMC.bin lib/firmware/rtw88/rtw8822c_fw.bin lib/firmware/rtw89/rtw8852b_fw-1.bin +usr/lib/firewall/rules.pl diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 75c95b395..40ccec083 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -62,6 +62,7 @@ usr/bin/wbinfo #usr/include/samba-4.0/gen_ndr #usr/include/samba-4.0/gen_ndr/atsvc.h #usr/include/samba-4.0/gen_ndr/auth.h +#usr/include/samba-4.0/gen_ndr/claims.h #usr/include/samba-4.0/gen_ndr/dcerpc.h #usr/include/samba-4.0/gen_ndr/drsblobs.h #usr/include/samba-4.0/gen_ndr/drsuapi.h @@ -196,7 +197,7 @@ usr/lib/libtevent-util.so.0 usr/lib/libtevent-util.so.0.0.1 usr/lib/libwbclient.so usr/lib/libwbclient.so.0 -usr/lib/libwbclient.so.0.15 +usr/lib/libwbclient.so.0.16 #usr/lib/pkgconfig/dcerpc.pc #usr/lib/pkgconfig/dcerpc_samr.pc #usr/lib/pkgconfig/ndr.pc @@ -223,6 +224,7 @@ usr/lib/python3.10/site-packages/samba/auth.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/auth_util.py usr/lib/python3.10/site-packages/samba/colour.py usr/lib/python3.10/site-packages/samba/common.py +usr/lib/python3.10/site-packages/samba/compression.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/credentials.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/crypto.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dbchecker.py @@ -231,6 +233,7 @@ usr/lib/python3.10/site-packages/samba/dcerpc/__init__.py usr/lib/python3.10/site-packages/samba/dcerpc/atsvc.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/auth.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/base.cpython-310-aarch64-linux-gnu.so +usr/lib/python3.10/site-packages/samba/dcerpc/claims.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/dcerpc.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/dfs.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/dns.cpython-310-aarch64-linux-gnu.so @@ -382,6 +385,8 @@ usr/lib/python3.10/site-packages/samba/provision/kerberos_implementation.py usr/lib/python3.10/site-packages/samba/provision/sambadns.py usr/lib/python3.10/site-packages/samba/registry.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/remove_dc.py +usr/lib/python3.10/site-packages/samba/reparse_symlink.cpython-310-aarch64-linux-gnu.so +usr/lib/python3.10/site-packages/samba/safe_tarfile.py #usr/lib/python3.10/site-packages/samba/samba3 usr/lib/python3.10/site-packages/samba/samba3/__init__.py usr/lib/python3.10/site-packages/samba/samba3/libsmb_samba_cwrapper.cpython-310-aarch64-linux-gnu.so @@ -437,6 +442,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/traffic_summary.py #usr/lib/python3.10/site-packages/samba/tests/common.py #usr/lib/python3.10/site-packages/samba/tests/complex_expressions.py +#usr/lib/python3.10/site-packages/samba/tests/compression.py #usr/lib/python3.10/site-packages/samba/tests/core.py #usr/lib/python3.10/site-packages/samba/tests/cred_opt.py #usr/lib/python3.10/site-packages/samba/tests/credentials.py @@ -507,9 +513,11 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/krb5/alias_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/as_canonicalization_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/as_req_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/claims_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/compatability_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py @@ -540,6 +548,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/ldap_referrals.py #usr/lib/python3.10/site-packages/samba/tests/ldap_spn.py #usr/lib/python3.10/site-packages/samba/tests/ldap_upn_sam_account.py +#usr/lib/python3.10/site-packages/samba/tests/libsmb-basic.py #usr/lib/python3.10/site-packages/samba/tests/libsmb.py #usr/lib/python3.10/site-packages/samba/tests/loadparm.py #usr/lib/python3.10/site-packages/samba/tests/logfiles.py @@ -577,12 +586,14 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/pso.py #usr/lib/python3.10/site-packages/samba/tests/py_credentials.py #usr/lib/python3.10/site-packages/samba/tests/registry.py +#usr/lib/python3.10/site-packages/samba/tests/reparsepoints.py #usr/lib/python3.10/site-packages/samba/tests/s3_net_join.py #usr/lib/python3.10/site-packages/samba/tests/s3idmapdb.py #usr/lib/python3.10/site-packages/samba/tests/s3param.py #usr/lib/python3.10/site-packages/samba/tests/s3passdb.py #usr/lib/python3.10/site-packages/samba/tests/s3registry.py #usr/lib/python3.10/site-packages/samba/tests/s3windb.py +#usr/lib/python3.10/site-packages/samba/tests/safe_tarfile.py #usr/lib/python3.10/site-packages/samba/tests/samba3sam.py #usr/lib/python3.10/site-packages/samba/tests/samba_tool #usr/lib/python3.10/site-packages/samba/tests/samba_tool/__init__.py @@ -632,6 +643,9 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/sid_strings.py #usr/lib/python3.10/site-packages/samba/tests/smb-notify.py #usr/lib/python3.10/site-packages/samba/tests/smb.py +#usr/lib/python3.10/site-packages/samba/tests/smb1posix.py +#usr/lib/python3.10/site-packages/samba/tests/smb2symlink.py +#usr/lib/python3.10/site-packages/samba/tests/smb3unix.py #usr/lib/python3.10/site-packages/samba/tests/smbconf.py #usr/lib/python3.10/site-packages/samba/tests/smbd_base.py #usr/lib/python3.10/site-packages/samba/tests/smbd_fuzztest.py @@ -783,6 +797,7 @@ usr/lib/samba/libsmbd-shim-samba4.so usr/lib/samba/libsmbldaphelper-samba4.so usr/lib/samba/libsmbpasswdparser-samba4.so usr/lib/samba/libsocket-blocking-samba4.so +usr/lib/samba/libstable-sort-samba4.so usr/lib/samba/libsys-rw-samba4.so usr/lib/samba/libtalloc-report-printf-samba4.so usr/lib/samba/libtalloc-report-samba4.so diff --git a/lfs/linux b/lfs/linux index e48374f1e..85f767799 100644 --- a/lfs/linux +++ b/lfs/linux @@ -25,7 +25,7 @@ include Config VER = 6.1.24 -ARM_PATCHES = 6.1.y-ipfire1 +ARM_PATCHES = 6.1.y-ipfire2 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -76,7 +76,7 @@ $(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 = 2f20ad999655226bc79caca109bde0f940420d87a293cf000f2d8304122bdfcc388c1a558ff26f2f551c9b6133b8fb120dbd537f914e1b88d0fbbd5408e648b0 -arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 2181ba20d1c9d2752d67438784da12470f5c9cb8acc4eb748637ae1e8bf9d7cd0e7a08a51fad5cac98764d46ae6a20521ddda31da7002d48dbd180ff04a4d9aa +arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3 install : $(TARGET) diff --git a/lfs/u-boot b/lfs/u-boot index cea74e64c..2ad92df05 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -138,7 +138,7 @@ ifneq "$(MKIMAGE)" "1" cd $(DIR_APP) && make distclean # Nanopi R2C - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rockchip/add_nanopi-r2c.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)" @@ -156,6 +156,23 @@ ifneq "$(MKIMAGE)" "1" /usr/share/u-boot/nanopi_r2c/u-boot-rockchip.bin cd $(DIR_APP) && make distclean + # Orangepi R1 plus lts + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz + cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)" + cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/rk3328/release/bl31/bl31.elf bl31.elf + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + -mkdir -pv /usr/share/u-boot/orangepi_r1_plus_lts + + cd $(DIR_APP) && make CROSS_COMPILE="" orangepi-r1-plus-lts-rk3328_config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi R1 plus lts - IPFire.org"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200!' .config + cd $(DIR_APP) && sed -i -e 's!.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config + cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" + cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ + /usr/share/u-boot/orangepi_r1_plus_lts/u-boot-rockchip.bin + cd $(DIR_APP) && make distclean # Nanopi R4S # arm trusted firmware for rk3399 cannot build without cortex m0 gcc crosscompiler diff --git a/src/initscripts/system/leds b/src/initscripts/system/leds index 7522ce94d..464a71043 100644 --- a/src/initscripts/system/leds +++ b/src/initscripts/system/leds @@ -144,6 +144,11 @@ case "${1}" in setup_netdev_trigger nanopi-r4s:green:wan ${RED_DEV} tx rx setup_netdev_trigger nanopi-r4s:green:lan ${GREEN_DEV} tx rx + # OrangePi R1 Plus + setup_heartbeat_trigger red:status + setup_netdev_trigger green:wan ${RED_DEV} tx rx + setup_netdev_trigger green:lan ${GREEN_DEV} tx rx + exit 0 ;; @@ -190,6 +195,12 @@ case "${1}" in disable_led_trigger nanopi-r4s:green:wan disable_led_trigger nanopi-r4s:green:lan + # OrangePi R1 Plus stop + disable_led_trigger red:status + enable_led red:status + disable_led_trigger green:wan + disable_led_trigger green:lan + exit 0 ;; diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 147405e1e..272fbe482 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -71,6 +71,14 @@ case "${1}" in echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt ;; + Xunlong\ Orange\ Pi\ R1\ Plus* ) + # Generate MAC address at first boot + # This board should have mac addresses in rom but uboot + # doesnt set it for fist nic + SWMAC=`printf "%1x2:%02x:%02x:%02x:%02x" $[RANDOM%16] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]` + echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt + echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt + ;; esac 2>/dev/null if [ -e /boot/grub/grub.cfg ]; then diff --git a/src/patches/u-boot/rockchip/add_nanopi-r2c.patch b/src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch similarity index 52% rename from src/patches/u-boot/rockchip/add_nanopi-r2c.patch rename to src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch index 9e330041f..99712be03 100644 --- a/src/patches/u-boot/rockchip/add_nanopi-r2c.patch +++ b/src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch @@ -1,14 +1,16 @@ diff -Naur u-boot-2022.10.org/arch/arm/dts/Makefile u-boot-2022.10/arch/arm/dts/Makefile --- u-boot-2022.10.org/arch/arm/dts/Makefile 2022-10-03 19:25:32.000000000 +0000 -+++ u-boot-2022.10/arch/arm/dts/Makefile 2023-04-22 15:02:25.945603949 +0000 -@@ -124,6 +124,7 @@ ++++ u-boot-2022.10/arch/arm/dts/Makefile 2023-04-27 16:16:35.697116372 +0000 +@@ -124,7 +124,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3328) += \ rk3328-evb.dtb \ + rk3328-nanopi-r2c.dtb \ rk3328-nanopi-r2s.dtb \ ++ rk3328-orangepi-r1-plus-lts.dtb \ rk3328-roc-cc.dtb \ rk3328-rock64.dtb \ + rk3328-rock-pi-e.dtb diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi u-boot-2022.10/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi --- u-boot-2022.10.org/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2022.10/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi 2023-04-22 15:07:54.544953841 +0000 @@ -51,6 +53,32 @@ diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-nanopi-r2c.dts u-boot-2022.10/ + vqmmc-supply = <&vcc18_emmc>; + status = "okay"; +}; +diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi +--- u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi 2023-04-27 16:12:50.320850145 +0000 +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ */ ++ ++#include "rk3328-nanopi-r2s-u-boot.dtsi" ++#include "rk3328-sdram-lpddr3-666.dtsi" +diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts +--- u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts 2023-04-27 16:14:56.582755127 +0000 +@@ -0,0 +1,12 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ */ ++ ++/dts-v1/; ++#include "rk3328-nanopi-r2s.dts" ++ ++/ { ++ model = "Xunlong Orange Pi R1 Plus"; ++ compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328"; ++}; ++ diff -Naur u-boot-2022.10.org/configs/nanopi-r2c-rk3328_defconfig u-boot-2022.10/configs/nanopi-r2c-rk3328_defconfig --- u-boot-2022.10.org/configs/nanopi-r2c-rk3328_defconfig 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2022.10/configs/nanopi-r2c-rk3328_defconfig 2023-04-22 15:09:20.843584447 +0000 @@ -167,3 +195,119 @@ diff -Naur u-boot-2022.10.org/configs/nanopi-r2c-rk3328_defconfig u-boot-2022.10 +CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y +diff -Naur u-boot-2022.10.org/configs/orangepi-r1-plus-lts-rk3328_defconfig u-boot-2022.10/configs/orangepi-r1-plus-lts-rk3328_defconfig +--- u-boot-2022.10.org/configs/orangepi-r1-plus-lts-rk3328_defconfig 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2022.10/configs/orangepi-r1-plus-lts-rk3328_defconfig 2023-04-27 16:19:41.122065498 +0000 +@@ -0,0 +1,112 @@ ++CONFIG_ARM=y ++CONFIG_SKIP_LOWLEVEL_INIT=y ++CONFIG_COUNTER_FREQUENCY=24000000 ++CONFIG_ARCH_ROCKCHIP=y ++CONFIG_SYS_TEXT_BASE=0x00200000 ++CONFIG_SPL_GPIO=y ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_OFFSET=0x3F8000 ++CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus-lts" ++CONFIG_ROCKCHIP_RK3328=y ++CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y ++CONFIG_TPL_LIBCOMMON_SUPPORT=y ++CONFIG_TPL_LIBGENERIC_SUPPORT=y ++CONFIG_SPL_DRIVERS_MISC=y ++CONFIG_SPL_STACK_R_ADDR=0x600000 ++CONFIG_DEBUG_UART_BASE=0xFF130000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_SYS_LOAD_ADDR=0x800800 ++CONFIG_DEBUG_UART=y ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 ++CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 ++# CONFIG_ANDROID_BOOT_IMAGE is not set ++CONFIG_FIT=y ++CONFIG_FIT_VERBOSE=y ++CONFIG_SPL_LOAD_FIT=y ++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb" ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_DISPLAY_BOARDINFO_LATE=y ++CONFIG_MISC_INIT_R=y ++CONFIG_SPL_MAX_SIZE=0x40000 ++CONFIG_SPL_PAD_TO=0x7f8000 ++CONFIG_SPL_HAS_BSS_LINKER_SECTION=y ++CONFIG_SPL_BSS_START_ADDR=0x2000000 ++CONFIG_SPL_BSS_MAX_SIZE=0x2000 ++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set ++# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set ++CONFIG_SPL_STACK=0x400000 ++CONFIG_SPL_STACK_R=y ++CONFIG_SPL_I2C=y ++CONFIG_SPL_POWER=y ++CONFIG_SPL_ATF=y ++CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y ++CONFIG_TPL_SYS_MALLOC_SIMPLE=y ++CONFIG_CMD_BOOTZ=y ++CONFIG_CMD_GPT=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_USB=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_TIME=y ++CONFIG_SPL_OF_CONTROL=y ++CONFIG_TPL_OF_CONTROL=y ++CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" ++CONFIG_TPL_OF_PLATDATA=y ++CONFIG_ENV_IS_IN_MMC=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SYS_MMC_ENV_DEV=1 ++CONFIG_NET_RANDOM_ETHADDR=y ++CONFIG_TPL_DM=y ++CONFIG_REGMAP=y ++CONFIG_SPL_REGMAP=y ++CONFIG_TPL_REGMAP=y ++CONFIG_SYSCON=y ++CONFIG_SPL_SYSCON=y ++CONFIG_TPL_SYSCON=y ++CONFIG_CLK=y ++CONFIG_SPL_CLK=y ++CONFIG_FASTBOOT_BUF_ADDR=0x800800 ++CONFIG_FASTBOOT_CMD_OEM_FORMAT=y ++CONFIG_ROCKCHIP_GPIO=y ++CONFIG_SYS_I2C_ROCKCHIP=y ++CONFIG_MMC_DW=y ++CONFIG_MMC_DW_ROCKCHIP=y ++CONFIG_SF_DEFAULT_SPEED=20000000 ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_GMAC_ROCKCHIP=y ++CONFIG_PINCTRL=y ++CONFIG_SPL_PINCTRL=y ++CONFIG_DM_PMIC=y ++CONFIG_PMIC_RK8XX=y ++CONFIG_SPL_PMIC_RK8XX=y ++CONFIG_SPL_DM_REGULATOR=y ++CONFIG_REGULATOR_PWM=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_SPL_DM_REGULATOR_FIXED=y ++CONFIG_REGULATOR_RK8XX=y ++CONFIG_PWM_ROCKCHIP=y ++CONFIG_RAM=y ++CONFIG_SPL_RAM=y ++CONFIG_TPL_RAM=y ++CONFIG_DM_RESET=y ++CONFIG_BAUDRATE=1500000 ++CONFIG_DEBUG_UART_SHIFT=2 ++CONFIG_SYSINFO=y ++CONFIG_SYSRESET=y ++# CONFIG_TPL_SYSRESET is not set ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_GENERIC=y ++CONFIG_USB_OHCI_HCD=y ++CONFIG_USB_OHCI_GENERIC=y ++CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1 ++CONFIG_USB_DWC2=y ++CONFIG_USB_DWC3=y ++# CONFIG_USB_DWC3_GADGET is not set ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_SPL_TINY_MEMSET=y ++CONFIG_TPL_TINY_MEMSET=y ++CONFIG_ERRNO_STR=y hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2023