diff options
-rw-r--r-- | security/clamav/Makefile | 7 | ||||
-rw-r--r-- | security/clamav/distinfo | 4 | ||||
-rw-r--r-- | security/clamav/patches/patch-configure | 33 |
3 files changed, 36 insertions, 8 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index c20f7405440..9ee00ce75a9 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2019/10/10 15:43:44 prlw1 Exp $ +# $NetBSD: Makefile,v 1.57 2019/10/31 11:22:15 jperkin Exp $ .include "Makefile.common" @@ -62,6 +62,9 @@ PKG_USERS_VARS= CLAMAV_USER EGDIR= ${PREFIX}/share/examples/clamav CONF_SAMPLES= clamd.conf freshclam.conf + +.include "options.mk" + OWN_DIRS_PERMS= ${CLAMAV_DBDIR} ${CLAMAV_USER} ${CLAMAV_GROUP} 0775 CONF_FILES= # empty CONF_FILES_PERMS= # empty @@ -71,8 +74,6 @@ CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} INSTALLATION_DIRS+= ${EGDIR} -.include "options.mk" - post-install: .for i in ${CONF_SAMPLES} ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/${i}.sample ${DESTDIR}${EGDIR}/${i} diff --git a/security/clamav/distinfo b/security/clamav/distinfo index 5ba179ce879..25dffa5305b 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2019/10/10 15:41:29 prlw1 Exp $ +$NetBSD: distinfo,v 1.30 2019/10/31 11:22:15 jperkin Exp $ SHA1 (clamav-0.102.0.tar.gz) = 42413ff5eaed69f20a3756fa3b06cbbb63ee7766 RMD160 (clamav-0.102.0.tar.gz) = ef57b3c3d09ba2441251e13ea8963e7b905500e7 @@ -8,7 +8,7 @@ SHA1 (patch-Makefile.in) = a11766ea353d81fb281a07c8120e8a1f5c8dc60f SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5 SHA1 (patch-ab) = 78793f0267ce8c820b51937186dc17dabb4a1ccf SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336 -SHA1 (patch-configure) = 6f05e6ee90ce96e56e0f427b14d729c79a255067 +SHA1 (patch-configure) = a700ae41e961e0cfc82306f290a87f6c677a32f6 SHA1 (patch-etc_clamav-milter.conf.sample) = 0cbf22bf380213c9e9f2b9baf15d7eba745afd46 SHA1 (patch-etc_clamd.conf.sample) = 74c995c7df2d5b083bb4465d2ab4cb0cab8670b6 SHA1 (patch-etc_freshclam.conf.sample) = 520ffbca5421ef2dc270e3c5a13cfb36a469e676 diff --git a/security/clamav/patches/patch-configure b/security/clamav/patches/patch-configure index aade1b697ca..aca4e1cd230 100644 --- a/security/clamav/patches/patch-configure +++ b/security/clamav/patches/patch-configure @@ -1,6 +1,7 @@ -$NetBSD: patch-configure,v 1.5 2019/10/10 15:41:30 prlw1 Exp $ +$NetBSD: patch-configure,v 1.6 2019/10/31 11:22:15 jperkin Exp $ Portability fixes. +Move the checks for $have_milter to after it is defined. --- configure.orig 2019-10-01 17:24:08.000000000 +0000 +++ configure @@ -33,7 +34,20 @@ Portability fixes. CHECK_CPPFLAGS=$CHECK_CFLAGS else -@@ -29013,10 +29013,10 @@ fi +@@ -24689,6 +24689,12 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for systemd system unit installation directory... $with_systemdsystemunitdir" >&5 + $as_echo "checking for systemd system unit installation directory... $with_systemdsystemunitdir" >&6; } + ++# Check whether --enable-milter was given. ++if test "${enable_milter+set}" = set; then : ++ enableval=$enable_milter; have_milter=$enableval ++else ++ have_milter="no" ++fi + + if test "$have_milter" = "yes"; then + +@@ -29013,10 +29019,10 @@ fi ;; *) @@ -46,7 +60,7 @@ Portability fixes. BUILD_CLAMONACC_TRUE= BUILD_CLAMONACC_FALSE='#' else -@@ -29027,7 +29027,7 @@ fi +@@ -29027,7 +29033,7 @@ fi ;; esac else @@ -55,3 +69,16 @@ Portability fixes. BUILD_CLAMONACC_TRUE= BUILD_CLAMONACC_FALSE='#' else +@@ -29296,12 +29302,6 @@ if test $ac_cv_func_setpgrp_void = yes; + fi + fi + +-# Check whether --enable-milter was given. +-if test "${enable_milter+set}" = set; then : +- enableval=$enable_milter; have_milter=$enableval +-else +- have_milter="no" +-fi + + + # Check whether --enable-id-check was given. |