diff options
Diffstat (limited to 'user/glib-networking')
| -rw-r--r-- | user/glib-networking/APKBUILD | 8 | ||||
| -rw-r--r-- | user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch | 31 |
2 files changed, 3 insertions, 36 deletions
diff --git a/user/glib-networking/APKBUILD b/user/glib-networking/APKBUILD index 83ee6af4a..c0ef9ac59 100644 --- a/user/glib-networking/APKBUILD +++ b/user/glib-networking/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=glib-networking -pkgver=2.60.1 +pkgver=2.60.2 _ver=${pkgver%.*} pkgrel=0 pkgdesc="Networking support for GLib" @@ -12,8 +12,7 @@ depends="ca-certificates" makedepends="bash glib-dev gnutls-dev gsettings-desktop-schemas-dev intltool libgcrypt-dev libproxy-dev meson ninja p11-kit-dev" subpackages="$pkgname-lang" -source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz - glib-networking-2.60-new-gnutls-cert-error-fix.patch" +source="https://download.gnome.org/sources/glib-networking/$_ver/glib-networking-$pkgver.tar.xz" prepare() { cd "$builddir" @@ -38,5 +37,4 @@ package() { rm -f "$pkgdir"/usr/lib/gio/modules/*.a } -sha512sums="a40a7e9678076db1a469f0d8ffdcb0c6658ef96ff1d9637299fbb07985f4c42bae3f1415f8df15242718420d20eb90de93253a00d1f6a347110b3f8a74bcc717 glib-networking-2.60.1.tar.xz -b9d3d744aec5337553e228ff1ee0616b1d79d1766ef9d87e644706a154f8e6151b15651b73a7073482e5cbe20b54ac78bd34f7ad77ebf0d34c42d969b4315241 glib-networking-2.60-new-gnutls-cert-error-fix.patch" +sha512sums="bfb8c716e78dfce997baaeb8aaafc1f187aa18fabee0197211f741d6175c21760e8eb5f514711e12f19ed7d7a0e4931dc7469b0ba778dc0e354c9123cf5a67f1 glib-networking-2.60.2.tar.xz" diff --git a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch b/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch deleted file mode 100644 index ab04dae3e..000000000 --- a/user/glib-networking/glib-networking-2.60-new-gnutls-cert-error-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1ce6b40da8ecbf997c5522a592a122e805aa81c4 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@igalia.com> -Date: Wed, 3 Apr 2019 18:00:55 -0500 -Subject: [PATCH] gnutls: Handle new GNUTLS_E_CERTIFICATE_REQUIRED - -This new error in GnuTLS 3.6.7 should correspond to -G_TLS_ERROR_CERTIFICATE_REQUIRED. This fixes our client auth tests when -run with GnuTLS 3.6.7. - -Fixes #70 ---- - tls/gnutls/gtlsconnection-gnutls.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c -index 27bbbcd..774d668 100644 ---- a/tls/gnutls/gtlsconnection-gnutls.c -+++ b/tls/gnutls/gtlsconnection-gnutls.c -@@ -1062,7 +1062,11 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, - else - return 0; - } -- else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) -+ else if (status == GNUTLS_E_NO_CERTIFICATE_FOUND -+#ifdef GNUTLS_E_CERTIFICATE_REQUIRED -+ || status == GNUTLS_E_CERTIFICATE_REQUIRED /* Added in GnuTLS 3.6.7 */ -+#endif -+ ) - { - g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_CERTIFICATE_REQUIRED, - _("TLS connection peer did not send a certificate")); |