[Python-apps-commits] r13760 - in packages/pypolicyd-spf/trunk/debian (8 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Fri Dec 2 07:04:21 UTC 2016
Date: Friday, December 2, 2016 @ 07:04:15
Author: kitterman
Revision: 13760
* New upstream release (Closes: #808847, #816850)
* Update compat and debhelper version to 9 without further change
* Bump standards-version to 3.9.8 without further change
* Fix postinst adduser invocation to properly deal with /home
* Correct name of installed logcheck file (Closes: #807543)
* Refresh patches
* Explicitly add dh-python to build-depends
Added:
packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.logcheck
Modified:
packages/pypolicyd-spf/trunk/debian/changelog
packages/pypolicyd-spf/trunk/debian/compat
packages/pypolicyd-spf/trunk/debian/control
packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst
packages/pypolicyd-spf/trunk/debian/rules
Deleted:
packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python-logcheck
Modified: packages/pypolicyd-spf/trunk/debian/changelog
===================================================================
--- packages/pypolicyd-spf/trunk/debian/changelog 2016-12-01 22:53:13 UTC (rev 13759)
+++ packages/pypolicyd-spf/trunk/debian/changelog 2016-12-02 07:04:15 UTC (rev 13760)
@@ -1,3 +1,15 @@
+pypolicyd-spf (2.0.0-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #808847, #816850)
+ * Update compat and debhelper version to 9 without further change
+ * Bump standards-version to 3.9.8 without further change
+ * Fix postinst adduser invocation to properly deal with /home
+ * Correct name of installed logcheck file (Closes: #807543)
+ * Refresh patches
+ * Explicitly add dh-python to build-depends
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 02 Dec 2016 01:28:16 -0500
+
pypolicyd-spf (1.3.2-1) unstable; urgency=medium
* New upstream release
Modified: packages/pypolicyd-spf/trunk/debian/compat
===================================================================
--- packages/pypolicyd-spf/trunk/debian/compat 2016-12-01 22:53:13 UTC (rev 13759)
+++ packages/pypolicyd-spf/trunk/debian/compat 2016-12-02 07:04:15 UTC (rev 13760)
@@ -1 +1 @@
-8
+9
Modified: packages/pypolicyd-spf/trunk/debian/control
===================================================================
--- packages/pypolicyd-spf/trunk/debian/control 2016-12-01 22:53:13 UTC (rev 13759)
+++ packages/pypolicyd-spf/trunk/debian/control 2016-12-02 07:04:15 UTC (rev 13760)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Scott Kitterman <scott at kitterman.com>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 8.1.0), python3, quilt (>= 0.46-7)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9), dh-python, python3, quilt (>= 0.46-7)
+Standards-Version: 3.9.8
Homepage: https://launchpad.net/pypolicyd-spf
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pypolicyd-spf/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pypolicyd-spf/trunk/
Modified: packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
===================================================================
--- packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch 2016-12-01 22:53:13 UTC (rev 13759)
+++ packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch 2016-12-02 07:04:15 UTC (rev 13760)
@@ -1,10 +1,10 @@
This patch is to integrate with the package namespace for Debian and derived
distributions. It has not gone, and does not need to go, upstream.
-Index: pypolicyd-spf-1.3.2/policyd-spf
+Index: pypolicyd-spf-2.0.0/policyd-spf
===================================================================
---- pypolicyd-spf-1.3.2.orig/policyd-spf 2015-08-12 23:18:58.107294072 -0400
-+++ pypolicyd-spf-1.3.2/policyd-spf 2015-08-12 23:18:58.103294072 -0400
-@@ -651,7 +651,7 @@
+--- pypolicyd-spf-2.0.0.orig/policyd-spf 2016-12-02 01:23:29.363567669 -0500
++++ pypolicyd-spf-2.0.0/policyd-spf 2016-12-02 01:23:29.355567669 -0500
+@@ -738,7 +738,7 @@
###################################################
# load config file {{{1
# Default location:
@@ -13,10 +13,10 @@
if len(sys.argv) > 1:
if sys.argv[1] in ( '-?', '--help', '-h' ):
print('usage: policyd-spf [<configfilename>]')
-Index: pypolicyd-spf-1.3.2/policyd-spf.1
+Index: pypolicyd-spf-2.0.0/policyd-spf.1
===================================================================
---- pypolicyd-spf-1.3.2.orig/policyd-spf.1 2015-08-12 23:18:58.107294072 -0400
-+++ pypolicyd-spf-1.3.2/policyd-spf.1 2015-08-12 23:18:58.103294072 -0400
+--- pypolicyd-spf-2.0.0.orig/policyd-spf.1 2016-12-02 01:23:29.363567669 -0500
++++ pypolicyd-spf-2.0.0/policyd-spf.1 2016-12-02 01:26:49.483572313 -0500
@@ -145,12 +145,13 @@
$ policyd-spf \-h (Display usage message)
@@ -36,27 +36,31 @@
Additionally, whitelisting certain IP addresses or IP addresses used by listed
domains from SPF checks is supported. Skipping SPF checks for local submission
-@@ -254,14 +255,12 @@
+@@ -254,15 +255,13 @@
1. Add the following to /etc/postfix/master.cf:
policyd-spf unix - n n - 0 spawn
- user=nobody argv=/usr/bin/policyd-spf
+ user=policyd-spf argv=/usr/bin/policyd-spf
- NOTE: Check the path to both the installed Python interpreter and
+- NOTE: Check the path to both the installed Python 3 interpreter and
++ NOTE: Check the path to both the installed Python interpreter and
policyd-spf. These vary from system to system. To use non-default
- settings, you must also add the config file (see above and
+- settings, you must also add the config file (see above and
- policyd-spf.conf(5) for details). If you run other services with
- user nobody, create a dedicated user for this policy server and use
-- that instead.
-+ policyd-spf.conf(5) for details).
+- that instead. Python and Python 3 versions prior to 3.3 are not
+- supported.
++ settings, you must also add the config file (see above and
++ policyd-spf.conf(5) for details). Python and Python 3 versions
++ prior to 3.3 are not supported.
2. Configure the Postfix policy service in /etc/postfix/main.cf:
-Index: pypolicyd-spf-1.3.2/policyd-spf.conf.5
+Index: pypolicyd-spf-2.0.0/policyd-spf.conf.5
===================================================================
---- pypolicyd-spf-1.3.2.orig/policyd-spf.conf.5 2015-08-12 23:18:58.107294072 -0400
-+++ pypolicyd-spf-1.3.2/policyd-spf.conf.5 2015-08-12 23:18:58.107294072 -0400
+--- pypolicyd-spf-2.0.0.orig/policyd-spf.conf.5 2016-12-02 01:23:29.363567669 -0500
++++ pypolicyd-spf-2.0.0/policyd-spf.conf.5 2016-12-02 01:23:29.355567669 -0500
@@ -138,7 +138,7 @@
.SH "USAGE"
.IX Header "USAGE"
@@ -75,10 +79,10 @@
Additionally, whitelisting certain IP addresses from SPF checks is supported.
This man page and the sample configuration file show the format to use.
-Index: pypolicyd-spf-1.3.2/setup.py
+Index: pypolicyd-spf-2.0.0/setup.py
===================================================================
---- pypolicyd-spf-1.3.2.orig/setup.py 2015-08-12 23:18:58.107294072 -0400
-+++ pypolicyd-spf-1.3.2/setup.py 2015-08-12 23:18:58.107294072 -0400
+--- pypolicyd-spf-2.0.0.orig/setup.py 2016-12-02 01:23:29.363567669 -0500
++++ pypolicyd-spf-2.0.0/setup.py 2016-12-02 01:23:29.355567669 -0500
@@ -15,9 +15,9 @@
scripts = ['policyd-spf'],
data_files=[(os.path.join('share', 'man', 'man1'),
Deleted: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python-logcheck
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python-logcheck 2016-12-01 22:53:13 UTC (rev 13759)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python-logcheck 2016-12-02 07:04:15 UTC (rev 13760)
@@ -1,2 +0,0 @@
-+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ policyd-spf\[[0-9]+\]: (Pass|Neutral|None|Softfail|Fail|Temperror|Permerror); identity=(helo|mailfrom); client-ip=[0-9a-f.:]+; helo=.*; envelope-from=.*; receiver=
-
Added: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.logcheck
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.logcheck (rev 0)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.logcheck 2016-12-02 07:04:15 UTC (rev 13760)
@@ -0,0 +1,2 @@
++^\w{3} [ :0-9]{11} [._[:alnum:]-]+ policyd-spf\[[0-9]+\]: (Pass|Neutral|None|Softfail|Fail|Temperror|Permerror); identity=(helo|mailfrom); client-ip=[0-9a-f.:]+; helo=.*; envelope-from=.*; receiver=
+
Modified: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst 2016-12-01 22:53:13 UTC (rev 13759)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postinst 2016-12-02 07:04:15 UTC (rev 13760)
@@ -4,7 +4,7 @@
if [ "$1" = "configure" ]; then
if ! id -u policyd-spf >/dev/null 2>&1; then
- adduser --quiet --system --group --no-create-home policyd-spf
+ adduser --quiet --system --group --no-create-home --home /nonexistent policyd-spf
elif [ -n "$2" ]; then
addgroup --quiet --system policyd-spf
usermod -g policyd-spf policyd-spf
Modified: packages/pypolicyd-spf/trunk/debian/rules
===================================================================
--- packages/pypolicyd-spf/trunk/debian/rules 2016-12-01 22:53:13 UTC (rev 13759)
+++ packages/pypolicyd-spf/trunk/debian/rules 2016-12-02 07:04:15 UTC (rev 13760)
@@ -8,7 +8,9 @@
override_dh_auto_install:
python3 $(CURDIR)/setup.py install --install-layout=deb --root $(CURDIR)/debian/postfix-policyd-spf-python
# Install logcheck filter
- dh_install debian/postfix-policyd-spf-python-logcheck etc/logcheck/ignore.d.server
+ dh_install debian/postfix-policyd-spf-python.logcheck etc/logcheck/ignore.d.server/
+ mv $(CURDIR)/debian/postfix-policyd-spf-python/etc/logcheck/ignore.d.server/postfix-policyd-spf-python.logcheck \
+ $(CURDIR)/debian/postfix-policyd-spf-python/etc/logcheck/ignore.d.server/postfix-policyd-spf-python
dh_install
override_dh_auto_clean:
More information about the Python-apps-commits
mailing list