[Midnightbsd-cvs] mports: security/clamav: Update to 0.92.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Dec 27 21:58:16 EST 2007
Log Message:
-----------
Update to 0.92.
Add options for each type of compression utility.
Set license to agg.
Modified Files:
--------------
mports/security/clamav:
Makefile (r1.9 -> r1.10)
distinfo (r1.7 -> r1.8)
pkg-plist (r1.3 -> r1.4)
mports/security/clamav/files:
clamav-clamd.in (r1.1 -> r1.2)
clamav-freshclam.in (r1.1 -> r1.2)
clamav-milter.in (r1.3 -> r1.4)
pkg-deinstall.in (r1.2 -> r1.3)
pkg-install.in (r1.2 -> r1.3)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/security/clamav/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L security/clamav/pkg-plist -L security/clamav/pkg-plist -u -r1.3 -r1.4
--- security/clamav/pkg-plist
+++ security/clamav/pkg-plist
@@ -8,10 +8,19 @@
%%CLAMAV-MILTER%%sbin/clamav-milter
sbin/clamd
include/clamav.h
-lib/libclamav.so.2
+include/clamav-config.h
+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
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/clamav/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L security/clamav/Makefile -L security/clamav/Makefile -u -r1.9 -r1.10
--- security/clamav/Makefile
+++ security/clamav/Makefile
@@ -7,20 +7,23 @@
#
PORTNAME= clamav
-PORTVERSION= 0.91.2
-PORTREVISION= 1
+PORTVERSION= 0.92
CATEGORIES= security
MASTER_SITES= SF
MAINTAINER= ports at MidnightBSD.org
COMMENT= Command line virus scanner written entirely in C
+LICENSE= agg
+# gpl, lgpl, a "freeware license for unrar code that is not that free..."
LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
-RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha \
- arj:${PORTSDIR}/archivers/arj \
- arc:${PORTSDIR}/archivers/arc
-OPTIONS= MILTER "Compile the milter interface" Off \
+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 \
EXPERIMENTAL "Build experimental code" Off
@@ -99,6 +102,25 @@
# Only works with -lthr
PTHREAD_LIBS= -lthr
+.if defined(WITH_ARC)
+RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc
+.endif
+.if defined(WITH_ARJ)
+RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj
+.endif
+.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
.if defined(WITH_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
@@ -131,17 +153,25 @@
@${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
+ ${WRKSRC}/libclamunrar/unrar.c
@${REINPLACE_CMD} ${SED_CONF} \
${WRKSRC}/etc/clamd.conf \
${WRKSRC}/etc/freshclam.conf
+pre-install:
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
+ @${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include
+.for c in clamd freshclam
+ @[ -f ${PREFIX}/etc/${c}.conf ] || \
+ ${CP} ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
+.endfor
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/html
@${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
.endif
+ @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/security/clamav/distinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -L security/clamav/distinfo -L security/clamav/distinfo -u -r1.7 -r1.8
--- security/clamav/distinfo
+++ 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
Index: pkg-install.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/pkg-install.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L security/clamav/files/pkg-install.in -L security/clamav/files/pkg-install.in -u -r1.2 -r1.3
--- security/clamav/files/pkg-install.in
+++ security/clamav/files/pkg-install.in
@@ -1,5 +1,6 @@
#!/bin/sh
# $FreeBSD: ports/security/clamav/files/pkg-install.in,v 1.4 2007/02/18 16:12:37 garga Exp $
+# $MidnightBSD$
PREFIX=${PKG_PREFIX:-%%PREFIX%%}
Index: clamav-milter.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/clamav-milter.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -L security/clamav/files/clamav-milter.in -L security/clamav/files/clamav-milter.in -u -r1.3 -r1.4
--- security/clamav/files/clamav-milter.in
+++ security/clamav/files/clamav-milter.in
@@ -1,6 +1,7 @@
#!/bin/sh
#
# $FreeBSD: ports/security/clamav/files/clamav-milter.in,v 1.4 2007/06/05 14:22:46 garga Exp $
+# $MidnightBSD$
#
# PROVIDE: clamav-milter
@@ -36,7 +37,7 @@
fi
rc_flags="--pidfile ${pidfile} ${flags:-$clamav_milter_flags} $clamav_milter_socket"
- if checkyesno clamav_clamd_enable; then
+ if checkyesno clamav_clamd_enable && [ "x$clamav_clamd_socket" != "x" ]; then
echo -n "Waiting for clamd socket.. "
i=${clamav_milter_socktimeout}
while [ $i -ne 0 ]
Index: clamav-freshclam.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/clamav-freshclam.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/clamav/files/clamav-freshclam.in -L security/clamav/files/clamav-freshclam.in -u -r1.1 -r1.2
--- security/clamav/files/clamav-freshclam.in
+++ security/clamav/files/clamav-freshclam.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD: ports/security/clamav/files/clamav-freshclam.in,v 1.1 2006/04/06 15:20:18 garga Exp $
-#
+# $MidnightBSD$
# PROVIDE: freshclam
# REQUIRE: LOGIN clamd
Index: pkg-deinstall.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/pkg-deinstall.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L security/clamav/files/pkg-deinstall.in -L security/clamav/files/pkg-deinstall.in -u -r1.2 -r1.3
--- security/clamav/files/pkg-deinstall.in
+++ security/clamav/files/pkg-deinstall.in
@@ -1,5 +1,6 @@
#!/bin/sh
# $FreeBSD: ports/security/clamav/files/pkg-deinstall.in,v 1.2 2007/02/16 00:19:32 garga Exp $
+# $MidnightBSD$
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
@@ -8,7 +9,6 @@
CLAMAVUSER=%%CLAMAVUSER%%
echo
-echo "===================================================="
echo
echo "If you want remove clamav permanently from you system"
echo "execute following commands:"
@@ -20,7 +20,6 @@
echo " # pw userdel ${CLAMAVUSER}"
fi
echo
-echo "===================================================="
echo
exit 0
Index: clamav-clamd.in
===================================================================
RCS file: /home/cvs/mports/security/clamav/files/clamav-clamd.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/clamav/files/clamav-clamd.in -L security/clamav/files/clamav-clamd.in -u -r1.1 -r1.2
--- security/clamav/files/clamav-clamd.in
+++ security/clamav/files/clamav-clamd.in
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $FreeBSD: ports/security/clamav/files/clamav-clamd.in,v 1.1 2006/04/06 15:20:18 garga Exp $
-#
+# $MidnightBSD$
# PROVIDE: clamd
# REQUIRE: LOGIN
More information about the Midnightbsd-cvs
mailing list