[SCM] VLC media player packaging branch, sid, updated. debian/0.9.9a-1-2-gd47def7

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

The following commit has been merged in the sid branch:
commit 29333ee785fac4ed3588c2542b7aebd76a716b2e
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Mon Apr 6 23:51:11 2009 +0200

    Fix share/http/{old}/.hosts
    
    In vlc 0.9.8->0.9.9a, the default .hosts file was modified in error to
    an unsecure default

diff --git a/debian/patches/403_http_hosts.diff b/debian/patches/403_http_hosts.diff
new file mode 100644
index 0000000..d03f032
--- /dev/null
+++ b/debian/patches/403_http_hosts.diff
@@ -0,0 +1,69 @@
+commit cd4a14e2c43a3aadc63c2244932dca478ad75b18
+Author: Rémi Denis-Courmont <remi at remlab.net>
+Date:   Sun Apr 5 21:19:42 2009 +0300
+
+    Typo
+    (cherry picked from commit 50c4f646fd5b8cf39a600681a2ae988fae2b40fd)
+    
+    Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
+
+diff --git a/share/http/old/.hosts b/share/http/old/.hosts
+index 7996904..6f54ae0 100644
+--- a/share/http/old/.hosts
++++ b/share/http/old/.hosts
+@@ -1,5 +1,5 @@
+ #
+-# Default access-list for VLC HTTP interface
++# Access-list for VLC HTTP interface
+ # $Id$
+ #
+ 
+@@ -16,9 +16,9 @@
+ #10.0.0.0/8
+ #172.16.0.0/12
+ #192.168.0.0/16
++#169.254.0.0/16
+ 
+-# The world
+-# (comment this out to obtain a safe default)
+-::/0
+-0.0.0.0/0
++# The world (uncommenting these 2 lines is not quite safe)
++#::/0
++#0.0.0.0/0
+ 
+commit c5f355b77a5f11f7a75e7de2e485fab25ad638df
+Author: Christophe Mutricy <xtophe at videolan.org>
+Date:   Sun Apr 5 22:19:52 2009 +0100
+
+    Revert "Safe default ACL also for the old HTTP interface"
+    
+    This was the opposite of what was intended
+    
+    This reverts commit 1d82f475bda7f36a3d1927ab9a1d9afeb6a0df80.
+
+diff --git a/share/http/.hosts b/share/http/.hosts
+index 7996904..6f54ae0 100644
+--- a/share/http/.hosts
++++ b/share/http/.hosts
+@@ -1,5 +1,5 @@
+ #
+-# Default access-list for VLC HTTP interface
++# Access-list for VLC HTTP interface
+ # $Id$
+ #
+ 
+@@ -16,9 +16,9 @@
+ #10.0.0.0/8
+ #172.16.0.0/12
+ #192.168.0.0/16
++#169.254.0.0/16
+ 
+-# The world
+-# (comment this out to obtain a safe default)
+-::/0
+-0.0.0.0/0
++# The world (uncommenting these 2 lines is not quite safe)
++#::/0
++#0.0.0.0/0
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 34766b0..c0e9ea4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 300_manpage_syntax.diff
 401_detect_xinerama_fullscreen.diff
 402_fortune_pruning.diff
+403_http_hosts.diff

-- 
VLC media player packaging