- Update to 0.95

7 files changed, 33 insertions, 53 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 1367e63759b0..445667d60ae7 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	clamav
-DISTVERSION=	0.94.2
+PORTVERSION=	0.95
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Command line virus scanner written entirely in C
 
-LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
-
 OPTIONS=	ARC "Enable arch archives support" On \
 		ARJ "Enable arj archives support" On \
 		LHA "Enable lha archives support" On \
@@ -30,6 +28,7 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
+CONF_FILES=	clamd freshclam
 
 PORTDOCS=	*
 
@@ -62,7 +61,8 @@ MAN1=		clamconf.1 \
 		clamscan.1 \
 		freshclam.1 \
 		sigtool.1 \
-		clamdscan.1
+		clamdscan.1 \
+		clamdtop.1
 MAN5=		clamd.conf.5 \
 		freshclam.conf.5
 MAN8=		clamd.8 \
@@ -89,7 +89,7 @@ SUB_LIST+=	DBDIR=${DBDIR} \
 
 SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
-		-e 's|^\#?(PidFile) .*/([a-z]+\.pid)$$|\1 ${RUNDIR}/\2|' \
+		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${RUNDIR}/\2|' \
 		-e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \
 		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' \
@@ -97,7 +97,9 @@ SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
 		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(FixStaleSocket).*$$|\1 yes|' \
-		-e 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|'
+		-e 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' \
+		-e 's|^\#?(MilterSocket) */tmp.*$$|\1 ${CLAMAV_MILTER_SOCKET}|' \
+		-e 's|^\#?(ClamdSocket).*$$|\1 unix:${CLAMAV_CLAMD_SOCKET}|'
 
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
@@ -131,6 +133,7 @@ CONFIGURE_ARGS+=--without-iconv
 
 .if defined(WITH_MILTER)
 USE_RC_SUBR+=	clamav-milter
