[arch-commits] Commit in python/repos (4 files)

[Allan McRae]

    Date: Saturday, June 6, 2009 @ 08:06:55
  Author: allan
Revision: 41675

Merged revisions 36174,41674 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/python/trunk

........
  r36174 | allan | 2009-04-20 18:04:39 +1000 (Mon, 20 Apr 2009) | 1 line
  
  add a symlink to help some packages find the shared library
........
  r41674 | allan | 2009-06-06 22:05:40 +1000 (Sat, 06 Jun 2009) | 2 lines
  
  upgpkg: python 2.6.2-2
      fix smtplib (FS#14915)
........

Added:
  python/repos/extra-i686/python-2.6-smtplib.patch
    (from rev 41674, python/trunk/python-2.6-smtplib.patch)
Modified:
  python/repos/extra-i686/	(properties)
  python/repos/extra-i686/ChangeLog
  python/repos/extra-i686/PKGBUILD

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


Property changes on: python/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /python/trunk:1-35911
   + /python/trunk:1-41674

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-06-06 12:05:40 UTC (rev 41674)
+++ extra-i686/ChangeLog	2009-06-06 12:06:55 UTC (rev 41675)
@@ -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: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-06 12:05:40 UTC (rev 41674)
+++ extra-i686/PKGBUILD	2009-06-06 12:06:55 UTC (rev 41675)
@@ -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
 
@@ -41,6 +44,9 @@
   ln -sf python${_pybasever} ${pkgdir}/usr/bin/python
   ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2
 
+  ln -sf ../../libpython${_pybasever}.so \
+    ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+
   # Install the tools
   #modulator
   sed -i "s#%%PYBASEVER%%#${_pybasever}#" ${srcdir}/modulator-launcher

Copied: python/repos/extra-i686/python-2.6-smtplib.patch (from rev 41674, python/trunk/python-2.6-smtplib.patch)
===================================================================
--- extra-i686/python-2.6-smtplib.patch	                        (rev 0)
+++ extra-i686/python-2.6-smtplib.patch	2009-06-06 12:06:55 UTC (rev 41675)
@@ -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")