[arch-commits] Commit in glib-networking/trunk (2 files)

[Jan Steffens]

    Date: Thursday, June 11, 2015 @ 17:39:39
  Author: heftig
Revision: 240587

Use PKCS11

Added:
  glib-networking/trunk/0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
Modified:
  glib-networking/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch |   36 ++++++++++
 PKGBUILD                                                        |   13 ++-
 2 files changed, 46 insertions(+), 3 deletions(-)

Added: 0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
===================================================================
--- 0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch	                        (rev 0)
+++ 0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch	2015-06-11 15:39:39 UTC (rev 240587)
@@ -0,0 +1,36 @@
+From ad464b856318691c1277dd3239573d18dd04bb08 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 28 Apr 2015 22:09:33 +0200
+Subject: [PATCH] gnutls: Switch backend priorities so gnutls-pkcs11 is
+ preferred
+
+---
+ tls/gnutls/gtlsbackend-gnutls-pkcs11.c | 2 +-
+ tls/gnutls/gtlsbackend-gnutls.c        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tls/gnutls/gtlsbackend-gnutls-pkcs11.c b/tls/gnutls/gtlsbackend-gnutls-pkcs11.c
+index 48be45e..429acbb 100644
+--- a/tls/gnutls/gtlsbackend-gnutls-pkcs11.c
++++ b/tls/gnutls/gtlsbackend-gnutls-pkcs11.c
+@@ -61,5 +61,5 @@ g_tls_backend_gnutls_pkcs11_register (GIOModule *module)
+   g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME,
+ 				  g_tls_backend_gnutls_pkcs11_get_type(),
+ 				  "gnutls-pkcs11",
+-				  -5);
++				  0);
+ }
+diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c
+index 55ec1a5..ca79b92 100644
+--- a/tls/gnutls/gtlsbackend-gnutls.c
++++ b/tls/gnutls/gtlsbackend-gnutls.c
+@@ -310,5 +310,5 @@ g_tls_backend_gnutls_register (GIOModule *module)
+   g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME,
+ 				  g_tls_backend_gnutls_get_type(),
+ 				  "gnutls",
+-				  0);
++				  -5);
+ }
+-- 
+2.3.6
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-11 15:32:34 UTC (rev 240586)
+++ PKGBUILD	2015-06-11 15:39:39 UTC (rev 240587)
@@ -3,7 +3,7 @@
 
 pkgname=glib-networking
 pkgver=2.44.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Network-related giomodules for glib"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
@@ -11,9 +11,16 @@
 depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas)
 makedepends=(intltool)
 install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch)
+sha256sums=('8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346'
+            '5d12c3b8905f67a93adc884920f7e062404b723e9d2e56f935b914e58a20b29e')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../0001-gnutls-Switch-backend-priorities-so-gnutls-pkcs11-is.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \