Re: [PR PATCH] [Updated] WIP: clamav: update to 1.2.0.

[nsudsgaard <nsudsgaard@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 830 bytes --]

There is an updated pull request by nsudsgaard against master on the void-packages repository

https://github.com/nsudsgaard/void-packages master
https://github.com/void-linux/void-packages/pull/46041

WIP: clamav: update to 1.2.0.
- [x] Builds locally on x86_64-musl
- [x] Builds locally on x86_64
- [ ] Builds locally on i686
- [x] Builds locally on aarch64-musl _crossbuild_
- [x] Builds locally on aarch64 _crossbuild_
- [ ] Builds locally on armv7l-musl _crossbuild_
- [ ] Builds locally on armv7l  _crossbuild_
- [ ] Builds locally on armv6l-musl _crossbuild_
- [ ] Builds locally on armv6l _crossbuild_
- [ ] Test on x86_64-musl
- [ ] Test on x86_64
- [ ] Cleanup/patch the configuration files
- [ ] Add service files


A patch file from https://github.com/void-linux/void-packages/pull/46041.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-46041.patch --]
[-- Type: text/x-diff, Size: 6320 bytes --]

From a36956cfa45eef2f66d87c18c79fd70c5f66368a Mon Sep 17 00:00:00 2001
From: Nicholas Sudsgaard <devel@nsudsgaard.com>
Date: Wed, 13 Sep 2023 16:45:13 +0900
Subject: [PATCH 1/2] clamav: update to 1.0.3, adopt.

---
 common/shlibs           |  7 ++--
 srcpkgs/clamav/template | 88 +++++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c407ffde9b8fd..730ee8f6b2159 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2256,9 +2256,10 @@ libsfml-system.so.2.5 SFML-2.5.0_1
 libsfml-window.so.2.5 SFML-2.5.0_1
 libsfml-audio.so.2.5 SFML-2.5.0_1
 libsfml-graphics.so.2.5 SFML-2.5.0_1
-libclamav.so.9 clamav-0.103.1_2
-libclamunrar.so.9 clamav-0.103.1_2
-libclamunrar_iface.so.9 clamav-0.103.1_2
+libclamav.so.11 clamav-1.0.3_1
+libclamunrar.so.11 clamav-1.0.3_1
+libclamunrar_iface.so.11 clamav-1.0.3_1
+libclammspack.so.0 clamav-1.0.3_1
 libfreshclam.so.2 clamav-0.103.1_2
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 3574b7baeed09..df48421dda465 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,66 +1,68 @@
 # Template file for 'clamav'
 pkgname=clamav
-version=0.103.8
-revision=4
-build_style=gnu-configure
-# XXX: system llvm is too new (< 3.7 required)
-# Shipped llvm does not build with gcc>=6
-configure_args="--sbindir=/usr/bin --libdir=/usr/lib
- --with-openssl=${XBPS_CROSS_BASE}/usr --with-pcre=${XBPS_CROSS_BASE}/usr
- --with-zlib=${XBPS_CROSS_BASE}/usr --with-libbz2-prefix=${XBPS_CROSS_BASE}/usr
- --with-system-libmspack=${XBPS_CROSS_BASE}/usr --with-libcurl=${XBPS_CROSS_BASE}/usr
- --enable-ipv6 --with-user=_clamav --with-group=_clamav"
-conf_files="/etc/clamd.conf /etc/freshclam.conf"
-hostmakedepends="flex pkg-config zip"
-makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel
- ncurses-devel pcre-devel tcl-devel"
+version=1.0.3
+revision=1
+build_style=cmake
+cmake_builddir=build
+# Setting ENABLE_JSON_SHARED=OFF is preferred, as libclamav.so may crash if you
+# use a different JSON library.
+configure_args="
+ -D CMAKE_BUILD_TYPE=Release
+ -D CMAKE_INSTALL_PREFIX=/usr
+ -D APP_CONFIG_DIRECTORY=/etc
+ -D DATABASE_DIRECTORY=/var/lib/_${pkgname}
+ -D CLAMAV_USER=_${pkgname}
+ -D CLAMAV_GROUP=_${pkgname}
+ -D ENABLE_JSON_SHARED=OFF"
+hostmakedepends="rust cargo python3"
+makedepends="bzip2-devel check-devel libcurl-devel json-c-devel libmilter-devel
+ libxml2-devel ncurses-devel openssl-devel pcre2-devel zlib-devel"
 short_desc="Clam Anti-Virus scanner"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Nicholas Sudsgaard <devel@nsudsgaard.com>"
 license="GPL-2.0-only"
 homepage="https://www.clamav.net/"
 distfiles="https://www.clamav.net/downloads/production/clamav-${version}.tar.gz"
-checksum=6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f
-_clamav_homedir="/var/lib/_${pkgname}"
+checksum=8779458dc31fdee1232eb8986f092d25568b39f5d337c0cbcd9c1abb5dc2886b
+system_accounts="_${pkgname}"
 _clamav_descr="ClamAV user"
-system_accounts="_clamav"
-make_check=ci-skip
+_clamav_homedir="/var/lib/_${pkgname}"
+conf_files="/etc/clamd.conf /etc/freshclam.conf /etc/clamav-milter.conf"
 
-CPPFLAGS="-Wno-unused-local-typedefs"
 if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --disable-mempool"
+	build_helper="qemu"
+	makedepends+=" rust-std"
+	configure_args+=" -D RUST_COMPILER_TARGET:STRING=${XBPS_CROSS_RUST_TARGET}"
 fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"
-	LDFLAGS="-lfts"
+	configure_args+=" -D CMAKE_EXE_LINKER_FLAGS=-lfts"
 fi
 
-do_configure() {
-	# Disable detection of sys/cdefs.h (it's obsolete)
-	sed -i configure -e 's; sys/cdefs\.h$;;'
-	sed -i configure -e 's;3\.7;3.9;'
-	# Enable IPv6 for cross builds
+pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" have_cv_ipv6=yes"
+		path=${XBPS_CROSS_BASE}/lib/rustlib/${XBPS_CROSS_RUST_TARGET}/lib
+
+		sed -i cmake/FindRust.cmake \
+		    -e "s:^set(RUSTFLAGS \"\")$:set(RUSTFLAGS \"-L${path}\"):g"
 	fi
-	# Need to set PCRE_HOME to make --with-pcre=/usr work
-	PCRE_HOME=/usr ./configure ${configure_args}
 }
+
 post_install() {
-	# Enable and patch clamd configuration
-	mv -v ${PKGDESTDIR}/etc/clamd.conf.sample ${PKGDESTDIR}/etc/clamd.conf
-	vsconf etc/clamd.conf.sample
-	sed -i ${PKGDESTDIR}/etc/clamd.conf \
-		-e "s;^Example$;# Example;" \
-		-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_${pkgname};"
+	vmkdir /etc 755
+	for path in ${conf_files}; do
+		name=${path#/etc}
+
+		mv -v ${PKGDESTDIR}//${path}.sample ${PKGDESTDIR}/${path}
+		vsconf ${PKGDESTDIR}/${path} ${name}.sample
+		sed -i ${PKGDESTDIR}/${path}        \
+			-e "s;^Example$;# Example;" \
+			-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_${pkgname};"
+	done
+	vdoc ${FILESDIR}/README.voidlinux
 
-	# Enable and patch freshclam configuration
-	mv -v ${PKGDESTDIR}/etc/freshclam.conf.sample ${PKGDESTDIR}/etc/freshclam.conf
-	vsconf etc/freshclam.conf.sample
-	sed -i ${PKGDESTDIR}/etc/freshclam.conf \
-		-e "s;^Example$;# Example;" \
-		-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_${pkgname};"
-	vdoc "${FILESDIR}/README.voidlinux"
 }
+
 clamav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From bb2ef58edd1075c85c6f6bf1bace5879f3705d32 Mon Sep 17 00:00:00 2001
From: Nicholas Sudsgaard <144646475+nsudsgaard@users.noreply.github.com>
Date: Thu, 14 Sep 2023 03:53:24 +0000
Subject: [PATCH 2/2] Renounce adoption

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index df48421dda465..51e05b8ab73b9 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -18,7 +18,7 @@ hostmakedepends="rust cargo python3"
 makedepends="bzip2-devel check-devel libcurl-devel json-c-devel libmilter-devel
  libxml2-devel ncurses-devel openssl-devel pcre2-devel zlib-devel"
 short_desc="Clam Anti-Virus scanner"
-maintainer="Nicholas Sudsgaard <devel@nsudsgaard.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.clamav.net/"
 distfiles="https://www.clamav.net/downloads/production/clamav-${version}.tar.gz"