r897 - /videolan/vlc/debian/patches/101_certificates_paths.diff

[xtophe-guest at users.alioth.debian.org]

Author: xtophe-guest
Date: Thu Oct 18 00:06:30 2007
New Revision: 897

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=897
Log:
refresh gnutls patch

Modified:
    videolan/vlc/debian/patches/101_certificates_paths.diff

Modified: videolan/vlc/debian/patches/101_certificates_paths.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/101_certificates_paths.diff?rev=897&op=diff
==============================================================================
--- videolan/vlc/debian/patches/101_certificates_paths.diff (original)
+++ videolan/vlc/debian/patches/101_certificates_paths.diff Thu Oct 18 00:06:30 2007
@@ -3,13 +3,13 @@
 --- vlc-trunk/modules/misc/gnutls.c    (revision 18345)
 +++ vlc-trunk/modules/misc/gnutls.c    (working copy)
 @@ -728,6 +728,10 @@     
-         sprintf (path, "%s/ca-certificates.crt", datadir);
-         gnutls_Addx509File ((vlc_object_t *)p_session,
-                             p_sys->x509_cred, path, VLC_FALSE);
-+        gnutls_Addx509File( (vlc_object_t *)p_session,
-+                            p_sys->x509_cred,
-+                            "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE );
+     sprintf (path, "%s/ca-certificates.crt", datadir);
+     gnutls_Addx509File ((vlc_object_t *)p_session,
+                         p_sys->x509_cred, path, VLC_FALSE);
++    gnutls_Addx509File( (vlc_object_t *)p_session,
++                        p_sys->x509_cred,
++                        "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE );
 +
-         p_session->pf_handshake = gnutls_HandshakeAndValidate;
-     }
-     else
+     p_session->pf_handshake = gnutls_HandshakeAndValidate;
+     /*p_session->pf_handshake = gnutls_ContinueHandshake;*/
+