summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-10-29 20:05:13 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-10-29 20:05:13 +0000
commitbc384ab4b398441f2441483e810d1ffbf9c6116f (patch)
treec34bc1ae9f88b23a813b712f140193970125a882 /net-libs/libsoup/files
parentFix dependencies. Restrict 2.4 and 2.5 Python ABIs (bug #343233). (diff)
downloadgentoo-2-bc384ab4b398441f2441483e810d1ffbf9c6116f.tar.gz
gentoo-2-bc384ab4b398441f2441483e810d1ffbf9c6116f.tar.bz2
gentoo-2-bc384ab4b398441f2441483e810d1ffbf9c6116f.zip
Clean up old revisions.
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libsoup/files')
-rw-r--r--net-libs/libsoup/files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch52
-rw-r--r--net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch42
2 files changed, 0 insertions, 94 deletions
diff --git a/net-libs/libsoup/files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch
deleted file mode 100644
index d63d81f014a6..000000000000
--- a/net-libs/libsoup/files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix Gentoo Bug 268592, patch adapted from upstream patch.
-
-Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in)
-Hence, to be applied ONLY when !gnome && doc
-
----
---- docs/reference/Makefile.am
-+++ docs/reference/Makefile.am
-@@ -13,7 +13,7 @@
- DOC_SOURCE_DIR=../../libsoup
-
- # Extra options to supply to gtkdoc-scan.
--SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED
-+SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED --rebuild-types
-
- # Extra options to supply to gtkdoc-scangobj.
- SCANGOBJ_OPTIONS=--type-init-func 'g_type_init(); g_thread_init(NULL)'
-@@ -38,6 +38,9 @@
- soup-proxy-resolver-libproxy.h soup-proxy-resolver-gconf.h \
- soup-proxy-resolver-static.h
-
-+IGNORE_HFILES += soup-cookie-jar-sqlite.h \
-+ soup-gnome.h soup-gnome-features.h
-+
- # Images to copy into HTML directory.
- HTML_IMAGES =
-
-@@ -61,7 +61,7 @@
- $(GNUTLS_CFLAGS) \
- $(LIBPROXY_LIBS)
-
--GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
-+GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la
-
- # include common portion ...
- include $(top_srcdir)/gtk-doc.make
---- docs/reference/libsoup-2.4-docs.sgml
-+++ docs/reference/libsoup-2.4-docs.sgml
-@@ -47,11 +47,13 @@
- <xi:include href="xml/soup-value-utils.xml"/>
- </chapter>
-
-+ <!--
- <chapter>
- <title>GNOME integration</title>
- <xi:include href="xml/soup-gnome-features.xml"/>
- <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
- </chapter>
-+ -->
-
- <chapter>
- <title>Low-level Networking API</title>
diff --git a/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch b/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch
deleted file mode 100644
index 5459e8c063e8..000000000000
--- a/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 139502583e065520e1c7a31e73c6e68969153d70 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@gmx.de>
-Date: Thu, 23 Jul 2009 16:03:34 +0200
-Subject: [PATCH] Allow version 1 CA certificates in clients
-
-This is done by setting the GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT
-flag while setting up the credentials and parsing the CA certificate
-file. This is necessary because without it, some releases of gnutls
-reject certificates that are currently in use by major sites, including
-Google.
-
-Setting the flag is safe in libsoup because the file is meant to
-contain only CA certificates. The main weakness around version 1
-certs is that personal certificates could be mistaken for CA certs,
-which shouldn't happen if libsoup is used as intended.
-
-Servers don't have the possibility to verify their clients, so this
-problem doesn't apply to them.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=589323
----
- libsoup/soup-gnutls.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
-index 46b4188..b4f0876 100644
---- a/libsoup/soup-gnutls.c
-+++ b/libsoup/soup-gnutls.c
-@@ -529,6 +529,10 @@ soup_ssl_get_client_credentials (const char *ca_file)
- creds = g_slice_new0 (SoupSSLCredentials);
- gnutls_certificate_allocate_credentials (&creds->creds);
-
-+ /* http://bugzilla.gnome.org/show_bug.cgi?id=589323 */
-+ gnutls_certificate_set_verify_flags (creds->creds,
-+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
-+
- if (ca_file) {
- creds->have_ca_file = TRUE;
- status = gnutls_certificate_set_x509_trust_file (
---
-1.6.3.3
-