[Pkg-ocaml-maint-commits] r3418 - in /trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian: changelog patches/00list patches/fix-double-close-segv.dpatch

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

Author: jcristau-guest
Date: Fri Dec 29 17:55:48 2006
New Revision: 3418

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3418
Log:
* Add patch stolen from 3.09.3 to fix a segfault when a file is closed
  twice (closes: #403848).

Added:
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/fix-double-close-segv.dpatch   (with props)
Modified:
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog
    trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/00list

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/changelog?rev=3418&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/changelog Fri Dec 29 17:55:48 2006
@@ -1,8 +1,13 @@
 ocaml (3.09.2-8) UNRELEASED; urgency=low
 
-  * Installing ocamlbrowser in ocaml instead of ocaml-nox, closes: #397245. 
-
- -- Samuel Mimram <smimram at debian.org>  Mon,  6 Nov 2006 14:54:08 +0000
+  [ Samuel Mimram ]
+  * Installing ocamlbrowser in ocaml instead of ocaml-nox, closes: #397245.
+
+  [ Julien Cristau ]
+  * Add patch stolen from 3.09.3 to fix a segfault when a file is closed
+    twice (closes: #403848).
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Fri, 29 Dec 2006 17:27:05 +0100
 
 ocaml (3.09.2-7) unstable; urgency=low
 

Modified: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/patches/00list?rev=3418&op=diff
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/00list (original)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/00list Fri Dec 29 17:55:48 2006
@@ -8,3 +8,4 @@
 #pr_o
 no_rpath
 stdlib_man_section
+fix-double-close-segv

Added: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/fix-double-close-segv.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/branches/etch-3.09.2%2Bcdbs/debian/patches/fix-double-close-segv.dpatch?rev=3418&op=file
==============================================================================
--- trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/fix-double-close-segv.dpatch (added)
+++ trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/fix-double-close-segv.dpatch Fri Dec 29 17:55:48 2006
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-double-close-segv.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix caml_ml_flush() to not crash on a double close by using the 
+## DP: CAMLreturn macro. See Debian Bug#403848 and upstream PR#4039.
+
+ at DPATCH@
+
+diff -pru ocaml-3.09.2/byterun/io.c ocaml-3.09.3~rc1/byterun/io.c
+--- ocaml-3.09.2/byterun/io.c	2006-03-22 23:59:58.000000000 +1100
++++ ocaml-3.09.3~rc1/byterun/io.c	2006-06-09 00:57:59.000000000 +1000
+@@ -534,7 +534,7 @@ CAMLprim value caml_ml_flush_partial(val
+   struct channel * channel = Channel(vchannel);
+   int res;
+ 
+-  if (channel->fd == -1) return Val_true;
++  if (channel->fd == -1) CAMLreturn (Val_true);
+   Lock(channel);
+   res = caml_flush_partial(channel);
+   Unlock(channel);
+@@ -546,7 +546,7 @@ CAMLprim value caml_ml_flush(value vchan
+   CAMLparam1 (vchannel);
+   struct channel * channel = Channel(vchannel);
+ 
+-  if (channel->fd == -1) return Val_unit;
++  if (channel->fd == -1) CAMLreturn (Val_unit);
+   Lock(channel);
+   caml_flush(channel);
+   Unlock(channel);

Propchange: trunk/packages/ocaml/branches/etch-3.09.2+cdbs/debian/patches/fix-double-close-segv.dpatch
------------------------------------------------------------------------------
    svn:executable = *