From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 26 16:40:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 78C3C25C for ; Tue, 26 Mar 2013 16:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 5C750A69 for ; Tue, 26 Mar 2013 16:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QGe2ES049656 for ; Tue, 26 Mar 2013 16:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2QGe2Eo049655; Tue, 26 Mar 2013 16:40:02 GMT (envelope-from gnats) Resent-Date: Tue, 26 Mar 2013 16:40:02 GMT Resent-Message-Id: <201303261640.r2QGe2Eo049655@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, Gerard Seibert Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 39D77F0F for ; Tue, 26 Mar 2013 16:30:52 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 2B2EBA13 for ; Tue, 26 Mar 2013 16:30:52 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2QGUo5h092776 for ; Tue, 26 Mar 2013 16:30:50 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2QGUoAR092775; Tue, 26 Mar 2013 16:30:50 GMT (envelope-from nobody) Message-Id: <201303261630.r2QGUoAR092775@red.freebsd.org> Date: Tue, 26 Mar 2013 16:30:50 GMT From: Gerard Seibert To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/177398: [maintainer update] security/scamp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Mar 2013 16:40:02 -0000 >Number: 177398 >Category: ports >Synopsis: [maintainer update] security/scamp >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: Tue Mar 26 16:40:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Gerard Seibert >Release: FreeBSD 8.3 >Organization: seibercom.net >Environment: FreeBSD scorpio.seibercom.net 8.3-STABLE FreeBSD 8.3-STABLE #0: Fri Aug 17 13:52:14 EDT 2012 gerard@scorpio.seibercom.net:/usr/obj/usr/src/sys/SCORPIO amd64 >Description: Update the security/scamp port to version 5.4. The following file has been removed from the distro: Release.html It is replaced by: Release.pdf The files are usually stored in the "/usr/local/share/doc/scamp/" directory. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN /usr/ports/security/scamp/Makefile /usr/ports/local/scamp/Makefile --- /usr/ports/security/scamp/Makefile 2012-11-17 01:01:19.000000000 -0500 +++ /usr/ports/local/scamp/Makefile 2013-03-26 11:57:38.000000000 -0400 @@ -1,11 +1,8 @@ -# New ports collection makefile for: scamp -# Date created: 31 March 2009 -# Whom: Gerard Seibert -# +# Created by: Gerard Seibert # $FreeBSD: ports/security/scamp/Makefile,v 1.15 2012/11/17 06:01:19 svnexp Exp $ PORTNAME= scamp -PORTVERSION= 5.3b +PORTVERSION= 5.4 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -14,15 +11,15 @@ LICENSE= BSD -RUN_DEPENDS= bash>=4.2.20:${PORTSDIR}/shells/bash \ - clamav>=0.97.3_1:${PORTSDIR}/security/clamav \ - gnupg>=2.0.18_1:${PORTSDIR}/security/gnupg \ +RUN_DEPENDS= bash>=4.2.42:${PORTSDIR}/shells/bash \ + clamav>=0.97.7:${PORTSDIR}/security/clamav \ + gnupg>=2.0.19:${PORTSDIR}/security/gnupg \ rsync>=3.0.9:${PORTSDIR}/net/rsync .if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl) -RUN_DEPENDS+= wget>=1.13.4_1:${PORTSDIR}/ftp/wget +RUN_DEPENDS+= wget>=1.14:${PORTSDIR}/ftp/wget .else -RUN_DEPENDS+= curl>=7.21.3_2:${PORTSDIR}/ftp/curl +RUN_DEPENDS+= curl>=7.24.0_2:${PORTSDIR}/ftp/curl .endif NO_BUILD= yes @@ -30,6 +27,8 @@ MAN1= scamp.1 +.include + post-patch: @${REINPLACE_CMD} -e 's|CLAMAV_DB=$${CLAMAV_DB:-""}|CLAMAV_DB=$${CLAMAV_DB:-\"/var/db/clamav\"}|g' ${WRKSRC}/${PORTNAME}.sh @${REINPLACE_CMD} -e 's|CONFIG_DIR=$${CONFIG_DIR:-"/etc/scamp"}|CONFIG_DIR=$${CONFIG_DIR:-"${ETCDIR}"}|g' ${WRKSRC}/${PORTNAME}.sh @@ -40,19 +39,21 @@ fi @${INSTALL_DATA} ${FILESDIR}/default.sample ${ETCDIR} - @if [ ! -f ${ETCDIR}/default ]; then \ - ${CP} -p ${ETCDIR}/default.sample \ - ${ETCDIR}/default ; \ - fi + + @if [ ! -f ${PREFIX}/etc/scamp/default ]; then \ + ${CP} -p ${PREFIX}/etc/scamp/default.sample ${PREFIX}/etc/scamp/default ; \ + fi do-install: cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${PREFIX}/bin cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${MANPREFIX}/man/man1 -.ifndef(NOPORTDOCS) +# Documentation +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.html ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${DOCSDIR} .endif + @${CAT} ${PKGMESSAGE} .include diff -ruN /usr/ports/security/scamp/distinfo /usr/ports/local/scamp/distinfo --- /usr/ports/security/scamp/distinfo 2012-02-24 15:00:35.000000000 -0500 +++ /usr/ports/local/scamp/distinfo 2013-03-25 18:55:15.000000000 -0400 @@ -1,2 +1,2 @@ -SHA256 (scamp-5.3b.tar.gz) = ad557fbad486d8baba6d1f55e6492af555adb00830cca4ff904c0fb34659d5c5 -SIZE (scamp-5.3b.tar.gz) = 40988 +SHA256 (scamp-5.4.tar.gz) = 8e0273e6f0e6f3c8d05f5fe194459e3dc606ec7daca4094527b9f71892e9e3c6 +SIZE (scamp-5.4.tar.gz) = 134541 diff -ruN /usr/ports/security/scamp/files/default.sample /usr/ports/local/scamp/files/default.sample --- /usr/ports/security/scamp/files/default.sample 2012-02-24 15:00:35.000000000 -0500 +++ /usr/ports/local/scamp/files/default.sample 2013-03-25 18:28:38.000000000 -0400 @@ -1,34 +1,28 @@ # This is the /usr/local/etc/scamp/default file. -# Created February 21, 2012 +# Created March 25, 2013 -SCAMP_VERSION=5.3b -CLAMAV_DB=/var/db/clamav -T_DIR=/var/db/clamav/tmp C_GROUP=clamav C_PID=/var/run/clamav/clamd.pid C_USER=clamav +CLAMAV_DB=/var/db/clamav GET_LDB=1 GET_MALWARE=1 -GET_MSRBL=0 GET_SANE=1 GET_SECURITE=4 GET_WINNOW=1 gpg_key_url=http://www.sanesecurity.net/publickey.gpg L_TYPE=1 MK_LOG=0 -MSRBL=rsync://rsync.mirror.msrbl.com/msrbl/ -msrbl_Images=MSRBL-Images.hdb -msrbl_SPAM=MSRBL-SPAM.ndb -msrbl_SPAM_CR=MSRBL-SPAM-CR.ndb -MSR_DIR=/var/db/clamav/tmp/msr MW_DIR=/var/db/clamav/tmp/malware MW_FILE=mbl.ndb MW_URL=http://www.malwarepatrol.com.br/cgi/submit?action=list_clamav_ext RELOAD=1 -REST=1 -SANE=rsync://rsync.sanesecurity.net/sanesecurity +REST=0 SANE_DB=/var/db/clamav/tmp/sane +SANE=rsync://rsync.sanesecurity.net/sanesecurity +SCAMP_VERSION=5.4 SI_DIR=/var/db/clamav/tmp/securite SYS_LOG=1 -WPC=1 +T_DIR=/var/db/clamav/tmp W_SUM=1 +WPC=1 diff -ruN /usr/ports/security/scamp/pkg-descr /usr/ports/local/scamp/pkg-descr --- /usr/ports/security/scamp/pkg-descr 2009-04-23 09:20:02.000000000 -0400 +++ /usr/ports/local/scamp/pkg-descr 2013-03-25 18:31:31.000000000 -0400 @@ -3,7 +3,6 @@ sanesecurity.com malware.com.br -msrbl.com clamav.securiteinfo.com Site Address: diff -ruN /usr/ports/security/scamp/pkg-plist /usr/ports/local/scamp/pkg-plist --- /usr/ports/security/scamp/pkg-plist 2013-03-25 22:43:52.000000000 -0400 +++ /usr/ports/local/scamp/pkg-plist 2013-03-26 11:47:21.000000000 -0400 @@ -1,16 +1,11 @@ -%%PREFIX%%/bin/scamp.sh +bin/scamp.sh %%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/Release.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PREFIX%%/share/licenses/scamp-5.4/BSD -%%PREFIX%%/share/licenses/scamp-5.4/LICENSE -%%PREFIX%%/share/licenses/scamp-5.4/catalog.mk -@dirrm %%PORTDOCS%%%%DOCSDIR%% -@dirrm %%ETCDIR%%/scamp -@unexec if cmp -s %D/%%ETCDIR%%/default.sample %D/%%ETCDIR%%/default; then rm -f %D/%%ETCDIR%%/default; fi -%%ETCDIR%%/default.sample -@exec if [ ! -f %D/%%ETCDIR%%/default ] ; then cp -p %D/%F %B/default; fi -@exec mkdir -p %D/%%ETCDIR%% -@dirrmtry %%ETCDIR%% +@exec mkdir -p %D/etc/scamp +@unexec if cmp -s %D/etc/scamp/default.sample %D/etc/scamp/default; then rm -f %D/etc/scamp/default; fi +etc/scamp/default.sample +@exec if [ ! -f %D/etc/scamp/default ] ; then cp -p %D/%F %B/default; fi +@dirrmtry etc/scamp >Release-Note: >Audit-Trail: >Unformatted: