This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch debian/experimental in repository ocaml.
commit 2ca8f34e86e4d130e7dc2eb1c741b15d0e95a494 Merge: c2f2fe1 973e0ae Author: Ximin Luo <infini...@debian.org> Date: Wed Aug 9 14:58:48 2017 +0200 Merge branch 'debian/sid' into debian/experimental debian/changelog | 26 ++++++++++++++ ...LAGS-for-linking-all-executables-and-shar.patch | 40 ++++++++++++++++++++++ ...pute-a-stable-name-for-preprocessed-files.patch | 31 +++++++++++++++++ debian/patches/series | 2 ++ debian/rules | 7 ++++ 5 files changed, 106 insertions(+) diff --cc debian/changelog index 85e3772,c5ce385..8ef4f76 --- a/debian/changelog +++ b/debian/changelog @@@ -1,101 -1,29 +1,127 @@@ +ocaml (4.05.0-7) experimental; urgency=medium + + * Only install findlib/ocaml-native-compilers.conf on native-code arches, + fixing ocamlfind behaviour and FTBFS of ocamlbuild. + + -- Ximin Luo <infini...@debian.org> Mon, 31 Jul 2017 01:42:31 +0200 + +ocaml (4.05.0-6) experimental; urgency=medium + + * Mark certain symbols as .hidden in arm64 codegen, fixing FTBFS with + binutils 2.29. (Closes: #868860) + + -- Ximin Luo <infini...@debian.org> Sat, 29 Jul 2017 11:06:41 +0200 + +ocaml (4.05.0-5) experimental; urgency=medium + + * Proper fix for kfreebsd-* not having dup3/pipe2. + + -- Ximin Luo <infini...@debian.org> Sat, 22 Jul 2017 12:14:04 +0200 + +ocaml (4.05.0-4) experimental; urgency=medium + + * Fix new natdynlink logic, fixes FTBFS on some more arches. + + -- Ximin Luo <infini...@debian.org> Fri, 21 Jul 2017 20:40:30 +0200 + +ocaml (4.05.0-3) experimental; urgency=medium + + * Fix Makefile $-escaping syntax, fixes FTBFS on a bunch of arches. + + -- Ximin Luo <infini...@debian.org> Fri, 21 Jul 2017 19:08:27 +0200 + +ocaml (4.05.0-2) experimental; urgency=medium + + * Update conditional-install rules for easier maintenance. This fixes FTBFS + on arm64 and s390x where libasmrunp.a is not available. + * Disable failing dup3/pipe2-related tests on kfreebsd-*. + * Close old bug reports. (Closes: #865712) + + -- Ximin Luo <infini...@debian.org> Fri, 21 Jul 2017 18:01:04 +0200 + +ocaml (4.05.0-1) experimental; urgency=medium + + * New upstream release. + * Update to latest Standards-Version; no changes required. + + -- Ximin Luo <infini...@debian.org> Mon, 17 Jul 2017 16:11:47 +0200 + +ocaml (4.04.0-2) experimental; urgency=medium + + * Fix the build on non-opt+64 arches for raw_spacetime. + + -- Ximin Luo <infini...@debian.org> Sat, 04 Mar 2017 13:13:34 +0100 + +ocaml (4.04.0-1) experimental; urgency=medium + + [ Mehdi Dogguy ] + * Use secure and canonical URIs for Vcs-* fields + + [ Ximin Luo ] + * New upstream release. + * Merge ocaml-native-compilers into ocaml-nox. + + -- Ximin Luo <infini...@debian.org> Fri, 03 Mar 2017 23:57:44 +0100 + +ocaml (4.03.0-5) experimental; urgency=medium + + * Fix variable substitution in Makefile syntax. + + -- Ximin Luo <infini...@debian.org> Thu, 03 Nov 2016 01:39:42 +0100 + +ocaml (4.03.0-4) experimental; urgency=medium + + * Add a versioned Provides so we can have versioned Build-Depends + on ocaml-best-compilers in other packages. + + -- Ximin Luo <infini...@debian.org> Wed, 02 Nov 2016 15:26:44 +0100 + +ocaml (4.03.0-3) experimental; urgency=medium + + * Default to PIC on arm, to fix failing armhf tests. + + -- Ximin Luo <infini...@debian.org> Wed, 02 Nov 2016 13:09:29 +0100 + +ocaml (4.03.0-2) experimental; urgency=medium + + * Add native compilers for ppc64, ppc64el, s390x. + * Skip native tests on bytecode-only systems. + + -- Ximin Luo <infini...@debian.org> Fri, 28 Oct 2016 02:13:18 +0200 + +ocaml (4.03.0-1) experimental; urgency=medium + + * Team upload. + * New upstream release. + + -- Ximin Luo <infini...@debian.org> Thu, 20 Oct 2016 17:43:52 +0200 + + ocaml (4.02.3-10) unstable; urgency=medium + + * Add Provides: ocamlbuild to ocaml-nox + * Tell dh_installdocs to ignore README.Debian (see #868204) + + -- Stéphane Glondu <glo...@debian.org> Thu, 13 Jul 2017 04:40:57 +0200 + + ocaml (4.02.3-9) unstable; 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! + * CVE-2015-8869 (Closes: #824139). + + -- Mehdi Dogguy <me...@debian.org> Thu, 22 Dec 2016 00:48:59 +0100 + + ocaml (4.02.3-8) unstable; urgency=medium + + * Default to PIC on arm, to fix failing armhf tests (Closes: #837359). + * Use secure and canonical URIs for Vcs-* fields + * Sync Standards-Version's value in debian/control.in + + -- Mehdi Dogguy <me...@debian.org> Sun, 06 Nov 2016 11:29:41 +0100 + ocaml (4.02.3-7) unstable; urgency=medium * d/rules: split install-stamp target into -arch and -indep, to allow diff --cc debian/patches/0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch index 0000000,6cdc64c..0973b67 mode 000000,100644..100644 --- a/debian/patches/0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch +++ b/debian/patches/0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch @@@ -1,0 -1,44 +1,40 @@@ + From: Torok Edwin <ed...@etorok.net> + Date: Wed, 15 Jul 2015 16:33:23 +0300 + Subject: Use CCLINKFLAGS for linking all executables and shared libraries + + This allows packagers to set additional linker flags for executables and shared + libraries created by OCaml, and for the OCaml tools themselves. + OCaml code can be linked with various C stubs and C libraries that would + benefit from using hardening link flags, such as -Wl,-z,relro. + + Origin: other + Bug-Debian: https://bugs.debian.org/702349 + Forwarded: no + Last-Update: <2015-07-15> + --- + configure | 2 ++ + tools/Makefile.shared | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + -diff --git a/configure b/configure -index c37a2e5..b58a86d 100755 + --- a/configure + +++ b/configure -@@ -768,6 +768,8 @@ if test $with_sharedlibs = "yes"; then ++@@ -815,6 +815,8 @@ + shared_libraries_supported=true;; + esac + fi + +mksharedlib="$mksharedlib $CCLINKFLAGS" + +mkexe="$mkexe $CCLINKFLAGS" + + if test -z "$mkmaindll"; then + mkmaindll=$mksharedlib -diff --git a/tools/Makefile.shared b/tools/Makefile.shared -index 0b90cd3..2d5546e 100644 ---- a/tools/Makefile.shared -+++ b/tools/Makefile.shared -@@ -287,7 +287,7 @@ endif ++--- a/tools/Makefile +++++ b/tools/Makefile ++@@ -316,7 +316,7 @@ + + objinfo_helper$(EXE): objinfo_helper.c ../config/s.h + $(BYTECC) $(CCOUT)objinfo_helper$(EXE) $(BYTECCCOMPOPTS) \ -- objinfo_helper.c $(LIBBFD_LINK) -+ objinfo_helper.c $(LIBBFD_LINK) $(CCLINKFLAGS) ++- $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) objinfo_helper.c $(LIBBFD_LINK) +++ $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) objinfo_helper.c $(LIBBFD_LINK) $(CCLINKFLAGS) + + OBJINFO=../compilerlibs/ocamlcommon.cma \ + ../compilerlibs/ocamlbytecomp.cma \ diff --cc debian/patches/0014-Compute-a-stable-name-for-preprocessed-files.patch index 0000000,ad0df46..2b951a0 mode 000000,100644..100644 --- a/debian/patches/0014-Compute-a-stable-name-for-preprocessed-files.patch +++ b/debian/patches/0014-Compute-a-stable-name-for-preprocessed-files.patch @@@ -1,0 -1,33 +1,31 @@@ + From: Johannes Schauer <jo...@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 = ++@@ -21,10 +21,19 @@ + + 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 --cc debian/patches/series index 7f29c03,e3c2088..32174dc --- a/debian/patches/series +++ b/debian/patches/series @@@ -4,6 -4,12 +4,8 @@@ 0004-Put-manpages-in-section-3o-instead-of-3.patch 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0006-Embed-bytecode-in-C-object-when-using-custom.patch -0007-Tune-resource-usage-of-some-tests.patch 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch -0010-Enable-ocamldoc-to-build-reproducible-manpages.patch -0010-Add-a-.file-directive-to-generated-.s-files.patch -0011-Compatibility-with-x32-architecture.patch -0012-arm-default-PIC.patch +0010-arm-default-PIC.patch +0011-arm64-hide-symbols-for-stricter-binutils.patch + 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch + 0014-Compute-a-stable-name-for-preprocessed-files.patch -0015-CVE-2015-8869.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits