[Midnightbsd-cvs] mports [15825] trunk/security/clamav: clamav 0.98
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Jan 23 07:42:56 EST 2014
Revision: 15825
http://svnweb.midnightbsd.org/mports/?rev=15825
Author: laffer1
Date: 2014-01-23 07:42:55 -0500 (Thu, 23 Jan 2014)
Log Message:
-----------
clamav 0.98
Modified Paths:
--------------
trunk/security/clamav/Makefile
trunk/security/clamav/distinfo
trunk/security/clamav/files/clamav-clamd.in
trunk/security/clamav/files/clamav-milter.in
trunk/security/clamav/files/pkg-deinstall.in
trunk/security/clamav/files/pkg-install.in
trunk/security/clamav/pkg-plist
Added Paths:
-----------
trunk/security/clamav/files/patch-libclamav__bignum_fast.h
Removed Paths:
-------------
trunk/security/clamav/files/patch-etc_Makefile.in
Modified: trunk/security/clamav/Makefile
===================================================================
--- trunk/security/clamav/Makefile 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/Makefile 2014-01-23 12:42:55 UTC (rev 15825)
@@ -1,16 +1,17 @@
# $MidnightBSD$
PORTNAME= clamav
-PORTVERSION= 0.97.8
+PORTVERSION= 0.98
CATEGORIES= security
MASTER_SITES= SF
MAINTAINER= ports at MidnightBSD.org
COMMENT= Command line virus scanner written entirely in C
+
LICENSE= gpl2
OPTIONS_DEFINE= ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
- EXPERIMENTAL DOCS
+ EXPERIMENTAL DOCS IPV6
ARC_DESC= Enable arch archives support
ARJ_DESC= Enable arj archives support
@@ -23,14 +24,27 @@
STDERR_DESC= Print logs to stderr instead of stdout
EXPERIMENTAL_DESC= Build experimental code
-OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM DOCS
+OPTIONS_DEFAULT= ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6
+ARC_RUN_DEPENDS= arc:${PORTSDIR}/archivers/arc
+ARJ_RUN_DEPENDS= arj:${PORTSDIR}/archivers/arj
+LHA_RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha
+UNZOO_RUN_DEPENDS= unzoo:${PORTSDIR}/archivers/unzoo
+UNRAR_CONFIGURE_ENABLE= unrar
+MILTER_CONFIGURE_ENABLE=milter
+TESTS_CONFIGURE_ENABLE= check
+TESTS_BUILD_DEPENDS= ${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
+ICONV_CONFIGURE_ON= --with-iconv
+ICONV_CONFIGURE_OFF= --without-iconv
+ICONV_USES= iconv
+EXPERIMENTAL_CONFIGURE_ENABLE= experimental
+IPV6_CONFIGURE_ENABLE= ipv6
+
GNU_CONFIGURE= yes
-MAKE_JOBS_SAFE= yes
USE_LDCONFIG= yes
USE_GCC= any
+USES= gmake
USE_RC_SUBR= clamav-clamd clamav-freshclam
-CLAM_CONF_FILES= clamd freshclam
PORTDOCS= *
@@ -40,6 +54,7 @@
PLIST_SUB+= DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
PY_NO_THREAD= ${WRKDIR}/.python-has-no-threads
USE_AUTOTOOLS= libltdl
+OPTIONS_SUB= yes
CONFIGURE_ARGS= --libdir=${PREFIX}/lib \
--with-dbdir=${DBDIR} \
@@ -60,19 +75,6 @@
# force to use -lthr until it's not fixed.
PTHREAD_LIBS= -lthr
-MAN1= clambc.1 \
- clamconf.1 \
- clamscan.1 \
- freshclam.1 \
- sigtool.1 \
- clamdscan.1 \
- clamdtop.1
-MAN5= clamav-milter.conf.5 \
- clamd.conf.5 \
- freshclam.conf.5
-MAN8= clamd.8 \
- clamav-milter.8
-
CONFLICTS?= clamav-devel-[0-9]* clamav-milter-[0-9]*
CLAMAVUSER?= clamav
@@ -111,31 +113,6 @@
.include <bsd.mport.options.mk>
-.if ${PORT_OPTIONS:MARC}
-RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc
-.endif
-.if ${PORT_OPTIONS:MARJ}
-RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj
-.endif
-.if ${PORT_OPTIONS:MLHA}
-RUN_DEPENDS+= lha:${PORTSDIR}/archivers/lha
-.endif
-.if ${PORT_OPTIONS:MUNZOO}
-RUN_DEPENDS+= unzoo:${PORTSDIR}/archivers/unzoo
-.endif
-.if ${PORT_OPTIONS:MUNRAR}
-PLIST_SUB+= UNRAR=""
-.else
-PLIST_SUB+= UNRAR="@comment "
-CONFIGURE_ARGS+=--disable-unrar
-.endif
-.if ${PORT_OPTIONS:MICONV}
-CONFIGURE_ARGS+=--with-iconv
-USES+= iconv
-.else
-CONFIGURE_ARGS+=--without-iconv
-.endif
-
.if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
CONFIGURE_ARGS+=--enable-llvm
. if defined(WITH_TESTS)
@@ -147,7 +124,6 @@
.if ${PORT_OPTIONS:MMILTER}
USE_RC_SUBR+= clamav-milter
-CLAM_CONF_FILES+= clamav-milter
. if ${PORT_OPTIONS:MLDAP} && exists(${LOCALBASE}/lib/libldap.so)
USE_OPENLDAP= yes
LDFLAGS+= -lldap
@@ -159,11 +135,6 @@
. else
CONFIGURE_ARGS+=--with-sendmail=/usr/sbin/sendmail
. endif
-
-CONFIGURE_ARGS+=--enable-milter
-PLIST_SUB+= CLAMAV-MILTER=""
-.else
-PLIST_SUB+= CLAMAV-MILTER="@comment "
.endif
.if ${PORT_OPTIONS:MSTDERR}
@@ -170,10 +141,6 @@
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-shared_output.c
.endif
-.if ${PORT_OPTIONS:MEXPERIMENTAL}
-CONFIGURE_ARGS+=--enable-experimental
-.endif
-
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
@@ -180,13 +147,6 @@
CFLAGS+= -march=i486
.endif
-.if ${PORT_OPTIONS:MTESTS} && ${OSVERSION} >= 3000
-BUILD_DEPENDS+= ${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
-CONFIGURE_ARGS+=--enable-check
-.else
-CONFIGURE_ARGS+=--disable-check
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
@@ -193,9 +153,9 @@
@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} ${SED_CONF} \
- ${WRKSRC}/etc/clamd.conf \
- ${WRKSRC}/etc/freshclam.conf \
- ${WRKSRC}/etc/clamav-milter.conf
+ ${WRKSRC}/etc/clamd.conf.sample \
+ ${WRKSRC}/etc/freshclam.conf.sample \
+ ${WRKSRC}/etc/clamav-milter.conf.sample
@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
${WRKSRC}/libclamunrar/unrar.c
@@ -215,20 +175,14 @@
.if ${PORT_OPTIONS:MTESTS} && ${OSVERSION} >= 3000
post-build:
@if [ ! -f "${PY_NO_THREAD}" ]; then \
- ${MAKE} -C ${WRKSRC} check; \
+ ${GMAKE} -C ${WRKSRC} check; \
fi
.endif
post-install:
${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include
-.for c in ${CLAM_CONF_FILES}
- @[ -f ${PREFIX}/etc/${c}.conf ] || \
- ${CP} -v ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
-.endfor
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}/html
${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
-.endif
.include <bsd.port.post.mk>
Modified: trunk/security/clamav/distinfo
===================================================================
--- trunk/security/clamav/distinfo 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/distinfo 2014-01-23 12:42:55 UTC (rev 15825)
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.97.8.tar.gz) = d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12
-SIZE (clamav-0.97.8.tar.gz) = 14609966
+SHA256 (clamav-0.98.tar.gz) = 113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6
+SIZE (clamav-0.98.tar.gz) = 37075245
Modified: trunk/security/clamav/files/clamav-clamd.in
===================================================================
--- trunk/security/clamav/files/clamav-clamd.in 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/files/clamav-clamd.in 2014-01-23 12:42:55 UTC (rev 15825)
@@ -36,7 +36,7 @@
#clamav .93 won't start without a valid main.c[vl]d file
clamav_clamd_precmd() {
if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then
- echo "Missing %%DBDIR%%/clamav/*.cvd or *.cld files. You must run freshclam first"
+ echo "Missing %%DBDIR%%/*.cvd or *.cld files. You must run freshclam first"
exit 1
fi
}
Modified: trunk/security/clamav/files/clamav-milter.in
===================================================================
--- trunk/security/clamav/files/clamav-milter.in 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/files/clamav-milter.in 2014-01-23 12:42:55 UTC (rev 15825)
@@ -1,6 +1,7 @@
#!/bin/sh
#
# $MidnightBSD$
+#
# PROVIDE: clamav-milter
# REQUIRE: LOGIN clamd
Deleted: trunk/security/clamav/files/patch-etc_Makefile.in
===================================================================
--- trunk/security/clamav/files/patch-etc_Makefile.in 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/files/patch-etc_Makefile.in 2014-01-23 12:42:55 UTC (rev 15825)
@@ -1,18 +0,0 @@
---- etc/Makefile.in.orig 2009-10-28 13:54:51.000000000 -0200
-+++ etc/Makefile.in 2009-10-28 15:24:27.000000000 -0200
-@@ -419,12 +419,9 @@
-
- install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(CFGINST)
-- @test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
-- $(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
-- @test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \
-- $(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
-- at BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ @test -f $(DESTDIR)$(CFGINST)/clamav-milter.conf || \
-- at BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)
-+ $(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)/clamd.conf.default
-+ $(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
-+ at BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ $(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)/clamav-milter.conf.default
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Added: trunk/security/clamav/files/patch-libclamav__bignum_fast.h
===================================================================
--- trunk/security/clamav/files/patch-libclamav__bignum_fast.h (rev 0)
+++ trunk/security/clamav/files/patch-libclamav__bignum_fast.h 2014-01-23 12:42:55 UTC (rev 15825)
@@ -0,0 +1,32 @@
+--- libclamav/bignum_fast.h
++++ libclamav/bignum_fast.h
+@@ -7,6 +7,14 @@
+ *
+ * Tom St Denis, tomstdenis at gmail.com
+ */
++
++/* Oct 1, 2013
++ * Adding clamav-config.h include here for size-checking on fall-through case
++ */
++#if HAVE_CONFIG_H
++#include "clamav-config.h"
++#endif
++
+ #ifndef TFM_H_
+ #define TFM_H_
+
+@@ -249,7 +257,13 @@
+ typedef signed long long long64;
+ #endif
+ #endif
+- typedef unsigned long fp_digit;
++ /* The code requires that fp_word be twice the size of fp_digit.
++ * Add size-checking for special case (both long and long long are 64) */
++ #if (SIZEOF_LONG == 8) && (SIZEOF_LONG_LONG == 8)
++ typedef unsigned int fp_digit;
++ #else
++ typedef unsigned long fp_digit;
++ #endif
+ typedef ulong64 fp_word;
+ #endif
+
Modified: trunk/security/clamav/files/pkg-deinstall.in
===================================================================
--- trunk/security/clamav/files/pkg-deinstall.in 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/files/pkg-deinstall.in 2014-01-23 12:42:55 UTC (rev 15825)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $MidnightBSD: mports/security/clamav/files/pkg-deinstall.in,v 1.3 2007/12/28 02:58:14 laffer1 Exp $
+# $MidnightBSD$
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
@@ -8,6 +8,7 @@
CLAMAVUSER=%%CLAMAVUSER%%
echo
+echo "===================================================="
echo
echo "If you want remove clamav permanently from you system"
echo "execute following commands:"
@@ -19,6 +20,7 @@
echo " # pw userdel ${CLAMAVUSER}"
fi
echo
+echo "===================================================="
echo
exit 0
Modified: trunk/security/clamav/files/pkg-install.in
===================================================================
--- trunk/security/clamav/files/pkg-install.in 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/files/pkg-install.in 2014-01-23 12:42:55 UTC (rev 15825)
@@ -1,5 +1,5 @@
#!/bin/sh
-# $MidnightBSD: mports/security/clamav/files/pkg-install.in,v 1.4 2008/04/18 21:40:47 laffer1 Exp $
+# $MidnightBSD$
PREFIX=${PKG_PREFIX:-%%PREFIX%%}
Modified: trunk/security/clamav/pkg-plist
===================================================================
--- trunk/security/clamav/pkg-plist 2014-01-06 15:11:55 UTC (rev 15824)
+++ trunk/security/clamav/pkg-plist 2014-01-23 12:42:55 UTC (rev 15825)
@@ -1,3 +1,4 @@
+ at comment $FreeBSD: head/security/clamav/pkg-plist 328486 2013-09-27 14:49:28Z garga $
bin/clamav-config
bin/clambc
bin/clamconf
@@ -6,7 +7,7 @@
bin/clamdscan
bin/freshclam
bin/sigtool
-%%CLAMAV-MILTER%%sbin/clamav-milter
+%%MILTER%%sbin/clamav-milter
sbin/clamd
include/clamav.h
include/clamav-config.h
@@ -20,17 +21,24 @@
%%UNRAR%%lib/libclamunrar_iface.so
%%UNRAR%%lib/libclamunrar_iface.so.7
libdata/pkgconfig/libclamav.pc
- at unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
-etc/clamd.conf.default
+man/man1/clambc.1
+man/man1/clamconf.1
+man/man1/clamdscan.1
+man/man1/clamdtop.1
+man/man1/clamscan.1
+man/man1/freshclam.1
+man/man1/sigtool.1
+man/man5/clamav-milter.conf.5
+man/man5/clamd.conf.5
+man/man5/freshclam.conf.5
+man/man8/clamav-milter.8
+man/man8/clamd.8
+ at unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.sample; then rm -f %D/etc/clamd.conf; fi
+etc/clamd.conf.sample
@exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
- at unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
-etc/freshclam.conf.default
-%%CLAMAV-MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.default; then rm -f %D/etc/clamav-milter.conf; fi
-%%CLAMAV-MILTER%%etc/clamav-milter.conf.default
+ at unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.sample; then rm -f %D/etc/freshclam.conf; fi
+etc/freshclam.conf.sample
@exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
- at unexec [ -s %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true
- at unexec [ -s %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true
- at cwd /
- at dirrmtry %%DBDIR%%
- at dirrmtry %%LOGDIR%%
- at dirrmtry %%RUNDIR%%
+%%MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.sample; then rm -f %D/etc/clamav-milter.conf; fi
+%%MILTER%%etc/clamav-milter.conf.sample
+%%MILTER%%@exec [ -f %B/clamav-milter.conf ] || cp %B/%f %B/clamav-milter.conf
More information about the Midnightbsd-cvs
mailing list