[arch-commits] Commit in libxml2/repos (10 files)
Jan de Groot
jgc at archlinux.org
Fri Sep 1 13:50:30 UTC 2017
Date: Friday, September 1, 2017 @ 13:50:28
Author: jgc
Revision: 304426
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libxml2/repos/extra-i686/PKGBUILD
(from rev 304425, libxml2/trunk/PKGBUILD)
libxml2/repos/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 304425, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
libxml2/repos/extra-x86_64/PKGBUILD
(from rev 304425, libxml2/trunk/PKGBUILD)
libxml2/repos/extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 304425, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
Deleted:
libxml2/repos/extra-i686/PKGBUILD
libxml2/repos/extra-i686/bug786267.patch
libxml2/repos/extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch
libxml2/repos/extra-x86_64/PKGBUILD
libxml2/repos/extra-x86_64/bug786267.patch
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 | 72 ---------
extra-i686/bug786267.patch | 15 --
extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch | 12 -
extra-x86_64/PKGBUILD | 72 ---------
extra-x86_64/bug786267.patch | 15 --
extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch | 12 -
8 files changed, 154 insertions(+), 198 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-09-01 13:50:20 UTC (rev 304425)
+++ extra-i686/PKGBUILD 2017-09-01 13:50:28 UTC (rev 304426)
@@ -1,72 +0,0 @@
-# $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.4+99+g27f310d4
-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=27f310d453b7e2e71847e5910a0961753aacdbd1 # 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
- bug786267.patch)
-sha256sums=('SKIP'
- '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7'
- 'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9'
- 'aca462fd71cec83cc8a98ccfc4065ab68167aab2a148cf7db39596a20f4a7ca7')
-
-pkgver() {
- cd $pkgname
- git describe --long | sed -e 's/-/+/g' -e 's/^v//'
-}
-
-prepare() {
- mkdir build-py3
- mkdir build-py2
- mv xmlconf build-py2/
- cd $pkgname
-
- # https://bugs.archlinux.org/task/54828
- git revert -n 79c8a6b10593c709fd3ceea9deef35c1a3da70f0
- # https://bugs.archlinux.org/task/55134
- patch -Np1 -i ../bug786267.patch
-
- 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 304425, libxml2/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-09-01 13:50:28 UTC (rev 304426)
@@ -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.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
+}
Deleted: extra-i686/bug786267.patch
===================================================================
--- extra-i686/bug786267.patch 2017-09-01 13:50:20 UTC (rev 304425)
+++ extra-i686/bug786267.patch 2017-09-01 13:50:28 UTC (rev 304426)
@@ -1,15 +0,0 @@
---- a/parserInternals.c
-+++ a/parserInternals.c
-@@ -1235,7 +1235,11 @@ xmlSwitchInputEncodingInt(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
- input->buf->rawconsumed += use - xmlBufUse(input->buf->raw);
- }
- return (0);
-- } else {
-+ } else if (input->length == 0) {
-+ /*
-+ * When parsing a static memory array one must know the
-+ * size to be able to convert the buffer.
-+ */
- xmlErrInternal(ctxt, "switching encoding : no input\n", NULL);
- return (-1);
- }
Deleted: extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch
===================================================================
--- extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-01 13:50:20 UTC (rev 304425)
+++ extra-i686/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-01 13:50:28 UTC (rev 304426)
@@ -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 304425, 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-01 13:50:28 UTC (rev 304426)
@@ -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-01 13:50:20 UTC (rev 304425)
+++ extra-x86_64/PKGBUILD 2017-09-01 13:50:28 UTC (rev 304426)
@@ -1,72 +0,0 @@
-# $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.4+99+g27f310d4
-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=27f310d453b7e2e71847e5910a0961753aacdbd1 # 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
- bug786267.patch)
-sha256sums=('SKIP'
- '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7'
- 'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9'
- 'aca462fd71cec83cc8a98ccfc4065ab68167aab2a148cf7db39596a20f4a7ca7')
-
-pkgver() {
- cd $pkgname
- git describe --long | sed -e 's/-/+/g' -e 's/^v//'
-}
-
-prepare() {
- mkdir build-py3
- mkdir build-py2
- mv xmlconf build-py2/
- cd $pkgname
-
- # https://bugs.archlinux.org/task/54828
- git revert -n 79c8a6b10593c709fd3ceea9deef35c1a3da70f0
- # https://bugs.archlinux.org/task/55134
- patch -Np1 -i ../bug786267.patch
-
- 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 304425, libxml2/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-09-01 13:50:28 UTC (rev 304426)
@@ -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.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
+}
Deleted: extra-x86_64/bug786267.patch
===================================================================
--- extra-x86_64/bug786267.patch 2017-09-01 13:50:20 UTC (rev 304425)
+++ extra-x86_64/bug786267.patch 2017-09-01 13:50:28 UTC (rev 304426)
@@ -1,15 +0,0 @@
---- a/parserInternals.c
-+++ a/parserInternals.c
-@@ -1235,7 +1235,11 @@ xmlSwitchInputEncodingInt(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
- input->buf->rawconsumed += use - xmlBufUse(input->buf->raw);
- }
- return (0);
-- } else {
-+ } else if (input->length == 0) {
-+ /*
-+ * When parsing a static memory array one must know the
-+ * size to be able to convert the buffer.
-+ */
- xmlErrInternal(ctxt, "switching encoding : no input\n", NULL);
- return (-1);
- }
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-01 13:50:20 UTC (rev 304425)
+++ extra-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 2017-09-01 13:50:28 UTC (rev 304426)
@@ -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 304425, 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-01 13:50:28 UTC (rev 304426)
@@ -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