Attachment 107130 Details for Bug 147840 – file.diff

[patch] file.diff

file.diff (text/plain), 6.18 KB, created by Gerard Seibert on 2010-06-13 23:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Seibert

Created: 2010-06-13 23:40:01 UTC

Size: 6.18 KB

patch

obsolete

>diff -ruN /usr/ports/security/scamp/Makefile /usr/ports/local/scamp/Makefile
>--- /usr/ports/security/scamp/Makefile	2010-04-06 08:01:56.000000000 -0400
>+++ /usr/ports/local/scamp/Makefile	2010-06-13 18:03:51.000000000 -0400
>@@ -5,23 +5,22 @@
> # $FreeBSD: ports/security/scamp/Makefile,v 1.8 2010/04/06 12:01:56 garga Exp $
> 
> PORTNAME=	scamp
>-PORTVERSION=	5.2g
>-PORTREVISION=	1
>+PORTVERSION=	5.2j
> CATEGORIES=	security
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	gerard@seibercom.net
> COMMENT=	Download & Install additional definition files for Clamav
> 
>-RUN_DEPENDS+=	bash>=4.0.35:${PORTSDIR}/shells/bash \
>-		clamav>=0.95.3:${PORTSDIR}/security/clamav \
>-		gnupg>=2.0.14:${PORTSDIR}/security/gnupg \
>+RUN_DEPENDS+=	bash>=4.1.5_2:${PORTSDIR}/shells/bash \
>+		clamav>=0.96.1:${PORTSDIR}/security/clamav \
>+		gnupg>=2.0.14_2:${PORTSDIR}/security/gnupg \
> 		rsync>=3.0.7:${PORTSDIR}/net/rsync
> 
> .if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
> RUN_DEPENDS+=	wget>=1.12:${PORTSDIR}/ftp/wget
> .else
>-RUN_DEPENDS+=	curl>=7.19.7_1:${PORTSDIR}/ftp/curl
>+RUN_DEPENDS+=	curl>=7.20.1:${PORTSDIR}/ftp/curl
> .endif
> 
> NO_BUILD=	yes
>@@ -32,8 +31,8 @@
> MANCOMPRESSED=	no
> 
> 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:-${PREFIX}/etc/scamp}|g' ${WRKSRC}/${PORTNAME}.sh
>+	@${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:-\"${PREFIX}/etc/scamp\"}|g' ${WRKSRC}/${PORTNAME}.sh
> 
> post-install:
> 	@if [ ! -d ${PREFIX}/etc/scamp ]; then \
>diff -ruN /usr/ports/security/scamp/distinfo /usr/ports/local/scamp/distinfo
>--- /usr/ports/security/scamp/distinfo	2010-04-02 14:52:22.000000000 -0400
>+++ /usr/ports/local/scamp/distinfo	2010-06-13 18:16:51.000000000 -0400
>@@ -1,3 +1,3 @@
>-MD5 (scamp-5.2g.tar.gz) = ec8afe9df9f03169c8f4ec54d406ab40
>-SHA256 (scamp-5.2g.tar.gz) = a425f0865452c6853498ec039169e0fd41c833c3db7990d0bbce3d351f1fc7f0
>-SIZE (scamp-5.2g.tar.gz) = 22595
>+MD5 (scamp-5.2j.tar.gz) = e987825d06849c40370a32d2b063a68d
>+SHA256 (scamp-5.2j.tar.gz) = 042e10f426df3d9967c395279b331fafa57a77626d9ad082495716c1c425299a
>+SIZE (scamp-5.2j.tar.gz) = 24827
>diff -ruN /usr/ports/security/scamp/files/default.sample /usr/ports/local/scamp/files/default.sample
>--- /usr/ports/security/scamp/files/default.sample	2009-04-23 09:20:02.000000000 -0400
>+++ /usr/ports/local/scamp/files/default.sample	2010-06-13 18:33:57.000000000 -0400
>@@ -1,16 +1,17 @@
>-# This is the /etc/scamp/default file.
>-# Created April 18, 2009 @ 07:16:40
>+# This is the /usr/local/etc/scamp/default file.
>+# Created June 10, 2010 @ 15:37:48
> 
>-SIG_DB=/var/db/clamav
>+SCAMP_VERSION=5.2j
>+CLAMAV_DB=""
> T_DIR=/var/db/clamav/tmp
> C_GROUP=clamav
> C_PID=/var/run/clamav/clamd.pid
> C_USER=clamav
> GET_LDB=1
> GET_MALWARE=1
>-GET_MSRBL=1
>+GET_MSRBL=0
> GET_SANE=1
>-GET_SECURITE=1
>+GET_SECURITE=4
> GET_WINNOW=1
> gpg_key_url=http://www.sanesecurity.net/publickey.gpg
> L_TYPE=1
>@@ -22,17 +23,12 @@
> MSR_DIR=/var/db/clamav/tmp/msr
> MW_DIR=/var/db/clamav/tmp/malware
> MW_FILE=mbl.ndb
>-MW_URL=http://www.malware.com.br/cgi/submit?action=list_clamav_ext
>+MW_URL=http://www.malwarepatrol.com.br/cgi/submit?action=list_clamav_ext
> RELOAD=1
>-REST=0
>+REST=1
> SANE=rsync://rsync.sanesecurity.net/sanesecurity
> SANE_DB=/var/db/clamav/tmp/sane
> SI_DIR=/var/db/clamav/tmp/securite
>-SI_URL1=http://clamav.securiteinfo.com/vx.hdb.gz
>-SI_URL2=http://clamav.securiteinfo.com/honeynet.hdb.gz
>-SI_URL3=http://clamav.securiteinfo.com/securiteinfo.hdb.gz
>-SI_URL4=http://clamav.securiteinfo.com/antispam.ndb.gz
>-SI_URL=$SI_URL1" "$SI_URL2" "$SI_URL3" "$SI_URL4
> SYS_LOG=1
> WPC=1
> W_SUM=1
>diff -ruN /usr/ports/security/scamp/files/pkg-message.in /usr/ports/local/scamp/files/pkg-message.in
>--- /usr/ports/security/scamp/files/pkg-message.in	2009-05-20 12:37:00.000000000 -0400
>+++ /usr/ports/local/scamp/files/pkg-message.in	2010-06-09 11:24:05.000000000 -0400
>@@ -1,19 +1,15 @@
> 
>-
>-          ***************************************************
>-          *               ** WARNING **                     *
>-          *                                                 *
>-          *  Please read before running "scamp.sh"          *
>-          *  To configure this script prior to running it   *
>-          *  the first time, or if updating from an earlier *
>-          *  release, please use the [-c] command line      *
>-          *  option; i.e.: "scamp.sh -c" to create a new    *
>-          *  default config file.                           *
>-          *                                                 *
>-          *  Use the [-e] command line option to update any *
>-          *  other existing config files.                   *
>-          *                                                 *
>-          *  Example: "scamp.sh -e <name>" with <name>      *
>-          *  being a pre-existing config file.              *
>-          *                                                 *
>-          ***************************************************
>+***********************************************************************
>+                            ** WARNING **                             *
>+                                                                      *
>+* Please read the README file before running "scamp.sh"               *
>+* If updating from an earlier version, it is suggested                *
>+* that you first run:                                                 *
>+*                                                                     *
>+* "scamp.sh -D" to delete all old configuration. Then, running        *
>+* "scamp.sh" will cause the script to create a new configuration      *
>+*                                                                     *
>+* You will need to manually create any additional configuration files.*
>+* Read the README or type "man scamp" for further assistance.         *
>+*                                                                     *
>+***********************************************************************
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 147840: 107130