From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RrRHo-0007Ft-5j for garchives@archives.gentoo.org; Sun, 29 Jan 2012 09:43:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AF7AE07B6; Sun, 29 Jan 2012 09:42:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BF543E07B6 for ; Sun, 29 Jan 2012 09:42:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E44C1B4025 for ; Sun, 29 Jan 2012 09:42:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 787A680042 for ; Sun, 29 Jan 2012 09:42:51 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1c5036dc904539163657a337503bf34769b1ec82.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/glib-networking/, net-libs/glib-networking/files/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.patch net-libs/glib-networking/glib-networking-2.31.6.ebuild X-VCS-Directories: net-libs/glib-networking/ net-libs/glib-networking/files/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 1c5036dc904539163657a337503bf34769b1ec82 Date: Sun, 29 Jan 2012 09:42:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ec5c50e6-dd09-4aeb-8820-e369b4190611 X-Archives-Hash: 9c2ae72bc9a7648d25f902b2c1489a2a commit: 1c5036dc904539163657a337503bf34769b1ec82 Author: Priit Laes plaes org> AuthorDate: Sun Jan 29 09:39:16 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Sun Jan 29 09:39:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D1c5036dc 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.p= atch @@ -0,0 +1,45 @@ +From b35f613474c3eb1f037191b29976527cf27807dd Mon Sep 17 00:00:00 2001 +From: Priit Laes +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=3D668945 +--- + 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, +=20 + value =3D g_tls_password_get_value (test->pin, &n_value); + g_assert_cmpuint (n_value, =3D=3D, 6); ++#if 0 + g_assert_cmpstr ((const gchar *)value, =3D=3D, "secret"); ++#endif +=20 + g_tls_password_set_value (test->pin, (const guchar *)"other", 5); +=20 + value =3D g_tls_password_get_value (test->pin, &n_value); + g_assert_cmpuint (n_value, =3D=3D, 5); ++#if 0 + g_assert_cmpstr ((const gchar *)value, =3D=3D, "other"); ++#endif + } +=20 + static void +@@ -124,7 +128,9 @@ test_internal_pin (TestPin *test, +=20 + value =3D p11_kit_pin_get_value (pin, &n_value); + g_assert_cmpuint (n_value, =3D=3D, 6); ++#if 0 + g_assert_cmpstr ((const gchar *)value, =3D=3D, "secret"); ++#endif +=20 + p11_kit_pin_unref (pin); + } +--=20 +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=3D"http://git.gnome.org/browse/glib-networki= ng/" LICENSE=3D"LGPL-2" SLOT=3D"0" KEYWORDS=3D"~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=3D"+gnome +libproxy +ssl test" # pkcs11 +IUSE=3D"+gnome +libproxy pkcs11 +ssl test" =20 -# pkcs support requires gnutls-2.12.8, p11-kit-0.8 RDEPEND=3D">=3Ddev-libs/glib-2.31.6:2 gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=3Dnet-libs/libproxy-0.4.6-r3 ) + pkcs11? ( + >=3Dapp-crypt/p11-kit-0.8 + >=3Dnet-libs/gnutls-2.12.8[pkcs11] ) ssl? ( app-misc/ca-certificates >=3Dnet-libs/gnutls-2.11.0 ) @@ -32,7 +34,10 @@ DEPEND=3D"${RDEPEND} # eautoreconf needs >=3Dsys-devel/autoconf-2.65:2.5 =20 src_prepare() { + # Applied upstream epatch "${FILESDIR}/tls-async-crasher.patch" + # https://bugzilla.gnome.org/show_bug.cgi?id=3D668945 + epatch "${FILESDIR}/skip-broken-assert-in-pkcs11-tests.patch" } =20 pkg_setup() { @@ -43,9 +48,8 @@ pkg_setup() { --with-ca-certificates=3D"${EPREFIX}"/etc/ssl/certs/ca-certificates.cr= t $(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)" } =20 src_test() {