Attachment 143281 Details for Bug 190468 – postgrey-1.34.patch

[patch] postgrey-1.34.patch

postgrey-1.34.patch (text/plain), 4.97 KB, created by Yasuhiro Kimura on 2014-06-02 00:02:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2014-06-02 00:02:39 UTC

Size: 4.97 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 356158)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	postgrey
> PORTVERSION=	1.34
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	mail
> MASTER_SITES=	http://postgrey.schweikert.ch/pub/ \
> 		http://postgrey.schweikert.ch/pub/old/
>@@ -11,6 +11,8 @@
> MAINTAINER=	ports.maintainer@evilphi.com
> COMMENT=	Greylisting policy server for Postfix
> 
>+LICENSE=	GPLv2
>+
> RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
> 		p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \
> 		p5-Parse-Syslog>=0:${PORTSDIR}/textproc/p5-Parse-Syslog \
>@@ -22,7 +24,7 @@
> NO_BUILD=	yes
> POD2MAN?=	pod2man
> PORTDOCS=	README Changes README.exim
>-SUB_FILES=	pkg-install
>+SUB_FILES=	pkg-install pkg-deinstall
> SUB_LIST=	USER=${PGY_USERNAME} \
> 		GROUP=${PGY_GROUPNAME} \
> 		ETCFILES="${ETCFILES}" \
>@@ -34,17 +36,13 @@
> 
> USERS=		${PGY_USERNAME}
> GROUPS=		${PGY_GROUPNAME}
>-MAN1=		${PORTNAME}.1 policy-test.1 postgreyreport.1
>+MANFILES=	${PORTNAME}.1 policy-test.1 postgreyreport.1
> 
> USES=		shebangfix perl5
>-SHEBANG_FILES=	${WRKSRC}/postgrey
>+SHEBANG_FILES=	contrib/postgreyreport policy-test postgrey
> 
>-NO_STAGE=	yes
>-
> OPTIONS_DEFINE=	DOCS
> 
>-.include <bsd.port.options.mk>
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's#nogroup#${PGY_GROUPNAME}#' ${WRKSRC}/postgrey
> 	@${REINPLACE_CMD} -e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey
>@@ -51,28 +49,19 @@
> 	@${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' ${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_*
> 	@${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${PGY_DIR}#' ${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport
> 
>-pre-install:
>-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>-
> do-install:
> 	@${POD2MAN} ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
> 	@${POD2MAN} ${WRKSRC}/policy-test ${WRKSRC}/policy-test.1
> 	@${POD2MAN} ${WRKSRC}/contrib/postgreyreport ${WRKSRC}/postgreyreport.1
>-	@${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${PREFIX}/sbin
>-	@${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${PREFIX}/sbin
>-	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport ${PREFIX}/sbin
>-	@${INSTALL} -d ${PREFIX}/etc/postfix
>+	@${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${STAGEDIR}${PREFIX}/sbin
>+	@${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${STAGEDIR}${PREFIX}/sbin
>+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport ${STAGEDIR}${PREFIX}/sbin
>+	@${INSTALL} -d ${STAGEDIR}${PREFIX}/etc/postfix
> .for i in ${ETCFILES}
>-	${INSTALL_DATA} ${WRKSRC}/postgrey_${i} ${PREFIX}/etc/postfix/dist-postgrey_${i}
>+	${INSTALL_DATA} ${WRKSRC}/postgrey_${i} ${STAGEDIR}${PREFIX}/etc/postfix/dist-postgrey_${i}
> .endfor
>+	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
>+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>+	@cd ${WRKSRC} && ${INSTALL_MAN} ${MANFILES} ${STAGEDIR}${MANPREFIX}/man/man1
> 
>-.if ${PORT_OPTIONS:MDOCS}
>-	@${INSTALL} -d ${DOCSDIR}
>-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
>-.endif
>-	@cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
>-
>-post-install:
>-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>-
> .include <bsd.port.mk>
>Index: files/pkg-deinstall.in
>===================================================================
>--- files/pkg-deinstall.in	(revision 0)
>+++ files/pkg-deinstall.in	(working copy)
>@@ -0,0 +1,26 @@
>+#! /bin/sh
>+#
>+# $FreeBSD$
>+
>+PATH=/bin:/usr/bin:/usr/sbin
>+
>+case $2 in
>+
>+DEINSTALL)
>+  if [ -z "%%POSTGREYDIR%%" -o -z "%%USER%%" -o -z "%%GROUP%%" ]; then
>+    echo "ERROR: A required pragma was empty"
>+    exit 1
>+  fi
>+  ;;
>+
>+POST-DEINSTALL)
>+  echo "---> Starting post-deinstall script:"
>+
>+  # Try to remove home directory
>+  if /bin/rmdir "%%POSTGREYDIR%%" 2>/dev/null; then
>+    echo "---> Postgrey database directory (%%POSTGREYDIR%%) is removed."
>+  else
>+    echo "---> Postgrey database directory (%%POSTGREYDIR%%) is not empty so is not removed."
>+  fi
>+
>+esac
>
>Property changes on: files/pkg-deinstall.in
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 356158)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,8 @@
> @unexec if cmp -s %D/etc/postfix/dist-postgrey_whitelist_recipients %D/etc/postfix/postgrey_whitelist_recipients; then rm -f %D/etc/postfix/postgrey_whitelist_recipients; fi
> @unexec if cmp -s %D/etc/postfix/dist-postgrey_whitelist_clients %D/etc/postfix/postgrey_whitelist_clients; then rm -f %D/etc/postfix/postgrey_whitelist_clients; fi
>+man/man1/policy-test.1.gz
>+man/man1/postgrey.1.gz
>+man/man1/postgreyreport.1.gz
> sbin/postgrey
> sbin/policy-test
> sbin/postgreyreport
>@@ -6,4 +9,3 @@
> etc/postfix/dist-postgrey_whitelist_recipients
> etc/postfix/dist-postgrey_whitelist_clients
> @dirrmtry etc/postfix
>-@unexec rmdir /var/db/postgrey 2>/dev/null || true
>--- postgrey-1.34.patch ends here ---

Actions: View | Diff

Attachments on bug 190468: 143281