[Python-modules-commits] r17469 - in packages/pydkim/trunk/debian (12 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Thu Jun 16 04:32:51 UTC 2011
Date: Thursday, June 16, 2011 @ 04:32:49
Author: kitterman
Revision: 17469
* New upstream release
- Drop debian/patches/fix-key-record-validation.patch and
relaxed-canonicalization.patch, incorporated upstream
- Update debian/patches/adjust-setup.py.patch to match upstream setup.py
versions
- Drop debian/dkimsign.1 and dkimverify.1, provided in the upstream
tarball now
- Drop debian/manpages, installed using upstream setup.py
- Add depends on python-dns and use python-dnspython as an alternate
- Increase minimum python version to 2.6 (X-P-V) and add X-Python3-Version
>= 3.1 for python3 support
- Add python3-dkim to debian/control for python3 support
- Only python3-dns is available for python3, so use this
- Add python3 to build-depends
- Rework debian/rules to build for python3
- Update debian/copyright
* Update debian/watch and debian/control Homepage: to point at the new
upstream location
Modified:
packages/pydkim/trunk/debian/changelog
packages/pydkim/trunk/debian/control
packages/pydkim/trunk/debian/copyright
packages/pydkim/trunk/debian/patches/adjust-setup.py.patch
packages/pydkim/trunk/debian/patches/series
packages/pydkim/trunk/debian/rules
packages/pydkim/trunk/debian/watch
Deleted:
packages/pydkim/trunk/debian/dkimsign.1
packages/pydkim/trunk/debian/dkimverify.1
packages/pydkim/trunk/debian/manpages
packages/pydkim/trunk/debian/patches/fix-key-record-validation.patch
packages/pydkim/trunk/debian/patches/relaxed-canonicalization.patch
Modified: packages/pydkim/trunk/debian/changelog
===================================================================
--- packages/pydkim/trunk/debian/changelog 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/changelog 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,3 +1,26 @@
+pydkim (0.4.1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - Drop debian/patches/fix-key-record-validation.patch and
+ relaxed-canonicalization.patch, incorporated upstream
+ - Update debian/patches/adjust-setup.py.patch to match upstream setup.py
+ versions
+ - Drop debian/dkimsign.1 and dkimverify.1, provided in the upstream
+ tarball now
+ - Drop debian/manpages, installed using upstream setup.py
+ - Add depends on python-dns and use python-dnspython as an alternate
+ - Increase minimum python version to 2.6 (X-P-V) and add X-Python3-Version
+ >= 3.1 for python3 support
+ - Add python3-dkim to debian/control for python3 support
+ - Only python3-dns is available for python3, so use this
+ - Add python3 to build-depends
+ - Rework debian/rules to build for python3
+ - Update debian/copyright
+ * Update debian/watch and debian/control Homepage: to point at the new
+ upstream location
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 14 Jun 2011 23:11:26 -0500
+
pydkim (0.3-6) unstable; urgency=low
* Rebuild for python transition
Modified: packages/pydkim/trunk/debian/control
===================================================================
--- packages/pydkim/trunk/debian/control 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/control 2011-06-16 04:32:49 UTC (rev 17469)
@@ -3,18 +3,26 @@
Priority: optional
Maintainer: Scott Kitterman <scott at kitterman.com>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.16), python (>= 2.6.5-2~), quilt (>= 0.46-7)
-X-Python-Version: >= 2.5
+Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.5-2~), python3-all, quilt (>= 0.46-7)
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.1
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pydkim/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pydkim/trunk/
Standards-Version: 3.9.2
-Homepage: http://hewgill.com/pydkim
+Homepage: http://launchpad.net/pydkim
Package: python-dkim
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-dnspython
+Depends: ${python:Depends}, ${misc:Depends}, python-dns|python-dnspython
Conflicts: dkimproxy (<< 1.0.1-8.1~)
Description: Python module for DKIM signing and verification
Python module that implements DKIM (DomainKeys Identified Mail) email signing
and verification. It also provides helper scripts for command line signing
and verification.
+
+Package: python3-dkim
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}, python3-dns
+Description: Python 3 module for DKIM signing and verification
+ Python 3 module that implements DKIM (DomainKeys Identified Mail) email signing
+ and verification.
Modified: packages/pydkim/trunk/debian/copyright
===================================================================
--- packages/pydkim/trunk/debian/copyright 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/copyright 2011-06-16 04:32:49 UTC (rev 17469)
@@ -3,8 +3,14 @@
It was downloaded from http://hewgill.com/pydkim
-Copyright Holder: Copyright © 2008 Greg Hewgill http://hewgill.com
+Copyright Holders:
+Copyright © 2008 Greg Hewgill http://hewgill.com
+Copyright © 2011 William Grant <me at williamgrant.id.au>
+Copyright © 2011 Scott Kitterman <scott at kitterman.com>
+Every file for which the original upstream specified copyright in the original
+has been modified from in this altered version of the software.
+
License:
# This software is provided 'as-is', without any express or implied
@@ -25,5 +31,5 @@
#
# Copyright © 2008 Greg Hewgill http://hewgill.com
-The Debian packaging is © 2008, Scott Kitterman <scott at kitterman.com> and
+The Debian packaging is © 2008-11, Scott Kitterman <scott at kitterman.com> and
is licensed under the same terms as pydkim, see above.
Deleted: packages/pydkim/trunk/debian/dkimsign.1
===================================================================
--- packages/pydkim/trunk/debian/dkimsign.1 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/dkimsign.1 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,158 +0,0 @@
-\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.if \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.\"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "dkimsign 1"
-.TH dkimsign 1 "2008-11-07"
-.SH "NAME"
-dkimsign \- Script for DKIM signing messages on stdin
-.SH "VERSION"
-.IX Header "VERSION"
-0\.3
-
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-
-dkimsign is a filter that reads an RFC822 message on standard input, and writes
-the same message on standard output with a DKIM-Signature line prepended.
-
-.SH "USAGE"
-.IX Header "USAGE"
-
-The signing options are specified on the command line:
-
-dkimsign selector domain privatekeyfile [identity]
-
-The identity is optional and defaults to "@domain".
-
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-This version of \fBdkimsign\fR was written by Greg Hewgill <greg at hewgill.com>.
-.PP
-This man-page was created by Scott Kitterman <scott at kitterman.com> and is
-licensed under the same terms as pydkim.
Deleted: packages/pydkim/trunk/debian/dkimverify.1
===================================================================
--- packages/pydkim/trunk/debian/dkimverify.1 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/dkimverify.1 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,150 +0,0 @@
-\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings. \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote. \*(C+ will
-.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-. ds -- \(*W-
-. ds PI pi
-. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-. ds L" ""
-. ds R" ""
-. ds C` ""
-. ds C' ""
-'br\}
-.el\{\
-. ds -- \|\(em\|
-. ds PI \(*p
-. ds L" ``
-. ds R" ''
-'br\}
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
-.\" entries marked with X<> in POD. Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.if \nF \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
-..
-. nr % 0
-. rr F
-.\}
-.\"
-.\" For nroff, turn off justification. Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.hy 0
-.if n .na
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear. Run. Save yourself. No user-serviceable parts.
-. \" fudge factors for nroff and troff
-.if n \{\
-. ds #H 0
-. ds #V .8m
-. ds #F .3m
-. ds #[ \f1
-. ds #] \fP
-.\}
-.if t \{\
-. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-. ds #V .6m
-. ds #F 0
-. ds #[ \&
-. ds #] \&
-.\}
-. \" simple accents for nroff and troff
-.if n \{\
-. ds ' \&
-. ds ` \&
-. ds ^ \&
-. ds , \&
-. ds ~ ~
-. ds /
-.\}
-.if t \{\
-. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-. \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-. \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-. \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-. ds : e
-. ds 8 ss
-. ds o a
-. ds d- d\h'-1'\(ga
-. ds D- D\h'-1'\(hy
-. ds th \o'bp'
-. ds Th \o'LP'
-. ds ae ae
-. ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "dkimverify 1"
-.TH dkimverify 1 "2008-11-07"
-.SH "NAME"
-dkimverify \- Script for DKIM verifying messages on stdin
-.SH "VERSION"
-.IX Header "VERSION"
-0\.3
-
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-
-dkimverify reads an RFC822 message on standard input, and returns with exit
-code 0 if the signature verifies successfully. Otherwise, it returns with exit
-code 1.
-
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-This version of \fBdkimsign\fR was written by Greg Hewgill <greg at hewgill.com>.
-.PP
-This man-page was created by Scott Kitterman <scott at kitterman.com> and is
-licensed under the same terms as pydkim.
Deleted: packages/pydkim/trunk/debian/manpages
===================================================================
--- packages/pydkim/trunk/debian/manpages 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/manpages 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,3 +0,0 @@
-debian/dkimsign.1
-debian/dkimverify.1
-
Modified: packages/pydkim/trunk/debian/patches/adjust-setup.py.patch
===================================================================
--- packages/pydkim/trunk/debian/patches/adjust-setup.py.patch 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/patches/adjust-setup.py.patch 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,20 +1,22 @@
This is a Debian specific patch that should not go upstream. See debian/
changelog for source and rationale.
-Index: pydkim-0.3/setup.py
+Index: pydkim-0.4/setup.py
===================================================================
---- pydkim-0.3.orig/setup.py 2010-06-21 23:43:45.503817777 -0400
-+++ pydkim-0.3/setup.py 2010-06-21 23:43:55.486817085 -0400
+--- pydkim-0.4.orig/setup.py 2011-06-15 03:17:08.000000000 +0000
++++ pydkim-0.4/setup.py 2011-06-15 05:01:55.588581204 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
# This software is provided 'as-is', without any express or implied
# warranty. In no event will the author be held liable for any damages
-@@ -34,5 +34,5 @@
+@@ -38,7 +38,7 @@
url = "http://hewgill.com/pydkim/",
license = "BSD-like",
- py_modules = ["dkim"],
+ packages = ["dkim"],
- scripts = ["dkimsign.py", "dkimverify.py", "dkimsend.sh"],
+ scripts = ["dkimsign.py", "dkimverify.py"],
- )
+ data_files = [(os.path.join('share', 'man', 'man1'),
+ ['man/dkimsign.1']), (os.path.join('share', 'man', 'man1'),
+ ['man/dkimverify.1'])],
Deleted: packages/pydkim/trunk/debian/patches/fix-key-record-validation.patch
===================================================================
--- packages/pydkim/trunk/debian/patches/fix-key-record-validation.patch 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/patches/fix-key-record-validation.patch 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,15 +0,0 @@
-Index: pydkim-0.3/dkim.py
-===================================================================
---- pydkim-0.3.orig/dkim.py 2011-03-06 23:33:14.000000000 -0500
-+++ pydkim-0.3/dkim.py 2011-03-06 23:34:13.000000000 -0500
-@@ -557,6 +557,10 @@
- if not s:
- return False
- a = re.split(r"\s*;\s*", s)
-+ # Trailing ';' on signature record is valid, see RFC 4871 3.2
-+ # tag-list = tag-spec 0*( ";" tag-spec ) [ ";" ]
-+ if a[-1] == '':
-+ a.pop(-1)
- pub = {}
- for f in a:
- m = re.match(r"(\w+)=(.*)", f)
Deleted: packages/pydkim/trunk/debian/patches/relaxed-canonicalization.patch
===================================================================
--- packages/pydkim/trunk/debian/patches/relaxed-canonicalization.patch 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/patches/relaxed-canonicalization.patch 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,44 +0,0 @@
-Index: pydkim-0.3/dkim.py
-===================================================================
---- pydkim-0.3.orig/dkim.py 2010-08-25 20:45:42.000000000 +0000
-+++ pydkim-0.3/dkim.py 2010-08-25 20:45:53.000000000 +0000
-@@ -363,18 +363,23 @@
- ('bh', bodyhash),
- ('b', ""),
- ] if x]
-- sig = "DKIM-Signature: " + "; ".join("%s=%s" % x for x in sigfields)
-
-- sig = fold(sig)
-+ sig_value = fold("; ".join("%s=%s" % x for x in sigfields))
-+ dkim_header = canonicalize[0].canonicalize_headers([
-+ ['DKIM-Signature', ' ' + sig_value]])[0]
-+ # the dkim sig is hashed with no trailing crlf, even if the
-+ # canonicalization algorithm would add one.
-+ if dkim_header[1][-2:] == '\r\n':
-+ dkim_header = (dkim_header[0], dkim_header[1][:-2])
-+ sign_headers.append(dkim_header)
-
- if debuglog is not None:
-- print >>debuglog, "sign headers:", sign_headers + [("DKIM-Signature", " "+"; ".join("%s=%s" % x for x in sigfields))]
-+ print >>debuglog, "sign headers:", sign_headers
- h = hashlib.sha256()
- for x in sign_headers:
- h.update(x[0])
- h.update(":")
- h.update(x[1])
-- h.update(sig)
- d = h.digest()
- if debuglog is not None:
- print >>debuglog, "sign digest:", " ".join("%02x" % ord(x) for x in d)
-@@ -392,9 +397,9 @@
- if len(dinfo)+3 > modlen:
- raise ParameterError("Hash too large for modulus")
- sig2 = int2str(pow(str2int("\x00\x01"+"\xff"*(modlen-len(dinfo)-3)+"\x00"+dinfo), pk['privateExponent'], pk['modulus']), modlen)
-- sig += base64.b64encode(''.join(sig2))
-+ sig_value += base64.b64encode(''.join(sig2))
-
-- return sig + "\r\n"
-+ return 'DKIM-Signature: ' + sig_value + "\r\n"
-
- def verify(message, debuglog=None):
- """Verify a DKIM signature on an RFC822 formatted message.
Modified: packages/pydkim/trunk/debian/patches/series
===================================================================
--- packages/pydkim/trunk/debian/patches/series 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/patches/series 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,3 +1 @@
adjust-setup.py.patch
-relaxed-canonicalization.patch
-fix-key-record-validation.patch
Modified: packages/pydkim/trunk/debian/rules
===================================================================
--- packages/pydkim/trunk/debian/rules 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/rules 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,10 +1,31 @@
#!/usr/bin/make -f
+# -*- makefile -*-
%:
- dh $@ --with quilt, --with python2
+ dh $@ --with python2,python3,quilt
-override_dh_install:
+override_dh_auto_install:
+ set -e && for pyvers in $(shell pyversions -vr); do \
+ python$$pyvers $(CURDIR)/setup.py install --no-compile -O0 --install-layout=deb \
+ --root $(CURDIR)/debian/python-dkim; \
+ done
mv debian/python-dkim/usr/bin/dkimsign.py debian/python-dkim/usr/bin/dkimsign
mv debian/python-dkim/usr/bin/dkimverify.py debian/python-dkim/usr/bin/dkimverify
+ set -e && for pyvers in $(shell py3versions -sv); do \
+ python$$pyvers $(CURDIR)/setup.py install --no-compile -O0 --install-layout=deb \
+ --root $(CURDIR)/debian/python3-dkim; \
+ done
+ rm $(CURDIR)/debian/python3-dkim/usr/bin/dkimverify.py
+ rm $(CURDIR)/debian/python3-dkim/usr/bin/dkimsign.py
+ rm -rf $(CURDIR)/debian/python3-dkim/usr/share/man
dh_install
+override_dh_auto_clean:
+ set -e && for pyvers in $(shell pyversions -vr); do \
+ python$$pyvers setup.py clean -a; \
+ done
+ set -e && for pyvers in $(shell py3versions -sv); do \
+ python$$pyvers setup.py clean -a; \
+ done
+ find . -name \*.pyc -exec rm {} \;
+ dh_clean
Modified: packages/pydkim/trunk/debian/watch
===================================================================
--- packages/pydkim/trunk/debian/watch 2011-06-15 18:23:53 UTC (rev 17468)
+++ packages/pydkim/trunk/debian/watch 2011-06-16 04:32:49 UTC (rev 17469)
@@ -1,3 +1,3 @@
version=3
-http://hewgill.com/pydkim/pydkim-(.*)\.tar\.gz debian uupdate
+http://launchpad.net/pydkim/+download http://launchpad.net/pydkim/.*/.*/pydkim-(.*)\.tar\.gz debian uupdate
More information about the Python-modules-commits
mailing list