Development December 2022

development@lists.ipfire.org

8 participants
53 discussions

[PATCH 01/29] libgudev: New package
by Michael Tremer 20 Dec '22

20 Dec '22

This is required for libqmi. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/rootfiles/common/libgudev | 13 ++++++ lfs/libgudev | 80 ++++++++++++++++++++++++++++++++ make.sh | 3 +- 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/common/libgudev create mode 100644 lfs/libgudev diff --git a/config/rootfiles/common/libgudev b/config/rootfiles/common/libgudev new file mode 100644 index 000000000..2caf7f2c8 --- /dev/null +++ b/config/rootfiles/common/libgudev @@ -0,0 +1,13 @@ +#usr/include/gudev-1.0 +#usr/include/gudev-1.0/gudev +#usr/include/gudev-1.0/gudev/gudev.h +#usr/include/gudev-1.0/gudev/gudevclient.h +#usr/include/gudev-1.0/gudev/gudevdevice.h +#usr/include/gudev-1.0/gudev/gudevenumerator.h +#usr/include/gudev-1.0/gudev/gudevenums.h +#usr/include/gudev-1.0/gudev/gudevenumtypes.h +#usr/include/gudev-1.0/gudev/gudevtypes.h +#usr/lib/libgudev-1.0.so +usr/lib/libgudev-1.0.so.0 +usr/lib/libgudev-1.0.so.0.3.0 +#usr/lib/pkgconfig/gudev-1.0.pc diff --git a/lfs/libgudev b/lfs/libgudev new file mode 100644 index 000000000..bf0fec9b8 --- /dev/null +++ b/lfs/libgudev @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 237 + +THISAPP = libgudev-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 5d39d4d26d8c8b3fa877319c294036294dbda96b340d2d04d7a35449d91b58de876b96b5e3d9423cdf3e1d3e2a94f5a861b1ac1e74a610637e0fc66248c68309 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && meson --prefix=/usr \ + --sysconfdir=/etc \ + --buildtype=release \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 413d04491..366596fc2 100755 --- a/make.sh +++ b/make.sh @@ -1176,6 +1176,8 @@ buildipfire() { lfsmake2 xradio KCFG="" lfsmake2 linux-initrd KCFG="" + lfsmake2 glib + lfsmake2 libgudev lfsmake2 libgpg-error lfsmake2 libgcrypt lfsmake2 libassuan @@ -1421,7 +1423,6 @@ buildipfire() { lfsmake2 python3-inotify lfsmake2 python3-docutils lfsmake2 python3-daemon - lfsmake2 glib lfsmake2 ntp lfsmake2 openssh lfsmake2 fontconfig -- 2.30.2

2 32

[PATCH v2] general-functions.pl: Fix for bug#12937
by Adolf Belka 19 Dec '22

19 Dec '22

- The check for validwildcarddomainname did not allow wildcards of the form *.ipfire.org* which is the example given on the proxy.cgi page for excluded url's for the wpad file. - A forum user sufferred from this problem and the bug was raised for it. https://community.ipfire.org/t/proxy-cgi-error-message-when-use-wildcard-in… forum user has tested the patch change and confirmed it solves the problem. Fixes: Bug#12937 Suggested-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/cfgroot/general-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 98bedb4b9..d871025eb 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -760,7 +760,7 @@ sub validwildcarddomainname($) { my $domainname = shift; # Ignore any leading dots - if ($domainname =~ m/^\*\.(.*)/) { + if ($domainname =~ m/^\*\.([^\*]*)\*?/) { $domainname = $1; } -- 2.39.0

2 1

[PATCH] libconfig: Update to 1.7.3
by Matthias Fischer 19 Dec '22

19 Dec '22

...it just came my way... For details see: https://github.com/hyperrealm/libconfig/releases/tag/v1.7.3 This release includes some bugfixes and enhancements. Fixed a memory access violation bug in config_clear() Various fixes to CMake and Visual Studio build files Added a Setting::isString() method Fixed a bug in config_setting_lookup() where the setting itself (instead of NULL) would be returned if the path was not found. Renamed all remaining internal methods that lacked a 'libconfig_' prefix. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/libconfig | 4 ++-- lfs/libconfig | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/libconfig b/config/rootfiles/common/libconfig index 633e1baf9..6c1e245ca 100644 --- a/config/rootfiles/common/libconfig +++ b/config/rootfiles/common/libconfig @@ -9,12 +9,12 @@ #usr/lib/libconfig++.la #usr/lib/libconfig++.so usr/lib/libconfig++.so.11 -usr/lib/libconfig++.so.11.0.2 +usr/lib/libconfig++.so.11.1.0 #usr/lib/libconfig.a #usr/lib/libconfig.la #usr/lib/libconfig.so usr/lib/libconfig.so.11 -usr/lib/libconfig.so.11.0.2 +usr/lib/libconfig.so.11.1.0 #usr/lib/pkgconfig/libconfig++.pc #usr/lib/pkgconfig/libconfig.pc #usr/share/info/libconfig.info diff --git a/lfs/libconfig b/lfs/libconfig index 58dbd8bff..4a34a878e 100644 --- a/lfs/libconfig +++ b/lfs/libconfig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.7.2 +VER = 1.7.3 THISAPP = libconfig-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c +$(DL_FILE)_BLAKE2 = 05d43022a937ed5ba35120170eca506051310cd7386b0a6a6c2f30186a079a02803c3d7ecb8dd49b50b5a706b282704605c250a306ada76b5241788eb1c575e6 install : $(TARGET) -- 2.34.1

2 1

[PATCH] backup(.pl): Replace OpenVPN DH parameter with ffdhe4096
by Peter Müller 17 Dec '22

17 Dec '22

This ensures restoring a backup won't silently bring back an insecure Diffie-Hellman parameter (which could also not be inspected through the web interface anymore). Reported-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/backup/backup.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 6fd9e45bb..520d9315d 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -187,6 +187,15 @@ restore_backup() { # Update OpenVPN CRL /etc/fcron.daily/openvpn-crl-updater + # Replace previously used OpenVPN Diffie-Hellman parameter by ffdhe4096 + if [ -f /var/ipfire/ovpn/server.conf ]; then + sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/server.conf + fi + + if [ -f "/var/ipfire/ovpn/n2nconf/*/*.conf" ]; then + sed -i 's|/var/ipfire/ovpn/ca/dh1024.pem|/etc/ssl/ffdhe4096.pem|' /var/ipfire/ovpn/n2nconf/*/*.conf + fi + return 0 } -- 2.35.3

2 5

[PATCH 1/2] libtool: Update to version 2.4.7
by Adolf Belka 09 Dec '22

09 Dec '22

- Update from version 2.4.6 (Feb 2015) to 2.4.7 (Mar 2022) - Update of rootfile - The shebang in the libtoolize script has changed from ! /bin/sh to ! /usr/bin/env sh because apparently the previous version presented challenges for containerised environments. For IPFire build it meant that using libtoolize in the build of libxcrypt failed because it could not deal with the changed shebang. - Patch created to change the shebang for libtoolize.in back to the version in 2.4.6 and earlier. - The change of libtoolize.in then caused the libtool build to try and rebuild the man page for it but this fails as help2man is required for this. There is no option in the configure to not build the docs so hence there is an associated patch with this one that build help2man but the rootfile is completely commented out as it is only required for the build - Added --disable-static to the configure options - Changelog Noteworthy changes in release 2.4.7 (2022-03-16) [stable] New features: - Libtool script now supports (configure-time and runtime) ARFLAGS variable, which obsoletes AR_FLAGS. This is due to naming conventions among other *FLAGS and to be consistent with Automake's ARFLAGS. - Gnulib testsuite is enabled and run during 'make check'. - Support the Windows version of the Intel C Compiler (icl) in libtool script. - Pass '-fsanitize=*' flags for GCC and LLVM, and '-specs=*' for GCC to linker. - Pass '-Xassembler=*' and '-Wa,*' flag to compilers and linkers. - The variable 'FILECMD' with default value of '/usr/bin/file' was used to replace existing hard coded references to '/usr/bin/file'. - Add MidnightBSD support. Important incompatible changes: - Libtool changed ARFLAGS/AR_FLAGS default from 'cru' to 'cr'. - Do not pass '-pthread' to Solaris linker. - 'libtool' and 'libtoolize' scripts now use '#! /usr/bin/env sh' shebang. Previously '#! /bin/sh' was used, which presents challenges for containerized environments. Bug fixes: - Fix significant slowdown of libtoolize for certain projects (regression introduced in 2.4.3 release) caused by infinite m4 macro recursion. - Mitigate the slowdown of libtool script (introduced in v2.4.3) caused by increased number of calls to '$SED $sed_quote_subst' (bug#20006). - Properly parse and export TLS symbols on AIX. - Various bug fixes surrounding use of 'sed'. - Darwin systems set proper "allow undefined" flag on OSX 11, and PowerPC 10.5. - Removed some deprecated tests related to 'Makefile.inc' files. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libtool | 77 ++++--------------- lfs/libtool | 8 +- ...-2.4.7-correct-libtoolize.in-shebang.patch | 8 ++ 3 files changed, 28 insertions(+), 65 deletions(-) create mode 100644 src/patches/libtool-2.4.7-correct-libtoolize.in-shebang.patch diff --git a/config/rootfiles/common/libtool b/config/rootfiles/common/libtool index 23753c79e..86ffb7fba 100644 --- a/config/rootfiles/common/libtool +++ b/config/rootfiles/common/libtool @@ -5,12 +5,10 @@ #usr/include/libltdl/lt_error.h #usr/include/libltdl/lt_system.h #usr/include/ltdl.h -#usr/lib/libltdl.a #usr/lib/libltdl.la -usr/lib/libltdl.so +#usr/lib/libltdl.so usr/lib/libltdl.so.7 -usr/lib/libltdl.so.7.3.1 -#usr/share/aclocal/argz.m4 +usr/lib/libltdl.so.7.3.2 #usr/share/aclocal/libtool.m4 #usr/share/aclocal/ltargz.m4 #usr/share/aclocal/ltdl.m4 @@ -22,24 +20,11 @@ usr/lib/libltdl.so.7.3.1 #usr/share/info/libtool.info-1 #usr/share/info/libtool.info-2 #usr/share/libtool -#usr/share/libtool/config-h.in -#usr/share/libtool/configure -#usr/share/libtool/configure.ac #usr/share/libtool/COPYING.LIB #usr/share/libtool/Makefile.am #usr/share/libtool/Makefile.in #usr/share/libtool/README #usr/share/libtool/aclocal.m4 -#usr/share/libtool/lt__alloc.c -#usr/share/libtool/lt__argz.c -#usr/share/libtool/lt__dirent.c -#usr/share/libtool/lt__strl.c -#usr/share/libtool/lt_dlloader.c -#usr/share/libtool/lt_error.c -#usr/share/libtool/ltdl.c -#usr/share/libtool/ltdl.h -#usr/share/libtool/ltdl.mk -#usr/share/libtool/slist.c #usr/share/libtool/build-aux #usr/share/libtool/build-aux/compile #usr/share/libtool/build-aux/config.guess @@ -48,34 +33,10 @@ usr/lib/libltdl.so.7.3.1 #usr/share/libtool/build-aux/install-sh #usr/share/libtool/build-aux/ltmain.sh #usr/share/libtool/build-aux/missing -#usr/share/libtool/config -#usr/share/libtool/config/compile -#usr/share/libtool/config/config.guess -#usr/share/libtool/config/config.sub -#usr/share/libtool/config/depcomp -#usr/share/libtool/config/install-sh -#usr/share/libtool/config/ltmain.sh -#usr/share/libtool/config/missing +#usr/share/libtool/config-h.in +#usr/share/libtool/configure +#usr/share/libtool/configure.ac #usr/share/libtool/libltdl -#usr/share/libtool/libltdl/COPYING.LIB -#usr/share/libtool/libltdl/Makefile.am -#usr/share/libtool/libltdl/Makefile.in -#usr/share/libtool/libltdl/Makefile.inc -#usr/share/libtool/libltdl/README -#usr/share/libtool/libltdl/aclocal.m4 -#usr/share/libtool/libltdl/argz.c -#usr/share/libtool/libltdl/argz_.h -#usr/share/libtool/libltdl/config-h.in -#usr/share/libtool/libltdl/configure -#usr/share/libtool/libltdl/configure.ac -#usr/share/libtool/libltdl/lt__alloc.c -#usr/share/libtool/libltdl/lt__dirent.c -#usr/share/libtool/libltdl/lt__strl.c -#usr/share/libtool/libltdl/lt_dlloader.c -#usr/share/libtool/libltdl/lt_error.c -#usr/share/libtool/libltdl/ltdl.c -#usr/share/libtool/libltdl/ltdl.h -#usr/share/libtool/libltdl/slist.c #usr/share/libtool/libltdl/lt__alloc.h #usr/share/libtool/libltdl/lt__argz_.h #usr/share/libtool/libltdl/lt__dirent.h @@ -86,24 +47,6 @@ usr/lib/libltdl.so.7.3.1 #usr/share/libtool/libltdl/lt_error.h #usr/share/libtool/libltdl/lt_system.h #usr/share/libtool/libltdl/slist.h -#usr/share/libtool/libltdl/libltdl -#usr/share/libtool/libltdl/libltdl/lt__alloc.h -#usr/share/libtool/libltdl/libltdl/lt__dirent.h -#usr/share/libtool/libltdl/libltdl/lt__glibc.h -#usr/share/libtool/libltdl/libltdl/lt__private.h -#usr/share/libtool/libltdl/libltdl/lt__strl.h -#usr/share/libtool/libltdl/libltdl/lt_dlloader.h -#usr/share/libtool/libltdl/libltdl/lt_error.h -#usr/share/libtool/libltdl/libltdl/lt_system.h -#usr/share/libtool/libltdl/libltdl/slist.h -#usr/share/libtool/libltdl/loaders -#usr/share/libtool/libltdl/loaders/dld_link.c -#usr/share/libtool/libltdl/loaders/dlopen.c -#usr/share/libtool/libltdl/loaders/dyld.c -#usr/share/libtool/libltdl/loaders/load_add_on.c -#usr/share/libtool/libltdl/loaders/loadlibrary.c -#usr/share/libtool/libltdl/loaders/preopen.c -#usr/share/libtool/libltdl/loaders/shl_load.c #usr/share/libtool/loaders #usr/share/libtool/loaders/dld_link.c #usr/share/libtool/loaders/dlopen.c @@ -112,5 +55,15 @@ usr/lib/libltdl.so.7.3.1 #usr/share/libtool/loaders/loadlibrary.c #usr/share/libtool/loaders/preopen.c #usr/share/libtool/loaders/shl_load.c +#usr/share/libtool/lt__alloc.c +#usr/share/libtool/lt__argz.c +#usr/share/libtool/lt__dirent.c +#usr/share/libtool/lt__strl.c +#usr/share/libtool/lt_dlloader.c +#usr/share/libtool/lt_error.c +#usr/share/libtool/ltdl.c +#usr/share/libtool/ltdl.h +#usr/share/libtool/ltdl.mk +#usr/share/libtool/slist.c #usr/share/man/man1/libtool.1 #usr/share/man/man1/libtoolize.1 diff --git a/lfs/libtool b/lfs/libtool index 1192a9772..014d54028 100644 --- a/lfs/libtool +++ b/lfs/libtool @@ -24,7 +24,7 @@ include Config -VER = 2.4.6 +VER = 2.4.7 THISAPP = libtool-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 +$(DL_FILE)_BLAKE2 = 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 install : $(TARGET) @@ -75,9 +75,11 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libtool-2.4.7-correct-libtoolize.in-shebang.patch $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure \ - --prefix=/usr + --prefix=/usr \ + --disable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/src/patches/libtool-2.4.7-correct-libtoolize.in-shebang.patch b/src/patches/libtool-2.4.7-correct-libtoolize.in-shebang.patch new file mode 100644 index 000000000..6a79bc623 --- /dev/null +++ b/src/patches/libtool-2.4.7-correct-libtoolize.in-shebang.patch @@ -0,0 +1,8 @@ +--- libtool-2.4.7/libtoolize.in.orig 2022-03-17 03:43:39.000000000 +0100 ++++ libtool-2.4.7/libtoolize.in 2022-12-08 18:12:36.134198672 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env sh ++#! /bin/sh + + # Prepare a package to use libtool. + # Written by Gary V. Vaughan <gary(a)gnu.org>, 2003 -- 2.38.1

1 1

[PATCH] pcre2: Update to 10.41
by Matthias Fischer 08 Dec '22

08 Dec '22

...it just came my way... "Mainly bug fixes and tidies;..." Excerpt from changelog: "Version 10.41 06-December-2022 ------------------------------ 1. Add fflush() before and after a fork callout in pcre2grep to get its output to be the same on all systems. (There were previously ordering differences in Alpine Linux). 2. Merged patch from @carenas (GitHub #110) for pthreads support in CMake. 3. SSF scorecards grumbled about possible overflow in an expression in pcre2test. It never would have overflowed in practice, but some casts have been added and at the some time there's been some tidying of fprints that output size_t values. 4. PR #94 showed up an unused enum in pcre2_convert.c, which is now removed. 5. Minor code re-arrangement to remove gcc warning about realloc() in pcre2test. 6. Change a number of int variables that hold buffer and line lengths in pcre2grep to PCRE2_SIZE (aka size_t). 7. Added an #ifdef to cut out a call to PRIV(jit_free) when JIT is not supported (even though that function would do nothing in that case) at the request of a user who doesn't even want to link with pcre_jit_compile.o. Also tidied up an untidy #ifdef arrangement in pcre2test. 8. Fixed an issue in the backtracking optimization of character repeats in JIT. Furthermore optimize star repetitions, not just plus repetitions. 9. Removed the use of an initial backtracking frames vector on the system stack in pcre2_match() so that it now always uses the heap. (In a multi-thread environment with very small stacks there had been an issue.) This also is tidier for JIT matching, which didn't need that vector. The heap vector is now remembered in the match data block and re-used if that block itself is re-used. It is freed with the match data block. 10. Adjusted the find_limits code in pcre2test to work with change 9 above. 11. Added find_limits_noheap to pcre2test, because the heap limits are now different in different environments and so cannot be included in the standard tests. 12. Created a test for pcre2_match() heap processing that is not part of the tests run by 'make check', but can be run manually. The current output is from a 64-bit system. 13. Implemented -Z aka --null in pcre2grep. 14. A minor change to pcre2test and the addition of several new pcre2grep tests have improved LCOV coverage statistics. At the same time, code in pcre2grep and elsewhere that can never be obeyed in normal testing has been excluded from coverage. 15. Fixed a bug in pcre2grep that could cause an extra newline to be written after output generaed by --output. 16. If a file has a .bz2 extension but is not in fact compressed, pcre2grep should process it as a plain text file. A bug stopped this happening; now fixed and added to the tests. 17. When pcre2grep was running not in UTF mode, if a string specified by --output or obtained from a callout in a pattern contained a character (byte) greater than 127, it was incorrectly output in UTF-8 format. 18. Added some casts after warnings from Clang sanitize. 19. Merged patch from cbouc (GitHub #139): 4 function prototypes were missing PCRE2_CALL_CONVENTION in src/pcre2posix.h. All function prototypes returning pointers had out of place PCRE2_CALL_CONVENTION in src/pcre2.h.*. These produced errors when building for Windows with #define PCRE2_CALL_CONVENTION __stdcall. 20. A negative repeat value in a pcre2test subject line was not being diagnosed, leading to infinite looping. 21. Updated RunGrepTest to discard the warning that Bash now gives when setting LC_CTYPE to a bad value (because older versions didn't). 22. Updated pcre2grep so that it behaves like GNU grep when matching more than one pattern and a later pattern matches at an earlier point in the subject when the matched substrings are being identified by colour or by offsets. 23. Updated the PrepareRelease script so that the man page that it makes for the pcre2demo demonstration program is more standard and does not cause errors when processed by lexgrog or mandb -c (GitHub issue #160). 24. The JIT compiler was updated." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/pcre2 | 226 +++++++++++++++++----------------- lfs/pcre2 | 6 +- 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/config/rootfiles/common/pcre2 b/config/rootfiles/common/pcre2 index 716f23661..c6e0f8154 100644 --- a/config/rootfiles/common/pcre2 +++ b/config/rootfiles/common/pcre2 @@ -6,132 +6,132 @@ #usr/lib/libpcre2-16.la #usr/lib/libpcre2-16.so usr/lib/libpcre2-16.so.0 -usr/lib/libpcre2-16.so.0.11.0 +usr/lib/libpcre2-16.so.0.11.1 #usr/lib/libpcre2-32.la #usr/lib/libpcre2-32.so usr/lib/libpcre2-32.so.0 -usr/lib/libpcre2-32.so.0.11.0 +usr/lib/libpcre2-32.so.0.11.1 #usr/lib/libpcre2-8.la #usr/lib/libpcre2-8.so usr/lib/libpcre2-8.so.0 -usr/lib/libpcre2-8.so.0.11.0 +usr/lib/libpcre2-8.so.0.11.1 #usr/lib/libpcre2-posix.la #usr/lib/libpcre2-posix.so usr/lib/libpcre2-posix.so.3 -usr/lib/libpcre2-posix.so.3.0.2 +usr/lib/libpcre2-posix.so.3.0.3 #usr/lib/pkgconfig/libpcre2-16.pc #usr/lib/pkgconfig/libpcre2-32.pc #usr/lib/pkgconfig/libpcre2-8.pc #usr/lib/pkgconfig/libpcre2-posix.pc -#usr/share/doc/pcre-pcre2-10.40 -#usr/share/doc/pcre-pcre2-10.40/AUTHORS -#usr/share/doc/pcre-pcre2-10.40/COPYING -#usr/share/doc/pcre-pcre2-10.40/ChangeLog -#usr/share/doc/pcre-pcre2-10.40/LICENCE -#usr/share/doc/pcre-pcre2-10.40/NEWS -#usr/share/doc/pcre-pcre2-10.40/README -#usr/share/doc/pcre-pcre2-10.40/html -#usr/share/doc/pcre-pcre2-10.40/html/NON-AUTOTOOLS-BUILD.txt -#usr/share/doc/pcre-pcre2-10.40/html/README.txt -#usr/share/doc/pcre-pcre2-10.40/html/index.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2-config.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_callout_enumerate.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_copy.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_copy_with_tables.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_code_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_copy.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_create.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_compile_context_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_config.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_copy.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_create.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_convert_context_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_converted_pattern_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_dfa_match.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_copy.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_create.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_general_context_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_error_message.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_mark.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_match_data_size.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_ovector_count.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_ovector_pointer.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_get_startchar.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_compile.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_free_unused_memory.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_match.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_assign.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_create.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_jit_stack_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_maketables.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_maketables_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_copy.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_create.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_context_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_create.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_create_from_pattern.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_match_data_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_pattern_convert.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_pattern_info.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_decode.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_encode.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_serialize_get_number_of_codes.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_bsr.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_callout.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_character_tables.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_compile_extra_options.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_compile_recursion_guard.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_depth_limit.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_glob_escape.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_glob_separator.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_heap_limit.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_match_limit.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_max_pattern_length.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_newline.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_offset_limit.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_parens_nest_limit.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_recursion_limit.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_recursion_memory_management.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_set_substitute_callout.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substitute.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_copy_byname.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_copy_bynumber.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_get_byname.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_get_bynumber.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_length_byname.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_length_bynumber.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_list_free.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_list_get.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_nametable_scan.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2_substring_number_from_name.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2api.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2build.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2callout.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2compat.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2convert.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2demo.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2grep.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2jit.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2limits.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2matching.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2partial.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2pattern.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2perform.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2posix.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2sample.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2serialize.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2syntax.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2test.html -#usr/share/doc/pcre-pcre2-10.40/html/pcre2unicode.html -#usr/share/doc/pcre-pcre2-10.40/pcre2-config.txt -#usr/share/doc/pcre-pcre2-10.40/pcre2.txt -#usr/share/doc/pcre-pcre2-10.40/pcre2grep.txt -#usr/share/doc/pcre-pcre2-10.40/pcre2test.txt +#usr/share/doc/pcre-pcre2-10.41 +#usr/share/doc/pcre-pcre2-10.41/AUTHORS +#usr/share/doc/pcre-pcre2-10.41/COPYING +#usr/share/doc/pcre-pcre2-10.41/ChangeLog +#usr/share/doc/pcre-pcre2-10.41/LICENCE +#usr/share/doc/pcre-pcre2-10.41/NEWS +#usr/share/doc/pcre-pcre2-10.41/README +#usr/share/doc/pcre-pcre2-10.41/html +#usr/share/doc/pcre-pcre2-10.41/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre-pcre2-10.41/html/README.txt +#usr/share/doc/pcre-pcre2-10.41/html/index.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2-config.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_callout_enumerate.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_code_copy.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_code_copy_with_tables.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_code_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_compile.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_compile_context_copy.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_compile_context_create.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_compile_context_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_config.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_convert_context_copy.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_convert_context_create.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_convert_context_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_converted_pattern_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_dfa_match.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_general_context_copy.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_general_context_create.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_general_context_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_get_error_message.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_get_mark.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_get_match_data_size.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_get_ovector_count.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_get_ovector_pointer.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_get_startchar.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_jit_compile.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_jit_free_unused_memory.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_jit_match.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_jit_stack_assign.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_jit_stack_create.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_jit_stack_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_maketables.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_maketables_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_match.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_match_context_copy.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_match_context_create.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_match_context_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_match_data_create.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_match_data_create_from_pattern.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_match_data_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_pattern_convert.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_pattern_info.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_serialize_decode.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_serialize_encode.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_serialize_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_serialize_get_number_of_codes.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_bsr.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_callout.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_character_tables.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_compile_extra_options.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_compile_recursion_guard.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_depth_limit.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_glob_escape.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_glob_separator.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_heap_limit.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_match_limit.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_max_pattern_length.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_newline.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_offset_limit.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_parens_nest_limit.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_recursion_limit.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_recursion_memory_management.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_set_substitute_callout.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substitute.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_copy_byname.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_copy_bynumber.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_get_byname.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_get_bynumber.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_length_byname.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_length_bynumber.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_list_free.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_list_get.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_nametable_scan.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2_substring_number_from_name.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2api.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2build.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2callout.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2compat.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2convert.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2demo.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2grep.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2jit.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2limits.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2matching.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2partial.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2pattern.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2perform.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2posix.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2sample.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2serialize.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2syntax.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2test.html +#usr/share/doc/pcre-pcre2-10.41/html/pcre2unicode.html +#usr/share/doc/pcre-pcre2-10.41/pcre2-config.txt +#usr/share/doc/pcre-pcre2-10.41/pcre2.txt +#usr/share/doc/pcre-pcre2-10.41/pcre2grep.txt +#usr/share/doc/pcre-pcre2-10.41/pcre2test.txt #usr/share/man/man1/pcre2-config.1 #usr/share/man/man1/pcre2grep.1 #usr/share/man/man1/pcre2test.1 diff --git a/lfs/pcre2 b/lfs/pcre2 index b57af0971..0bc6ca2c6 100644 --- a/lfs/pcre2 +++ b/lfs/pcre2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 10.40 +VER = 10.41 THISAPP = pcre2-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -54,7 +54,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 627a204585b92238eda81b4befc88757a81d75b0d9fa26ea6d51afcdd93f7e2d102a2245bf3c8e1f5f9ddf69a316c419c948b741a64442bb567480015543e49b +$(DL_FILE)_BLAKE2 = 4335eae8e8a327c32092a1a9f8214fa86a2d016deb7450938c4ddc38214b72dfa8c6f9c85a03bb36b3686390d378d74fdd991563f92611c42a54915310604559 install : $(TARGET) -- 2.34.1

1 0

[PATCH 1/3] openvpn-authenticator: Avoid infinite loop when losing socket connection
by Michael Tremer 07 Dec '22

07 Dec '22

This patch will gracefully terminate the daemon when it loses its connection to the OpenVPN daemon. Fixes: #12963 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- config/ovpn/openvpn-authenticator | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/config/ovpn/openvpn-authenticator b/config/ovpn/openvpn-authenticator index 65844012b..5d9348d7e 100644 --- a/config/ovpn/openvpn-authenticator +++ b/config/ovpn/openvpn-authenticator @@ -116,11 +116,16 @@ class OpenVPNAuthenticator(object): log.info("OpenVPN Authenticator started") - while True: - line = self._read_line() + try: + while True: + line = self._read_line() - if line.startswith(">CLIENT"): - self._client_event(line) + if line.startswith(">CLIENT"): + self._client_event(line) + + # Terminate the daemon when it loses its connection to the OpenVPN daemon + except ConnectionResetError as e: + log.error("Connection to OpenVPN has been lost: %s" % e) log.info("OpenVPN Authenticator terminated") @@ -269,7 +274,7 @@ class OpenVPNAuthenticator(object): @staticmethod def _b64decode(s): return base64.b64decode(s.encode()).decode() - + @staticmethod def _escape(s): return s.replace(" ", "\ ") -- 2.30.2

