r120 - in videolan/vlc/debian: . patches

[xtophe-guest at alioth.debian.org]

Author: xtophe-guest
Date: 2006-12-09 23:38:50 +0000 (Sat, 09 Dec 2006)
New Revision: 120

Modified:
   videolan/vlc/debian/changelog
   videolan/vlc/debian/patches/020_certificates_paths.diff
Log:
refresh gnutls patch


Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog	2006-11-27 22:37:16 UTC (rev 119)
+++ videolan/vlc/debian/changelog	2006-12-09 23:38:50 UTC (rev 120)
@@ -1,3 +1,9 @@
+vlc (0.9.0-svn6) experimental; urgency=low
+
+  * Refresh gnutls patch 
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Sat,  9 Dec 2006 23:34:17 +0000
+
 vlc (0.9.0-svn5) experimental; urgency=low
 
   * SONAME change.
@@ -2,3 +8,3 @@
 
- -- Christophe Mutricy <xtophe at coloc.plus.com>  Wed, 22 Nov 2006 22:45:02 +0000
+ -- Christophe Mutricy <xtophe at videolan.org>  Wed, 22 Nov 2006 22:45:02 +0000
 
@@ -8,9 +14,8 @@
 
   * Install puzzle and colorthres plugins in vlc-nox
   * Install libvlc-control.so in libvlc0
-  * foo
 
- -- Christophe Mutricy <xtophe at coloc.plus.com>  Sun, 19 Nov 2006 23:21:33 +0000
+ -- Christophe Mutricy <xtophe at videolan.org>  Sun, 19 Nov 2006 23:21:33 +0000
 
 vlc (0.9.0-svn3) experimental; urgency=low
 
@@ -67,7 +72,6 @@
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 25 Sep 2006 14:00:46 +0200
 
->>>>>>> .merge-right.r100
 vlc (0.8.6-svn20060918.debian-1) unstable; urgency=low
 
   * New upstream SVN snapshot, with a slightly saner version number.

Modified: videolan/vlc/debian/patches/020_certificates_paths.diff
===================================================================
--- videolan/vlc/debian/patches/020_certificates_paths.diff	2006-11-27 22:37:16 UTC (rev 119)
+++ videolan/vlc/debian/patches/020_certificates_paths.diff	2006-12-09 23:38:50 UTC (rev 120)
@@ -1,15 +1,14 @@
 Index: vlc-trunk/modules/misc/gnutls.c
 ===================================================================
---- vlc-trunk/modules/misc/gnutls.c	(revision 15766)
+--- vlc-trunk/modules/misc/gnutls.c	(revision 18345)
 +++ vlc-trunk/modules/misc/gnutls.c	(working copy)
-@@ -614,6 +614,10 @@
-                                 p_sys->x509_cred, psz_path, VLC_FALSE );
-             free( psz_path );
-         }
+         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_handshake2 = gnutls_HandshakeAndValidate;
      }
      else