+CONF_FILES+=	clamav-milter
 . if defined(WITH_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
 USE_OPENLDAP=	yes
 LDFLAGS+=	-lldap
@@ -160,11 +163,12 @@ CONFIGURE_ARGS+=	--enable-experimental
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,g' \
+	@${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/freshclam.conf \
+		${WRKSRC}/etc/clamav-milter.conf
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
@@ -173,7 +177,7 @@ pre-su-install:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include
-.for c in clamd freshclam
+.for c in ${CONF_FILES}
 	@[ -f ${PREFIX}/etc/${c}.conf ] || \
 		${CP} -v ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
 .endfor
@@ -181,9 +185,6 @@ post-install:
 	@${MKDIR} ${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
-. if defined(WITH_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/clamav-milter/INSTALL ${DOCSDIR}/INSTALL.clamav-milter
-. endif
 .endif
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index b8d68ddc2632..b3fcd2065c38 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.94.2.tar.gz) = 1181e6d62341b84708f126cc353f7ebf
-SHA256 (clamav-0.94.2.tar.gz) = 1aec7fecff375958d067aceeb9782d3ff0be7c13bed0eecf6240fb089f8d268c
-SIZE (clamav-0.94.2.tar.gz) = 22107637
+MD5 (clamav-0.95.tar.gz) = 98590386ba9a69039580b1bf48ca038b
+SHA256 (clamav-0.95.tar.gz) = 4f126ecfd20086c452f25aeb6757a200f68e87da82aa39542520435e2f7d31a7
+SIZE (clamav-0.95.tar.gz) = 24104169
diff --git a/security/clamav/files/clamav-clamd.in b/security/clamav/files/clamav-clamd.in
index d3d67d672bef..43704a5bd86b 100644
--- a/security/clamav/files/clamav-clamd.in
+++ b/security/clamav/files/clamav-clamd.in
@@ -22,7 +22,6 @@ name=clamav_clamd
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamd
-pidfile=%%RUNDIR%%/clamd.pid
 required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav-milter.in
index cb467c53f333..53450d44903e 100644
--- a/security/clamav/files/clamav-milter.in
+++ b/security/clamav/files/clamav-milter.in
@@ -21,10 +21,10 @@
 name=clamav_milter
 rcvar=`set_rcvar`
 
+conf_file=%%PREFIX%%/etc/clamav-milter.conf
 command=%%PREFIX%%/sbin/clamav-milter
-pidfile=%%RUNDIR%%/clamav-milter.pid
 required_dirs=%%DBDIR%%
-required_files=%%PREFIX%%/etc/clamd.conf
+required_files=${conf_file}
 
 start_precmd=start_precmd
 start_postcmd=start_postcmd
@@ -35,7 +35,7 @@ start_precmd()
 		warn "Stale socket $clamav_milter_socket removed."
 		rm "$clamav_milter_socket"
 	fi
-	rc_flags="--pidfile ${pidfile} ${flags:-$clamav_milter_flags} $clamav_milter_socket"
+	rc_flags="${flags:-$clamav_milter_flags}"
 
 	clamav_clamd_socket_prefix=${clamav_clamd_socket%:*}
 	# We can have inet or inet6, try to remove 6
@@ -93,7 +93,7 @@ start_postcmd()
 load_rc_config $name
 : ${clamav_milter_enable="NO"}
 : ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
-: ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"}
+: ${clamav_milter_flags="-c ${conf_file}"}
 : ${clamav_milter_socktimeout="60"}
 : ${clamav_milter_socket_mode="755"}
 : ${clamav_milter_socket_user="%%CLAMAVUSER%%"}
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure
index 17be13d43fa2..fc85efdcc7b6 100644
--- a/security/clamav/files/patch-configure
+++ b/security/clamav/files/patch-configure
@@ -18,29 +18,3 @@
      if test -d /usr/lib/libmilter ; then
  	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
      fi
-@@ -18806,19 +18806,25 @@
-     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
- 
- 
-+if echo "$sendmailver_a" | egrep -q '^[0-9]+$'; then
- cat >>confdefs.h <<_ACEOF
- #define SENDMAIL_VERSION_A $sendmailver_a
- _ACEOF
-+fi
- 
- 
-+if echo "$sendmailver_b" | egrep -q '^[0-9]+$'; then
- cat >>confdefs.h <<_ACEOF
- #define SENDMAIL_VERSION_B $sendmailver_b
- _ACEOF
-+fi
- 
- 
-+if echo "$sendmailver_c" | egrep -q '^[0-9]+$'; then
- cat >>confdefs.h <<_ACEOF
- #define SENDMAIL_VERSION_C $sendmailver_c
- _ACEOF
-+fi
- 
-   fi
-   if test "x$ac_cv_have_lresolv_r" != "xyes"; then
diff --git a/security/clamav/files/patch-etc::Makefile.in b/security/clamav/files/patch-etc_Makefile.in
index e47b65443c8e..336f5667c3e3 100644
--- a/security/clamav/files/patch-etc::Makefile.in
+++ b/security/clamav/files/patch-etc_Makefile.in
@@ -1,15 +1,18 @@
---- etc/Makefile.in.orig	Thu Feb 19 14:17:02 2004
-+++ etc/Makefile.in	Thu Feb 19 14:17:36 2004
-@@ -333,10 +333,8 @@
+--- etc/Makefile.in.orig	2009-02-17 22:43:14.000000000 -0300
++++ etc/Makefile.in	2009-02-18 08:14:54.000000000 -0300
+@@ -393,12 +393,9 @@
  
- install:
+ 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)
+-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	@test -f $(DESTDIR)$(CFGINST)/clamav-milter.conf || \
+-@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
++@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.
  .NOEXPORT:
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index 20e41ed8215b..17e2eda2b91d 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 bin/clamav-config
 bin/clamconf
+bin/clamdtop
 bin/clamscan
 bin/clamdscan
 bin/freshclam
@@ -12,21 +13,23 @@ include/clamav-config.h
 lib/libclamav.a
 lib/libclamav.la
 lib/libclamav.so
-lib/libclamav.so.5
+lib/libclamav.so.6
 %%UNRAR%%lib/libclamunrar.a
 %%UNRAR%%lib/libclamunrar.la
 %%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.5
+%%UNRAR%%lib/libclamunrar.so.6
 %%UNRAR%%lib/libclamunrar_iface.a
 %%UNRAR%%lib/libclamunrar_iface.la
 %%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.5
+%%UNRAR%%lib/libclamunrar_iface.so.6
 libdata/pkgconfig/libclamav.pc
 @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
 @exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
 @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
 @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
 @unexec [ -s %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true
 @unexec [ -s %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true