2 5

[PATCH] shared-mime-info: New package.
by Stefan Schantl 05 Dec '22

05 Dec '22

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- shared-mime-info/shared-mime-info.nm | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 shared-mime-info/shared-mime-info.nm diff --git a/shared-mime-info/shared-mime-info.nm b/shared-mime-info/shared-mime-info.nm new file mode 100644 index 000000000..580d35a6b --- /dev/null +++ b/shared-mime-info/shared-mime-info.nm @@ -0,0 +1,59 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = shared-mime-info +version = 2.2 +release = 1 + +url = http://freedesktop.org/Software/shared-mime-info +license = GPLv2+ +summary = Shared MIME information database + +description + This is the freedesktop.org shared MIME info database. + + Many programs and desktops use the MIME system to represent the types of + files. Frequently, it is necessary to work out the correct MIME type for + a file. This is generally done by examining the file's name or contents, + and looking up the correct MIME type in a database. +end + +source_dl = https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version}/ + +build + requires + glib2-devel + libxml2-devel + meson >= 0.55.3 + end + + build + %{meson} \ + -Dupdate-mimedb=true + + %{meson_build} + + end + + install + %{meson_install} + end +end + +packages + package %{name} + script postin + update-mime-database -n %{datadir}/mime &> /dev/null ||: + end + + script postup + update-mime-database -n %{datadir}/mime &> /dev/null ||: + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end -- 2.30.2

1 0

[PATCH] gdk-pixbuf2: Update to 2.42.10
by Stefan Schantl 05 Dec '22

05 Dec '22

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- gdk-pixbuf2/gdk-pixbuf2.nm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm index 7c39db0de..93aad711a 100644 --- a/gdk-pixbuf2/gdk-pixbuf2.nm +++ b/gdk-pixbuf2/gdk-pixbuf2.nm @@ -5,9 +5,9 @@ name = gdk-pixbuf2 version = %{ver_major}.%{ver_minor} -ver_major = 2.33 -ver_minor = 2 -release = 3 +ver_major = 2.42 +ver_minor = 10 +release = 1 groups = System/Libraries url = http://www.gtk.org/ @@ -29,19 +29,28 @@ build glib2-devel >= 2.37.6 gobject-introspection-devel >= 0.9.3 libpng-devel - libjpeg-devel - libtiff-devel + libjpeg-devel >= 2.1.4 + libtiff-devel >= 4.4.0 + meson >= 0.55.3 + shared-mime-info end export LD_LIBRARY_PATH = %{DIR_APP}/gdk-pixbuf/.libs - configure_options += \ - --without-x11 \ - --with-included-loaders=png + build + %{meson} \ + --default-library=both \ + -Dman=false \ + -Dgtk_doc=false \ + -Dinstalled_tests=false - make_install_targets += RUN_QUERY_LOADER_TEST=false + %{meson_build} + end + + + install + %{meson_install} - install_cmds touch %{BUILDROOT}%{libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache end end -- 2.30.2

