Re: WIP: clamav: update to 1.2.0.

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

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

New comment by nsudsgaard on void-packages repository

https://github.com/void-linux/void-packages/pull/46041#issuecomment-1719601295

Comment:
WIP: 1.2.0 patch

```patch
--- a/common/shlibs	2023-09-14 14:00:08.268535424 +0900
+++ b/common/shlibs	2023-09-14 21:32:26.745618939 +0900
@@ -2256,11 +2256,11 @@
 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.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
+libclamav.so.12 clamav-1.2.0_1
+libclamunrar.so.12 clamav-1.2.0_1
+libclamunrar_iface.so.12 clamav-1.2.0_1
+libclammspack.so.0 clamav-1.2.0_1
+libfreshclam.so.3 clamav-1.2.0_1
 libqca-qt5.so.2 qca-qt5-2.1.3_1
 libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
--- a/srcpkgs/clamav/template	2023-09-14 23:44:26.619590292 +0900
+++ b/srcpkgs/clamav/template	2023-09-14 22:15:10.006635765 +0900
@@ -1,6 +1,6 @@
 # Template file for 'clamav'
 pkgname=clamav
-version=1.0.3
+version=1.2.0
 revision=1
 build_style=cmake
 cmake_builddir=build
@@ -10,9 +10,9 @@
  -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 DATABASE_DIRECTORY=/var/lib/_clamav
+ -D CLAMAV_USER=_clamav
+ -D CLAMAV_GROUP=_clamav
  -D ENABLE_JSON_SHARED=OFF"
 hostmakedepends="rust cargo python3"
 makedepends="bzip2-devel check-devel libcurl-devel json-c-devel libmilter-devel
@@ -21,17 +21,19 @@
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.clamav.net/"
+changelog="https://raw.githubusercontent.com/Cisco-Talos/clamav/main/NEWS.md"
 distfiles="https://www.clamav.net/downloads/production/clamav-${version}.tar.gz"
-checksum=8779458dc31fdee1232eb8986f092d25568b39f5d337c0cbcd9c1abb5dc2886b
-system_accounts="_${pkgname}"
-_clamav_descr="ClamAV user"
-_clamav_homedir="/var/lib/_${pkgname}"
+checksum=97a192dffe141480b56cabf1063d79a9fc55cd59203241fa41bfc7a98a548020
+system_accounts="_clamav"
+_clamav_homedir="/var/lib/_clamav"
 conf_files="/etc/clamd.conf /etc/freshclam.conf /etc/clamav-milter.conf"
 
 if [ "$CROSS_BUILD" ]; then
 	build_helper="qemu"
 	makedepends+=" rust-std"
-	configure_args+=" -D RUST_COMPILER_TARGET:STRING=${XBPS_CROSS_RUST_TARGET}"
+	configure_args+="
+	-D RUST_COMPILER_TARGET:STRING=${XBPS_CROSS_RUST_TARGET}
+	-D RUSTFLAGS=${XBPS_CROSS_RUSTFLAGS}"
 fi
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
@@ -39,15 +41,6 @@
 	configure_args+=" -D CMAKE_EXE_LINKER_FLAGS=-lfts"
 fi
 
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		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
-}
-
 post_install() {
 	vmkdir /etc 755
 	for path in ${conf_files}; do
@@ -57,7 +50,7 @@
 		vsconf ${PKGDESTDIR}/${path} ${name}.sample
 		sed -i ${PKGDESTDIR}/${path}        \
 			-e "s;^Example$;# Example;" \
-			-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_${pkgname};"
+			-e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_clamav;"
 	done
 	vdoc ${FILESDIR}/README.voidlinux
 
```