Compute a stable name for preprocessed files (Closes: #838188)

diff --git a/debian/changelog b/debian/changelog
index b74401bee486cb399b3673162dc90479aaf47de2..fda32d0d862706ce38f2fc6a9271adcc0c775e24 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ocaml (4.02.3-9) UNRELEASED; urgency=medium
   * obey hardening LDFLAGS (Closes: #792502). Thanks to Török Edwin
     for the patch!
     - add patch 0013-Obey-ldflags.patch
+  * Compute a stable name for preprocessed files (Closes: #838188).
+    Thanks to Johannes Schauer for the patch!
 
  -- Mehdi Dogguy <mehdi@debian.org>  Thu, 22 Dec 2016 00:12:38 +0100
 

diff --git a/debian/patches/0014-Compute-a-stable-name-for-preprocessed-files.patch b/debian/patches/0014-Compute-a-stable-name-for-preprocessed-files.patch
new file mode 100644 (file)
index 0000000..ad0df46
--- /dev/null
+++ b/debian/patches/0014-Compute-a-stable-name-for-preprocessed-files.patch
@@ -0,0 +1,33 @@
+From: Johannes Schauer <josch@debian.org>
+Date: Thu, 22 Dec 2016 00:36:14 +0100
+Subject: Compute a stable name for preprocessed files
+
+---
+ driver/pparse.ml | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/driver/pparse.ml b/driver/pparse.ml
+index b67c180..321d0cc 100644
+--- a/driver/pparse.ml
++++ b/driver/pparse.ml
+@@ -18,10 +18,19 @@ type error =
+ 
+ exception Error of error
+ 
++external open_desc: string -> open_flag list -> int -> int = "caml_sys_open"
++external close_desc: int -> unit = "caml_sys_close"
++
+ (* Optionally preprocess a source file *)
+ 
+ let call_external_preprocessor sourcefile pp =
+-      let tmpfile = Filename.temp_file "ocamlpp" "" in
++      (* do not use Filename.temp_file as the resulting temporary file name will be
++       * recorded in the debug output of the resulting binary and thus make the
++       * output random and unreproducible *)
++      let temp_dir = Filename.get_temp_dir_name () in
++      let hash = Digest.to_hex (Digest.string (sourcefile^pp)) in
++      let tmpfile = Filename.concat temp_dir ("ocamlpp"^hash) in
++      close_desc(open_desc tmpfile [Open_wronly; Open_creat; Open_excl] 0o600);
+       let comm = Printf.sprintf "%s %s > %s"
+                                 pp (Filename.quote sourcefile) tmpfile
+       in

diff --git a/debian/patches/series b/debian/patches/series
index 7ca62b306b9c9dbf669521ced11f9bef07cd7965..78d8b8c780079d2ba6b8178d8b3b7c516871efc6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-Compatibility-with-x32-architecture.patch
 0012-arm-default-PIC.patch
 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch
+0014-Compute-a-stable-name-for-preprocessed-files.patch