fix #79161

Package-Manager: portage-2.0.51-r14

5 files changed, 24 insertions, 24 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index a12c1a114771..d3efd4042ba4 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsoup
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.44 2004/12/29 03:20:41 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.45 2005/01/23 01:31:27 swtaylor Exp $
+
+  22 Jan 2005; Scott W Taylor <swtaylor@gentoo.org> libsoup-2.2.1.ebuild:
+  nuke GNUTLS_CERT_NOT_TRUSTED which does not exist in gnutls-1.1.23. closes
+  #79161
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 7dcca1814886..8f6268463921 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2aa1c805ea88cefa0672910825b58b4d ChangeLog 5026
-MD5 187c37fe84070f31c16d297ed8159c28 libsoup-2.2.1.ebuild 716
+MD5 7f5ad91fdd0c1fe30a1a8e04847a2d99 libsoup-2.2.1.ebuild 861
+MD5 b958bc1738b685810de6d8ae87acac9a libsoup-2.2.0.ebuild 719
+MD5 5130c7db5f80bcd7d34f94f2027b39e3 ChangeLog 5188
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 f0367542d06803b435ff449a642e8751 libsoup-1.99.28.ebuild 1386
-MD5 9b896b51bc7dbfabbb18d3697240b536 libsoup-2.2.0.ebuild 717
-MD5 5ba8cbd6308ea46629bb3e6ef7232c4a files/digest-libsoup-2.2.1 66
-MD5 6128cc7bbf088e07b4040e8296a7c57b files/libsoup-1.99.26-msn.patch 627
+MD5 2f900fb0cd5029c807dfc460b8b2c07c libsoup-1.99.28.ebuild 1388
 MD5 09a0c3f27613d90ffeb8abb875598ace files/libsoup-1.99.26-with_ssl.patch 2861
+MD5 f6f42e462e494171a0aa1ee21232cd63 files/digest-libsoup-2.2.0 66
+MD5 5ba8cbd6308ea46629bb3e6ef7232c4a files/digest-libsoup-2.2.1 66
 MD5 4cf83ac1dc09f7d21c0a29bf231bfe94 files/libsoup-1.99.26-gnutls_1.0.patch 414
+MD5 6128cc7bbf088e07b4040e8296a7c57b files/libsoup-1.99.26-msn.patch 627
 MD5 6c44713499ec52c81ca81ed58a6286bf files/digest-libsoup-1.99.28 68
-MD5 f6f42e462e494171a0aa1ee21232cd63 files/digest-libsoup-2.2.0 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.14 (GNU/Linux)
-
-iD8DBQFB7vYAroRuSHgZdywRAit8AJ48PILBEBrlrqd1vsfh6DIc4j9bHgCbBKbF
-gZffS+jh3mmvl7PpxKChbm8=
-=5qXh
------END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-1.99.28.ebuild b/net-libs/libsoup/libsoup-1.99.28.ebuild
index e85438f750d6..8ef39c8f0642 100644
--- a/net-libs/libsoup/libsoup-1.99.28.ebuild
+++ b/net-libs/libsoup/libsoup-1.99.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-1.99.28.ebuild,v 1.11 2004/11/08 19:44:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-1.99.28.ebuild,v 1.12 2005/01/23 01:31:27 swtaylor Exp $
 
 inherit gnome.org libtool eutils
 
diff --git a/net-libs/libsoup/libsoup-2.2.0.ebuild b/net-libs/libsoup/libsoup-2.2.0.ebuild
index 059a5728b76d..efd8a66b99ef 100644
--- a/net-libs/libsoup/libsoup-2.2.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.0.ebuild,v 1.4 2004/11/08 19:44:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.0.ebuild,v 1.5 2005/01/23 01:31:27 swtaylor Exp $
 
 inherit gnome2
 
diff --git a/net-libs/libsoup/libsoup-2.2.1.ebuild b/net-libs/libsoup/libsoup-2.2.1.ebuild
index 6964b405cb23..988afe1822ce 100644
--- a/net-libs/libsoup/libsoup-2.2.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2005/01/20 00:05:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.1.ebuild,v 1.13 2005/01/23 01:31:27 swtaylor Exp $
 
 inherit gnome2
 
@@ -22,3 +22,9 @@ DEPEND="${RDEPEND}
 
 G2CONF="${G2CONF} $(use_enable ssl) $(use_enable ipv6)"
 DOCS="AUTHORS ChangeLog README* TODO"
+
+src_unpack() {
+	unpack ${A}
+	has_version ">=net-libs/gnutls-1.1.23" && sed -e's|GNUTLS_CERT_NOT_TRUSTED|0|g' -i ${S}/libsoup/soup-gnutls.c
+}
+