diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/clamav/Makefile | 14 | ||||
| -rw-r--r-- | security/clamav/PLIST | 6 | ||||
| -rw-r--r-- | security/clamav/distinfo | 11 | ||||
| -rw-r--r-- | security/clamav/patches/patch-Makefile.in | 14 | ||||
| -rw-r--r-- | security/clamav/patches/patch-ad | 15 |
5 files changed, 27 insertions, 33 deletions
diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 7e20cf69728..12a074a6aec 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2014/05/08 10:19:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2014/05/08 16:01:09 jperkin Exp $ -DISTNAME= clamav-0.98.1 +DISTNAME= clamav-0.98.3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/} @@ -11,6 +11,7 @@ LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes SET_LIBDIR= yes @@ -19,8 +20,11 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} CONFIGURE_ARGS+= --with-user=${CLAMAV_USER} +CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl} CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} # pkgsrc enforces a "secure" version of zlib, so don't let this check # bomb the build @@ -38,6 +42,8 @@ CONFIGURE_ARGS+= --disable-readdir-r CONFIGURE_ARGS+= --enable-readdir_r .endif +CFLAGS.SunOS+= -D__EXTENSIONS__ + BUILD_DEFS+= CLAMAV_USER CLAMAV_GROUP CLAMAV_DBDIR FILES_SUBST+= CLAMAV_USER=${CLAMAV_USER} FILES_SUBST+= CLAMAV_GROUP=${CLAMAV_GROUP} @@ -46,7 +52,7 @@ MESSAGE_SUBST+= CLAMAV_USER=${CLAMAV_USER} SUBST_CLASSES+= vars SUBST_STAGE.vars= pre-configure -SUBST_FILES.vars= etc/clamd.conf +SUBST_FILES.vars= etc/clamd.conf.sample SUBST_VARS.vars= CLAMAV_DBDIR RCD_SCRIPTS= clamd freshclamd @@ -82,6 +88,8 @@ post-install: .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/clamav/PLIST b/security/clamav/PLIST index 7e5988989d2..e9314bbe8a4 100644 --- a/security/clamav/PLIST +++ b/security/clamav/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:13 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.6 2014/05/08 16:01:09 jperkin Exp $ bin/clamav-config bin/clambc bin/clamconf bin/clamdscan bin/clamdtop bin/clamscan +bin/clamsubmit bin/freshclam bin/sigtool include/clamav.h @@ -17,6 +18,7 @@ man/man1/clamconf.1 man/man1/clamdscan.1 man/man1/clamdtop.1 man/man1/clamscan.1 +man/man1/clamsubmit.1 man/man1/freshclam.1 man/man1/sigtool.1 man/man5/clamav-milter.conf.5 @@ -24,8 +26,8 @@ man/man5/clamd.conf.5 man/man5/freshclam.conf.5 man/man8/clamav-milter.8 man/man8/clamd.8 -sbin/clamd ${PLIST.milter}sbin/clamav-milter +sbin/clamd share/examples/clamav/clamav-milter.conf share/examples/clamav/clamd.conf share/examples/clamav/freshclam.conf diff --git a/security/clamav/distinfo b/security/clamav/distinfo index 53a3b8f84f7..64198257e16 100644 --- a/security/clamav/distinfo +++ b/security/clamav/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.12 2014/03/11 14:34:39 jperkin Exp $ +$NetBSD: distinfo,v 1.13 2014/05/08 16:01:09 jperkin Exp $ -SHA1 (clamav-0.98.1.tar.gz) = 9f04c0e81463c36f7e58d18f16d1b88f3332dcb8 -RMD160 (clamav-0.98.1.tar.gz) = 8899a07901493d5ea39c248417c2887d64101702 -Size (clamav-0.98.1.tar.gz) = 15431484 bytes -SHA1 (patch-Makefile.in) = c463edcef69422ff4b654f95d053e8600e34e313 +SHA1 (clamav-0.98.3.tar.gz) = 32f0a0675f8023b20e1d19fe8592e330674d0551 +RMD160 (clamav-0.98.3.tar.gz) = 95e036c1e6319e5d9fe4c7acad8e7ba93b4ba2e2 +Size (clamav-0.98.3.tar.gz) = 15543335 bytes +SHA1 (patch-Makefile.in) = 070fe734113de9fc6ce5f02de088b10281913b00 SHA1 (patch-aa) = 8539a90ac5591c86f7e9f6b8c073f36523f221a5 SHA1 (patch-ab) = fea995ea944c2ae0f51a41e1a1076badf65c6c8b -SHA1 (patch-ad) = c862658ceba98ac415b0c193fc205c5862ac4970 SHA1 (patch-af) = d217633ed33c72b6d01a9aeef03f0f5dd33b4336 SHA1 (patch-ag) = cf4a0040a53c81402e8d15478407bc854af6fb30 SHA1 (patch-etc_clamd.conf.sample) = 69bed1c88cf60f699e64fd361091621728b9f9d1 diff --git a/security/clamav/patches/patch-Makefile.in b/security/clamav/patches/patch-Makefile.in index 599120c3ced..7be219f6ee2 100644 --- a/security/clamav/patches/patch-Makefile.in +++ b/security/clamav/patches/patch-Makefile.in @@ -1,15 +1,15 @@ -$NetBSD: patch-Makefile.in,v 1.1 2013/10/02 18:30:13 adam Exp $ +$NetBSD: patch-Makefile.in,v 1.2 2014/05/08 16:01:10 jperkin Exp $ Install etc files manually. ---- Makefile.in.orig 2013-10-02 13:06:10.000000000 +0000 +--- Makefile.in.orig 2014-05-06 18:59:45.000000000 +0000 +++ Makefile.in -@@ -379,7 +379,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ +@@ -462,7 +462,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 --SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests -+SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs clamav-milter test clamdtop clambc unit_tests + SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool \ +- clamconf database docs etc clamav-milter test clamdtop clambc \ ++ clamconf database docs clamav-milter test clamdtop clambc \ + unit_tests $(am__append_1) EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32 bin_SCRIPTS = clamav-config - pkgconfigdir = $(libdir)/pkgconfig diff --git a/security/clamav/patches/patch-ad b/security/clamav/patches/patch-ad deleted file mode 100644 index ece6a680d92..00000000000 --- a/security/clamav/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2011/07/08 09:28:06 adam Exp $ - -Fix compilation error DragonFly. - ---- docs/Makefile.in.orig 2011-06-09 06:51:36.000000000 +0000 -+++ docs/Makefile.in -@@ -274,6 +274,8 @@ EXTRA_DIST = html $(top_srcdir)/docs/man - man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.conf.5 man/clamdscan.1 man/clamav-milter.8 man/clamav-milter.conf.5 man/freshclam.conf.5 man/clamconf.1 man/clamdtop.1 man/clambc.1 - all: all-am - -+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8 -+ - .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ |