Merge branch 'xmlsec-gnutls' into 'master'

user/xmlsec: fix tests, add -gcrypt and -gnutls, and more

* URL changed to official website.
* Source changed to official download URL instead of GitHub archive.
* Tests were being skipped spuriously due to the test suite being
  broken. The relevant commits to fix this have been backported and
  applied.
* Add the -gnutls (for experimental/aqbanking) and -gcrypt (required in
  order to build -gnutls) subpackages.
* The *.la files have been removed from the main package (remove
  options=libtool). It is assumed these are no longer needed, since the
  only official reverse dependency at this time is libreoffice, which
  uses pkg-config and not libtool.
* usr/lib/libxmlsec1-nss.so was moved to -dev by running the -dev split
  function before the plugin split functions.
* usr/lib/xmlsec1Conf.sh was moved to -dev.

See merge request !244

1 files changed, 35 insertions, 18 deletions

diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD
index 171427b55..4b7f83509 100644
--- a/user/xmlsec/APKBUILD
+++ b/user/xmlsec/APKBUILD
@@ -1,25 +1,21 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=xmlsec
 pkgver=1.2.28
-_pkgver=1_2_28
-pkgrel=0
+_pkgname="$pkgname${pkgver%%.*}"
+pkgrel=1
 pkgdesc="C-based XML signature and encryption syntax and processing library"
-url="https://github.com/lsh123/$pkgname/"
+url="https://www.aleksey.com/xmlsec/"
 arch="all"
-options="libtool"
 license="MIT"
 depends=""
 checkdepends="nss-tools"
-makedepends="$depends_dev libxml2-dev libxslt-dev nss-dev openssl-dev
-	autoconf automake libtool"
-subpackages="$pkgname-nss $pkgname-dev $pkgname-doc"
-source="$url/archive/$pkgname-$_pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgname-$_pkgver"
-
-prepare() {
-	default_prepare
-	./autogen.sh
-}
+makedepends="libxml2-dev libxslt-dev openssl-dev
+	gnutls-dev libgcrypt-dev nss-dev"
+subpackages="$pkgname-dev $pkgname-doc
+	$pkgname-gcrypt $pkgname-gnutls $pkgname-nss"
+source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz
+	fix-tests.patch"
+builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
 	./configure \
@@ -28,9 +24,9 @@ build() {
 		--prefix=/usr \
 		--disable-static \
 		--enable-pkgconfig \
-		--with-openssl=/usr \
-		--without-gnutls \
-		--without-gcrypt \
+		--with-openssl \
+		--with-gnutls \
+		--with-gcrypt \
 		--with-default-crypto='openssl'
 	make
 }
@@ -46,6 +42,26 @@ package() {
 	install -m644 'COPYING' "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
+dev() {
+	default_dev
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/xmlsec1Conf.sh "$subpkgdir"/usr/lib
+}
+
+gcrypt() {
+	pkgdesc="xmlsec gcrypt plugin"
+	install_if="$pkgname=$pkgver-r$pkgrel gcrypt"
+	mkdir -p "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libxmlsec1-gcrypt.so* "$subpkgdir"/usr/lib/
+}
+
+gnutls() {
+	pkgdesc="xmlsec gnutls plugin"
+	install_if="$pkgname=$pkgver-r$pkgrel gnutls"
+	mkdir -p "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libxmlsec1-gnutls.so* "$subpkgdir"/usr/lib/
+}
+
 nss() {
 	pkgdesc="xmlsec NSS plugin"
 	install_if="$pkgname=$pkgver-r$pkgrel nss"
@@ -53,4 +69,5 @@ nss() {
 	mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="fb0c775f6455ce5a5579a69bb91d60fe90c023e538c32bdf2a70aa413a53b22ef938349a3ce6b42bb23f8f70b4e00f1b9917f877487bb1507c927ec70c3d95f5  xmlsec-1_2_28.tar.gz"
+sha512sums="17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480  xmlsec1-1.2.28.tar.gz
+2f146b31460ae1843a696c77cef03b36a0bf212028189055834e2e50d7a3142f6a069ce18a5c6b2251b5846fad7e96a6d9e26a6445fd182ac4c44c70afc4f8a3  fix-tests.patch"