diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/clamassassin/Makefile | 1 | ||||
-rw-r--r-- | security/clamav/Makefile | 24 | ||||
-rw-r--r-- | security/clamav/distinfo | 9 | ||||
-rw-r--r-- | security/clamav/pkg-plist | 10 | ||||
-rw-r--r-- | security/clamcour/Makefile | 4 | ||||
-rw-r--r-- | security/klamav/Makefile | 2 | ||||
-rw-r--r-- | security/klamav/files/patch-src__klamd__scanner.c | 11 | ||||
-rw-r--r-- | security/klamav/files/patch-src__klamd__scanner.h | 9 | ||||
-rw-r--r-- | security/p5-File-Scan-ClamAV/Makefile | 2 | ||||
-rw-r--r-- | security/py-clamav/Makefile | 4 | ||||
-rw-r--r-- | security/squidclam/Makefile | 2 |
11 files changed, 60 insertions, 18 deletions
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile index 0b06e4e5f514..65bb6a23ff37 100644 --- a/security/clamassassin/Makefile +++ b/security/clamassassin/Makefile @@ -7,6 +7,7 @@ PORTNAME= clamassassin PORTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://jameslick.com/clamassassin/ \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ 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 diff --git a/security/clamcour/Makefile b/security/clamcour/Makefile index a4a6023be698..31e2cedf2073 100644 --- a/security/clamcour/Makefile +++ b/security/clamcour/Makefile @@ -7,7 +7,7 @@ PORTNAME= clamcour PORTVERSION= 0.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security mail MASTER_SITES= http://www.becrux.com/pages/projects/clamcour/ @@ -15,7 +15,7 @@ MAINTAINER= bsd@dino.sk COMMENT= ClamAV courier filter BUILD_DEPENDS= courier-config:${PORTSDIR}/mail/courier -LIB_DEPENDS= clamav.2:${PORTSDIR}/security/clamav +LIB_DEPENDS= clamav.3:${PORTSDIR}/security/clamav GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/security/klamav/Makefile b/security/klamav/Makefile index bbff033cdf96..fe44f76f0bf7 100644 --- a/security/klamav/Makefile +++ b/security/klamav/Makefile @@ -7,7 +7,7 @@ PORTNAME= klamav PORTVERSION= 0.41 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= klamav diff --git a/security/klamav/files/patch-src__klamd__scanner.c b/security/klamav/files/patch-src__klamd__scanner.c new file mode 100644 index 000000000000..24c1360951cb --- /dev/null +++ b/security/klamav/files/patch-src__klamd__scanner.c @@ -0,0 +1,11 @@ +--- src/klamd/scanner.c.orig 2007-12-19 08:33:50.000000000 -0200 ++++ src/klamd/scanner.c 2007-12-19 08:36:04.000000000 -0200 +@@ -396,7 +396,7 @@ + + logg("*Accepted connection on port %d, fd %d\n", port, acceptd); + +- if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) { ++ if (cli_gentempfd(NULL, &tmpname, &tmpd) ) { + shutdown(sockfd, 2); + close(sockfd); + close(acceptd); diff --git a/security/klamav/files/patch-src__klamd__scanner.h b/security/klamav/files/patch-src__klamd__scanner.h new file mode 100644 index 000000000000..18572cd1d383 --- /dev/null +++ b/security/klamav/files/patch-src__klamd__scanner.h @@ -0,0 +1,9 @@ +--- src/klamd/scanner.h.orig 2007-12-19 08:34:32.000000000 -0200 ++++ src/klamd/scanner.h 2007-12-19 08:34:52.000000000 -0200 +@@ -33,4 +33,6 @@ + + int checksymlink(const char *path); + ++extern int cli_gentempfd(const char *dir, char **name, int *fd); ++ + #endif diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile index 0737b0a78c58..c9ab8b88ad47 100644 --- a/security/p5-File-Scan-ClamAV/Makefile +++ b/security/p5-File-Scan-ClamAV/Makefile @@ -7,7 +7,7 @@ PORTNAME= File-Scan-ClamAV PORTVERSION= 1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= File diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile index d4db878ce5ae..25158f8b5d1f 100644 --- a/security/py-clamav/Makefile +++ b/security/py-clamav/Makefile @@ -7,7 +7,7 @@ PORTNAME= clamav PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security python MASTER_SITES= http://xael.org/norman/python/pyclamav/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= mnag@FreeBSD.org COMMENT= A python binding to libclamav written in C -LIB_DEPENDS= clamav.2:${PORTSDIR}/security/clamav +LIB_DEPENDS= clamav.3:${PORTSDIR}/security/clamav DIST_SUBDIR= python USE_PYTHON= yes diff --git a/security/squidclam/Makefile b/security/squidclam/Makefile index 9fa9e4806ea0..a6e69d96b314 100644 --- a/security/squidclam/Makefile +++ b/security/squidclam/Makefile @@ -7,7 +7,7 @@ PORTNAME= squidclam PORTVERSION= 0.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} |