- merged from DEVEL

Changed files:
    libsoup-gnutls.patch -> 1.3

diff --git a/libsoup-gnutls.patch b/libsoup-gnutls.patch
index 1f963209c913c93488bf3d9c49015ad4e44fd708..83942eafdcb9d3f2975a8137a02d2ee2f85a33d7 100644 (file)
--- a/libsoup-gnutls.patch
+++ b/libsoup-gnutls.patch
@@ -1,11 +1,19 @@
-diff -Nuard libsoup-1.99.26.orig/libsoup/soup-gnutls.c libsoup-1.99.26/libsoup/soup-gnutls.c
---- libsoup-1.99.26.orig/libsoup/soup-gnutls.c 2003-04-01 00:32:48.000000000 +0200
-+++ libsoup-1.99.26/libsoup/soup-gnutls.c      2003-11-22 14:19:35.211326392 +0100
-@@ -77,7 +77,5 @@
+diff -urN aa/libsoup-2.1.7/libsoup/soup-gnutls.c libsoup-2.1.7/libsoup/soup-gnutls.c
+--- aa/libsoup-2.1.7/libsoup/soup-gnutls.c     2004-02-11 17:19:26.000000000 +0100
++++ libsoup-2.1.7/libsoup/soup-gnutls.c        2004-02-22 16:00:07.795638536 +0100
+@@ -20,6 +20,7 @@
+ #include <glib.h>
+ 
+ #include <gnutls/gnutls.h>
++#include <gnutls/x509.h>
+ 
+ #include "soup-ssl.h"
+ #include "soup-misc.h"
+@@ -57,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.");