dgit.raspbian.org Git - ocaml.git/log

Merge version 4.05.0-10+rpi1 and 4.05.0-11 to produce 4.05.0-11+rpi1

Merge ocaml (4.05.0-11) import into refs/heads/workingbranch

Integer overflows when unmarshaling a bigarray

Malicious or corrupted marshaled data can result in a bigarray
with impossibly large dimensions that cause overflow when computing
the in-memory size of the bigarray. Disaster ensues when the data
is read in a too small memory area. This commit checks for overflows
when computing the in-memory size of the bigarray.

This patch has been modified from upstream one to use caml_ba_multov
instead of caml_umul_overflow which is unavailable in OCaml 4.05.0.

Origin: https://github.com/ocaml/ocaml/pull/1718
Bug: https://caml.inria.fr/mantis/view.php?id=7765
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895472
Bug-CVE: CVE-2018-9838

Gbp-Pq: Name 0012-Integer-overflows-when-unmarshaling-a-bigarray.patch

Compute a stable name for preprocessed files

Gbp-Pq: Name 0014-Compute-a-stable-name-for-preprocessed-files.patch

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>

Gbp-Pq: Name 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch

arm64-hide-symbols-for-stricter-binutils

AArch64 GOT fixed

Gbp-Pq: Name 0011-arm64-hide-symbols-for-stricter-binutils.patch

Drop a test-suite experiment committed by mistake

This was failing on armhf because Debian GCC now enables PIE by default.

Bug: https://caml.inria.fr/mantis/view.php?id=7642
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837359#80

Gbp-Pq: Name 0010-XL-001-tests.asmcomp.patch

Native backtraces don't work on powerpc and sparc

Gbp-Pq: Name 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch

Embed bytecode in C object when using -custom

This patch fixes non-strippability of bytecode executables linked with
custom runtime. The new behaviour is enabled when OCAML_CUSTOM_EMBED
is set to "y", or when DEB_HOST_ARCH is non-empty.

Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0006-Embed-bytecode-in-C-object-when-using-custom.patch

Avoid multiple declarations in generated .c files in -output-obj

In -output-obj mode, <caml/mlvalues.h> (which contains some
primitives) is included in the generated .c file, leading to errors
when compiling with g++ (multiple declarations).

There are probably better implementations (in particular, in this one,
care must be taken when changing the list of primitives available in
mlvalues.h), but this is a small and (not too) intrusive patch.

Bug: http://caml.inria.fr/mantis/view.php?id=5254
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch

Put manpages in section 3o instead of 3

Gbp-Pq: Name 0004-Put-manpages-in-section-3o-instead-of-3.patch

Don't use rpath

Gbp-Pq: Name 0003-Don-t-use-rpath.patch

Call ld with proper flags

Filter linkflags passed to ld by ocamlopt -pack and -output-obj
to remove the "-Wl," parts, which are only used when ocamlopt calls
gcc.

Gbp-Pq: Name 0002-Call-ld-with-proper-flags.patch

Pass --no-relax to ld on alpha

Pass the --no-relax option to ld to fix a segfault in initialization
code (bug#338437)

Gbp-Pq: Name 0001-Pass-no-relax-to-ld-on-alpha.patch

ocaml (4.05.0-11) unstable; urgency=medium

  [ Ralf Treinen ]
  * Dropped "Recommends: camlp4" from ocaml-nox since that package is
    being deprecated. (Closes: #895994)

  [ Stéphane Glondu ]
  * Fix integer overflows when unmarshaling a bigarray
    (Closes: #895472, CVE-2018-9838)
  * Update Vcs-* to point to salsa

[dgit import unpatched ocaml 4.05.0-11]

Import ocaml_4.05.0-11.debian.tar.xz

[dgit import tarball ocaml 4.05.0-11 ocaml_4.05.0-11.debian.tar.xz]

Merge version 4.02.3-10+rpi1 and 4.05.0-10 to produce 4.05.0-10+rpi1

Merge ocaml (4.05.0-10) import into refs/heads/workingbranch

Compute a stable name for preprocessed files

Gbp-Pq: Name 0014-Compute-a-stable-name-for-preprocessed-files.patch

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>

Gbp-Pq: Name 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch

arm64-hide-symbols-for-stricter-binutils

commit 4274dfe22ae37c4c5589a6fe7fe9d53d62013df5
Author: Mark Shinwell <mshinwell@gmail.com>
Date: Wed Sep 13 10:23:16 2017 +0100

AArch64 GOT fixed

Gbp-Pq: Name 0011-arm64-hide-symbols-for-stricter-binutils.patch

XL-001-tests.asmcomp

Gbp-Pq: Name 0010-XL-001-tests.asmcomp.patch

Native backtraces don't work on powerpc and sparc

Gbp-Pq: Name 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch

Embed bytecode in C object when using -custom

This patch fixes non-strippability of bytecode executables linked with
custom runtime. The new behaviour is enabled when OCAML_CUSTOM_EMBED
is set to "y", or when DEB_HOST_ARCH is non-empty.

Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0006-Embed-bytecode-in-C-object-when-using-custom.patch

Avoid multiple declarations in generated .c files in -output-obj

In -output-obj mode, <caml/mlvalues.h> (which contains some
primitives) is included in the generated .c file, leading to errors
when compiling with g++ (multiple declarations).

There are probably better implementations (in particular, in this one,
care must be taken when changing the list of primitives available in
mlvalues.h), but this is a small and (not too) intrusive patch.

Bug: http://caml.inria.fr/mantis/view.php?id=5254
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch

Put manpages in section 3o instead of 3

Gbp-Pq: Name 0004-Put-manpages-in-section-3o-instead-of-3.patch

Don't use rpath

Gbp-Pq: Name 0003-Don-t-use-rpath.patch

Call ld with proper flags

Filter linkflags passed to ld by ocamlopt -pack and -output-obj
to remove the "-Wl," parts, which are only used when ocamlopt calls
gcc.

Gbp-Pq: Name 0002-Call-ld-with-proper-flags.patch

Pass --no-relax to ld on alpha

Pass the --no-relax option to ld to fix a segfault in initialization
code (bug#338437)

Gbp-Pq: Name 0001-Pass-no-relax-to-ld-on-alpha.patch

ocaml (4.05.0-10) unstable; urgency=medium

* Drop support for ocamlopt on armel as suggested by upstream.
* Replace the ARM PIC patch with one from upstream.

[dgit import unpatched ocaml 4.05.0-10]

Import ocaml_4.05.0-10.debian.tar.xz

[dgit import tarball ocaml 4.05.0-10 ocaml_4.05.0-10.debian.tar.xz]

Merge version 4.02.3-9+rpi1 and 4.02.3-10 to produce 4.02.3-10+rpi1

Merge branch 'debpsuedomerge' into buster-working

Import ocaml_4.05.0.orig.tar.xz

[dgit import orig ocaml_4.05.0.orig.tar.xz]

Merge ocaml (4.02.3-10) import into refs/heads/workingbranch

CVE-2015-8869

Upstream commit: https://github.com/ocaml/ocaml/commit/659615c7b100a89eafe6253e7a5b9d84d0e8df74#diff-a97df53e3ebc59bb457191b496c90762

http://www.openwall.com/lists/oss-security/2016/04/29/1

Gbp-Pq: Name 0015-CVE-2015-8869.patch

Compute a stable name for preprocessed files

Gbp-Pq: Name 0014-Compute-a-stable-name-for-preprocessed-files.patch

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>

Gbp-Pq: Name 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch

Default to PIC on arm

Otherwise the armhf build fails now that PIE is enabled by default.

Bug-Debian: https://bugs.debian.org/837359
Forwarded: TODO

Gbp-Pq: Name 0012-arm-default-PIC.patch

Compatibility with x32 architecture

Origin: https://github.com/ocaml/ocaml/commit/58c07fa89ec6546cea911f1d2e7803fd7aa75de9
Bug: http://caml.inria.fr/mantis/view.php?id=6722
Bug-Debian: https://bugs.debian.org/773409

Gbp-Pq: Name 0011-Compatibility-with-x32-architecture.patch

Add a .file directive to generated .s files

When no .file directive is given, the toolchain records the filename
of the .o file, which is sometimes random, making generated objects
non-deterministic.

We use Location.input_name for adding .file directives to assembly
files. Note: when the file is preprocessed, this reference holds the
name of the temporary file. Hence, files compiled with -pp are still
not deterministic.

Bug-Debian: https://bugs.debian.org/795784
Bug-Debian: https://bugs.debian.org/796336

Gbp-Pq: Name 0010-Add-a-.file-directive-to-generated-.s-files.patch

Enable ocamldoc to build reproducible manpages

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794586
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0010-Enable-ocamldoc-to-build-reproducible-manpages.patch

Native backtraces don't work on powerpc and sparc

Gbp-Pq: Name 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch

Tune resource usage of some tests

The original tests trigger some limits and fail on kfreebsd-i386 with
uncaught exception Sys_error("Thread.create: Resource temporarily
unavailable").

Gbp-Pq: Name 0007-Tune-resource-usage-of-some-tests.patch

Embed bytecode in C object when using -custom

This patch fixes non-strippability of bytecode executables linked with
custom runtime. The new behaviour is enabled when OCAML_CUSTOM_EMBED
is set to "y", or when DEB_HOST_ARCH is non-empty.

Forwarded: not-needed
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0006-Embed-bytecode-in-C-object-when-using-custom.patch

Avoid multiple declarations in generated .c files in -output-obj

In -output-obj mode, <caml/mlvalues.h> (which contains some
primitives) is included in the generated .c file, leading to errors
when compiling with g++ (multiple declarations).

There are probably better implementations (in particular, in this one,
care must be taken when changing the list of primitives available in
mlvalues.h), but this is a small and (not too) intrusive patch.

Bug: http://caml.inria.fr/mantis/view.php?id=5254
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch

Put manpages in section 3o instead of 3

Gbp-Pq: Name 0004-Put-manpages-in-section-3o-instead-of-3.patch

Don't use rpath

Gbp-Pq: Name 0003-Don-t-use-rpath.patch

Call ld with proper flags

Filter linkflags passed to ld by ocamlopt -pack and -output-obj
to remove the "-Wl," parts, which are only used when ocamlopt calls
gcc.

Gbp-Pq: Name 0002-Call-ld-with-proper-flags.patch

Pass --no-relax to ld on alpha

Pass the --no-relax option to ld to fix a segfault in initialization
code (bug#338437)

Gbp-Pq: Name 0001-Pass-no-relax-to-ld-on-alpha.patch

ocaml (4.02.3-10) unstable; urgency=medium

* Add Provides: ocamlbuild to ocaml-nox
* Tell dh_installdocs to ignore README.Debian (see #868204)

[dgit import unpatched ocaml 4.02.3-10]

Import ocaml_4.02.3-10.debian.tar.xz

[dgit import tarball ocaml 4.02.3-10 ocaml_4.02.3-10.debian.tar.xz]

Merge ocaml (4.02.3-9+rpi1) import into refs/heads/workingbranch