[arch-commits] Commit in libxml2/trunk (PKGBUILD libxml2-2.9.10-icu68.patch)

2020-12-18 Thread Evangelos Foutras via arch-commits 
Date: Saturday, December 19, 2020 @ 04:46:38
  Author: foutrelis
Revision: 404518

upgpkg: libxml2 2.9.10-8: icu 68.2 rebuild

Added:
  libxml2/trunk/libxml2-2.9.10-icu68.patch
Modified:
  libxml2/trunk/PKGBUILD

+
 PKGBUILD   |6 +-
 libxml2-2.9.10-icu68.patch |   28 
 2 files changed, 33 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-19 04:04:06 UTC (rev 404517)
+++ PKGBUILD2020-12-19 04:46:38 UTC (rev 404518)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.10
-pkgrel=7
+pkgrel=8
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)
@@ -21,6 +21,7 @@
 libxml2-2.9.10-parenthesize-type-checks.patch
 libxml2-2.9.10-CVE-2020-24977.patch
 libxml2-2.9.10-fix-integer-overflow.patch
+libxml2-2.9.10-icu68.patch
 https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
 sha256sums=('SKIP'
 '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
@@ -30,6 +31,7 @@
 'b63c161e4c8a6f0a65ba091c3d3ed09d3110d21f997ee61077c782b311fd4b33'
 '62eafffc2b4949489c261c63883d27c2e83d688f1d4c899000b283e4c2a682be'
 'fd227780ad5699bebca7ef412d2d50fb1d21a54f6e3fdcad0bda5bdc8f8b2525'
+'f02a435761f26ff664041d49f9d05924dc627bf103c7f542feee891f69aa84a2'
 '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
 
 pkgver() {
@@ -50,6 +52,8 @@
   patch -Np1 -i ../libxml2-2.9.10-CVE-2020-24977.patch
   patch -Np1 -i ../libxml2-2.9.10-fix-integer-overflow.patch
 
+  patch -Np1 -i ../libxml2-2.9.10-icu68.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }
 

Added: libxml2-2.9.10-icu68.patch
===
--- libxml2-2.9.10-icu68.patch  (rev 0)
+++ libxml2-2.9.10-icu68.patch  2020-12-19 04:46:38 UTC (rev 404518)
@@ -0,0 +1,28 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert 
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca44..264f60bb 100644
+--- a/encoding.c
 b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, 
unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+ else if (handler->uconv_out != NULL) {
+ ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+-  TRUE);
++  1);
+ }
+ #endif /* LIBXML_ICU_ENABLED */
+ else {
+-- 
+GitLab
+

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2020-11-11 Thread Jan de Groot via arch-commits 
Date: Wednesday, November 11, 2020 @ 15:13:00
  Author: jgc
Revision: 400393

upgpkg: libxml2 2.9.10-7: Another python3.9 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 15:10:50 UTC (rev 400392)
+++ PKGBUILD2020-11-11 15:13:00 UTC (rev 400393)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.10
-pkgrel=6
+pkgrel=7
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2020-11-11 Thread Evangelos Foutras via arch-commits 
Date: Wednesday, November 11, 2020 @ 10:43:54
  Author: foutrelis
Revision: 400312

upgpkg: libxml2 2.9.10-5: Python 3.9 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-11 10:43:21 UTC (rev 400311)
+++ PKGBUILD2020-11-11 10:43:54 UTC (rev 400312)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.10
-pkgrel=4
+pkgrel=5
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

icu 67.1 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-27 08:14:23 UTC (rev 381662)
+++ PKGBUILD2020-04-27 08:17:10 UTC (rev 381663)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

Update to 2.9.10

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-21 20:12:49 UTC (rev 369575)
+++ PKGBUILD2019-11-21 20:49:32 UTC (rev 369576)
@@ -4,8 +4,8 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.9
-pkgrel=6
+pkgver=2.9.10
+pkgrel=1
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)
@@ -12,7 +12,7 @@
 license=(MIT)
 depends=(zlib readline ncurses xz icu)
 makedepends=(python2 python git)
-_commit=f8a8c1f59db355b46962577e7b74f1a1e8149dc6  # tags/v2.9.9^0
+_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)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2019-11-11 Thread Evangelos Foutras via arch-commits 
Date: Monday, November 11, 2019 @ 21:20:55
  Author: foutrelis
Revision: 367762

icu 65.1 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-11 19:24:37 UTC (rev 367761)
+++ PKGBUILD2019-11-11 21:20:55 UTC (rev 367762)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.9
-pkgrel=5
+pkgrel=6
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2019-10-31 Thread Evangelos Foutras via arch-commits 
Date: Thursday, October 31, 2019 @ 17:56:07
  Author: foutrelis
Revision: 366274

Python 3.8 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-31 17:55:56 UTC (rev 366273)
+++ PKGBUILD2019-10-31 17:56:07 UTC (rev 366274)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.9
-pkgrel=4
+pkgrel=5
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

Python 3.8 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-25 15:43:50 UTC (rev 365638)
+++ PKGBUILD2019-10-25 15:44:00 UTC (rev 365639)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.9
-pkgrel=3
+pkgrel=4
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2019-04-05 Thread Felix Yan via arch-commits 
Date: Friday, April 5, 2019 @ 10:36:01
  Author: felixonmars
Revision: 349846

icu 64.1 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-05 06:02:24 UTC (rev 349845)
+++ PKGBUILD2019-04-05 10:36:01 UTC (rev 349846)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.9
-pkgrel=1
+pkgrel=2
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2019-01-22 Thread Levente Polyak via arch-commits 
Date: Wednesday, January 23, 2019 @ 00:10:50
  Author: anthraxx
