From d779d9659c00e12068ecf266056304e99195a4c6 Mon Sep 17 00:00:00 2001
From: xrs <xrs@mail36.net>
Date: Fri, 29 Nov 2019 09:28:43 +0100
Subject: Minor fixes; preparing for next gnunet release.

---
 contrib/packages/alpine/gnunet-gtk/APKBUILD |  4 ++--
 contrib/packages/alpine/gnunet/APKBUILD     | 15 +++++----------
 contrib/packages/alpine/gnurl/APKBUILD      |  4 ++--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/contrib/packages/alpine/gnunet-gtk/APKBUILD b/contrib/packages/alpine/gnunet-gtk/APKBUILD
index 8c72bdb6c..c1963e0a9 100644
--- a/contrib/packages/alpine/gnunet-gtk/APKBUILD
+++ b/contrib/packages/alpine/gnunet-gtk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: xrs <xrs@mail36.net>
 # Maintainer: xrs <xrs@mail36.net>
 pkgname=gnunet-gtk
-pkgver=0.11.5
+pkgver=0.11.7
 pkgrel=0
 pkgdesc="Graphical user interface for GNUnet"
 url="https://gnunet.org"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8cd5bcadba070396b9b9b4849678bda362ba274f7d8e0c4dfc0bd793ac103a8a94949a472d992c90f21ddb7db16b14ea23a199acd4cf2e52f985e15205d2f5a9  gnunet-gtk-0.11.5.tar.gz"
+sha512sums="368d31e876d3ace60e62e744e5a7d375962a6f7e6c2800cf1389185673ec643a91160fccbd380427e5fdcf0683824aa17265b3de4eb8a8493aa20c55596d982f  gnunet-gtk-0.11.7.tar.gz"
diff --git a/contrib/packages/alpine/gnunet/APKBUILD b/contrib/packages/alpine/gnunet/APKBUILD
index b21c6241e..b8dd66958 100644
--- a/contrib/packages/alpine/gnunet/APKBUILD
+++ b/contrib/packages/alpine/gnunet/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: xrs <xrs@mail36.net>
 # Maintainer: xrs <xrs@mail36.net>
 pkgname=gnunet
-pkgver=0.11.6
+pkgver=0.12.0
 pkgrel=0
 pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking"
 url="https://gnunet.org"
@@ -10,7 +10,7 @@ license="AGPL-3.0-only"
 depends="gnutls-utils bash which iptables coreutils"
 depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev
 	gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev
-	nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext"
+	nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext openjpeg-dev"
 makedepends="$depends_dev autoconf automake libtool gettext-dev python3
 	texlive texinfo"
 install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall"
@@ -26,11 +26,6 @@ source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-$pkgver.tar.gz
 	gnunet.xsession
 	"
 
-prepare() {
-	default_prepare
-	autoreconf -if # FIXME: See https://bugs.gnunet.org/view.php?id=5902
-}
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -40,7 +35,7 @@ build() {
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
 		--enable-logging=verbose
-	make -j 1
+	make
 }
 
 check() {
@@ -48,7 +43,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -j1 install # Using more CPUs generates CI-errors.
 
 	libexecdir=$pkgdir/usr/lib/gnunet/libexec/
 	# Limit access to critical gnunet-helper-dns to group "gnunetdns"
@@ -87,7 +82,7 @@ dev() {
 		$pkgdir/usr/bin/gnunet-config
 }
 
-sha512sums="1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541118e55766c422edf4a80e140c4eb2cfc681e0d4a1384e39811d024df9278  gnunet-0.11.6.tar.gz
+#sha512sums="3f066f72486fccd247045495e1072c3680f12109bfceae782a52892824639e2990e34054bfeebcc58bb8778069bfd8a9c1feba19e2d726f12b6128fc27004759  gnunet-0.11.8.tar.gz
 a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0  gnunet-system.conf
 b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33  gnunet-user.conf
 96ab78bb48d5fb10f0b34336ad05e73b543c4362c73436ef20b3bb83dff214e997acf38a2ea493b1901bdc37c8877d83cdaebd73a0e50831e2f23413c8edda76  gnunet-system-services.initd
diff --git a/contrib/packages/alpine/gnurl/APKBUILD b/contrib/packages/alpine/gnurl/APKBUILD
index 24a5ee866..52373f1bc 100644
--- a/contrib/packages/alpine/gnurl/APKBUILD
+++ b/contrib/packages/alpine/gnurl/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: xrs <xrs@mail36.net>
 # Maintainer: xrs <xrs@mail36.net>
 pkgname=gnurl
-pkgver=7.65.3
+pkgver=7.66.0
 pkgrel=0
 pkgdesc="curl with only HTTP/HTTPS support and GnuTLS"
 url="https://gnunet.org/en/gnurl.html"
@@ -75,4 +75,4 @@ libgnurl() {
 }
 
 
-sha512sums="51aa71352dfe2e65dbcf542cb616af1eaa7e80fbc4ddb455a338e74eea245724ac1fa7ff226c418101e8ba298a8f85c2be9e7d9190a57c66e2e8c65d0c5186f8  gnurl-7.65.3.tar.gz"
+sha512sums="ab7305433b204ce68d139898efa1a74351a73c5e5bde121bb5ce1aa76f31cd07b699c18988a78f756262f9d7566b323651012ed0790bce15ed3e77aeba2c6dd9  gnurl-7.66.0.tar.gz"
-- 
cgit v1.2.3