[Python-apps-commits] r9549 - in packages/pymilter-milters/trunk/debian/patches (1 file)

[kitterman at users.alioth.debian.org]

    Date: Thursday, April 18, 2013 @ 03:27:42
  Author: kitterman
Revision: 9549

Add debian/patches/dkim-milter-debian-config.patch, left out of svn after the last upload.

Added:
  packages/pymilter-milters/trunk/debian/patches/dkim-milter-debian-config.patch

Added: packages/pymilter-milters/trunk/debian/patches/dkim-milter-debian-config.patch
===================================================================
--- packages/pymilter-milters/trunk/debian/patches/dkim-milter-debian-config.patch	                        (rev 0)
+++ packages/pymilter-milters/trunk/debian/patches/dkim-milter-debian-config.patch	2013-04-18 03:27:42 UTC (rev 9549)
@@ -0,0 +1,69 @@
+Index: pymilter-milters-0.8.17/dkim-milter.cfg
+===================================================================
+--- pymilter-milters-0.8.17.orig/dkim-milter.cfg	2012-11-23 21:19:09.074231838 -0500
++++ pymilter-milters-0.8.17/dkim-milter.cfg	2012-11-23 21:19:46.010230868 -0500
+@@ -1,12 +1,12 @@
+ [milter]
+ # The socket used to communicate with sendmail
+-socketname = /var/run/milter/dkimmiltersock
++socketname = /var/run/dkim-milter-python/dkimmiltersock
+ # Name of the milter given to sendmail
+ name = pydkimfilter
+ # Mail from internal networks is DKIM signed.
+ # NOTE: SMTP AUTH connections are also considered internal.
+ internal_connect = 127.0.0.1,192.168.0.0/16,10.0.0.0/8
+-datadir = /var/log/milter
++datadir = /var/log/dkim-milter-python
+ 
+ [dkim]
+ privkey = /etc/mail/dkim_rsa
+@@ -44,7 +44,7 @@
+ class=FileHandler
+ level=DEBUG
+ formatter=milterFormatter
+-args=('/var/log/milter/dkim-milter.log', 'a')
++args=('/var/log/dkim-milter-python/dkim-milter.log', 'a')
+ 
+ [formatter_milterFormatter]
+ format=%(asctime)s %(message)s
+Index: pymilter-milters-0.8.17/dkim-milter.py
+===================================================================
+--- pymilter-milters-0.8.17.orig/dkim-milter.py	2012-11-23 20:51:47.202274876 -0500
++++ pymilter-milters-0.8.17/dkim-milter.py	2012-11-23 21:19:17.138231625 -0500
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ # A simple DKIM milter.
+ # You must install pydkim/dkimpy for this to work.
+ 
+@@ -16,6 +17,7 @@
+ import logging
+ import logging.config
+ import os
++import os.path
+ import tempfile
+ import StringIO
+ import re
+@@ -257,16 +259,14 @@
+   Milter.factory = dkimMilter
+   Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
+   global config
+-  config = read_config(['dkim-milter.cfg','/etc/mail/dkim-milter.cfg'])
++  config = read_config(['dkim-milter.cfg','/etc/dkim-milter-python/dkim-milter.cfg'])
+   miltername = config.miltername
+   socketname = config.socketname
+-  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 dkim-milter startup""" % (miltername,miltername,socketname)
++  ownpid = os.getpid()
++  if not os.path.isfile('/var/run/dkim-milter-python/dkim-milter.pid'):
++    pidfile = open('/var/run/dkim-milter-python/dkim-milter.pid',mode='w+')
++    pidfile.write(ownpid)
++    pidfile.flush()
++    pidfile.close()
+   sys.stdout.flush()
+   Milter.runmilter(miltername,socketname,240)
+-  print "sample dkim-milter shutdown"