Date: Thursday, September 7, 2017 @ 21:35:15 Author: jgc Revision: 305020
archrelease: copy trunk to extra-i686, extra-x86_64 Added: libxml2/repos/extra-i686/PKGBUILD (from rev 305019, libxml2/trunk/PKGBUILD) libxml2/repos/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 305019, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) libxml2/repos/extra-x86_64/PKGBUILD (from rev 305019, libxml2/trunk/PKGBUILD) libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 305019, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) Deleted: libxml2/repos/extra-i686/PKGBUILD libxml2/repos/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch libxml2/repos/extra-x86_64/PKGBUILD libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch -----------------------------------------------------+ /PKGBUILD | 130 ++++++++++++++++++ /libxml2-2.9.4-remove-pyverify_fd.patch | 24 +++ extra-i686/PKGBUILD | 65 --------- extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch | 12 - extra-x86_64/PKGBUILD | 65 --------- extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch | 12 - 6 files changed, 154 insertions(+), 154 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-09-07 21:35:04 UTC (rev 305019) +++ extra-i686/PKGBUILD 2017-09-07 21:35:15 UTC (rev 305020) @@ -1,65 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: John Proctor <jproc...@prium.net> - -pkgname=libxml2 -pkgver=2.9.5rc2+0+g69936b12 -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=69936b129fedcda3514fee1a0d6b39521923cbac # tags/v2.9.5-rc2^0 -source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit - https://www.w3.org/XML/Test/xmlts20080827.tar.gz - libxml2-2.9.4-remove-pyverify_fd.patch) -sha256sums=('SKIP' - '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' - '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/extra-i686/PKGBUILD (from rev 305019, libxml2/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-09-07 21:35:15 UTC (rev 305020) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: John Proctor <jproc...@prium.net> + +pkgname=libxml2 +pkgver=2.9.5+6+g07e227ed +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=07e227ed00d0fb787c06cf03069b2904e692e770 # master +source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit + https://www.w3.org/XML/Test/xmlts20080827.tar.gz + libxml2-2.9.4-remove-pyverify_fd.patch) +sha256sums=('SKIP' + '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' + '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 +} Deleted: extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch =================================================================== --- extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-07 21:35:04 UTC (rev 305019) +++ extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-07 21:35:15 UTC (rev 305020) @@ -1,12 +0,0 @@ -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/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 305019, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) =================================================================== --- extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch (rev 0) +++ extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-07 21:35:15 UTC (rev 305020) @@ -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 + */ Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-09-07 21:35:04 UTC (rev 305019) +++ extra-x86_64/PKGBUILD 2017-09-07 21:35:15 UTC (rev 305020) @@ -1,65 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Maintainer: Tom Gundersen <t...@jklm.no> -# Contributor: John Proctor <jproc...@prium.net> - -pkgname=libxml2 -pkgver=2.9.5rc2+0+g69936b12 -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=69936b129fedcda3514fee1a0d6b39521923cbac # tags/v2.9.5-rc2^0 -source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit - https://www.w3.org/XML/Test/xmlts20080827.tar.gz - libxml2-2.9.4-remove-pyverify_fd.patch) -sha256sums=('SKIP' - '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' - '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/extra-x86_64/PKGBUILD (from rev 305019, libxml2/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-09-07 21:35:15 UTC (rev 305020) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Maintainer: Tom Gundersen <t...@jklm.no> +# Contributor: John Proctor <jproc...@prium.net> + +pkgname=libxml2 +pkgver=2.9.5+6+g07e227ed +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=07e227ed00d0fb787c06cf03069b2904e692e770 # master +source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit + https://www.w3.org/XML/Test/xmlts20080827.tar.gz + libxml2-2.9.4-remove-pyverify_fd.patch) +sha256sums=('SKIP' + '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' + '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 +} Deleted: extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch =================================================================== --- extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-07 21:35:04 UTC (rev 305019) +++ extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-07 21:35:15 UTC (rev 305020) @@ -1,12 +0,0 @@ -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/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (from rev 305019, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch) =================================================================== --- extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch (rev 0) +++ extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-07 21:35:15 UTC (rev 305020) @@ -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 + */