diff -Nru twisted-mail-11.1.0/debian/changelog twisted-mail-12.1.0/debian/changelog --- twisted-mail-11.1.0/debian/changelog 2011-12-21 11:53:40.000000000 +0000 +++ twisted-mail-12.1.0/debian/changelog 2012-06-23 14:40:33.000000000 +0000 @@ -1,3 +1,16 @@ +twisted-mail (12.1.0-1~ppa1~precise1) precise; urgency=low + + * New upstream release. + * Rebuild for use in PPA. + + -- Jessica McKellar Sat, 23 Jun 2012 10:40:08 -0400 + +twisted-mail (12.0.0-1~ppa1~precise1) precise; urgency=low + + * Rebuild for use in PPA. + + -- Jessica McKellar Tue, 29 May 2012 18:28:35 -0400 + twisted-mail (11.1.0-1) unstable; urgency=low * New upstream release. diff -Nru twisted-mail-11.1.0/debian/compat twisted-mail-12.1.0/debian/compat --- twisted-mail-11.1.0/debian/compat 2010-07-21 08:31:45.000000000 +0000 +++ twisted-mail-12.1.0/debian/compat 2012-06-19 02:52:24.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru twisted-mail-11.1.0/debian/control twisted-mail-12.1.0/debian/control --- twisted-mail-11.1.0/debian/control 2011-12-21 11:54:11.000000000 +0000 +++ twisted-mail-12.1.0/debian/control 2012-06-19 02:53:18.000000000 +0000 @@ -3,17 +3,16 @@ Priority: optional Maintainer: Matthias Klose Uploaders: Free Ekanayaka -Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.5-9~), python-twisted-core (>= 11.1), patch +Build-Depends: debhelper (>=7.0.50~), python-all (>= 2.6.6-3~), python-twisted-core (>= 12.1), patch XS-Python-Version: all Standards-Version: 3.9.2 Package: python-twisted-mail Architecture: all -Depends: ${python:Depends}, python-twisted-core (>= 11.1), python-openssl, ${misc:Depends} +Depends: ${python:Depends}, python-twisted-core (>= 12.1), python-openssl, ${misc:Depends} Recommends: python-twisted-names Conflicts: python-twisted (<< 2.1), python2.3-twisted-mail, python2.4-twisted-mail Replaces: python-twisted (<< 2.1), python2.3-twisted-mail, python2.4-twisted-mail -XB-Python-Version: ${python:Versions} Description: SMTP, IMAP and POP protocol implementation Twisted Mail contains high-level, efficient protocol implementations for both clients and servers of SMTP, POP3, and IMAP4. Additionally, diff -Nru twisted-mail-11.1.0/debian/rules twisted-mail-12.1.0/debian/rules --- twisted-mail-11.1.0/debian/rules 2011-12-21 11:54:25.000000000 +0000 +++ twisted-mail-12.1.0/debian/rules 2012-06-19 02:52:24.000000000 +0000 @@ -27,7 +27,7 @@ install-prereq: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep install-python%: install-prereq : # python-twisted-mail diff -Nru twisted-mail-11.1.0/debian/watch twisted-mail-12.1.0/debian/watch --- twisted-mail-11.1.0/debian/watch 2011-02-24 11:03:09.000000000 +0000 +++ twisted-mail-12.1.0/debian/watch 2012-06-19 02:52:24.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://tmrc.mit.edu/mirror/twisted/Mail/(\d+\.\d)/ TwistedMail-([\d\.]*)\.tar\.bz2 +http://tmrc.mit.edu/mirror/twisted/Mail/(\d\.\d)/ TwistedMail-([\d\.]*)\.tar\.bz2 diff -Nru twisted-mail-11.1.0/doc/examples/index.html twisted-mail-12.1.0/doc/examples/index.html --- twisted-mail-11.1.0/doc/examples/index.html 2011-11-17 10:51:13.000000000 +0000 +++ twisted-mail-12.1.0/doc/examples/index.html 2012-06-04 08:46:24.000000000 +0000 @@ -1,11 +1,11 @@ -Twisted Documentation: Twisted.Mail code examples +Twisted Documentation: Twisted Mail code examples -

Twisted.Mail code examples

+

Twisted Mail code examples

  1. SMTP servers
  2. SMTP clients
  3. IMAP clients
@@ -31,6 +31,6 @@

Index

- Version: 11.1.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-mail-11.1.0/doc/index.html twisted-mail-12.1.0/doc/index.html --- twisted-mail-11.1.0/doc/index.html 2011-11-17 10:51:13.000000000 +0000 +++ twisted-mail-12.1.0/doc/index.html 2012-06-04 08:46:24.000000000 +0000 @@ -20,6 +20,6 @@

Index

- Version: 11.1.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-mail-11.1.0/doc/man/mailmail-man.html twisted-mail-12.1.0/doc/man/mailmail-man.html --- twisted-mail-11.1.0/doc/man/mailmail-man.html 2011-11-17 10:51:13.000000000 +0000 +++ twisted-mail-12.1.0/doc/man/mailmail-man.html 2012-06-04 08:46:24.000000000 +0000 @@ -50,6 +50,6 @@

Index

- Version: 11.1.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-mail-11.1.0/doc/tutorial/smtpclient/smtpclient-11.tac twisted-mail-12.1.0/doc/tutorial/smtpclient/smtpclient-11.tac --- twisted-mail-11.1.0/doc/tutorial/smtpclient/smtpclient-11.tac 2005-04-02 00:57:01.000000000 +0000 +++ twisted-mail-12.1.0/doc/tutorial/smtpclient/smtpclient-11.tac 2012-05-25 13:23:22.000000000 +0000 @@ -46,7 +46,7 @@ def getMailExchange(host): def cbMX(mxRecord): - return str(mxRecord.exchange) + return str(mxRecord.name) return relaymanager.MXCalculator().getMX(host).addCallback(cbMX) def cbMailExchange(exchange): diff -Nru twisted-mail-11.1.0/doc/tutorial/smtpclient/smtpclient.html twisted-mail-12.1.0/doc/tutorial/smtpclient/smtpclient.html --- twisted-mail-11.1.0/doc/tutorial/smtpclient/smtpclient.html 2011-11-17 10:51:13.000000000 +0000 +++ twisted-mail-12.1.0/doc/tutorial/smtpclient/smtpclient.html 2012-06-04 08:46:24.000000000 +0000 @@ -733,7 +733,7 @@ 4

def getMailExchange(host): def cbMX(mxRecord): - return str(mxRecord.exchange) + return str(mxRecord.name) return relaymanager.MXCalculator().getMX(host).addCallback(cbMX) @@ -752,6 +752,6 @@

Index

- Version: 11.1.0 + Version: 12.1.0 \ No newline at end of file diff -Nru twisted-mail-11.1.0/LICENSE twisted-mail-12.1.0/LICENSE --- twisted-mail-11.1.0/LICENSE 2011-05-05 02:48:02.000000000 +0000 +++ twisted-mail-12.1.0/LICENSE 2012-02-11 13:47:35.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (c) 2001-2011 +Copyright (c) 2001-2012 Allen Short Andy Gayton Andrew Bennetts diff -Nru twisted-mail-11.1.0/NEWS twisted-mail-12.1.0/NEWS --- twisted-mail-11.1.0/NEWS 2011-11-15 16:39:18.000000000 +0000 +++ twisted-mail-12.1.0/NEWS 2012-06-02 07:04:01.000000000 +0000 @@ -1,6 +1,25 @@ Ticket numbers in this file can be looked up by visiting http://twistedmatrix.com/trac/ticket/ +Twisted Mail 12.1.0 (2012-06-02) +================================ + +Bugfixes +-------- + - twistd mail --auth, broken in 11.0, now correctly connects + authentication to the portal being used (#5219) + +Other +----- + - #5686 + + +Twisted Mail 12.0.0 (2012-02-10) +================================ + +No significant changes have been made for this release. + + Twisted Mail 11.1.0 (2011-11-15) ================================ diff -Nru twisted-mail-11.1.0/README twisted-mail-12.1.0/README --- twisted-mail-11.1.0/README 2011-11-15 16:39:18.000000000 +0000 +++ twisted-mail-12.1.0/README 2012-06-02 07:04:01.000000000 +0000 @@ -1,4 +1,4 @@ -Twisted Mail 11.1.0 +Twisted Mail 12.1.0 Twisted Mail depends on Twisted Core and (sometimes) Twisted Names. For TLS support, pyOpenSSL () is also required. Aside diff -Nru twisted-mail-11.1.0/twisted/mail/tap.py twisted-mail-12.1.0/twisted/mail/tap.py --- twisted-mail-11.1.0/twisted/mail/tap.py 2011-10-18 10:31:11.000000000 +0000 +++ twisted-mail-12.1.0/twisted/mail/tap.py 2012-03-13 10:09:50.000000000 +0000 @@ -240,6 +240,12 @@ if self['esmtp'] and self['hostname'] is None: raise usage.UsageError("--esmtp requires --hostname") + # If the --auth option was passed, this will be present -- otherwise, + # it won't be, which is also a perfectly valid state. + if 'credCheckers' in self: + for ch in self['credCheckers']: + self.service.smtpPortal.registerChecker(ch) + if not self['disable-anonymous']: self.service.smtpPortal.registerChecker(checkers.AllowAnonymousAccess()) diff -Nru twisted-mail-11.1.0/twisted/mail/test/test_options.py twisted-mail-12.1.0/twisted/mail/test/test_options.py --- twisted-mail-11.1.0/twisted/mail/test/test_options.py 2011-08-08 20:58:28.000000000 +0000 +++ twisted-mail-12.1.0/twisted/mail/test/test_options.py 2012-03-13 10:09:50.000000000 +0000 @@ -187,6 +187,20 @@ self.assertEqual("--esmtp requires --hostname", str(exc)) + def test_auth(self): + """ + Tests that the --auth option registers a checker. + """ + options = Options() + options.parseOptions(['--auth', 'memory:admin:admin:bob:password']) + self.assertEqual(len(options['credCheckers']), 1) + checker = options['credCheckers'][0] + interfaces = checker.credentialInterfaces + registered_checkers = options.service.smtpPortal.checkers + for iface in interfaces: + self.assertEqual(checker, registered_checkers[iface]) + + class SpyEndpoint(object): """ diff -Nru twisted-mail-11.1.0/twisted/mail/_version.py twisted-mail-12.1.0/twisted/mail/_version.py --- twisted-mail-11.1.0/twisted/mail/_version.py 2011-11-15 16:39:18.000000000 +0000 +++ twisted-mail-12.1.0/twisted/mail/_version.py 2012-06-02 07:04:01.000000000 +0000 @@ -1,3 +1,3 @@ # This is an auto-generated file. Do not edit it. from twisted.python import versions -version = versions.Version('twisted.mail', 11, 1, 0) +version = versions.Version('twisted.mail', 12, 1, 0)