clamav: updated to version 0.104.0; new dependencies cmake, libxml2, libpcre2, and json-c

3 files changed, 34 insertions, 34 deletions

diff --git a/clamav/.footprint b/clamav/.footprint
index 7771aca58..eef2fc5c8 100644
--- a/clamav/.footprint
+++ b/clamav/.footprint
@@ -12,6 +12,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/clamdscan
 -rwxr-xr-x	root/root	usr/bin/clamdtop
 -rwxr-xr-x	root/root	usr/bin/clamscan
+-rwxr-xr-x	root/root	usr/bin/clamsubmit
 -rwxr-xr-x	root/root	usr/bin/freshclam
 -rwxr-xr-x	root/root	usr/bin/sigtool
 drwxr-xr-x	root/root	usr/include/
@@ -20,26 +21,21 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/clamav.h
 -rw-r--r--	root/root	usr/include/libfreshclam.h
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libclamav.la
-lrwxrwxrwx	root/root	usr/lib/libclamav.so -> libclamav.so.9.0.5
-lrwxrwxrwx	root/root	usr/lib/libclamav.so.9 -> libclamav.so.9.0.5
--rwxr-xr-x	root/root	usr/lib/libclamav.so.9.0.5
--rwxr-xr-x	root/root	usr/lib/libclammspack.la
-lrwxrwxrwx	root/root	usr/lib/libclammspack.so -> libclammspack.so.0.1.0
-lrwxrwxrwx	root/root	usr/lib/libclammspack.so.0 -> libclammspack.so.0.1.0
--rwxr-xr-x	root/root	usr/lib/libclammspack.so.0.1.0
--rwxr-xr-x	root/root	usr/lib/libclamunrar.la
-lrwxrwxrwx	root/root	usr/lib/libclamunrar.so -> libclamunrar.so.9.0.5
-lrwxrwxrwx	root/root	usr/lib/libclamunrar.so.9 -> libclamunrar.so.9.0.5
--rwxr-xr-x	root/root	usr/lib/libclamunrar.so.9.0.5
--rwxr-xr-x	root/root	usr/lib/libclamunrar_iface.la
-lrwxrwxrwx	root/root	usr/lib/libclamunrar_iface.so -> libclamunrar_iface.so.9.0.5
-lrwxrwxrwx	root/root	usr/lib/libclamunrar_iface.so.9 -> libclamunrar_iface.so.9.0.5
--rwxr-xr-x	root/root	usr/lib/libclamunrar_iface.so.9.0.5
--rwxr-xr-x	root/root	usr/lib/libfreshclam.la
-lrwxrwxrwx	root/root	usr/lib/libfreshclam.so -> libfreshclam.so.2.0.1
-lrwxrwxrwx	root/root	usr/lib/libfreshclam.so.2 -> libfreshclam.so.2.0.1
--rwxr-xr-x	root/root	usr/lib/libfreshclam.so.2.0.1
+lrwxrwxrwx	root/root	usr/lib/libclamav.so -> libclamav.so.9
+lrwxrwxrwx	root/root	usr/lib/libclamav.so.9 -> libclamav.so.9.1.0
+-rwxr-xr-x	root/root	usr/lib/libclamav.so.9.1.0
+lrwxrwxrwx	root/root	usr/lib/libclammspack.so -> libclammspack.so.0
+lrwxrwxrwx	root/root	usr/lib/libclammspack.so.0 -> libclammspack.so.0.8.0
+-rwxr-xr-x	root/root	usr/lib/libclammspack.so.0.8.0
+lrwxrwxrwx	root/root	usr/lib/libclamunrar.so -> libclamunrar.so.9
+lrwxrwxrwx	root/root	usr/lib/libclamunrar.so.9 -> libclamunrar.so.9.1.0
+-rwxr-xr-x	root/root	usr/lib/libclamunrar.so.9.1.0
+lrwxrwxrwx	root/root	usr/lib/libclamunrar_iface.so -> libclamunrar_iface.so.9
+lrwxrwxrwx	root/root	usr/lib/libclamunrar_iface.so.9 -> libclamunrar_iface.so.9.1.0
+-rwxr-xr-x	root/root	usr/lib/libclamunrar_iface.so.9.1.0
+lrwxrwxrwx	root/root	usr/lib/libfreshclam.so -> libfreshclam.so.2
+lrwxrwxrwx	root/root	usr/lib/libfreshclam.so.2 -> libfreshclam.so.2.0.2
+-rwxr-xr-x	root/root	usr/lib/libfreshclam.so.2.0.2
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libclamav.pc
 drwxr-xr-x	root/root	usr/sbin/
