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 1S55De-0006CM-OE for garchives@archives.gentoo.org; Wed, 07 Mar 2012 00:59:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4372BE0D3E; Wed, 7 Mar 2012 00:58:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EC301E0D3E for ; Wed, 7 Mar 2012 00:58:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F36941B400A for ; Wed, 7 Mar 2012 00:58:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D2C76E5428 for ; Wed, 7 Mar 2012 00:58:53 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1331081787.3b3e708aa0aa0e9c8687a5f4338d0b9447171fe1.tetromino@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/files/tls-async-crasher.patch net-libs/glib-networking/glib-networking-2.31.20.ebuild 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: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 3b3e708aa0aa0e9c8687a5f4338d0b9447171fe1 X-VCS-Branch: master Date: Wed, 7 Mar 2012 00:58:53 +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: 4252ebef-d4ee-4251-afaa-872c02be3f95 X-Archives-Hash: a0fba2fad2f6d2d141f5c3ef947bab04 commit: 3b3e708aa0aa0e9c8687a5f4338d0b9447171fe1 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Mar 7 00:54:03 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Mar 7 00:56:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3b3e708a net-libs/glib-networking: 2.31.6 =E2=86=92 2.31.20 Patches were applied upstream. Update -D*DEPRECATED-disabling sed from gentoo-x86. --- .../files/skip-broken-assert-in-pkcs11-tests.patch | 45 --------------= ------ .../glib-networking/files/tls-async-crasher.patch | 33 -------------- ....31.6.ebuild =3D> glib-networking-2.31.20.ebuild} | 24 +++++++--- 3 files changed, 17 insertions(+), 85 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 deleted file mode 100644 index 18b815e..0000000 --- a/net-libs/glib-networking/files/skip-broken-assert-in-pkcs11-tests.p= atch +++ /dev/null @@ -1,45 +0,0 @@ -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/files/tls-async-crasher.patch b/net= -libs/glib-networking/files/tls-async-crasher.patch deleted file mode 100644 index 4ea8eb1..0000000 --- a/net-libs/glib-networking/files/tls-async-crasher.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 51938b5e9771095f1d0feb1cab3e6d402ca7f6da Mon Sep 17 00:00:00 2001 -From: Dan Winship -Date: Thu, 26 Jan 2012 12:56:51 +0000 -Subject: gnutls: fix an async handshake crash - -g_tls_connection_gnutls_handshake_async() would cause a crash if the -handshake either succeeded or failed immediately (rather than getting -an EAGAIN after making partial progress). - -https://bugzilla.gnome.org/show_bug.cgi?id=3D658771 ---- -diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnect= ion-gnutls.c -index f1655d6..4bed055 100644 ---- a/tls/gnutls/gtlsconnection-gnutls.c -+++ b/tls/gnutls/gtlsconnection-gnutls.c -@@ -969,6 +969,7 @@ g_tls_connection_gnutls_handshake_async (GTlsConnect= ion *conn, - g_simple_async_result_set_op_res_gboolean (simple, TRUE); - g_simple_async_result_complete_in_idle (simple); - g_object_unref (simple); -+ return; - } - else if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)= ) - { -@@ -976,6 +977,7 @@ g_tls_connection_gnutls_handshake_async (GTlsConnect= ion *conn, - g_error_free (error); - g_simple_async_result_complete_in_idle (simple); - g_object_unref (simple); -+ return; - } - else if (error) - g_error_free (error); --- -cgit v0.9.0.2 diff --git a/net-libs/glib-networking/glib-networking-2.31.6.ebuild b/net= -libs/glib-networking/glib-networking-2.31.20.ebuild similarity index 76% rename from net-libs/glib-networking/glib-networking-2.31.6.ebuild rename to net-libs/glib-networking/glib-networking-2.31.20.ebuild index 84959b4..9ea9568 100644 --- a/net-libs/glib-networking/glib-networking-2.31.6.ebuild +++ b/net-libs/glib-networking/glib-networking-2.31.20.ebuild @@ -33,13 +33,6 @@ DEPEND=3D"${RDEPEND} test? ( sys-apps/dbus[X] )" # 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" -} - pkg_setup() { # AUTHORS, ChangeLog are empty DOCS=3D"NEWS README" @@ -52,6 +45,23 @@ pkg_setup() { $(use_with ssl gnutls)" } =20 +src_prepare() { + gnome2_src_prepare + + # Drop DEPRECATED flags + sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED *\\:\\:g' \ + -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ + -i Makefile.{decl,in} \ + proxy/gnome/Makefile.in \ + proxy/libproxy/Makefile.in \ + proxy/tests/Makefile.in \ + tls/gnutls/Makefile.in \ + tls/pkcs11/Makefile.{am,in} \ + tls/tests/Makefile.in || die + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ + tls/pkcs11/Makefile.{am,in} || die +} + src_test() { Xemake check }