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

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Sat Feb 10 08:15:57 UTC 2018 

    Date: Saturday, February 10, 2018 @ 08:15:54
  Author: kitterman
Revision: 14588

* New upstream release
  - Refreshed patches
* Update debian/watch for new upstream location
* Update debian/copyright
* Bump compat and minimum debehelper version to 9
* Update homepage field in debian/control
* Bump standards-version to 4.1.3 without further change

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

Modified: packages/pymilter-milters/trunk/debian/changelog
===================================================================
--- packages/pymilter-milters/trunk/debian/changelog	2018-02-07 00:42:37 UTC (rev 14587)
+++ packages/pymilter-milters/trunk/debian/changelog	2018-02-10 08:15:54 UTC (rev 14588)
@@ -1,9 +1,19 @@
-pymilter-milters (0.8.18-3) UNRELEASED; urgency=low
+pymilter-milters (0.9-1) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Fix a typo in README.source.
 
- -- Jakub Wilk <jwilk at debian.org>  Wed, 12 Jun 2013 01:44:23 +0200
+  [ Scott Kitterman ]
+  * New upstream release
+    - Refreshed patches
+  * Update debian/watch for new upstream location
+  * Update debian/copyright
+  * Bump compat and minimum debehelper version to 9
+  * Update homepage field in debian/control
+  * Bump standards-version to 4.1.3 without further change
 
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 10 Feb 2018 02:32:07 -0500
+
 pymilter-milters (0.8.18-2) unstable; urgency=low
 
   * Upload to unstable

Modified: packages/pymilter-milters/trunk/debian/compat
===================================================================
--- packages/pymilter-milters/trunk/debian/compat	2018-02-07 00:42:37 UTC (rev 14587)
+++ packages/pymilter-milters/trunk/debian/compat	2018-02-10 08:15:54 UTC (rev 14588)
@@ -1 +1 @@
-8
+9

Modified: packages/pymilter-milters/trunk/debian/control
===================================================================
--- packages/pymilter-milters/trunk/debian/control	2018-02-07 00:42:37 UTC (rev 14587)
+++ packages/pymilter-milters/trunk/debian/control	2018-02-10 08:15:54 UTC (rev 14588)
@@ -3,9 +3,9 @@
 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), quilt (>= 0.46-7), python
-Standards-Version: 3.9.4
-Homepage: http://sourceforge.net/projects/pymilter/
+Build-Depends: debhelper (>= 9), quilt (>= 0.46-7), python
+Standards-Version: 4.1.3
+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/
 

Modified: packages/pymilter-milters/trunk/debian/copyright
===================================================================
--- packages/pymilter-milters/trunk/debian/copyright	2018-02-07 00:42:37 UTC (rev 14587)
+++ packages/pymilter-milters/trunk/debian/copyright	2018-02-10 08:15:54 UTC (rev 14588)
@@ -1,10 +1,12 @@
 This package was debianized by Scott Kitterman <scott at kitterman.com> on
 Friday August 24, 2007 19:04:29 -0400.
 
-It was downloaded from http://sourceforge.net/projects/pymilter/
+It was originally downloaded from http://sourceforge.net/projects/pymilter/
+It is now downloaded from https://github.com/sdgathman/milter/
 
 Copyright Holder: 
- * © Copyright 2007 Business Management Systems, Inc.
+ * © Copyright 2001-2013 Business Management Systems, Inc.
+   © Copyright 2013-2015 Stuart D. Gathman
 
 License:
 

Modified: packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch
===================================================================
--- packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch	2018-02-07 00:42:37 UTC (rev 14587)
+++ packages/pymilter-milters/trunk/debian/patches/spfmilter-debian-config.patch	2018-02-10 08:15:54 UTC (rev 14588)
@@ -1,48 +1,39 @@
 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.18/spfmilter.cfg
+Index: pymilter-milters-0.9/spfmilter.cfg
 ===================================================================
---- 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
+--- pymilter-milters-0.9.orig/spfmilter.cfg	2018-02-10 02:34:45.256002636 -0500
++++ pymilter-milters-0.9/spfmilter.cfg	2018-02-10 02:45:58.584029738 -0500
 @@ -1,6 +1,6 @@
  [milter]
  # The socket used to communicate with sendmail
 -socketname = /var/run/milter/spfmiltersock
 +socketname = /var/run/spf-milter-python/spfmiltersock
+ # Process umask for runmilter.  Set to e.g. 0117 to allow group write.
+ ;umask = 0177
  # 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.18/spfmilter.py
+Index: pymilter-milters-0.9/spfmilter.py
 ===================================================================
---- 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
+--- pymilter-milters-0.9.orig/spfmilter.py	2018-02-10 02:34:45.256002636 -0500
++++ pymilter-milters-0.9/spfmilter.py	2018-02-10 02:43:42.812024273 -0500
 @@ -1,3 +1,4 @@
 +#!/usr/bin/python
  # A simple SPF milter.
  # You must install pyspf for this to work.
  
-@@ -8,6 +9,8 @@
- # This code is under GPL.  See COPYING for details.
- 
- import sys
-+import os
-+import os.path
- import Milter
- import spf
- import syslog
-@@ -295,7 +298,7 @@
-   Milter.factory = spfMilter
+@@ -319,7 +320,7 @@
    Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
    global config
--  config = read_config(['spfmilter.cfg','/etc/mail/spfmilter.cfg'])
-+  config = read_config(['spfmilter.cfg','/etc/spf-milter-python/spfmilter.cfg'])
+   config = read_config(
+-    ['spfmilter.cfg','/etc/mail/spfmilter.cfg','/etc/postfix/spfmilter.cfg'])
++    ['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 @@
- 
+@@ -333,14 +334,12 @@
    miltername = config.miltername
    socketname = config.socketname
+   # FIXME: set process umask based on config
 -  print("""To use this with sendmail, add the following to sendmail.cf:
 -
 -O InputMailFilters=%s
@@ -57,5 +48,6 @@
 +    pidfile.flush()
 +    pidfile.close()
    sys.stdout.flush()
+   config.savumask = os.umask(config.umask)
    Milter.runmilter(miltername,socketname,240)
 -  print "spfmilter shutdown"

Modified: packages/pymilter-milters/trunk/debian/watch
===================================================================
--- packages/pymilter-milters/trunk/debian/watch	2018-02-07 00:42:37 UTC (rev 14587)
+++ packages/pymilter-milters/trunk/debian/watch	2018-02-10 08:15:54 UTC (rev 14588)
@@ -1,3 +1,5 @@
 version=3
-http://sf.net/pymilter/milter-(.*).tar.gz debian uupdate
-
+#http://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

More information about the Python-apps-commits mailing list