View | Details | Raw Unified | Return to bug 177398 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/ports/local/scamp/Makefile (-16 / +17 lines)
Lines 1-11 Link Here
1
# New ports collection makefile for:	scamp
1
# Created by: Gerard Seibert <gerard@seibercom.net>
2
# Date created:	31 March 2009
3
# Whom:	Gerard Seibert <gerard@seibercom.net>
4
#
5
# $FreeBSD: ports/security/scamp/Makefile,v 1.15 2012/11/17 06:01:19 svnexp Exp $
2
# $FreeBSD: ports/security/scamp/Makefile,v 1.15 2012/11/17 06:01:19 svnexp Exp $
6
3
7
PORTNAME=	scamp
4
PORTNAME=	scamp
8
PORTVERSION=	5.3b
5
PORTVERSION=	5.4
9
CATEGORIES=	security
6
CATEGORIES=	security
10
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
11
8
Lines 14-28 Link Here
14
11
15
LICENSE=	BSD
12
LICENSE=	BSD
16
13
17
RUN_DEPENDS=	bash>=4.2.20:${PORTSDIR}/shells/bash \
14
RUN_DEPENDS=	bash>=4.2.42:${PORTSDIR}/shells/bash \
18
		clamav>=0.97.3_1:${PORTSDIR}/security/clamav \
15
		clamav>=0.97.7:${PORTSDIR}/security/clamav \
19
		gnupg>=2.0.18_1:${PORTSDIR}/security/gnupg \
16
		gnupg>=2.0.19:${PORTSDIR}/security/gnupg \
20
		rsync>=3.0.9:${PORTSDIR}/net/rsync
17
		rsync>=3.0.9:${PORTSDIR}/net/rsync
21
18
22
.if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
19
.if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
23
RUN_DEPENDS+=	wget>=1.13.4_1:${PORTSDIR}/ftp/wget
20
RUN_DEPENDS+=	wget>=1.14:${PORTSDIR}/ftp/wget
24
.else
21
.else
25
RUN_DEPENDS+=	curl>=7.21.3_2:${PORTSDIR}/ftp/curl
22
RUN_DEPENDS+=	curl>=7.24.0_2:${PORTSDIR}/ftp/curl
26
.endif
23
.endif
27
24
28
NO_BUILD=	yes
25
NO_BUILD=	yes
Lines 30-35 Link Here
30
27
31
MAN1=		scamp.1
28
MAN1=		scamp.1
32
29
30
.include <bsd.port.options.mk>
31
33
post-patch:
32
post-patch:
34
	@${REINPLACE_CMD} -e 's|CLAMAV_DB=$${CLAMAV_DB:-""}|CLAMAV_DB=$${CLAMAV_DB:-\"/var/db/clamav\"}|g' ${WRKSRC}/${PORTNAME}.sh
33
	@${REINPLACE_CMD} -e 's|CLAMAV_DB=$${CLAMAV_DB:-""}|CLAMAV_DB=$${CLAMAV_DB:-\"/var/db/clamav\"}|g' ${WRKSRC}/${PORTNAME}.sh
35
	@${REINPLACE_CMD} -e 's|CONFIG_DIR=$${CONFIG_DIR:-"/etc/scamp"}|CONFIG_DIR=$${CONFIG_DIR:-"${ETCDIR}"}|g' ${WRKSRC}/${PORTNAME}.sh
34
	@${REINPLACE_CMD} -e 's|CONFIG_DIR=$${CONFIG_DIR:-"/etc/scamp"}|CONFIG_DIR=$${CONFIG_DIR:-"${ETCDIR}"}|g' ${WRKSRC}/${PORTNAME}.sh
Lines 40-58 Link Here
40
	fi
39
	fi
41
40
42
	@${INSTALL_DATA} ${FILESDIR}/default.sample ${ETCDIR}
41
	@${INSTALL_DATA} ${FILESDIR}/default.sample ${ETCDIR}
43
		@if [ ! -f ${ETCDIR}/default ]; then \
42
44
			${CP} -p ${ETCDIR}/default.sample \
43
	@if [ ! -f ${PREFIX}/etc/scamp/default ]; then \
45
			${ETCDIR}/default ; \
44
		${CP} -p ${PREFIX}/etc/scamp/default.sample ${PREFIX}/etc/scamp/default ; \
46
		fi
45
	fi
47
46
48
do-install:
47
do-install:
49
	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${PREFIX}/bin
48
	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${PREFIX}/bin
50
	cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${MANPREFIX}/man/man1
49
	cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${MANPREFIX}/man/man1
51
50
52
.ifndef(NOPORTDOCS)
51
# Documentation
52
.if ${PORT_OPTIONS:MDOCS}
53
	@${MKDIR} ${DOCSDIR}
53
	@${MKDIR} ${DOCSDIR}
54
	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.html ${DOCSDIR}
54
	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${DOCSDIR}
55
.endif
55
.endif
56
56
	@${CAT} ${PKGMESSAGE}
57
	@${CAT} ${PKGMESSAGE}
57
58
58
.include <bsd.port.mk>
59
.include <bsd.port.mk>
(-)/usr/ports/local/scamp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (scamp-5.3b.tar.gz) = ad557fbad486d8baba6d1f55e6492af555adb00830cca4ff904c0fb34659d5c5
1
SHA256 (scamp-5.4.tar.gz) = 8e0273e6f0e6f3c8d05f5fe194459e3dc606ec7daca4094527b9f71892e9e3c6
2
SIZE (scamp-5.3b.tar.gz) = 40988
2
SIZE (scamp-5.4.tar.gz) = 134541
(-)/usr/ports/local/scamp/files/default.sample (-13 / +7 lines)
Lines 1-34 Link Here
1
# This is the /usr/local/etc/scamp/default file.
1
# This is the /usr/local/etc/scamp/default file.
2
# Created February 21, 2012
2
# Created March 25, 2013
3
3
4
SCAMP_VERSION=5.3b
5
CLAMAV_DB=/var/db/clamav
6
T_DIR=/var/db/clamav/tmp
7
C_GROUP=clamav
4
C_GROUP=clamav
8
C_PID=/var/run/clamav/clamd.pid
5
C_PID=/var/run/clamav/clamd.pid
9
C_USER=clamav
6
C_USER=clamav
7
CLAMAV_DB=/var/db/clamav
10
GET_LDB=1
8
GET_LDB=1
11
GET_MALWARE=1
9
GET_MALWARE=1
12
GET_MSRBL=0
13
GET_SANE=1
10
GET_SANE=1
14
GET_SECURITE=4
11
GET_SECURITE=4
15
GET_WINNOW=1
12
GET_WINNOW=1
16
gpg_key_url=http://www.sanesecurity.net/publickey.gpg
13
gpg_key_url=http://www.sanesecurity.net/publickey.gpg
17
L_TYPE=1
14
L_TYPE=1
18
MK_LOG=0
15
MK_LOG=0
19
MSRBL=rsync://rsync.mirror.msrbl.com/msrbl/
20
msrbl_Images=MSRBL-Images.hdb
21
msrbl_SPAM=MSRBL-SPAM.ndb
22
msrbl_SPAM_CR=MSRBL-SPAM-CR.ndb
23
MSR_DIR=/var/db/clamav/tmp/msr
24
MW_DIR=/var/db/clamav/tmp/malware
16
MW_DIR=/var/db/clamav/tmp/malware
25
MW_FILE=mbl.ndb
17
MW_FILE=mbl.ndb
26
MW_URL=http://www.malwarepatrol.com.br/cgi/submit?action=list_clamav_ext
18
MW_URL=http://www.malwarepatrol.com.br/cgi/submit?action=list_clamav_ext
27
RELOAD=1
19
RELOAD=1
28
REST=1
20
REST=0
29
SANE=rsync://rsync.sanesecurity.net/sanesecurity
30
SANE_DB=/var/db/clamav/tmp/sane
21
SANE_DB=/var/db/clamav/tmp/sane
22
SANE=rsync://rsync.sanesecurity.net/sanesecurity
23
SCAMP_VERSION=5.4
31
SI_DIR=/var/db/clamav/tmp/securite
24
SI_DIR=/var/db/clamav/tmp/securite
32
SYS_LOG=1
25
SYS_LOG=1
33
WPC=1
26
T_DIR=/var/db/clamav/tmp
34
W_SUM=1
27
W_SUM=1
28
WPC=1
(-)/usr/ports/local/scamp/pkg-descr (-1 lines)
Lines 3-9 Link Here
3
3
4
sanesecurity.com
4
sanesecurity.com
5
malware.com.br
5
malware.com.br
6
msrbl.com
7
clamav.securiteinfo.com
6
clamav.securiteinfo.com
8
7
9
Site Address:
8
Site Address:
(-)/usr/ports/local/scamp/pkg-plist (-11 / +6 lines)
Lines 1-16 Link Here
1
%%PREFIX%%/bin/scamp.sh
1
bin/scamp.sh
2
%%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG
2
%%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG
3
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
3
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
4
%%PORTDOCS%%%%DOCSDIR%%/README
4
%%PORTDOCS%%%%DOCSDIR%%/README
5
%%PORTDOCS%%%%DOCSDIR%%/Release.pdf
5
%%PORTDOCS%%%%DOCSDIR%%/Release.pdf
6
%%PORTDOCS%%@dirrm %%DOCSDIR%%
6
%%PORTDOCS%%@dirrm %%DOCSDIR%%
7
%%PREFIX%%/share/licenses/scamp-5.4/BSD
7
@exec mkdir -p %D/etc/scamp
8
%%PREFIX%%/share/licenses/scamp-5.4/LICENSE
8
@unexec if [ %%PORTDOCS%%%%DOCSDIR%%/Release.html ]; then rm -f %%PORTDOCS%%%%DOCSDIR%%/Release.html; fi
9
%%PREFIX%%/share/licenses/scamp-5.4/catalog.mk
9
etc/scamp/default.sample
10
@dirrm %%PORTDOCS%%%%DOCSDIR%%
10
@exec if [ ! -f %D/etc/scamp/default ] ; then cp -p %D/%F %B/default; fi
11
@dirrm %%ETCDIR%%/scamp
11
@dirrmtry etc/scamp
12
@unexec if cmp -s %D/%%ETCDIR%%/default.sample %D/%%ETCDIR%%/default; then rm -f %D/%%ETCDIR%%/default; fi
13
%%ETCDIR%%/default.sample
14
@exec if [ ! -f %D/%%ETCDIR%%/default ] ; then cp -p %D/%F %B/default; fi
15
@exec mkdir -p %D/%%ETCDIR%%
16
@dirrmtry %%ETCDIR%%
(-)/usr/ports/local/scamp/scamp.diff (+165 lines)
Line 0 Link Here
1
diff -ruN /usr/ports/security/scamp/Makefile /usr/ports/local/scamp/Makefile
2
--- /usr/ports/security/scamp/Makefile	2012-11-17 01:01:19.000000000 -0500
3
+++ /usr/ports/local/scamp/Makefile	2013-03-26 11:57:38.000000000 -0400
4
@@ -1,11 +1,8 @@
5
-# New ports collection makefile for:	scamp
6
-# Date created:	31 March 2009
7
-# Whom:	Gerard Seibert <gerard@seibercom.net>
8
-#
9
+# Created by: Gerard Seibert <gerard@seibercom.net>
10
 # $FreeBSD: ports/security/scamp/Makefile,v 1.15 2012/11/17 06:01:19 svnexp Exp $
11
 
12
 PORTNAME=	scamp
13
-PORTVERSION=	5.3b
14
+PORTVERSION=	5.4
15
 CATEGORIES=	security
16
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
17
 
18
@@ -14,15 +11,15 @@
19
 
20
 LICENSE=	BSD
21
 
22
-RUN_DEPENDS=	bash>=4.2.20:${PORTSDIR}/shells/bash \
23
-		clamav>=0.97.3_1:${PORTSDIR}/security/clamav \
24
-		gnupg>=2.0.18_1:${PORTSDIR}/security/gnupg \
25
+RUN_DEPENDS=	bash>=4.2.42:${PORTSDIR}/shells/bash \
26
+		clamav>=0.97.7:${PORTSDIR}/security/clamav \
27
+		gnupg>=2.0.19:${PORTSDIR}/security/gnupg \
28
 		rsync>=3.0.9:${PORTSDIR}/net/rsync
29
 
30
 .if exists (${LOCALBASE}/bin/wget) && ! exists (${LOCALBASE}/bin/curl)
31
-RUN_DEPENDS+=	wget>=1.13.4_1:${PORTSDIR}/ftp/wget
32
+RUN_DEPENDS+=	wget>=1.14:${PORTSDIR}/ftp/wget
33
 .else
34
-RUN_DEPENDS+=	curl>=7.21.3_2:${PORTSDIR}/ftp/curl
35
+RUN_DEPENDS+=	curl>=7.24.0_2:${PORTSDIR}/ftp/curl
36
 .endif
