r51 - in videolan/vlc/debian: . patches

[xtophe-guest at alioth.debian.org]

Author: xtophe-guest
Date: 2006-05-30 22:06:53 +0000 (Tue, 30 May 2006)
New Revision: 51

Added:
   videolan/vlc/debian/patches/020_certificates_paths.diff
Modified:
   videolan/vlc/debian/changelog
   videolan/vlc/debian/patches/series
Log:
Patch to look also in /etc/ssl/certs for certificates (Closes: #365239)


Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog	2006-05-24 21:58:37 UTC (rev 50)
+++ videolan/vlc/debian/changelog	2006-05-30 22:06:53 UTC (rev 51)
@@ -2,14 +2,15 @@
 
   * debian/control
     + Build-depends on libshout3-dev
-  
+
   * debian/patches
     + xulrunner patch has been applied upstream
+    + Look at the debian default place for TLS certificates (Closes: #365239)
 
   * debian/wxvlc.desktop is now supplied by upstream
+ 
+ -- Christophe Mutricy <xtophe at coloc.plus.com>  Tue, 30 May 2006 23:02:35 +0100
 
- -- Christophe Mutricy <xtophe at videolan.org>  Wed, 17 May 2006 20:11:44 +0100
-
 vlc (0.8.5.debian-1) unstable; urgency=low
 
   * New upstream release (Closes: #364934).

Added: videolan/vlc/debian/patches/020_certificates_paths.diff
===================================================================
--- videolan/vlc/debian/patches/020_certificates_paths.diff	2006-05-24 21:58:37 UTC (rev 50)
+++ videolan/vlc/debian/patches/020_certificates_paths.diff	2006-05-30 22:06:53 UTC (rev 51)
@@ -0,0 +1,15 @@
+Index: modules/misc/gnutls.c
+===================================================================
+--- modules/misc/gnutls.c	(revision 15766)
++++ modules/misc/gnutls.c	(working copy)
+@@ -614,6 +614,10 @@
+                                 p_sys->x509_cred, psz_path, VLC_FALSE );
+             free( psz_path );
+         }
++        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

Modified: videolan/vlc/debian/patches/series
===================================================================
--- videolan/vlc/debian/patches/series	2006-05-24 21:58:37 UTC (rev 50)
+++ videolan/vlc/debian/patches/series	2006-05-30 22:06:53 UTC (rev 51)
@@ -1,3 +1,4 @@
 010_no-wx-updates.diff 
 010_osdmenu-paths.diff 
 020_freetype_font.diff
+020_certificates_paths.diff