1 0

[PATCH] libjpeg: Update to 2.1.4
by Stefan Schantl 05 Dec '22

05 Dec '22

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- libjpeg/libjpeg.nm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/libjpeg/libjpeg.nm b/libjpeg/libjpeg.nm index 1dea7aa92..b4d7b0eb0 100644 --- a/libjpeg/libjpeg.nm +++ b/libjpeg/libjpeg.nm @@ -4,7 +4,7 @@ ############################################################################### name = libjpeg -version = 1.4.2 +version = 2.1.4 release = 1 thisapp = libjpeg-turbo-%{version} @@ -27,18 +27,28 @@ source_dl = http://sourceforge.net/projects/libjpeg-turbo/files/%{version}/ build requires - autoconf - automake + cmake gcc-c++ - libtool nasm end - configure_options += \ - --enable-shared + # NASM object files are missing GNU Property note for Intel CET, + # force it on the resulting library + LDFLAGS +="-Wl,-z,ibt -Wl,-z,shstk" - prepare_cmds - autoreconf -vfi + export LD_LIBRARY_PATH = %{DIR_APP} + + build + %{cmake} . \ + -DCMAKE_SKIP_RPATH:BOOL=YES \ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \ + -DENABLE_STATIC:BOOL=NO + + make %{PARALLELISMFLAGS} + end + + test + make test end end -- 2.30.2

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development December 2022