From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 19 06:00:39 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A3B016A4CE for ; Thu, 19 Feb 2004 06:00:39 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 917CC43D1F for ; Thu, 19 Feb 2004 06:00:39 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1JE0dbv022432 for ; Thu, 19 Feb 2004 06:00:39 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1JE0dYk022427; Thu, 19 Feb 2004 06:00:39 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 19 Feb 2004 06:00:39 -0800 (PST) Resent-Message-Id: <200402191400.i1JE0dYk022427@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Oliver Eikemeier Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A3E516A4CE for ; Thu, 19 Feb 2004 06:00:20 -0800 (PST) Received: from postman.arcor.de (postman4.arcor-online.net [151.189.0.154]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B86F43D1D for ; Thu, 19 Feb 2004 06:00:19 -0800 (PST) (envelope-from eikemeier@fillmore-labs.com) Received: from fillmore.dyndns.org (port-212-202-184-227.reverse.qdsl-home.de [212.202.184.227]) (authenticated bits=0)i1JE0CUa011249 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Thu, 19 Feb 2004 15:00:13 +0100 (MET) Received: from [172.16.0.2] (helo=fillmore-labs.com) by fillmore.dyndns.org with esmtp (Exim 4.30; FreeBSD) id 1Atoil-000DE3-Ib; Thu, 19 Feb 2004 15:00:07 +0100 Message-Id: <4034C167.4040903@fillmore-labs.com> Date: Thu, 19 Feb 2004 15:00:07 +0100 From: Oliver Eikemeier To: FreeBSD-gnats-submit@FreeBSD.org cc: =?UTF-8?B?5a+65pysIOaYjOW8mA==?= Subject: ports/63065: [PATCH] security/clamav: update to version 0.67-1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2004 14:00:39 -0000 >Number: 63065 >Category: ports >Synopsis: [PATCH] security/clamav: update to version 0.67-1 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 19 06:00:38 PST 2004 >Closed-Date: >Last-Modified: >Originator: Oliver Eikemeier >Release: FreeBSD 5.1-CURRENT i386 >Organization: Fillmore Labs - http://www.fillmore-labs.com >Environment: System: FreeBSD nuuk.fillmore-labs.com 5.1-CURRENT >Description: - update to version 0.67-1 - install NEWS/ChangeLog >How-To-Repeat: >Fix: Index: security/clamav/Makefile =================================================================== RCS file: /home/pcvs/ports/security/clamav/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- security/clamav/Makefile 10 Feb 2004 14:06:49 -0000 1.21 +++ security/clamav/Makefile 19 Feb 2004 13:58:34 -0000 @@ -6,11 +6,11 @@ # PORTNAME= clamav -PORTVERSION= 0.65 -PORTREVISION= 7 +PORTVERSION= ${DISTVERSION:S/-/./g} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= clamav +DISTNAME= ${PORTNAME}-${DISTVERSION} MAINTAINER= markun@onohara.to COMMENT= Command line virus scanner written entirely in C @@ -23,6 +23,8 @@ arc:${PORTSDIR}/archivers/arc \ unzip:${PORTSDIR}/archivers/unzip +DISTVERSION= 0.67-1 + USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -57,6 +59,7 @@ -e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \ -e 's|^\#?(User) .*$$|\1 clamav|' \ -e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \ + -e 's|^\#?(FixStaleSocket)$$|\1|' \ -e 's|^\#?(ScanMail)$$|\1|' .include @@ -88,17 +91,11 @@ ${WRKSRC}/clamav-milter/clamav-milter.c pre-configure: - @${REINPLACE_CMD} -e 's|clamav.conf|&.default|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ - ${CONFIGURE_WRKSRC}/etc/Makefile.in -.ifdef USE_LIBTOOL_VER @${REINPLACE_CMD} -e '/^LIBTOOL=/s|\$$(top_builddir)/libtool|${LIBTOOL}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.endif post-build: - @${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \ - >${BUILD_WRKSRC}/etc/clamav.conf.default + @${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf @${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL} @${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-clamd.sh \ >${WRKDIR}/clamav-clamd.sh @@ -114,18 +111,23 @@ ${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL post-install: - @${INSTALL_DATA} ${BUILD_WRKSRC}/etc/clamav.conf.default \ - ${PREFIX}/etc/clamav.conf.default @${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \ ${RC_DIR}/clamav-clamd${RC_SUFX} @${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \ ${RC_DIR}/clamav-freshclam${RC_SUFX} @${CHOWN} -R clamav:clamav ${DATADIR} - @[ -f ${PREFIX}/etc/clamav.conf ] || \ - ${CP} ${PREFIX}/etc/clamav.conf.default ${PREFIX}/etc/clamav.conf +.for c in clamav freshclam + @[ -f ${PREFIX}/etc/${c}.conf ] || \ + ${CP} ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf +.endfor .if defined(WITH_MILTER) @${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \ ${RC_DIR}/clamav-milter${RC_SUFX} +.endif +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${INSTALL_WRKSRC}/NEWS ${INSTALL_WRKSRC}/ChangeLog \ + ${DOCSDIR} .endif @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL Index: security/clamav/distinfo =================================================================== RCS file: /home/pcvs/ports/security/clamav/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- security/clamav/distinfo 19 Nov 2003 17:40:04 -0000 1.4 +++ security/clamav/distinfo 19 Feb 2004 13:58:34 -0000 @@ -1 +1,2 @@ -MD5 (clamav-0.65.tar.gz) = f2b8473190b6dc1fd9c64b9ebc49a5ad +MD5 (clamav-0.67-1.tar.gz) = e53d65fe2f7d4146f146c5720313381e +SIZE (clamav-0.67-1.tar.gz) = 2282367 Index: security/clamav/pkg-plist =================================================================== RCS file: /home/pcvs/ports/security/clamav/pkg-plist,v retrieving revision 1.11 diff -u -r1.11 pkg-plist --- security/clamav/pkg-plist 3 Feb 2004 06:46:21 -0000 1.11 +++ security/clamav/pkg-plist 19 Feb 2004 13:58:34 -0000 @@ -14,8 +14,13 @@ @unexec if cmp -s %D/etc/clamav.conf %D/etc/clamav.conf.default; then rm -f %D/etc/clamav.conf; fi etc/clamav.conf.default @exec [ -f %B/clamav.conf ] || cp %B/%f %B/clamav.conf +@unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi +etc/freshclam.conf.default +@exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf etc/rc.d/clamav-clamd%%RC_SUFX%% etc/rc.d/clamav-freshclam%%RC_SUFX%% +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog @owner clamav @group clamav %%DATADIR%%/daily.cvd Index: security/clamav/files/patch-clamav-milter::Makefile.in =================================================================== RCS file: /home/pcvs/ports/security/clamav/files/patch-clamav-milter::Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-clamav-milter::Makefile.in --- security/clamav/files/patch-clamav-milter::Makefile.in 8 Dec 2003 14:06:49 -0000 1.1 +++ security/clamav/files/patch-clamav-milter::Makefile.in 19 Feb 2004 13:58:34 -0000 @@ -1,14 +1,5 @@ --- clamav-milter/Makefile.in.orig Wed Nov 12 02:36:48 2003 +++ clamav-milter/Makefile.in Fri Nov 21 18:23:35 2003 -@@ -122,7 +122,7 @@ - - @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@clamav_milter_LDADD = ../clamd/cfgfile.o ../clamd/others.o ../clamscan/getopt.o - --@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = ../docs/clamav-milter.8 -+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = ../docs/man/clamav-milter.8 - - DEFS = @DEFS@ - # CLAMD_LIBS is used, because clamav-milter requires the same libraries as clamd @@ -162,7 +162,7 @@ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) Index: security/clamav/files/patch-configure =================================================================== RCS file: security/clamav/files/patch-configure diff -N security/clamav/files/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/clamav/files/patch-configure 19 Feb 2004 13:58:34 -0000 @@ -0,0 +1,20 @@ +--- /var/tmp/usr/FreeBSD/ports/security/clamav/work/clamav-0.67-1/configure.orig Thu Feb 19 14:18:40 2004 ++++ /var/tmp/usr/FreeBSD/ports/security/clamav/work/clamav-0.67-1/configure Thu Feb 19 14:19:31 2004 +@@ -9317,7 +9317,7 @@ + + + +-if test ! -r "$cfg_dir/clamav.conf"; then ++if true; then + INSTALL_CLAMAV_CONF_TRUE= + INSTALL_CLAMAV_CONF_FALSE='#' + else +@@ -9327,7 +9327,7 @@ + + + +-if test ! -r "$cfg_dir/freshclam.conf"; then ++if true; then + INSTALL_FRESHCLAM_CONF_TRUE= + INSTALL_FRESHCLAM_CONF_FALSE='#' + else Index: security/clamav/files/patch-etc::Makefile.in =================================================================== RCS file: security/clamav/files/patch-etc::Makefile.in diff -N security/clamav/files/patch-etc::Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ security/clamav/files/patch-etc::Makefile.in 19 Feb 2004 13:58:34 -0000 @@ -0,0 +1,13 @@ +--- /var/tmp/usr/FreeBSD/ports/security/clamav/work/clamav-0.67-1/etc/Makefile.in.orig Thu Feb 19 14:17:02 2004 ++++ /var/tmp/usr/FreeBSD/ports/security/clamav/work/clamav-0.67-1/etc/Makefile.in Thu Feb 19 14:17:36 2004 +@@ -248,8 +248,8 @@ + + install: + $(mkinstalldirs) $(DESTDIR)$(CFGINST) +-@INSTALL_CLAMAV_CONF_TRUE@ @$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST) +-@INSTALL_FRESHCLAM_CONF_TRUE@ @$(INSTALL_DATA) freshclam.conf $(DESTDIR)$(CFGINST) ++@INSTALL_CLAMAV_CONF_TRUE@ @$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)/clamav.conf.default ++@INSTALL_FRESHCLAM_CONF_TRUE@ @$(INSTALL_DATA) freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Index: security/clamav/files/patch-libclamav::message.c =================================================================== RCS file: security/clamav/files/patch-libclamav::message.c diff -N security/clamav/files/patch-libclamav::message.c --- security/clamav/files/patch-libclamav::message.c 10 Feb 2004 14:06:49 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ ---- libclamav/message.c.orig Wed Nov 5 11:59:53 2003 -+++ libclamav/message.c Tue Feb 10 14:39:23 2004 -@@ -878,15 +878,20 @@ - if(strcasecmp(line, "end") == 0) - break; - -- assert(strlen(line) <= 62); - if((line[0] & 0x3F) == ' ') - break; - - len = *line++ - ' '; - -- assert((len >= 0) && (len <= 63)); -- -- ptr = decode(line, ptr, uudecode, (len & 3) == 0); -+ if(len < 0 || len > 63) -+ /* -+ * In practice this should never occur since -+ * the maximum length of a uuencoded line is -+ * 62 characters -+ */ -+ cli_warnmsg("uudecode: buffer overflow stopped, attempting to ignore but decoding may fail"); -+ else -+ ptr = decode(line, ptr, uudecode, (len & 3) == 0); - break; - - case BINARY: >Release-Note: >Audit-Trail: >Unformatted: