- Update to 20071212

- Unrar code was removed from clamav source due to license problems, and a patch
  was created. I've added an UNRAR option, Off by default.
- Cosmetic changes
- Fix rc.d/clamav-milter to change socket permissions after startup. It fixes
  proclems when sendmail or postfix cannot connect to this socket. [1]

Submitted by:	Chris St Denis <chris@smartt.com>  by email

3 files changed, 30 insertions, 11 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 1fdfa58caf6e..1f031e915b9a 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20071011
+PORTVERSION=	20071212
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		${MASTER_SITE_LOCAL}
@@ -22,7 +22,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 "Enavle zoo archives support" On \
+		UNZOO "Enable zoo archives support" On \
+		UNRAR "Enable rar archives support" Off \
 		MILTER "Compile the milter interface" Off \
 		LDAP "libmilter was built with LDAP" Off \
 		STDERR "Print logs to stderr instead of stdout" Off
@@ -118,18 +119,24 @@ PTHREAD_LIBS=	-lthr
 PTHREAD_LIBS=	-pthread
 .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(WITHOUT_UNZOO)
+.if defined(WITH_UNZOO)
 RUN_DEPENDS+=	unzoo:${PORTSDIR}/archivers/unzoo
 .endif
+.if defined(WITH_UNRAR)
+PATCH_SITES+=	http://www.clamav.net/patches/
+PATCHFILES+=	unrar.diff
+PATCH_DIST_STRIP+=	-p1
+CONFIGURE_ARGS+=	--enable-unrar
+.endif
 
 .if defined(WITH_MILTER)
 USE_RC_SUBR+=	clamav-milter
@@ -160,11 +167,13 @@ 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
+.if defined(WITH_UNRAR)
+	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
+		${WRKSRC}/libclamunrar/unrar.c
+.endif
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index d56bc01feb6f..0ea2080a635d 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,6 @@
-MD5 (clamav-devel-20071011.tar.gz) = c00bca2190973fbd2710c61dd17e1cf8
-SHA256 (clamav-devel-20071011.tar.gz) = d80818924c2de1b7a13ab5e0d254c3ee252a4dae8a4f49efaa443737e19d8c6c
-SIZE (clamav-devel-20071011.tar.gz) = 3042710
+MD5 (clamav-devel-20071212.tar.gz) = 77821f905f8e270193c2b9454da420a1
+SHA256 (clamav-devel-20071212.tar.gz) = be7bc61ba12e1208c57c08cd6d1b1d6b147a69248bb442283be57f4cb2a22fd2
+SIZE (clamav-devel-20071212.tar.gz) = 3016866
+MD5 (unrar.diff) = 3ee33ac3d02f5ef95b22905e49dc3ef7
+SHA256 (unrar.diff) = 859ea0a74c77cdb2e63e4b674e35d880c304282fab99786d1c9cfee92ce11607
+SIZE (unrar.diff) = 178262
diff --git a/security/clamav-devel/files/clamav-milter.in b/security/clamav-devel/files/clamav-milter.in
index 90a3f2bf8c2e..509d05e3d42c 100644
--- a/security/clamav-devel/files/clamav-milter.in
+++ b/security/clamav-devel/files/clamav-milter.in
@@ -27,6 +27,7 @@ required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
 start_precmd=start_precmd
+start_postcmd=start_postcmd
 
 start_precmd()
 {
@@ -56,12 +57,18 @@ start_precmd()
 	fi
 }
 
+start_postcmd()
+{
+	/bin/chmod ${clamav_milter_socket_mode} ${clamav_milter_socket}
+}
+
 # read settings, set default values
 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_socktimeout="60"}
+: ${clamav_milter_socket_mode="755"}
 
 : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
 : ${clamav_clamd_enable="NO"}