[email protected] writes:

> Hi Tobias,
>
> Here are the fixes are oulined by Julien. Would you upload this or let
> me know if it is ok to proceed with the NMU.
>
> Thanks,
> Jari Aalto
>
> lsdiff(1) of changes:
>
>     vdr-1.6.0/debian/changelog
>     vdr-1.6.0/debian/vdrleaktest

That was wrong diff. Here is the one.

Jari

diffstat for vdr_1.6.0-19 vdr_1.6.0-19.1

 changelog   |    8 ++++++++
 vdrleaktest |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff -u vdr-1.6.0/debian/changelog vdr-1.6.0/debian/changelog
--- vdr-1.6.0/debian/changelog
+++ vdr-1.6.0/debian/changelog
@@ -1,3 +1,11 @@
+vdr (1.6.0-19.1) unstable; urgency=low
+
+  * debian/vdrleaktest
+    - Remove extra colon from LD_LIBRARY_PATH to fix CVE-2010-3387.
+      (normal, security; Closes: #598308).
+
+ -- Jari Aalto <[email protected]>  Thu, 21 Oct 2010 09:18:54 +0300
+
 vdr (1.6.0-19) unstable; urgency=low
 
   * Fixed DEB_BUILD_OPTIONS export in in vdrdbg-buildpackage
diff -u vdr-1.6.0/debian/vdrleaktest vdr-1.6.0/debian/vdrleaktest
--- vdr-1.6.0/debian/vdrleaktest
+++ vdr-1.6.0/debian/vdrleaktest
@@ -65,7 +65,7 @@
 
 /etc/init.d/vdr stop
 
-LANG=C LD_LIBRARY_PATH="/usr/lib/debug:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
+LANG=C LD_LIBRARY_PATH="/usr/lib/debug${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
    valgrind --tool=memcheck --leak-check=yes --num-callers=20 \
    --suppressions=/usr/share/vdr/valgrind.supp \
    /usr/bin/vdr-dbg -v $VIDEO_DIR -c $CFG_DIR -L $PLUGIN_DIR  -r $REC_CMD \

Reply via email to