Add patch for tests

3 files changed, 69 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5b5d30392f5..276ee1290146 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,37 @@
 pkgbase = lib32-raptor
 	pkgdesc = A C library that parses RDF/XML/N-Triples into RDF triples (32 bit)
 	pkgver = 2.0.15
-	pkgrel = 10
-	url = http://librdf.org/raptor
+	pkgrel = 11
+	url = https://librdf.org/raptor
 	arch = x86_64
 	license = Apache
 	license = GPL2
 	license = LGPL2.1
 	makedepends = gcc-multilib
-	depends = lib32-curl
+	makedepends = gtk-doc
+	makedepends = lib32-curl
+	makedepends = lib32-icu
 	depends = lib32-glibc
-	depends = lib32-icu
 	depends = lib32-libxml2
 	depends = lib32-libxslt
 	depends = lib32-xz
 	depends = lib32-zlib
 	depends = raptor
-	source = http://librdf.org/dist/source/raptor2-2.0.15.tar.gz
-	source = http://librdf.org/dist/source/raptor2-2.0.15.tar.gz.asc
+	source = https://librdf.org/dist/source/raptor2-2.0.15.tar.gz
+	source = https://librdf.org/dist/source/raptor2-2.0.15.tar.gz.asc
 	source = raptor-2.0.15-CVE-2017-18926.patch::https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch
 	source = raptor-2.0.15-out_of_bounds.patch
+	source = raptor-2.0.15-disable_broken_test_suites.patch
 	validpgpkeys = F879F0DEDA780198DD08DC6443EC92504F71955A
 	sha512sums = 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
 	sha512sums = SKIP
-	sha512sums = 203ae75dae8242fb7988a199df8a7337b0660871f5caa6c9098167536ba880ad55765bb60fd4315020f208ed3ae8dc03eb1b91241851410a961a797192ecb969
+	sha512sums = 82f2f7ea4b72aa2bf444013a81db3cb17fcce2ae650bdb22eaab00d6d5cf7f950f7a550ffff49348db878f90f2753b407e6026d08d543cd0757c1687c6dad159
 	sha512sums = 140f90d74fad8cdc6ef7fa14fa655e425552947d57068021362f8ae9efdded8ed31295e9bdd495fe70e646967062e28fa3ecd5831f9902134da5fe0a82607735
+	sha512sums = bfa5e2c10e33bab9ba85541ca78e903dbcbe07e2fbb654687e0b65fe46531bf385d7b3de36619b9919b7b4db3b803624d294cb8bfd63a89b96fc85cd2fda278e
 	b2sums = 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22
 	b2sums = SKIP
-	b2sums = a3f83e34686dfd55ad1c4b9e97f6ae046be31b8224846dfa2b83ba9228cb987c6ebb19f37f48c196fab56a1e1d007d71225ed12acc2188e088b95c7cff5a0beb
+	b2sums = 5e86b3bb1e80662363cbefa889b36810a4472c23ddb0a96960c13586124ac13031c6759e4abb3381e17a8f3b7cc941eaa3f97f3bc7c562f165db37efc47a39f8
 	b2sums = ab11eeb648bf2cf8ac4ef4bbff4cdb77d1b713ad086268b656c7249363bf5752b535763f9a9fd34be4d72b3ff420cd87ee6970d3da6e24e5e2b067b9dbb9c29e
+	b2sums = 5f623afff5566d47d132c24e32b6b683b7eff15a9a819387b1764b1c222ae47f6e1948892b2a93af77375a3616f9276b00e6686108720da1005b47232b3f6b5f
 
 pkgname = lib32-raptor
-
diff --git a/PKGBUILD b/PKGBUILD
index 6d3a27742b16..f2c477edfd93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,42 +6,47 @@ _name=raptor2
 _basename=raptor
 pkgname=lib32-raptor
 pkgver=2.0.15
