Attachment #161856 for bug #203660

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




perl_OLD_CMD=	perl
GNU_CONFIGURE=	yes

MIMEDEFANG_USER?=	mailnull
MIMEDEFANG_GROUP?=	mailnull
SPOOLDIR?=		/var/spool/MIMEDefang
QUARANTINEDIR?=		/var/spool/MD-Quarantine

CONFIGURE_ENV+=		PERL=${PERL}
CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc \
			--with-confsubdir=mimedefang \
			--with-user=${MIMEDEFANG_USER} \
			--with-spooldir=${SPOOLDIR} \
			--with-quarantinedir=${QUARANTINEDIR} \
			--with-ipheader \


SUB_FILES=	pkg-message

PLIST_SUB+=	USER="${MIMEDEFANG_USER}" \
		GROUP="${MIMEDEFANG_GROUP}" \
		MIMEDEFANG_RUNDIR="${SPOOLDIR}" \
		MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"



post-install:
	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
	${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${STAGEDIR}${PREFIX}/etc/rc.d/mimedefang
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/
.endif

.if ${PORT_OPTIONS:MEXAMPLES}




--- Makefile.in.orig	2012-01-20 15:20:32 UTC
+++ Makefile.in
@@ -156,14 +156,14 @@ install-redhat: install
 
 install: all
 	$(INSTALL) -m 755 -d $(DESTDIR)${CONFDIR}
-	-if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key" ; then \
-		$(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key ;\
-		-chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 ; \
+	-if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample" ; then \
+		$(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample ;\
+		-chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample > /dev/null 2>&1 ; \
 	fi
 
 	if test "$(DEFANGUSER)" != "" ; then \
 		if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \
-			chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
+			chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample > /dev/null 2>&1 || true; \
 			test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 || true; \
 			test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 || true; \
                 fi \
@@ -185,11 +185,7 @@ install: all
 	-test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 750 $(DESTDIR)$(SPOOLDIR) || true
 	-test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 750 $(DESTDIR)$(QDIR) || true
 

-	else \
-		$(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter || exit 1; \
-	fi
+	$(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.sample || exit 1
 
 	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor   $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor
 	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) md-mx-ctrl               $(DESTDIR)$(prefix)/bin/md-mx-ctrl
@@ -210,11 +206,7 @@ install: all
 	$(INSTALL) -m 644 mimedefang-protocol.7    $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7
 	$(INSTALL) -m 644 mimedefang-notify.7      $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7
 	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \

-		else \
-			$(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf || exit 1; \
-		fi \
+		$(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.sample || exit 1; \
 	fi
 
 distro: FORCE




--- examples/init-script.in.orig	2012-01-20 15:24:01 UTC
+++ examples/init-script.in
@@ -39,6 +39,12 @@ export LC_ALL
 # The socket used by mimedefang to communicate with sendmail
 # SOCKET=$SPOOLDIR/mimedefang.sock
 

 # Run the multiplexor and filters as this user, not root.  RECOMMENDED
 MX_USER=@DEFANGUSER@
 
@@ -136,11 +142,11 @@ MX_MAXIMUM=10
 
 # Limit slave processes' resident-set size to this many kilobytes.  Default
 # is unlimited.

 
 # If you want to use the "notification" facility, set the appropriate port.
 # See the mimedefang-notify man page for details.
@@ -187,7 +193,7 @@ then
     . /etc/rc.subr
 
     name=$prog

     # default to not enabled, enable in rc.conf
     eval $rcvar=\${$rcvar:-NO}
 
@@ -197,6 +203,7 @@ then
     procname=$PROGDIR/$prog-multiplexor
     start_cmd="start_it"
     stop_cmd="stop_it"

     sig_reload="INT"
     reread_cmd="reread_it"
     # provide both "reload", the FreeBSD default, with a direct signal to
@@ -207,6 +214,8 @@ fi
 # Make sure required vars are set
 SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock}
 MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock}

 
 start_it() {
     if test -r $PID ; then
@@ -292,6 +301,29 @@ start_it() {
 	kill `cat $MXPID`
 	return 1
     fi

     return 0
 }
 
@@ -327,7 +359,7 @@ stop_it() {
     rm -f $MX_SOCKET > /dev/null 2>&1
     rm -f $SOCKET > /dev/null 2>&1
 

 	printf "Waiting for daemons to exit."
 	WAITPID=""
 	test -f $PID && WAITPID=`cat $PID`
@@ -379,6 +411,12 @@ reread_it() {
 	fi
 }
 

Lines 1-6 Link Here

(-)mimedefang/files/patch-mimedefang-filter.5.in (-3 / +3 lines)
1	--- ./mimedefang-filter.5.in.orig 2010-02-24 16:19:43.000000000 +0100	1	--- mimedefang-filter.5.in.orig 2014-05-21 13:51:21 UTC
2	+++ ./mimedefang-filter.5.in 2010-05-09 16:46:21.000000000 +0200	2	+++ mimedefang-filter.5.in
3	@@ -609,7 +609,7 @@	3	@@ -622,7 +622,7 @@ and entity_contains_virus_sophie unless
4	routine.	4	routine.
5		5
6	.TP	6	.TP

Lines 1-9 Link Here

(-)mimedefang/files/patch-mimedefang.pl.in (-3 / +5 lines)
1	--- mimedefang.pl.in.orig 2011-02-18 22:08:53.000000000 +0300	1	--- mimedefang.pl.in.orig 2014-05-21 13:50:26 UTC
2	+++ mimedefang.pl.in 2011-02-18 22:09:18.000000000 +0300	2	+++ mimedefang.pl.in
3	@@ -172,7 +172,7 @@	3	@@ -171,7 +171,7 @@ $FprotdHost = "127.0.0.1:10200";
4	$Fprotd6Host = "127.0.0.1:10200";	4	$Fprotd6Host = "127.0.0.1:10200";
5		5
6	$SophieSock = '@SPOOLDIR@/sophie';	6	$SophieSock = '@SPOOLDIR@/sophie';
7	-$ClamdSock = '@SPOOLDIR@/clamd.sock';	7	-$ClamdSock = '@SPOOLDIR@/clamd.sock';
8	+$ClamdSock = '/var/run/clamav/clamd.sock';	8	+$ClamdSock = '/var/run/clamav/clamd.sock';
9	$TrophieSock = '@SPOOLDIR@/trophie';	9	$TrophieSock = '@SPOOLDIR@/trophie';
		10
		11	#***********************************************************************




#!/bin/sh

[ $# != 2 ] && exit 1
[ -z "${PKG_PREFIX}" ] && exit 1
[ -n "${BATCH}" ] && exit 0

PKG_NAME=$1
PKG_ACTION=$2
MAILUSER=mailnull
SPOOLDIR=/var/spool/MIMEDefang
QUARANTINEDIR=/var/spool/MD-Quarantine

case "$PKG_ACTION" in
POST-INSTALL)
	if [ ! -d ${SPOOLDIR} ]; then
		mkdir -p ${SPOOLDIR}
		chown ${MAILUSER}:${MAILUSER} ${SPOOLDIR}
		chmod 710 ${SPOOLDIR}
	fi
	if [ ! -d ${QUARANTINEDIR} ]; then
		mkdir -p ${QUARANTINEDIR}
		chown ${MAILUSER}:${MAILUSER} ${QUARANTINEDIR}
		chmod 700 ${QUARANTINEDIR}
	fi
	;;

PRE-INSTALL|POST-DEINSTALL|DEINSTALL)
	;;

*)
echo "usage: $0 <PKG_NAME> {PRE-INSTALL|POST-INSTALL|DEINSTALL|POST-DEINSTALL}" >&2
	exit 1
	;;
esac

exit 0




man/man8/mimedefang.pl.8.gz
man/man8/watch-mimedefang.8.gz
man/man8/watch-multiple-mimedefangs.8.gz
@sample %%ETCDIR%%/mimedefang-ip-key.sample
@sample %%ETCDIR%%/mimedefang-filter.sample
@sample %%ETCDIR%%/sa-mimedefang.cf.sample
@unexec if cmp -s %D/%%ETCDIR%%/mimedefang-filter %D/%%ETCDIR%%/mimedefang-filter.example; then rm -f %D/%%ETCDIR%%/mimedefang-filter; fi
%%ETCDIR%%/mimedefang-filter.example
@exec [ -f %B/mimedefang-filter ] || cp -p %D/%F %B/mimedefang-filter
@unexec if cmp -s %D/%%ETCDIR%%/sa-mimedefang.cf %D/%%ETCDIR%%/sa-mimedefang.cf.example; then rm -f %D/%%ETCDIR%%/sa-mimedefang.cf; fi
%%ETCDIR%%/sa-mimedefang.cf.example
@exec [ -f %B/sa-mimedefang.cf ] || cp -p %D/%F %B/sa-mimedefang.cf
@exec [ -d %%MIMEDEFANG_RUNDIR%% ] || mkdir -p %%MIMEDEFANG_RUNDIR%%
@exec chgrp %%MAIL_USER%% %%MIMEDEFANG_RUNDIR%%
@exec [ -d %%MIMEDEFANG_QUARANTINEDIR%% ] || mkdir -p %%MIMEDEFANG_QUARANTINEDIR%%
@exec chgrp %%MAIL_USER%% %%MIMEDEFANG_QUARANTINEDIR%%
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN
%%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stream-by-domain-filter
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
@dir %%PORTEXAMPLES%%%%EXAMPLESDIR%%
@dir %%PORTDOCS%%%%DOCSDIR%%
@dir %%ETCDIR%%
@dir(%%USER%%,%%GROUP%%,710) %%MIMEDEFANG_RUNDIR%%
@dir(%%USER%%,%%GROUP%%,700) %%MIMEDEFANG_QUARANTINEDIR%%
@dirrm MD-Quarantine

Return to bug 203660

Lines 29-42 Link Here

(-)mimedefang/Makefile (-5 / +7 lines)
29	perl_OLD_CMD= perl	29	perl_OLD_CMD= perl
30	GNU_CONFIGURE= yes	30	GNU_CONFIGURE= yes
31		31
32	MAILUSER?= mailnull	32	MIMEDEFANG_USER?= mailnull
		33	MIMEDEFANG_GROUP?= mailnull
33	SPOOLDIR?= /var/spool/MIMEDefang	34	SPOOLDIR?= /var/spool/MIMEDefang
34	QUARANTINEDIR?= /var/spool/MD-Quarantine	35	QUARANTINEDIR?= /var/spool/MD-Quarantine
35		36
36	CONFIGURE_ENV+= PERL=${PERL}	37	CONFIGURE_ENV+= PERL=${PERL}
37	CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc \	38	CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc \
38	--with-confsubdir=mimedefang \	39	--with-confsubdir=mimedefang \
39	--with-user=${MAILUSER} \	40	--with-user=${MIMEDEFANG_USER} \
40	--with-spooldir=${SPOOLDIR} \	41	--with-spooldir=${SPOOLDIR} \
41	--with-quarantinedir=${QUARANTINEDIR} \	42	--with-quarantinedir=${QUARANTINEDIR} \
42	--with-ipheader \	43	--with-ipheader \
Lines 44-50 Link Here
44		45
45	SUB_FILES= pkg-message	46	SUB_FILES= pkg-message
46		47
47	PLIST_SUB+= MAIL_USER="${MAILUSER}" \	48	PLIST_SUB+= USER="${MIMEDEFANG_USER}" \
		49	GROUP="${MIMEDEFANG_GROUP}" \
48	MIMEDEFANG_RUNDIR="${SPOOLDIR}" \	50	MIMEDEFANG_RUNDIR="${SPOOLDIR}" \
49	MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"	51	MIMEDEFANG_QUARANTINEDIR="${QUARANTINEDIR}"
50		52
Lines 77-86 Link Here
77		79
78	post-install:	80	post-install:
79	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script	81	@${REINPLACE_CMD} -e 's,%%CHMOD%%,${CHMOD},g' ${WRKSRC}/examples/init-script
80	@${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${STAGEDIR}${PREFIX}/etc/rc.d/mimedefang	82	${INSTALL_SCRIPT} ${WRKSRC}/examples/init-script ${STAGEDIR}${PREFIX}/etc/rc.d/mimedefang
81	.if ${PORT_OPTIONS:MDOCS}	83	.if ${PORT_OPTIONS:MDOCS}
82	@${MKDIR} ${STAGEDIR}${DOCSDIR}	84	@${MKDIR} ${STAGEDIR}${DOCSDIR}
83	@${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/	85	${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/
84	.endif	86	.endif
85		87
86	.if ${PORT_OPTIONS:MEXAMPLES}	88	.if ${PORT_OPTIONS:MEXAMPLES}

Lines 1-25 Link Here

(-)mimedefang/files/patch-Makefile.in (-11 / +11 lines)
1	--- Makefile.in.orig 2012-01-20 19:20:32.000000000 +0400	1	--- Makefile.in.orig 2012-01-20 15:20:32 UTC
2	+++ Makefile.in 2012-04-16 03:14:35.979944862 +0400	2	+++ Makefile.in
3	@@ -156,14 +156,14 @@	3	@@ -156,14 +156,14 @@ install-redhat: install
4		4
5	install: all	5	install: all
6	$(INSTALL) -m 755 -d $(DESTDIR)${CONFDIR}	6	$(INSTALL) -m 755 -d $(DESTDIR)${CONFDIR}
7	- -if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key" ; then \	7	- -if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key" ; then \
8	- $(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key ;\	8	- $(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key ;\
9	- -chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 ; \	9	- -chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 ; \
10	+ -if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key.example" ; then \	10	+ -if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample" ; then \
11	+ $(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key.example ;\	11	+ $(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample ;\
12	+ -chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key.example > /dev/null 2>&1 ; \	12	+ -chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample > /dev/null 2>&1 ; \
13	fi	13	fi
14		14
15	if test "$(DEFANGUSER)" != "" ; then \	15	if test "$(DEFANGUSER)" != "" ; then \
16	if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \	16	if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \
17	- chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 \|\| true; \	17	- chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 \|\| true; \
18	+ chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key.example > /dev/null 2>&1 \|\| true; \	18	+ chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key.sample > /dev/null 2>&1 \|\| true; \
19	test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 \|\| true; \	19	test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 \|\| true; \
20	test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 \|\| true; \	20	test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 \|\| true; \
21	fi \	21	fi \
22	@@ -185,11 +185,7 @@	22	@@ -185,11 +185,7 @@ install: all
23	-test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 750 $(DESTDIR)$(SPOOLDIR) \|\| true	23	-test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 750 $(DESTDIR)$(SPOOLDIR) \|\| true
24	-test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 750 $(DESTDIR)$(QDIR) \|\| true	24	-test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 750 $(DESTDIR)$(QDIR) \|\| true
25		25
Lines 28-38 Link Here
28	- else \	28	- else \
29	- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter \|\| exit 1; \	29	- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter \|\| exit 1; \
30	- fi	30	- fi
31	+ $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.example \|\| exit 1	31	+ $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.sample \|\| exit 1
32		32
33	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor	33	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor
34	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) md-mx-ctrl $(DESTDIR)$(prefix)/bin/md-mx-ctrl	34	$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) md-mx-ctrl $(DESTDIR)$(prefix)/bin/md-mx-ctrl
35	@@ -210,11 +206,7 @@	35	@@ -210,11 +206,7 @@ install: all
36	$(INSTALL) -m 644 mimedefang-protocol.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7	36	$(INSTALL) -m 644 mimedefang-protocol.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7
37	$(INSTALL) -m 644 mimedefang-notify.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7	37	$(INSTALL) -m 644 mimedefang-notify.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7
38	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \	38	if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
Lines 41-47 Link Here
41	- else \	41	- else \
42	- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf \|\| exit 1; \	42	- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf \|\| exit 1; \
43	- fi \	43	- fi \
44	+ $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.example \|\| exit 1; \	44	+ $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.sample \|\| exit 1; \
45	fi	45	fi
46		46
47	distro: FORCE	47	distro: FORCE

Lines 1-6 Link Here

(-)mimedefang/files/patch-examples__init-script.in (-10 / +10 lines)
1	--- examples/init-script.in.orig 2010-06-29 14:50:32.000000000 -0700	1	--- examples/init-script.in.orig 2012-01-20 15:24:01 UTC
2	+++ examples/init-script.in 2012-02-14 23:06:37.000000000 -0800	2	+++ examples/init-script.in
3	@@ -39,6 +39,12 @@	3	@@ -39,6 +39,12 @@ export LC_ALL
4	# The socket used by mimedefang to communicate with sendmail	4	# The socket used by mimedefang to communicate with sendmail
5	# SOCKET=$SPOOLDIR/mimedefang.sock	5	# SOCKET=$SPOOLDIR/mimedefang.sock
6		6
Lines 13-19 Link Here
13	# Run the multiplexor and filters as this user, not root. RECOMMENDED	13	# Run the multiplexor and filters as this user, not root. RECOMMENDED
14	MX_USER=@DEFANGUSER@	14	MX_USER=@DEFANGUSER@
15		15
16	@@ -132,11 +138,11 @@	16	@@ -136,11 +142,11 @@ MX_MAXIMUM=10
17		17
18	# Limit slave processes' resident-set size to this many kilobytes. Default	18	# Limit slave processes' resident-set size to this many kilobytes. Default
19	# is unlimited.	19	# is unlimited.
Lines 27-33 Link Here
27		27
28	# If you want to use the "notification" facility, set the appropriate port.	28	# If you want to use the "notification" facility, set the appropriate port.
29	# See the mimedefang-notify man page for details.	29	# See the mimedefang-notify man page for details.
30	@@ -183,7 +189,7 @@	30	@@ -187,7 +193,7 @@ then
31	. /etc/rc.subr	31	. /etc/rc.subr
32		32
33	name=$prog	33	name=$prog
Lines 36-42 Link Here
36	# default to not enabled, enable in rc.conf	36	# default to not enabled, enable in rc.conf
37	eval $rcvar=\${$rcvar:-NO}	37	eval $rcvar=\${$rcvar:-NO}
38		38
39	@@ -193,6 +199,7 @@	39	@@ -197,6 +203,7 @@ then
40	procname=$PROGDIR/$prog-multiplexor	40	procname=$PROGDIR/$prog-multiplexor
41	start_cmd="start_it"	41	start_cmd="start_it"
42	stop_cmd="stop_it"	42	stop_cmd="stop_it"
Lines 44-50 Link Here
44	sig_reload="INT"	44	sig_reload="INT"
45	reread_cmd="reread_it"	45	reread_cmd="reread_it"
46	# provide both "reload", the FreeBSD default, with a direct signal to	46	# provide both "reload", the FreeBSD default, with a direct signal to
47	@@ -203,6 +210,8 @@	47	@@ -207,6 +214,8 @@ fi
48	# Make sure required vars are set	48	# Make sure required vars are set
49	SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock}	49	SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock}
50	MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock}	50	MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock}
Lines 53-59 Link Here
53		53
54	start_it() {	54	start_it() {
55	if test -r $PID ; then	55	if test -r $PID ; then
56	@@ -286,6 +295,29 @@	56	@@ -292,6 +301,29 @@ start_it() {
57	kill `cat $MXPID`	57	kill `cat $MXPID`
58	return 1	58	return 1
59	fi	59	fi
Lines 83-89 Link Here
83	return 0	83	return 0
84	}	84	}
85		85
86	@@ -321,7 +353,7 @@	86	@@ -327,7 +359,7 @@ stop_it() {
87	rm -f $MX_SOCKET > /dev/null 2>&1	87	rm -f $MX_SOCKET > /dev/null 2>&1
88	rm -f $SOCKET > /dev/null 2>&1	88	rm -f $SOCKET > /dev/null 2>&1
89		89
Lines 92-98 Link Here
92	printf "Waiting for daemons to exit."	92	printf "Waiting for daemons to exit."
93	WAITPID=""	93	WAITPID=""
94	test -f $PID && WAITPID=`cat $PID`	94	test -f $PID && WAITPID=`cat $PID`
95	@@ -373,6 +405,12 @@	95	@@ -379,6 +411,12 @@ reread_it() {
96	fi	96	fi
97	}	97	}
98		98

Lines 1-36 Link Here

(-)mimedefang/pkg-install (-36 lines)
1	#!/bin/sh
2
3	[ $# != 2 ] && exit 1
4	[ -z "${PKG_PREFIX}" ] && exit 1
5	[ -n "${BATCH}" ] && exit 0
6
7	PKG_NAME=$1
8	PKG_ACTION=$2
9	MAILUSER=mailnull
10	SPOOLDIR=/var/spool/MIMEDefang
11	QUARANTINEDIR=/var/spool/MD-Quarantine
12
13	case "$PKG_ACTION" in
14	POST-INSTALL)
15	if [ ! -d ${SPOOLDIR} ]; then
16	mkdir -p ${SPOOLDIR}
17	chown ${MAILUSER}:${MAILUSER} ${SPOOLDIR}
18	chmod 710 ${SPOOLDIR}
19	fi
20	if [ ! -d ${QUARANTINEDIR} ]; then
21	mkdir -p ${QUARANTINEDIR}
22	chown ${MAILUSER}:${MAILUSER} ${QUARANTINEDIR}
23	chmod 700 ${QUARANTINEDIR}
24	fi
25	;;
26
27	PRE-INSTALL\|POST-DEINSTALL\|DEINSTALL)
28	;;
29
30	*)
31	echo "usage: $0 <PKG_NAME> {PRE-INSTALL\|POST-INSTALL\|DEINSTALL\|POST-DEINSTALL}" >&2
32	exit 1
33	;;
34	esac
35
36	exit 0

Lines 16-34 Link Here

(-)mimedefang/pkg-plist (-19 / +8 lines)
16	man/man8/mimedefang.pl.8.gz	16	man/man8/mimedefang.pl.8.gz
17	man/man8/watch-mimedefang.8.gz	17	man/man8/watch-mimedefang.8.gz
18	man/man8/watch-multiple-mimedefangs.8.gz	18	man/man8/watch-multiple-mimedefangs.8.gz
19	@unexec if cmp -s %D/%%ETCDIR%%/mimedefang-ip-key %D/%%ETCDIR%%/mimedefang-ip-key.example; then rm -f %D/%%ETCDIR%%/mimedefang-ip-key; fi	19	@sample %%ETCDIR%%/mimedefang-ip-key.sample
20	%%ETCDIR%%/mimedefang-ip-key.example	20	@sample %%ETCDIR%%/mimedefang-filter.sample
21	@exec [ -f %B/mimedefang-ip-key ] \|\| cp -p %D/%F %B/mimedefang-ip-key	21	@sample %%ETCDIR%%/sa-mimedefang.cf.sample
22	@unexec if cmp -s %D/%%ETCDIR%%/mimedefang-filter %D/%%ETCDIR%%/mimedefang-filter.example; then rm -f %D/%%ETCDIR%%/mimedefang-filter; fi
23	%%ETCDIR%%/mimedefang-filter.example
24	@exec [ -f %B/mimedefang-filter ] \|\| cp -p %D/%F %B/mimedefang-filter
25	@unexec if cmp -s %D/%%ETCDIR%%/sa-mimedefang.cf %D/%%ETCDIR%%/sa-mimedefang.cf.example; then rm -f %D/%%ETCDIR%%/sa-mimedefang.cf; fi
26	%%ETCDIR%%/sa-mimedefang.cf.example
27	@exec [ -f %B/sa-mimedefang.cf ] \|\| cp -p %D/%F %B/sa-mimedefang.cf
28	@exec [ -d %%MIMEDEFANG_RUNDIR%% ] \|\| mkdir -p %%MIMEDEFANG_RUNDIR%%
29	@exec chgrp %%MAIL_USER%% %%MIMEDEFANG_RUNDIR%%
30	@exec [ -d %%MIMEDEFANG_QUARANTINEDIR%% ] \|\| mkdir -p %%MIMEDEFANG_QUARANTINEDIR%%
31	@exec chgrp %%MAIL_USER%% %%MIMEDEFANG_QUARANTINEDIR%%
32	%%PORTDOCS%%%%DOCSDIR%%/README	22	%%PORTDOCS%%%%DOCSDIR%%/README
33	%%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN	23	%%PORTDOCS%%%%DOCSDIR%%/README.SPAMASSASSIN
34	%%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE	24	%%PORTDOCS%%%%DOCSDIR%%/README.SOPHIE
Lines 40-48 Link Here
40	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README	30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
41	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stream-by-domain-filter	31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stream-by-domain-filter
42	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients	32	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suggested-minimum-filter-for-windows-clients
43	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%	33	@dir %%PORTEXAMPLES%%%%EXAMPLESDIR%%
44	%%PORTDOCS%%@dirrm %%DOCSDIR%%	34	@dir %%PORTDOCS%%%%DOCSDIR%%
45	@dirrmtry %%ETCDIR%%	35	@dir %%ETCDIR%%
46	@cwd /var/spool	36	@dir(%%USER%%,%%GROUP%%,710) %%MIMEDEFANG_RUNDIR%%
47	@dirrm MIMEDefang	37	@dir(%%USER%%,%%GROUP%%,700) %%MIMEDEFANG_QUARANTINEDIR%%
48	@dirrm MD-Quarantine