[gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/

[Priit Laes]

commit:     1c5036dc904539163657a337503bf34769b1ec82
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Jan 29 09:39:16 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Jan 29 09:39:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1c5036dc

net-libs/glib-networking: Add pkcs11 support

---
 .../files/skip-broken-assert-in-pkcs11-tests.patch |   45 ++++++++++++++++++++
 .../glib-networking/glib-networking-2.31.6.ebuild  |   14 ++++--
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch b/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch
new file mode 100644
index 0000000..18b815e
--- /dev/null
+++ b/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch
@@ -0,0 +1,45 @@
+From b35f613474c3eb1f037191b29976527cf27807dd Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@×××××.org>
+Date: Sun, 29 Jan 2012 11:31:04 +0200
+Subject: [PATCH] Skip broken assert in pkcs11 tests
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668945
+---
+ tls/tests/pkcs11-pin.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/tls/tests/pkcs11-pin.c b/tls/tests/pkcs11-pin.c
+index d4051f9..250307b 100644
+--- a/tls/tests/pkcs11-pin.c
++++ b/tls/tests/pkcs11-pin.c
+@@ -101,13 +101,17 @@ test_set_get_value (TestPin        *test,
+ 
+   value = g_tls_password_get_value (test->pin, &n_value);
+   g_assert_cmpuint (n_value, ==, 6);
++#if 0
+   g_assert_cmpstr ((const gchar *)value, ==, "secret");
++#endif
+ 
+   g_tls_password_set_value (test->pin, (const guchar *)"other", 5);
+ 
+   value = g_tls_password_get_value (test->pin, &n_value);
+   g_assert_cmpuint (n_value, ==, 5);
++#if 0
+   g_assert_cmpstr ((const gchar *)value, ==, "other");
++#endif
+ }
+ 
+ static void
+@@ -124,7 +128,9 @@ test_internal_pin (TestPin        *test,
+ 
+   value = p11_kit_pin_get_value (pin, &n_value);
+   g_assert_cmpuint (n_value, ==, 6);
++#if 0
+   g_assert_cmpstr ((const gchar *)value, ==, "secret");
++#endif
+ 
+   p11_kit_pin_unref (pin);
+ }
+-- 
+1.7.8.4
+

diff --git a/net-libs/glib-networking/glib-networking-2.31.6.ebuild b/net-libs/glib-networking/glib-networking-2.31.6.ebuild
index 10a0261..84959b4 100644
--- a/net-libs/glib-networking/glib-networking-2.31.6.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.31.6.ebuild
@@ -14,12 +14,14 @@ HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy +ssl test" # pkcs11
+IUSE="+gnome +libproxy pkcs11 +ssl test"
 
-# pkcs support requires gnutls-2.12.8, p11-kit-0.8
 RDEPEND=">=dev-libs/glib-2.31.6:2
 	gnome? ( gnome-base/gsettings-desktop-schemas )
 	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
+	pkcs11? (
+		>=app-crypt/p11-kit-0.8
+		>=net-libs/gnutls-2.12.8[pkcs11] )
 	ssl? (
 		app-misc/ca-certificates
 		>=net-libs/gnutls-2.11.0 )
@@ -32,7 +34,10 @@ DEPEND="${RDEPEND}
 # eautoreconf needs >=sys-devel/autoconf-2.65:2.5
 
 src_prepare() {
+	# Applied upstream
 	epatch "${FILESDIR}/tls-async-crasher.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=668945
+	epatch "${FILESDIR}/skip-broken-assert-in-pkcs11-tests.patch"
 }
 
 pkg_setup() {
@@ -43,9 +48,8 @@ pkg_setup() {
 		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
 		$(use_with gnome gnome-proxy)
 		$(use_with libproxy)
-		$(use_with ssl gnutls)
-		--without-pkcs11"
-		#$(use_with pkcs11 pkcs11)
+		$(use_with pkcs11)
+		$(use_with ssl gnutls)"
 }
 
 src_test() {