.gitignore

@@ -14,7 +14,7 @@ src_ext/extlib/
 src_ext/mccs/
 src_ext/re/
 src_ext/ocamlgraph/
-src_ext/jbuilder/
+src_ext/dune-local/
 src_ext/result/
 src_ext/opam-file-format/
 src_ext/camlp4
@@ -28,7 +28,7 @@ src_ext/*.tar.gz
 src_ext/archives/*
 src_ext/*.*download
 src_ext/*.pkgbuild
-src_ext/jbuild-ignore
+src_ext/dune
 Opam.Runtime.*/
 *.tar.bz2
 *.annot
@@ -70,7 +70,7 @@ src/*/.merlin
 src/client/manifest.inc
 src/client/opamManifest.inc
 src/client/*.dll
-src/stubs/jbuild
+src/stubs/dune
 src/tools/opam-putenv.inc
 # doc
 doc/dev-manual/*aux

.travis-ci.sh

@@ -29,7 +29,7 @@ init-bootstrap () {
     eval $(opam env)
     # extlib is installed, since UChar.cmi causes problems with the search
     # order. See also the removal of uChar and uTF8 in src_ext/jbuild-extlib-src
-    opam install cohttp-lwt-unix ssl cmdliner dose3 cudf.0.9 opam-file-format re extlib 'jbuilder>=1.0+beta19' 'mccs>=1.1+5' --yes
+    opam install cohttp-lwt-unix ssl cmdliner dose3 cudf.0.9 opam-file-format re extlib dune 'mccs>=1.1+5' --yes
   fi
   rm -f "$OPAMBSROOT"/log/*
 }

.travis.yml

@@ -37,17 +37,20 @@ matrix:
     - os: linux
       env: OCAML_VERSION=4.06.1
       stage: Build
+    - os: linux
+      env: OCAML_VERSION=4.07.1
+      stage: Build
     - os: osx
-      env: OCAML_VERSION=4.06.1 OPAM_TEST=1
+      env: OCAML_VERSION=4.07.1 OPAM_TEST=1
       stage: Test
     - os: osx
       env: OCAML_VERSION=4.03.0
       stage: Test
     - os: linux
-      env: OCAML_VERSION=4.06.1 OPAM_TEST=1
+      env: OCAML_VERSION=4.07.1 OPAM_TEST=1
       stage: Test
     - os: linux
-      env: OCAML_VERSION=4.06.1 OPAM_TEST=1 EXTERNAL_SOLVER=aspcud
+      env: OCAML_VERSION=4.07.1 OPAM_TEST=1 EXTERNAL_SOLVER=aspcud
       stage: Test
     - os: linux
       env: COLD=1

CHANGES

@@ -2,8 +2,52 @@ 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.3:
+* Fix manpage remaining $ (OPAMBESTEFFORT)
+* Fix OPAMROOTISOK handling
+* Regenerate missing environment file
+
+2.0.2:
+* Update build from jbuilder to dune
+* Doc:
+  * update man page
+  * add message for deprecated options
+  * reinsert removed ones
+  * deprecate `no-aspcud`
+* Pin:
+  * upgrade pin depends on pinning
+  * include descr & url files on pinning 1.2 opam files
+* Sandbox:
+  * handle symlinks in bwrap
+  * allow use of internal sockets on
+  * change one-line conditional to if statement which was incompatible with set -e
+  * make /var readonly instead of empty and rw
+* Path: resolve default opam root path
+* System: suffix .out for read_command_output stdout files (#3644)
+* Locked: check consistency with opam file when reading lock file to suggest regeneration message
+* Show: remove pin depends messages
+* Cudf: Fix closure computation in the presence of cycles
+* List: Fix some cases of listing coinstallable packages
+* Format upgrade: extract archived source files of version-pinned packages
+* Core: add is_archive in OpamSystem and OpamFilename
+* Init: don't fail if empty compiler given
+* Lint: fix light_uninstall flag for error 52
+* Update cold compiler to 4.07.1
+
 2.0.1:
-* Fixes and documentation
+* Cold boot for MacOS/CentOS/Alpine
+* Install checksum validation on MacOS
+* Archive extraction for OpenBSD now defaults to using gtar
+* Fix compilation of mccs on MacOS and Nix platforms
+* Do not use GNU-sed specific features in the release Makefile, to fix build on OpenBSD/FreeBSD
+* Cleaning to enable reproducible builds
+* Update configure scripts
+* git: fix git fetch by sha1 for git < 2.14
+* linting: add test variable warning and empty description error
+* upgrade: convert pinned but not installed opam files
+* error reporting: more comprehensible error message for tar extraction, and upgrade of git-url compilers
+* opam show: upgrade given local files
+* list: as opam 2.0.0 list doesn't return non-zero code if list is empty, add --silent option for a silent output and returns 1 if list is empty
 
 2.0.0
 * Fixes and documentation

Makefile

@@ -5,15 +5,15 @@ endif
 all: opam opam-installer
 	@
 
-ifeq ($(JBUILDER),)
-  JBUILDER_FILE = src_ext/jbuilder/_build/install/default/bin/jbuilder$(EXE)
+ifeq ($(DUNE),)
+  DUNE_EXE = src_ext/dune-local/_build/install/default/bin/dune$(EXE)
   ifeq ($(shell command -v cygpath 2>/dev/null),)
-    JBUILDER := $(JBUILDER_FILE)
+    DUNE := $(DUNE_EXE)
   else
-    JBUILDER := $(shell echo "$(JBUILDER_FILE)" | cygpath -f - -a)
+    DUNE := $(shell echo "$(DUNE_EXE)" | cygpath -f - -a)
   endif
 else
-  JBUILDER_FILE=
+  DUNE_EXE=
 endif
 
 OPAMINSTALLER = ./opam-installer$(EXE)
@@ -21,18 +21,21 @@ OPAMINSTALLER = ./opam-installer$(EXE)
 ALWAYS:
 	@
 
-JBUILDER_DEP = ALWAYS $(JBUILDER_FILE)
+DUNE_DEP = ALWAYS $(DUNE_EXE)
+JBUILDER_ARGS ?= 
+DUNE_ARGS ?= $(JBUILDER_ARGS)
+DUNE_PROFILE ?= release
 
-src_ext/jbuilder/_build/install/default/bin/jbuilder$(EXE): src_ext/jbuilder.stamp
-	cd src_ext/jbuilder && ocaml bootstrap.ml && ./boot.exe
+src_ext/dune-local/_build/install/default/bin/dune$(EXE): src_ext/dune-local.stamp
+	cd src_ext/dune-local && ocaml bootstrap.ml && ./boot.exe --release
 
-src_ext/jbuilder.stamp:
-	$(MAKE) -C src_ext jbuilder.stamp
+src_ext/dune-local.stamp:
+	$(MAKE) -C src_ext dune-local.stamp
 
-jbuilder: $(JBUILDER_DEP)
-	@$(JBUILDER) build $(JBUILDER_ARGS) @install
+dune: $(DUNE_DEP)
+	@$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) @install
 
-opam: $(JBUILDER_DEP) opam.install
+opam: $(DUNE_DEP) opam.install
 	$(LN_S) -f _build/default/src/client/opamMain.exe $@$(EXE)
 ifneq ($(MANIFEST_ARCH),)
 	@mkdir -p Opam.Runtime.$(MANIFEST_ARCH)
@@ -42,12 +45,12 @@ ifneq ($(MANIFEST_ARCH),)
 	@cd Opam.Runtime.$(MANIFEST_ARCH) && $(LN_S) -f ../src/client/$(RUNTIME_GCC_S).dll .
 endif
 
-opam-installer: $(JBUILDER_DEP)
-	$(JBUILDER) build $(JBUILDER_ARGS) src/tools/opam_installer.exe
+opam-installer: $(DUNE_DEP)
+	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) src/tools/opam_installer.exe
 	$(LN_S) -f _build/default/src/tools/opam_installer.exe $@$(EXE)
 
-opam-admin.top: $(JBUILDER_DEP)
-	$(JBUILDER) build $(JBUILDER_ARGS) src/tools/opam_admin_top.bc
+opam-admin.top: $(DUNE_DEP)
+	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) src/tools/opam_admin_top.bc
 	$(LN_S) -f _build/default/src/tools/opam_admin_top.bc $@$(EXE)
 
 lib-ext:
@@ -73,7 +76,7 @@ clean:
 distclean: clean clean-ext
 	rm -rf autom4te.cache bootstrap
 	rm -f Makefile.config config.log config.status aclocal.m4
-	rm -f src/*.META src/*/.merlin src/stubs/jbuild src/client/*.dll
+	rm -f src/*.META src/*/.merlin src/stubs/dune src/client/*.dll
 	rm -f src/tools/opam-putenv.inc src/client/manifest.inc src/client/opamManifest.inc
 
 OPAMINSTALLER_FLAGS = --prefix "$(DESTDIR)$(prefix)"
@@ -93,15 +96,15 @@ ifneq ($(LIBINSTALL_DIR),)
     OPAMINSTALLER_FLAGS += --libdir "$(LIBINSTALL_DIR)"
 endif
 
-opam-devel.install: $(JBUILDER_DEP)
-	$(JBUILDER) build $(JBUILDER_ARGS) -p opam opam.install
+opam-devel.install: $(DUNE_DEP)
+	$(DUNE) build $(DUNE_ARGS) -p opam opam.install
 	sed -e "s/bin:/libexec:/" opam.install > $@
 
-opam-%.install: $(JBUILDER_DEP)
-	$(JBUILDER) build $(JBUILDER_ARGS) -p opam-$* $@
+opam-%.install: $(DUNE_DEP)
+	$(DUNE) build $(DUNE_ARGS) -p opam-$* $@
 
-opam.install: $(JBUILDER_DEP)
-	$(JBUILDER) build $(JBUILDER_ARGS) opam-installer.install opam.install
+opam.install: ALWAYS $(DUNE_DEP)
+	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) opam-installer.install opam.install
 
 opam-actual.install: opam.install man
 	@echo 'bin: [' > $@
@@ -119,11 +122,11 @@ opam-actual.install: opam.install man
 
 OPAMLIBS = core format solver repository state client
 
-opam-%: $(JBUILDER_DEP)
-	$(JBUILDER) build $(JBUILDER_ARGS) opam-$*.install
+opam-%: $(DUNE_DEP)
+	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) opam-$*.install
 
-opam-lib: $(JBUILDER_DEP)
-	$(JBUILDER) build $(JBUILDER_ARGS) $(patsubst %,opam-%.install,$(OPAMLIBS))
+opam-lib: $(DUNE_DEP)
+	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) $(patsubst %,opam-%.install,$(OPAMLIBS))
 
 installlib-%: opam-installer opam-%.install
 	$(if $(wildcard src_ext/lib/*),\
@@ -134,7 +137,7 @@ installlib-%: opam-installer opam-%.install
 uninstalllib-%: opam-installer opam-%.install
 	$(OPAMINSTALLER) -u $(OPAMINSTALLER_FLAGS) opam-$*.install
 
-libinstall: $(JBUILDER_DEP) opam-admin.top $(OPAMLIBS:%=installlib-%)
+libinstall: $(DUNE_DEP) opam-admin.top $(OPAMLIBS:%=installlib-%)
 	@
 
 install: opam-actual.install
@@ -148,12 +151,12 @@ uninstall: opam-actual.install
 	$(OPAMINSTALLER) -u $(OPAMINSTALLER_FLAGS) $<
 
 checker:
-	$(JBUILDER) build src/tools/opam_check.exe
+	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) src/tools/opam_check.exe
 
 .PHONY: tests tests-local tests-git
-tests: $(JBUILDER_DEP)
-	$(JBUILDER) build opam.install src/tools/opam_check.exe
-	$(JBUILDER) runtest --force --no-buffer $(JBUILDER_ARGS) src/ tests/
+tests: $(DUNE_DEP)
+	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) opam.install src/tools/opam_check.exe
+	$(DUNE) runtest --force --no-buffer --profile=$(DUNE_PROFILE) $(DUNE_ARGS) src/ tests/
 
 # tests-local, tests-git
 tests-%:

Makefile.config.in

@@ -16,7 +16,7 @@ OCAMLFIND = @OCAMLFIND@
 OCAML = @OCAML@
 OCAMLC = @OCAMLC@
 OCAMLOPT = @OCAMLOPT@
-JBUILDER = @JBUILDER@
+DUNE = @DUNE@
 LN_S = @LN_S@
 
 EXE = @EXE@

appveyor.patch

@@ -14,8 +14,8 @@ index 1a350068..964a818c 100644
 --- a/src_ext/Makefile
 +++ b/src_ext/Makefile
 @@ -12,8 +12,8 @@ endif
- URL_ocaml = http://caml.inria.fr/pub/distrib/ocaml-4.06/ocaml-4.06.0.tar.gz
- MD5_ocaml = 66e5439eb63dbb8b8224cba5d1b20947
+ URL_ocaml = http://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.1.tar.gz
+ MD5_ocaml = 0b180b273ce5cc2ac68f347c9b06d06f
  
 -URL_flexdll = https://github.com/alainfrisch/flexdll/archive/0.37.tar.gz
 -MD5_flexdll = cc456a89382e60d84130cddd53977486

appveyor_build.cmd

@@ -75,7 +75,7 @@ set CYGWIN_UPGRADE_REQUIRED=0
 for %%P in (%CYGWIN_PACKAGES%) do call :CheckPackage %%P
 call :UpgradeCygwin
 
-rem Use dra27 jbuilder/ocaml-mccs/flexdll for native ports
+rem Use dra27 flexdll for native ports
 if "%OCAML_PORT%" neq "" git apply appveyor.patch
 
 set INSTALLED_URL=

configure.ac

-AC_INIT(opam,2.0.1)
+dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
+AC_INIT(opam,2.0.3)
 AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -132,7 +133,7 @@ AS_IF([test "x${CI}" != "x"], [
 ])
 AS_IF([test "x${CI}" != "x" -o "x${enable_developer_mode}" = "xyes"],[
   AS_IF([test "x${CCOMP_TYPE}" = "xmsvc"],[
-    CONF_CFLAGS="/WX"
+    CONF_CFLAGS="\"/WX\""
   ],[
     CONF_CFLAGS="-Werror"
   ])
@@ -158,7 +159,7 @@ AS_IF([ test ${WIN32} -eq 1 ],[
       AS_IF([ test "$ARCH" = "i386" ],[T_CC64=x86_64-w64-mingw32-gcc],[T_CC64=i686-w64-mingw32-gcc])])
     AC_CHECK_TOOL(CC64,[${T_CC64}],[no])
     AS_IF([ test "x${CC64}" != "xno" ],[
-      CC64_JBUILD="(run ${CC64} -o \"\${@}\" -I ../core -Wdeclaration-after-statement \${<})"
+      CC64_JBUILD="(run ${CC64} -o \"%{targets}\" -I ../core -Wdeclaration-after-statement %{source})"
     ])
   ],[
     AC_MSG_CHECKING([whether Microsoft Linker needs a PATH shim])
@@ -182,7 +183,7 @@ AS_IF([ test ${WIN32} -eq 1 ],[
       AC_MSG_RESULT([from $MSVS_NAME])
       CL_FULL="`PATH="${MSVS_PATH}:${PATH}" which cl | cygpath -f - -w`"
       MSVS_PATH="`echo "${MSVS_PATH}" | cygpath -f - -wp`"
-      CC64_JBUILD="(setenv PATH \"${MSVS_PATH}\" (setenv LIB \"${MSVS_LIB};${LIB}\" (setenv INCLUDE \"${MSVS_INC};${INCLUDE}\" (run \"${CL_FULL}\" /nologo \"/Fe\${@}\" /I../core \${<}))))"
+      CC64_JBUILD="(setenv PATH \"${MSVS_PATH}\" (setenv LIB \"${MSVS_LIB};${LIB}\" (setenv INCLUDE \"${MSVS_INC};${INCLUDE}\" (run \"${CL_FULL}\" /nologo \"/Fe%{targets}\" /I../core %{source}))))"
       CC64_JBUILD="$(echo $CC64_JBUILD|sed -e 's/\\/\\\\/g')"
     ])
   ])
@@ -203,7 +204,7 @@ AC_PROG_FINDLIB
 
 AC_ARG_ENABLE([certificate_check],
   AS_HELP_STRING([--disable-certificate-check],
-                 [Do not check the certificate of opam's dependency archives])
+                 [Do not check the certificate of opam's dependency archives])dnl '
 )
 
 AS_IF([test "x${enable_certificate_check}" = "xno"], [
@@ -213,7 +214,7 @@ AS_IF([test "x${enable_certificate_check}" = "xno"], [
 
 AC_CHECK_PROGS(FETCH,[curl wget],no)
 
-AC_CHECK_TOOL(JBUILDER,jbuilder)
+AC_CHECK_TOOL(DUNE,dune)
 AC_CHECK_TOOL(PATCH,patch)
 AC_CHECK_TOOL(BUNZIP2,bunzip2)
 
@@ -239,7 +240,7 @@ fi
 
 AS_IF([test "x${with_private_runtime}" != "xno"],[
   AS_IF([test ${WIN32} -eq 1 -a "x${CCOMP_TYPE}" = "xcc"],[
-    CONF_MANIFEST_O=opam-manifest.o
+    CONF_MANIFEST_O="\"opam-manifest.o\""
     AS_IF([ test "$ARCH" = "i386" ],[
       TOOL_ARCH=i686
       MANIFEST_ARCH=x86
@@ -358,12 +359,12 @@ AC_CONFIG_FILES(
 )
 AC_OUTPUT
 
+
+rm -f src/stubs/dune
 AS_IF([ test ${WIN32} -eq 1],[
   cd src/stubs
-  ${LN_S} -f jbuild-win32 jbuild
+  ${LN_S} -f dune-win32 dune
   cd ../..
-],[
-  rm -f src/stubs/jbuild
 ])
 
 echo

debian/changelog

+opam (2.0.3-1) unstable; urgency=medium
+
+  * New (bugfix) upstream release
+  * Restrict dependency on bubblewrap on [linux-any] (Closes: #918345)
+  * Update patches
+
+ -- Mehdi Dogguy <mehdi@debian.org>  Fri, 01 Feb 2019 12:05:09 +0100
+
 opam (2.0.1-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -52,7 +52,7 @@ Depends:
  build-essential,
  aspcud | mccs | packup,
  opam-installer,
- bubblewrap,
+ bubblewrap [linux-any],
  unzip,
  wget | curl
 Recommends:

debian/patches/0002-Add-a-test-target.patch

@@ -6,20 +6,18 @@ This patch is useful only for Debian: It helps dh_auto_test to detect
 that there is a testsuite and run it accordingly. dh_auto_test checks
 'test' and 'check' targets, but not 'tests'.
 ---
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index 07940d5..91a3fe6 100644
+index 79ec35a..11b1230 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -150,7 +150,8 @@ uninstall: opam-actual.install
- checker:
- 	$(JBUILDER) build src/tools/opam_check.exe
+@@ -154,6 +154,7 @@ checker:
+ 	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) src/tools/opam_check.exe
  
--.PHONY: tests tests-local tests-git
-+.PHONY: test tests tests-local tests-git
+ .PHONY: tests tests-local tests-git
 +test: tests
- tests: $(JBUILDER_DEP)
- 	$(JBUILDER) build opam.install src/tools/opam_check.exe
- 	$(JBUILDER) runtest --force --no-buffer $(JBUILDER_ARGS) src/ tests/
+ tests: $(DUNE_DEP)
+ 	$(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) opam.install src/tools/opam_check.exe
+ 	$(DUNE) runtest --force --no-buffer --profile=$(DUNE_PROFILE) $(DUNE_ARGS) src/ tests/

debian/patches/0002-Fix-spelling-error-in-manpage.patch

@@ -23,10 +23,10 @@ Subject: Fix spelling-error-in-manpage
  17 files changed, 27 insertions(+), 27 deletions(-)
 
 diff --git a/CHANGES b/CHANGES
-index 88e2b6e..ed62783 100644
+index e438db8..f608ac9 100644
 --- a/CHANGES
 +++ b/CHANGES
-@@ -287,7 +287,7 @@ are not marked).
+@@ -331,7 +331,7 @@ are not marked).
  
  1.2.1
  * Non-system compiler definitions without source are now allowed
@@ -159,10 +159,10 @@ index db100ac..65c8fd4 100644
            $(i,~/.opam/config) is always ignored.")
  
 diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml
-index a7c7aab..bef842d 100644
+index 1500a4b..7248fe2 100644
 --- a/src/client/opamCommands.ml
 +++ b/src/client/opamCommands.ml
-@@ -175,13 +175,13 @@ let init =
+@@ -178,13 +178,13 @@ let init =
          repository).";
      `P "The initial repository and defaults can be set through a \
          configuration file found at $(i,~/.opamrc) or $(i,/etc/opamrc).";
@@ -178,7 +178,7 @@ index a7c7aab..bef842d 100644
          through $(i,~/.opamrc), $(i,/etc/opamrc), or a file supplied with \
          $(i,--config). The default configuration for this version of opam \
          can be obtained using $(b,--show-default-opamrc).";
-@@ -282,7 +282,7 @@ let init =
+@@ -285,7 +285,7 @@ let init =
    let no_sandboxing =
      mk_flag ["disable-sandboxing"]
        "Use a default configuration with sandboxing disabled (note that this \
@@ -187,7 +187,7 @@ index a7c7aab..bef842d 100644
         $(b,--config) is used). Use this at your own risk, without sandboxing \
         it is possible for a broken package script to delete all your files."
    in
-@@ -1558,7 +1558,7 @@ let repository =
+@@ -1564,7 +1564,7 @@ let repository =
       package definitions anymore. With $(b,--all), makes opam forget about \
       these repositories completely.";
      "set-repos", `set_repos, ["NAME..."],
@@ -196,7 +196,7 @@ index a7c7aab..bef842d 100644
       definitions from, in the specified priority order (overriding previous \
       selection and ranks), according to the specified scope.";
      "set-url", `set_url, ["NAME"; "ADDRESS"; "[QUORUM]"; "[FINGERPRINTS]"],
-@@ -1586,7 +1586,7 @@ let repository =
+@@ -1592,7 +1592,7 @@ let repository =
          repositories, or all configured repositories with $(b,--all).";
    ] @ mk_subdoc ~defaults:["","list"] commands @ [
        `S scope_section;
@@ -205,7 +205,7 @@ index a7c7aab..bef842d 100644
            $(b,remove), $(b,set-repos). If no flag in this section is specified \
            the updated selections default to the current switch. Multiple scopes \
            can be selected, e.g. $(b,--this-switch --set-default).";
-@@ -2306,7 +2306,7 @@ let pin ?(unpin_only=false) () =
+@@ -2326,7 +2326,7 @@ let pin ?(unpin_only=false) () =
          used locally.";
      `P "If (or $(i,-)) is specified, the package is pinned without a source \
          archive. The package name can be omitted if the target is a directory \
@@ -319,10 +319,10 @@ index c00cebc..0e64378 100644
  
    global_variables:
 diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh
-index 3d29e3e..dae7898 100755
+index 50b833c..6c709ec 100755
 --- a/src/state/shellscripts/bwrap.sh
 +++ b/src/state/shellscripts/bwrap.sh
-@@ -27,7 +27,7 @@ add_mounts() {
+@@ -51,7 +51,7 @@ add_sys_mounts() {
      done
  }
  

doc/Makefile

 -include ../Makefile.config
 
-ifeq ($(JBUILDER),)
-  JBUILDER_FILE = ../src_ext/jbuilder/_build/install/default/bin/jbuilder$(EXE)
+ifeq ($(DUNE),)
+  DUNE_EXE = ../src_ext/dune-local/_build/install/default/bin/dune$(EXE)
   ifeq ($(shell command -v cygpath 2>/dev/null),)
-    JBUILDER := $(JBUILDER_FILE)
+    DUNE := $(DUNE_EXE)
   else
-    JBUILDER := $(shell echo "$(JBUILDER_FILE)" | cygpath -f - -a)
+    DUNE := $(shell echo "$(DUNE_EXE)" | cygpath -f - -a)
   endif
 else
-  JBUILDER_FILE=
+  DUNE_EXE=
 endif
 
+DUNE_PROFILE ?= release
+DUNE_ARGS ?= 
+
 ifndef OPAM
-  OPAM = $(JBUILDER) exec -- opam
+  OPAM = $(DUNE) exec --profile=$(DUNE_PROFILE) -- opam
 endif
 
 TOPICS  = $(shell $(OPAM) help topics)
@@ -21,7 +24,7 @@ TOPICS_ADMIN = cache filter index lint list upgrade
 HELPFMT = --help=groff
 
 ifndef OPAM_INSTALLER
-  OPAM_INSTALLER = $(JBUILDER) exec -- opam-installer
+  OPAM_INSTALLER = $(DUNE) exec --profile=$(DUNE_PROFILE) -- opam-installer
 endif
 
 .PHONY: man html pages
@@ -58,7 +61,7 @@ man-html: man
 
 html:
 	rm -rf html
-	cd .. && $(JBUILDER) build @doc
+	cd .. && $(DUNE) build --profile=$(DUNE_PROFILE) $(DUNE_ARGS) @doc
 	cp -r ../_build/default/_doc/_html html
 	sed 's/%{OPAMVERSION}%/'$(version)'/g' index.html > html/index.html
 # Not to break older links, add manpages to the `ocamldoc` dir

dune

+(ignored_subdirs (bootstrap))

dune-project

+(lang dune 1.2)
+(name opam)

jbuild-ignore

-bootstrap

opam-client.opam

 opam-version: "1.2"
-version: "2.0.1"
+version: "2.0.3"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [
   "Vincent Bernardoff <vb@luminar.eu.org>"
@@ -21,10 +21,10 @@ build: [
   [make "%{name}%.install"]
 ]
 depends: [
-  "opam-state" {= "2.0.1"}
-  "opam-solver" {= "2.0.1"}
+  "opam-state" {= "2.0.3"}
+  "opam-solver" {= "2.0.3"}
   "re" {>= "1.7.2"}
   "cmdliner" {>= "0.9.8"}
-  "jbuilder" {build & >= "1.0+beta20"}
+  "dune" {build & >= "1.2.1"}
 ]
 available: ocaml-version >= "4.02.3"