37
 
38
 NO_BUILD=	yes
39
@@ -30,6 +27,8 @@
40
 
41
 MAN1=		scamp.1
42
 
43
+.include <bsd.port.options.mk>
44
+
45
 post-patch:
46
 	@${REINPLACE_CMD} -e 's|CLAMAV_DB=$${CLAMAV_DB:-""}|CLAMAV_DB=$${CLAMAV_DB:-\"/var/db/clamav\"}|g' ${WRKSRC}/${PORTNAME}.sh
47
 	@${REINPLACE_CMD} -e 's|CONFIG_DIR=$${CONFIG_DIR:-"/etc/scamp"}|CONFIG_DIR=$${CONFIG_DIR:-"${ETCDIR}"}|g' ${WRKSRC}/${PORTNAME}.sh
48
@@ -40,19 +39,21 @@
49
 	fi
50
 
51
 	@${INSTALL_DATA} ${FILESDIR}/default.sample ${ETCDIR}
52
-		@if [ ! -f ${ETCDIR}/default ]; then \
53
-			${CP} -p ${ETCDIR}/default.sample \
54
-			${ETCDIR}/default ; \
55
-		fi
56
+
57
+	@if [ ! -f ${PREFIX}/etc/scamp/default ]; then \
58
+		${CP} -p ${PREFIX}/etc/scamp/default.sample ${PREFIX}/etc/scamp/default ; \
59
+	fi
60
 
61
 do-install:
62
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTNAME}.sh ${PREFIX}/bin
63
 	cd ${WRKSRC} && ${INSTALL_MAN} scamp.1 ${MANPREFIX}/man/man1
64
 
65
-.ifndef(NOPORTDOCS)
66
+# Documentation
67
+.if ${PORT_OPTIONS:MDOCS}
68
 	@${MKDIR} ${DOCSDIR}
69
-	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.html ${DOCSDIR}
70
+	cd ${WRKSRC} && ${INSTALL_DATA} README CHANGE.LOG INSTALL Release.pdf ${DOCSDIR}
71
 .endif
72
+
73
 	@${CAT} ${PKGMESSAGE}
74
 
75
 .include <bsd.port.mk>
76
diff -ruN /usr/ports/security/scamp/distinfo /usr/ports/local/scamp/distinfo
77
--- /usr/ports/security/scamp/distinfo	2012-02-24 15:00:35.000000000 -0500
78
+++ /usr/ports/local/scamp/distinfo	2013-03-25 18:55:15.000000000 -0400
79
@@ -1,2 +1,2 @@
80
-SHA256 (scamp-5.3b.tar.gz) = ad557fbad486d8baba6d1f55e6492af555adb00830cca4ff904c0fb34659d5c5
81
-SIZE (scamp-5.3b.tar.gz) = 40988
82
+SHA256 (scamp-5.4.tar.gz) = 8e0273e6f0e6f3c8d05f5fe194459e3dc606ec7daca4094527b9f71892e9e3c6
83
+SIZE (scamp-5.4.tar.gz) = 134541
84
diff -ruN /usr/ports/security/scamp/files/default.sample /usr/ports/local/scamp/files/default.sample
85
--- /usr/ports/security/scamp/files/default.sample	2012-02-24 15:00:35.000000000 -0500
86
+++ /usr/ports/local/scamp/files/default.sample	2013-03-25 18:28:38.000000000 -0400
87
@@ -1,34 +1,28 @@
88
 # This is the /usr/local/etc/scamp/default file.
89
-# Created February 21, 2012
90
+# Created March 25, 2013
91
 
92
-SCAMP_VERSION=5.3b
93
-CLAMAV_DB=/var/db/clamav
94
-T_DIR=/var/db/clamav/tmp
95
 C_GROUP=clamav
