From owner-svn-ports-all@FreeBSD.ORG Sat Apr 27 20:00:43 2013 Return-Path: Delivered-To: svn-ports-all@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 2FC15A80; Sat, 27 Apr 2013 20:00:43 +0000 (UTC) (envelope-from stefan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 117511753; Sat, 27 Apr 2013 20:00:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3RK0g12041320; Sat, 27 Apr 2013 20:00:42 GMT (envelope-from stefan@svn.freebsd.org) Received: (from stefan@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3RK0gEm041312; Sat, 27 Apr 2013 20:00:42 GMT (envelope-from stefan@svn.freebsd.org) Message-Id: <201304272000.r3RK0gEm041312@svn.freebsd.org> From: Stefan Walter Date: Sat, 27 Apr 2013 20:00:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316687 - in head/security/scamp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Apr 2013 20:00:43 -0000 Author: stefan Date: Sat Apr 27 20:00:41 2013 New Revision: 316687 URL: http://svnweb.freebsd.org/changeset/ports/316687 Log: Update to 5.4. PR: 177398 Submitted by: Gerard Seibert (maintainer) Modified: head/security/scamp/Makefile head/security/scamp/distinfo head/security/scamp/files/default.sample head/security/scamp/pkg-descr head/security/scamp/pkg-plist Modified: head/security/scamp/Makefile ============================================================================== --- head/security/scamp/Makefile Sat Apr 27 19:18:49 2013 (r316686) +++ head/security/scamp/Makefile Sat Apr 27 20:00:41 2013 (r316687) @@ -1,11 +1,8 @@ -# New ports collection makefile for: scamp -# Date created: 31 March 2009 -# Whom: Gerard Seibert -# +# Created by: Gerard Seibert # $FreeBSD$ PORTNAME= scamp -PORTVERSION= 5.3b +PORTVERSION= 5.4 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -14,15 +11,15 @@ COMMENT= Download & Install additional d 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 @@ SUB_FILES= pkg-message 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 @@ post-install: 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 Modified: head/security/scamp/distinfo ============================================================================== --- head/security/scamp/distinfo Sat Apr 27 19:18:49 2013 (r316686) +++ head/security/scamp/distinfo Sat Apr 27 20:00:41 2013 (r316687) @@ -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 Modified: head/security/scamp/files/default.sample ============================================================================== --- head/security/scamp/files/default.sample Sat Apr 27 19:18:49 2013 (r316686) +++ head/security/scamp/files/default.sample Sat Apr 27 20:00:41 2013 (r316687) @@ -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 Modified: head/security/scamp/pkg-descr ============================================================================== --- head/security/scamp/pkg-descr Sat Apr 27 19:18:49 2013 (r316686) +++ head/security/scamp/pkg-descr Sat Apr 27 20:00:41 2013 (r316687) @@ -3,7 +3,6 @@ following sites: sanesecurity.com malware.com.br -msrbl.com clamav.securiteinfo.com Site Address: Modified: head/security/scamp/pkg-plist ============================================================================== --- head/security/scamp/pkg-plist Sat Apr 27 19:18:49 2013 (r316686) +++ head/security/scamp/pkg-plist Sat Apr 27 20:00:41 2013 (r316687) @@ -2,10 +2,9 @@ bin/scamp.sh %%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/Release.html +%%PORTDOCS%%%%DOCSDIR%%/Release.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% -@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 +etc/scamp/default.sample +@exec if [ ! -f %D/etc/scamp/default ] ; then cp -p %D/%F %B/default; fi +@dirrmtry etc/scamp