Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Archlinux python26 2.6.9-8 package update to make it work with expat 2.2
From 8e92d83327b3df598a7be5431e810724d36bda3f Mon Sep 17 00:00:00 2001
From: Thomas Sarboni <tsarboni.ext@orange.com>
Date: Tue, 19 Jul 2016 11:01:11 +0200
Subject: [PATCH 1/1] Integrate expat 2.2 compatibility patch (issue 27369)
---
.SRCINFO | 6 ++++--
PKGBUILD | 11 ++++++++---
python-2.6-expat-2.2.patch | 11 +++++++++++
3 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 python-2.6-expat-2.2.patch
diff --git a/.SRCINFO b/.SRCINFO
index 810b4e3..04d6773 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu May 26 16:06:09 UTC 2016
+# Tue Jul 19 08:59:58 UTC 2016
pkgbase = python26
pkgdesc = Legacy version Python 2.6 of the high-level scripting language
pkgver = 2.6.9
- pkgrel = 8
+ pkgrel = 9
url = http://www.python.org/
changelog = ChangeLog
arch = i686
@@ -36,6 +36,7 @@ pkgbase = python26
source = python-2.6-ssl-nosslv3.patch
source = python-2.6-tkinter-86.patch
source = python-2.6-whichdb-gdbm-1.9.patch
+ source = python-2.6-expat-2.2.patch
sha256sums = cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41
sha256sums = 9fb0914357b43d4d6d5ea58ef7827cd0f5784792060e776dfa62d6e372b08f8e
sha256sums = e92e300ef7844478c53c37d7c05a27adc714d11106e79537da4b3b8ef039d6cb
@@ -50,6 +51,7 @@ pkgbase = python26
sha256sums = 15bcbd12b6b103db67d828dbf50e22965dc3037297a88616725188b6576d25bb
sha256sums = dbbc72d9c71c065fe3700af4322a130d5c5c459b6ee512f66e7e5eb9e4971171
sha256sums = e0dc2156ca821eaaada49cf5e1e301fc828215288aae648a6e7e4d4da1b38050
+ sha256sums = 1c1731c1a703844fad3de52b4378e2158c532442c67cfea3f8d6eecf7b7ce54f
pkgname = python26
diff --git a/PKGBUILD b/PKGBUILD
index c58ffe3..9e486d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=python26
pkgver=2.6.9
-pkgrel=8
+pkgrel=9
_pybasever=2.6
pkgdesc="Legacy version Python 2.6 of the high-level scripting language"
arch=('i686' 'x86_64' 'arm')
@@ -28,7 +28,8 @@ source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.xz
python-2.6-sqlite-test.patch
python-2.6-ssl-nosslv3.patch
python-2.6-tkinter-86.patch
- python-2.6-whichdb-gdbm-1.9.patch)
+ python-2.6-whichdb-gdbm-1.9.patch
+ python-2.6-expat-2.2.patch)
sha256sums=('cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41'
'9fb0914357b43d4d6d5ea58ef7827cd0f5784792060e776dfa62d6e372b08f8e'
'e92e300ef7844478c53c37d7c05a27adc714d11106e79537da4b3b8ef039d6cb'
@@ -42,7 +43,8 @@ sha256sums=('cae7bb995006ea5b703d9d28446f694894c441fe4bfb95d561c0ac908cd06e41'
'9c01e3bb264eaf6444b76ba6f5265d79bda234b5542fe3d2b478628412186c1e'
'15bcbd12b6b103db67d828dbf50e22965dc3037297a88616725188b6576d25bb'
'dbbc72d9c71c065fe3700af4322a130d5c5c459b6ee512f66e7e5eb9e4971171'
- 'e0dc2156ca821eaaada49cf5e1e301fc828215288aae648a6e7e4d4da1b38050')
+ 'e0dc2156ca821eaaada49cf5e1e301fc828215288aae648a6e7e4d4da1b38050'
+ '1c1731c1a703844fad3de52b4378e2158c532442c67cfea3f8d6eecf7b7ce54f')
prepare() {
cd "${srcdir}/Python-${pkgver}"
@@ -76,6 +78,9 @@ prepare() {
# http://bugs.python.org/issue13007
patch -Np1 -i ${srcdir}/python-2.6-whichdb-gdbm-1.9.patch
+ # http://bugs.python.org/issue27369
+ patch -Np0 -i ${srcdir}/python-2.6-expat-2.2.patch
+
# Ensure that we are using the system copy of various libraries
# (expat, zlib and libffi), rather than copies shipped in the tarball
rm -r Modules/expat
diff --git a/python-2.6-expat-2.2.patch b/python-2.6-expat-2.2.patch
new file mode 100644
index 0000000..7d23c8b
--- /dev/null
+++ b/python-2.6-expat-2.2.patch
@@ -0,0 +1,11 @@
+--- Lib/test/test_pyexpat.py 2013-10-29 16:04:38.000000000 +0100
++++ Lib/test/test_pyexpat.py 2016-07-18 15:53:08.772375096 +0200
+@@ -576,7 +576,7 @@
+ parser.Parse(xml, True)
+ self.fail()
+ except expat.ExpatError as e:
+- self.assertEquals(str(e), 'XML declaration not well-formed: line 1, column 14')
++ self.assertTrue(str(e).startswith('XML declaration not well-formed: line 1, column '))
+
+ def test_main():
+ run_unittest(SetAttributeTest,
--
2.9.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.