From cb4b745f70288e54ce0488fcec3bfd7f59b1972a Mon Sep 17 00:00:00 2001 From: 4fury-c3440d8 Date: Thu, 9 Mar 2023 22:49:51 +0300 Subject: [PATCH] clamav rebuild. --- util/antivirus/clamav/actions.py | 8 ++++---- util/antivirus/clamav/pspec.xml | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/util/antivirus/clamav/actions.py b/util/antivirus/clamav/actions.py index 47804ae28a..41b75c8fff 100644 --- a/util/antivirus/clamav/actions.py +++ b/util/antivirus/clamav/actions.py @@ -13,11 +13,11 @@ j = ''.join([ ' -DENABLE_SYSTEMD=OFF', ' -DAPP_CONFIG_DIRECTORY=/etc/clamav', ' -DDATABASE_DIRECTORY=/var/lib/clamav', - ' -G Ninja', - ' -B_build -L ' + ' -B_build -G Ninja -L ' ]) def setup(): + shelltools.export("CFLAGS", "%s -I/usr/include/iconv " % get.CFLAGS()) cmaketools.configure(j) def build(): @@ -25,8 +25,8 @@ def build(): def check(): # failed utf16 to utf8 converting - pass - #mesontools.build("-C _build test") + #pass + mesontools.build("-C _build test") def install(): mesontools.install("-C _build install") diff --git a/util/antivirus/clamav/pspec.xml b/util/antivirus/clamav/pspec.xml index fece8eea38..b94be2a84e 100644 --- a/util/antivirus/clamav/pspec.xml +++ b/util/antivirus/clamav/pspec.xml @@ -29,6 +29,7 @@ python3-devel libxml2-devel libpcre2-devel + libiconv-devel daemon_confs.patch @@ -47,6 +48,7 @@ ncurses openssl libpcre2 + libiconv @@ -101,7 +103,7 @@ - 2023-02-24 + 2023-03-09 1.0.1 Version bump. fury