diff options
| author |   Leonardo Boshell <leonardop@gentoo.org> | 2005-05-30 06:31:59 +0000 |
|---|---|---|
| committer | Leonardo Boshell <leonardop@gentoo.org> | 2005-05-30 06:31:59 +0000 |
| commit | 80d7a658f0b0a3f4a476de0355e69b2b6a7357a3 (patch) | |
| tree | e3ba9981eab8f57bd837f8a63050ccc137e7a238 /net-libs/libsoup/files | |
| parent | Added sparc stable keyword (diff) | |
| download | gentoo-2-80d7a658f0b0a3f4a476de0355e69b2b6a7357a3.tar.gz gentoo-2-80d7a658f0b0a3f4a476de0355e69b2b6a7357a3.tar.bz2 gentoo-2-80d7a658f0b0a3f4a476de0355e69b2b6a7357a3.zip | |
Marking 2.2.3 stable (x86). Modified patch for 1.99.28 to fix bug #82654.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-libs/libsoup/files')
| -rw-r--r-- | net-libs/libsoup/files/digest-libsoup-2.2.0 | 1 | ||||
| -rw-r--r-- | net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch | 11 | ||||
| -rw-r--r-- | net-libs/libsoup/files/libsoup-1.99.28-gnutls.patch | 48 |
3 files changed, 48 insertions, 12 deletions
diff --git a/net-libs/libsoup/files/digest-libsoup-2.2.0 b/net-libs/libsoup/files/digest-libsoup-2.2.0 deleted file mode 100644 index 907c0f808dcf..000000000000 --- a/net-libs/libsoup/files/digest-libsoup-2.2.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 c47b1985e4e55a0916db6888a7374a92 libsoup-2.2.0.tar.bz2 403612 diff --git a/net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch b/net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch deleted file mode 100644 index 0eb987dcc7a0..000000000000 --- a/net-libs/libsoup/files/libsoup-1.99.26-gnutls_1.0.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u libsoup/soup-gnutls.c.old libsoup/soup-gnutls.c ---- libsoup/soup-gnutls.c.old 2004-01-20 01:00:23.000000000 +0000 -+++ libsoup/soup-gnutls.c 2004-01-20 01:05:17.000000000 +0000 -@@ -58,7 +58,6 @@ - - if (status & GNUTLS_CERT_INVALID || - status & GNUTLS_CERT_NOT_TRUSTED || -- status & GNUTLS_CERT_CORRUPTED || - status & GNUTLS_CERT_REVOKED) - { - g_warning ("The certificate is not trusted."); diff --git a/net-libs/libsoup/files/libsoup-1.99.28-gnutls.patch b/net-libs/libsoup/files/libsoup-1.99.28-gnutls.patch new file mode 100644 index 000000000000..20b4d4ef78c5 --- /dev/null +++ b/net-libs/libsoup/files/libsoup-1.99.28-gnutls.patch @@ -0,0 +1,48 @@ +diff -NurdB libsoup-1.99.28/libsoup/soup-gnutls.c libsoup-1.99.28-patched/libsoup/soup-gnutls.c +--- libsoup-1.99.28/libsoup/soup-gnutls.c 2003-03-31 17:32:48.000000000 -0500 ++++ libsoup-1.99.28-patched/libsoup/soup-gnutls.c 2005-05-30 00:20:21.000000000 -0500 +@@ -76,8 +76,9 @@ + } + + if (status & GNUTLS_CERT_INVALID || ++#ifdef GNUTLS_CERT_NOT_TRUSTED + status & GNUTLS_CERT_NOT_TRUSTED || +- status & GNUTLS_CERT_CORRUPTED || ++#endif + status & GNUTLS_CERT_REVOKED) + { + g_warning ("The certificate is not trusted."); +@@ -328,31 +329,19 @@ + static gboolean + init_dh_params (void) + { +- gnutls_datum prime, generator; +- + if (gnutls_dh_params_init (&dh_params) != 0) + goto THROW_CREATE_ERROR; + +- if (gnutls_dh_params_generate (&prime, &generator, DH_BITS) != 0) +- goto THROW_CREATE_ERROR; +- +- if (gnutls_dh_params_set (dh_params, prime, generator, DH_BITS) != 0) ++ if (gnutls_dh_params_generate2 (dh_params, DH_BITS) != 0) + goto THROW_CREATE_ERROR; + +- free (prime.data); +- free (generator.data); +- + return TRUE; + +- THROW_CREATE_ERROR: ++THROW_CREATE_ERROR: + if (dh_params) { + gnutls_dh_params_deinit (dh_params); + dh_params = NULL; + } +- if (prime.data) +- free (prime.data); +- if (generator.data) +- free (generator.data); + return FALSE; + } + |