--- pypolicyd-spf-1.0.orig/debian/changelog +++ pypolicyd-spf-1.0/debian/changelog @@ -0,0 +1,269 @@ +pypolicyd-spf (1.0-1) unstable; urgency=low + + * New upstream release + - Refreshed patch + * Bumped standards version to 3.9.3 without further change + + -- Scott Kitterman Sun, 18 Mar 2012 00:33:00 -0400 + +pypolicyd-spf (0.9-1) unstable; urgency=low + + * New upstream release + - Update debian/copyright for licensing changes + - Update debian/patches/install-conf-fix.patch for new release + - Add Suggests: python-authres for support for optional RFC 5451 + Authentication-Results header support + * Stop installing two copies of upstream changelog (CHANGES) + + -- Scott Kitterman Tue, 10 Jan 2012 22:50:51 -0500 + +pypolicyd-spf (0.8.1-2) unstable; urgency=low + + * Rebuild for python transition + * Drop ancient version requirements for python-spf and postfix depends + * Bump Standards-Version to 3.9.2 without further change + + -- Scott Kitterman Tue, 19 Apr 2011 23:47:33 -0400 + +pypolicyd-spf (0.8.1-1) unstable; urgency=low + + * New upstream release + * Bump standards version to 3.9.1 without further change + * Update for recent Python policy changes: + - Change XS-Python-Version X-Python-Version and bump minimum python + version to 2.6.5-13~ + - Drop XB-Python-Version + + -- Scott Kitterman Sat, 27 Nov 2010 23:22:23 -0500 + +pypolicyd-spf (0.8.0-2) unstable; urgency=low + + * Convert from CDBS to Debhelper 7 + - Port debian/rules to DH 7 --with quilt plus overrides + - Drop cdbs from build-depends + - Add quilt to build-depends + - Update debian/README.source + - Bump debhelper version requirement + - Change compat to 7 + - Remove cdbs generated pycompat + * Convert from python-central to dh_python2 + - Drop build-depends on python-central + - Version build-depend on python (>- 2.6.5.-2~) + - Add --with python2 to debian/rules + * Drop obsolete Conflicts/Provides/Replaces: python-policyd-spf + * Drop obsolete debian/postfix-policyd-spf-python.postrm/preinst + * Fix XB-Python-Version + * Bump standards version to 3.8.4 without further change + * Drop DM-Upload-Allowed + + -- Scott Kitterman Fri, 25 Jun 2010 14:41:35 -0400 + +pypolicyd-spf (0.8.0-1) unstable; urgency=low + + * New upstream release + - Updated Debian config patch + * Update debian/copyright for new year + * Correct XS/XB-Python-Version to be >= 2.4 + * Build-dep on python-all instead of python + * Correct short description - the package is not a daemon + + -- Scott Kitterman Wed, 17 Feb 2010 19:12:38 -0500 + +pypolicyd-spf (0.7.3-1) unstable; urgency=low + + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + + [ Scott Kitterman ] + * New upstream release + - Works with Python 2.4 now + * debian/control + - Update homepage for new upstream location + - Update XS/XB-Python-Version due to deprecation of current + - Improve package description + * Add upstream changelog (CHANGES) to postfix-policyd-spf-python.docs + * Update debian/watch for the new upstream location + + -- Scott Kitterman Thu, 07 Jan 2010 01:23:58 -0500 + +pypolicyd-spf (0.7.2-1) unstable; urgency=low + + * New upstream release + - Fix crash on missing "@" in mail from (closes: #551714) + - Fix man page type (closes: #517119) + * Add logcheck filter (closes: #499503) + * Add ${misc:Depends} to debian/control + * Bump standards version to 3.8.3 without further change + * Use proper © symbol in debian/changelog + * Set -e in all maintainer scripts + + -- Scott Kitterman Thu, 12 Nov 2009 23:55:03 -0500 + +pypolicyd-spf (0.7.1-1) unstable; urgency=low + + * New upstream release + - Documentation updates + - Freshen install-conf-fix.patch for new release + * Create and use dedicated user instead of nobody + - Add postfix-policyd-spf-python.postinst to create user if needed + - Add depends on adduser + + -- Scott Kitterman Sat, 26 Jul 2008 00:14:50 -0400 + +pypolicyd-spf (0.7-1) unstable; urgency=low + + * New upstream release + - Added receiver policy options to reject softfail and neutral SPF + messages + - Use minimal configuration file by default and provide additional + fully commented config file + * Correct README.Debian directory names (thanks to Carlos Pasqualini + for noticing and letting me know) + * Freshen debian/patches/install-conf-fix.patch + * Install new policyd-spf.conf.commented file with docs + * Bump standards version to 3.8.0 and add README.source + * Switch to python-central + - Add XS/XB-Python-Version: current to debian/control + - Update build-dep and debian/rules + - Remove debian/pyversions + + -- Scott Kitterman Sun, 22 Jun 2008 17:55:18 -0400 + +pypolicyd-spf (0.6.1-1) unstable; urgency=low + + [ Scott Kitterman ] + * New upstream release + - Fix crash if HELO checking is disabled + + [ Piotr Ożarowski ] + * Add DM-Upload-Allowed: yes + + -- Scott Kitterman Sat, 05 Apr 2008 01:58:32 -0400 + +pypolicyd-spf (0.6-2) unstable; urgency=low + + * Remove transitional package (rejected by ftp-masters) + * Rename debian/docs to debian/postfix-policyd-spf-python.docs for + consistency + + -- Scott Kitterman Mon, 25 Feb 2008 14:30:12 -0500 + +pypolicyd-spf (0.6-1) UNRELEASED; urgency=low + + * New upstream release + - Domain whitelisting fixed + - IP whitelists with multiple items fixed + - IPv6 whitelist CIDR length fixed + - Logging and config file improvements + * Add transitional package to ease binary package name transition + * Remove pythonpath.patch (incorporated upstream) + * Update debian/copyright for 2008 + * Update install-conf-fix.patch for new binary package name + * Add preinst and prerm to move conffile to correct directory for new + package name + + -- Scott Kitterman Sat, 23 Feb 2008 00:38:02 -0500 + +pypolicyd-spf (0.5.2-3) unstable; urgency=low + + * Remove unneeded reference to debian/README.Debian and README in + debian/docs + * Change postfix from recommends to depends + * Rename binary postfix-policyd-spf-python for clarity - add provides, + conflicts, replaces python-policyd-spf + * Bump standards version to 3.7.3 without further change + + -- Scott Kitterman Tue, 08 Jan 2008 16:59:39 -0500 + +pypolicyd-spf (0.5.2-2) unstable; urgency=low + + * Finish freshening install-conf-fix.patch so that we actually use + the installed config file + + -- Scott Kitterman Wed, 31 Oct 2007 09:13:34 -0400 + +pypolicyd-spf (0.5.2-1) unstable; urgency=low + + * New upstream release + - Fixes permerror processing some more + - Logging is more consistent + * Freshen install-conf-fix.patch and pythonpath.patch + + -- Scott Kitterman Sat, 27 Oct 2007 12:56:31 -0400 + +pypolicyd-spf (0.5.1-1) unstable; urgency=low + + [ Piotr Ożarowski ] + * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now) + + [ Scott Kitterman ] + * New upstream release. + - Fix per user restriction class filtering to work. + - Fix reject on SPF Permerror to work. + * Remove man-page-fixup.patch (incorporated upstream). + * Changed postfix restart to reload in README.Debian (Thanks John A. Martin) + * Update install-conf-fix.patch to adjust paths for Debian package in man + pages. + + -- Scott Kitterman Wed, 17 Oct 2007 18:36:46 -0400 + +pypolicyd-spf (0.5-1) unstable; urgency=low + + * New Upstream release + * Remove unnecessary python provides in debian/control + * Patch out usr/local PYTHONPATH addition (pythonpath.patch) + * Freshen install-conf-fix.patch + * Add debian/pycompat + * Add Python Applications Packaging Team as Uploaders + * Add Homepage: field to debian/control + * Add XS-Vcs-Svn: and XS-Vcs-Browser: fields to debian/control + * Add debian/pyversions and remove XS/XB-Python-Version from debian/control + * Add debian/rules to install new upstream man page + * Add man-page-fixup.patch to quiet lintian + * Simplify debian/rules + + -- Scott Kitterman Wed, 03 Oct 2007 16:48:12 -0400 + +pypolicyd-spf (0.4.1-1) unstable; urgency=low + + * Correct multi-recipient reject processing (Closes: #437361) + * Correct typos in README.Debian (Closes: #434623) + * Add debian/watch + + -- Scott Kitterman Mon, 13 Aug 2007 11:03:09 -0400 + +pypolicyd-spf (0.4-3) unstable; urgency=low + + * Correct debian/rules to fix FTBFS (Closes: #434017) + - Change config file mv to install in debian/rules with correct path. + - Change dh_installdirs path to relative rather than absolute. + + -- Scott Kitterman Sun, 21 Jul 2007 11:32:58 -0400 + +pypolicyd-spf (0.4-2) unstable; urgency=low + + * Merge debian/changelog entries from 0.3-1 and 0.4-1 + + -- Scott Kitterman Mon, 09 Jul 2007 23:17:09 -0400 + +pypolicyd-spf (0.4-1) unstable; urgency=low + + * New upstream release + - Mutliple receiver policy options controlled by config file + - SPF Whitelist via config file + - Many minor changes + * debian/control - Moved from section Python to Mail + * debian/rules - Changes to install default config file + * debian/pycompat - removed + * debain/README.Debian updated to match upstream changes + + -- Scott Kitterman Mon, 09 Jul 2007 17:37:13 -0400 + +pypolicyd-spf (0.3-1) unstable; urgency=low + + * Initial Debian package for Python SPF policy server for Postfix + (Closes: #419887) + + -- Scott Kitterman Wed, 18 Apr 2007 10:11:36 -0400 + --- pypolicyd-spf-1.0.orig/debian/postfix-policyd-spf-python.docs +++ pypolicyd-spf-1.0/debian/postfix-policyd-spf-python.docs @@ -0,0 +1,2 @@ +README.per_user_whitelisting +policyd-spf.conf.commented --- pypolicyd-spf-1.0.orig/debian/logcheck +++ pypolicyd-spf-1.0/debian/logcheck @@ -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= + --- pypolicyd-spf-1.0.orig/debian/rules +++ pypolicyd-spf-1.0/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +%: + dh $@ --with quilt, --with python2 + +override_dh_install: + # Install logcheck filter + dh_install debian/logcheck etc/logcheck/ignore.d.server/postfix-policyd-spf-python + dh_install + --- pypolicyd-spf-1.0.orig/debian/watch +++ pypolicyd-spf-1.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://launchpad.net/pypolicyd-spf/+download http://launchpad.net/pypolicyd-spf/.*/.*/pypolicyd-spf-(.*)\.tar\.gz debian uupdate + --- pypolicyd-spf-1.0.orig/debian/copyright +++ pypolicyd-spf-1.0/debian/copyright @@ -0,0 +1,32 @@ +This package was debianized by Scott Kitterman on +Wed January 17, 2007 19:04:29 -0500. + +It was downloaded from http://www.openspf.net/Software + +Copyright Holder: +Copyright © 2007-2012 Scott Kitterman +Portions Copyright © 2004-2005, Sean Reifschneider, tummy.com, ltd. + +Portions Copyright © 2003-2004 Meng Weng Wong + +License: + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +On Debian systems, the complete text of the Apache License, Version 2.0 can be +found here: + /usr/share/common-licenses/Apache-2.0 + +The Debian packaging is © 2007-2012, Scott Kitterman +and is licensed under the Apache-2.0 license. See above. + --- pypolicyd-spf-1.0.orig/debian/postfix-policyd-spf-python.postinst +++ pypolicyd-spf-1.0/debian/postfix-policyd-spf-python.postinst @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + if ! id -u policyd-spf >/dev/null 2>&1; then + adduser --quiet --system --group --no-create-home policyd-spf + elif [ -n "$2" ]; then + addgroup --quiet --system policyd-spf + usermod -g policyd-spf policyd-spf + fi +fi + +#DEBHELPER# + +exit 0 + --- pypolicyd-spf-1.0.orig/debian/README.source +++ pypolicyd-spf-1.0/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt for patches. dpkg-source -x does produce source +ready for building with dpkg-buildpackage. It does not procude source ready +for editing. See /usr/share/doc/quilt/README.source for information on using +quilt. + --- pypolicyd-spf-1.0.orig/debian/control +++ pypolicyd-spf-1.0/debian/control @@ -0,0 +1,23 @@ +Source: pypolicyd-spf +Section: mail +Priority: optional +Maintainer: Scott Kitterman +Uploaders: Python Applications Packaging Team +Build-Depends: debhelper (>= 7.3.16), python (>= 2.6.5-13~), quilt (>= 0.46-7) +Standards-Version: 3.9.3 +Homepage: https://launchpad.net/pypolicyd-spf +Vcs-Svn: svn://svn.debian.org/python-apps/packages/pypolicyd-spf/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pypolicyd-spf/trunk/ +X-Python-Version: >= 2.4 + +Package: postfix-policyd-spf-python +Architecture: all +Depends: ${python:Depends}, ${misc:Depends}, python-spf, postfix, adduser +Suggests: python-authres +Description: Postfix policy server for SPF checking + postfix-policyd-spf-python is a full featured Postfix SMTPd policy engine for + SPF checking. It includes a variety of whitelisting mechanisms and policy + options to enable it to support the widest variety of system requirements. + It is implemented in pure Python and uses the python-spf module. The SPF + web site is http://www.openspf.net/. + --- pypolicyd-spf-1.0.orig/debian/README.Debian +++ pypolicyd-spf-1.0/debian/README.Debian @@ -0,0 +1,26 @@ +See man 1 policyd-spf for additional documentation. + +Installing +---------- +This package must be integrated with Postfix to be effective: + + 1. Add the following to /etc/postfix/master.cf: + + policyd-spf unix - n n - 0 spawn + user=nobody argv=/usr/bin/python /usr/bin/policyd-spf /etc/postfix-policyd-spf-python/policyd-spf.conf + + 2. Configure the Postfix policy service in /etc/postfix/main.cf: + + smtpd_recipient_restrictions = + ... + reject_unauth_destination + check_policy_service unix:private/policyd-spf + ... + + policyd-spf_time_limit = 3600 + + NOTE: Specify check_policy_service AFTER reject_unauth_destination or + else your system can become an open relay. + + 3. Reload Postfix. + --- pypolicyd-spf-1.0.orig/debian/compat +++ pypolicyd-spf-1.0/debian/compat @@ -0,0 +1 @@ +7 --- pypolicyd-spf-1.0.orig/debian/patches/series +++ pypolicyd-spf-1.0/debian/patches/series @@ -0,0 +1 @@ +install-conf-fix.patch --- pypolicyd-spf-1.0.orig/debian/patches/install-conf-fix.patch +++ pypolicyd-spf-1.0/debian/patches/install-conf-fix.patch @@ -0,0 +1,94 @@ +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.0/policyd-spf +=================================================================== +--- pypolicyd-spf-1.0.orig/policyd-spf 2012-03-17 23:51:37.000000000 -0400 ++++ pypolicyd-spf-1.0/policyd-spf 2012-03-18 00:33:41.897527156 -0400 +@@ -644,7 +644,7 @@ + ################################################### + # load config file {{{1 + # Default location: +-configFile = '/etc/python-policyd-spf/policyd-spf.conf' ++configFile = '/etc/postfix-policyd-spf-python/policyd-spf.conf' + if len(sys.argv) > 1: + if sys.argv[1] in ( '-?', '--help', '-h' ): + print 'usage: policyd-spf []' +Index: pypolicyd-spf-1.0/policyd-spf.1 +=================================================================== +--- pypolicyd-spf-1.0.orig/policyd-spf.1 2012-03-17 23:51:37.000000000 -0400 ++++ pypolicyd-spf-1.0/policyd-spf.1 2012-03-18 00:33:41.901527155 -0400 +@@ -145,12 +145,13 @@ + + $ policyd-spf \-h (Display usage message) + +-$ policyd-spf /etc/policyd-spf/policyd-spf.conf (Config file name to use) ++$ policyd-spf /etc/postfix-policyd-spf-python/policyd-spf.conf ++ (Config file name to use) + +-Configuration options are described in the sample configuration file provided +-with the package (policyd-spf.conf.commented) and in policyd-spf.conf(5). The +-provided setup.py installs an uncommented configuration file in +-/etc/policyd-spf/. ++Configuration options are described in the sample configuration file installed ++in /usr/share/doc/postfix-policyd-spf-python (policyd-spf.conf.commented) and ++in policyd-spf.conf(5). The provided setup.py installs an uncommented ++configuration file in /etc/postfix-policyd-spf-python/. + + 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 @@ + 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 + policyd-spf. These vary from system to system. To use non-default + 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). + + 2. Configure the Postfix policy service in /etc/postfix/main.cf: + +Index: pypolicyd-spf-1.0/policyd-spf.conf.5 +=================================================================== +--- pypolicyd-spf-1.0.orig/policyd-spf.conf.5 2012-03-17 23:51:37.000000000 -0400 ++++ pypolicyd-spf-1.0/policyd-spf.conf.5 2012-03-18 00:33:41.901527155 -0400 +@@ -138,7 +138,7 @@ + .SH "USAGE" + .IX Header "USAGE" + Usage: +- policyd-spf [/etc/policyd-spf/policyd-spf.conf] ++ policyd-spf [/etc/postfix-policyd-spf-python/policyd-spf.conf] + + .SH "OTHER DOCUMENTATION" + .IX Header "OTHER DOCUMENTATION" +@@ -166,7 +166,7 @@ + + Configuration options are described here and in the configuration file + provided with the package. The provided setup.py installs this configuration +-file in /etc/policyd-spf/. ++file in /etc/postfix-policyd-spf-python/. + + 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.0/setup.py +=================================================================== +--- pypolicyd-spf-1.0.orig/setup.py 2012-03-17 23:51:37.000000000 -0400 ++++ pypolicyd-spf-1.0/setup.py 2012-03-18 00:33:41.901527155 -0400 +@@ -16,9 +16,9 @@ + 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'), +- ['policyd-spf.peruser.5'])], ++ ['policyd-spf.conf.5']), (os.path.join('../etc', ++ 'postfix-policyd-spf-python'), ['policyd-spf.conf']), ++ (os.path.join('share', 'man', 'man5'), ['policyd-spf.peruser.5'])], + classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Environment :: No Input/Output (Daemon)',