[arch-commits] Commit in clamav/trunk (PKGBUILD)

[Levente Polyak]

    Date: Thursday, September 9, 2021 @ 18:20:19
  Author: anthraxx
Revision: 423674

upgpkg: clamav 0.104.0-1

Modified:
  clamav/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-09 13:30:21 UTC (rev 423673)
+++ PKGBUILD	2021-09-09 18:20:19 UTC (rev 423674)
@@ -5,14 +5,15 @@
 # Contributor: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=clamav
-pkgver=0.103.3
+pkgver=0.104.0
 pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='https://www.clamav.net/'
 license=('GPL')
 arch=('x86_64')
-depends=('bzip2' 'libltdl' 'libxml2' 'curl' 'systemd-libs' 'pcre2' 'json-c' 'libmspack')
-makedepends=('libmilter' 'systemd')
+depends=('bzip2' 'libltdl' 'libxml2' 'curl' 'systemd-libs' 'pcre2' 'json-c' 'libmspack'
+         'ncurses' libsystemd.so libncursesw.so libcurl.so libjson-c.so libbz2.so)
+makedepends=('libmilter' 'systemd' 'cmake' 'ninja' 'python')
 checkdepends=('check')
 backup=('etc/clamav/clamd.conf'
         'etc/clamav/freshclam.conf'
@@ -23,7 +24,7 @@
         clamav.logrotate
         clamav.tmpfiles
         clamav.sysusers)
-sha512sums=('c2ee24a6f63735c064140aa5baa347d51e8240b2f7eced3480d05435202aedd481fa7057fd40ecbc2e93a62fe8b0cefb574d8accdf9acede643ffbe0d396686f'
+sha512sums=('7a052e6310ef92068acc384d10a64eed6d54d2d408d203dab92defbb1a276e8a193a2096a8028c8982323ba0be83d25602f026aeffa056878ce36aa325c0046c'
             'SKIP'
             '9cb168c1c16bb43c99900d7ef34456e3f3b593d4d1943c875a0306bc86fd3872cb78e9e1413dcba93579e01b96d466c9eea1975e24190193663b7986c4525d48'
             'c5443634399bd87fe0d0192518538ffdb7296a8437b5b0160a0fbd58696b01285de3237e3feb552c0095c49e576832dec2e2b2107eef2be42424ed7edd13cd19'
@@ -46,40 +47,32 @@
   sed -E 's|#(LogFile) .+|\1 /var/log/clamav/clamav-milter.log|' -i etc/clamav-milter.conf.sample
   sed -E 's|#(PidFile) .+|\1 /run/clamav/clamav-milter.pid|' -i etc/clamav-milter.conf.sample
   sed -E "s|(\\[Unit\\])|\\1\\nWants=network-online.target\\nAfter=network-online.target|" -i freshclam/clamav-freshclam.service.in
-  autoreconf -fiv
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  # --disable-zlib-vcheck because the configure script thinks that
-  # zlib 1.2.11 is older than 1.2.2
-  ./configure \
-    --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc/clamav \
-    --with-dbdir=/var/lib/clamav \
-    --with-user=clamav \
-    --with-group=clamav \
-    --with-system-libmspack \
-    --disable-rpath \
-    --disable-clamav \
-    --disable-llvm \
-    --enable-zlib-vcheck \
-    --enable-milter \
-    --enable-clamdtop
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  cmake \
+    -DCMAKE_BUILD_TYPE='None' \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_SBINDIR=bin \
+    -DAPP_CONFIG_DIRECTORY=/etc/clamav \
+    -DDATABASE_DIRECTORY=/var/lib/clamav \
+    -DENABLE_EXTERNAL_MSPACK=ON \
+    -Wno-dev \
+    -B build \
+    -G Ninja \
+    -S .
+  ninja -C build
 }
 
 check() {
   cd ${pkgname}-${pkgver}
-  make check
+  ninja -C build test
 }
 
 package() {
   cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
 
   mv "${pkgdir}"/etc/clamav/freshclam.conf{.sample,}
   mv "${pkgdir}"/etc/clamav/clamd.conf{.sample,}