[arch-commits] Commit in libxml2/trunk (PKGBUILD no-fuzz.diff no-fuzz.patch)

[Jan Steffens]

    Date: Sunday, February 20, 2022 @ 20:29:22
  Author: heftig
Revision: 437817

2.9.13-1

Added:
  libxml2/trunk/no-fuzz.diff
    (from rev 437816, libxml2/trunk/no-fuzz.patch)
Modified:
  libxml2/trunk/PKGBUILD
Deleted:
  libxml2/trunk/no-fuzz.patch

---------------+
 PKGBUILD      |   40 ++++++++++++++--------------------------
 no-fuzz.diff  |   24 ++++++++++++++++++++++++
 no-fuzz.patch |   24 ------------------------
 3 files changed, 38 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-20 20:27:49 UTC (rev 437816)
+++ PKGBUILD	2022-02-20 20:29:22 UTC (rev 437817)
@@ -4,8 +4,8 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=libxml2
-pkgver=2.9.12
-pkgrel=7
+pkgver=2.9.13
+pkgrel=1
 pkgdesc='XML parsing library, version 2'
 url='http://www.xmlsoft.org/'
 arch=(x86_64)
@@ -12,19 +12,20 @@
 license=(MIT)
 depends=(zlib readline ncurses xz icu)
 makedepends=(python git)
+optdepends=('python: Python bindings')
 provides=(libxml2.so)
-_commit=b48e77cf4f6fa0792c5f4b639707a2b0675e461b  # tags/v2.9.12^0
+_commit=a075d256fd9ff15590b86d981b75a50ead124fca  # tags/v2.9.13^0
 source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
         libxml2-2.9.8-python3-unicode-errors.patch
-        no-fuzz.patch # Do not run fuzzing tests
+        no-fuzz.diff
         https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
 sha256sums=('SKIP'
             '37eb81a8ec6929eed1514e891bff2dd05b450bcf0c712153880c485b7366c17c'
-            '163655aba312c237a234a82d64b71a65bd9d1d901e176d443e3e3ac64f3b1b32'
+            '3fc010d8c42b93e6d6f1fca6b598a561e9d2c8780ff3ca0c76a31efabaea404f'
             '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
 
 pkgver() {
-  cd $pkgname
+  cd libxml2
   git describe --tags | sed 's/-rc/rc/;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
@@ -34,26 +35,13 @@
   # Use xmlconf from conformance test suite
   ln -s xmlconf build/xmlconf
 
-  cd $pkgname
+  cd libxml2
 
-  # Work around lxml API abuse
-  git cherry-pick -n 85b1792e37b131e7a51af98a37f92472e8de5f3f
-  # Fix regression in xmlNodeDumpOutputInternal
-  git cherry-pick -n 13ad8736d294536da4cbcd70a96b0a2fbf47070c
-  # Fix XPath recursion limit
-  git cherry-pick -n 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77
-  # Fix whitespace when serializing empty HTML documents
-  git cherry-pick -n 92d9ab4c28842a09ca2b76d3ff2f933e01b6cd6f
+  # https://src.fedoraproject.org/rpms/libxml2/tree/rawhide
+  git apply -3 ../libxml2-2.9.8-python3-unicode-errors.patch
 
-  # Take patches from https://src.fedoraproject.org/rpms/libxml2/tree/master
-  local src
-  for src in "${source[@]}"; do
-    src="${src%%::*}"
-    src="${src##*/}"
-    [[ $src = *.patch ]] || continue
-    echo "Applying patch $src..."
-    git apply -3 "../$src"
-  done
+  # Do not run fuzzing tests
+  git apply -3 ../no-fuzz.diff
 
   autoreconf -fiv
 }
@@ -61,7 +49,7 @@
 build() (
   cd build
 
-  ../$pkgname/configure \
+  ../libxml2/configure \
     --prefix=/usr \
     --with-threads \
     --with-history \
@@ -70,7 +58,7 @@
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
   make
 
-  find doc -type f -exec chmod 0644 {} +
+  find doc -type f -exec chmod -c 0644 {} +
 )
 
 check() {

Copied: libxml2/trunk/no-fuzz.diff (from rev 437816, libxml2/trunk/no-fuzz.patch)
===================================================================
--- no-fuzz.diff	                        (rev 0)
+++ no-fuzz.diff	2022-02-20 20:29:22 UTC (rev 437817)
@@ -0,0 +1,24 @@
+diff --git i/Makefile.am w/Makefile.am
+index 7917b595..f0f4b695 100644
+--- i/Makefile.am
++++ w/Makefile.am
+@@ -2,9 +2,9 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR)
++SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR)
+ 
+-DIST_SUBDIRS = include . doc example fuzz python xstc
++DIST_SUBDIRS = include . doc example python xstc
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
+ 
+@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
+ 	    $(CHECKER) ./runxmlconf$(EXEEXT)
+ 	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
+ 	    $(MAKE) tests ; fi)
+-	@cd fuzz; $(MAKE) tests
+ 
+ check: all runtests
+ 

Deleted: no-fuzz.patch
===================================================================
--- no-fuzz.patch	2022-02-20 20:27:49 UTC (rev 437816)
+++ no-fuzz.patch	2022-02-20 20:29:22 UTC (rev 437817)
@@ -1,24 +0,0 @@
-diff --git i/Makefile.am w/Makefile.am
-index a9284b95..3d7b344d 100644
---- i/Makefile.am
-+++ w/Makefile.am
-@@ -2,9 +2,9 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR)
-+SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR)
- 
--DIST_SUBDIRS = include . doc example fuzz python xstc
-+DIST_SUBDIRS = include . doc example python xstc
- 
- AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
- 
-@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
- 	    $(CHECKER) ./runxmlconf$(EXEEXT)
- 	@(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \
- 	    $(MAKE) tests ; fi)
--	@cd fuzz; $(MAKE) tests
- 
- check: all runtests
-