[Pkg-cli-apps-commits] [SCM] bareftp branch, master, updated. debian/0.3.4-1-5-g35715c6

[Stefan Ebner]

The following commit has been merged in the master branch:
commit 35715c6dd0a3aedb5c2822486307c8b8e49e3c46
Author: Stefan Ebner <sebner at ubuntu.com>
Date:   Fri Oct 15 18:06:29 2010 +0200

    Re-add missing changelog entry/change from the NMU

diff --git a/bareftp.in b/bareftp.in
index 0052ae8..65934d3 100644
--- a/bareftp.in
+++ b/bareftp.in
@@ -1,3 +1,7 @@
 #!/bin/sh
-export LD_LIBRARY_PATH=@expanded_libdir@/bareftp${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+if [ -z ${LD_LIBRARY_PATH} ]; then
+        export LD_LIBRARY_PATH=@expanded_libdir@/bareftp
+    else
+        export LD_LIBRARY_PATH=@expanded_libdir@/bareftp:${LD_LIBRARY_PATH}
+fi
 exec @MONO@ @expanded_libdir@/bareftp/bareftp.exe $MONO_EXTRA_ARGS "$@"
diff --git a/debian/changelog b/debian/changelog
index d3df674..39fcbf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,13 @@ bareftp (0.3.6-1) UNRELEASED; urgency=low
 
  -- Stefan Ebner <sebner at ubuntu.com>  Fri, 15 Oct 2010 17:53:44 +0200
 
+bareftp (0.3.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix security issue CVE-2010-3350 (Closes: #598284)
+
+ -- gustavo panizzo <gfa at zumbi.com.ar>  Tue, 05 Oct 2010 23:37:54 -0300
+
 bareftp (0.3.4-1) unstable; urgency=low
 
   * New upstream bugfix release 0.3.4

-- 
bareftp