Attachment 88818 Details for Bug 125657 – milter-greylist-devel-2.0.b1_1.patch

[patch] milter-greylist-devel-2.0.b1_1.patch

milter-greylist-devel-2.0.b1_1.patch (text/plain), 8.13 KB, created by Philip M. Gollucci on 2008-07-15 23:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2008-07-15 23:40:02 UTC

Size: 8.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/milter-greylist-devel/Makefile,v
>retrieving revision 1.5
>diff -u -u -r1.5 Makefile
>--- Makefile	9 Dec 2006 20:51:15 -0000	1.5
>+++ Makefile	15 Jul 2008 22:29:20 -0000
>@@ -7,16 +7,19 @@
> 
> PORTNAME=	milter-greylist-devel
> DISTVERSION=	2.0b1
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
> DISTNAME=	milter-greylist-${DISTVERSION}
> EXTRACT_SUFX=	.tgz
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	pgollucci@p6m7g8.com
> COMMENT=	Easy-to-use greylist milter for sendmail (development)
> 
>+.if !defined(NO_INSTALL_MANPAGES)
> MAN5=		greylist.conf.5
> MAN8=		milter-greylist.8
>+.endif
> 
> CFLAGS+=	${PTHREAD_CFLAGS}
> LIBS+=		${PTHREAD_LIBS}
>@@ -28,34 +31,32 @@
> 
> ALL_TARGET=	milter-greylist
> 
>-USE_RC_SUBR=	yes
>-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
>+USE_RC_SUBR=	milter-greylist
>+SUB_FILES+=	pkg-message
> 
> CONFLICTS=	milter-greylist-[1-9]*.*
> 
>-post-extract:
>-	@${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>-		${FILESDIR}/milter-greylist.sh > ${WRKSRC}/milter-greylist.sh
>-
> do-install:
> 	@${MKDIR} ${PREFIX}/etc/mail
> 	@${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/bin
>+.if !defined (NO_INSTALL_MANPAGES)
> 	@${INSTALL_MAN} ${WRKSRC}/greylist.conf.5 ${PREFIX}/man/man5
> 	@${INSTALL_MAN} ${WRKSRC}/milter-greylist.8 ${PREFIX}/man/man8
>+.endif
> 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf \
> 			${PREFIX}/etc/mail/greylist.conf.sample
>-	@${INSTALL_SCRIPT} ${WRKSRC}/milter-greylist.sh ${PREFIX}/etc/rc.d/
> 
> post-install:
> 	@${MKDIR} /var/milter-greylist
> 	@${CHOWN} smmsp /var/milter-greylist
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	@${MKDIR} ${EXAMPLESDIR}
> 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+.endif
>+.if !defined (NOPORTEXAMPLES)
>+	@${MKDIR} ${EXAMPLESDIR}
> 	@${INSTALL_DATA} ${WRKSRC}/greylist.conf ${EXAMPLESDIR}
> .endif
>-
> 	@${TEST} -f /var/db/milter-greylist/greylist.db && ( \
> 		${ECHO} "***********************************************************"; \
> 		${ECHO} "***********************************************************"; \
>@@ -69,7 +70,6 @@
> 		${ECHO} "***********************************************************"; \
> 		${ECHO} "***********************************************************"; \
> 	) || ${TRUE}
>-
> 	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>Index: pkg-message
>===================================================================
>RCS file: pkg-message
>diff -N pkg-message
>--- pkg-message	9 Feb 2005 12:30:03 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,14 +0,0 @@
>-
>-------------------------------------------------------------------------
>-                              IMPORTANT NOTE
>-
>- A sample configuration file has been installed in ${PREFIX}/etc/mail
>- directory. Copy and edit it to suit your needs before launching
>- milter-greylist.
>-
>- To run milter-greylist from startup, add miltergreylist_enable="YES"
>- in your /etc/rc.conf or your /etc/rc.conf.local
>-
>- See ${DOCSDIR}/README for operation details.
>-
>-------------------------------------------------------------------------
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/mail/milter-greylist-devel/pkg-plist,v
>retrieving revision 1.2
>diff -u -u -r1.2 pkg-plist
>--- pkg-plist	9 Feb 2005 12:30:03 -0000	1.2
>+++ pkg-plist	15 Jul 2008 22:29:20 -0000
>@@ -1,12 +1,11 @@
> bin/milter-greylist
> etc/mail/greylist.conf.sample
>-etc/rc.d/milter-greylist.sh
> %%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%EXAMPLESDIR%%/greylist.conf
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/greylist.conf
> @exec /bin/mkdir -p /var/milter-greylist
> @exec /usr/sbin/chown smmsp /var/milter-greylist
> @exec [ -f /var/db/milter-greylist/greylist.db ] && printf '\n*\n************************************************************\n************************************************************\n***                                                       **\n***                      WARNING                          **\n***                                                       **\n*** The default dump file location has changed.           **\n*** Please move greylist.db from /var/db/milter-greylist/ **\n*** to /var/milter-greylist/                              **\n***                                                       **\n************************************************************\n************************************************************\n' ||true
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>-@unexec /bin/rmdir %D/etc/mail 2>/dev/null || true
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>+@dirrmtry etc/mail
> @unexec [ -f /var/milter-greylist/greylist.db ] || /bin/rmdir /var/milter-greylist || true
>Index: files/milter-greylist.in
>===================================================================
>RCS file: files/milter-greylist.in
>diff -N files/milter-greylist.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/milter-greylist.in	15 Jul 2008 22:29:20 -0000
>@@ -0,0 +1,33 @@
>+#!/bin/sh
>+# $FreeBSD: ports/mail/milter-greylist-devel/files/milter-greylist.sh,v 1.1 2005/02/03 18:42:24 ume Exp $
>+
>+# PROVIDE: miltergreylist
>+# REQUIRE: LOGIN
>+# BEFORE: sendmail
>+# KEYWORD: milter-greylist
>+
>+# Define these miltergreylist_* variables in one of these files:
>+#       /etc/rc.conf
>+#       /etc/rc.conf.local
>+#       /etc/rc.conf.d/miltergreylist
>+#
>+# DO NOT CHANGE THESE DEFAULT VALUES HERE
>+#
>+
>+. %%RC_SUBR%%
>+
>+name="miltergreylist"
>+rcvar=`set_rcvar`
>+command="%%PREFIX%%/bin/milter-greylist"
>+
>+load_rc_config $name
>+
>+miltergreylist_enable=${miltergreylist_enable-"NO"}
>+miltergreylist_runas=${miltergreylist_runas-"smmsp"}
>+miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
>+miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"}
>+miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"}
>+miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
>+-f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
>+
>+run_rc_command "$1"
>Index: files/milter-greylist.sh
>===================================================================
>RCS file: files/milter-greylist.sh
>diff -N files/milter-greylist.sh
>--- files/milter-greylist.sh	3 Feb 2005 18:42:24 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,32 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/mail/milter-greylist-devel/files/milter-greylist.sh,v 1.1 2005/02/03 18:42:24 ume Exp $
>-
>-# PROVIDE: miltergreylist
>-# REQUIRE: LOGIN
>-# BEFORE: sendmail
>-# KEYWORD: milter-greylist
>-
>-# Define these miltergreylist_* variables in one of these files:
>-#       /etc/rc.conf
>-#       /etc/rc.conf.local
>-#       /etc/rc.conf.d/miltergreylist
>-#
>-# DO NOT CHANGE THESE DEFAULT VALUES HERE
>-#
>-miltergreylist_enable=${miltergreylist_enable-"NO"}
>-miltergreylist_runas=${miltergreylist_runas-"smmsp"}
>-miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"}
>-miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"}
>-miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"}
>-miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \
>--f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"}
>-
>-. %%RC_SUBR%%
>-
>-name="miltergreylist"
>-rcvar=`set_rcvar`
>-command="%%PREFIX%%/bin/milter-greylist"
>-
>-load_rc_config $name
>-
>-run_rc_command "$1"
>Index: files/pkg-message.in
>===================================================================
>RCS file: files/pkg-message.in
>diff -N files/pkg-message.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/pkg-message.in	15 Jul 2008 22:29:20 -0000
>@@ -0,0 +1,14 @@
>+
>+------------------------------------------------------------------------
>+                              IMPORTANT NOTE
>+
>+ A sample configuration file has been installed in ${PREFIX}/etc/mail
>+ directory. Copy and edit it to suit your needs before launching
>+ milter-greylist.
>+
>+ To run milter-greylist from startup, add miltergreylist_enable="YES"
>+ in your /etc/rc.conf or your /etc/rc.conf.local
>+
>+ See ${DOCSDIR}/README for operation details.
>+
>+------------------------------------------------------------------------

Actions: View | Diff

Attachments on bug 125657: 88818