6 files changed, 31 insertions, 62 deletions

diff --git a/contrib/packages/arch/gnunet-git/.SRCINFO b/contrib/packages/arch/gnunet-git/.SRCINFO
index d73829db6..682e69576 100644
--- a/contrib/packages/arch/gnunet-git/.SRCINFO
+++ b/contrib/packages/arch/gnunet-git/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by makepkg 6.0.1
+# Mon Sep 26 21:21:28 UTC 2022
 pkgbase = gnunet-git
         pkgdesc = A framework for secure peer-to-peer networking
-        pkgver = 0.17.0.r0.g0a9c2aa9d
+        pkgver = 0.17.6.r4.g7bf2f8f59
         pkgrel = 1
         url = http://gnunet.org
         install = gnunet.install
@@ -16,13 +18,15 @@ pkgbase = gnunet-git
         makedepends = pkgconfig
         makedepends = postgresql
         makedepends = python
+        makedepends = python-sphinx
+        makedepends = python-sphinx_rtd_theme
         makedepends = recutils
         depends = brotli
         depends = gettext
-        depends = gnurl
         depends = gnutls
         depends = iptables
         depends = jansson
+        depends = libcurl-gnutls
         depends = libextractor
         depends = libgcrypt
         depends = libidn2
@@ -30,6 +34,7 @@ pkgbase = gnunet-git
         depends = libsodium
         depends = libtool
         depends = libunistring
+        depends = miniupnpc
         depends = nss
         depends = openssl
         depends = sqlite
@@ -37,14 +42,12 @@ pkgbase = gnunet-git
         depends = zlib
         optdepends = bluez: for bluetooth transport
         optdepends = gnunet-gtk: for handling the gnunet:// URI scheme
-        optdepends = libgabe: for Attribute-Based Encryption
+        optdepends = jose: for re:claimID OpenID Connect plugin
         optdepends = libogg: for conversation service
         optdepends = libpabc: for re:claimID zero-knowledge privacy credentials
         optdepends = libpulse: for conversation service
-        optdepends = miniupnpc: for NAT uPnP support
         optdepends = mysql: for an alternative to sqlite in the database plugin
         optdepends = opus: for conversation service
-        optdepends = pbc: for Attribute-Based Encryption
         optdepends = postgresql: for an alternative to sqlite in the database plugin
         optdepends = python: for test suite
         optdepends = texi2mdoc: for automatic mdoc generation
@@ -59,14 +62,12 @@ pkgbase = gnunet-git
         source = gnunet-system.service
         source = gnunet.sysusers
         source = gnunet.tmpfiles
-        source = gnunet-uri.desktop
         source = gnunet-user.conf
         source = gnunet-user.service
         sha256sums = SKIP
         sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262
         sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
         sha256sums = 5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0
-        sha256sums = 98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7
         sha256sums = 3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2
         sha256sums = 60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5
 
diff --git a/contrib/packages/arch/gnunet-git/PKGBUILD b/contrib/packages/arch/gnunet-git/PKGBUILD
index bb4d3598d..17d7e057f 100644
--- a/contrib/packages/arch/gnunet-git/PKGBUILD
+++ b/contrib/packages/arch/gnunet-git/PKGBUILD
@@ -6,7 +6,7 @@
 
 _appname='gnunet'
 pkgname="${_appname}-git"
-pkgver=0.17.0.r0.g0a9c2aa9d
+pkgver=0.17.6.r4.g7bf2f8f59
 pkgrel=1
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
@@ -14,21 +14,21 @@ url="http://${_appname}.org"
 license=('AGPL')
 conflicts=("${_appname}" "${_appname}-bin")
 provides=("${_appname}")
-depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson'
+depends=('brotli' 'gettext' 'gnutls' 'iptables' 'jansson' 'libcurl-gnutls'
          'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium'
-         'libtool' 'libunistring' 'nss' 'openssl' 'sqlite' 'which' 'zlib')
+         'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which'
+         'zlib')
 makedepends=('bluez-libs' 'gettext' 'git' 'libpulse' 'libtool' 'opus'
-             'pkgconfig' 'postgresql' 'python' 'recutils')
+             'pkgconfig' 'postgresql' 'python' 'python-sphinx'
+             'python-sphinx_rtd_theme' 'recutils')
 optdepends=('bluez: for bluetooth transport'
             'gnunet-gtk: for handling the gnunet:// URI scheme'
-            'libgabe: for Attribute-Based Encryption'
+            'jose: for re:claimID OpenID Connect plugin'
             'libogg: for conversation service'
             'libpabc: for re:claimID zero-knowledge privacy credentials'
             'libpulse: for conversation service'
-            'miniupnpc: for NAT uPnP support'
             'mysql: for an alternative to sqlite in the database plugin'
             'opus: for conversation service'
-            'pbc: for Attribute-Based Encryption'
             'postgresql: for an alternative to sqlite in the database plugin'
             'python: for test suite'
             'texi2mdoc: for automatic mdoc generation'
@@ -40,7 +40,6 @@ source=("git+https://git.${_appname}.org/${_appname}.git"
         "${_appname}-system.service"
         "${_appname}.sysusers"
         "${_appname}.tmpfiles"
-        "${_appname}-uri.desktop"
         "${_appname}-user.conf"
         "${_appname}-user.service")
 install="${_appname}.install"
@@ -48,7 +47,6 @@ sha256sums=('SKIP'
             '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262'
             '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
             '5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0'
-            '98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7'
             '3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2'
             '60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5')
 
@@ -101,10 +99,6 @@ package() {
         install -Dm644 "${srcdir}/${_appname}.tmpfiles" \
                 "${pkgdir}/usr/lib/tmpfiles.d/${_appname}.conf"
 
-        install -dm755 "${pkgdir}/usr/share/applications"
-        install -Dm644 "${srcdir}/${_appname}-uri.desktop" \
-                "${pkgdir}/usr/share/applications/${_appname}-uri.desktop"
-
         install -dm700 "${pkgdir}/etc/skel/.config"
         install -Dm600 "${srcdir}/${_appname}-user.conf" \
                 "${pkgdir}/etc/skel/.config/${_appname}.conf"
diff --git a/contrib/packages/arch/gnunet-git/gnunet-uri.desktop b/contrib/packages/arch/gnunet-git/gnunet-uri.desktop
deleted file mode 100644
index 4f847d20f..000000000
--- a/contrib/packages/arch/gnunet-git/gnunet-uri.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=GNUnet URI
-Exec=gnunet-uri %u
-GenericName=URI handler for the GNUnet network
-Icon=gnunet
-Type=Application
-Terminal=false
-NoDisplay=true
-MimeType=x-scheme-handler/gnunet;
diff --git a/contrib/packages/arch/gnunet/.SRCINFO b/contrib/packages/arch/gnunet/.SRCINFO
index 438f91230..19df8d63f 100644
--- a/contrib/packages/arch/gnunet/.SRCINFO
+++ b/contrib/packages/arch/gnunet/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnunet
         pkgdesc = A framework for secure peer-to-peer networking
-        pkgver = 0.17.0
+        pkgver = 0.17.6
         pkgrel = 1
         url = http://gnunet.org
         install = gnunet.install
@@ -14,12 +14,14 @@ pkgbase = gnunet
         makedepends = pkgconfig
         makedepends = postgresql
         makedepends = python
+        makedepends = python-sphinx
+        makedepends = python-sphinx_rtd_theme
         depends = brotli
         depends = gettext
-        depends = gnurl
         depends = gnutls
         depends = iptables
         depends = jansson
+        depends = libcurl-gnutls
         depends = libextractor
         depends = libgcrypt
         depends = libidn2
@@ -27,6 +29,7 @@ pkgbase = gnunet
         depends = libsodium
         depends = libtool
         depends = libunistring
+        depends = miniupnpc
         depends = nss
         depends = openssl
         depends = sqlite
@@ -34,14 +37,12 @@ pkgbase = gnunet
         depends = zlib
         optdepends = bluez: for bluetooth transport
         optdepends = gnunet-gtk: for handling the gnunet:// URI scheme
-        optdepends = libgabe: for Attribute-Based Encryption
+        optdepends = jose: for re:claimID OpenID Connect plugin
         optdepends = libogg: for conversation service
         optdepends = libpabc: for re:claimID zero-knowledge privacy credentials
         optdepends = libpulse: for conversation service
-        optdepends = miniupnpc: for NAT uPnP support
         optdepends = mysql: for an alternative to sqlite in the database plugin
         optdepends = opus: for conversation service
-        optdepends = pbc: for Attribute-Based Encryption
         optdepends = postgresql: for an alternative to sqlite in the database plugin
         optdepends = python: for test suite
         optdepends = texi2mdoc: for automatic mdoc generation
@@ -51,21 +52,19 @@ pkgbase = gnunet
         conflicts = gnunet-git
         conflicts = gnunet-bin
         backup = etc/gnunet.conf
-        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.0.tar.gz
-        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.0.tar.gz.sig
+        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.6.tar.gz
+        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.6.tar.gz.sig
         source = gnunet-system.service
         source = gnunet.sysusers
         source = gnunet.tmpfiles
-        source = gnunet-uri.desktop
         source = gnunet-user.conf
         source = gnunet-user.service
         validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A
-        sha256sums = 6b2f7bf34c3c3986f2c294f04e881dda9db8ef636c0e78ebcf8084b8a47d49ca
+        sha256sums = 249358ef3b10ce99810781fedaec526a6eab943c120e4bba096aedf91c1afc40
         sha256sums = SKIP
         sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262
         sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
         sha256sums = 5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0
-        sha256sums = 98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7
         sha256sums = 3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2
         sha256sums = 60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5
 
diff --git a/contrib/packages/arch/gnunet/PKGBUILD b/contrib/packages/arch/gnunet/PKGBUILD
index 2dfcdd6ec..1cef4dcec 100644
--- a/contrib/packages/arch/gnunet/PKGBUILD
+++ b/contrib/packages/arch/gnunet/PKGBUILD
@@ -5,28 +5,27 @@
 # Contributor: wahnby <wahnby AT yahoo DOT fr>
 
 pkgname='gnunet'
-pkgver='0.17.0'
+pkgver='0.17.6'
 pkgrel=1
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
 license=('AGPL')
 conflicts=("${pkgname}-git" "${pkgname}-bin")
-depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson'
+depends=('brotli' 'gettext' 'gnutls' 'iptables' 'jansson' 'libcurl-gnutls'
          'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium'
-         'libtool' 'libunistring' 'nss' 'openssl' 'sqlite' 'which' 'zlib')
+         'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which'
+         'zlib')
 makedepends=('bluez-libs' 'libpulse' 'libtool' 'opus' 'pkgconfig' 'postgresql'
-             'python')
+             'python' 'python-sphinx' 'python-sphinx_rtd_theme')
 optdepends=('bluez: for bluetooth transport'
             'gnunet-gtk: for handling the gnunet:// URI scheme'
-            'libgabe: for Attribute-Based Encryption'
+            'jose: for re:claimID OpenID Connect plugin'
             'libogg: for conversation service'
             'libpabc: for re:claimID zero-knowledge privacy credentials'
             'libpulse: for conversation service'
-            'miniupnpc: for NAT uPnP support'
             'mysql: for an alternative to sqlite in the database plugin'
             'opus: for conversation service'
-            'pbc: for Attribute-Based Encryption'
             'postgresql: for an alternative to sqlite in the database plugin'
             'python: for test suite'
             'texi2mdoc: for automatic mdoc generation'
@@ -38,17 +37,15 @@ source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
         "${pkgname}-system.service"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        "${pkgname}-uri.desktop"
         "${pkgname}-user.conf"
         "${pkgname}-user.service")
 install="${pkgname}.install"
 validpgpkeys=('3D11063C10F98D14BD24D1470B0998EF86F59B6A')
