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

Collapse All | Expand All

(-)Makefile (-27 / +17 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	dcc-dccd
4
PORTNAME=	dcc-dccd
5
PORTVERSION=	1.3.159
5
PORTVERSION=	1.3.159
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
8
MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
9
		ftp://ftp.dcc-servers.net/src/dcc/old/ \
9
		ftp://ftp.dcc-servers.net/src/dcc/old/ \
Lines 45-59 Link Here
45
GROUPS=		${DCCGROUP}
45
GROUPS=		${DCCGROUP}
46
46
47
DCCHOME=	${PREFIX}/dcc
47
DCCHOME=	${PREFIX}/dcc
48
DCCDATA=	/var/dcc
48
49
49
PLIST_SUB+=	DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}"
50
PLIST_SUB+=	DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}" DCCDATA="${DCCDATA}"
50
SUB_FILES=		pkg-install pkg-message
51
SUB_FILES=	pkg-install pkg-message
51
SUB_LIST+=		WRKSRC=${WRKSRC} DCCHOME=${DCCHOME} DCCUSER="${DCCUSER}"
52
SUB_LIST+=	${PLIST_SUB} WRKSRC=${WRKSRC} DCCHOME=${DCCHOME}
52
53
53
## Use the configure script to explicitly set the locations of all files,
54
## Use the configure script to explicitly set the locations of all files,
54
## in case the standard locations have been locally overridden
55
## in case the standard locations have been locally overridden
55
## Also, use a similar hack to USES=desthack.
56
## Also, use a similar hack to USES=desthack.
56
CONFIGURE_ARGS=	-q \
57
CONFIGURE_ARGS=	-q \
58
		--without-DCC-MD5 \
57
		--with-uid=${DCCUSER} \
59
		--with-uid=${DCCUSER} \
58
		--bindir=${PREFIX}/bin \
60
		--bindir=${PREFIX}/bin \
59
		--mandir=${MANPREFIX}/man \
61
		--mandir=${MANPREFIX}/man \
Lines 62-69 Link Here
62
		--with-make-cmd=${MAKE_CMD} \
64
		--with-make-cmd=${MAKE_CMD} \
63
		--with-install-cmd=${BSD_INSTALL_PROGRAM} \
65
		--with-install-cmd=${BSD_INSTALL_PROGRAM} \
64
		--enable-pkg-make \
66
		--enable-pkg-make \
65
		--homedir=${DCCHOME} \
67
		--homedir=${DCCDATA} \
66
		--libexecdir=${DCCHOME}/libexec \
68
		--libexecdir=${PREFIX}/libexec \
67
		--with-cgibin=${DCCHOME}/cgi-bin
69
		--with-cgibin=${DCCHOME}/cgi-bin
68
70
69
CONFIGURE_ENV=	ac_cv_header_histedit_h=no	# disable libedit detection
71
CONFIGURE_ENV=	ac_cv_header_histedit_h=no	# disable libedit detection
Lines 81-86 Link Here
81
83
82
.include <bsd.port.options.mk>
84
.include <bsd.port.options.mk>
83
85
86
EXTRACT_AFTER_ARGS+= --no-same-owner --no-same-permissions --exclude 'md5.?'
87
84
## dccm milter support
88
## dccm milter support
85
#
89
#
86
.if ${PORT_OPTIONS:MPORTS_MILTER}
90
.if ${PORT_OPTIONS:MPORTS_MILTER}
Lines 100-130 Link Here
100
PLIST_SUB+=	IFD_MILT="@comment "
104
PLIST_SUB+=	IFD_MILT="@comment "
101
.endif
105
.endif
102
106
107
post-patch:
108
	${REINPLACE_CMD} -e 's,md5.c ,,' ${WRKSRC}/clntlib/Makefile.in
109
	${REINPLACE_CMD} -e 's,^\(BININSTALL.*\),\1 -s,p'	\
