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

[Allan McRae]

    Date: Friday, October 2, 2009 @ 21:25:20
  Author: allan
Revision: 53612

Merged revisions 53611 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/python/trunk

........
  r53611 | allan | 2009-10-03 11:24:19 +1000 (Sat, 03 Oct 2009) | 2 lines
  
  upgpkg: python 2.6.3-1
      upstream update
........

Modified:
  python/repos/testing-x86_64/	(properties)
  python/repos/testing-x86_64/PKGBUILD
Deleted:
  python/repos/testing-x86_64/ChangeLog
  python/repos/testing-x86_64/python-2.6-smtplib.patch

--------------------------+
 ChangeLog                |   34 ----------------------------------
 PKGBUILD                 |    9 +++------
 python-2.6-smtplib.patch |   17 -----------------
 3 files changed, 3 insertions(+), 57 deletions(-)


Property changes on: python/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /python/trunk:1-53108
   + /python/trunk:1-53611

Deleted: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2009-10-03 01:24:19 UTC (rev 53611)
+++ testing-x86_64/ChangeLog	2009-10-03 01:25:20 UTC (rev 53612)
@@ -1,34 +0,0 @@
-2009-07-20  Allan McRae <allan at archlinux.org>
-	* python 2.6.2-5
-	* add patch to fix readline completion support
-	  with readline 6.0
-
-2009-07-13  Allan McRae <allan at archlinux.org>
-	* python 2.6.2-4
-	* use our CFLAGS (FS#15336)
-	* remove explict readline dep 
-	  (covered by versioned sqlite3)
-
-2009-06-19  Tobias Powalowski <tpowa at archlinux.org>
-	* python 2.6.2-3
-	* rebuild for readline 6.0
-
-2009-06-06  Allan McRae <allan at archlinux.org>
-	* python 2.6.2-2
-	* add fix for smtplib (FS#14915)
-
-2009-04-17  Allan McRae <allan at archlinux.org>
-	* python 2.6.2-1
-	* upstream update
-	* add expat and sqlite3 dependencies
-	* remove python-2.5 compatibility site path
-
-2008-12-07  Allan McRae <allan at archlinux.org>
-	* python 2.6.1-1
-	* upstream update
-	* fix gdbm related build error
-	* fix modulator/pynche launchers
-
-2008-10-27  Allan McRae <allan at archlinux.org>
-	* python 2.6-2
-	* patched to use internal expat

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-10-03 01:24:19 UTC (rev 53611)
+++ testing-x86_64/PKGBUILD	2009-10-03 01:25:20 UTC (rev 53612)
@@ -3,8 +3,8 @@
 # Contributer: Jason Chu <jason at archlinux.org>
 
 pkgname=python
-pkgver=2.6.2
-pkgrel=6
+pkgver=2.6.3
+pkgrel=1
 _pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -18,14 +18,12 @@
 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
 	python-2.6-readline.patch
 	modulator-launcher
 	pynche-launcher)
-md5sums=('245db9f1e0f09ab7e0faaa0cf7301011'
+md5sums=('8755fc03075b1701ca3f13932e6ade9f'
          '993800dbcc0c4f199c1ceee998a06e71'
          '13fab4bb2cacbc433e62d7191a17f71e'
-         'c38d58521acfb6eec0c3d3c5ad38410a'
          '1f0aed8b96d4531f40fd3e24a80157a5'
          'b4a531570415280dc406c8d5c1fa8d83'
          '9f731b9033db285132a3524fb36409e7')
@@ -35,7 +33,6 @@
 
   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
   patch -Np0 -i ${srcdir}/python-2.6-readline.patch
 
   export OPT="${CFLAGS}"

Deleted: testing-x86_64/python-2.6-smtplib.patch
===================================================================
--- testing-x86_64/python-2.6-smtplib.patch	2009-10-03 01:24:19 UTC (rev 53611)
+++ testing-x86_64/python-2.6-smtplib.patch	2009-10-03 01:25:20 UTC (rev 53612)
@@ -1,17 +0,0 @@
-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")