-sha256sums=('6b2f7bf34c3c3986f2c294f04e881dda9db8ef636c0e78ebcf8084b8a47d49ca'
+sha256sums=('249358ef3b10ce99810781fedaec526a6eab943c120e4bba096aedf91c1afc40'
             'SKIP'
             '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262'
             '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
             '5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0'
-            '98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7'
             '3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2'
             '60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5')
 
@@ -92,10 +89,6 @@ package() {
         install -Dm644 "${srcdir}/${pkgname}.tmpfiles" \
                 "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 
-        install -dm755 "${pkgdir}/usr/share/applications"
-        install -Dm644 "${srcdir}/${pkgname}-uri.desktop" \
-                "${pkgdir}/usr/share/applications/${pkgname}-uri.desktop"
-
         install -dm700 "${pkgdir}/etc/skel/.config"
         install -Dm600 "${srcdir}/${pkgname}-user.conf" \
                 "${pkgdir}/etc/skel/.config/${pkgname}.conf"
diff --git a/contrib/packages/arch/gnunet/gnunet-uri.desktop b/contrib/packages/arch/gnunet/gnunet-uri.desktop
deleted file mode 100644
index 4f847d20f..000000000
--- a/contrib/packages/arch/gnunet/gnunet-uri.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=GNUnet URI
-Exec=gnunet-uri %u
-GenericName=URI handler for the GNUnet network
-Icon=gnunet
-Type=Application
-Terminal=false
-NoDisplay=true
-MimeType=x-scheme-handler/gnunet;