Changed to use patch from http://bugzilla.ximian.com/show_bug.cgi?id=57811 to fix bug #79161

(Portage version: 2.0.51.16)

5 files changed, 28 insertions, 19 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 32be2aa27d8c..dc94f547bd60 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.48 2005/02/10 11:29:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.49 2005/02/18 23:09:34 dragonheart Exp $
+
+  19 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libsoup-2.2.2-gnutls.patch, libsoup-2.2.1.ebuild,
+  libsoup-2.2.2.ebuild:
+  Changed to use patch from Martin Wolf <pazo_bug@shiba.dk> in upstream bug
+  http://bugzilla.ximian.com/show_bug.cgi?id=57811 to fix bug #79161
 
   10 Feb 2005; Daniel Black <dragonheart@gentoo.org> libsoup-2.2.1.ebuild,
   libsoup-2.2.2.ebuild:
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index a9a8c8143785..aef7cfac0e84 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 70ad138eede9a411bcb2ec48a7111624 ChangeLog 5540
-MD5 35a413de2cb6e7310ea0c834f6dc54b7 libsoup-2.2.1.ebuild 881
-MD5 c787c30865dc4c40fb443337e591b69d libsoup-2.2.2.ebuild 890
+MD5 3349e9d219dabc51842dbf31decfba15 libsoup-2.2.1.ebuild 815
+MD5 aeae493dcc7251196a4f8a5e7d17a597 libsoup-2.2.2.ebuild 815
 MD5 b958bc1738b685810de6d8ae87acac9a libsoup-2.2.0.ebuild 719
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 2f900fb0cd5029c807dfc460b8b2c07c libsoup-1.99.28.ebuild 1388
@@ -14,10 +11,4 @@ MD5 6128cc7bbf088e07b4040e8296a7c57b files/libsoup-1.99.26-msn.patch 627
 MD5 09a0c3f27613d90ffeb8abb875598ace files/libsoup-1.99.26-with_ssl.patch 2861
 MD5 4cf83ac1dc09f7d21c0a29bf231bfe94 files/libsoup-1.99.26-gnutls_1.0.patch 414
 MD5 6c44713499ec52c81ca81ed58a6286bf files/digest-libsoup-1.99.28 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCC0WTmdTrptrqvGERAl1YAJ9qXbUvsO3yLnKrfIsDAchs43sVHwCdF51s
-egs98FqyfvQLy3kQG+2Y4Q4=
-=MxLJ
------END PGP SIGNATURE-----
+MD5 8236edc0e5949f46d2a27e747c310889 files/libsoup-2.2.2-gnutls.patch 336
diff --git a/net-libs/libsoup/files/libsoup-2.2.2-gnutls.patch b/net-libs/libsoup/files/libsoup-2.2.2-gnutls.patch
new file mode 100644
index 000000000000..cad63a4674f6
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.2.2-gnutls.patch
@@ -0,0 +1,10 @@
+--- libsoup-2.2.0/libsoup/soup-gnutls.c	2004-08-25 20:19:59.000000000 +0200
++++ libsoup/soup-gnutls.new.c	2004-09-08 03:39:45.189822392 +0200
+@@ -58,7 +58,6 @@
+ 	}
+ 
+ 	if (status & GNUTLS_CERT_INVALID ||
+-	    status & GNUTLS_CERT_NOT_TRUSTED ||
+ 	    status & GNUTLS_CERT_REVOKED)
+ 	{
+ 		g_warning ("The certificate is not trusted.");
diff --git a/net-libs/libsoup/libsoup-2.2.1.ebuild b/net-libs/libsoup/libsoup-2.2.1.ebuild
index c2cc1c9d9f34..6418ac5ab03a 100644
--- a/net-libs/libsoup/libsoup-2.2.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.1.ebuild,v 1.15 2005/02/10 11:29:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.1.ebuild,v 1.16 2005/02/18 23:09:34 dragonheart Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Soup is a SOAP implementation"
 HOMEPAGE="http://www.gnome.org/"
@@ -25,6 +25,7 @@ DOCS="AUTHORS ChangeLog README* TODO"
 
 src_unpack() {
 	unpack ${A}
-	has_version ">=net-libs/gnutls-1.1.23" && sed -e's|GNUTLS_CERT_NOT_TRUSTED|GNUTLS_CERT_INVALID|g' -i ${S}/libsoup/soup-gnutls.c
+	cd ${S}
+	epatch ${FILESDIR}/libsoup-2.2.2-gnutls.patch
 }
 
diff --git a/net-libs/libsoup/libsoup-2.2.2.ebuild b/net-libs/libsoup/libsoup-2.2.2.ebuild
index 062b7e19ee94..b5f1c69f8842 100644
--- a/net-libs/libsoup/libsoup-2.2.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.2.ebuild,v 1.2 2005/02/10 11:29:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.2.ebuild,v 1.3 2005/02/18 23:09:34 dragonheart Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Soup is a SOAP implementation"
 HOMEPAGE="http://www.gnome.org/"
@@ -25,6 +25,7 @@ DOCS="AUTHORS ChangeLog README* TODO"
 
 src_unpack() {
 	unpack ${A}
-	has_version ">=net-libs/gnutls-1.1.23" && sed -e's|GNUTLS_CERT_NOT_TRUSTED|GNUTLS_CERT_INVALID|g' -i ${S}/libsoup/soup-gnutls.c
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gnutls.patch
 }