[Pkg-ocaml-maint-commits] [SCM] unison packaging branch, master, updated. debian/2.32.52-2-4-g3432341

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 355393af95a9e6e2c17624bc4a26dd2428a303fe
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Apr 3 11:48:27 2011 +0200

    Add Fix-bad-interaction-with-OpenSSH-5.6.patch (Closes: #620031)

diff --git a/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch b/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch
new file mode 100644
index 0000000..f274ed0
--- /dev/null
+++ b/debian/patches/0006-Fix-bad-interaction-with-OpenSSH-5.6.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sun, 3 Apr 2011 11:44:19 +0200
+Subject: [PATCH] Fix bad interaction with OpenSSH 5.6
+
+Origin: https://bugs.archlinux.org/task/20877
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620031
+---
+ terminal.ml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/terminal.ml b/terminal.ml
+index 657f3d2..aafa425 100644
+--- a/terminal.ml
++++ b/terminal.ml
+@@ -191,7 +191,6 @@ let create_session cmd args new_stdin new_stdout new_stderr =
+             exit 127
+           end
+       | childPid ->
+-          Unix.close slaveFd;
+           (Some masterFd, childPid)
+       end
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index aa78f1f..9c2a4c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Typo-missing-o-in-follow.patch
 0004-Fix-silent-behaviour.patch
 0005-Fix-build-with-OCaml-3.12.patch
+0006-Fix-bad-interaction-with-OpenSSH-5.6.patch

-- 
unison packaging