96
 C_PID=/var/run/clamav/clamd.pid
97
 C_USER=clamav
98
+CLAMAV_DB=/var/db/clamav
99
 GET_LDB=1
100
 GET_MALWARE=1
101
-GET_MSRBL=0
102
 GET_SANE=1
103
 GET_SECURITE=4
104
 GET_WINNOW=1
105
 gpg_key_url=http://www.sanesecurity.net/publickey.gpg
106
 L_TYPE=1
107
 MK_LOG=0
108
-MSRBL=rsync://rsync.mirror.msrbl.com/msrbl/
109
-msrbl_Images=MSRBL-Images.hdb
110
-msrbl_SPAM=MSRBL-SPAM.ndb
111
-msrbl_SPAM_CR=MSRBL-SPAM-CR.ndb
112
-MSR_DIR=/var/db/clamav/tmp/msr
113
 MW_DIR=/var/db/clamav/tmp/malware
114
 MW_FILE=mbl.ndb
115
 MW_URL=http://www.malwarepatrol.com.br/cgi/submit?action=list_clamav_ext
116
 RELOAD=1
117
-REST=1
118
-SANE=rsync://rsync.sanesecurity.net/sanesecurity
119
+REST=0
120
 SANE_DB=/var/db/clamav/tmp/sane
121
+SANE=rsync://rsync.sanesecurity.net/sanesecurity
122
+SCAMP_VERSION=5.4
123
 SI_DIR=/var/db/clamav/tmp/securite
124
 SYS_LOG=1
125
-WPC=1
126
+T_DIR=/var/db/clamav/tmp
127
 W_SUM=1
128
+WPC=1
129
diff -ruN /usr/ports/security/scamp/pkg-descr /usr/ports/local/scamp/pkg-descr
130
--- /usr/ports/security/scamp/pkg-descr	2009-04-23 09:20:02.000000000 -0400
131
+++ /usr/ports/local/scamp/pkg-descr	2013-03-25 18:31:31.000000000 -0400
132
@@ -3,7 +3,6 @@
133
 
134
 sanesecurity.com
135
 malware.com.br
136
-msrbl.com
137
 clamav.securiteinfo.com
138
 
139
 Site Address:
140
diff -ruN /usr/ports/security/scamp/pkg-plist /usr/ports/local/scamp/pkg-plist
141
--- /usr/ports/security/scamp/pkg-plist	2013-03-25 22:43:52.000000000 -0400
142
+++ /usr/ports/local/scamp/pkg-plist	2013-04-27 07:09:02.000000000 -0400
143
@@ -1,16 +1,11 @@
144
-%%PREFIX%%/bin/scamp.sh
145
+bin/scamp.sh
146
 %%PORTDOCS%%%%DOCSDIR%%/CHANGE.LOG
147
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
148
 %%PORTDOCS%%%%DOCSDIR%%/README
149
 %%PORTDOCS%%%%DOCSDIR%%/Release.pdf
150
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
151
-%%PREFIX%%/share/licenses/scamp-5.4/BSD
152
-%%PREFIX%%/share/licenses/scamp-5.4/LICENSE
153
-%%PREFIX%%/share/licenses/scamp-5.4/catalog.mk
154
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
155
-@dirrm %%ETCDIR%%/scamp
156
-@unexec if cmp -s %D/%%ETCDIR%%/default.sample %D/%%ETCDIR%%/default; then rm -f %D/%%ETCDIR%%/default; fi
157
-%%ETCDIR%%/default.sample
158
-@exec if [ ! -f %D/%%ETCDIR%%/default ] ; then cp -p %D/%F %B/default; fi
159
-@exec mkdir -p %D/%%ETCDIR%%
160
-@dirrmtry %%ETCDIR%%
161
+@exec mkdir -p %D/etc/scamp
162
+@unexec if [ %%PORTDOCS%%%%DOCSDIR%%/Release.html ]; then rm -f %%PORTDOCS%%%%DOCSDIR%%/Release.html; fi
163
+etc/scamp/default.sample
164
+@exec if [ ! -f %D/etc/scamp/default ] ; then cp -p %D/%F %B/default; fi
165
+@dirrmtry etc/scamp

Return to bug 177398