Patch cohttp-2.5.2, revert semantic change in Header.replace

packages/cohttp-async/cohttp-async.2.5.2-1/opam

@@ -0,0 +1,58 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+]
+synopsis: "CoHTTP implementation for the Async concurrency library"
+description: """
+An implementation of an HTTP client and server using the Async
+concurrency library. See the `Cohttp_async` module for information
+on how to use this.  The package also installs `cohttp-curl-async`
+and a `cohttp-server-async` binaries for quick uses of a HTTP(S)
+client and server respectively.
+"""
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+depends: [
+  "ocaml" {>= "4.04.1"}
+  "dune" {>= "1.1.0"}
+  "async_kernel" {>= "v0.13.0" & < "v0.14.0"}
+  "async_unix" {>= "v0.13.0" & < "v0.14.0"}
+  "async" {>= "v0.13.0" & < "v0.14.0"}
+  "base" {>= "v0.11.0"}
+  "core" {with-test}
+  "cohttp" {=version}
+  "conduit-async" {>="1.2.0"}
+  "magic-mime"
+  "logs"
+  "fmt" {>= "0.8.2"}
+  "sexplib0"
+  "stdlib-shims"
+  "ppx_sexp_conv" {>= "v0.13.0"}
+  "ounit" {with-test}
+  "uri" {>= "2.0.0"}
+  "uri-sexp"
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.2/cohttp-v2.5.2.tbz"
+  checksum: [
+    "sha256=37bbb95e4b8f5fa9ffa6e3e38693c50369f32137eeae70d528cafe76a92a449a"
+    "sha512=736bf5ee0765096ea654a6378d349a8ae52b8c134bc959ae307cf830c84f4010aa8b152a8c1c141696616766f6a3b24e0a61c0873215cc7f24a0083c7d6a9197"
+  ]
+}

packages/cohttp-lwt-jsoo/cohttp-lwt-jsoo.2.5.2-1/opam

@@ -0,0 +1,47 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+]
+synopsis: "CoHTTP implementation for the Js_of_ocaml JavaScript compiler"
+description: """
+An implementation of an HTTP client for JavaScript, but using the
+CoHTTP types.  This lets you build HTTP clients that can compile
+natively (using one of the other Cohttp backends such as `cohttp-lwt-unix`)
+and also to native JavaScript via js_of_ocaml.
+"""
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+depends: [
+  "ocaml" {>= "4.04.1"}
+  "dune" {>= "1.1.0"}
+  "cohttp" {=version}
+  "cohttp-lwt" {=version}
+  "lwt" {>= "3.0.0"}
+  "js_of_ocaml" {>= "3.3.0"}
+  "js_of_ocaml-ppx" {>= "3.3.0"}
+  "js_of_ocaml-lwt" {>= "3.5.0"}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.2/cohttp-v2.5.2.tbz"
+  checksum: [
+    "sha256=37bbb95e4b8f5fa9ffa6e3e38693c50369f32137eeae70d528cafe76a92a449a"
+    "sha512=736bf5ee0765096ea654a6378d349a8ae52b8c134bc959ae307cf830c84f4010aa8b152a8c1c141696616766f6a3b24e0a61c0873215cc7f24a0083c7d6a9197"
+  ]
+}

packages/cohttp-lwt-unix/cohttp-lwt-unix.2.5.2-1/opam

@@ -0,0 +1,53 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+]
+synopsis: "CoHTTP implementation for Unix and Windows using Lwt"
+description: """
+An implementation of an HTTP client and server using the Lwt
+concurrency library. See the `Cohttp_lwt_unix` module for information
+on how to use this.  The package also installs `cohttp-curl-lwt`
+and a `cohttp-server-lwt` binaries for quick uses of a HTTP(S)
+client and server respectively.
+
+Although the name implies that this only works under Unix, it
+should also be fine under Windows too."""
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+depends: [
+  "ocaml" {>= "4.04.1"}
+  "dune" {>= "1.1.0"}
+  "conduit-lwt-unix" {>= "1.0.3"}
+  "cmdliner"
+  "magic-mime"
+  "logs"
+  "fmt" {>= "0.8.2"}
+  "cohttp-lwt" {=version}
+  "lwt" {>= "3.0.0"}
+  "base-unix"
+  "ounit" {with-test}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.2/cohttp-v2.5.2.tbz"
+  checksum: [
+    "sha256=37bbb95e4b8f5fa9ffa6e3e38693c50369f32137eeae70d528cafe76a92a449a"
+    "sha512=736bf5ee0765096ea654a6378d349a8ae52b8c134bc959ae307cf830c84f4010aa8b152a8c1c141696616766f6a3b24e0a61c0873215cc7f24a0083c7d6a9197"
+  ]
+}

packages/cohttp-lwt/cohttp-lwt.2.5.2-1/opam

@@ -0,0 +1,49 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+]
+synopsis: "CoHTTP implementation using the Lwt concurrency library"
+description: """
+This is a portable implementation of HTTP that uses the Lwt
+concurrency library to multiplex IO.  It implements as much of the
+logic in an OS-independent way as possible, so that more specialised
+modules can be tailored for different targets.  For example, you
+can install `cohttp-lwt-unix` or `cohttp-lwt-jsoo` for a Unix or
+JavaScript backend, or `cohttp-mirage` for the MirageOS unikernel
+version of the library. All of these implementations share the same
+IO logic from this module."""
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+depends: [
+  "ocaml" {>= "4.04.1"}
+  "dune" {>= "1.1.0"}
+  "cohttp" {=version}
+  "lwt" {>= "2.5.0"}
+  "sexplib0"
+  "ppx_sexp_conv" {>= "v0.13.0"}
+  "logs"
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.2/cohttp-v2.5.2.tbz"
+  checksum: [
+    "sha256=37bbb95e4b8f5fa9ffa6e3e38693c50369f32137eeae70d528cafe76a92a449a"
+    "sha512=736bf5ee0765096ea654a6378d349a8ae52b8c134bc959ae307cf830c84f4010aa8b152a8c1c141696616766f6a3b24e0a61c0873215cc7f24a0083c7d6a9197"
+  ]
+}

