From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 27 00:50:27 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 5695716A4CE for ; Wed, 27 Oct 2004 00:50:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E84E43D1F for ; Wed, 27 Oct 2004 00:50:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9R0oReA035447 for ; Wed, 27 Oct 2004 00:50:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9R0oRTk035446; Wed, 27 Oct 2004 00:50:27 GMT (envelope-from gnats) Date: Wed, 27 Oct 2004 00:50:27 GMT Message-Id: <200410270050.i9R0oRTk035446@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Marcus Grando Subject: Re: ports/71504: Update security/clamav-devel to 20040908 (update in libclamav to detect "PK00PK") X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2004 00:50:27 -0000 The following reply was made to PR ports/71504; it has been noted by GNATS. From: Marcus Grando To: freebsd-gnats-submit@FreeBSD.org, rob@debank.tv Cc: Subject: Re: ports/71504: Update security/clamav-devel to 20040908 (update in libclamav to detect "PK00PK") Date: Tue, 26 Oct 2004 21:41:58 -0300 Update security/clamav-devel to 20041026 Please apply this new patch. --begin-- diff -ruN clamav-devel.old/Makefile clamav-devel/Makefile --- clamav-devel.old/Makefile Sat Oct 16 01:19:50 2004 +++ clamav-devel/Makefile Tue Oct 26 21:18:27 2004 @@ -6,7 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 20040826 +PORTVERSION= 20041026 CATEGORIES= security MASTER_SITES= http://www.clamav.net/snapshot/ PKGNAMESUFFIX= -devel @@ -46,7 +46,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" MAN1= clamscan.1 freshclam.1 sigtool.1 clamdscan.1 -MAN5= clamav.conf.5 freshclam.conf.5 +MAN5= clamd.conf.5 freshclam.conf.5 MAN8= clamd.8 clamav-milter.8 CONFLICTS= clamav-0.* @@ -113,10 +113,10 @@ @cd ${WRKSRC} && ${ACLOCAL} post-build: - @${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \ - > ${BUILD_WRKSRC}/etc/clamav.conf.default - @${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \ - ${BUILD_WRKSRC}/etc/clamav.conf + @${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamd.conf \ + > ${BUILD_WRKSRC}/etc/clamd.conf.default + @${CP} ${BUILD_WRKSRC}/etc/clamd.conf.default \ + ${BUILD_WRKSRC}/etc/clamd.conf @${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/freshclam.conf \ > ${BUILD_WRKSRC}/etc/freshclam.conf.default @${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \ @@ -137,12 +137,12 @@ .endif post-install: - @[ -f ${PREFIX}/etc/clamav.conf ] || \ - ${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \ - ${PREFIX}/etc/clamav.conf - @[ -f ${PREFIX}/etc/clamav.conf.default ] || \ - ${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \ - ${PREFIX}/etc/clamav.conf.default + @[ -f ${PREFIX}/etc/clamd.conf ] || \ + ${CP} ${BUILD_WRKSRC}/etc/clamd.conf.default \ + ${PREFIX}/etc/clamd.conf + @[ -f ${PREFIX}/etc/clamd.conf.default ] || \ + ${CP} ${BUILD_WRKSRC}/etc/clamd.conf.default \ + ${PREFIX}/etc/clamd.conf.default @[ -f ${PREFIX}/etc/freshclam.conf ] || \ ${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \ ${PREFIX}/etc/freshclam.conf diff -ruN clamav-devel.old/distinfo clamav-devel/distinfo --- clamav-devel.old/distinfo Thu Sep 2 12:24:16 2004 +++ clamav-devel/distinfo Tue Oct 26 21:20:27 2004 @@ -1,2 +1,2 @@ -MD5 (clamav-devel-20040826.tar.gz) = c739f4d138863a27ce57976e6bb67deb -SIZE (clamav-devel-20040826.tar.gz) = 1660493 +MD5 (clamav-devel-20041026.tar.gz) = d8b8a11ebc35dfd6336b2c7332de8329 +SIZE (clamav-devel-20041026.tar.gz) = 1311519 diff -ruN clamav-devel.old/files/clamav-clamd.sh clamav-devel/files/clamav-clamd.sh --- clamav-devel.old/files/clamav-clamd.sh Wed Feb 18 17:24:40 2004 +++ clamav-devel/files/clamav-clamd.sh Tue Oct 26 21:19:43 2004 @@ -24,7 +24,7 @@ command=%%PREFIX%%/sbin/clamd pidfile=/var/run/clamav/clamd.pid required_dirs=%%DATADIR%% -required_files=%%PREFIX%%/etc/clamav.conf +required_files=%%PREFIX%%/etc/clamd.conf stop_postcmd=stop_postcmd diff -ruN clamav-devel.old/files/clamav-freshclam.sh clamav-devel/files/clamav-freshclam.sh --- clamav-devel.old/files/clamav-freshclam.sh Fri Jun 11 17:04:30 2004 +++ clamav-devel/files/clamav-freshclam.sh Tue Oct 26 21:19:53 2004 @@ -28,7 +28,7 @@ # set defaults clamav_freshclam_enable=${clamav_freshclam_enable:-"NO"} -clamav_freshclam_flags=${clamav_freshclam_flags:-"--pid=/var/run/clamav/freshclam.pid --daemon-notify=%%PREFIX%%/etc/clamav.conf"} +clamav_freshclam_flags=${clamav_freshclam_flags:-"--pid=/var/run/clamav/freshclam.pid --daemon-notify=%%PREFIX%%/etc/clamd.conf"} load_rc_config $name diff -ruN clamav-devel.old/files/clamav-milter.sh clamav-devel/files/clamav-milter.sh --- clamav-devel.old/files/clamav-milter.sh Fri Jan 16 15:39:46 2004 +++ clamav-devel/files/clamav-milter.sh Tue Oct 26 21:20:06 2004 @@ -23,7 +23,7 @@ command=%%PREFIX%%/sbin/clamav-milter required_dirs=%%DATADIR%% -required_files=%%PREFIX%%/etc/clamav.conf +required_files=%%PREFIX%%/etc/clamd.conf start_precmd=start_precmd diff -ruN clamav-devel.old/pkg-plist clamav-devel/pkg-plist --- clamav-devel.old/pkg-plist Fri Jun 11 17:04:30 2004 +++ clamav-devel/pkg-plist Tue Oct 26 21:18:53 2004 @@ -18,9 +18,9 @@ %%PORTDOCS%%%%DOCSDIR%%/clamav-mirror-howto.pdf %%PORTDOCS%%%%DOCSDIR%%/clamdoc.pdf %%PORTDOCS%%%%DOCSDIR%%/signatures.pdf -@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/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi +etc/clamd.conf.default +@exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.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 --end-- -- Marcus Grando Grupos Internet S/A marcus(at)corp.grupos.com.br