From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 3 05:40:31 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 53EBD16A4CF for ; Mon, 3 May 2004 05:40:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF57643D5F for ; Mon, 3 May 2004 05:40:30 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i43CeUEB096640 for ; Mon, 3 May 2004 05:40:30 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i43CeUrk096639; Mon, 3 May 2004 05:40:30 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 3 May 2004 05:40:30 -0700 (PDT) Resent-Message-Id: <200405031240.i43CeUrk096639@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, Rob Evers Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D5ED716A4CE for ; Mon, 3 May 2004 05:39:23 -0700 (PDT) Received: from flappie.debank.tv (flappie.debank.tv [212.206.127.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0607943D48 for ; Mon, 3 May 2004 05:39:23 -0700 (PDT) (envelope-from rob@debank.tv) Received: from localhost (localhost.debank.tv [127.0.0.1]) by flappie.debank.tv (Postfix) with ESMTP id B8532529C for ; Mon, 3 May 2004 14:39:21 +0200 (CEST) Received: from flappie.debank.tv ([127.0.0.1]) by localhost (flappie.debank.tv [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 28271-03 for ; Mon, 3 May 2004 14:39:19 +0200 (CEST) Received: by flappie.debank.tv (Postfix, from userid 1001) id 6A902525A; Mon, 3 May 2004 14:39:19 +0200 (CEST) Message-Id: <20040503123919.6A902525A@flappie.debank.tv> Date: Mon, 3 May 2004 14:39:19 +0200 (CEST) From: Rob Evers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/66203: Update security/clamav-devel to latest snapshot X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rob Evers List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2004 12:40:31 -0000 >Number: 66203 >Category: ports >Synopsis: Update security/clamav-devel to latest snapshot >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon May 03 05:40:30 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Rob Evers >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD flappie.debank.tv 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Feb 29 20:35:15 CET 2004 rob@flappie.debank.tv:/usr/obj/usr/src/sys/FLAPPIE i386 >Description: Update security/clamav-devel to latest snapshot (20040503) -AllowSupplementaryGroups enabled by default -Removed OSVERSION check (not needed anymore) -Make the port look a bit more like security/clamav >How-To-Repeat: >Fix: --- clamav-devel.patch begins here --- diff -ruN clamav-devel.orig/Makefile clamav-devel/Makefile --- clamav-devel.orig/Makefile Mon Apr 26 21:43:05 2004 +++ clamav-devel/Makefile Mon May 3 14:25:31 2004 @@ -6,7 +6,7 @@ # PORTNAME= clamav -PORTVERSION= 20040419 +PORTVERSION= 20040503 CATEGORIES= security MASTER_SITES= http://clamav.sourceforge.net/snapshot/ PKGNAMESUFFIX= -devel @@ -31,11 +31,16 @@ USE_AUTOCONF_VER=257 USE_LIBTOOL_VER=13 INSTALLS_SHLIB= yes +USE_RC_SUBR= yes CONFIGURE_ARGS= --with-dbdir=${DATADIR} \ - --disable-clamav --enable-bigstack + --disable-clamuko \ + --disable-clamav \ + --enable-bigstack \ + --disable-dependency-tracking +CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -lcipher CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" MAN1= clamscan.1 freshclam.1 sigtool.1 clamdscan.1 @@ -65,6 +70,7 @@ -e 's|^\#?(PidFile) .*$$|\1 /var/run/clamav/clamd.pid|' \ -e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \ -e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \ + -e 's|^\#?(AllowSupplementaryGroups)$$|\1|' \ -e 's|^\#?(ScanMail)$$|\1|' \ -e 's|^\#?(Checks)$$|\#\1|' \ -e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DATADIR}|' \ @@ -72,9 +78,6 @@ -e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' \ -e 's|^\#?(FixStaleSocket)$$|\1|' -.include - -USE_RC_SUBR= yes RC_DIR= ${PREFIX}/etc/rc.d RC_SUFX= .sh SED_SCRIPT+= -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ @@ -83,21 +86,18 @@ PLIST_SUB+= RC_DIR=${RC_DIR} \ RC_SUFX=${RC_SUFX} -.if ${OSVERSION} < 501001 -# compiles only with optimizer -CFLAGS+= -O -LDFLAGS+= -lcipher -.endif +.include .if defined(WITH_MILTER) -.if exists(${LOCALBASE}/lib/libmilter.a) -CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -.endif +.if exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a) CONFIGURE_ARGS+= --enable-milter -PLIST_SUB+= CLAMAV-MILTER:="" +PLIST_SUB+= CLAMAV-MILTER="" +.else +BROKEN= requires Sendmail 8.12 +PLIST_SUB+= CLAMAV-MILTER="@comment " +.endif .else -PLIST_SUB+= CLAMAV-MILTER:="@comment " +PLIST_SUB+= CLAMAV-MILTER="@comment " .endif post-patch: @@ -121,7 +121,7 @@ @${SED} ${SED_SCRIPT} ${FILESDIR}/freshclam.sh > ${WRKDIR}/freshclam.sh pre-install: - ${SETENV} PKG_PREFIX=${PREFIX} \ + @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff -ruN clamav-devel.orig/distinfo clamav-devel/distinfo --- clamav-devel.orig/distinfo Mon Apr 26 21:43:05 2004 +++ clamav-devel/distinfo Mon May 3 14:05:28 2004 @@ -1,2 +1,2 @@ -MD5 (clamav-devel-20040419.tar.gz) = 57e4348a60ff7e779b74d92be5bf8513 -SIZE (clamav-devel-20040419.tar.gz) = 1313229 +MD5 (clamav-devel-20040503.tar.gz) = 26de36cc374df6e076dc489b2c1ad0ef +SIZE (clamav-devel-20040503.tar.gz) = 1338089 diff -ruN clamav-devel.orig/pkg-descr clamav-devel/pkg-descr --- clamav-devel.orig/pkg-descr Mon Apr 26 21:43:05 2004 +++ clamav-devel/pkg-descr Mon May 3 14:11:11 2004 @@ -1,8 +1,8 @@ -This is a snapshot version of Clam Antivirus. Clam Antivirus -is a command line virus scanner written entirely in C its -database is kept up to date. It also detects polymorphic -viruses, scans compressed files and is supported by AMaViS. +This is a snapshot version of Clam Antivirus. +Clam Antivirus is command line virus scanner written entirely in C +and its database is kept up to date. It also detects polymorphic +viruses, scans compressed files and supported by AMaViS. Optionally you can use the clamav-milter interface to connect clamav with sendmail. -WWW: http://clamav.net/ +WWW: http://www.clamav.net/ diff -ruN clamav-devel.orig/pkg-plist clamav-devel/pkg-plist --- clamav-devel.orig/pkg-plist Mon Apr 26 21:43:05 2004 +++ clamav-devel/pkg-plist Mon May 3 14:13:07 2004 @@ -1,11 +1,12 @@ +@unexec [ ! -f /var/run/clamav/clamd.pid ] || %%RC_DIR%%/clamd%%RC_SUFX%% stop || true bin/clamscan bin/clamdscan bin/freshclam bin/sigtool etc/rc.d/clamav-clamd%%RC_SUFX%% etc/rc.d/freshclam%%RC_SUFX%% -%%CLAMAV-MILTER:%%etc/rc.d/clamav-milter%%RC_SUFX%% -%%CLAMAV-MILTER:%%sbin/clamav-milter +%%CLAMAV-MILTER%%etc/rc.d/clamav-milter%%RC_SUFX%% +%%CLAMAV-MILTER%%sbin/clamav-milter sbin/clamd include/clamav.h lib/libclamav.so.1 --- clamav-devel.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: