[arch-commits] Commit in libxml2/repos (6 files)
Jan de Groot
jgc at archlinux.org
Sun Oct 8 21:02:14 UTC 2017
Date: Sunday, October 8, 2017 @ 21:02:13
Author: jgc
Revision: 307163
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
libxml2/repos/testing-i686/
libxml2/repos/testing-i686/PKGBUILD
(from rev 307162, libxml2/trunk/PKGBUILD)
libxml2/repos/testing-i686/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 307162, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
libxml2/repos/testing-x86_64/
libxml2/repos/testing-x86_64/PKGBUILD
(from rev 307162, libxml2/trunk/PKGBUILD)
libxml2/repos/testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 307162, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
-------------------------------------------------------+
testing-i686/PKGBUILD | 65 ++++++++++++++++
testing-i686/libxml2-2.9.4-remove-pyverify_fd.patch | 12 ++
testing-x86_64/PKGBUILD | 65 ++++++++++++++++
testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch | 12 ++
4 files changed, 154 insertions(+)
Copied: libxml2/repos/testing-i686/PKGBUILD (from rev 307162, libxml2/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-10-08 21:02:13 UTC (rev 307163)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=libxml2
+pkgver=2.9.6+3+g5af594d8
+pkgrel=1
+pkgdesc="XML parsing library, version 2"
+arch=(i686 x86_64)
+license=('MIT')
+depends=('zlib' 'readline' 'ncurses' 'xz' 'icu')
+options=(!makeflags)
+makedepends=('python2' 'python' 'git')
+url="http://www.xmlsoft.org/"
+_commit=5af594d8bc55121ae454cba4d05793d1db7ff612 # master
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+ https://www.w3.org/XML/Test/xmlts20130923.tar.gz
+ libxml2-2.9.4-remove-pyverify_fd.patch)
+sha256sums=('SKIP'
+ '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
+ 'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9')
+
+pkgver() {
+ cd $pkgname
+ git describe --long | sed -e 's/-rc/rc/' -e 's/-/+/g' -e 's/^v//'
+}
+
+prepare() {
+ mkdir build-py3
+ mkdir build-py2
+ mv xmlconf build-py2/
+ cd $pkgname
+
+ patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd build-py2
+ ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 --with-icu
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+ make
+
+ cd ../build-py3
+ ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python --with-icu
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+ PYTHONHASHSEED=0 make
+}
+
+check() {
+ cd build-py2
+ make check
+}
+
+package() {
+ cd build-py2
+ find doc -type f -exec chmod 0644 {} \;
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+ cd ../build-py3/python
+ PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install
+}
Copied: libxml2/repos/testing-i686/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 307162, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===================================================================
--- testing-i686/libxml2-2.9.4-remove-pyverify_fd.patch (rev 0)
+++ testing-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-10-08 21:02:13 UTC (rev 307163)
@@ -0,0 +1,12 @@
+diff -Nur libxml2-2.9.4.orig/python/types.c libxml2-2.9.4/python/types.c
+--- libxml2-2.9.4.orig/python/types.c 2016-02-09 03:17:33.000000000 -0700
++++ libxml2-2.9.4/python/types.c 2016-12-21 12:34:06.755650986 -0700
+@@ -31,8 +31,6 @@
+ const char *mode;
+
+ fd = PyObject_AsFileDescriptor(f);
+- if (!_PyVerify_fd(fd))
+- return(NULL);
+ /*
+ * Get the flags on the fd to understand how it was opened
+ */
Copied: libxml2/repos/testing-x86_64/PKGBUILD (from rev 307162, libxml2/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-10-08 21:02:13 UTC (rev 307163)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Tom Gundersen <teg at jklm.no>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=libxml2
+pkgver=2.9.6+3+g5af594d8
+pkgrel=1
+pkgdesc="XML parsing library, version 2"
+arch=(i686 x86_64)
+license=('MIT')
+depends=('zlib' 'readline' 'ncurses' 'xz' 'icu')
+options=(!makeflags)
+makedepends=('python2' 'python' 'git')
+url="http://www.xmlsoft.org/"
+_commit=5af594d8bc55121ae454cba4d05793d1db7ff612 # master
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+ https://www.w3.org/XML/Test/xmlts20130923.tar.gz
+ libxml2-2.9.4-remove-pyverify_fd.patch)
+sha256sums=('SKIP'
+ '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
+ 'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9')
+
+pkgver() {
+ cd $pkgname
+ git describe --long | sed -e 's/-rc/rc/' -e 's/-/+/g' -e 's/^v//'
+}
+
+prepare() {
+ mkdir build-py3
+ mkdir build-py2
+ mv xmlconf build-py2/
+ cd $pkgname
+
+ patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd build-py2
+ ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2 --with-icu
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+ make
+
+ cd ../build-py3
+ ../$pkgname/configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python --with-icu
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+ PYTHONHASHSEED=0 make
+}
+
+check() {
+ cd build-py2
+ make check
+}
+
+package() {
+ cd build-py2
+ find doc -type f -exec chmod 0644 {} \;
+
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+ cd ../build-py3/python
+ PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install
+}
Copied: libxml2/repos/testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 307162, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===================================================================
--- testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (rev 0)
+++ testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-10-08 21:02:13 UTC (rev 307163)
@@ -0,0 +1,12 @@
+diff -Nur libxml2-2.9.4.orig/python/types.c libxml2-2.9.4/python/types.c
+--- libxml2-2.9.4.orig/python/types.c 2016-02-09 03:17:33.000000000 -0700
++++ libxml2-2.9.4/python/types.c 2016-12-21 12:34:06.755650986 -0700
+@@ -31,8 +31,6 @@
+ const char *mode;
+
+ fd = PyObject_AsFileDescriptor(f);
+- if (!_PyVerify_fd(fd))
+- return(NULL);
+ /*
+ * Get the flags on the fd to understand how it was opened
+ */
More information about the arch-commits
mailing list