[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.2-3-5-g7978786

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 7978786af58cefddeba3653263978f449ca27fec
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue Aug 3 11:10:04 2010 -0500

    Added user & password harbor recode patch

diff --git a/debian/patches/add_mpeg_url_to_playlists.patch b/debian/patches/add_mpeg_url_to_playlists.patch
index 97ca201..699f5be 100644
--- a/debian/patches/add_mpeg_url_to_playlists.patch
+++ b/debian/patches/add_mpeg_url_to_playlists.patch
@@ -1,7 +1,7 @@
 Index: liquidsoap/src/playlists/playlist_basic.ml
 ===================================================================
---- liquidsoap.orig/src/playlists/playlist_basic.ml	2009-10-30 15:35:23.000000000 -0500
-+++ liquidsoap/src/playlists/playlist_basic.ml	2010-08-03 10:32:38.000000000 -0500
+--- liquidsoap.orig/src/playlists/playlist_basic.ml	2010-08-03 10:33:20.000000000 -0500
++++ liquidsoap/src/playlists/playlist_basic.ml	2010-08-03 11:09:31.000000000 -0500
 @@ -70,4 +70,5 @@
  
  let () =
diff --git a/debian/patches/harbor_source_recode_user_password.patch b/debian/patches/harbor_source_recode_user_password.patch
new file mode 100644
index 0000000..d092564
--- /dev/null
+++ b/debian/patches/harbor_source_recode_user_password.patch
@@ -0,0 +1,28 @@
+Index: liquidsoap/src/sources/harbor_input.ml
+===================================================================
+--- liquidsoap.orig/src/sources/harbor_input.ml	2009-10-30 15:35:23.000000000 -0500
++++ liquidsoap/src/sources/harbor_input.ml	2010-08-03 11:09:26.000000000 -0500
+@@ -287,6 +287,23 @@
+          let debug = Lang.to_bool (List.assoc "debug" p) in
+          let auth_function = List.assoc "auth" p in
+          let login user pass =
++           (** We try to decode user & password here. 
++             * Idealy, it would be better to decode them
++             * in tools/harbor.ml in order to use any
++             * possible charset information there.
++             * However: 
++             * - ICY password are given raw, without
++             *   any charset information
++             * - HTTP password are encoded in Base64 and 
++             *   passed through the HTTP headers, where
++             *   there are no charset information concerning
++             *   the password. Note: Content-Type may contain
++             *   a charset information, but this refers to 
++             *   the charset of the HTML content.. *)
++           let user,pass = 
++              let f = Configure.recode_tag in
++              f user, f pass
++           in
+            let user_login test_user test_pass =
+              let user,pass =
+                let f g x = match x with "" -> g | _ -> x in
diff --git a/debian/patches/series b/debian/patches/series
index e71d869..7f21d4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+harbor_source_recode_user_password.patch
 add_mpeg_url_to_playlists.patch
 harbor_recode_tags.patch
 magic_follow_symlink.patch

-- 
liquidsoap packaging