Revision: 344593

upgpkg: libxml2 2.9.9-1

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-22 23:11:37 UTC (rev 344592)
+++ PKGBUILD2019-01-23 00:10:50 UTC (rev 344593)
@@ -1,18 +1,19 @@
+# Maintainer: Levente Polyak 
 # Maintainer: Jan de Groot 
 # Contributor: Tom Gundersen 
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.8
-pkgrel=8
-pkgdesc="XML parsing library, version 2"
-url="http://www.xmlsoft.org/;
+pkgver=2.9.9
+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=18890f471c420411aa3c989e104d090966ec9dbf  # tags/v2.9.8^0
-source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
+_commit=f8a8c1f59db355b46962577e7b74f1a1e8149dc6  # tags/v2.9.9^0
+source=("git+https://git.gnome.org/browse/libxml2#commit=$_commit;
 https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
 sha256sums=('SKIP'
 '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
@@ -19,15 +20,12 @@
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+  git describe --always --tags | sed 
's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
   mkdir build-py{2,3}
-
   cd $pkgname
-  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -58,5 +56,7 @@
 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
+  install -Dm 644 build-py2/COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
 }
+
+# vim: ts=2 sw=2 et:

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2019-01-10 Thread Felix Yan via arch-commits 
Date: Thursday, January 10, 2019 @ 23:48:57
  Author: felixonmars
Revision: 343533

Readline 8.0 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-10 23:48:14 UTC (rev 343532)
+++ PKGBUILD2019-01-10 23:48:57 UTC (rev 343533)
@@ -4,7 +4,7 @@
 
 pkgname=libxml2
 pkgver=2.9.8
-pkgrel=7
+pkgrel=8
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/;
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2019-01-10 Thread Evangelos Foutras via arch-commits 
Date: Thursday, January 10, 2019 @ 16:11:59
  Author: foutrelis
Revision: 343510

Readline 8.0 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-10 16:10:28 UTC (rev 343509)
+++ PKGBUILD2019-01-10 16:11:59 UTC (rev 343510)
@@ -4,7 +4,7 @@
 
 pkgname=libxml2
 pkgver=2.9.8
-pkgrel=6
+pkgrel=7
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/;
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

upgpkg: libxml2 2.9.8-6

icu 63.1 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 14:28:49 UTC (rev 336998)
+++ PKGBUILD2018-10-22 14:41:00 UTC (rev 336999)
@@ -4,7 +4,7 @@
 
 pkgname=libxml2
 pkgver=2.9.8
-pkgrel=5
+pkgrel=6
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/;
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2018-10-11 Thread Jan de Groot via arch-commits 
Date: Thursday, October 11, 2018 @ 21:45:26
  Author: jgc
Revision: 336400

Replace patch from git.gnome.org with a cherry-pick command

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-11 19:29:28 UTC (rev 336399)
+++ PKGBUILD2018-10-11 21:45:26 UTC (rev 336400)
@@ -13,11 +13,9 @@
 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
-
CVE-2018-9251.patch::https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch)
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
 sha256sums=('SKIP'
-'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
-'d534592b690798ea0eb8ff9b9e1b6ea82d9e3761f7717bbdf277c68ee73271cb')
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
 
 pkgver() {
   cd $pkgname
@@ -28,7 +26,7 @@
   mkdir build-py{2,3}
 
   cd $pkgname
-  patch -Np1 -i ${srcdir}/CVE-2018-9251.patch
+  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
 
   NOCONFIGURE=1 ./autogen.sh
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2018-09-26 Thread Jelle van der Waa via arch-commits 
Date: Wednesday, September 26, 2018 @ 11:14:20
  Author: jelle
Revision: 335418

upgpkg: libxml2 2.9.8-5

Patch libxml2 for CVE-2018-9251

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-26 11:02:31 UTC (rev 335417)
+++ PKGBUILD2018-09-26 11:14:20 UTC (rev 335418)
@@ -4,7 +4,7 @@
 
 pkgname=libxml2
 pkgver=2.9.8
-pkgrel=4
+pkgrel=5
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/;
 arch=(x86_64)
@@ -13,9 +13,11 @@
 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)
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz
+
CVE-2018-9251.patch::https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch)
 sha256sums=('SKIP'
-'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
+'d534592b690798ea0eb8ff9b9e1b6ea82d9e3761f7717bbdf277c68ee73271cb')
 
 pkgver() {
   cd $pkgname
@@ -26,6 +28,8 @@
   mkdir build-py{2,3}
 
   cd $pkgname
+  patch -Np1 -i ${srcdir}/CVE-2018-9251.patch
+
   NOCONFIGURE=1 ./autogen.sh
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

icu 62.1 / poppler 0.67.0 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-06 15:17:49 UTC (rev 330977)
+++ PKGBUILD2018-08-06 15:27:22 UTC (rev 330978)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.8
-pkgrel=3
+pkgrel=4
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/;
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2018-06-30 Thread Felix Yan via arch-commits 
Date: Saturday, June 30, 2018 @ 18:25:59
  Author: felixonmars
Revision: 327883

Python 3.7 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-30 18:17:54 UTC (rev 327882)
+++ PKGBUILD2018-06-30 18:25:59 UTC (rev 327883)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.8
-pkgrel=2
+pkgrel=3
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/;
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

icu 61.1 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-27 19:54:39 UTC (rev 320398)
+++ PKGBUILD2018-03-27 20:46:40 UTC (rev 320399)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.8
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/;
 arch=(x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2018-03-08 Thread Jan Steffens via arch-commits 
Date: Thursday, March 8, 2018 @ 18:37:38
  Author: heftig
Revision: 318254

2.9.8-1

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   66 -
 1 file changed, 31 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-08 18:18:48 UTC (rev 318253)
+++ PKGBUILD2018-03-08 18:37:38 UTC (rev 318254)
@@ -1,65 +1,61 @@
 # $Id$
 # Maintainer: Jan de Groot 
-# Maintainer: Tom Gundersen 
+# Contributor: Tom Gundersen 
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.7+4+g72182550
-pkgrel=2
+pkgver=2.9.8
+pkgrel=1
 pkgdesc="XML parsing library, version 2"
+url="http://www.xmlsoft.org/;
 arch=(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
+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
-libxml2-2.9.4-remove-pyverify_fd.patch)
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
 sha256sums=('SKIP'
-'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
-'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9')
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
 
 pkgver() {
   cd $pkgname
-  git describe --long | sed -e 's/-rc/rc/' -e 's/-/+/g' -e 's/^v//'
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
 }
 
 prepare() {
-  mkdir build-py3
-  mkdir build-py2
-  mv xmlconf build-py2/
+  mkdir build-py{2,3}
+
   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
+_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
-  make
+  PYTHONHASHSEED=0 make
+  find doc -type f -exec chmod 0644 {} +
+)
 
-  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
+build() {
+  _build 2
+  _build 3
 }
 
 check() {
   cd build-py2
+  ln -s ../xmlconf
   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
+  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
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

icu 60.1 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-12 11:10:12 UTC (rev 309592)
+++ PKGBUILD2017-11-12 11:53:47 UTC (rev 309593)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.7+4+g72182550
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

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

upgpkg: libxml2 2.9.7+4+g72182550-1

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-09 21:43:24 UTC (rev 309339)
+++ PKGBUILD2017-11-09 21:47:16 UTC (rev 309340)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.6+3+g5af594d8
+pkgver=2.9.7+4+g72182550
 pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-_commit=5af594d8bc55121ae454cba4d05793d1db7ff612  # master
+_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)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2017-10-08 Thread Jan de Groot 
Date: Sunday, October 8, 2017 @ 21:02:04
  Author: jgc
Revision: 307162

upgpkg: libxml2 2.9.6+3+g5af594d8-1

Update testsuite (FS#55567)

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-08 20:58:09 UTC (rev 307161)
+++ PKGBUILD2017-10-08 21:02:04 UTC (rev 307162)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.5+6+g07e227ed
+pkgver=2.9.6+3+g5af594d8
 pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
@@ -13,12 +13,12 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-_commit=07e227ed00d0fb787c06cf03069b2904e692e770  # master
+_commit=5af594d8bc55121ae454cba4d05793d1db7ff612  # master
 source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
-https://www.w3.org/XML/Test/xmlts20080827.tar.gz
+https://www.w3.org/XML/Test/xmlts20130923.tar.gz
 libxml2-2.9.4-remove-pyverify_fd.patch)
 sha256sums=('SKIP'
-'96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7'
+'9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
 'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9')
 
 pkgver() {

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2017-09-07 Thread Jan de Groot 
Date: Thursday, September 7, 2017 @ 21:35:04
  Author: jgc
Revision: 305019

upgpkg: libxml2 2.9.5+6+g07e227ed-1

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-07 21:24:46 UTC (rev 305018)
+++ PKGBUILD2017-09-07 21:35:04 UTC (rev 305019)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.5rc2+0+g69936b12
+pkgver=2.9.5+6+g07e227ed
 pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-_commit=69936b129fedcda3514fee1a0d6b39521923cbac  # tags/v2.9.5-rc2^0
+_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)

[arch-commits] Commit in libxml2/trunk (PKGBUILD bug786267.patch)

2017-09-01 Thread Jan de Groot 
Date: Friday, September 1, 2017 @ 13:50:20
  Author: jgc
Revision: 304425

upgpkg: libxml2 2.9.5rc2+0+g69936b12-1

Update to git master, includes final fix for FS#54828

Modified:
  libxml2/trunk/PKGBUILD
Deleted:
  libxml2/trunk/bug786267.patch

-+
 PKGBUILD|   17 +
 bug786267.patch |   15 ---
 2 files changed, 5 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-01 06:02:18 UTC (rev 304424)
+++ PKGBUILD2017-09-01 13:50:20 UTC (rev 304425)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.4+99+g27f310d4
+pkgver=2.9.5rc2+0+g69936b12
 pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
@@ -13,19 +13,17 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-_commit=27f310d453b7e2e71847e5910a0961753aacdbd1  # master
+_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
-bug786267.patch)
+libxml2-2.9.4-remove-pyverify_fd.patch)
 sha256sums=('SKIP'
 '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7'
-'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9'
-'aca462fd71cec83cc8a98ccfc4065ab68167aab2a148cf7db39596a20f4a7ca7')
+'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9')
 
 pkgver() {
   cd $pkgname
-  git describe --long | sed -e 's/-/+/g' -e 's/^v//'
+  git describe --long | sed -e 's/-rc/rc/' -e 's/-/+/g' -e 's/^v//'
 }
 
 prepare() {
@@ -34,11 +32,6 @@
   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
 }

Deleted: bug786267.patch
===
--- bug786267.patch 2017-09-01 06:02:18 UTC (rev 304424)
+++ bug786267.patch 2017-09-01 13:50:20 UTC (rev 304425)
@@ -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);
- }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2017-07-09 Thread Jan de Groot 
Date: Sunday, July 9, 2017 @ 21:51:46
  Author: jgc
Revision: 299929

upgpkg: libxml2 2.9.4+96+gfb56f80e-1

Update to latest snapshot, includes some security bugfixes

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-09 12:16:57 UTC (rev 299928)
+++ PKGBUILD2017-07-09 21:51:46 UTC (rev 299929)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.4+91+g872fea94
+pkgver=2.9.4+96+gfb56f80e
 pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-_commit=872fea9485bd715aeccdaef64cda8a4cc05bd9c5  # master
+_commit=fb56f80eeffde4b79a49667c3f0727181d57aeb3  # 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)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2017-06-28 Thread Jan de Groot 
Date: Wednesday, June 28, 2017 @ 22:08:56
  Author: jgc
Revision: 299382

upgpkg: libxml2 2.9.4+91+g872fea94-1

Update to latest git snapshot. Fixes quite some memleaks, NULL pointer 
dereferences and also FS#54482

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-28 22:01:00 UTC (rev 299381)
+++ PKGBUILD2017-06-28 22:08:56 UTC (rev 299382)
@@ -4,8 +4,8 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.4+16+g07418011
-pkgrel=2
+pkgver=2.9.4+91+g872fea94
+pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
@@ -13,7 +13,7 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-_commit=074180119fc90d5fd04ef9e8a5ee1910d6f9ad8e  # master
+_commit=872fea9485bd715aeccdaef64cda8a4cc05bd9c5  # 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)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2017-04-24 Thread Andreas Radke 
Date: Monday, April 24, 2017 @ 14:53:53
  Author: andyrtr
Revision: 294551

upgpkg: libxml2 2.9.4+16+g07418011-2

icu rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-24 14:32:14 UTC (rev 294550)
+++ PKGBUILD2017-04-24 14:53:53 UTC (rev 294551)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.4+16+g07418011
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2017-04-22 Thread Jan de Groot 
Date: Saturday, April 22, 2017 @ 13:01:07
  Author: jgc
Revision: 293917

upgpkg: libxml2 2.9.4+16+g07418011-1

Build with icu support, update git snapshot

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-22 13:00:17 UTC (rev 293916)
+++ PKGBUILD2017-04-22 13:01:07 UTC (rev 293917)
@@ -4,22 +4,22 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.4+12+ge905f081
-pkgrel=5
+pkgver=2.9.4+16+g07418011
+pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
-depends=('zlib' 'readline' 'ncurses' 'xz')
+depends=('zlib' 'readline' 'ncurses' 'xz' 'icu')
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-_commit=e905f08123e4a6e7731549e6f09dadff4cab65bd  # master
-source=(git://git.gnome.org/libxml2#commit=$_commit
+_commit=074180119fc90d5fd04ef9e8a5ee1910d6f9ad8e  # 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)
-md5sums=('SKIP'
- 'ae3d1ebe000a3972afa104ca7f0e1b4a'
- '0fcbf80989e6aa1f974465226259e818')
+libxml2-2.9.4-remove-pyverify_fd.patch)
+sha256sums=('SKIP'
+'96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7'
+'c201b0d6364a7b9df58ce40a5fc506e58945a3fbb834af9c1193a35665789d60')
 
 pkgver() {
   cd $pkgname
@@ -37,12 +37,12 @@
 
 build() {
   cd build-py2
-  ../$pkgname/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python2
+  ../$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
+  ../$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
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-12-24 Thread Bartłomiej Piotrowski 
Date: Saturday, December 24, 2016 @ 12:24:24
  Author: bpiotrowski
Revision: 284626

Python 3.6 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 12:16:43 UTC (rev 284625)
+++ PKGBUILD2016-12-24 12:24:24 UTC (rev 284626)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.4+12+ge905f081
-pkgrel=3
+pkgrel=4
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-12-24 Thread Evangelos Foutras 
Date: Saturday, December 24, 2016 @ 12:14:58
  Author: foutrelis
Revision: 284623

Fix pkgver so pkgrel doesn't get reset by makepkg

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 11:49:41 UTC (rev 284622)
+++ PKGBUILD2016-12-24 12:14:58 UTC (rev 284623)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.4+12+ge905f08
+pkgver=2.9.4+12+ge905f081
 pkgrel=3
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-12-24 Thread Evangelos Foutras 
Date: Saturday, December 24, 2016 @ 11:35:31
  Author: foutrelis
Revision: 284620

Python 3.6 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-24 11:34:56 UTC (rev 284619)
+++ PKGBUILD2016-12-24 11:35:31 UTC (rev 284620)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.4+12+ge905f08
-pkgrel=2
+pkgrel=3
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-11-07 Thread Bartłomiej Piotrowski 
Date: Monday, November 7, 2016 @ 12:02:00
  Author: bpiotrowski
Revision: 280028

readline 7.0 rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-07 11:04:46 UTC (rev 280027)
+++ PKGBUILD2016-11-07 12:02:00 UTC (rev 280028)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.4+12+ge905f08
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-10-31 Thread Jan de Groot 
Date: Monday, October 31, 2016 @ 21:50:02
  Author: jgc
Revision: 279547

upgpkg: libxml2 2.9.4+12+ge905f08-1

Fix some security issues

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-31 21:13:33 UTC (rev 279546)
+++ PKGBUILD2016-10-31 21:50:02 UTC (rev 279547)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.4+4+g3169602
+pkgver=2.9.4+12+ge905f08
 pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
@@ -13,7 +13,8 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-source=('git://git.gnome.org/libxml2#commit=3169602058bd2d04913909e869c61d1540bc7fb4'
+_commit=e905f08123e4a6e7731549e6f09dadff4cab65bd  # master
+source=(git://git.gnome.org/libxml2#commit=$_commit
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
 md5sums=('SKIP'
  'ae3d1ebe000a3972afa104ca7f0e1b4a')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-08-31 Thread Jan de Groot 
Date: Wednesday, August 31, 2016 @ 08:48:38
  Author: jgc
Revision: 275595

upgpkg: libxml2 2.9.4+4+g3169602-1

Update to git snapshot, fixes FS#50600 and a possible NULL-pointer dereference

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-31 08:43:49 UTC (rev 275594)
+++ PKGBUILD2016-08-31 08:48:38 UTC (rev 275595)
@@ -4,8 +4,8 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.4+0+gbdec218
-pkgrel=2
+pkgver=2.9.4+4+g3169602
+pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
@@ -13,7 +13,7 @@
 options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-source=('git://git.gnome.org/libxml2#commit=bdec2183f34b37ee89ae1d330c6ad2bb4d76605f'
+source=('git://git.gnome.org/libxml2#commit=3169602058bd2d04913909e869c61d1540bc7fb4'
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
 md5sums=('SKIP'
  'ae3d1ebe000a3972afa104ca7f0e1b4a')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-05-25 Thread Jan de Groot 
Date: Wednesday, May 25, 2016 @ 17:12:24
  Author: jgc
Revision: 268551

upgpkg: libxml2 2.9.4+0+gbdec218-2

Package main package from build-py2
Run testsuite from build-py2
Disable makeflags because python bindings are generated multiple times in 
parallel
Add PYTHONHASHSEED hack to make python 3 bindings reproducible

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-25 08:02:13 UTC (rev 268550)
+++ PKGBUILD2016-05-25 15:12:24 UTC (rev 268551)
@@ -5,11 +5,12 @@
 
 pkgname=libxml2
 pkgver=2.9.4+0+gbdec218
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
+options=(!makeflags)
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
 
source=('git://git.gnome.org/libxml2#commit=bdec2183f34b37ee89ae1d330c6ad2bb4d76605f'
@@ -25,7 +26,7 @@
 prepare() {
   mkdir build-py3
   mkdir build-py2
-  mv xmlconf build-py3/
+  mv xmlconf build-py2/
   cd $pkgname
   NOCONFIGURE=1 ./autogen.sh
 }
@@ -39,21 +40,21 @@
   cd ../build-py3
   ../$pkgname/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
-  make
+  PYTHONHASHSEED=0 make
 }
 
 check() {
-  cd build-py3
+  cd build-py2
   make check
 }
 
 package() {
-  cd build-py3
+  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-py2/python
-  make DESTDIR="${pkgdir}" install
+  cd ../build-py3/python
+  PYTHONHASHSEED=0 make DESTDIR="${pkgdir}" install
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-05-23 Thread Jan de Groot 
Date: Monday, May 23, 2016 @ 14:39:29
  Author: jgc
Revision: 268504

upgpkg: libxml2 2.9.4+0+gbdec218-1

Update to 2.9.4, keep PKGBUILD in git-style as upstream fixes a lot of bugs and 
does not release often

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-23 08:30:40 UTC (rev 268503)
+++ PKGBUILD2016-05-23 12:39:29 UTC (rev 268504)
@@ -4,7 +4,7 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.3+14+gd5bd2a9
+pkgver=2.9.4+0+gbdec218
 pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 depends=('zlib' 'readline' 'ncurses' 'xz')
 makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-source=('git://git.gnome.org/libxml2#commit=d5bd2a9a'
+source=('git://git.gnome.org/libxml2#commit=bdec2183f34b37ee89ae1d330c6ad2bb4d76605f'
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
 md5sums=('SKIP'
  'ae3d1ebe000a3972afa104ca7f0e1b4a')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-04-12 Thread Jan de Groot 
Date: Tuesday, April 12, 2016 @ 10:34:15
  Author: jgc
Revision: 264697

upgpkg: libxml2 2.9.3+14+gd5bd2a9-1

Update to git snapshot, includes a security fix and should fix python3 bindings

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-12 08:03:30 UTC (rev 264696)
+++ PKGBUILD2016-04-12 08:34:15 UTC (rev 264697)
@@ -4,34 +4,40 @@
 # Contributor: John Proctor 
 
 pkgname=libxml2
-pkgver=2.9.3
-pkgrel=2
+pkgver=2.9.3+14+gd5bd2a9
+pkgrel=1
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
-makedepends=('python2' 'python')
+makedepends=('python2' 'python' 'git')
 url="http://www.xmlsoft.org/;
-source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=('git://git.gnome.org/libxml2#commit=d5bd2a9a'
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
-md5sums=('daece17e045f1c107610e137ab50c179'
+md5sums=('SKIP'
  'ae3d1ebe000a3972afa104ca7f0e1b4a')
 
+pkgver() {
+  cd $pkgname
+  git describe --long | sed -e 's/-/+/g' -e 's/^v//'
+}
+
 prepare() {
   mkdir build-py3
   mkdir build-py2
   mv xmlconf build-py3/
-  cd ${pkgname}-${pkgver}
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd build-py2
-  ../$pkgname-$pkgver/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python2
+  ../$pkgname/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python2
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
   make
 
   cd ../build-py3
-  ../$pkgname-$pkgver/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python
+  ../$pkgname/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
   make
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2016-03-24 Thread Jan de Groot 
Date: Friday, March 25, 2016 @ 01:06:42
  Author: jgc
Revision: 262508

upgpkg: libxml2 2.9.3-2

Add python 3.x bindings

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   30 +++---
 1 file changed, 19 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-24 23:12:26 UTC (rev 262507)
+++ PKGBUILD2016-03-25 00:06:42 UTC (rev 262508)
@@ -5,13 +5,12 @@
 
 pkgname=libxml2
 pkgver=2.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
-makedepends=('python2')
-optdepends=('python2: python bindings to libxml')
+makedepends=('python2' 'python')
 url="http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
@@ -19,27 +18,36 @@
  'ae3d1ebe000a3972afa104ca7f0e1b4a')
 
 prepare() {
+  mkdir build-py3
+  mkdir build-py2
+  mv xmlconf build-py3/
   cd ${pkgname}-${pkgver}
-  sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 
's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
-  mv ../xmlconf .
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python2
+  cd build-py2
+  ../$pkgname-$pkgver/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python2
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  make
 
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test 
"$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/  
func_append compile_command " -Wl,-O1,--as-needed"\n  func_append 
finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
+  cd ../build-py3
+  ../$pkgname-$pkgver/configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
   make
 }
 
 check() {
-  cd ${pkgname}-${pkgver}
+  cd build-py3
   make check
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd build-py3
+  find doc -type f -exec chmod 0644 {} \;
+
   make DESTDIR="${pkgdir}" install
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+  cd ../build-py2/python
+  make DESTDIR="${pkgdir}" install
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2014-10-24 Thread Dave Reisner 
Date: Friday, October 24, 2014 @ 22:17:38
  Author: dreisner
Revision: 225297

upgpkg: libxml2 2.9.2-1

- add optdepend on python2
- resolve CVE-2014-3660 (FS#40790)

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-24 19:22:57 UTC (rev 225296)
+++ PKGBUILD2014-10-24 20:17:38 UTC (rev 225297)
@@ -4,17 +4,18 @@
 # Contributor: John Proctor jproc...@prium.net
 
 pkgname=libxml2
-pkgver=2.9.1
-pkgrel=5
+pkgver=2.9.2
+pkgrel=1
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
 makedepends=('python2')
+optdepends=('python2: python bindings to libxml')
 url=http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
-md5sums=('9c0cfef285d5c4a5c80d00904ddab380'
+md5sums=('9e6a9aca9d155737868b3dc5fd82f788'
  'ae3d1ebe000a3972afa104ca7f0e1b4a')
 
 prepare() {

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2013-11-04 Thread Jan Steffens 
Date: Monday, November 4, 2013 @ 15:24:49
  Author: heftig
Revision: 198785

strip bad python3 module again. let's try again, next version

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 3 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-04 13:57:55 UTC (rev 198784)
+++ PKGBUILD2013-11-04 14:24:49 UTC (rev 198785)
@@ -5,12 +5,12 @@
 
 pkgname=libxml2
 pkgver=2.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
-makedepends=('python' 'python2')
+makedepends=('python2')
 url=http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
@@ -18,11 +18,9 @@
  'ae3d1ebe000a3972afa104ca7f0e1b4a')
 
 prepare() {
-  mv xmlconf -t ${pkgname}-${pkgver}
-  cp -a ${pkgname}-${pkgver} python3
-
   cd ${pkgname}-${pkgver}
   sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 
's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
+  mv ../xmlconf .
 }
 
 build() {
@@ -29,17 +27,11 @@
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python2
   make
-
-  cd ../python3
-  ./configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python3
-  make
 }
 
 check() {
   cd ${pkgname}-${pkgver}
   make check
-  cd ../python3
-  make check
 }
 
 package() {
@@ -46,6 +38,4 @@
   cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-  cd ../python3/python
-  make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2013-11-02 Thread Jan Steffens 
Date: Saturday, November 2, 2013 @ 18:32:49
  Author: heftig
Revision: 198738

ship python3 bindings

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   31 ++-
 1 file changed, 22 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-02 16:06:46 UTC (rev 198737)
+++ PKGBUILD2013-11-02 17:32:49 UTC (rev 198738)
@@ -5,12 +5,12 @@
 
 pkgname=libxml2
 pkgver=2.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
-makedepends=('python2')
+makedepends=('python' 'python2')
 url=http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
 http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
@@ -17,22 +17,35 @@
 md5sums=('9c0cfef285d5c4a5c80d00904ddab380'
  'ae3d1ebe000a3972afa104ca7f0e1b4a')
 
+prepare() {
+  mv xmlconf -t ${pkgname}-${pkgver}
+  cp -a ${pkgname}-${pkgver} python3
+
+  cd ${pkgname}-${pkgver}
+  sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 
's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
+}
+
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 
's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
-  ./configure --prefix=/usr --with-threads --with-history \
- --with-python=/usr/bin/python2
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python2
   make
+
+  cd ../python3
+  ./configure --prefix=/usr --with-threads --with-history 
--with-python=/usr/bin/python3
+  make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  mv ${srcdir}/xmlconf .
+  cd ${pkgname}-${pkgver}
   make check
+  cd ../python3
+  make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  cd ../python3/python
+  make DESTDIR=${pkgdir} install
 }

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2013-10-24 Thread Gaetan Bisson 
Date: Friday, October 25, 2013 @ 05:13:40
  Author: bisson
Revision: 197379

remove static libs

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-25 03:06:40 UTC (rev 197378)
+++ PKGBUILD2013-10-25 03:13:40 UTC (rev 197379)
@@ -5,7 +5,7 @@
 
 pkgname=libxml2
 pkgver=2.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('MIT')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2013-06-04 Thread Bartłomiej Piotrowski 
Date: Tuesday, June 4, 2013 @ 19:39:20
  Author: bpiotrowski
Revision: 187169

upgpkg: libxml2 2.9.1-2

- change license to MIT

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-04 17:00:40 UTC (rev 187168)
+++ PKGBUILD2013-06-04 17:39:20 UTC (rev 187169)
@@ -5,10 +5,10 @@
 
 pkgname=libxml2
 pkgver=2.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
-license=('custom')
+license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
 makedepends=('python2')
 options=('!libtool')

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2013-05-10 Thread Bartłomiej Piotrowski 
Date: Friday, May 10, 2013 @ 19:09:24
  Author: bpiotrowski
Revision: 185046

upgpkg: libxml2 2.9.1-1

- upstream release
- upgrade XML conformance test suites to 20080827

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-10 17:08:21 UTC (rev 185045)
+++ PKGBUILD2013-05-10 17:09:24 UTC (rev 185046)
@@ -3,7 +3,7 @@
 # Contributor: John Proctor jproc...@prium.net
 
 pkgname=libxml2
-pkgver=2.8.0
+pkgver=2.9.1
 pkgrel=1
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
@@ -13,9 +13,9 @@
 options=('!libtool')
 url=http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-http://www.w3.org/XML/Test/xmlts20080205.tar.gz)
-md5sums=('c62106f02ee00b6437f0fb9d370c1093'
- 'b255be9a1c7f7021e52448e4ec8d7a0d')
+http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
+md5sums=('9c0cfef285d5c4a5c80d00904ddab380'
+ 'ae3d1ebe000a3972afa104ca7f0e1b4a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2013-05-10 Thread Tom Gundersen 
Date: Friday, May 10, 2013 @ 19:43:30
  Author: tomegun
Revision: 185054

add myself as maintainer

also remove some versioned deps

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-10 17:34:50 UTC (rev 185053)
+++ PKGBUILD2013-05-10 17:43:30 UTC (rev 185054)
@@ -1,5 +1,6 @@
 # $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
+# Maintainer: Tom Gundersen t...@jklm.no
 # Contributor: John Proctor jproc...@prium.net
 
 pkgname=libxml2
@@ -8,7 +9,7 @@
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('custom')
-depends=('zlib=1.2.4' 'readline=6.1' 'ncurses=5.7' 'xz')
+depends=('zlib' 'readline' 'ncurses' 'xz')
 makedepends=('python2')
 options=('!libtool')
 url=http://www.xmlsoft.org/;

[arch-commits] Commit in libxml2/trunk (PKGBUILD shared_library_versionning.patch)

2010-11-27 Thread Ionut Biru 
Date: Saturday, November 27, 2010 @ 10:26:13
  Author: ibiru
Revision: 101089

upgpkg: libxml2 2.7.8-1
update to 2.7.8

Added:
  libxml2/trunk/shared_library_versionning.patch
Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 shared_library_versionning.patch |   21 +
 2 files changed, 30 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-27 15:24:41 UTC (rev 101088)
+++ PKGBUILD2010-11-27 15:26:13 UTC (rev 101089)
@@ -3,8 +3,8 @@
 # Contributor: John Proctor jproc...@prium.net
 
 pkgname=libxml2
-pkgver=2.7.7
-pkgrel=2
+pkgver=2.7.8
+pkgrel=1
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('custom')
@@ -13,13 +13,16 @@
 options=('!libtool')
 url=http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-largefile64.patch)
-md5sums=('9abc9959823ca9ff904f1fbcf21df066'
- '5ad4915665608ebfa5b89f7908467a72')
+largefile64.patch shared_library_versionning.patch)
+md5sums=('8127a65e8c3b08856093099b52599c86'
+ '5ad4915665608ebfa5b89f7908467a72'
+ '84aeb7c6db023eae044e95d9211dba53')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/largefile64.patch
+  patch -Np1 -i ${srcdir}/shared_library_versionning.patch
+  autoreconf -fi
   ./configure --prefix=/usr --with-threads --with-history \
  --with-python=/usr/bin/python2.7
   make
@@ -30,3 +33,4 @@
   make DESTDIR=${pkgdir} install
   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
+

Added: shared_library_versionning.patch
===
--- shared_library_versionning.patch(rev 0)
+++ shared_library_versionning.patch2010-11-27 15:26:13 UTC (rev 101089)
@@ -0,0 +1,21 @@
+From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard veill...@redhat.com
+Date: Thu, 04 Nov 2010 20:53:14 +
+Subject: Reactivate the shared library versionning script
+
+---
+diff --git a/configure.in b/configure.in
+index 59d0629..a1d2c89 100644
+--- a/configure.in
 b/configure.in
+@@ -84,7 +84,7 @@ else
+   esac
+ fi
+ AC_SUBST(VERSION_SCRIPT_FLAGS)
+-AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z $VERSION_SCRIPT_FLAGS])
++AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n $VERSION_SCRIPT_FLAGS])
+ 
+ dnl
+ dnl We process the AC_ARG_WITH first so that later we can modify
+--
+cgit v0.8.3.1

[arch-commits] Commit in libxml2/trunk (PKGBUILD)

2010-08-17 Thread Allan McRae 
Date: Tuesday, August 17, 2010 @ 21:57:53
  Author: allan
Revision: 87702

upgpkg: libxml2 2.7.7-2
python rebuild

Modified:
  libxml2/trunk/PKGBUILD

--+
 PKGBUILD |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-18 01:36:20 UTC (rev 87701)
+++ PKGBUILD2010-08-18 01:57:53 UTC (rev 87702)
@@ -4,12 +4,12 @@
 
 pkgname=libxml2
 pkgver=2.7.7
-pkgrel=1
+pkgrel=2
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('custom')
 depends=('zlib=1.2.4' 'readline=6.1' 'ncurses=5.7')
-makedepends=('python')
+makedepends=('python2')
 options=('!libtool')
 url=http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
@@ -19,10 +19,14 @@
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/largefile64.patch || return 1
-  ./configure --prefix=/usr --with-threads --with-history || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+  patch -Np1 -i ${srcdir}/largefile64.patch
+  ./configure --prefix=/usr --with-threads --with-history \
+ --with-python=/usr/bin/python2.7
+  make
 }
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}

[arch-commits] Commit in libxml2/trunk (PKGBUILD zlib.patch)

2010-03-28 Thread Jan de Groot 
Date: Sunday, March 28, 2010 @ 09:12:08
  Author: jgc
Revision: 73765

upgpkg: libxml2 2.7.7-1
Update to 2.7.7, remove upstream-applied patch

Modified:
  libxml2/trunk/PKGBUILD
Deleted:
  libxml2/trunk/zlib.patch

+
 PKGBUILD   |   14 ++
 zlib.patch |   32 
 2 files changed, 6 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-28 12:55:55 UTC (rev 73764)
+++ PKGBUILD2010-03-28 13:12:08 UTC (rev 73765)
@@ -3,25 +3,23 @@
 # Contributor: John Proctor jproc...@prium.net
 
 pkgname=libxml2
-pkgver=2.7.6
-pkgrel=2
+pkgver=2.7.7
+pkgrel=1
 pkgdesc=XML parsing library, version 2
 arch=(i686 x86_64)
 license=('custom')
-depends=('zlib=1.2.3.3' 'readline=6.0' 'ncurses=5.7')
+depends=('zlib=1.2.4' 'readline=6.1' 'ncurses=5.7')
 makedepends=('python')
 options=('!libtool')
 url=http://www.xmlsoft.org/;
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-largefile64.patch zlib.patch)
-md5sums=('7740a8ec23878a2f50120e1faa2730f2'
- '5ad4915665608ebfa5b89f7908467a72'
- '0365d5397164b8739219e56e5ca069d1')
+largefile64.patch)
+md5sums=('9abc9959823ca9ff904f1fbcf21df066'
+ '5ad4915665608ebfa5b89f7908467a72')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 -i ${srcdir}/largefile64.patch || return 1
-  patch -p1 -i ${srcdir}/zlib.patch || return 1
   ./configure --prefix=/usr --with-threads --with-history || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1

Deleted: zlib.patch
===
--- zlib.patch  2010-03-28 12:55:55 UTC (rev 73764)
+++ zlib.patch  2010-03-28 13:12:08 UTC (rev 73765)
@@ -1,32 +0,0 @@
-From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001
-From: Mark Adler mad...@alumni.caltech.edu
-Date: Tue, 19 Jan 2010 15:28:48 +
-Subject: libxml violates the zlib interface and crashes
-
-* xmlIO.c: remove an abuse of zlib API and use a clean interface
-  available in zlib = 1.2.3

-diff --git a/xmlIO.c b/xmlIO.c
-index c03ac43..8fc00e3 100644
 a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, 
xmlCharEncoding enc) {
- #ifdef HAVE_ZLIB_H
-   if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) 
-   (strcmp(URI, -) != 0)) {
-+#if defined(ZLIB_VERNUM)  ZLIB_VERNUM = 0x1230
-+ret-compressed = !gzdirect(context);
-+#else
-   if (((z_stream *)context)-avail_in  4) {
-   char *cptr, buff4[4];
-   cptr = (char *) ((z_stream *)context)-next_in;
-@@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, 
xmlCharEncoding enc) {
-   gzrewind(context);
-   }
-   }
-+#endif
-   }
- #endif
- }
---
-cgit v0.8.3.1

[arch-commits] Commit in libxml2/trunk (PKGBUILD libxml2-2.7.3-ficora-parse.patch)

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

Update to 2.7.6 - remove old security patch, integrated upstream

Modified:
  libxml2/trunk/PKGBUILD
Deleted:
  libxml2/trunk/libxml2-2.7.3-ficora-parse.patch

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

Modified: PKGBUILD
===
--- PKGBUILD2009-11-04 11:55:46 UTC (rev 58139)
+++ PKGBUILD2009-11-04 12:06:09 UTC (rev 58140)
@@ -3,8 +3,8 @@
 # Contributor: John Proctor jproc...@prium.net
 
 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: libxml2-2.7.3-ficora-parse.patch
===
--- libxml2-2.7.3-ficora-parse.patch2009-11-04 11:55:46 UTC (rev 58139)
+++ libxml2-2.7.3-ficora-parse.patch2009-11-04 12:06:09 UTC (rev 58140)
@@ -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
-+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk,
-+   int depth) {
- xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL;
- const xmlChar *elem;
- xmlChar type = 0;
- 
-+if (((depth  128)  ((ctxt-options  XML_PARSE_HUGE) == 0)) ||
-+(depth   2048)) {
-+xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
-+xmlParseElementChildrenContentDecl : depth %d too deep, use 
XML_PARSE_HUGE\n,
-+