Attachment #75502 for bug #109039

View | Details | Raw Unified | Return to bug 109039
Collapse All | Expand All

Lines 6-12 Link Here

(-)dcc-dccd/Makefile (-1 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= dcc-dccd	8	PORTNAME= dcc-dccd
9	PORTVERSION= 1.3.42	9	PORTVERSION= 1.3.50
10	CATEGORIES= mail	10	CATEGORIES= mail
11	MASTER_SITES= http://www.rhyolite.com/anti-spam/dcc/source/ \	11	MASTER_SITES= http://www.rhyolite.com/anti-spam/dcc/source/ \
12	http://www.wa.apana.org.au/~dean/sources/	12	http://www.wa.apana.org.au/~dean/sources/
Lines 107-112 Link Here
107	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL	107	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
108		108
109	post-install:	109	post-install:
		110	${INSTALL} -o root -g wheel -m 644 ${MASTERDIR}/files/dcc-start.sh.dist ${PREFIX}/etc/rc.d
		111
110	.if !exists(${PREFIX}/dcc/map)	112	.if !exists(${PREFIX}/dcc/map)
111	${CP} ${PREFIX}/dcc/map ${PREFIX}/dcc/map.dist	113	${CP} ${PREFIX}/dcc/map ${PREFIX}/dcc/map.dist
112	@${CHOWN} ${DCCUSER} ${PREFIX}/dcc/map.dist	114	@${CHOWN} ${DCCUSER} ${PREFIX}/dcc/map.dist

Lines 1-3 Link Here

(-)dcc-dccd/distinfo (-3 / +3 lines)
1	MD5 (dcc-dccd-1.3.42.tar.Z) = 47d023c6d96f0f8fa7910425b1e76459	1	MD5 (dcc-dccd-1.3.50.tar.Z) = 4306df4a05d04f926995ddc0c1d480e1
2	SHA256 (dcc-dccd-1.3.42.tar.Z) = 2544815d2fab2c913f3d8ca8bf1fe8ec247c50837a138998d86f708cf696a20b	2	SHA256 (dcc-dccd-1.3.50.tar.Z) = 942c9be56f3ff765b524e6c49d85dd84aa4a22c1514afe096d34e246cbf6cc21
3	SIZE (dcc-dccd-1.3.42.tar.Z) = 1424267	3	SIZE (dcc-dccd-1.3.50.tar.Z) = 1448485




#!/bin/sh
#
# PROVIDE: dccifd
# REQUIRE: LOGIN
# BEFORE: mail
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable dccifd:
#
#dccifd_enable="YES"
#
# See dccifd(8) for flags
#

. /etc/rc.subr

name=dccifd
rcvar=`set_rcvar`

load_rc_config $name

# Set defaults
: ${dccifd_enable:="NO"}
: ${dccifd_flags=""}
: ${dccifd_home="/usr/local/dcc"}
: ${dccifd_conf="$dccifd_home/dcc_conf"}


pidfile=${dccifd_pidfile:-"/var/run/dccifd.pid"}
command="${dccifd_home}/libexec/start-dccifd"
procname="${dccifd_home}/libexec/dccifd"
required_dirs="$dccifd_home"
required_files="${dccifd_conf}"

stop_postcmd="stop_postcmd"
start_precmd="start_precmd"


stop_postcmd()
{
 rm -f $pidfile
}

start_precmd()
{
X=`grep DCCIFD_ENABLE ${dccifd_conf}`
eval $X
if [ "$DCCIFD_ENABLE"  != "on" ]
then
	echo "Warning ${X} needs to be on in ${dccifd_conf}"
	return 1
fi
}

run_rc_command "$1"


Line 0 Link Here

(-)dcc-dccd/files/patch-cgi-bin::Makefile.in (+11 lines)
	1	--- cgi-bin/Makefile.in.orig Sun Feb 11 09:58:09 2007
	2	+++ cgi-bin/Makefile.in Sun Feb 11 09:58:30 2007
	3	@@ -60,7 +60,7 @@
	4	-m 644 -c $$NM $(INST_BINDIR)/$$NM; done
	5	for NM in $(LOCFILES); do \
	6	if test ! -f $(INST_BINDIR)/$$NM; then \
	7	- $(INSTALL) $(SET_BINOWN) -m 644 -c $$NM $(INST_BINDIR)/$$NM; \
	8	+ $(INSTALL) $(SET_BINOWN) -m 644 -c $$NM $(INST_BINDIR)/$$NM.dist; \
	9	fi; done
	10
	11	deinstall:




--- homedir/Makefile.in.orig	Sun Feb 11 09:05:45 2007
+++ homedir/Makefile.in	Sun Feb 11 09:07:59 2007
@@ -57,23 +57,19 @@
 	  $(HINST) -m 755 -d $(DIR); fi
 	if test ! -d $(DIR)/log; then\
 	  $(HINST) -m 710 -d $(DIR)/log; fi
-	if test -s $(DIR)/dcc_conf; then\
-	  sh make-dcc_conf -h $(DIR);\
-	else\
-	  $(HINST) -m 644 dcc_conf $(DIR)/dcc_conf;\
-	fi
+	$(INSTALL) -m 644 dcc_conf $(DIR)/dcc_conf.dist; \
 	for nm in flod grey_flod whitelist grey_whitelist\
 		whiteclnt whitecommon; do\
 	  if test ! -f $(DIR)/$$nm; then\
-		$(HINST) -m 644 $$nm $(DIR)/$$nm; fi; done
+		$(INSTALL) -m 644 $$nm $(DIR)/$$nm.dist; fi; done
 	if test ! -f $(DIR)/ids -a ! -f $(DIR)/map -a ! -f $(DIR)/map.txt; then\
 	  umask 077; PASSWD1=`$(RSTRING)`; PASSWD2=`$(RSTRING)`;\
-	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(DIR)/map.txt;\
+	  sed -e "s/secret1/$$PASSWD1/" map.txt >$(DIR)/map.txt.dist;\
 	  sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids\
-		>$(DIR)/ids;\
-	  ${DEPTH}/cdcc/cdcc -qh $(DIR) 'new map; load $(DIR)/map.txt';\
-	  set +e; chown $(DCC_SUID) $(DIR)/map.txt\
-			$(DIR)/map $(DIR)/ids;\
+		>$(DIR)/ids.dist;\
+	  ${DEPTH}/cdcc/cdcc -qh $(DIR) 'new map; load $(DIR)/map.txt.dist';\
+	  set +e; chown $(DCC_SUID) $(DIR)/map.txt.dist\
+			$(DIR)/map $(DIR)/ids.dist;\
-		<$(INST_HOMEDIR)/map.txt >/dev/null; \
-	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt \
-			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids; \
+		<$(INST_HOMEDIR)/map.txt.dist >/dev/null; \
+	  set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt.dist \
+			$(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids.dist; \
 	fi
 
 deinstall:

Lines 39-44 Link Here

(-)dcc-dccd/pkg-plist (+4 lines)
39	dcc/cgi-bin/list-log	39	dcc/cgi-bin/list-log
40	dcc/cgi-bin/list-msg	40	dcc/cgi-bin/list-msg
41	dcc/cgi-bin/webuser-notify	41	dcc/cgi-bin/webuser-notify
		42	dcc/cgi-bin/footer.dist
		43	dcc/cgi-bin/header.dist
42	dcc/libexec/cron-dccd	44	dcc/libexec/cron-dccd
43	%%WITH_DCCIFD%%dcc/libexec/dccifd	45	%%WITH_DCCIFD%%dcc/libexec/dccifd
44	%%WITH_SENDMAIL%%dcc/libexec/dccm	46	%%WITH_SENDMAIL%%dcc/libexec/dccm
Lines 49-54 Link Here
49	dcc/libexec/dcc-stats-init	51	dcc/libexec/dcc-stats-init
50	dcc/libexec/dccd	52	dcc/libexec/dccd
51	dcc/libexec/dccsight	53	dcc/libexec/dccsight
		54	dcc/libexec/dns-helper
52	dcc/libexec/fetchblack	55	dcc/libexec/fetchblack
53	dcc/libexec/fetch-testmsg-whitelist	56	dcc/libexec/fetch-testmsg-whitelist
54	dcc/libexec/hackmc	57	dcc/libexec/hackmc
Lines 65-70 Link Here
65	dcc/libexec/updatedcc	68	dcc/libexec/updatedcc
66	dcc/libexec/uninstalldcc	69	dcc/libexec/uninstalldcc
67	dcc/libexec/wlist	70	dcc/libexec/wlist
		71	etc/rc.d/dcc-start.sh.dist
68	@dirrm dcc/log	72	@dirrm dcc/log
69	@dirrm dcc/libexec	73	@dirrm dcc/libexec
70	@dirrm dcc/cgi-bin	74	@dirrm dcc/cgi-bin

Return to bug 109039

Line 0 Link Here

(-)dcc-dccd/files/dcc-start.sh.dist (+57 lines)
	1	#!/bin/sh
	2	#
	3	# PROVIDE: dccifd
	4	# REQUIRE: LOGIN
	5	# BEFORE: mail
	6	# KEYWORD: shutdown
	7
	8	#
	9	# Add the following lines to /etc/rc.conf to enable dccifd:
	10	#
	11	#dccifd_enable="YES"
	12	#
	13	# See dccifd(8) for flags
	14	#
	15
	16	. /etc/rc.subr
	17
	18	name=dccifd
	19	rcvar=`set_rcvar`
	20
	21	load_rc_config $name
	22
	23	# Set defaults
	24	: ${dccifd_enable:="NO"}
	25	: ${dccifd_flags=""}
	26	: ${dccifd_home="/usr/local/dcc"}
	27	: ${dccifd_conf="$dccifd_home/dcc_conf"}
	28
	29
	30	pidfile=${dccifd_pidfile:-"/var/run/dccifd.pid"}
	31	command="${dccifd_home}/libexec/start-dccifd"
	32	procname="${dccifd_home}/libexec/dccifd"
	33	required_dirs="$dccifd_home"
	34	required_files="${dccifd_conf}"
	35
	36	stop_postcmd="stop_postcmd"
	37	start_precmd="start_precmd"
	38
	39
	40	stop_postcmd()
	41	{
	42	rm -f $pidfile
	43	}
	44
	45	start_precmd()
	46	{
	47	X=`grep DCCIFD_ENABLE ${dccifd_conf}`
	48	eval $X
	49	if [ "$DCCIFD_ENABLE" != "on" ]
	50	then
	51	echo "Warning ${X} needs to be on in ${dccifd_conf}"
	52	return 1
	53	fi
	54	}
	55
	56	run_rc_command "$1"
	57

Lines 1-37 Link Here

(-)dcc-dccd/files/patch-homedir::Makefile.in (-35 / +31 lines)
1	--- homedir/Makefile.in.orig Thu Sep 8 09:57:07 2005	1	--- homedir/Makefile.in.orig Sun Feb 11 09:05:45 2007
2	+++ homedir/Makefile.in Wed Mar 1 07:39:11 2006	2	+++ homedir/Makefile.in Sun Feb 11 09:07:59 2007
3	@@ -51,15 +51,11 @@	3	@@ -57,23 +57,19 @@
4	$(HINSTALL) -m 755 -d $(INST_HOMEDIR); fi	4	$(HINST) -m 755 -d $(DIR); fi
5	if test ! -d $(INST_HOMEDIR)/log; then \	5	if test ! -d $(DIR)/log; then\
6	$(HINSTALL) -m 710 -d $(INST_HOMEDIR)/log; fi	6	$(HINST) -m 710 -d $(DIR)/log; fi
7	- if test -s $(INST_HOMEDIR)/dcc_conf; then \	7	- if test -s $(DIR)/dcc_conf; then\
8	- sh make-dcc_conf -h $(INST_HOMEDIR); \	8	- sh make-dcc_conf -h $(DIR);\
9	- else \	9	- else\
10	- $(HINSTALL) -m 644 dcc_conf $(INST_HOMEDIR)/dcc_conf; \	10	- $(HINST) -m 644 dcc_conf $(DIR)/dcc_conf;\
11	- fi	11	- fi
12	+ $(HINSTALL) -m 644 dcc_conf $(INST_HOMEDIR)/dcc_conf.dist; \	12	+ $(INSTALL) -m 644 dcc_conf $(DIR)/dcc_conf.dist; \
13	for nm in flod grey_flod whitelist grey_whitelist \	13	for nm in flod grey_flod whitelist grey_whitelist\
14	whiteclnt whitecommon; do \	14	whiteclnt whitecommon; do\
15	if test ! -f $(INST_HOMEDIR)/$$nm; then \	15	if test ! -f $(DIR)/$$nm; then\
16	- $(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm; fi; \	16	- $(HINST) -m 644 $$nm $(DIR)/$$nm; fi; done
17	+ $(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm.dist; fi; \	17	+ $(INSTALL) -m 644 $$nm $(DIR)/$$nm.dist; fi; done
18	done	18	if test ! -f $(DIR)/ids -a ! -f $(DIR)/map -a ! -f $(DIR)/map.txt; then\
19	@if test ! -f $(INST_HOMEDIR)/ids \	19	umask 077; PASSWD1=`$(RSTRING)`; PASSWD2=`$(RSTRING)`;\
20	-a ! -f $(INST_HOMEDIR)/map \	20	- sed -e "s/secret1/$$PASSWD1/" map.txt >$(DIR)/map.txt;\
21	@@ -67,11 +63,11 @@	21	+ sed -e "s/secret1/$$PASSWD1/" map.txt >$(DIR)/map.txt.dist;\
22	PASSWD1=`ps\|cksum\|tr ' ' 'xy'`; \	22	sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids\
23	PASSWD2=`ps\|cksum\|tr ' ' 'yx'`; \	23	- >$(DIR)/ids;\
24	umask 077; \	24	- ${DEPTH}/cdcc/cdcc -qh $(DIR) 'new map; load $(DIR)/map.txt';\
25	- sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt; \	25	- set +e; chown $(DCC_SUID) $(DIR)/map.txt\
26	+ sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt.dist; \	26	- $(DIR)/map $(DIR)/ids;\
27	sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids \	27	+ >$(DIR)/ids.dist;\
28	- >$(INST_HOMEDIR)/ids; \	28	+ ${DEPTH}/cdcc/cdcc -qh $(DIR) 'new map; load $(DIR)/map.txt.dist';\
29	+ >$(INST_HOMEDIR)/ids.dist; \	29	+ set +e; chown $(DCC_SUID) $(DIR)/map.txt.dist\
30	${DEPTH}/cdcc/cdcc -qh $(INST_HOMEDIR) 'new map; load -' \	30	+ $(DIR)/map $(DIR)/ids.dist;\
31	- <$(INST_HOMEDIR)/map.txt >/dev/null; \
32	- set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt \
33	- $(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids; \
34	+ <$(INST_HOMEDIR)/map.txt.dist >/dev/null; \
35	+ set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt.dist \
36	+ $(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids.dist; \
37	fi	31	fi
		32
		33	deinstall: