Merge pull request #4425 from OCamlPro/208

2.0.8 backported commits

CHANGES

@@ -2,6 +2,28 @@ Changes prefixed with "(*)" are potentially breaking to scripts or existing
 repositories (changes that are automatically handled by the format upgrade tools
 are not marked).
 
+2.0.8:
+* Add colon for fish MANPATH fix. [#4084 @rjbou - fix #4078]
+* No error when linked directory doesn't exist (e.g. XDG defined)
+  [#4278 @kit-ty-kate]
+* Add quotes to avoid space unwanted behaviors [#4278 @kit-ty-kate]
+* Handle `CCACHE_DIR` environment variable in sandbox script.
+  [#4087 @rjbou - fix #4079]
+* Follow links of `~/.cache` & `~/.cache/dune` for bwrap call.
+  [#4087 @rjbou - fix #4086]
+* Don't overwrite user's sandbow script modification. [#4020 #4092 @rjbou]
+* On MacOS sandbox script, always read write mount `/tmp`
+  [#3742 @rjbou - fix ocaml/opam-repository#13339]
+* Use version var in opam file instead of equal current version number in
+  opamlib dependencies [#4178 @rjbou]
+* Opam file build using dune [#4178 @rjbou #4229 @kit-ty-kate - fix #4173]
+* Update opam file to 2.0 [#4371 @AltGr]
+* Fix `arch` detection when using 32bit mode on ARM64 [#4462 @kit-ty-kate]
+* Fix `arch` detection of i486 [#4462 @kit-ty-kate]
+* The stdout of pre- and post-session hooks is now propagated to the user
+  [#4382 @AltGr - fix #4359]
+* Run switch pre/post sessions hooks [#4476 @rjbou - fix #4472]
+
 
 2.0.7:
 * Properly escape Windows paths on manpages [#4129 @AltGr @rjbou]

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for opam 2.0.7.
+# Generated by GNU Autoconf 2.69 for opam 2.0.8.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -578,8 +578,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='2.0.7'
-PACKAGE_STRING='opam 2.0.7'
+PACKAGE_VERSION='2.0.8'
+PACKAGE_STRING='opam 2.0.8'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 2.0.7 to adapt to many kinds of systems.
+\`configure' configures opam 2.0.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1327,7 +1327,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 2.0.7:";;
+     short | recursive ) echo "Configuration of opam 2.0.8:";;
    esac
   cat <<\_ACEOF
 
@@ -1431,7 +1431,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 2.0.7
+opam configure 2.0.8
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1526,7 +1526,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 2.0.7, which was
+It was created by opam $as_me 2.0.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -6083,7 +6083,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 2.0.7, which was
+This file was extended by opam $as_me 2.0.8, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6136,7 +6136,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-opam config.status 2.0.7
+opam config.status 2.0.8
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
-AC_INIT(opam,2.0.7)
+AC_INIT(opam,2.0.8)
 AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

doc/pages/Manual.md

@@ -1388,6 +1388,10 @@ for <span class="opam">opam</span>.
     - `hooks`: the directory where scripts created using `opamrc`'s
       [`init-scripts:`](#opamrcfield-init-scripts) field are created.
 
+    In addition, the output of these hooks is printed to the user, so
+    `post-session-commands` may be used to output extra information upon session
+    completion.
+
 - <a id="configfield-repository-validation-command">`repository-validation-command: [ <term> { <filter> } ... ]`</a>:
   defines a command to run on the upstream repositories to validate their
   authenticity. When this is specified, and for repositories that define

opam-client.opam

@@ -1,5 +1,9 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "opam 2.0 development libraries (client)"
+description: """
+Actions on the opam root, switches, installations, and front-end.
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,16 +19,16 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
-  [make "%{name}%.install"]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "opam-state" {= "2.0.7"}
-  "opam-solver" {= "2.0.7"}
+  "ocaml" {>= "4.02.3"}
+  "opam-state" {= version}
+  "opam-solver" {= version}
   "re" {>= "1.7.2"}
   "cmdliner" {>= "0.9.8"}
   "dune" {build & >= "1.2.1"}
 ]
-available: ocaml-version >= "4.02.3"

opam-core.opam

@@ -1,5 +1,9 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "opam 2.0 development libraries (core)"
+description: """
+Small standard library extensions, and generic system interaction modules used by opam.
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,12 +19,13 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
-  [make "%{name}%.install"]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
+  "ocaml" {>= "4.02.3"}
   "base-unix"
   "base-bigarray"
   "ocamlgraph"
@@ -29,4 +34,3 @@ depends: [
   "cppo" {build}
 ]
 conflicts: "extlib-compat"
-available: ocaml-version >= "4.02.3"

opam-devel.opam

@@ -1,5 +1,9 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "opam 2.0 bootstrapped binary"
+description: """
+This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide.
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,14 +19,15 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
   [make "%{name}%.install"]
+  [make "tests"] {with-test}
 ]
-build-test: [make "tests"]
 depends: [
-  "opam-client" {= "2.0.7"}
+  "ocaml" {>= "4.02.3"}
+  "opam-client" {= version}
   "cmdliner" {>= "0.9.8"}
   "dune" {build & >= "1.2.1"}
 ]
@@ -34,4 +39,3 @@ If you just want to give it a try without altering your current installation, yo
     alias opam2=\"OPAMROOT=~/.opam2 %{lib}%/%{name}%/opam\""
   {success}
 ]
-available: ocaml-version >= "4.02.3"

opam-format.opam

@@ -1,5 +1,9 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "opam 2.0 development libraries (format)"
+description: """
+Definition of opam datastructures and its file interface.
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,14 +19,14 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
-  [make "%{name}%.install"]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "opam-core" {= "2.0.7"}
+  "ocaml" {>= "4.02.3"}
+  "opam-core" {= version}
   "opam-file-format" {>= "2.0.0~rc2" & <= "2.1.0"}
   "dune" {build & >= "1.2.1"}
 ]
-available: ocaml-version >= "4.02.3"

opam-installer.opam

@@ -1,5 +1,11 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "Installation of files to a prefix, following opam conventions"
+description: """
+opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam.
+
+[1] http://opam.ocaml.org/doc/2.0/Manual.html#lt-pkgname-gt-install
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,14 +21,14 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
-  [make "%{name}%.install"]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "opam-format" {= "2.0.7"}
+  "ocaml" {>= "4.02.3"}
+  "opam-format" {= version}
   "cmdliner" {>= "0.9.8"}
   "dune" {build & >= "1.2.1"}
 ]
-available: ocaml-version >= "4.02.3"

opam-repository.opam

@@ -1,5 +1,9 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "opam 2.0 development libraries (repository)"
+description: """
+This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends.
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,13 +19,13 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
-  [make "%{name}%.install"]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "opam-format" {= "2.0.7"}
+  "ocaml" {>= "4.02.3"}
+  "opam-format" {= version}
   "dune" {build & >= "1.2.1"}
 ]
-available: ocaml-version >= "4.02.3"

opam-solver.opam

@@ -1,5 +1,9 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "opam 2.0 development libraries (solver)"
+description: """
+Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam.
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,16 +19,16 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
-  [make "%{name}%.install"]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "opam-format" {= "2.0.7"}
+  "ocaml" {>= "4.02.3"}
+  "opam-format" {= version}
   "mccs" {>= "1.1+9"}
   "dose3" {>= "5"}
   "cudf" {>= "0.7"}
   "dune" {build & >= "1.2.1"}
 ]
-available: ocaml-version >= "4.02.3"

opam-state.opam

@@ -1,5 +1,9 @@
-opam-version: "1.2"
-version: "2.0.7"
+opam-version: "2.0"
+version: "2.0.8"
+synopsis: "opam 2.0 development libraries (state)"
+description: """
+Handling of the ~/.opam hierarchy, repository and switch states.
+"""
 maintainer: "[email protected]"
 authors: [
   "Vincent Bernardoff <[email protected]>"
@@ -15,13 +19,13 @@ authors: [
 ]
 homepage: "https://opam.ocaml.org/"
 bug-reports: "https://github.com/ocaml/opam/issues"
-dev-repo: "https://github.com/ocaml/opam.git"
+dev-repo: "git+https://github.com/ocaml/opam.git"
 build: [
   ["./configure" "--disable-checks" "--prefix" prefix]
-  [make "%{name}%.install"]
+  ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "opam-repository" {= "2.0.7"}
+  "ocaml" {>= "4.02.3"}
+  "opam-repository" {= version}
   "dune" {build & >= "1.2.1"}
 ]
-available: ocaml-version >= "4.02.3"

shell/bundle.sh

@@ -2,7 +2,7 @@
 set -ue
 
 OCAMLV=4.04.1
-OPAMV=2.0.7
+OPAMV=2.0.8
 OPAM_REPO=https://opam.ocaml.org/2.0
 DEBUG=
 MAKESELF=