[Pkg-ocaml-maint-commits] [dose3] 01/07: backport fix to work around libcudf bug leaking file descriptors

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch pushed a commit to branch experimental/master
in repository dose3.

commit ba038c2f7ccde7c1099113290b89da31647149a3
Author: josch <j.schauer at email.de>
Date:   Tue Mar 24 07:42:43 2015 +0100

    backport fix to work around libcudf bug leaking file descriptors
---
 debian/changelog                          |  8 ++++++++
 debian/patches/cudfSolver-fix-leaking-fds | 20 ++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ee23344..1e9c6e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dose3 (3.3-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * backport patch cudfSolver-fix-leaking-fds to work around libcudf bug
+    https://gforge.inria.fr/tracker/index.php?func=detail&aid=18789&group_id=4385&atid=13811
+
+ -- Johannes Schauer <josch at debian.org>  Tue, 24 Mar 2015 07:44:19 +0100
+
 dose3 (3.3-1) experimental; urgency=medium
 
   [ Johannes Schauer ]
diff --git a/debian/patches/cudfSolver-fix-leaking-fds b/debian/patches/cudfSolver-fix-leaking-fds
new file mode 100644
index 0000000..3fbfb91
--- /dev/null
+++ b/debian/patches/cudfSolver-fix-leaking-fds
@@ -0,0 +1,20 @@
+Author: Johannes Schauer <josch at debian.org>
+Description: cudfSolver.ml: workaround for libcudf fd leak:
+ https://gforge.inria.fr/tracker/index.php?func=detail&aid=18789&group_id=4385&atid=13811
+
+diff --git a/common/cudfSolver.ml b/common/cudfSolver.ml
+index a33aa7e..46c86cd 100644
+--- a/common/cudfSolver.ml
++++ b/common/cudfSolver.ml
+@@ -132,9 +132,8 @@ let execsolver exec_pat criteria cudf =
+     raise Unsat
+   else 
+     try begin
+-      let cudf_parser = Cudf_parser.from_file solver_out in
+-      Sys.remove solver_in; Sys.remove solver_out ;
+-      try Cudf_parser.load_solution cudf_parser universe with
++      let f p = Cudf_parser.load_solution_from_file p universe in
++      try finally (fun () -> Sys.remove solver_in; Sys.remove solver_out) f solver_out with
+       |Cudf_parser.Parse_error _
+       |Cudf.Constraint_violation _ ->
+         fatal "(CRASH) Solution file contains an invalid solution"
diff --git a/debian/patches/series b/debian/patches/series
index 2e270a6..a5bda8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 binaries-prefix-edos
 coinstall-binary-name
+cudfSolver-fix-leaking-fds

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git