diff -Nru pymilter-milters-0.9/debian/changelog pymilter-milters-0.9/debian/changelog --- pymilter-milters-0.9/debian/changelog 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/changelog 2018-12-23 20:34:59.000000000 +0000 @@ -1,3 +1,22 @@ +pymilter-milters (0.9-2) unstable; urgency=medium + + [ Ondřej Nový ] + * d/changelog: Remove trailing whitespaces + * d/control: Remove trailing whitespaces + * d/watch: Use https protocol + + [ Scott Kitterman ] + * Bump standards-version to 4.3.0 without further change + * Update description of spf-milter-python to mention RFC 7208 + * Update dkim-milter-python description to also mention dkimpy-milter + * Switch to source format 3.0 (quilt) + * Eliminate use of recursive chown in spf/dkimpy-milter- + python.postinst + * Add systemd unit files for spf/dkim-milter-python + * Use pybuild/dh-python instead of python-distutils build system + + -- Scott Kitterman Sun, 23 Dec 2018 15:34:59 -0500 + pymilter-milters (0.9-1) unstable; urgency=low [ Jakub Wilk ] @@ -80,7 +99,7 @@ - Remove XS/XB-Python-Version * Change priority from extral to optional * Improve short description - * Remove unneeded /etc/spf-milter-python from debian/spf-milter-python.dirs + * Remove unneeded /etc/spf-milter-python from debian/spf-milter-python.dirs -- Scott Kitterman Fri, 25 Jun 2010 09:33:53 -0400 diff -Nru pymilter-milters-0.9/debian/control pymilter-milters-0.9/debian/control --- pymilter-milters-0.9/debian/control 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/control 2018-12-23 20:33:54.000000000 +0000 @@ -3,29 +3,28 @@ Priority: optional Maintainer: Scott Kitterman Uploaders: Python Applications Packaging Team -Build-Depends: debhelper (>= 9), quilt (>= 0.46-7), python -Standards-Version: 4.1.3 +Build-Depends: debhelper (>= 9), quilt (>= 0.46-7), python, dh-python +Standards-Version: 4.3.0 Homepage: https://github.com/sdgathman/milter/ -Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pymilter-milters/trunk/ -Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pymilter-milters/trunk/ +Vcs-Git: https://salsa.debian.org/python-team/applications/pymilter-milters.git +Vcs-Browser: https://salsa.debian.org/python-team/applications/pymilter-milters Package: spf-milter-python Architecture: all -Depends: python, ${misc:Depends}, python-milter (>= 0.9.3), python-spf (>= 2.0), lsb-base, adduser +Depends: ${python:Depends}, ${misc:Depends}, python-milter (>= 0.9.3), python-spf (>= 2.0), lsb-base, adduser Suggests: postfix (>= 2.3) | sendmail (>= 8.13) -Description: RFC 4408 compliant SPF Milter for Sendmail and Postfix +Description: RFC 7208 compliant SPF Milter for Sendmail and Postfix A Python mail filter to add Received-SPF headers and reject forged mail. - Rejection policy is configured via sendmail access file. Updated for RFC 4408 - compliance. + Rejection policy is configured via sendmail access file. Updated for RFC + 4408/7208 compliance. Package: dkim-milter-python Architecture: all -Depends: python, ${misc:Depends}, python-milter (>= 0.9.3), python-dkim (>= 0.4), +Depends: ${python:Depends}, ${misc:Depends}, python-milter (>= 0.9.3), python-dkim (>= 0.4), python-authres (>= 0.2), lsb-base, adduser Suggests: postfix (>= 2.3) | sendmail (>= 8.13) Description: Domain Keys Identified Mail Milter for Sendmail and Postfix A simple Python mail filter for creating and verifying Domain Keys Identified Mail (DKIM) signatures. While not as featureful as some other - implementations, like opendkim, because it is written in Python, it is a - good choice for experimentation and customization. - + implementations, like dkimpy-milter or opendkim, because it is written in + Python, it is a good choice for experimentation and customization. diff -Nru pymilter-milters-0.9/debian/dkim-milter.1 pymilter-milters-0.9/debian/dkim-milter.1 --- pymilter-milters-0.9/debian/dkim-milter.1 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/dkim-milter.1 2018-12-23 16:47:39.000000000 +0000 @@ -140,7 +140,7 @@ This is a simple milter for DKIM signing and verification written in Python. -DKIM is an emsil authentication technlogy. For more information about DKIM, +DKIM is an emsil authentication technology. For more information about DKIM, please see http://www.dkim.org/. .SH "USAGE" diff -Nru pymilter-milters-0.9/debian/dkim-milter-python.install pymilter-milters-0.9/debian/dkim-milter-python.install --- pymilter-milters-0.9/debian/dkim-milter-python.install 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/dkim-milter-python.install 2018-12-23 20:17:02.000000000 +0000 @@ -1,3 +1,4 @@ dkim-milter.py usr/bin/ debian/dkim-milter usr/bin/ dkim-milter.cfg etc/dkim-milter-python +debian/dkim-milter-python.service lib/systemd/system/ diff -Nru pymilter-milters-0.9/debian/dkim-milter-python.postinst pymilter-milters-0.9/debian/dkim-milter-python.postinst --- pymilter-milters-0.9/debian/dkim-milter-python.postinst 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/dkim-milter-python.postinst 2018-12-23 16:45:39.000000000 +0000 @@ -9,7 +9,8 @@ addgroup --quiet --system dkim-milter-python usermod -g dkim-milter-python dkim-milter-python fi - chown -R dkim-milter-python:dkim-milter-python /var/log/dkim-milter-python + chown dkim-milter-python:dkim-milter-python /var/log/dkim-milter-python + chown dkim-milter-python:dkim-milter-python /var/log/dkim-milter-python/save fi #DEBHELPER# diff -Nru pymilter-milters-0.9/debian/dkim-milter-python.service pymilter-milters-0.9/debian/dkim-milter-python.service --- pymilter-milters-0.9/debian/dkim-milter-python.service 1970-01-01 00:00:00.000000000 +0000 +++ pymilter-milters-0.9/debian/dkim-milter-python.service 2018-12-23 20:07:33.000000000 +0000 @@ -0,0 +1,12 @@ +[Unit] +Description=DKIM Milter Python +Documentation=man:dkim-milter(1) +After=network.target + +[Service] +Type=simple +PIDFile=/var/run/dkim-milter-python/dkim-milter.pid +ExecStart=/usr/bin/dkim-milter + +[Install] +WantedBy=multi-user.target diff -Nru pymilter-milters-0.9/debian/gbp.conf pymilter-milters-0.9/debian/gbp.conf --- pymilter-milters-0.9/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ pymilter-milters-0.9/debian/gbp.conf 2018-12-23 14:39:58.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +debian-branch=debian/master diff -Nru pymilter-milters-0.9/debian/README.source pymilter-milters-0.9/debian/README.source --- pymilter-milters-0.9/debian/README.source 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -This package uses quilt for patches. dpkg-source -x does produce source -ready for building with dpkg-buildpackage. It does not produce source ready -for editing. See /usr/share/doc/quilt/README.source for information on using -quilt. - diff -Nru pymilter-milters-0.9/debian/rules pymilter-milters-0.9/debian/rules --- pymilter-milters-0.9/debian/rules 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/rules 2018-12-23 20:33:09.000000000 +0000 @@ -1,8 +1,12 @@ #!/usr/bin/make -f %: - dh $@ --with quilt + dh $@ --with python2 --buildsystem=pybuild override_dh_auto_build: rm -rf makefile dh_auto_build + +override_dh_python2: + dh_python2 -p dkim-milter-python + dh_python2 -p spf-milter-python diff -Nru pymilter-milters-0.9/debian/source/format pymilter-milters-0.9/debian/source/format --- pymilter-milters-0.9/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ pymilter-milters-0.9/debian/source/format 2018-12-23 16:36:19.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru pymilter-milters-0.9/debian/spf-milter-python.install pymilter-milters-0.9/debian/spf-milter-python.install --- pymilter-milters-0.9/debian/spf-milter-python.install 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/spf-milter-python.install 2018-12-23 20:16:52.000000000 +0000 @@ -1,3 +1,4 @@ spfmilter.py usr/bin/ debian/spfmilter usr/bin/ spfmilter.cfg etc/spf-milter-python +debian/spf-milter-python.service lib/systemd/system/ diff -Nru pymilter-milters-0.9/debian/spf-milter-python.postinst pymilter-milters-0.9/debian/spf-milter-python.postinst --- pymilter-milters-0.9/debian/spf-milter-python.postinst 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/spf-milter-python.postinst 2018-12-23 16:45:03.000000000 +0000 @@ -9,7 +9,8 @@ addgroup --quiet --system spf-milter-python usermod -g spf-milter-python spf-milter-python fi - chown -R spf-milter-python:spf-milter-python /var/log/spf-milter-python + chown spf-milter-python:spf-milter-python /var/log/spf-milter-python + chown spf-milter-python:spf-milter-python /var/log/spf-milter-python/save fi #DEBHELPER# diff -Nru pymilter-milters-0.9/debian/spf-milter-python.service pymilter-milters-0.9/debian/spf-milter-python.service --- pymilter-milters-0.9/debian/spf-milter-python.service 1970-01-01 00:00:00.000000000 +0000 +++ pymilter-milters-0.9/debian/spf-milter-python.service 2018-12-23 20:11:28.000000000 +0000 @@ -0,0 +1,12 @@ +[Unit] +Description=SPF Milter Python +Documentation=man:spfmilter(1) +After=network.target + +[Service] +Type=simple +PIDFile=/var/run/spf-milter-python/spfmilter.pid +ExecStart=/usr/bin/spfmilter + +[Install] +WantedBy=multi-user.target diff -Nru pymilter-milters-0.9/debian/watch pymilter-milters-0.9/debian/watch --- pymilter-milters-0.9/debian/watch 2018-12-24 07:18:20.000000000 +0000 +++ pymilter-milters-0.9/debian/watch 2018-12-23 14:39:58.000000000 +0000 @@ -1,5 +1,5 @@ version=3 -#http://sf.net/pymilter/milter-(.*).tar.gz debian uupdate +#https://sf.net/pymilter/milter-(.*).tar.gz debian uupdate #https://github.com/chargebee/chargebee-python/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz #https://github.com/sdgathman/milter/releases/tag/milter-(\d\d. https://github.com/sdgathman/milter/tags /sdgathman/milter/archive/milter-(\d\.[\d].*)\.tar\.gz