FreeBSD Bugzilla – Attachment 215074 Details for
Bug 244424
mail/postfix-policyd-spf-python: Update to 2.9.2 and rename
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch file
mail_py-spf-engine.patch (text/plain), 13.20 KB, created by
Yasuhiro Kimura
on 2020-05-30 21:24:52 UTC
(
hide
)
Description:
Updated patch file
Filename:
MIME Type:
Creator:
Yasuhiro Kimura
Created:
2020-05-30 21:24:52 UTC
Size:
13.20 KB
patch
obsolete
>Index: GIDs >=================================================================== >--- GIDs (revision 537068) >+++ GIDs (working copy) >@@ -820,7 +820,7 @@ > # free: 877 > # free: 878 > # free: 879 >-# free: 880 >+pyspf-milter:*:880: > ultimaker:*:881: > midpoint:*:882: > ipfs-go:*:883: >Index: UIDs >=================================================================== >--- UIDs (revision 537068) >+++ UIDs (working copy) >@@ -825,7 +825,7 @@ > # free: 877 > # free: 878 > # free: 879 >-# free: 880 >+pyspf-milter:*:880:880::0:0:pyspf-milter:/nonexistent:/usr/sbin/nologin > ultimaker:*:881:881::0:0:Ultimaker user:/nonexistent:/usr/sbin/nologin > midpoint:*:882:882::0:0:midPoint user:/var/db/midpoint:/usr/sbin/nologin > ipfs-go:*:883:883::0:0:ipfs-go user:/var/db/ipfs-go:/bin/sh >Index: UPDATING >=================================================================== >--- UPDATING (revision 537068) >+++ UPDATING (working copy) >@@ -5,6 +5,17 @@ > You should get into the habit of checking this file for changes each time > you update your ports collection, before attempting any port upgrades. > >+20200531: >+ AFFECTS: users of mail/postfix-policyd-spf-python >+ AUTHOR: yasu@utahime.org >+ >+ This port is now deprecated because upstream project is superseded by its >+ successor. So uninstall this port and install mail/py-spf-engine instead. >+ Keep in mind that path of configuration file is changed from >+ ${PREFIX}/etc/postfix-policyd-spf-python/policyd-spf.conf to >+ ${PREFIX}/etc/python-policyd-spf/policyd-spf.conf. So you need to move >+ it to new location unless you use default one without changing. >+ > 20200526: > AFFECTS: users of databases/mariadb104-client, databases/mariadb104-server > AUTHOR: brnrd@FreeBSD.org >Index: mail/Makefile >=================================================================== >--- mail/Makefile (revision 537068) >+++ mail/Makefile (working copy) >@@ -510,6 +510,7 @@ > SUBDIR += py-pyspf > SUBDIR += py-pyzmail > SUBDIR += py-spambayes >+ SUBDIR += py-spf-engine > SUBDIR += py-validate_email > SUBDIR += pymsgauth > SUBDIR += pyzor >Index: mail/postfix-policyd-spf-python/Makefile >=================================================================== >--- mail/postfix-policyd-spf-python/Makefile (revision 537068) >+++ mail/postfix-policyd-spf-python/Makefile (working copy) >@@ -3,6 +3,7 @@ > > PORTNAME= postfix-policyd-spf-python > PORTVERSION= 2.0.2 >+PORTREVISION= 1 > CATEGORIES= mail python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >@@ -14,6 +15,9 @@ > LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/COPYING > >+DEPRECATED= Use mail/py-spf-engine instead (Project is superseded by successor) >+EXPIRATION_DATE= 2020-08-31 >+ > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${PY_FLAVOR} > >@@ -21,6 +25,8 @@ > USE_PYTHON= autoplist distutils > NO_ARCH= yes > >+CONFLICTS= py*-spf-engine >+ > PORTDOCS= CHANGES \ > README \ > README.per_user_whitelisting \ >Index: mail/py-spf-engine/Makefile >=================================================================== >--- mail/py-spf-engine/Makefile (revision 537068) >+++ mail/py-spf-engine/Makefile (working copy) >@@ -1,26 +1,40 @@ >-# Created by: Giel van Schijndel <me@mortis.eu> > # $FreeBSD$ > >-PORTNAME= postfix-policyd-spf-python >-PORTVERSION= 2.0.2 >+PORTNAME= spf-engine >+PORTVERSION= 2.9.2 > CATEGORIES= mail python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >-DISTNAME= pypolicyd-spf-${PORTVERSION} > > MAINTAINER= yasu@utahime.org >-COMMENT= Pure Python Postfix policy daemon for SPF checking >+COMMENT= SPF engine for Postfix policy server and milter implemented in Python > >-LICENSE= APACHE20 >-LICENSE_FILE= ${WRKSRC}/COPYING >+LICENSE= APACHE20 GPLv2+ >+LICENSE_COMB= multi >+LICENSE_FILE_APACHE20= ${WRKSRC}/COPYING >+LICENSE_FILE_GPLv2+ = ${WRKSRC}/GPL-2 > >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${PY_FLAVOR} >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}milter>0:mail/py-milter@${PY_FLAVOR} \ >+ ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${PY_FLAVOR} > >-USES= python:3.3+ >+USES= python:3.3+ shebangfix > USE_PYTHON= autoplist distutils >+USE_RC_SUBR= pyspf-milter > NO_ARCH= yes > >+CONFLICTS= py*-postfix-policyd-spf-python >+ >+USERS= ${PYSPF_MILTER_USER} >+GROUPS= ${PYSPF_MILTER_GROUP} >+ >+PYSPF_MILTER_USER= pyspf-milter >+PYSPF_MILTER_GROUP= pyspf-milter >+PYSPF_MILTER_RUNDIR= /var/run/pyspf-milter >+ >+PLIST_FILES= '@sample etc/python-policyd-spf/policyd-spf.conf.sample' \ >+ '@dir(${USERS},${GROUPS},755) ${PYSPF_MILTER_RUNDIR}' >+ > PORTDOCS= CHANGES \ > README \ > README.per_user_whitelisting \ >@@ -28,23 +42,31 @@ > > PKGMESSAGE= ${WRKSRC}/pkg-message > >+SHEBANG_FILES= spf_engine/milter_spf.py \ >+ spf_engine/policyd_spf.py >+ > SUB_FILES= pkg-message >+SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ >+ PYSPF_MILTER_RUNDIR=${PYSPF_MILTER_RUNDIR} > > OPTIONS_DEFINE= DOCS > > post-patch: >- @${MV} ${WRKSRC}/policyd-spf.conf ${WRKSRC}/policyd-spf.conf.sample >- @${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/|" \ >+ @${REINPLACE_CMD} -e "s|/usr/local/etc/|${PREFIX}/etc/|" \ >+ ${WRKSRC}/spf_engine/milter_spf.py >+ @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ >+ ${WRKSRC}/spf_engine/policyd_spf.py >+ @${REINPLACE_CMD} -e "s|/run|/var/run|" ${WRKSRC}/spf_engine/policydspfsupp.py >+ @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" -e "s|/usr/bin/|${PREFIX}/bin/|" \ >+ ${WRKSRC}/policyd-spf.1 ${WRKSRC}/policyd-spf.conf.5 \ > ${WRKSRC}/policyd-spf.peruser.5 > >+post-install: >+ @${MKDIR} ${STAGEDIR}/var/run/pyspf-milter \ >+ ${STAGEDIR}${PREFIX}/etc/python-policyd-spf >+ ${INSTALL_DATA} ${WRKSRC}/policyd-spf.conf \ >+ ${STAGEDIR}${PREFIX}/etc/python-policyd-spf/policyd-spf.conf.sample >+ > post-install-DOCS-on: > @${MKDIR} ${STAGEDIR}/${DOCSDIR} > cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} >Index: mail/py-spf-engine/distinfo >=================================================================== >--- mail/py-spf-engine/distinfo (revision 537068) >+++ mail/py-spf-engine/distinfo (working copy) >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1513282791 >-SHA256 (pypolicyd-spf-2.0.2.tar.gz) = df9cf888583c1003ff8dd2f0c8c1e5f46de466b56de5ce56eed5f42765f0a8da >-SIZE (pypolicyd-spf-2.0.2.tar.gz) = 38546 >+TIMESTAMP = 1582568246 >+SHA256 (spf-engine-2.9.2.tar.gz) = 188a8bc78f1ddb40f1b87a0b6fe2fa78efa0b4cc5d984ff19a53724bb5c28131 >+SIZE (spf-engine-2.9.2.tar.gz) = 52737 >Index: mail/py-spf-engine/files/patch-setup.py >=================================================================== >--- mail/py-spf-engine/files/patch-setup.py (revision 537068) >+++ mail/py-spf-engine/files/patch-setup.py (working copy) >@@ -1,17 +1,16 @@ >---- setup.py.orig 2014-06-04 05:08:20 UTC >+--- setup.py.orig 2019-10-27 01:15:11 UTC > +++ setup.py >-@@ -13,10 +13,10 @@ setup(name='pypolicyd-spf', >- py_modules=['policydspfsupp', 'policydspfuser'], >- keywords = ['Postfix','spf','email'], >- scripts = ['policyd-spf'], >-- data_files=[(os.path.join('share', 'man', 'man1'), >-- ['policyd-spf.1']), (os.path.join('share', 'man', 'man5'), >-- ['policyd-spf.conf.5']), (os.path.join('/etc', 'python-policyd-spf'), >-- ['policyd-spf.conf']), (os.path.join('share', 'man', 'man5'), >-+ data_files=[(os.path.join('man', 'man1'), >-+ ['policyd-spf.1']), (os.path.join('man', 'man5'), >-+ ['policyd-spf.conf.5']), (os.path.join('etc', 'postfix-policyd-spf-python'), >-+ ['policyd-spf.conf.sample']), (os.path.join('man', 'man5'), >- ['policyd-spf.peruser.5'])], >- classifiers = [ >+@@ -25,11 +25,8 @@ setup(name='spf-engine', >+ include_package_data=True, >+ data_files=[(os.path.join('share', 'man', 'man1'), >+ ['policyd-spf.1']), (os.path.join('share', 'man', 'man5'), >+- ['policyd-spf.conf.5']), (os.path.join('etc', 'python-policyd-spf'), >+- ['policyd-spf.conf']), (os.path.join('share', 'man', 'man5'), >+- ['policyd-spf.peruser.5']), (os.path.join('lib', 'systemd', 'system'), >+- ['system/pyspf-milter.service']),(os.path.join('etc', 'init.d'), >+- ['system/pyspf-milter']) ], >++ ['policyd-spf.conf.5']), (os.path.join('share', 'man', 'man5'), >++ ['policyd-spf.peruser.5'])], >+ classifiers = [ > 'Development Status :: 5 - Production/Stable', >+ 'Environment :: No Input/Output (Daemon)', >Index: mail/py-spf-engine/files/patch-spf__engine_milter__spf.py >=================================================================== >--- mail/py-spf-engine/files/patch-spf__engine_milter__spf.py (nonexistent) >+++ mail/py-spf-engine/files/patch-spf__engine_milter__spf.py (working copy) >@@ -0,0 +1,10 @@ >+--- spf_engine/milter_spf.py.orig 2020-02-26 02:21:41 UTC >++++ spf_engine/milter_spf.py >+@@ -37,7 +37,6 @@ import spf_engine.policydspfsupp as config >+ from spf_engine.util import drop_privileges >+ from spf_engine.policydspfsupp import _setExceptHook >+ from spf_engine.util import write_pid >+-from spf_engine.util import own_socketfile >+ from spf_engine.util import fold >+ >+ __version__ = "2.9.2" >Index: mail/py-spf-engine/files/pkg-message.in >=================================================================== >--- mail/py-spf-engine/files/pkg-message.in (revision 537068) >+++ mail/py-spf-engine/files/pkg-message.in (working copy) >@@ -2,10 +2,10 @@ > { type: install > message: <<EOM > # >-# To configure Postfix >+# Using policyd-spf with Postfix > # > >-This package must be integrated with Postfix to be effective: >+Policyd-spf must be integrated with Postfix to be effective: > > 1. Add to your postfix master.cf: > >@@ -32,6 +32,45 @@ > configuration. > > 4. Reload postfix. >+ >+# >+# Automatically starting pyspf-milter at boot time. >+# >+ >+Add 'pyspf_milter_enable="YES"' to /etc/rc.conf. >+ >+# >+# Using pyspf-milter with Sendmail >+# >+ >+Following is an example configuration line to include in your sendmail.mc. >+ >+INPUT_MAIL_FILTER(`pyspf-milter', `S=local:/var/run/pyspf-milter/pyspf-milter.sock')dnl >+ >+# >+# Using pyspf-milter with Postfix >+# >+ >+Integration of pyspf-milter into Postfix is like any milter (See Postfix's >+README_FILES/MILTER_README). But care is required to segregate outbound mail >+from inbound mail to be checked. Here is example using milter macros to keep >+the mail streams segregated. >+ >+%%PREFIX%%/etc/postfix/main.cf: >+ >+smtpd_milters = unix:/var/run/pyspf-milter/pyspf-milter.sock >+ >+%%PREFIX%%/etc/postfix/master.cf: >+ >+smtp inet n - - - - smtpd >+ ... >+ -o milter_macro_daemon_name=VERIFYING >+ ... >+ >+%%PREFIX%%/etc/python-policyd-spf/policyd-spf.conf: >+ >+MacroList daemon_name|VERIFYING >+ > EOM > } > ] >Index: mail/py-spf-engine/files/pyspf-milter.in >=================================================================== >--- mail/py-spf-engine/files/pyspf-milter.in (nonexistent) >+++ mail/py-spf-engine/files/pyspf-milter.in (working copy) >@@ -0,0 +1,42 @@ >+#!/bin/sh >+ >+# $FreeBSD$ >+# >+# PROVIDE: pyspf_milter >+# REQUIRE: LOGIN >+# BEFORE: mail >+# KEYWORD: shutdown >+# >+# Add the following lines to /etc/rc.conf to enable pyspf_milter: >+# >+# pyspf_milter_enable (bool) Set to 'YES' to enable. >+# Default: NO >+# pyspf_milter_conffile (path) Location of configuration file. >+# Default: %%PREFIX%%/etc/python-policyd-spf/policyd-spf.conf >+ >+. /etc/rc.subr >+ >+name=pyspf_milter >+rcvar=pyspf_milter_enable >+ >+load_rc_config $name >+ >+: ${pyspf_milter_enable:=NO} >+: ${pyspf_milter_conffile:=%%PREFIX%%/etc/python-policyd-spf/policyd-spf.conf} >+ >+command=/usr/sbin/daemon >+command_interpreter=%%PYTHON_CMD%% >+procname=%%PREFIX%%/bin/pyspf-milter >+command_args="-c -f ${procname} ${pyspf_milter_conffile}" >+pidfile=%%PYSPF_MILTER_RUNDIR%%/pyspf-milter.pid >+required_dirs=%%PYSPF_MILTER_RUNDIR%% >+required_files=${pyspf_milter_conffile} >+start_precmd=pyspf_milter_cleanup >+stop_postcmd=pyspf_milter_cleanup >+ >+pyspf_milter_cleanup () >+{ >+ rm -f ${pidfile} >+} >+ >+run_rc_command "$1" >Index: mail/py-spf-engine/pkg-descr >=================================================================== >--- mail/py-spf-engine/pkg-descr (revision 537068) >+++ mail/py-spf-engine/pkg-descr (working copy) >@@ -1,4 +1,8 @@ >-python-policyd-spf is a Postfix SMTPd policy engine for SPF checking. It is >-implemented in pure Python and uses the python-spf module. >+This project provides the SPF (Sender Policy Framework) back-end for both >+pypolicyd-spf (for which it was originally developed) and an future SPF >+milter using pymilter. The goal is to provide a common back-end for common >+features for support SPF integration with Postfix and Sendmail using both >+the Postfix policy service and the Sendmail milter protocol (also available >+with Postfix). > >-WWW: https://launchpad.net/pypolicyd-spf/ >+WWW: https://launchpad.net/spf-engine
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
yasu
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 244424
:
211945
|
211961
|
213945
|
214475
|
215058
| 215074