- Update security/clamav to 0.92

- Add a new OPTION (RAR) because unrar code is optional to fix a license
  issue
- Some cosmetic changes
- Chase library version bump and bump PORTREVISION of all dependant ports

Approved by:	portmgr (pav)
Security:	CVE-2007-6335, CVE-2007-6336, CVE-2007-6337

3 files changed, 32 insertions, 11 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 19e71119c304..92632fe41c9e 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.91.2
-PORTREVISION=	1
+PORTVERSION=	0.92
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -19,6 +18,8 @@ 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 \
+		UNZOO "Enable zoo archives support" On \
+		UNRAR "Enable rar archives support" On \
 		MILTER "Compile the milter interface" Off \
 		LDAP "libmilter was built with LDAP" Off \
 		STDERR "Print logs to stderr instead of stdout" Off \
@@ -107,15 +108,24 @@ CONFIGURE_ARGS+=	--enable-gethostbyname_r
 PTHREAD_LIBS=	-lthr
 .endif
 
-.if !defined(WITHOUT_ARC)
+.if defined(WITH_ARC)
 RUN_DEPENDS+=	arc:${PORTSDIR}/archivers/arc
 .endif
-.if !defined(WITHOUT_ARJ)
+.if defined(WITH_ARJ)
 RUN_DEPENDS+=	arj:${PORTSDIR}/archivers/arj
 .endif
-.if !defined(WITHOUT_LHA)
+.if defined(WITH_LHA)
 RUN_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
 .endif
+.if defined(WITH_UNZOO)
+RUN_DEPENDS+=	unzoo:${PORTSDIR}/archivers/unzoo
+.endif
+.if defined(WITH_UNRAR)
+PLIST_SUB+=	UNRAR=""
+.else
+PLIST_SUB+=	UNRAR="@comment "
+CONFIGURE_ARGS+=	--disable-unrar
+.endif
 
 .if defined(WITH_MILTER)
 USE_RC_SUBR+=	clamav-milter
@@ -148,11 +158,11 @@ post-patch:
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,g' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
-		${WRKSRC}/libclamav/unrar/unrar.c
 	@${REINPLACE_CMD} ${SED_CONF} \
 		${WRKSRC}/etc/clamd.conf \
 		${WRKSRC}/etc/freshclam.conf
+	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
+		${WRKSRC}/libclamunrar/unrar.c
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 780c2bb6351a..9c7dc6442260 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,6 @@
-MD5 (clamav-0.91.2.tar.gz) = 2a7265d17cfa80c32858978f16a3f47b
-SHA256 (clamav-0.91.2.tar.gz) = dac9de86dff5ef4c9a6e4962da24988e1aa74948a21b7fb7b7fed17867ddf2a0
-SIZE (clamav-0.91.2.tar.gz) = 13394538
+MD5 (clamav-0.92.tar.gz) = e500651858a9187a87025c8a5c23969c
+SHA256 (clamav-0.92.tar.gz) = d3c8c1e2e0025a354663b330d69c8848c7a5c9d7248204c69362c2924366025e
+SIZE (clamav-0.92.tar.gz) = 14300798
+MD5 (unrar.diff) = 3ee33ac3d02f5ef95b22905e49dc3ef7
+SHA256 (unrar.diff) = 859ea0a74c77cdb2e63e4b674e35d880c304282fab99786d1c9cfee92ce11607
+SIZE (unrar.diff) = 178262
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index cce136a30848..c2c36a05035b 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -9,10 +9,18 @@ bin/sigtool
 sbin/clamd
 include/clamav.h
 include/clamav-config.h
-lib/libclamav.so.2
+lib/libclamav.so.3
 lib/libclamav.so
 lib/libclamav.a
 lib/libclamav.la
+%%UNRAR%%lib/libclamunrar.so.3
+%%UNRAR%%lib/libclamunrar.so
+%%UNRAR%%lib/libclamunrar.la
+%%UNRAR%%lib/libclamunrar.a
+%%UNRAR%%lib/libclamunrar_iface.so.3
+%%UNRAR%%lib/libclamunrar_iface.so
+%%UNRAR%%lib/libclamunrar_iface.la
+%%UNRAR%%lib/libclamunrar_iface.a
 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