[arch-commits] Commit in twisted/trunk (4771.diff PKGBUILD)

[Ionut Biru]

    Date: Wednesday, December 29, 2010 @ 11:36:54
  Author: ibiru
Revision: 104136

upgpkg: twisted 10.2.0-2
fix crasher in pyicqt. FS#22224

Added:
  twisted/trunk/4771.diff
Modified:
  twisted/trunk/PKGBUILD

-----------+
 4771.diff |   22 ++++++++++++++++++++++
 PKGBUILD  |   10 +++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

Added: 4771.diff
===================================================================
--- 4771.diff	                        (rev 0)
+++ 4771.diff	2010-12-29 16:36:54 UTC (rev 104136)
@@ -0,0 +1,22 @@
+Index: twisted/words/protocols/jabber/jstrports.py
+===================================================================
+--- twisted/words/protocols/jabber/jstrports.py (revision 30346)
++++ twisted/words/protocols/jabber/jstrports.py (working copy)
+@@ -6,7 +6,7 @@
+ """ A temporary placeholder for client-capable strports, until we
+ sufficient use cases get identified """
+ 
+-from twisted.application import strports
++from twisted.internet.endpoints import _parse
+ 
+ def _parseTCPSSL(factory, domain, port):
+     """ For the moment, parse TCP or SSL connections the same """
+@@ -22,7 +22,7 @@
+ 
+ 
+ def parse(description, factory):
+-    args, kw = strports._parse(description)
++    args, kw = _parse(description)
+     return (args[0].upper(),) + _funcs[args[0]](factory, *args[1:], **kw)
+ 
+ def client(description, factory):

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-29 16:34:39 UTC (rev 104135)
+++ PKGBUILD	2010-12-29 16:36:54 UTC (rev 104136)
@@ -5,7 +5,7 @@
 
 pkgname=twisted
 pkgver=10.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/"
@@ -14,10 +14,14 @@
 optdepends=('pyopenssl'
             'python-soappy:for twisted.web.soap')
 install=twisted.install
-source=(http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2)
-md5sums=('73da62c793269eade8121da336b01ba5')
+source=(http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2
+        4771.diff)
+md5sums=('73da62c793269eade8121da336b01ba5'
+         '087ed6149abca43919dcece24ba222ab')
 build() {
   cd "${srcdir}/Twisted-${pkgver}"
+  #http://twistedmatrix.com/trac/ticket/4771
+  patch -Np0 -i ${srcdir}/4771.diff
 
   python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"