[Python-modules-commits] r24609 - in packages/pyspf/trunk/debian (3 files)

[kitterman at users.alioth.debian.org]

    Date: Wednesday, May 29, 2013 @ 04:43:56
  Author: kitterman
Revision: 24609

* Revert last addition to debian/patches/missed_py3
  - It isn't the right way to solve the problem and didn't work anyway
  - Will fix in python3-dns instead
* Set minimum python3-dns version for python3-spf to 3.0.3 as previous
  versions are broken

Modified:
  packages/pyspf/trunk/debian/changelog
  packages/pyspf/trunk/debian/control
  packages/pyspf/trunk/debian/patches/missed_py3

Modified: packages/pyspf/trunk/debian/changelog
===================================================================
--- packages/pyspf/trunk/debian/changelog	2013-05-29 04:43:12 UTC (rev 24608)
+++ packages/pyspf/trunk/debian/changelog	2013-05-29 04:43:56 UTC (rev 24609)
@@ -1,3 +1,13 @@
+pyspf (2.0.7-5) unstable; urgency=low
+
+  * Revert last addition to debian/patches/missed_py3
+    - It isn't the right way to solve the problem and didn't work anyway
+    - Will fix in python3-dns instead
+  * Set minimum python3-dns version for python3-spf to 3.0.3 as previous
+    versions are broken
+
+ -- Scott Kitterman <scott at kitterman.com>  Mon, 27 May 2013 00:22:58 -0400
+
 pyspf (2.0.7-4) unstable; urgency=medium
 
   [ Jakub Wilk ]

Modified: packages/pyspf/trunk/debian/control
===================================================================
--- packages/pyspf/trunk/debian/control	2013-05-29 04:43:12 UTC (rev 24608)
+++ packages/pyspf/trunk/debian/control	2013-05-29 04:43:56 UTC (rev 24609)
@@ -24,7 +24,7 @@
 
 Package: python3-spf
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-dns
+Depends: ${python3:Depends}, ${misc:Depends}, python3-dns (>= 3.0.3)
 Recommends: python3-authres
 Suggests: python3-yaml
 Description: sender policy framework (SPF) module for Python 3

Modified: packages/pyspf/trunk/debian/patches/missed_py3
===================================================================
--- packages/pyspf/trunk/debian/patches/missed_py3	2013-05-29 04:43:12 UTC (rev 24608)
+++ packages/pyspf/trunk/debian/patches/missed_py3	2013-05-29 04:43:56 UTC (rev 24609)
@@ -6,15 +6,6 @@
 ===================================================================
 --- pyspf-2.0.7.orig/spf.py	2013-05-25 23:35:47.738250685 -0400
 +++ pyspf-2.0.7/spf.py	2013-05-25 23:42:34.254238674 -0400
-@@ -1279,7 +1279,7 @@
-     def cidrmatch(self, ipaddrs, n):
-         """Match connect IP against a list of other IP addresses."""
-         try:
--            if self.v == 'ip6':
-+            if self.v == 'ip6' and sys.version_info[0] ==2:
-                 MASK = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-                 bin = bin2long6
-             else:
 @@ -1968,9 +1968,9 @@
      elif len(argv) == 3:
          q = query(i=argv[0], s=argv[1], h=argv[2],