packages/cohttp-mirage/cohttp-mirage.2.5.2-1/opam

@@ -0,0 +1,47 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: ["Anil Madhavapeddy" "Thomas Gazagnaire"]
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+synopsis: "CoHTTP implementation for the MirageOS unikernel"
+description: """
+This HTTP implementation uses the Cohttp portable implementaiton
+along with the Lwt threading library in order to provide a
+`Cohttp_mirage` functor that can be used in MirageOS unikernels
+to build very small and efficient HTTP clients and servers
+without having a hard dependency on an underlying operating
+system.
+
+Please see <https://mirage.io> for a self-hosted explanation
+and instructions on how to use this library."""
+depends: [
+  "ocaml" {>= "4.05.0"}
+  "dune" {>= "1.1.0"}
+  "mirage-flow" {>= "2.0.0"}
+  "mirage-channel" {>= "4.0.0"}
+  "conduit" {>= "2.0.2"}
+  "conduit-mirage" {>= "2.0.2"}
+  "mirage-kv" {>= "3.0.0"}
+  "lwt" {>= "2.4.3"}
+  "cohttp"
+  "cohttp-lwt"
+  "astring"
+  "magic-mime"
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.2/cohttp-v2.5.2.tbz"
+  checksum: [
+    "sha256=37bbb95e4b8f5fa9ffa6e3e38693c50369f32137eeae70d528cafe76a92a449a"
+    "sha512=736bf5ee0765096ea654a6378d349a8ae52b8c134bc959ae307cf830c84f4010aa8b152a8c1c141696616766f6a3b24e0a61c0873215cc7f24a0083c7d6a9197"
+  ]
+}

packages/cohttp-top/cohttp-top.2.5.2-1/opam

@@ -0,0 +1,41 @@
+opam-version: "2.0"
+maintainer: "anil@recoil.org"
+authors: [
+  "Anil Madhavapeddy"
+  "Stefano Zacchiroli"
+  "David Sheets"
+  "Thomas Gazagnaire"
+  "David Scott"
+  "Rudi Grinberg"
+  "Andy Ray"
+]
+synopsis: "CoHTTP toplevel pretty printers for HTTP types"
+description: """
+This library installs toplevel prettyprinters for CoHTTP
+types such as the `Request`, `Response` and `Types` modules.
+Once this library has been loaded, you can directly see the
+values of those types in toplevels such as `utop` or `ocaml`."""
+license: "ISC"
+tags: ["org:mirage" "org:xapi-project"]
+homepage: "https://github.com/mirage/ocaml-cohttp"
+doc: "https://mirage.github.io/ocaml-cohttp/"
+bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
+depends: [
+  "ocaml" {>= "4.04.1"}
+  "dune" {>= "1.1.0"}
+  "cohttp" {=version}
+]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+dev-repo: "git+https://github.com/mirage/ocaml-cohttp.git"
+url {
+  src:
+    "https://github.com/mirage/ocaml-cohttp/releases/download/v2.5.2/cohttp-v2.5.2.tbz"
+  checksum: [
+    "sha256=37bbb95e4b8f5fa9ffa6e3e38693c50369f32137eeae70d528cafe76a92a449a"
+    "sha512=736bf5ee0765096ea654a6378d349a8ae52b8c134bc959ae307cf830c84f4010aa8b152a8c1c141696616766f6a3b24e0a61c0873215cc7f24a0083c7d6a9197"
+  ]
+}

packages/cohttp/cohttp.2.5.2-1/files/0001-revert-header-change.patch

@@ -0,0 +1,44 @@
+From e0ede41da2d0d518b950a4ef652b216195b7f7dd Mon Sep 17 00:00:00 2001
+From: Marcello Seri <marcello.seri@gmail.com>
+Date: Mon, 20 Jul 2020 11:07:52 +0200
+Subject: revert header change
+
+Signed-off-by: Marcello Seri <marcello.seri@gmail.com>
+---
+ cohttp/src/header.ml  | 4 +---
+ cohttp/src/header.mli | 4 ++--
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/cohttp/src/header.ml b/cohttp/src/header.ml
+index 00fad5a..dc86226 100644
+--- a/cohttp/src/header.ml
++++ b/cohttp/src/header.ml
+@@ -77,9 +77,7 @@ let remove h k =
+
+ let replace h k v =
+   let k = LString.of_string k in
+-  if StringMap.mem k h
+-  then StringMap.add k [v] h
+-  else h
++  StringMap.add k [v] h
+
+ let get h k =
+   let k = LString.of_string k in
+diff --git a/cohttp/src/header.mli b/cohttp/src/header.mli
+index 9868832..c3cff88 100644
+--- a/cohttp/src/header.mli
++++ b/cohttp/src/header.mli
+@@ -56,8 +56,8 @@ val add_opt_unless_exists : t option -> string -> string -> t
+     original header parameter is not modified. *)
+ val remove : t -> string -> t
+
+-(** Replace the value of a key from the header map if it exists. The
+-   original header parameter is not modified. *)
++(** Replace the value of a key from the header map if it exists, otherwise it
++    adds it to the header map. The original header parameter is not modified. *)
+ val replace : t -> string -> string -> t
+
+ (** Check if a key exists in the header. *)
+-- 
+2.24.3 (Apple Git-128)
+