Bug#496360: Update for liquidsoap
Hi Team !
I have prepared an update for liquidsoap that I'd like to push for lenny.
The initial fix was against bug #496360, which severity used to be RC. But
alow the path of testing the patch, I also encountered an issue with the
portaudio support in liquidsoap that was also reported in our trac.
Hence, I would like to propose the following patch, which fixes bug #496360 as
well as desactivates portaudio support (drops build-dep).
Changes are minimal, so I think it should be fine.
Romain
Index: debian/control
===================================================================
--- debian/control (.../tags/packages/liquidsoap/0.3.6-4) (révision 6029)
+++ debian/control (.../trunk/packages/liquidsoap/lenny) (révision 6030)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <savonet-debian@lists.sourceforge.net>
Uploaders: Romain Beauxis <toots@rastageeks.org>, Samuel Mimram <smimram@debian.org>
-Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
+Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Index: debian/control.in
===================================================================
--- debian/control.in (.../tags/packages/liquidsoap/0.3.6-4) (révision 6029)
+++ debian/control.in (.../trunk/packages/liquidsoap/lenny) (révision 6030)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Liquidsoap Debian Packaging <savonet-debian@lists.sourceforge.net>
Uploaders: Romain Beauxis <toots@rastageeks.org>, Samuel Mimram <smimram@debian.org>
-Build-Depends: @cdbs@, ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libportaudio-ocaml-dev, libsoundtouch-ocaml-dev
+Build-Depends: @cdbs@, ocaml-nox, ocaml-findlib, libshout-ocaml-dev, libogg-ocaml-dev (>= 0.1.1), libvorbis-ocaml-dev (>= 0.4.0), libmad-ocaml-dev (>= 0.3.2), libid3tag0-dev, libdtools-ocaml-dev (>= 0.1.4), libcamomile-ocaml-dev, festival, wget, libxml-dom-perl, texlive, python-gtk2-dev, python, python-support (>= 0.3), libao-ocaml-dev, libalsa-ocaml-dev (>= 0.1.2), libpcre-ocaml-dev, libxml-light-ocaml-dev, libextlib-ocaml-dev, libladspa-ocaml-dev, libsoundtouch-ocaml-dev
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/liquidsoap/trunk/
Index: debian/changelog
===================================================================
--- debian/changelog (.../tags/packages/liquidsoap/0.3.6-4) (révision 6029)
+++ debian/changelog (.../trunk/packages/liquidsoap/lenny) (révision 6030)
@@ -1,3 +1,13 @@
+liquidsoap (0.3.6-4lenny1) testing-security; urgency=high
+
+ * Added patch to fix liquigsoap's temporary file creation.
+ Thanks to Tobias Klauser for providing a patch.
+ Closes: #496360
+ * Desactivated portaudio option, since it is buggy and should
+ be tested more.
+
+ -- Romain Beauxis <toots@rastageeks.org> Mon, 10 Nov 2008 17:32:30 +0100
+
liquidsoap (0.3.6-4) unstable; urgency=high
* Updated fix for smartcross
Index: debian/patches/fix_tmp_file.patch
===================================================================
--- debian/patches/fix_tmp_file.patch (.../tags/packages/liquidsoap/0.3.6-4) (révision 0)
+++ debian/patches/fix_tmp_file.patch (.../trunk/packages/liquidsoap/lenny) (révision 6030)
@@ -0,0 +1,81 @@
+Index: liquidsoap-0.3.6/gui/liguidsoap.py
+===================================================================
+--- liquidsoap-0.3.6.orig/gui/liguidsoap.py 2007-12-17 16:47:32.000000000 +0100
++++ liquidsoap-0.3.6/gui/liguidsoap.py 2008-11-10 17:30:56.000000000 +0100
+@@ -8,6 +8,8 @@
+ import threading, socket, sys, os, time, re
+ import getopt
+
++import tempfile
++
+ from client import LiqClient
+ from widgets import View
+
+@@ -104,6 +106,7 @@
+ # liquidsoap runs liquidsoap with a fixed script
+ # a few parameteres are available
+ def liquidsoap(
++ scriptfile,
+ host='localhost',port=1234,mount='emission.ogg',
+ backup=''):
+ if backup=='':
+@@ -111,7 +114,7 @@
+ else:
+ addbackup=';"backup"'
+
+- os.system("""cat > /tmp/liguidsoap.liq <<__EOL__
++ os.system("""cat > %s <<__EOL__
+ set("log.file.path","/tmp/lig.<pid>.log")
+ set("log.stdout",true)
+ set("server.telnet",true)
+@@ -132,10 +135,10 @@
+ id="broadcast",
+ host="%s",port=%d,mount="%s",start=false,mixer)
+ output.file.vorbis(id="backup",start=false,"%s",mixer)
+-""" % (host, port, mount, backup))
++""" % (scriptfile, host, port, mount, backup))
+ pid = os.fork()
+ if pid==0:
+- os.execlp("liquidsoap","liquidsoap","/tmp/liguidsoap.liq")
++ os.execlp("liquidsoap","liquidsoap",scriptfile)
+ else:
+ print "Running liquidsoap..."
+ return pid
+@@ -162,10 +165,11 @@
+ ehost=eport=erun=dialog=None
+ icehost=iceport=icemount=backup=None
+
+- def exit(pid):
++ def exit(pid, scriptfile):
+ if pid!=None:
+ os.kill(pid,15)
+ os.waitpid(pid,0)
++ os.remove(scriptfile)
+ gtk.main_quit()
+
+ # This startup function can be used to start the GUI directly
+@@ -173,12 +177,15 @@
+ def start(response=None):
+ # Dialog stuff
+ liquid_pid=None
++ scriptfile=None
+ if response!=None:
+ if response!=gtk.RESPONSE_ACCEPT:
+ sys.exit()
+ if erun.get_active():
+ host,port = 'localhost',1234
++ __unused, scriptfile = tempfile.mkstemp('.liq', 'liquidsoap')
+ liquid_pid=liquidsoap(
++ scriptfile,
+ host=icehost.get_text(),
+ port=iceport.get_value(),
+ mount=icemount.get_text(),
+@@ -195,7 +202,7 @@
+ win = gtk.Window()
+ win.set_border_width(10)
+ win.connect("delete_event", lambda w,e: False)
+- win.connect("destroy", lambda osb: exit(liquid_pid))
++ win.connect("destroy", lambda osb: exit(liquid_pid,scriptfile))
+ win.set_title('Liquidsoap on '+host+':'+str(port))
+ win.resize(700,300)
+ try:
Index: debian/patches/series
===================================================================
--- debian/patches/series (.../tags/packages/liquidsoap/0.3.6-4) (révision 6029)
+++ debian/patches/series (.../trunk/packages/liquidsoap/lenny) (révision 6030)
@@ -1,2 +1,3 @@
ladspa_backport.patch
fix_smart_crossfade.patch
+fix_tmp_file.patch
Reply to: