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 ee5b84beabf05b6a8b2ee1edecc62ca95e2f5de6 (commit) via 71421e6c17783f9e5957482fc77ffbed37a4baa3 (commit) via 8cfce31dc5fb4a905161934fef5ab591974071a7 (commit) via 1ecccbdfca9bc198d73b004f1e16f8f577e095f0 (commit) via 5f3c1f65b7e487c3bd844a81ef12873e5fe5a420 (commit) via 861110f53b319f5059f2dcf3d839e00ae637112f (commit) via 26f53e2c2e70aa5e6adb06f53f7a2414bbe0e518 (commit) from 2d0b52b932d6738a7be84f94d84927bf82de0768 (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 ee5b84beabf05b6a8b2ee1edecc62ca95e2f5de6 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue May 14 12:39:56 2024 +0200
hyperscan: Remove from IPFire.
- hyperscan will move from BSD licence to a proprietary paid for licence from version 5.5 onwards. - hyperscan will be replaced by vectorscan, a fork of hyperscan.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 71421e6c17783f9e5957482fc77ffbed37a4baa3 Author: Adolf Belka adolf.belka@ipfire.org Date: Tue May 14 12:39:55 2024 +0200
vectorscan: Install vectorscan to replace hypersan
- It has been announced that from hyperscan-5.5 onwards the licence for this package will change from BSD tp proprietarty paid for version - This patch submission installs vectorscan whihc was created as a fork from hyperscan andf that is being maintained and has indicated it will suay Open Source - Created new lfs file - Created nbew rootfile. This looks to match the hyperscan rootfile closely - Added vector scan to the make.sh file and removed hyperscan from it.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8cfce31dc5fb4a905161934fef5ab591974071a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 14 10:04:12 2024 +0000
dnsdist: Update to 1.9.4
This release fixes CVE-2024-25581, a denial of service security issue affecting versions 1.9.0, 1.9.1, 1.9.2 and 1.9.3 only. Earlier versions are not affected.
When incoming DNS over HTTPS support is enabled using the nghttp2 provider, and queries are routed to a tcp-only or DNS over TLS backend, an attacker can trigger an assertion failure in DNSdist by sending a request for a zone transfer (AXFR or IXFR) over DNS over HTTPS, causing the process to stop and thus leading to a Denial of Service.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1ecccbdfca9bc198d73b004f1e16f8f577e095f0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 25 10:58:35 2024 +0200
core187: ship unbound
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 5f3c1f65b7e487c3bd844a81ef12873e5fe5a420 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Mon May 13 20:21:02 2024 +0200
unbound: Update to 1.20.0
For details see: https://nlnetlabs.nl/projects/unbound/download/#unbound-1-20-0
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 861110f53b319f5059f2dcf3d839e00ae637112f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 25 10:54:24 2024 +0200
core187: ship e2fsprogs
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 26f53e2c2e70aa5e6adb06f53f7a2414bbe0e518 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat May 11 13:27:23 2024 +0200
e2fsprogs: Fixes bug#13073 - Update to version 1.47.0
- Previously this patch was reverted due to Grub not being able to boot with it. This was fixed in Grub-2.12 - Confirmed on my vm testbed that a CU186 install with this e2fsprogs version was able to complete the install when the reboot button at the end of the first install stage was completed. - Update from version 1.46.5 to 1.47.0 - Update of rootfile not required - Changelog E2fsprogs 1.47.0 (February 5, 2023) Updates/Fixes since v1.46.6: UI and Features Add support for the orphan_file feature, which speeds up workloads that are deleting or truncating a large number files in parallel. This compat feature was first supported in the v5.15 Linux kernel. The mke2fs program (via the mke2fs.conf file) now enables the metadata_csum_seed and orphan_file features by default. The metadata_csum_seed feature is an incompat feature which is first supported in the Linux kernel starting in the 4.4 kernel and e2fsprogs 1.43. Mke2fs now supports the extended option "assume_storage_prezeroed" which causes mke2fs to skip zeroing the journal and inode tables and to mark the inode tables as zeroed. Add support to tune2fs and e2label to set the label and UUID for a mounted file system using a ioctl, which is more reliable than modifying the superblock via writing to the block device. The kernel support for setting the label landed in v5.17, while the support for adding the UUID landed in v6.0. If the ioctls are not supported, tune2fs and e2label will fall back old strategy of directly modifying the superblock. Allow tune2fs to disable the casefold feature after scanning all of the directories do not have the Casefold flag set. Fixes Fix a potential unbalanced mutex unlock when there is a short read while using the bounce buffer when using direct I/O. Performance, Internal Implementation, Development Support etc. Fix various Coverity and compiler warnings. Add the new function ext2fs_xattrs_read_inode() which takes an in-memory inode to avoid needing to reread an inode that was already read into memory. Teach debugfs logdump command the -n option which forces printing a specified number of transactions, even when a block missing a magic number would have stopped the logdump. (This is for debugging journalling problems.) E2fsprogs 1.46.6 (February 1, 2023) Updates/Fixes since v1.46.5: UI and Features Debugfs's ncheck command now allows the inode number to be surrounded by angle brackets, to be consistent with other debugfs commands. Debugfs no longer prints a scary message when debugfs -c (which enables "catastrophic mode") is used. This was intended to allow debugfs to operate on very badly corrupted file systems, but it is now sometimes used to suppress reading the block and inode bitmaps when they are not needed. Resize2fs will round down the requested new file system size to the nearest cluster boundary when resizing bigalloc file systems. Improve error messages issued by badblocks. Fuse2fs now supports an offset=<bytes> option which allows operating on a file system image which is located starting at the specified offset from the beginning of the image. Fixes Pre-v6.2 Linux kernels had long-standing bug in how the extended attribute hash was calculated when there were non-ASCII characters in the xattr name, when the hash would be different depending on whether the C 'char' type was signed or unsigned. To address this bug, starting with e2fsprogs 1.46.6+ and Linux 6.2+, we will accept either the signed or unsigned hash variant, but only set the unsigned hash variant. Since extended attribute names are in practice composed of ASCII characters, other than various tests (such as generic/454), most users will hopefully not notice this change. Avoid triggering udev in dumpe2fs and "resize2fs -P" for file systems with MMP enabled by opening the device read-only when reading the MMP block. Fix MMP handling so it can notice when another writer has modify the MMP block out from under it when stopping a MMP sessions. Fix tune2fs so it will detect another device stealing the MMP sessions while rewriting metadata checksums. E2fsck will now check to make sure the journal inode does not have the encrypt flag set. Fix a deadlock bug in e2fsck's error handler when there are errors trying to write to the file system. Fix a bug where e2fsck could fail when specifying an undo file and an explicit superblock number. Fix e2image so it won't potentially loop forever for certain invalid file systems. Fix resize2fs to honor the E2FSPROGS_FAKE_TIME environment variable. This allows embedded system builders who use resize2fs as part of their image build process to create reproducible images. Fix tune2fs to avoid a crash if the journal replay fails and to make sure its exit status is non-zero if there is some failure. Fix tune2fs, fuse2fs, and debugsfs to update j_tail_sequence when replaying the journal. Add additional bullet-proofing for very badly corrupted file systems. Try avoid UBSAN warnings, null pointer derferences, and other memory bugs. (Addresses CVE-2022-1304) Don't fail when the source directory for mke2fs -d doesn't support extended attributese. Check for and handle malloc() failures when computing the log filename in e2fsck and in the libss library. Fix tune2fs and e2fsck to accept pathames which include '=' characters. Previously arguments to tune2fs and e2fsck which included '=' characters are presumed to be blkid specifiers such as UUID=xxx or LABEL=yyy. If a specifier is both a valid pathname name and blkid tag name specifier, priority is given to a blkid resolved pathname. Improve tune2fs's error messages. Fix a bug in tune2fs which could cause it to crash if device goes off-line just as it being opened. Fix the fsck driver so if it is interrupted while running fsck -N it doesn't end up kllling all processes on the system. Fix a crash in badblocks when the user specifies an overly large number of blocks tested at a time in read/write or nondestructive mode. Update and clarify's chattr's man page and usage message. Fix spelling typo's in a variety of different man pages and comments. Performance, Internal Implementation, Development Support etc. Update to autoconf 2.71. Update flags used to create shared library on Darwin/MacOS. Speed up e2fsck's clonning of multiply-claimed blocks so it is substantially faster on very large file systems. Add tests/fuzz directory with fuzzers from oss-fuzz. Add a Github Actions configuration file so that Github will run CI tests on Linux, Windows and MacOS on a push to the e2fsprogs github repo. Make the mtab parsing in ext2fs_check_mount_point() more careful so it won't get confused when a block device shows up in the mnt_name field for a virtual file system. Fix the libss's Makefile to create the man page directory before trying to install its man page. Fix various Coverity and compiler warnings. Make tests more portable on various different OS's and system configurations (e.g., with SELinux enabled, MacOS, and Windows) Use mallinfo2() instead of mallinfo() where avilable, since mallinfo() is deprecated on newer glibc versions. E2fsck will no longer do a full scan of disconnected directory when trying to print the parent directory, which is pointless and can slow down e2fsck if there are a large number of disconnected directories. Debugfs will now print the extended attribute's e_hash field. Fix the setup-schroot script to work on non-Linux platforms. Fix ext2fs_compare_generic_bmap() so it correctly compares all of the bits in the bitmap, and so that it works correctly when comparing a bitarray bitmap with a rbtree-based bitmap. (Fortunately, none of the programs in e2fsprogs uses bitmap comparison functions.) Fix memory leaks on error paths. Add support for the configure option --enable-largefile so that e2fsprogs can utilize largefile support for the MUSL C library. Add an note that the dict library code has been modified, as required by the Kazlib license. Synchronized changes from Android's AOSP e2fsprogs tree. Updated config.guess and config.sub with newer versions from the FSF. Add Friulian translation. Update Chinese, Czech, Dutch, French, German, Malay, Polish, Serbian, Spanish, Swedish, and Ukrainian translations.
Fixes: bug#13073 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/unbound | 2 +- config/rootfiles/common/vectorscan | 13 ++++++++++++ config/rootfiles/common/x86_64/hyperscan | 18 ---------------- .../{oldcore/101 => core/187}/filelists/e2fsprogs | 0 .../{oldcore/106 => core/187}/filelists/unbound | 0 config/rootfiles/core/187/update.sh | 3 ++- lfs/dnsdist | 6 +++--- lfs/e2fsprogs | 6 +++--- lfs/unbound | 4 ++-- lfs/{hyperscan => vectorscan} | 17 +++++++-------- make.sh | 2 +- ...yperscan-5.4.0-fix-undefined-reference-to.patch | 24 ---------------------- 12 files changed, 32 insertions(+), 63 deletions(-) create mode 100644 config/rootfiles/common/vectorscan delete mode 100644 config/rootfiles/common/x86_64/hyperscan copy config/rootfiles/{oldcore/101 => core/187}/filelists/e2fsprogs (100%) copy config/rootfiles/{oldcore/106 => core/187}/filelists/unbound (100%) rename lfs/{hyperscan => vectorscan} (85%) delete mode 100644 src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch
Difference in files: diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index 95dafc4dae..79612c6346 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.26 +usr/lib/libunbound.so.8.1.27 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/config/rootfiles/common/vectorscan b/config/rootfiles/common/vectorscan new file mode 100644 index 0000000000..160dc3ae7c --- /dev/null +++ b/config/rootfiles/common/vectorscan @@ -0,0 +1,13 @@ +#usr/include/hs +#usr/include/hs/hs.h +#usr/include/hs/hs_common.h +#usr/include/hs/hs_compile.h +#usr/include/hs/hs_runtime.h +#usr/include/hs/hs_version.h +#usr/lib/libhs.so +usr/lib/libhs.so.5 +usr/lib/libhs.so.5.4.11 +#usr/lib/libhs_runtime.so +usr/lib/libhs_runtime.so.5 +usr/lib/libhs_runtime.so.5.4.11 +#usr/lib/pkgconfig/libhs.pc diff --git a/config/rootfiles/common/x86_64/hyperscan b/config/rootfiles/common/x86_64/hyperscan deleted file mode 100644 index 006e0fff9a..0000000000 --- a/config/rootfiles/common/x86_64/hyperscan +++ /dev/null @@ -1,18 +0,0 @@ -#usr/include/hs -#usr/include/hs/hs.h -#usr/include/hs/hs_common.h -#usr/include/hs/hs_compile.h -#usr/include/hs/hs_runtime.h -#usr/lib/libhs.so -usr/lib/libhs.so.5 -usr/lib/libhs.so.5.4.0 -usr/lib/libhs_runtime.so -usr/lib/libhs_runtime.so.5 -usr/lib/libhs_runtime.so.5.4.0 -#usr/lib/pkgconfig/libhs.pc -#usr/share/doc/hyperscan -#usr/share/doc/hyperscan/examples -#usr/share/doc/hyperscan/examples/README.md -#usr/share/doc/hyperscan/examples/patbench.cc -#usr/share/doc/hyperscan/examples/pcapscan.cc -#usr/share/doc/hyperscan/examples/simplegrep.c diff --git a/config/rootfiles/core/187/filelists/e2fsprogs b/config/rootfiles/core/187/filelists/e2fsprogs new file mode 120000 index 0000000000..37b55de698 --- /dev/null +++ b/config/rootfiles/core/187/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/187/filelists/unbound b/config/rootfiles/core/187/filelists/unbound new file mode 120000 index 0000000000..66adf09242 --- /dev/null +++ b/config/rootfiles/core/187/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/187/update.sh b/config/rootfiles/core/187/update.sh index 3aded31af3..d2e86a3202 100644 --- a/config/rootfiles/core/187/update.sh +++ b/config/rootfiles/core/187/update.sh @@ -48,9 +48,10 @@ ldconfig /usr/local/bin/filesystem-cleanup
# Start services +/etc/init.d/unbound restart
# This update needs a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot
# Finish /etc/init.d/fireinfo start diff --git a/lfs/dnsdist b/lfs/dnsdist index d1b23b75be..5a8c0ac702 100644 --- a/lfs/dnsdist +++ b/lfs/dnsdist @@ -26,7 +26,7 @@ include Config
SUMMARY = A highly DNS-, DoS- and abuse-aware loadbalancer
-VER = 1.9.3 +VER = 1.9.4
THISAPP = dnsdist-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dnsdist -PAK_VER = 21 +PAK_VER = 23
SUP_ARCH = x86_64 aarch64
@@ -52,7 +52,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 663b8a2161c5a7b94541cd775f135a99997024648c5bb57fd2ec18c7ede29aebda142452f97332300c45af32b5131e4dd5f9c1f904a1d68962398fa9a28c474e +$(DL_FILE)_BLAKE2 = a8cfc5c2da135ed96b857f9f1b6c3caa796b27f66ff7ead6e976b871a5e5db208ef3ce275c23085318bd7ff2f0fa2ec19e28ad36234991d84b8d13e74acb2f34
install : $(TARGET)
diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index 4758b54010..ce1ba19a42 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.46.5 +VER = 1.47.0
THISAPP = e2fsprogs-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 +$(DL_FILE)_BLAKE2 = 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa
install : $(TARGET)
diff --git a/lfs/unbound b/lfs/unbound index f09e76b1b9..904744bc21 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@
include Config
-VER = 1.19.3 +VER = 1.20.0
THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5d9cbc26510afc2b92ecce6307cd9924a1b450892f7839f076535177ab35f78059d271e628e2aa995b62f5cf97add2363561a819d6e0181beb6b44421661d8f0 +$(DL_FILE)_BLAKE2 = b272a6b8c0118819d9803f0c7f7a4b7eff77e37682f4a9a0f749cafa08da4d4de01cd7bf71698b8fc5a7cdf5ca03685978e6b4395c586c35d1d13bebb7cbb538
install : $(TARGET)
diff --git a/lfs/hyperscan b/lfs/vectorscan similarity index 85% rename from lfs/hyperscan rename to lfs/vectorscan index 56c6290b55..0b60e19c9c 100644 --- a/lfs/hyperscan +++ b/lfs/vectorscan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,14 +24,13 @@
include Config
-VER = 5.4.0 +VER = 5.4.11
-THISAPP = hyperscan-$(VER) +THISAPP = vectorscan-vectorscan-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = x86_64
# The compiler uses a lot of memory to compile hyperscan, hence we reduce # the total number of processes a little bit to be able to build on @@ -46,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 +$(DL_FILE)_BLAKE2 = a8f5a1230af0ddf7d9fb9299769ec1736d37ac3284f6a98b1e650af461206cf459eac35d13a47beb6683786c6529539b2d082edf426e7d4890ed11804c76268b
install : $(TARGET)
@@ -75,13 +74,11 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && cmake . \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DBUILD_STATIC_AND_SHARED:BOOL=OFF \ - -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_BUILD_TYPE=RELEASE \ -DBUILD_EXAMPLES=OFF cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/make.sh b/make.sh index 7b99ea11a4..f8221bc2c7 100755 --- a/make.sh +++ b/make.sh @@ -1402,7 +1402,7 @@ buildipfire() { lfsmake2 libhtp lfsmake2 colm lfsmake2 ragel - lfsmake2 hyperscan + lfsmake2 vectorscan lfsmake2 suricata lfsmake2 ids-ruleset-sources lfsmake2 ipblocklist-sources diff --git a/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch b/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch deleted file mode 100644 index fdd2543f1f..0000000000 --- a/src/patches/hyperscan-5.4.0-fix-undefined-reference-to.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 66189546403e5476c560bdbad89d24c3df87b172 Mon Sep 17 00:00:00 2001 -From: Yue Ni niyue.com@gmail.com -Date: Tue, 19 Jan 2021 17:03:02 +0800 -Subject: [PATCH] Fix hyperscan compilation issue for - https://github.com/intel/hyperscan/issues/292, avoid the compilation error - reporting 'undefined reference to `avx2_snprintf`'. - ---- - cmake/build_wrapper.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/build_wrapper.sh b/cmake/build_wrapper.sh -index 1962813f..895610c0 100755 ---- a/cmake/build_wrapper.sh -+++ b/cmake/build_wrapper.sh -@@ -17,7 +17,7 @@ KEEPSYMS=$(mktemp -p /tmp keep.syms.XXXXX) - LIBC_SO=$("$@" --print-file-name=libc.so.6) - cp ${KEEPSYMS_IN} ${KEEPSYMS} - # get all symbols from libc and turn them into patterns --nm -f p -g -D ${LIBC_SO} | sed -s 's/([^ ]*).*/^\1$/' >> ${KEEPSYMS} -+nm -f p -g -D ${LIBC_SO} | sed -s 's/([^ @]*).*/^\1$/' >> ${KEEPSYMS} - # build the object - "$@" - # rename the symbols in the object
hooks/post-receive -- IPFire 2.x development tree