sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-03 11:56:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update security/clamav to 0.92

Browse source 
- 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
This commit is contained in:
Renato Botelho 2007-12-19 23:08:38 +00:00
parent 19a8a2ec33
commit e74905e54b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=204156
21 changed files with 104 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ftp/proftpd-devel/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= proftpd
DISTVERSION= 1.3.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@ -217,7 +217,7 @@ MODULES:=${MODULES}:mod_quotatab_sql
DISTFILES+= mod_clamav-0.5.1.tar.bz2:clam
USE_CLAMAV= yes
MODULES:=${MODULES}:mod_clamav
LIB_DEPENDS+= clamav.2:${PORTSDIR}/security/clamav
LIB_DEPENDS+= clamav.3:${PORTSDIR}/security/clamav
INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
.endif

4
ftp/proftpd/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= proftpd
DISTVERSION= 1.3.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@ -217,7 +217,7 @@ MODULES:=${MODULES}:mod_quotatab_sql
DISTFILES+= mod_clamav-0.5.1.tar.bz2:clam
USE_CLAMAV= yes
MODULES:=${MODULES}:mod_clamav
LIB_DEPENDS+= clamav.2:${PORTSDIR}/security/clamav
LIB_DEPENDS+= clamav.3:${PORTSDIR}/security/clamav
INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
.endif

1
mail/p5-Mail-ClamAV/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= Mail-ClamAV
PORTVERSION= 0.20
PORTREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail

31
mail/p5-Mail-ClamAV/files/patch-ClamAV.pm
View file

@ -1,6 +1,17 @@
--- ../Mail-ClamAV-0.05.orig/ClamAV.pm Mon Feb 23 16:04:36 2004
+++ ClamAV.pm Mon Feb 23 16:05:17 2004
@@ -138,12 +138,9 @@
--- ClamAV.pm.orig 2007-02-20 11:42:16.000000000 -0200
+++ ClamAV.pm 2007-12-18 14:31:54.000000000 -0200
@@ -73,10 +73,6 @@
CL_ESUPPORT
CL_ELOCKDB
- CL_ENCINIT
- CL_ENCLOAD
- CL_ENCIO
-
CL_SCAN_RAW
CL_SCAN_ARCHIVE
CL_SCAN_MAIL
@@ -169,12 +165,9 @@
VERSION => $VERSION,
PREFIX => 'clamav_perl_',
NAME => "Mail::ClamAV",
@ -16,3 +27,17 @@
use Inline C => <<'END_OF_C';
#include <stdio.h>
#include <string.h>
@@ -496,13 +489,7 @@
if (strEQ("CL_ESUPPORT", name)) return CL_ESUPPORT;
if (strEQ("CL_ELOCKDB", name)) return CL_ELOCKDB;
- /* NodalCore */
- if (strEQ("CL_ENCINIT", name)) return CL_ENCINIT;
- if (strEQ("CL_ENCLOAD", name)) return CL_ENCLOAD;
- if (strEQ("CL_ENCIO", name)) return CL_ENCIO;
-
/* db options */
- if (strEQ("CL_DB_NCORE", name)) return CL_DB_NCORE;
if (strEQ("CL_DB_PHISHING", name)) return CL_DB_PHISHING;
if (strEQ("CL_DB_ACONLY", name)) return CL_DB_ACONLY;
if (strEQ("CL_DB_PHISHING_URLS", name)) return CL_DB_PHISHING_URLS;

2
mail/qsheff/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= qsheff-II
PORTVERSION= 2.1.r2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://www.enderunix.org/qsheff/ \
${MASTER_SITE_SOURCEFORGE}

2
mail/simscan/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= simscan
PORTVERSION= 1.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= mail security
MASTER_SITES= http://www.inter7.com/simscan/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}

1
security/clamassassin/Makefile
View file

@ -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}/

24
security/clamav/Makefile
View file

@ -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

9
security/clamav/distinfo
View file

@ -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

10
security/clamav/pkg-plist
View file

@ -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

4
security/clamcour/Makefile
View file

@ -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}

2
security/klamav/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= klamav
PORTVERSION= 0.41
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= klamav

11
security/klamav/files/patch-src__klamd__scanner.c Normal file
View file

@ -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);

9
security/klamav/files/patch-src__klamd__scanner.h Normal file
View file

@ -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

2
security/p5-File-Scan-ClamAV/Makefile
View file

@ -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

4
security/py-clamav/Makefile
View file

@ -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

2
security/squidclam/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= squidclam
PORTVERSION= 0.11
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

4
www/c-icap/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= c-icap
PORTVERSION= 030606
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
@ -55,7 +55,7 @@ CONFIGURE_ARGS+= --without-perl
.endif
.if !defined(WITHOUT_CLAMAV)
LIB_DEPENDS+= clamav.2:${PORTSDIR}/security/clamav
LIB_DEPENDS+= clamav.3:${PORTSDIR}/security/clamav
PLIST_SUB+= CLAMAV=""
CONFIGURE_ARGS+= --with-clamav
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \

6
www/gurlchecker/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= gurlchecker
PORTVERSION= 0.10.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= www gnome
MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
MASTER_SITE_SUBDIR= 547
@ -20,7 +20,7 @@ LIB_DEPENDS= gnet-2.0.0:${PORTSDIR}/net/gnet2 \
OPTIONS= CROCO "Use CROCO library for CSS2 validation" off \
TIDY "Use TIDY library for HTML w3c validation" off \
CLAMAV "Use CLAMAV library for virii scan" off \
CLAMAV "Use CLAMAV library for virii scan" on \
GNUTLS "Use GNU TLS library for HTTPS check" on
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --disable-tidy
.endif
.if defined(WITH_CLAMAV)
LIB_DEPENDS+= clamav.2:${PORTSDIR}/security/clamav
LIB_DEPENDS+= clamav.3:${PORTSDIR}/security/clamav
.else
CONFIGURE_ARGS+= --disable-clamav
.endif

3
www/havp/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= havp
PORTVERSION= 0.86
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.server-side.de/download/ \
http://bio3k.softboard.ru/uploads/arch/
@ -14,7 +15,7 @@ MASTER_SITES= http://www.server-side.de/download/ \
MAINTAINER= b3k@mail.ru
COMMENT= HTTP Antivirus Proxy
LIB_DEPENDS= clamav.2:${PORTSDIR}/security/clamav
LIB_DEPENDS= clamav.3:${PORTSDIR}/security/clamav
GNU_CONFIGURE= yes
USE_GMAKE= yes

4
www/mod_clamav/Makefile
View file

@ -7,14 +7,14 @@
PORTNAME= mod_clamav
PORTVERSION= 0.21
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www security
MASTER_SITES= http://software.othello.ch/mod_clamav/
MAINTAINER= tmueko@kommunity.net
COMMENT= Scans content delivered by the Apache2 proxy module for viruses
LIB_DEPENDS+= clamav:${PORTSDIR}/${CLAMAV_PORT}
LIB_DEPENDS+= clamav.3:${PORTSDIR}/${CLAMAV_PORT}
USE_AUTOTOOLS= libtool:15
USE_APACHE= YES