From 60415c68adfdf182938eff69238b877b4e287f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Mon, 19 Dec 2022 19:14:24 +0100 Subject: [PATCH] clamav: update to 1.0.0. --- common/shlibs | 6 +-- srcpkgs/clamav/files/clamd/log/run | 1 + srcpkgs/clamav/files/clamd/run | 4 ++ srcpkgs/clamav/files/freshclam/log/run | 1 + srcpkgs/clamav/files/freshclam/run | 4 ++ srcpkgs/clamav/template | 75 +++++++++++++------------- 6 files changed, 50 insertions(+), 41 deletions(-) create mode 120000 srcpkgs/clamav/files/clamd/log/run create mode 100755 srcpkgs/clamav/files/clamd/run create mode 120000 srcpkgs/clamav/files/freshclam/log/run create mode 100755 srcpkgs/clamav/files/freshclam/run diff --git a/common/shlibs b/common/shlibs index ddd0a3266a36..64c82592cc54 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2276,9 +2276,9 @@ 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.0_1 +libclamunrar.so.11 clamav-1.0.0_1 +libclamunrar_iface.so.11 clamav-1.0.0_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/files/clamd/log/run b/srcpkgs/clamav/files/clamd/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/clamav/files/clamd/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/clamav/files/clamd/run b/srcpkgs/clamav/files/clamd/run new file mode 100755 index 000000000000..ae2b1f0f5da6 --- /dev/null +++ b/srcpkgs/clamav/files/clamd/run @@ -0,0 +1,4 @@ +#!/bin/sh +mkdir -p /run/clamav +chown _clamav:_clamav /run/clamav +exec clamd --foreground 2>&1 diff --git a/srcpkgs/clamav/files/freshclam/log/run b/srcpkgs/clamav/files/freshclam/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/clamav/files/freshclam/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/clamav/files/freshclam/run b/srcpkgs/clamav/files/freshclam/run new file mode 100755 index 000000000000..d42df2fb5db7 --- /dev/null +++ b/srcpkgs/clamav/files/freshclam/run @@ -0,0 +1,4 @@ +#!/bin/sh +mkdir -p /run/clamav +chown _clamav:_clamav /run/clamav +exec freshclam --daemon --foreground 2>&1 diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template index 98dcf3750ad2..32c5ed3c3ea5 100644 --- a/srcpkgs/clamav/template +++ b/srcpkgs/clamav/template @@ -1,64 +1,63 @@ # Template file for 'clamav' pkgname=clamav -version=0.103.8 +version=1.0.1 revision=1 -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" +build_style=cmake +configure_args="-DAPP_CONFIG_DIRECTORY=/etc + -DDATABASE_DIRECTORY=/var/lib/_clamav + -DENABLE_JSON_SHARED=ON + -DCLAMAV_USER=_clamav + -DCLAMAV_GROUP=_clamav + -DENABLE_APP=ON + -DENABLE_MILTER=ON + -DENABLE_CLAMONACC=ON + -DENABLE_MAN_PAGES=ON + -DENABLE_DOXYGEN=OFF + -DENABLE_EXAMPLES=ON + -DENABLE_TESTS=ON + -DENABLE_SHARED_LIB=ON + -DENABLE_SYSTEMD=OFF + -DENABLE_UNRAR=ON" conf_files="/etc/clamd.conf /etc/freshclam.conf" -hostmakedepends="flex pkg-config zip" +hostmakedepends="flex pkg-config zip cmake ninja cargo python3" makedepends="json-c-devel libcurl-devel libmspack-devel libxml2-devel - ncurses-devel pcre-devel tcl-devel" + ncurses-devel pcre2-devel tcl-devel check-devel libmilter-devel" short_desc="Clam Anti-Virus scanner" -maintainer="Orphaned " +maintainer="Jan Christian Grünhage " license="GPL-2.0-only" homepage="https://www.clamav.net/" distfiles="https://www.clamav.net/downloads/production/clamav-${version}.tar.gz" -checksum=6f49da6ee927936de13d359e559d3944248e3a257d40b80b6c99ebe6fe8c8c3f +checksum=0872dc1b82ff4cd7e8e4323faf5ee41a1f66ae80865d05429085b946355d86ee _clamav_homedir="/var/lib/_${pkgname}" _clamav_descr="ClamAV user" system_accounts="_clamav" -make_check=ci-skip CPPFLAGS="-Wno-unused-local-typedefs" if [ "$CROSS_BUILD" ]; then - configure_args+=" --disable-mempool" + configure_args+=" -DDISABLE_MPOOL=1" fi if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-fts-devel" LDFLAGS="-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 - if [ "$CROSS_BUILD" ]; then - configure_args+=" have_cv_ipv6=yes" - 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};" - - # Enable and patch freshclam configuration - mv -v ${PKGDESTDIR}/etc/freshclam.conf.sample ${PKGDESTDIR}/etc/freshclam.conf - vsconf etc/freshclam.conf.sample + vsv clamd + vsv freshclam + for service in clamd clamav-milter freshclam; do + # Enable and patch service configuration + mv -v ${PKGDESTDIR}/etc/${service}.conf.sample ${PKGDESTDIR}/etc/${service}.conf + vsconf etc/${service}.conf.sample + sed -i ${PKGDESTDIR}/etc/${service}.conf \ + -e "s:^\(Example\)$:# \1:" \ + -e "s:#DatabaseDirectory.*:DatabaseDirectory /var/lib/_${pkgname}:" + done sed -i ${PKGDESTDIR}/etc/freshclam.conf \ - -e "s;^Example$;# Example;" \ - -e "s;#DatabaseDirectory.*;DatabaseDirectory /var/lib/_${pkgname};" + -e "s:.*\(PidFile\) .*:\1 /run/clamav/freshclam.pid:" \ + -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" + sed -i ${PKGDESTDIR}/etc/clamd.conf \ + -e "s:.*\(PidFile\) .*:\1 /run/clamav/clamd.pid:" \ + -e "s:.*\(LocalSocket\) .*:\1 /run/clamav/clamd.sock:" } clamav-devel_package() { depends="${sourcepkg}>=${version}_${revision}"