public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0db80b315b0d9f545ad567af0b62bc3c5d293331
@ 2026-01-09 11:26 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-01-09 11:26 UTC (permalink / raw)
  To: ipfire-scm

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  0db80b315b0d9f545ad567af0b62bc3c5d293331 (commit)
       via  a8d92120f48bd91c2a3a68b5afce6abf717e4947 (commit)
       via  41772487fbd8fa22962874b9b9e19b6eed229953 (commit)
       via  02275c437a76876a0c24b9675bedb6ce083a245b (commit)
      from  74af1b0f20786db177e6f952cddcf080d58b8b09 (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 0db80b315b0d9f545ad567af0b62bc3c5d293331
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Jan 9 11:25:29 2026 +0000

    core200: Ship fuse again
    
    The library was removed by the filesystem-cleanup script because of some
    creative versioning.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit a8d92120f48bd91c2a3a68b5afce6abf717e4947
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Jan 9 11:24:59 2026 +0000

    core200: Ship the filesystem-cleanup script again
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 41772487fbd8fa22962874b9b9e19b6eed229953
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Jan 9 11:19:41 2026 +0000

    core199: Don't cleanup any libfuse.so.* files
    
    libfuse does not follow the usual rules of versioning their libraries
    which is why we need to create an exception.
    
    Fixes: #13922 - Core 199 - QEMU VMs no longer start - libfuse3.so.4 missing
    Reported-by: Arno Jonker <admin@greenbull.nl>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 02275c437a76876a0c24b9675bedb6ce083a245b
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Fri Jan 9 11:10:42 2026 +0000

    clamav: Revert to version 1.4.3
    
    This is necessary as the new 1.5.x releases are not able to validate the
    signature of their database.
    
    Suggested-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/200/filelists/files          |  1 +
 .../{oldcore/112 => core/200}/filelists/fuse       |  0
 config/rootfiles/oldcore/199/filelists/files       |  1 +
 config/rootfiles/packages/clamav                   | 14 ++++-----
 lfs/clamav                                         | 36 +++++++++++-----------
 src/scripts/filesystem-cleanup                     |  4 +++
 6 files changed, 31 insertions(+), 25 deletions(-)
 copy config/rootfiles/{oldcore/112 => core/200}/filelists/fuse (100%)

Difference in files:
diff --git a/config/rootfiles/core/200/filelists/files b/config/rootfiles/core/200/filelists/files
index 6968361346..d0eed9f2e3 100644
--- a/config/rootfiles/core/200/filelists/files
+++ b/config/rootfiles/core/200/filelists/files
@@ -2,5 +2,6 @@ etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/unbound
 srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
+usr/local/bin/filesystem-cleanup
 var/ipfire/backup/exclude
 var/ipfire/urlfilter/autoupdate/autoupdate.urls
diff --git a/config/rootfiles/core/200/filelists/fuse b/config/rootfiles/core/200/filelists/fuse
new file mode 120000
index 0000000000..570edaadef
--- /dev/null
+++ b/config/rootfiles/core/200/filelists/fuse
@@ -0,0 +1 @@
+../../../common/fuse
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/199/filelists/files b/config/rootfiles/oldcore/199/filelists/files
index a8135369b2..89e87f23da 100644
--- a/config/rootfiles/oldcore/199/filelists/files
+++ b/config/rootfiles/oldcore/199/filelists/files
@@ -23,6 +23,7 @@ srv/web/ipfire/cgi-bin/modem-status.cgi
 srv/web/ipfire/cgi-bin/vulnerabilities.cgi
 srv/web/ipfire/cgi-bin/wireguard.cgi
 srv/web/ipfire/cgi-bin/wirelessclient.cgi
+usr/local/bin/filesystem-cleanup
 usr/local/bin/lldpdctrl
 usr/sbin/openvpn-authenticator
 usr/sbin/redirect_wrapper
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 5e5fe5438f..d5495e4b7b 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -14,20 +14,20 @@ usr/bin/sigtool
 #usr/include/libfreshclam.h
 usr/lib/libclamav.so
 usr/lib/libclamav.so.12
-usr/lib/libclamav.so.12.1.0
+usr/lib/libclamav.so.12.0.3
 #usr/lib/libclamav_rust.a
 usr/lib/libclammspack.so
 usr/lib/libclammspack.so.0
 usr/lib/libclammspack.so.0.8.0
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.12
-usr/lib/libclamunrar.so.12.1.0
+usr/lib/libclamunrar.so.12.0.3
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.12
-usr/lib/libclamunrar_iface.so.12.1.0
+usr/lib/libclamunrar_iface.so.12.0.3
 usr/lib/libfreshclam.so
-usr/lib/libfreshclam.so.4
-usr/lib/libfreshclam.so.4.0.0
+usr/lib/libfreshclam.so.3
+usr/lib/libfreshclam.so.3.0.2
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 #usr/share/doc/ClamAV
@@ -133,6 +133,7 @@ usr/sbin/clamd
 #usr/share/doc/ClamAV/html/manual/Installing/Add-clamav-user.html
 #usr/share/doc/ClamAV/html/manual/Installing/Community-projects.html
 #usr/share/doc/ClamAV/html/manual/Installing/Docker.html
+#usr/share/doc/ClamAV/html/manual/Installing/Installing-from-source-Unix-old.html
 #usr/share/doc/ClamAV/html/manual/Installing/Installing-from-source-Unix.html
 #usr/share/doc/ClamAV/html/manual/Installing/Installing-from-source-Windows.html
 #usr/share/doc/ClamAV/html/manual/Installing/Packages.html
@@ -167,6 +168,7 @@ usr/sbin/clamd
 #usr/share/doc/ClamAV/html/print.html
 #usr/share/doc/ClamAV/html/searcher.js
 #usr/share/doc/ClamAV/html/searchindex.js
+#usr/share/doc/ClamAV/html/searchindex.json
 #usr/share/doc/ClamAV/html/sitemap.xml
 #usr/share/doc/ClamAV/html/theme-dawn.js
 #usr/share/doc/ClamAV/html/theme-tomorrow_night.js
@@ -174,8 +176,6 @@ usr/sbin/clamd
 #usr/share/doc/ClamAV/html/toc.js
 #usr/share/doc/ClamAV/html/tomorrow-night.css
 #var/ipfire/clamav
-#var/ipfire/clamav/certs
-#var/ipfire/clamav/certs/clamav.crt
 var/ipfire/clamav/clamd.conf
 var/ipfire/clamav/clamd.conf.sample
 var/ipfire/clamav/freshclam.conf
diff --git a/lfs/clamav b/lfs/clamav
index 10880b85f9..254da1281b 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Antivirus Toolkit
 
-VER        = 1.5.1
+VER        = 1.4.3
 
 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    = 79
+PAK_VER    = 80
 
 DEPS       =
 
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = d6fd0885ea2864b0fecf040d6b0a088b8d9ad05a555697eab6c999b4a8b3d14bc2ee0968ef4dcb3f3b56d8361faecb98afa5ff4ffbb843cf1bf221a4e27a4496
+$(DL_FILE)_BLAKE2 = 144be77e7104ebf78482c9efc411a4a168bb4ea3ad18abb237e7bcc1f5cf3e2c10d5478a54d9dc0d82b028c923065bc614cd535fd4f67fb1e73f5fe1c6425861
 
 
 install : $(TARGET)
@@ -87,21 +87,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && mkdir -pv build
 	cd $(DIR_APP)/build && cmake .. -G Ninja \
-			-D CMAKE_BUILD_TYPE=Release \
-			-D CMAKE_INSTALL_PREFIX=/usr \
-			-D CMAKE_INSTALL_LIBDIR=/usr/lib \
-			-D OPTIMIZE=ON \
-			-D BYTECODE_RUNTIME="interpreter" \
-			-D ENABLE_TESTS=OFF \
-			-D ENABLE_CLAMONACC=OFF \
-			-D ENABLE_MILTER=OFF \
-			-D ENABLE_MAN_PAGES=OFF \
-			-D ENABLE_EXTERNAL_MSPACK=OFF \
-			-D ENABLE_FRESHCLAM_DNS_FIX=ON \
-			-D ENABLE_SYSTEMD=OFF \
-			-D APP_CONFIG_DIRECTORY=/var/ipfire/clamav \
-			-D CURSES_LIBRARY=/usr/lib/libncurses.so \
-			-D DATABASE_DIRECTORY=$(DATABASE_DIR)
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DOPTIMIZE=ON \
+		-DBYTECODE_RUNTIME="interpreter" \
+		-DENABLE_TESTS=OFF \
+		-DENABLE_CLAMONACC=OFF \
+		-DENABLE_MILTER=OFF \
+		-DENABLE_MAN_PAGES=OFF \
+		-DENABLE_EXTERNAL_MSPACK=OFF \
+		-DENABLE_FRESHCLAM_DNS_FIX=ON \
+		-DENABLE_SYSTEMD=OFF \
+		-DAPP_CONFIG_DIRECTORY=/var/ipfire/clamav \
+		-DCURSES_LIBRARY=/usr/lib/libncurses.so \
+		-DDATABASE_DIRECTORY=$(DATABASE_DIR)
 	cd $(DIR_APP)/build && ninja $(MAKETUNING) && ninja install
 
 	mkdir -pv $(DATABASE_DIR)
diff --git a/src/scripts/filesystem-cleanup b/src/scripts/filesystem-cleanup
index a1b5e88913..22dee138fd 100644
--- a/src/scripts/filesystem-cleanup
+++ b/src/scripts/filesystem-cleanup
@@ -56,6 +56,10 @@ main() {
 				*/libboost*)
 					continue
 					;;
+				# libfuse does not seem to understand how to version their libraries
+				*/libfuse.*)
+					continue
+					;;
 			esac
 
 			# Read the name of the linked library


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-01-09 11:26 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-09 11:26 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0db80b315b0d9f545ad567af0b62bc3c5d293331 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox