[arch-commits] Commit in python/trunk (ChangeLog PKGBUILD python-2.6-smtplib.patch)

[Allan McRae]

    Date: Saturday, June 6, 2009 @ 08:05:40
  Author: allan
Revision: 41674

upgpkg: python 2.6.2-2
    fix smtplib (FS#14915)

Added:
  python/trunk/python-2.6-smtplib.patch
Modified:
  python/trunk/ChangeLog
  python/trunk/PKGBUILD

--------------------------+
 ChangeLog                |    4 ++++
 PKGBUILD                 |    5 ++++-
 python-2.6-smtplib.patch |   17 +++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-06-06 11:39:31 UTC (rev 41673)
+++ ChangeLog	2009-06-06 12:05:40 UTC (rev 41674)
@@ -1,3 +1,7 @@
+2009-06-06  Allan McRae <allan at archlinux.org>
+	* python 2.6.2-1
+	* add fix for smtplib (FS#14915)
+
 2009-04-17  Allan McRae <allan at archlinux.org>
 	* python 2.6.2-1
 	* upstream update

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-06 11:39:31 UTC (rev 41673)
+++ PKGBUILD	2009-06-06 12:05:40 UTC (rev 41674)
@@ -4,7 +4,7 @@
 
 pkgname=python
 pkgver=2.6.2
-pkgrel=1
+pkgrel=2
 _pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -18,11 +18,13 @@
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
 	python-2.6-internal-expat.patch
 	python-2.6-gdbm.patch
+	python-2.6-smtplib.patch
 	modulator-launcher
 	pynche-launcher)
 md5sums=('245db9f1e0f09ab7e0faaa0cf7301011'
          '993800dbcc0c4f199c1ceee998a06e71'
          '13fab4bb2cacbc433e62d7191a17f71e'
+         'c38d58521acfb6eec0c3d3c5ad38410a'
          'b4a531570415280dc406c8d5c1fa8d83'
          '9f731b9033db285132a3524fb36409e7')
 
@@ -31,6 +33,7 @@
 
   patch -Np0 -i ${srcdir}/python-2.6-internal-expat.patch
   patch -Np1 -i ${srcdir}/python-2.6-gdbm.patch
+  patch -Np0 -i ${srcdir}/python-2.6-smtplib.patch
 
   ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode
 

Added: python-2.6-smtplib.patch
===================================================================
--- python-2.6-smtplib.patch	                        (rev 0)
+++ python-2.6-smtplib.patch	2009-06-06 12:05:40 UTC (rev 41674)
@@ -0,0 +1,17 @@
+Index: Lib/smtplib.py
+===================================================================
+--- Lib/smtplib.py      (revision 72551)
++++ Lib/smtplib.py      (working copy)
+@@ -751,9 +751,10 @@
+
+         def _get_socket(self, host, port, timeout):
+             if self.debuglevel > 0: print>>stderr, 'connect:', (host, port)
+-            self.sock = socket.create_connection((host, port), timeout)
+-            self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)
+-            self.file = SSLFakeFile(self.sock)
++            new_socket = socket.create_connection((host, port), timeout)
++            new_socket = ssl.wrap_socket(new_socket, self.keyfile, self.certfile)
++            self.file = SSLFakeFile(new_socket)
++            return new_socket
+
+     __all__.append("SMTP_SSL")