Bug#856618: unblock: dkimpy/0.6.1-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package dkimpy
After dkimpy 0.6.0 was released, we found a few significant bugs that it would
be good to get fixed for Stretch. One can cause Python tracebacks and the
can cause incorrect signature verification results which could lead to mail
being incorrectly rejected.
I have not uploaded anything to unstable yet as I'd prefer to move to the new
upstream release which, other than adding a new test case related to one of
these issues, only fixes the two bugs in question. I have it ready to upload
if approved. Alternately, I could patch 0.6.0, but I think that's a worse
solution in this case.
Whichever approach the release team prefers, I'll upload to unstable. Thanks
for considering.
Scott K
unblock dkimpy/0.6.1-1
diff -Nru dkimpy-0.6.0/arcverify.py dkimpy-0.6.1/arcverify.py
--- dkimpy-0.6.0/arcverify.py 2016-10-17 17:45:20.000000000 -0400
+++ dkimpy-0.6.1/arcverify.py 2017-01-27 17:02:44.000000000 -0500
@@ -40,10 +40,10 @@
verbose = '-v' in sys.argv
if verbose:
logging.basicConfig(level=10)
- d = dkim.ARC(message)
- cv, results, comment = d.verify()
+ a = dkim.ARC(message)
+ cv, results, comment = a.verify()
else:
- cv, results, comment = arc.verify(message)
+ cv, results, comment = dkim.arc_verify(message)
print("arc verification: cv=%s %s" % (cv, comment))
if verbose:
diff -Nru dkimpy-0.6.0/ChangeLog dkimpy-0.6.1/ChangeLog
--- dkimpy-0.6.0/ChangeLog 2017-01-23 13:18:52.000000000 -0500
+++ dkimpy-0.6.1/ChangeLog 2017-01-27 18:43:58.000000000 -0500
@@ -1,3 +1,7 @@
+2017-01-27 Version 0.6.1
+ - Fixed python3 dns lookup issue
+ - Fixed arcverify.py issue
+
2017-01-23 Version 0.6.0
- Add capability to sign and verify ARC signatures
- Added new script, dknewkey.py, to generate DKIM keys
diff -Nru dkimpy-0.6.0/debian/changelog dkimpy-0.6.1/debian/changelog
--- dkimpy-0.6.0/debian/changelog 2017-01-23 15:24:54.000000000 -0500
+++ dkimpy-0.6.1/debian/changelog 2017-03-02 17:19:09.000000000 -0500
@@ -1,3 +1,9 @@
+dkimpy (0.6.1-1) unstable; urgency=medium
+
+ * New upstream release: (Closes: #856609, #856611, #856613)
+
+ -- Scott Kitterman <scott@kitterman.com> Thu, 02 Mar 2017 17:16:36 -0500
+
dkimpy (0.6.0-1) unstable; urgency=medium
* New upstream release
diff -Nru dkimpy-0.6.0/debian/.git-dpm dkimpy-0.6.1/debian/.git-dpm
--- dkimpy-0.6.0/debian/.git-dpm 2017-01-23 14:23:53.000000000 -0500
+++ dkimpy-0.6.1/debian/.git-dpm 2017-03-02 17:13:54.000000000 -0500
@@ -1,11 +1,11 @@
# see git-dpm(1) from git-dpm package
-7f718ac47e8898d3bb5d5e8c5663379bb994e9ed
-7f718ac47e8898d3bb5d5e8c5663379bb994e9ed
-7f718ac47e8898d3bb5d5e8c5663379bb994e9ed
-7f718ac47e8898d3bb5d5e8c5663379bb994e9ed
-dkimpy_0.6.0.orig.tar.gz
-7f409be40f0c7e387cee4e11f2483743cf1fdfe7
-42006
+ec31673f633ff352f9bb1e883a47764f6a344ff3
+ec31673f633ff352f9bb1e883a47764f6a344ff3
+ec31673f633ff352f9bb1e883a47764f6a344ff3
+ec31673f633ff352f9bb1e883a47764f6a344ff3
+dkimpy_0.6.1.orig.tar.gz
+e2465cc62171927779d36cc3fd93e177009ba26d
+42744
debianTag="debian/%e%v"
patchedTag="patched/%e%v"
upstreamTag="upstream/%e%u"
diff -Nru dkimpy-0.6.0/dkim/dnsplug.py dkimpy-0.6.1/dkim/dnsplug.py
--- dkimpy-0.6.0/dkim/dnsplug.py 2012-06-13 00:21:56.000000000 -0400
+++ dkimpy-0.6.1/dkim/dnsplug.py 2017-01-27 17:02:44.000000000 -0500
@@ -80,6 +80,6 @@
except UnicodeDecodeError:
return None
txt = _get_txt(unicode_name)
- if txt:
+ if type(txt) is str:
txt = txt.encode('utf-8')
return txt
diff -Nru dkimpy-0.6.0/dkim/tests/__init__.py dkimpy-0.6.1/dkim/tests/__init__.py
--- dkimpy-0.6.0/dkim/tests/__init__.py 2016-10-24 16:45:33.000000000 -0400
+++ dkimpy-0.6.1/dkim/tests/__init__.py 2017-01-27 18:18:49.000000000 -0500
@@ -30,6 +30,7 @@
test_dkim,
test_util,
test_arc,
+ test_dnsplug,
)
modules = [
test_canonicalization,
@@ -37,6 +38,7 @@
test_dkim,
test_util,
test_arc,
+ test_dnsplug,
]
suites = [x.test_suite() for x in modules]
return unittest.TestSuite(suites)
diff -Nru dkimpy-0.6.0/dkim/tests/test_dnsplug.py dkimpy-0.6.1/dkim/tests/test_dnsplug.py
--- dkimpy-0.6.0/dkim/tests/test_dnsplug.py 1969-12-31 19:00:00.000000000 -0500
+++ dkimpy-0.6.1/dkim/tests/test_dnsplug.py 2017-01-27 18:18:49.000000000 -0500
@@ -0,0 +1,35 @@
+# This software is provided 'as-is', without any express or implied
+# warranty. In no event will the author be held liable for any damages
+# arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not
+# claim that you wrote the original software. If you use this software
+# in a product, an acknowledgment in the product documentation would be
+# appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+# misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+#
+# Copyright (c) 2017 Valimail Inc
+# Contact: Gene Shuman <gene@valimail.com>
+#
+
+import unittest
+import dkim.dnsplug
+
+class TestDNSPlug(unittest.TestCase):
+
+ def test_get_txt(self):
+ dkim.dnsplug._get_txt = {"in": "out"}.get
+ res = dkim.dnsplug.get_txt(b"in")
+
+ self.assertEqual(res, b"out")
+
+def test_suite():
+ from unittest import TestLoader
+ return TestLoader().loadTestsFromName(__name__)
+
diff -Nru dkimpy-0.6.0/PKG-INFO dkimpy-0.6.1/PKG-INFO
--- dkimpy-0.6.0/PKG-INFO 2017-01-23 13:21:29.000000000 -0500
+++ dkimpy-0.6.1/PKG-INFO 2017-01-27 18:47:07.000000000 -0500
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: dkimpy
-Version: 0.6.0
+Version: 0.6.1
Summary: DKIM (DomainKeys Identified Mail)
Home-page: https://launchpad.net/dkimpy
Author: Scott Kitterman
diff -Nru dkimpy-0.6.0/README dkimpy-0.6.1/README
--- dkimpy-0.6.0/README 2017-01-23 13:21:06.000000000 -0500
+++ dkimpy-0.6.1/README 2017-01-27 18:44:49.000000000 -0500
@@ -11,7 +11,7 @@
VERSION
-This is dkimpy 0.6.0.
+This is dkimpy 0.6.1.
REQUIREMENTS
diff -Nru dkimpy-0.6.0/setup.py dkimpy-0.6.1/setup.py
--- dkimpy-0.6.0/setup.py 2017-01-23 13:10:07.000000000 -0500
+++ dkimpy-0.6.1/setup.py 2017-01-23 18:21:31.000000000 -0500
@@ -24,7 +24,7 @@
from distutils.core import setup
import os
-version = "0.6.0"
+version = "0.6.1"
setup(
name = "dkimpy",
Reply to: