Inline patch for local changes to OPAM (#7672)

Mostly about aliasing `Dune_re` that we can't do on our vendored branch
of opam, lest it stops building.

Signed-off-by: Marek Kubica <marek@tarides.com>

vendor/update-opam.sh

@@ -19,6 +19,125 @@ mkdir -p opam/src
 
 SRC=$TMP/opam
 
+cat > $TMP/local-opam-changes.diff << "EOF"
+diff --git a/vendor/opam/src/core/opamCoreConfigDeveloper.ml b/vendor/opam/src/core/opamCoreConfigDeveloper.ml
+new file mode 100644
+index 000000000..cf62a7fd2
+--- /dev/null
++++ b/vendor/opam/src/core/opamCoreConfigDeveloper.ml
+@@ -0,0 +1 @@
++let value = ""
+diff --git a/vendor/opam/src/core/opamProcess.ml b/vendor/opam/src/core/opamProcess.ml
+index 764ff18fd..ef8734625 100644
+--- a/vendor/opam/src/core/opamProcess.ml
++++ b/vendor/opam/src/core/opamProcess.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Re = Dune_re
++
+ let log ?level fmt =
+   OpamConsole.log "PROC" ?level fmt
+ 
+diff --git a/vendor/opam/src/core/opamStd.ml b/vendor/opam/src/core/opamStd.ml
+index e04c84379..454702714 100644
+--- a/vendor/opam/src/core/opamStd.ml
++++ b/vendor/opam/src/core/opamStd.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Re = Dune_re
++
+ module type SET = sig
+   include Set.S
+   val map: (elt -> elt) -> t -> t
+diff --git a/vendor/opam/src/core/opamStd.mli b/vendor/opam/src/core/opamStd.mli
+index 9133f9e16..5fd460f06 100644
+--- a/vendor/opam/src/core/opamStd.mli
++++ b/vendor/opam/src/core/opamStd.mli
+@@ -278,7 +278,7 @@ module String : sig
+   val for_all: (char -> bool) -> string -> bool
+   val contains_char: string -> char -> bool
+   val contains: sub:string -> string -> bool
+-  val exact_match: Re.re -> string -> bool
++  val exact_match: Dune_re.re -> string -> bool
+   val find_from: (char -> bool) -> string -> int -> int
+ 
+   (** Like [String.compare], but with lowercase/uppercase variants ordered next
+diff --git a/vendor/opam/src/core/opamUrl.ml b/vendor/opam/src/core/opamUrl.ml
+index 16baf4c75..8234b3419 100644
+--- a/vendor/opam/src/core/opamUrl.ml
++++ b/vendor/opam/src/core/opamUrl.ml
+@@ -11,6 +11,8 @@
+ 
+ open OpamStd.Op
+ 
++module Re = Dune_re
++
+ type version_control = [ `git | `darcs | `hg ]
+ 
+ type backend = [ `http | `rsync | version_control ]
+diff --git a/vendor/opam/src/core/opamVersionInfo.ml b/vendor/opam/src/core/opamVersionInfo.ml
+new file mode 100644
+index 000000000..6c0168d9b
+--- /dev/null
++++ b/vendor/opam/src/core/opamVersionInfo.ml
+@@ -0,0 +1 @@
++let version = "2.2.0~alpha-vendored"
+diff --git a/vendor/opam/src/format/opamFile.ml b/vendor/opam/src/format/opamFile.ml
+index 03611c8e8..689cac471 100644
+--- a/vendor/opam/src/format/opamFile.ml
++++ b/vendor/opam/src/format/opamFile.ml
+@@ -18,6 +18,7 @@
+       a string list list. These are mostly used internally
+     - files using the "opam syntax" and lexer, parsed using OpamFormat.Pp.V
+ *)
++module Re = Dune_re
+ 
+ open OpamParserTypes.FullPos
+ open OpamTypes
+diff --git a/vendor/opam/src/format/opamFilter.ml b/vendor/opam/src/format/opamFilter.ml
+index af7374e4b..d60abc796 100644
+--- a/vendor/opam/src/format/opamFilter.ml
++++ b/vendor/opam/src/format/opamFilter.ml
+@@ -8,6 +8,7 @@
+ (*  exception on linking described in the file LICENSE.                   *)
+ (*                                                                        *)
+ (**************************************************************************)
++module Re = Dune_re
+ 
+ open OpamTypes
+ open OpamTypesBase
+diff --git a/vendor/opam/src/format/opamFormula.ml b/vendor/opam/src/format/opamFormula.ml
+index 6931055e4..277b17963 100644
+--- a/vendor/opam/src/format/opamFormula.ml
++++ b/vendor/opam/src/format/opamFormula.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Re = Dune_re
++
+ type relop = [`Eq|`Neq|`Geq|`Gt|`Leq|`Lt]
+ 
+ let neg_relop = function
+diff --git a/vendor/opam/src/format/opamSwitch.ml b/vendor/opam/src/format/opamSwitch.ml
+index c6704f911..6dbd58e96 100644
+--- a/vendor/opam/src/format/opamSwitch.ml
++++ b/vendor/opam/src/format/opamSwitch.ml
+@@ -9,6 +9,8 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++module Re = Dune_re
++
+ include OpamStd.AbstractString
+ 
+ let unset = of_string "#unset#"
+EOF
+
 for subpackage in core repository format
 do
     PKG=opam/src/$subpackage/
@@ -30,4 +149,5 @@ do
     git checkout $PKG/dune
 done
 
+git apply $TMP/local-opam-changes.diff
 git add -A opam/