[arch-commits] Commit in libxml2/repos (3 files)

2020-04-27 Thread Evangelos Foutras via arch-commits 
Date: Monday, April 27, 2020 @ 08:17:13
  Author: foutrelis
Revision: 381664

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 381663, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
(from rev 381663, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)

+
 PKGBUILD   |   68 +++
 libxml2-2.9.8-python3-unicode-errors.patch |   34 +
 2 files changed, 102 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 381663, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-04-27 08:17:13 UTC (rev 381664)
@@ -0,0 +1,68 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.10
+pkgrel=2
+pkgdesc='XML parsing library, version 2'
+url='http://www.xmlsoft.org/'
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=41a34e1f4ffae2ce401600dbb5fe43f8fe402641  # tags/v2.9.10^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
+libxml2-2.9.8-python3-unicode-errors.patch
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --always --tags | sed 
's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+  cd $pkgname
+
+  # From https://src.fedoraproject.org/rpms/libxml2/tree/master
+  patch -Np1 -i ../libxml2-2.9.8-python3-unicode-errors.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch 
(from rev 381663, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
===
--- staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   2020-04-27 
08:17:13 UTC (rev 381664)
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===
+--- libxml2-2.9.5.orig/python/libxml.c
 libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+   str[999] = 0;
+ va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++/* Ensure the error string doesn't start at UTF8 continuation. */
++while (*ptr && (*ptr & 0xc0) == 0x80)
++ptr++;
++#endif
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-message = libxml_charPtrConstWrap(str);
++message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++/* Forget any errors caused in the error handler. */
++PyErr_Clear();
+ Py_XDECREF(list);
+ Py_XDECREF(result);
+ }

[arch-commits] Commit in libxml2/repos (3 files)

2019-11-21 Thread Antonio Rojas via arch-commits 
Date: Thursday, November 21, 2019 @ 20:49:52
  Author: arojas
Revision: 369577

archrelease: copy trunk to testing-x86_64

Added:
  libxml2/repos/testing-x86_64/
  libxml2/repos/testing-x86_64/PKGBUILD
(from rev 369576, libxml2/trunk/PKGBUILD)
  libxml2/repos/testing-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
(from rev 369576, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)

+
 PKGBUILD   |   68 +++
 libxml2-2.9.8-python3-unicode-errors.patch |   34 +
 2 files changed, 102 insertions(+)

Copied: libxml2/repos/testing-x86_64/PKGBUILD (from rev 369576, 
libxml2/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2019-11-21 20:49:52 UTC (rev 369577)
@@ -0,0 +1,68 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.10
+pkgrel=1
+pkgdesc='XML parsing library, version 2'
+url='http://www.xmlsoft.org/'
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=41a34e1f4ffae2ce401600dbb5fe43f8fe402641  # tags/v2.9.10^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
+libxml2-2.9.8-python3-unicode-errors.patch
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --always --tags | sed 
's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+  cd $pkgname
+
+  # From https://src.fedoraproject.org/rpms/libxml2/tree/master
+  patch -Np1 -i ../libxml2-2.9.8-python3-unicode-errors.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Copied: libxml2/repos/testing-x86_64/libxml2-2.9.8-python3-unicode-errors.patch 
(from rev 369576, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
===
--- testing-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   
(rev 0)
+++ testing-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   2019-11-21 
20:49:52 UTC (rev 369577)
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===
+--- libxml2-2.9.5.orig/python/libxml.c
 libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+   str[999] = 0;
+ va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++/* Ensure the error string doesn't start at UTF8 continuation. */
++while (*ptr && (*ptr & 0xc0) == 0x80)
++ptr++;
++#endif
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-message = libxml_charPtrConstWrap(str);
++message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++/* Forget any errors caused in the error handler. */
++PyErr_Clear();
+ Py_XDECREF(list);
+ Py_XDECREF(result);
+ }

[arch-commits] Commit in libxml2/repos (3 files)

2019-11-11 Thread Evangelos Foutras via arch-commits 
Date: Monday, November 11, 2019 @ 21:21:00
  Author: foutrelis
Revision: 367763

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 367762, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
(from rev 367762, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)

+
 PKGBUILD   |   68 +++
 libxml2-2.9.8-python3-unicode-errors.patch |   34 +
 2 files changed, 102 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 367762, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-11-11 21:21:00 UTC (rev 367763)
@@ -0,0 +1,68 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.9
+pkgrel=6
+pkgdesc='XML parsing library, version 2'
+url='http://www.xmlsoft.org/'
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=f8a8c1f59db355b46962577e7b74f1a1e8149dc6  # tags/v2.9.9^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
+libxml2-2.9.8-python3-unicode-errors.patch
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --always --tags | sed 
's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+  cd $pkgname
+
+  # From https://src.fedoraproject.org/rpms/libxml2/tree/master
+  patch -Np1 -i ../libxml2-2.9.8-python3-unicode-errors.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch 
(from rev 367762, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
===
--- staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   2019-11-11 
21:21:00 UTC (rev 367763)
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===
+--- libxml2-2.9.5.orig/python/libxml.c
 libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+   str[999] = 0;
+ va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++/* Ensure the error string doesn't start at UTF8 continuation. */
++while (*ptr && (*ptr & 0xc0) == 0x80)
++ptr++;
++#endif
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-message = libxml_charPtrConstWrap(str);
++message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++/* Forget any errors caused in the error handler. */
++PyErr_Clear();
+ Py_XDECREF(list);
+ Py_XDECREF(result);
+ }

[arch-commits] Commit in libxml2/repos (3 files)

2019-10-25 Thread Evangelos Foutras via arch-commits 
Date: Friday, October 25, 2019 @ 15:44:05
  Author: foutrelis
Revision: 365640

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 365639, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch
(from rev 365639, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)

+
 PKGBUILD   |   68 +++
 libxml2-2.9.8-python3-unicode-errors.patch |   34 +
 2 files changed, 102 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 365639, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-25 15:44:05 UTC (rev 365640)
@@ -0,0 +1,68 @@
+# Maintainer: Levente Polyak 
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.9
+pkgrel=4
+pkgdesc='XML parsing library, version 2'
+url='http://www.xmlsoft.org/'
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=f8a8c1f59db355b46962577e7b74f1a1e8149dc6  # tags/v2.9.9^0
+source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit";
+libxml2-2.9.8-python3-unicode-errors.patch
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --always --tags | sed 
's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+  cd $pkgname
+
+  # From https://src.fedoraproject.org/rpms/libxml2/tree/master
+  patch -Np1 -i ../libxml2-2.9.8-python3-unicode-errors.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim: ts=2 sw=2 et:

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch 
(from rev 365639, libxml2/trunk/libxml2-2.9.8-python3-unicode-errors.patch)
===
--- staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.8-python3-unicode-errors.patch   2019-10-25 
15:44:05 UTC (rev 365640)
@@ -0,0 +1,34 @@
+Index: libxml2-2.9.5/python/libxml.c
+===
+--- libxml2-2.9.5.orig/python/libxml.c
 libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++unsigned char *ptr = (unsigned char *)str;
+ 
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+   str[999] = 0;
+ va_end(ap);
+ 
++#if PY_MAJOR_VERSION >= 3
++/* Ensure the error string doesn't start at UTF8 continuation. */
++while (*ptr && (*ptr & 0xc0) == 0x80)
++ptr++;
++#endif
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+-message = libxml_charPtrConstWrap(str);
++message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
++/* Forget any errors caused in the error handler. */
++PyErr_Clear();
+ Py_XDECREF(list);
+ Py_XDECREF(result);
+ }

[arch-commits] Commit in libxml2/repos (3 files)

2019-01-10 Thread Evangelos Foutras via arch-commits 
Date: Thursday, January 10, 2019 @ 16:12:05
  Author: foutrelis
Revision: 343511

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 343510, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 343510, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

+
 PKGBUILD   |   62 +++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 ++
 2 files changed, 74 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 343510, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-01-10 16:12:05 UTC (rev 343511)
@@ -0,0 +1,62 @@
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.8
+pkgrel=7
+pkgdesc="XML parsing library, version 2"
+url="http://www.xmlsoft.org/";
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=18890f471c420411aa3c989e104d090966ec9dbf  # tags/v2.9.8^0
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+
+  cd $pkgname
+  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 build-py2/COPYING
+}

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 
(from rev 343510, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===
--- staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   2019-01-10 
16:12:05 UTC (rev 343511)
@@ -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.0 -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
+  */

[arch-commits] Commit in libxml2/repos (3 files)

2018-10-22 Thread Andreas Radke via arch-commits 
Date: Monday, October 22, 2018 @ 14:41:09
  Author: andyrtr
Revision: 337000

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 336999, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 336999, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

+
 PKGBUILD   |   62 +++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 ++
 2 files changed, 74 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 336999, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-10-22 14:41:09 UTC (rev 337000)
@@ -0,0 +1,62 @@
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.8
+pkgrel=6
+pkgdesc="XML parsing library, version 2"
+url="http://www.xmlsoft.org/";
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=18890f471c420411aa3c989e104d090966ec9dbf  # tags/v2.9.8^0
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+
+  cd $pkgname
+  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 build-py2/COPYING
+}

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 
(from rev 336999, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===
--- staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   2018-10-22 
14:41:09 UTC (rev 337000)
@@ -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.0 -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
+  */

[arch-commits] Commit in libxml2/repos (3 files)

2018-08-06 Thread Felix Yan via arch-commits 
Date: Monday, August 6, 2018 @ 15:27:37
  Author: felixonmars
Revision: 330979

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 330978, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 330978, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

+
 PKGBUILD   |   61 +++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 ++
 2 files changed, 73 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 330978, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-06 15:27:37 UTC (rev 330979)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.8
+pkgrel=4
+pkgdesc="XML parsing library, version 2"
+url="http://www.xmlsoft.org/";
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=18890f471c420411aa3c989e104d090966ec9dbf  # tags/v2.9.8^0
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 build-py2/COPYING
+}

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 
(from rev 330978, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===
--- staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   2018-08-06 
15:27:37 UTC (rev 330979)
@@ -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.0 -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
+  */

[arch-commits] Commit in libxml2/repos (3 files)

2018-06-30 Thread Felix Yan via arch-commits 
Date: Saturday, June 30, 2018 @ 18:26:14
  Author: felixonmars
Revision: 327884

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 327883, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 327883, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

+
 PKGBUILD   |   61 +++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 ++
 2 files changed, 73 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 327883, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-06-30 18:26:14 UTC (rev 327884)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.8
+pkgrel=3
+pkgdesc="XML parsing library, version 2"
+url="http://www.xmlsoft.org/";
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=18890f471c420411aa3c989e104d090966ec9dbf  # tags/v2.9.8^0
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 build-py2/COPYING
+}

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 
(from rev 327883, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===
--- staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   2018-06-30 
18:26:14 UTC (rev 327884)
@@ -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.0 -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
+  */

[arch-commits] Commit in libxml2/repos (3 files)

2018-03-27 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, March 27, 2018 @ 20:46:54
  Author: foutrelis
Revision: 320400

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 320399, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 320399, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

+
 PKGBUILD   |   61 +++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 ++
 2 files changed, 73 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 320399, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-03-27 20:46:54 UTC (rev 320400)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.8
+pkgrel=2
+pkgdesc="XML parsing library, version 2"
+url="http://www.xmlsoft.org/";
+arch=(x86_64)
+license=(MIT)
+depends=(zlib readline ncurses xz icu)
+makedepends=(python2 python git)
+_commit=18890f471c420411aa3c989e104d090966ec9dbf  # tags/v2.9.8^0
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
+sha256sums=('SKIP'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+}
+
+prepare() {
+  mkdir build-py{2,3}
+
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+_build() (
+  cd build-py$1
+  ../$pkgname/configure \
+--prefix=/usr \
+--with-threads \
+--with-history \
+--with-python=/usr/bin/python$1 \
+--with-icu
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
+
+build() {
+  _build 2
+  _build 3
+}
+
+check() {
+  cd build-py2
+  ln -s ../xmlconf
+  make check
+}
+
+package() {
+  make -C build-py2 DESTDIR="$pkgdir" install
+  make -C build-py3/python DESTDIR="$pkgdir" install
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 build-py2/COPYING
+}

Copied: libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 
(from rev 320399, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===
--- staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   2018-03-27 
20:46:54 UTC (rev 320400)
@@ -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.0 -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
+  */

[arch-commits] Commit in libxml2/repos (3 files)

2017-11-12 Thread Evangelos Foutras 
Date: Sunday, November 12, 2017 @ 11:53:54
  Author: foutrelis
Revision: 309594

archrelease: copy trunk to staging-x86_64

Added:
  libxml2/repos/staging-x86_64/
  libxml2/repos/staging-x86_64/PKGBUILD
(from rev 309593, libxml2/trunk/PKGBUILD)
  libxml2/repos/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 309593, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

+
 PKGBUILD   |   65 +++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 +
 2 files changed, 77 insertions(+)

Copied: libxml2/repos/staging-x86_64/PKGBUILD (from rev 309593, 
libxml2/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-11-12 11:53:54 UTC (rev 309594)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Maintainer: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.7+4+g72182550
+pkgrel=2
+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=72182550926d31ad17357bd3ed69e49d7e69df02  # master~7
+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/staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch 
(from rev 309593, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)
===
--- staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   
(rev 0)
+++ staging-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch   2017-11-12 
11:53:54 UTC (rev 309594)
@@ -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.0 -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
+  */

[arch-commits] Commit in libxml2/repos (3 files)

2017-11-09 Thread Jan de Groot 
Date: Thursday, November 9, 2017 @ 21:47:22
  Author: jgc
Revision: 309341

archrelease: copy trunk to testing-x86_64

Added:
  libxml2/repos/testing-x86_64/
  libxml2/repos/testing-x86_64/PKGBUILD
(from rev 309340, libxml2/trunk/PKGBUILD)
  libxml2/repos/testing-x86_64/libxml2-2.9.4-remove-pyverify_fd.patch
(from rev 309340, libxml2/trunk/libxml2-2.9.4-remove-pyverify_fd.patch)

+
 PKGBUILD   |   65 +++
 libxml2-2.9.4-remove-pyverify_fd.patch |   12 +
 2 files changed, 77 insertions(+)

Copied: libxml2/repos/testing-x86_64/PKGBUILD (from rev 309340, 
libxml2/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-11-09 21:47:22 UTC (rev 309341)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Maintainer: Tom Gundersen 
+# Contributor: John Proctor 
+
+pkgname=libxml2
+pkgver=2.9.7+4+g72182550
+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=72182550926d31ad17357bd3ed69e49d7e69df02  # master~7
+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 309340, 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-11-09 
21:47:22 UTC (rev 309341)
@@ -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.0 -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
+  */

[arch-commits] Commit in libxml2/repos (3 files)

2009-11-05 Thread Ionut Biru 
Date: Thursday, November 5, 2009 @ 14:35:39
  Author: ibiru
Revision: 58182

Merged revisions 58140 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libxml2/trunk


  r58140 | jgc | 2009-11-04 14:06:09 +0200 (Wed, 04 Nov 2009) | 1 line
  
  Update to 2.7.6 - remove old security patch, integrated upstream


Modified:
  libxml2/repos/extra-i686/ (properties)
  libxml2/repos/extra-i686/PKGBUILD
Deleted:
  libxml2/repos/extra-i686/libxml2-2.7.3-ficora-parse.patch

--+
 PKGBUILD |   13 +--
 libxml2-2.7.3-ficora-parse.patch |  159 -
 2 files changed, 5 insertions(+), 167 deletions(-)


Property changes on: libxml2/repos/extra-i686
___
Modified: svnmerge-integrated
   - /libxml2/trunk:1-49695
   + /libxml2/trunk:1-58181

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-11-05 19:33:54 UTC (rev 58181)
+++ extra-i686/PKGBUILD 2009-11-05 19:35:39 UTC (rev 58182)
@@ -3,8 +3,8 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.7.3
-pkgrel=3
+pkgver=2.7.6
+pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('custom')
@@ -13,16 +13,13 @@
 options=('!libtool')
 url="http://www.xmlsoft.org/";
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-largefile64.patch
-libxml2-2.7.3-ficora-parse.patch)
-md5sums=('8f4fda3969237c2a33bdb1583b5d06b2'
- '5ad4915665608ebfa5b89f7908467a72'
- 'e4ed4ef08a941d44d053f5418945fc5d')
+largefile64.patch)
+md5sums=('7740a8ec23878a2f50120e1faa2730f2'
+ '5ad4915665608ebfa5b89f7908467a72')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/largefile64.patch" || return 1
-  patch -Np1 -i "${srcdir}/libxml2-2.7.3-ficora-parse.patch" || return 1
   ./configure --prefix=/usr --with-threads --with-history || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: extra-i686/libxml2-2.7.3-ficora-parse.patch
===
--- extra-i686/libxml2-2.7.3-ficora-parse.patch 2009-11-05 19:33:54 UTC (rev 
58181)
+++ extra-i686/libxml2-2.7.3-ficora-parse.patch 2009-11-05 19:35:39 UTC (rev 
58182)
@@ -1,159 +0,0 @@
-diff --git a/parser.c b/parser.c
-index a476060..b404722 100644
 a/parser.c
-+++ b/parser.c
-@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
-   if (name == NULL) {
-   xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
-  "Name expected in NOTATION declaration\n");
--  return(ret);
-+xmlFreeEnumeration(ret);
-+  return(NULL);
-   }
-   tmp = ret;
-   while (tmp != NULL) {
-@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
-   }
-   if (tmp == NULL) {
-   cur = xmlCreateEnumeration(name);
--  if (cur == NULL) return(ret);
-+  if (cur == NULL) {
-+xmlFreeEnumeration(ret);
-+return(NULL);
-+}
-   if (last == NULL) ret = last = cur;
-   else {
-   last->next = cur;
-@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
- } while (RAW == '|');
- if (RAW != ')') {
-   xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
--  if ((last != NULL) && (last != ret))
--  xmlFreeEnumeration(last);
--  return(ret);
-+xmlFreeEnumeration(ret);
-+  return(NULL);
- }
- NEXT;
- return(ret);
-@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
-   cur = xmlCreateEnumeration(name);
-   if (!xmlDictOwns(ctxt->dict, name))
-   xmlFree(name);
--  if (cur == NULL) return(ret);
-+  if (cur == NULL) {
-+xmlFreeEnumeration(ret);
-+return(NULL);
-+}
-   if (last == NULL) ret = last = cur;
-   else {
-   last->next = cur;
-@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, 
int inputchk) {
- }
- 
- /**
-- * xmlParseElementChildrenContentDecl:
-+ * xmlParseElementChildrenContentDeclPriv:
-  * @ctxt:  an XML parser context
-  * @inputchk:  the input used for the current entity, needed for boundary 
checks
-+ * @depth: the level of recursion
-  *
-  * parse the declaration for a Mixed Element content
-  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
-@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, 
int inputchk) {
-  * Returns the tree of xmlElementContentPtr describing the element 
-  *  hierarchy.
-  */
--xmlElementContentPtr
--xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
-+static xmlElementContentPtr
-+xmlP

[arch-commits] Commit in libxml2/repos (3 files)

2009-11-04 Thread Jan de Groot 
Date: Wednesday, November 4, 2009 @ 07:06:34
  Author: jgc
Revision: 58141

Merged revisions 58140 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libxml2/trunk


  r58140 | jgc | 2009-11-04 13:06:09 +0100 (Wed, 04 Nov 2009) | 1 line
  
  Update to 2.7.6 - remove old security patch, integrated upstream


Modified:
  libxml2/repos/extra-x86_64/   (properties)
  libxml2/repos/extra-x86_64/PKGBUILD
Deleted:
  libxml2/repos/extra-x86_64/libxml2-2.7.3-ficora-parse.patch

--+
 PKGBUILD |   13 +--
 libxml2-2.7.3-ficora-parse.patch |  159 -
 2 files changed, 5 insertions(+), 167 deletions(-)


Property changes on: libxml2/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /libxml2/trunk:1-49694
   + /libxml2/trunk:1-58140

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-11-04 12:06:09 UTC (rev 58140)
+++ extra-x86_64/PKGBUILD   2009-11-04 12:06:34 UTC (rev 58141)
@@ -3,8 +3,8 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.7.3
-pkgrel=3
+pkgver=2.7.6
+pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('custom')
@@ -13,16 +13,13 @@
 options=('!libtool')
 url="http://www.xmlsoft.org/";
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-largefile64.patch
-libxml2-2.7.3-ficora-parse.patch)
-md5sums=('8f4fda3969237c2a33bdb1583b5d06b2'
- '5ad4915665608ebfa5b89f7908467a72'
- 'e4ed4ef08a941d44d053f5418945fc5d')
+largefile64.patch)
+md5sums=('7740a8ec23878a2f50120e1faa2730f2'
+ '5ad4915665608ebfa5b89f7908467a72')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/largefile64.patch" || return 1
-  patch -Np1 -i "${srcdir}/libxml2-2.7.3-ficora-parse.patch" || return 1
   ./configure --prefix=/usr --with-threads --with-history || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: extra-x86_64/libxml2-2.7.3-ficora-parse.patch
===
--- extra-x86_64/libxml2-2.7.3-ficora-parse.patch   2009-11-04 12:06:09 UTC 
(rev 58140)
+++ extra-x86_64/libxml2-2.7.3-ficora-parse.patch   2009-11-04 12:06:34 UTC 
(rev 58141)
@@ -1,159 +0,0 @@
-diff --git a/parser.c b/parser.c
-index a476060..b404722 100644
 a/parser.c
-+++ b/parser.c
-@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
-   if (name == NULL) {
-   xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
-  "Name expected in NOTATION declaration\n");
--  return(ret);
-+xmlFreeEnumeration(ret);
-+  return(NULL);
-   }
-   tmp = ret;
-   while (tmp != NULL) {
-@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
-   }
-   if (tmp == NULL) {
-   cur = xmlCreateEnumeration(name);
--  if (cur == NULL) return(ret);
-+  if (cur == NULL) {
-+xmlFreeEnumeration(ret);
-+return(NULL);
-+}
-   if (last == NULL) ret = last = cur;
-   else {
-   last->next = cur;
-@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) {
- } while (RAW == '|');
- if (RAW != ')') {
-   xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
--  if ((last != NULL) && (last != ret))
--  xmlFreeEnumeration(last);
--  return(ret);
-+xmlFreeEnumeration(ret);
-+  return(NULL);
- }
- NEXT;
- return(ret);
-@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) {
-   cur = xmlCreateEnumeration(name);
-   if (!xmlDictOwns(ctxt->dict, name))
-   xmlFree(name);
--  if (cur == NULL) return(ret);
-+  if (cur == NULL) {
-+xmlFreeEnumeration(ret);
-+return(NULL);
-+}
-   if (last == NULL) ret = last = cur;
-   else {
-   last->next = cur;
-@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, 
int inputchk) {
- }
- 
- /**
-- * xmlParseElementChildrenContentDecl:
-+ * xmlParseElementChildrenContentDeclPriv:
-  * @ctxt:  an XML parser context
-  * @inputchk:  the input used for the current entity, needed for boundary 
checks
-+ * @depth: the level of recursion
-  *
-  * parse the declaration for a Mixed Element content
-  * The leading '(' and spaces have been skipped in xmlParseElementContentDecl
-@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, 
int inputchk) {
-  * Returns the tree of xmlElementContentPtr describing the element 
-  *  hierarchy.
-  */
--xmlElementContentPtr
--xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputch