[Python-apps-commits] r9550 - in packages/pymilter-milters/trunk/debian (3 files)

[kitterman at users.alioth.debian.org]

    Date: Thursday, April 18, 2013 @ 03:31:28
  Author: kitterman
Revision: 9550

* New upstream release (Closes: #705633)
  - Refresh patch and fix config file path
* Add python to build-depends since we need pyversions

Modified:
  packages/pymilter-milters/trunk/debian/changelog
  packages/pymilter-milters/trunk/debian/control
  packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch

Modified: packages/pymilter-milters/trunk/debian/changelog
===================================================================
--- packages/pymilter-milters/trunk/debian/changelog	2013-04-18 03:27:42 UTC (rev 9549)
+++ packages/pymilter-milters/trunk/debian/changelog	2013-04-18 03:31:28 UTC (rev 9550)
@@ -1,3 +1,11 @@
+pymilter-milters (0.8.18-1) experimental; urgency=low
+
+  * New upstream release (Closes: #705633)
+    - Refresh patch and fix config file path
+  * Add python to build-depends since we need pyversions
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 14 Apr 2013 18:54:57 -0400
+
 pymilter-milters (0.8.17-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/pymilter-milters/trunk/debian/control
===================================================================
--- packages/pymilter-milters/trunk/debian/control	2013-04-18 03:27:42 UTC (rev 9549)
+++ packages/pymilter-milters/trunk/debian/control	2013-04-18 03:31:28 UTC (rev 9550)
@@ -3,7 +3,7 @@
 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 (>= 7.3.16), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7.3.16), quilt (>= 0.46-7), python
 Standards-Version: 3.9.4
 Homepage: http://sourceforge.net/projects/pymilter/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/pymilter-milters/trunk/

Modified: packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch
===================================================================
--- packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch	2013-04-18 03:27:42 UTC (rev 9549)
+++ packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch	2013-04-18 03:31:28 UTC (rev 9550)
@@ -1,9 +1,9 @@
 This is a distro patch to integrate spf-milter-python properly in Debian and
 derived systems.  It has not gone, and does not need to go, upstream.
-Index: pymilter-milters-0.8.17/spfmilter.cfg
+Index: pymilter-milters-0.8.18/spfmilter.cfg
 ===================================================================
---- pymilter-milters-0.8.17.orig/spfmilter.cfg	2012-11-23 19:49:21.078373071 -0500
-+++ pymilter-milters-0.8.17/spfmilter.cfg	2012-11-23 19:49:25.066372968 -0500
+--- pymilter-milters-0.8.18.orig/spfmilter.cfg	2013-03-09 18:52:35.000000000 -0500
++++ pymilter-milters-0.8.18/spfmilter.cfg	2013-04-14 18:56:28.224583747 -0400
 @@ -1,6 +1,6 @@
  [milter]
  # The socket used to communicate with sendmail
@@ -12,10 +12,10 @@
  # Name of the milter given to sendmail
  name = pyspffilter
  # Trusted relays such as secondary MXes that should not have SPF checked.
-Index: pymilter-milters-0.8.17/spfmilter.py
+Index: pymilter-milters-0.8.18/spfmilter.py
 ===================================================================
---- pymilter-milters-0.8.17.orig/spfmilter.py	2012-11-23 19:49:21.078373071 -0500
-+++ pymilter-milters-0.8.17/spfmilter.py	2012-11-23 19:49:25.066372968 -0500
+--- pymilter-milters-0.8.18.orig/spfmilter.py	2013-03-12 23:10:08.000000000 -0400
++++ pymilter-milters-0.8.18/spfmilter.py	2013-04-14 19:04:22.700602204 -0400
 @@ -1,3 +1,4 @@
 +#!/usr/bin/python
  # A simple SPF milter.
@@ -30,21 +30,26 @@
  import Milter
  import spf
  import syslog
-@@ -267,16 +270,14 @@
+@@ -295,7 +298,7 @@
    Milter.factory = spfMilter
    Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
    global config
 -  config = read_config(['spfmilter.cfg','/etc/mail/spfmilter.cfg'])
-+  config = read_config(['spfmilter.cfg','/etc/mail//etc/spf-milter-python/spfmilter.cfg'])
++  config = read_config(['spfmilter.cfg','/etc/spf-milter-python/spfmilter.cfg'])
+   ue = config.untrapped_exception.upper()
+   if ue == 'CONTINUE':
+     Milter.set_exception_policy(Milter.CONTINUE)
+@@ -308,13 +311,11 @@
+ 
    miltername = config.miltername
    socketname = config.socketname
--  print """To use this with sendmail, add the following to sendmail.cf:
+-  print("""To use this with sendmail, add the following to sendmail.cf:
 -
 -O InputMailFilters=%s
 -X%s,        S=local:%s
 -
 -See the sendmail README for libmilter.
--sample spfmilter startup""" % (miltername,miltername,socketname)
+-spfmilter startup""" % (miltername,miltername,socketname))
 +  ownpid = os.getpid()
 +  if not os.path.isfile('/var/run/spf-milter-python/spfmilter.pid'):
 +    pidfile = open('/var/run/spf-milter-python/spfmilter.pid',mode='w+')
@@ -53,4 +58,4 @@
 +    pidfile.close()
    sys.stdout.flush()
    Milter.runmilter(miltername,socketname,240)
--  print "sample spfmilter shutdown"
+-  print "spfmilter shutdown"