Bug 177797 - [PATCH] mail/postfix-policyd-spf-python: update to 1.1 and etc.
Summary: [PATCH] mail/postfix-policyd-spf-python: update to 1.1 and etc.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ruslan Makhmatkhanov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-12 03:10 UTC by Yasuhiro Kimura
Modified: 2013-08-28 14:50 UTC (History)
0 users

See Also:


Attachments
patch-postfix-policyd-spf-python (3.55 KB, text/plain)
2013-04-12 03:10 UTC, Yasuhiro Kimura
no flags Details
patch-postfix-policyd-spf-python (3.75 KB, text/plain; charset=Shift_JIS)
2013-04-13 05:56 UTC, Yasuhiro Kimura
no flags Details
patch-postfix-policyd-spf-python (4.11 KB, text/plain; charset=Shift_JIS)
2013-08-10 01:03 UTC, Yasuhiro Kimura
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro Kimura freebsd_committer freebsd_triage 2013-04-12 03:10:00 UTC
	- Update to 1.1.
	- Modify policyd-spf so ${PREFIX}/etc/postfix-policyd-spf-python/policyd-spf.conf is used as default configuration files
	- Change pkg-message.in accordingly
	- Modify misc file paths in man pages so they match installed ones.
	- Adopt to new options framework.
	- Add license information.
	- Trim makefile header.
	- Update WWW url in pkg-descr.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-04-12 03:10:07 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-04-12 03:10:07 UTC
Maintainer of mail/postfix-policyd-spf-python,

Please note that PR ports/177797 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/177797

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Giel van Schijndel 2013-04-12 10:56:18 UTC
 On Fri, 12 Apr 2013 02:10:07 UT, Edwin Groothuis wrote:
> Please note that PR ports/177797 has just been submitted.
>
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.

 Patch looks good, go ahead and commit it.

-- 
 Giel
Comment 4 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-04-13 05:56:43 UTC
mail/py-authres is added to RUN_DDEPENDS in order to support
"Header_Type = AR" setting in policyd-spf.conf. Please commit attached
patch instead of original one. Also note mail/py-authres is new port and
not yet committed to port tree. So please commit ports/177824 and this
PR together.

Best Regards.
Comment 5 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-08-10 01:03:22 UTC
Newer version 1.2 is released. Please commit attached patch instead of
previous ons.

Regards.
Comment 6 neil 2013-08-10 09:30:34 UTC
Hi,

This needs committing because the recent py-spf-2.0.8 update has broken
postfix-policyd-spf-python. The upstream version of this port is
currently 1.2.

Regards,
Neil Darlow
Comment 7 Yasuhiro Kimura freebsd_committer freebsd_triage 2013-08-27 09:30:56 UTC
Once more, would someone please commit this PR?

Currently this port is broken due to update of mail/py-spf to 2.0.9,
and this PR need to be committed to fix it.

Best regards.

---
Yasuhiro KIMURA

From: Yasuhiro KIMURA <yasu@utahime.org>
Subject: Re: ports/177797: [PATCH] mail/postfix-policyd-spf-python: update to 1.1 and etc.
Date: Sat, 10 Aug 2013 09:58:02 +0900 (JST)

> Dear committers.
> 
> Would someone please commit this PR? Maintainer already approve it.
> 
> Best Regards.
> 
> ---
> Yasuhiro KIMURA
> _______________________________________________
> freebsd-ports@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-ports
> To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org"
Comment 8 Ruslan Makhmatkhanov freebsd_committer freebsd_triage 2013-08-27 23:46:58 UTC
Responsible Changed
From-To: freebsd-ports-bugs->rm

I will take it.
Comment 9 Ruslan Makhmatkhanov freebsd_committer freebsd_triage 2013-08-28 14:49:17 UTC
State Changed
From-To: feedback->closed

Committed with couple of cosmetic changes, thank you!
Comment 10 dfilter service freebsd_committer freebsd_triage 2013-08-28 14:49:32 UTC
Author: rm
Date: Wed Aug 28 13:47:32 2013
New Revision: 325529
URL: http://svnweb.freebsd.org/changeset/ports/325529

Log:
  - update to 1.2
  - modify policyd-spf so ${PREFIX}/etc/postfix-policyd-spf-python/policyd-spf.conf
    is used as default configuration files and change pkg-message.in accordingly
  - modify misc file paths in man pages so they match installed ones
  - adopt to new options framework (DOCS)
  - add license information (AL2)
  - trim makefile header.
  - update WWW url in pkg-descr
  
  while I'm here:
  - use absolute url in MASTER_SITES and remove http redirection quirks
  - replace PYTHON_SITELIBDIR with PYTHON_PKGNAMEPREFIX in depends
  - shortened overly long lines to make Makefile more readable
  - remove attribution from pkg-descr, that's no more supported in ports
  
  PR:		177797
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
  Approved by:	Giel van Schijndel <me@mortis.eu> (maintainer)

Modified:
  head/mail/postfix-policyd-spf-python/Makefile
  head/mail/postfix-policyd-spf-python/distinfo
  head/mail/postfix-policyd-spf-python/files/pkg-message.in
  head/mail/postfix-policyd-spf-python/pkg-descr

Modified: head/mail/postfix-policyd-spf-python/Makefile
==============================================================================
--- head/mail/postfix-policyd-spf-python/Makefile	Wed Aug 28 13:42:57 2013	(r325528)
+++ head/mail/postfix-policyd-spf-python/Makefile	Wed Aug 28 13:47:32 2013	(r325529)
@@ -1,29 +1,25 @@
-# New ports collection makefile for:	postfix-policyd-spf-python
-# Date created:				8 Jan 2010
-# Whom:					Giel van Schijndel <me@mortis.eu>
-#
+# Created by: Giel van Schijndel <me@mortis.eu>
 # $FreeBSD$
-#
 
 PORTNAME=	postfix-policyd-spf-python
-PORTVERSION=	1.0
+PORTVERSION=	1.2
 CATEGORIES=	mail python
-MASTER_SITES=	http://launchpad.net/pypolicyd-spf/${PORTVERSION}/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpadlibrarian.net/145855789/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pypolicyd-spf-${PORTVERSION}
 
 MAINTAINER=	me@mortis.eu
 COMMENT=	Pure Python Postfix policy daemon for SPF checking
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/spf.py:${PORTSDIR}/mail/py-spf
+LICENSE=	AL2
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipaddr>0:${PORTSDIR}/devel/py-ipaddr \
+		${PYTHON_PKGNAMEPREFIX}spf>0:${PORTSDIR}/mail/py-spf \
+		${PYTHON_PKGNAMEPREFIX}authres>0:${PORTSDIR}/mail/py-authres
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	python-policyd-spf
-
-# Apparently launchpad seems to depend on redirects for their downloads. So
-# ditch the fetch -A flag.
-FETCH_ARGS=	-pRr
+PYDISTUTILS_PKGNAME=	pypolicyd-spf
 
 MAN1=		policyd-spf.1
 MAN5=		policyd-spf.conf.5 \
@@ -33,7 +29,6 @@ PORTDOCS=	CHANGES \
 		COPYING \
 		README \
 		README.per_user_whitelisting \
-		TODO \
 		policyd-spf.conf.commented
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
@@ -41,18 +36,35 @@ PKGMESSAGE=	${WRKSRC}/pkg-message
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
+OPTIONS_DEFINE=	DOCS
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e '\/etc/s|/etc|etc|' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e "s|/etc/python-policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \
+		${WRKSRC}/policyd-spf
+	@${REINPLACE_CMD} -e "s|/etc/policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \
+		-e "s|/usr/bin/policyd-spf|${PREFIX}/bin/policyd-spf|" \
+		-e "s|/etc/postfix/|${LOCALBASE}/etc/postfix/|" ${WRKSRC}/policyd-spf.1
+	@${REINPLACE_CMD} -e "s|/etc/policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \
+		${WRKSRC}/policyd-spf.conf.5
+	@${REINPLACE_CMD} -e "s|/etc/policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \
+		-e "s|/etc/pypolicyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \
+		${WRKSRC}/policyd-spf.peruser.5
 
 do-install:
 	@# Install data to an unused directory to ensure it doesn't pollute the system
-	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS} --install-data ${WRKDIR}/tmp-datadump-dir)
+	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \
+		${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS} \
+		--install-data ${WRKDIR}/tmp-datadump-dir)
 	${INSTALL_MAN} ${WRKSRC}/policyd-spf.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/policyd-spf.conf.5 ${MANPREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/policyd-spf.peruser.5 ${MANPREFIX}/man/man5
 	@${INSTALL} -d ${ETCDIR}/
 	${INSTALL_DATA} ${WRKSRC}/policyd-spf.conf ${ETCDIR}/policyd-spf.conf.sample
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif

Modified: head/mail/postfix-policyd-spf-python/distinfo
==============================================================================
--- head/mail/postfix-policyd-spf-python/distinfo	Wed Aug 28 13:42:57 2013	(r325528)
+++ head/mail/postfix-policyd-spf-python/distinfo	Wed Aug 28 13:47:32 2013	(r325529)
@@ -1,2 +1,2 @@
-SHA256 (pypolicyd-spf-1.0.tar.gz) = c57aa4bae4f6ed2321acf0f9361cbdce652fb4c1c948b063a0909744815e0c8d
-SIZE (pypolicyd-spf-1.0.tar.gz) = 30204
+SHA256 (pypolicyd-spf-1.2.tar.gz) = e1a94c79ad91cfea17b9c8b19b035536f06d75ff9ee2e8478191e7c27fe69f74
+SIZE (pypolicyd-spf-1.2.tar.gz) = 30783

Modified: head/mail/postfix-policyd-spf-python/files/pkg-message.in
==============================================================================
--- head/mail/postfix-policyd-spf-python/files/pkg-message.in	Wed Aug 28 13:42:57 2013	(r325528)
+++ head/mail/postfix-policyd-spf-python/files/pkg-message.in	Wed Aug 28 13:47:32 2013	(r325529)
@@ -7,8 +7,8 @@ This package must be integrated with Pos
  1. Add to your postfix master.cf:
 
         policyd-spf  unix  -       n       n       -       0       spawn
-            user=nobody argv=%%PYTHON_CMD%% %%PREFIX%%/bin/policyd-spf %%ETCDIR%%/policyd-spf.conf
-      
+            user=nobody argv=%%PREFIX%%/bin/policyd-spf
+
  2. Configure the Postfix policy service in your main.cf so that the
     "smtpd_recipient_restrictions" includes a call to the policyd-spf policy
     filter.  If you already have a "smtpd_recipient_restrictions" line, you can

Modified: head/mail/postfix-policyd-spf-python/pkg-descr
==============================================================================
--- head/mail/postfix-policyd-spf-python/pkg-descr	Wed Aug 28 13:42:57 2013	(r325528)
+++ head/mail/postfix-policyd-spf-python/pkg-descr	Wed Aug 28 13:47:32 2013	(r325529)
@@ -1,6 +1,4 @@
 python-policyd-spf is a Postfix SMTPd policy engine for SPF checking. It is
 implemented in pure Python and uses the python-spf module.
 
-WWW: http://www.openspf.org/Software
-
-Giel van Schijndel <me@mortis.eu>
+WWW: https://launchpad.net/pypolicyd-spf/
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"