@@ -54,6 +50,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/clamdscan.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/clamdtop.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/clamscan.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/clamsubmit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/freshclam.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/sigtool.1.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
diff --git a/clamav/.signature b/clamav/.signature
index a9c1baa6e..1cf63ca62 100644
--- a/clamav/.signature
+++ b/clamav/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xR1BK0uPL+DxqkarWdJ6pDFdW3qZw8Rzr67FutI7wf/+QmmqFkT5lrVFXJNlLf1+ZKagjmBI1N8wQwRWBG2twA=
-SHA256 (Pkgfile) = f45d4b968f90a756f1ef8a9a65ff13ee9605abd8424b0873237490d19f530532
-SHA256 (.footprint) = 639dc200ae44ab41dabeb4fe7593e1a37a4b7563d869ef412969e6d666636f82
-SHA256 (clamav-0.103.3.tar.gz) = 9f6e3d18449f3d1a3992771d696685249dfa12736fe2b2929858f2c7d8276ae9
+RWSagIOpLGJF3w3RgcOGPrmFJSpV3riiAb4CP7d9PTtnSfTaeMtfJUmbuLSENiSRUBrY/ME5dfxHkSF+3GPWMMAFcPdKDXH5jA8=
+SHA256 (Pkgfile) = 8c9faa1613cceead8e74ccfc499a5f68603feacd9e176b21f3e990564610897e
+SHA256 (.footprint) = b375415ebe3958ea171d2362bfbd9194c7206b8f5db7f5ac1d9d5f695a3983f7
+SHA256 (clamav-0.104.0.tar.gz) = a079d64cd55d6184510adfe0f341b2f278f7fb1bcc080d28d374298160f19cb2
 SHA256 (clamd.conf) = e8a57ed7c3110fdda708f0b3f2fbfc97f944bc5e1987c40a164d864d5570bea5
 SHA256 (freshclam.conf) = 1374ba1986a7320ded85dcf6136741dc9fc8da7316d393ce4b29bac26a8a897e
 SHA256 (clamd) = b5de1447901943ac057b531c0b40e8bf21c4eb0d771fa27d6a6c8835c35ea2a7
diff --git a/clamav/Pkgfile b/clamav/Pkgfile
index 6287083fa..9750af12d 100644
--- a/clamav/Pkgfile
+++ b/clamav/Pkgfile
@@ -1,22 +1,25 @@
 # Description: A GPL virus scanner
 # URL: http://www.clamav.net/
 # Maintainer: Matt Housh, jaeger at crux dot ninja
-# Depends on: bzip2 libgmp curl
+# Depends on: bzip2 libgmp curl cmake libxml2 libpcre2 json-c
 
 name=clamav
-version=0.103.3
+version=0.104.0
 release=1
 source=(http://www.clamav.net/downloads/production/$name-$version.tar.gz \
 	clamd.conf freshclam.conf clamd freshclam)
 
 build() {
-	CXXFLAGS="${CXXFLAGS} -std=gnu++98"
-	cd $name-$version
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-id-check \
-		--with-libcurl
-	make
+	mkdir build
+	cd build
+	cmake -DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DAPP_CONFIG_DIRECTORY=/etc \
+		-DENABLE_MILTER=OFF \
+		-DENABLE_TESTS=OFF \
+		../$name-$version
+	cmake .
 	make DESTDIR=$PKG install
 	mkdir -p $PKG/var/run/$name $PKG/var/log/$name
 	chown -R $name:$name $PKG/var/run/$name $PKG/var/log/$name
@@ -26,5 +29,5 @@ build() {
 	install -o root -g root -m 0755 $SRC/{clamd,freshclam} \
 		$PKG/etc/rc.d/
 	install -o clamav -g clamav -m 0775 -d $PKG/usr/share/clamav
-	rm $PKG/etc/*.sample
+	rm -r $PKG/usr/share/doc $PKG/etc/*.sample
 }