-pkgrel=10
+pkgrel=11
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples (32 bit)"
-arch=('x86_64')
-url="http://librdf.org/raptor"
-license=('Apache' 'GPL2' 'LGPL2.1')
-depends=( 'lib32-curl' 'lib32-glibc' 'lib32-icu' 'lib32-libxml2' 'lib32-libxslt' 'lib32-xz' 'lib32-zlib' 'raptor')
-makedepends=('gcc-multilib')
-source=("http://librdf.org/dist/source/${_name}-$pkgver.tar.gz"{,.asc}
-        "${_basename}-2.0.15-CVE-2017-18926.patch::https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch"
-        "${_basename}-2.0.15-out_of_bounds.patch")
+arch=(x86_64)
+url="https://librdf.org/raptor"
+license=(Apache GPL2 LGPL2.1)
+depends=(lib32-glibc lib32-libxml2 lib32-libxslt lib32-xz lib32-zlib raptor)
+makedepends=(gcc-multilib gtk-doc lib32-curl lib32-icu)
+source=(https://librdf.org/dist/source/$_name-$pkgver.tar.gz{,.asc}
+        $_basename-2.0.15-CVE-2017-18926.patch::https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch
+        $_basename-2.0.15-out_of_bounds.patch
+        $_basename-2.0.15-disable_broken_test_suites.patch)
 sha512sums=('563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee'
             'SKIP'
-            '203ae75dae8242fb7988a199df8a7337b0660871f5caa6c9098167536ba880ad55765bb60fd4315020f208ed3ae8dc03eb1b91241851410a961a797192ecb969'
-            '140f90d74fad8cdc6ef7fa14fa655e425552947d57068021362f8ae9efdded8ed31295e9bdd495fe70e646967062e28fa3ecd5831f9902134da5fe0a82607735')
+            '82f2f7ea4b72aa2bf444013a81db3cb17fcce2ae650bdb22eaab00d6d5cf7f950f7a550ffff49348db878f90f2753b407e6026d08d543cd0757c1687c6dad159'
+            '140f90d74fad8cdc6ef7fa14fa655e425552947d57068021362f8ae9efdded8ed31295e9bdd495fe70e646967062e28fa3ecd5831f9902134da5fe0a82607735'
+            'bfa5e2c10e33bab9ba85541ca78e903dbcbe07e2fbb654687e0b65fe46531bf385d7b3de36619b9919b7b4db3b803624d294cb8bfd63a89b96fc85cd2fda278e')
 b2sums=('0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22'
         'SKIP'
-        'a3f83e34686dfd55ad1c4b9e97f6ae046be31b8224846dfa2b83ba9228cb987c6ebb19f37f48c196fab56a1e1d007d71225ed12acc2188e088b95c7cff5a0beb'
-        'ab11eeb648bf2cf8ac4ef4bbff4cdb77d1b713ad086268b656c7249363bf5752b535763f9a9fd34be4d72b3ff420cd87ee6970d3da6e24e5e2b067b9dbb9c29e')
+        '5e86b3bb1e80662363cbefa889b36810a4472c23ddb0a96960c13586124ac13031c6759e4abb3381e17a8f3b7cc941eaa3f97f3bc7c562f165db37efc47a39f8'
+        'ab11eeb648bf2cf8ac4ef4bbff4cdb77d1b713ad086268b656c7249363bf5752b535763f9a9fd34be4d72b3ff420cd87ee6970d3da6e24e5e2b067b9dbb9c29e'
+        '5f623afff5566d47d132c24e32b6b683b7eff15a9a819387b1764b1c222ae47f6e1948892b2a93af77375a3616f9276b00e6686108720da1005b47232b3f6b5f')
 validpgpkeys=('F879F0DEDA780198DD08DC6443EC92504F71955A') # Dave Beckett <dave@dajobe.org>
 
 prepare() {
-    mv -v "${_name}-${pkgver}" "${_basename}-${pkgver}"
-
-    cd "${_basename}-${pkgver}"
-
     # fix CVE-2017-18926:
     # https://bugs.archlinux.org/task/68613
-    patch -Np1 -i "../${_basename}-2.0.15-CVE-2017-18926.patch"
+    patch -d $_name-$pkgver -Np1 -i ../$_basename-2.0.15-CVE-2017-18926.patch
 
     # fix out-of-bounds read:
     # https://bugs.librdf.org/mantis/view.php?id=650
-    patch -Np1 -i "../${_basename}-2.0.15-out_of_bounds.patch"
+    patch -d $_name-$pkgver -Np1 -i ../$_basename-2.0.15-out_of_bounds.patch
+    # remove broken test suites: https://github.com/dajobe/raptor/issues/49
+    patch -d $_name-$pkgver -Np1 -i ../$_basename-2.0.15-disable_broken_test_suites.patch
+
+    cd $_name-$pkgver
+
+    autoreconf -fiv
 }
 
 build() {
-    cd "${_basename}-${pkgver}"
+    cd $_name-$pkgver
 
     export CC='gcc -m32'
     export CXX='g++ -m32'
@@ -49,24 +54,24 @@ build() {
 
     ./configure \
         --build=i686-pc-linux-gnu \
-        --prefix='/usr' \
-        --libdir='/usr/lib32' \
+        --prefix=/usr \
+        --libdir=/usr/lib32 \
         --disable-static \
         --with-icu-config=/usr/bin/icu-config-32
 
+    # prevent excessive overlinking due to libtool
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
     make
 }
 
 check() {
-    cd "${_basename}-${pkgver}"
-
-    make check || echo "Known to fail."
+    make check -C $_name-$pkgver
 }
 
 package() {
-    cd "${_basename}-${pkgver}"
-
-    make prefix="${pkgdir}"/usr libdir="${pkgdir}"/usr/lib32 install
+#     make prefix="${pkgdir}"/usr libdir="${pkgdir}"/usr/lib32 install
+    make DESTDIR="$pkgdir" install -C $_name-$pkgver
 
     rm -rf "${pkgdir}"/usr/{bin,include,share}
 }
diff --git a/raptor-2.0.15-disable_broken_test_suites.patch b/raptor-2.0.15-disable_broken_test_suites.patch
new file mode 100644
index 000000000000..5ae1da1b47e6
--- /dev/null
+++ b/raptor-2.0.15-disable_broken_test_suites.patch
@@ -0,0 +1,24 @@
+diff -ruN a/tests/Makefile.am b/tests/Makefile.am
+--- a/tests/Makefile.am	2013-12-08 02:57:05.000000000 +0100
++++ b/tests/Makefile.am	2022-02-19 16:47:41.562672003 +0100
+@@ -37,7 +37,7 @@
+ # Used to make N-triples output consistent
+ BASE_URI=http://librdf.org/raptor/tests/
+ 
+-SUBDIRS = rdfxml ntriples ntriples-2013 nquads-2013 turtle turtle-2013 trig grddl rdfa rdfa11 json feeds
++SUBDIRS = ntriples ntriples-2013 nquads-2013 turtle turtle-2013 trig grddl rdfa rdfa11 json
+ 
+ 
+ $(top_builddir)/src/libraptor2.la:
+diff -ruN a/tests/Makefile.in b/tests/Makefile.in
+--- a/tests/Makefile.in	2014-11-02 07:04:38.000000000 +0100
++++ b/tests/Makefile.in	2022-02-19 16:47:41.569338695 +0100
+@@ -338,7 +338,7 @@
+ 
+ # Used to make N-triples output consistent
+ BASE_URI = http://librdf.org/raptor/tests/
+-SUBDIRS = rdfxml ntriples ntriples-2013 nquads-2013 turtle turtle-2013 trig grddl rdfa rdfa11 json feeds
++SUBDIRS = ntriples ntriples-2013 nquads-2013 turtle turtle-2013 trig grddl rdfa rdfa11 json
+ all: all-recursive
+ 
+ .SUFFIXES: