[SCM] MediaTomb packaging branch, master, updated. debian/0.12.0.svn2018-4-1-g7c0ce38

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

The following commit has been merged in the master branch:
commit 7c0ce3886d5c490ec066320e141637fc1cbd015e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu Feb 4 09:08:51 2010 -0500

    Apply NMU patch from Mehdi Dogguy, with a minor change.

diff --git a/debian/changelog b/debian/changelog
index 50e8b4e..f5571f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+mediatomb (0.12.0~svn2018-5) unstable; urgency=medium
+
+  [ Mehdi Dogguy ]
+  * Non-maintainer upload.
+  * Fix FTBFS due to invalid string constant to char* conversion in
+    src/tools.cc (added const_char_conversion.patch) (Closes: #560468)
+  * Fix non-uninstallability of mediatomb-daemon, thanks to Raul Sanchez
+    Siles for the hint (Closes: #562372)
+  * Fix security issue in prototype.js (CVE-2008-7720 and CVE-2007-2383)
+    by using the one from the Debian package libjs-prototype
+    (Closes: #555232, #555233, #475279)
+    + set urgency to medium
+    + Make mediatomb-common depend on libjs-prototype
+    + Set a symbolic link to prototype.js using mediatomb-common.links
+
+ -- Andres Mejia <mcitadel at gmail.com>  Thu, 04 Feb 2010 08:57:05 -0500
+
 mediatomb (0.12.0~svn2018-4) unstable; urgency=low
 
   [ Andreas Henriksson ]
diff --git a/debian/control b/debian/control
index 5e48269..ff3752e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Git: git://git.debian.org/git/pkg-multimedia/mediatomb.git
 
 Package: mediatomb-common
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-prototype
 Description: UPnP MediaServer (base package)
  MediaTomb is an UPnP MediaServer with a nice web user interface, it allows you
  to stream your digital media through your home network and listen to/watch it
diff --git a/debian/mediatomb-common.links b/debian/mediatomb-common.links
new file mode 100644
index 0000000..632a2d2
--- /dev/null
+++ b/debian/mediatomb-common.links
@@ -0,0 +1 @@
+/usr/share/javascript/prototype/prototype.js /usr/share/mediatomb/web/js/prototype.js
diff --git a/debian/mediatomb-daemon.postrm b/debian/mediatomb-daemon.postrm
index 3eb0a1d..229df00 100644
--- a/debian/mediatomb-daemon.postrm
+++ b/debian/mediatomb-daemon.postrm
@@ -7,10 +7,10 @@ fi
 if [ "$1" = "purge" ] ; then
     rm -rf /var/log/mediatomb /var/log/mediatomb* \
 		/var/run/mediatomb.pid /var/lib/mediatomb
-    deluser mediatomb || true
-    delgroup mediatomb || true
     dpkg-statoverride --remove /etc/mediatomb/config.xml
     dpkg-statoverride --remove /var/lib/mediatomb
+    deluser mediatomb || true
+    delgroup mediatomb || true
 fi
 
 #DEBHELPER#
diff --git a/debian/patches/const_char_conversion.patch b/debian/patches/const_char_conversion.patch
new file mode 100644
index 0000000..7f96147
--- /dev/null
+++ b/debian/patches/const_char_conversion.patch
@@ -0,0 +1,45 @@
+--- a/src/tools.cc
++++ b/src/tools.cc
+@@ -297,14 +297,14 @@
+ 
+ String hex_decode_string(String encoded)
+ {
+-    char *ptr = encoded.c_str();
++    char *ptr = const_cast<char *>(encoded.c_str());
+     int len = encoded.length();
+     
+     Ref<StringBuffer> buf(new StringBuffer(len / 2));
+     for (int i = 0; i < len; i += 2)
+     {
+-        char *chi = strchr(HEX_CHARS, ptr[i]);
+-        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
++        char *chi = strchr(const_cast<char *>(HEX_CHARS), ptr[i]);
++        char *clo = strchr(const_cast<char *>(HEX_CHARS), ptr[i + 1]);
+         int hi, lo;
+         
+         if (chi)
+@@ -381,7 +381,7 @@
+ 
+ String url_unescape(String str)
+ {
+-    char *data = str.c_str();
++    char *data = const_cast<char *>(str.c_str());
+     int len = str.length();
+     Ref<StringBuffer> buf(new StringBuffer(len));
+ 
+@@ -399,13 +399,13 @@
+ 
+             char *pos;
+ 
+-            pos = strchr(hex, chi);
++            pos = strchr(const_cast<char *>(hex), chi);
+             if (!pos)
+                 hi = 0;
+             else
+                 hi = pos - hex;
+ 
+-            pos = strchr(hex, clo);
++            pos = strchr(const_cast<char *>(hex), clo);
+             if (!pos)
+                 lo = 0;
+             else
diff --git a/debian/patches/series b/debian/patches/series
index 5099b1d..d262ca8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ autoreconf_-fi.patch
 debug-mode-fix.patch
 config_xml_comment.patch
 service-id_fix.patch
+const_char_conversion.patch
diff --git a/debian/rules b/debian/rules
index a6591a2..4194f10 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,7 @@ override_dh_auto_install:
 		$(CURDIR)/debian/tmp/usr/share/pixmaps/mediatomb.xpm
 	install -D -m 0644 debian/mediatomb.desktop \
 		$(CURDIR)/debian/tmp/usr/share/applications/mediatomb.desktop
+	$(RM) -f $(CURDIR)/debian/tmp/usr/share/mediatomb/web/js/prototype.js
 
 override_dh_install:
 	dh_install --sourcedir=debian/tmp

-- 
MediaTomb packaging