110
		-e 's,^BIN\(INSTALL\s*=\s*.*\) -s$$,SCRIPT\1,' ${WRKSRC}/Makefile.inc.in
111
	${REINPLACE_CMD} -e 's,BININSTALL,SCRIPTINSTALL,g'	\
112
		${WRKSRC}/homedir/Makefile.in ${WRKSRC}/misc/Makefile.in
113
103
post-install:
114
post-install:
104
	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer-dist \
115
	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer-dist \
105
		${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample
116
		${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample
106
	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \
117
	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \
107
		${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample
118
		${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample
108
.for sf in bin/dccproc bin/cdcc dcc/libexec/dccsight dcc/libexec/check_ip_range \
109
	dcc/libexec/wlist dcc/libexec/ck2ip
110
		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf}
111
.endfor
112
.if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM}
113
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dns-helper
114
.endif
115
119
116
post-install-DCCIFD-on:
117
.for sf in bin/dccif-test dcc/libexec/dccifd
118
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf}
119
.endfor
120
121
post-install-DCCD-on:
122
.for sf in dcc/libexec/dump-clients dcc/libexec/dbclean \
123
	dcc/libexec/dblist dcc/libexec/dccd
124
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${sf}
125
.endfor
126
127
post-install-DCCM-on:
128
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/dccm
129
130
.include <bsd.port.mk>
120
.include <bsd.port.mk>
(-)files/dccd.in (-2 / +2 lines)
Lines 31-38 Link Here
31
31
32
# Set defaults
32
# Set defaults
33
: ${dccd_enable:="NO"}
33
: ${dccd_enable:="NO"}
34
: ${dccd_home="%%DCCHOME%%"}
34
: ${dccd_home="%%DCCDATA%%"}
35
: ${dccd_libexec="%%PREFIX%%/dcc/libexec"}
35
: ${dccd_libexec="%%PREFIX%%/libexec"}
36
: ${dccd_conf="$dccd_home/dcc_conf"}
36
: ${dccd_conf="$dccd_home/dcc_conf"}
37
37
38
38
(-)files/dccgrey.in (-2 / +2 lines)
Lines 32-39 Link Here
32
32
33
# Set defaults
33
# Set defaults
34
: ${dccgrey_enable:="NO"}
34
: ${dccgrey_enable:="NO"}
35
: ${dccgrey_home="%%DCCHOME%%"}
35
: ${dccgrey_home="%%DCCDATA%%"}
36
: ${dccgrey_libexec="%%PREFIX%%/dcc/libexec"}
36
: ${dccgrey_libexec="%%PREFIX%%/libexec"}
37
: ${dccgrey_conf="$dccgrey_home/dcc_conf"}
37
: ${dccgrey_conf="$dccgrey_home/dcc_conf"}
38
38
39
39
(-)files/dccifd.in (-2 / +2 lines)
Lines 32-39 Link Here
32
32
33
# Set defaults
33
# Set defaults
34
: ${dccifd_enable:="NO"}
34
: ${dccifd_enable:="NO"}
35
: ${dccifd_home="%%DCCHOME%%"}
35
: ${dccifd_home="%%DCCDATA%%"}
36
: ${dccifd_libexec="%%PREFIX%%/dcc/libexec"}
36
: ${dccifd_libexec="%%PREFIX%%/libexec"}
37
: ${dccifd_conf="$dccifd_home/dcc_conf"}
37
: ${dccifd_conf="$dccifd_home/dcc_conf"}
38
38
39
pidfile=${dccifd_pidfile:-"/var/run/dcc/dccifd.pid"}
39
pidfile=${dccifd_pidfile:-"/var/run/dcc/dccifd.pid"}
(-)files/dccm.in (-2 / +2 lines)
Lines 32-39 Link Here
32
32
33
# Set defaults
33
# Set defaults
34
: ${dccm_enable:="NO"}
34
: ${dccm_enable:="NO"}
35
: ${dccm_home="%%DCCHOME%%"}
35
: ${dccm_home="%%DCCDATA%%"}
36
: ${dccm_libexec="%%PREFIX%%/dcc/libexec"}
36
: ${dccm_libexec="%%PREFIX%%/libexec"}
37
: ${dccm_conf="$dccm_home/dcc_conf"}
37
: ${dccm_conf="$dccm_home/dcc_conf"}
38
38
39
pidfile=${dccm_pidfile:-"/var/run/dcc/dccm.pid"}
39
pidfile=${dccm_pidfile:-"/var/run/dcc/dccm.pid"}
(-)files/pkg-install.in (-9 / +7 lines)
Lines 2-22 Link Here
2
# $FreeBSD: /tmp/pcvs/ports/mail/dcc-dccd/files/pkg-install.in,v 1.2 2011-07-04 19:39:45 crees Exp $
2
# $FreeBSD: /tmp/pcvs/ports/mail/dcc-dccd/files/pkg-install.in,v 1.2 2011-07-04 19:39:45 crees Exp $
3
3
4
PREFIX=${PKG_PREFIX:-%%PREFIX%%}
4
PREFIX=${PKG_PREFIX:-%%PREFIX%%}
5
DCCHOME=%%DCCHOME%%
5
DCCDATA=%%DCCDATA%%
6
DCCUSER=%%DCCUSER%%
6
DCCUSER=%%DCCUSER%%
7
7
8
if [ "$2" = "POST-INSTALL" ]; then
8
if [ "$2" = "POST-INSTALL" ]; then
9
9
10
	/bin/sh $PREFIX/dcc/libexec/fix-map \
10
	/bin/sh $PREFIX/libexec/fix-map \
11
	-n .nopasswd \
11
	-n .nopasswd \
12
	-I $DCCHOME/ids.nopasswd -i $DCCHOME/ids \
12
	-I $DCCDATA/ids.nopasswd -i $DCCDATA/ids \
13
	-T $DCCHOME/map.txt.nopasswd -t $DCCHOME/map.txt \
13
	-T $DCCDATA/map.txt.nopasswd -t $DCCDATA/map.txt \
14
	-m $DCCHOME/map
14
	-m $DCCDATA/map
15
15
16
        for file in ids map map.txt ; do
16
        for file in ids map map.txt ; do
17
                /bin/cp -p $DCCHOME/$file $DCCHOME/${file}.nopasswd
17
                /bin/cp -p $DCCDATA/$file $DCCDATA/$file.nopasswd
18
		/usr/sbin/chown $DCCUSER $DCCHOME/${file} $DCCHOME/${file}.nopasswd
18
		/usr/sbin/chown $DCCUSER $DCCDATA/${file} $DCCDATA/$file.nopasswd
19
        done
19
        done
20
fi
20
fi
21
22
exit 0
(-)files/pkg-message.in (-2 / +2 lines)
Lines 11-22 Link Here
11
Daemon startup flags are also specified in %%DCCHOME%%/dcc_conf.
11
Daemon startup flags are also specified in %%DCCHOME%%/dcc_conf.
12
12
13
13
14
If you run the DCC server, %%LOCALBASE%%/dcc/libexec/cron-dccd should be
14
If you run the DCC server, %%PREFIX%%/libexec/cron-dccd should be
15
run at least daily from the crontab to clean old checksums from the DB.
15
run at least daily from the crontab to clean old checksums from the DB.
16
16
17
17
18
If you just run the client, you may still wish to add
18
If you just run the client, you may still wish to add
19
%%LOCALBASE%%/dcc/libexec/cron-dccd to your crontab to clean up the
19
%%PREFIX%%/libexec/cron-dccd to your crontab to clean up the
20
client's log files on a regular basis. dcc_conf's DBCLEAN_LOGDAYS
20
client's log files on a regular basis. dcc_conf's DBCLEAN_LOGDAYS
21
variable controls the number of days to keep logs.
21
variable controls the number of days to keep logs.
22
22
(-)pkg-plist (-54 / +54 lines)
Lines 12-50 Link Here
12
dcc/cgi-bin/webuser-notify
12
dcc/cgi-bin/webuser-notify
13
@sample dcc/cgi-bin/footer.sample
13
@sample dcc/cgi-bin/footer.sample
14
@sample dcc/cgi-bin/header.sample
14
@sample dcc/cgi-bin/header.sample
15
dcc/libexec/check_ip_range
15
libexec/check_ip_range
16
dcc/libexec/ck2ip
16
libexec/ck2ip
17
dcc/libexec/cron-dccd
17
libexec/cron-dccd
18
%%DCCIFD%%dcc/libexec/dccifd
18
%%DCCIFD%%libexec/dccifd
19
%%DCCM%%dcc/libexec/dccm
19
%%DCCM%%libexec/dccm
20
%%DCCD%%dcc/libexec/dbclean
20
%%DCCD%%libexec/dbclean
21
%%DCCD%%dcc/libexec/dblist
21
%%DCCD%%libexec/dblist
22
%%DCCD%%dcc/libexec/dump-clients
22
%%DCCD%%libexec/dump-clients
23
dcc/libexec/dcc-nagios
23
libexec/dcc-nagios
24
dcc/libexec/dcc-stats-collect
24
libexec/dcc-stats-collect
25
dcc/libexec/dcc-stats-graph
25
libexec/dcc-stats-graph
26
dcc/libexec/dcc-stats-init
26
libexec/dcc-stats-init
27
dcc/libexec/dcc-stats-update
27
libexec/dcc-stats-update
28
%%DCCD%%dcc/libexec/dccd
28
%%DCCD%%libexec/dccd
29
@(%%DCCUSER%%,%%DCCGROUP%%,4555) dcc/libexec/dccsight
29
@(%%DCCUSER%%,%%DCCGROUP%%,4555) libexec/dccsight
30
%%IFD_MILT%%dcc/libexec/dns-helper
30
%%IFD_MILT%%libexec/dns-helper
31
dcc/libexec/fetchblack
31
libexec/fetchblack
32
dcc/libexec/fetch-testmsg-whitelist
32
libexec/fetch-testmsg-whitelist
33
dcc/libexec/fix-map
33
libexec/fix-map
34
dcc/libexec/hackmc
34
libexec/hackmc
35
dcc/libexec/list-clients
35
libexec/list-clients
36
dcc/libexec/logger
36
libexec/logger
37
dcc/libexec/newwebuser
37
libexec/newwebuser
38
dcc/libexec/rcDCC
38
libexec/rcDCC
39
dcc/libexec/start-dccd
39
libexec/start-dccd
40
dcc/libexec/start-dccifd
40
libexec/start-dccifd
41
dcc/libexec/start-dccm
41
libexec/start-dccm
42
dcc/libexec/start-grey
42
libexec/start-grey
43
dcc/libexec/stats-get
43
libexec/stats-get
44
dcc/libexec/stop-dccd
44
libexec/stop-dccd
45
dcc/libexec/updatedcc
45
libexec/updatedcc
46
dcc/libexec/uninstalldcc
46
libexec/uninstalldcc
47
dcc/libexec/wlist
47
libexec/wlist
48
man/man8/cdcc.8.gz
48
man/man8/cdcc.8.gz
49
man/man8/dbclean.8.gz
49
man/man8/dbclean.8.gz
50
man/man8/dblist.8.gz
50
man/man8/dblist.8.gz
Lines 56-79 Link Here
56
man/man8/dccsight.8.gz
56
man/man8/dccsight.8.gz
57
@owner %%DCCUSER%%
57
@owner %%DCCUSER%%
58
@group %%DCCGROUP%%
58
@group %%DCCGROUP%%
59
@sample dcc/dcc_conf.sample
59
@sample %%DCCDATA%%/dcc_conf.sample
60
@sample dcc/flod.sample
60
@sample %%DCCDATA%%/flod.sample
61
@sample dcc/grey_flod.sample
61
@sample %%DCCDATA%%/grey_flod.sample
62
@sample dcc/grey_whitelist.sample
62
@sample %%DCCDATA%%/grey_whitelist.sample
63
@sample dcc/ids.sample
63
@sample %%DCCDATA%%/ids.sample
64
@sample dcc/map.txt.sample
64
@sample %%DCCDATA%%/map.txt.sample
65
@sample dcc/map.sample
65
@sample %%DCCDATA%%/map.sample
66
@sample dcc/whiteclnt.sample
66
@sample %%DCCDATA%%/whiteclnt.sample
67
@sample dcc/whitecommon.sample
67
@sample %%DCCDATA%%/whitecommon.sample
68
@sample dcc/whitelist.sample
68
@sample %%DCCDATA%%/whitelist.sample
69
%%IFD_MILT%%@unexec [ -e %D/dcc/whiteclnt.dccw ] && rm -f %D/dcc/whiteclnt.dccw || true
69
%%IFD_MILT%%@unexec [ -e %%DCCDATA%%/whiteclnt.dccw ] && rm -f %%DCCDATA%%/whiteclnt.dccw || true
70
%%IFD_MILT%%@unexec [ -e %D/dcc/whiteclnt.dccx ] && rm -f %D/dcc/whiteclnt.dccx || true
70
%%IFD_MILT%%@unexec [ -e %%DCCDATA%%/whiteclnt.dccx ] && rm -f %%DCCDATA%%/whiteclnt.dccx || true
71
%%DCCD%%@unexec [ -e %D/dcc/dcc_db ] && rm -f %D/dcc/dcc_db || true
71
%%DCCD%%@unexec [ -e %%DCCDATA%%/dcc_db ] && rm -f %%DCCDATA%%/dcc_db || true
72
%%DCCD%%@unexec [ -e %D/dcc/dcc_db.hash ] && rm -f %D/dcc/dcc_db.hash || true
72
%%DCCD%%@unexec [ -e %%DCCDATA%%/dcc_db.hash ] && rm -f %%DCCDATA%%/dcc_db.hash || true
73
%%DCCD%%@unexec [ -e %D/dcc/flod.map ] && rm -f %D/dcc/flod.map || true
73
%%DCCD%%@unexec [ -e %%DCCDATA%%/flod.map ] && rm -f %%DCCDATA%%/flod.map || true
74
%%DCCD%%@unexec [ -e %D/dcc/dccd_clients ] && rm -f %D/dcc/dccd_clients || true
74
%%DCCD%%@unexec [ -e %%DCCDATA%%/dccd_clients ] && rm -f %%DCCDATA%%/dccd_clients || true
75
%%DCCGREY%%@unexec [ -e %D/dcc/grey_db.hash ] && rm -f %D/dcc/grey_db.hash || true
75
%%DCCGREY%%@unexec [ -e %%DCCDATA%%/grey_db.hash ] && rm -f %%DCCDATA%%/grey_db.hash || true
76
%%DCCGREY%%@unexec [ -e %D/dcc/grey_flod.map ] && rm -f %D/dcc/grey_flod.map || true
76
%%DCCGREY%%@unexec [ -e %%DCCDATA%%/grey_flod.map ] && rm -f %%DCCDATA%%/grey_flod.map || true
77
%%DCCGREY%%@unexec [ -e %D/dcc/grey_clients ] && rm -f %D/dcc/grey_clients || true
77
%%DCCGREY%%@unexec [ -e %%DCCDATA%%/grey_clients ] && rm -f %%DCCDATA%%/grey_clients || true
78
@dir dcc/log
78
@dir %%DCCDATA%%/log
79
@dir dcc
79
@dir %%DCCDATA%%

Return to bug 220978