Update cstruct to 4.0 and its dependents

packages/upstream/cstruct-lwt.3.3.0/opam → packages/upstream/cstruct-lwt.4.0.0/opam

@@ -2,7 +2,7 @@ opam-version: "2.0"
 maintainer:   "anil@recoil.org"
 authors:      ["Anil Madhavapeddy" "Richard Mortier" "Thomas Gazagnaire"
                "Pierre Chambart" "David Kaloper" "Jeremy Yallop" "David Scott"
-               "Mindy Preston" "Thomas Leonard" ]
+               "Mindy Preston" "Thomas Leonard" "Etienne Millon" ]
 homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
@@ -17,7 +17,7 @@ depends: [
   "ocaml" {>= "4.03.0"}
   "base-unix"
   "lwt"
-  "cstruct" {>="3.2.0"}
+  "cstruct" {=version}
   "dune" {build & >= "1.0"}
 ]
 synopsis: "Access C-like structures directly from OCaml"
@@ -27,6 +27,6 @@ structures directly from OCaml.  It supports both reading and writing to these
 structures, and they are accessed via the `Bigarray` module."""
 url {
   src:
-    "https://github.com/mirage/ocaml-cstruct/releases/download/v3.3.0/cstruct-v3.3.0.tbz"
-  checksum: "md5=7451389f3941d938575f8887c55c5e6b"
+    "https://github.com/mirage/ocaml-cstruct/releases/download/v4.0.0/cstruct-v4.0.0.tbz"
+  checksum: "md5=e01a2036d1fb08d1d8e47d4f3e122bf0"
 }

packages/upstream/cstruct-sexp.4.0.0/opam

@@ -0,0 +1,36 @@
+opam-version: "2.0"
+maintainer:   "anil@recoil.org"
+authors:      ["Anil Madhavapeddy" "Richard Mortier" "Thomas Gazagnaire"
+               "Pierre Chambart" "David Kaloper" "Jeremy Yallop" "David Scott"
+               "Mindy Preston" "Thomas Leonard" "Anton Kochkov" "Etienne Millon" ]
+homepage:     "https://github.com/mirage/ocaml-cstruct"
+license:      "ISC"
+dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
+bug-reports:  "https://github.com/mirage/ocaml-cstruct/issues"
+doc: "https://mirage.github.io/ocaml-cstruct/"
+
+tags: [ "org:mirage" "org:ocamllabs" ]
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {build & >= "1.0"}
+  "sexplib" {< "v0.13"}
+  "cstruct" {=version}
+  "alcotest" {with-test}
+]
+synopsis: "S-expression serialisers for C-like structures"
+description: """
+Cstruct is a library and syntax extension to make it easier to access C-like
+structures directly from OCaml.  It supports both reading and writing to these
+structures, and they are accessed via the `Bigarray` module.
+
+This library provides Sexplib serialisers for the Cstruct.t values."""
+url {
+  src:
+    "https://github.com/mirage/ocaml-cstruct/releases/download/v4.0.0/cstruct-v4.0.0.tbz"
+  checksum: "md5=e01a2036d1fb08d1d8e47d4f3e122bf0"
+}

packages/upstream/cstruct-unix.3.3.0/opam → packages/upstream/cstruct-unix.4.0.0/opam

@@ -2,7 +2,7 @@ opam-version: "2.0"
 maintainer:   "anil@recoil.org"
 authors:      ["Anil Madhavapeddy" "Richard Mortier" "Thomas Gazagnaire"
                "Pierre Chambart" "David Kaloper" "Jeremy Yallop" "David Scott"
-               "Mindy Preston" "Thomas Leonard" ]
+               "Mindy Preston" "Thomas Leonard" "Etienne Millon" ]
 homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
@@ -15,10 +15,10 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.06.0"}
   "dune" {build & >= "1.0"}
   "base-unix"
-  "cstruct" {>="3.2.0"}
+  "cstruct" {=version}
 ]
 synopsis: "Access C-like structures directly from OCaml"
 
@@ -29,6 +29,6 @@ structures, and they are accessed via the `Bigarray` module.
 """
 url {
   src:
-    "https://github.com/mirage/ocaml-cstruct/releases/download/v3.3.0/cstruct-v3.3.0.tbz"
-  checksum: "md5=7451389f3941d938575f8887c55c5e6b"
+    "https://github.com/mirage/ocaml-cstruct/releases/download/v4.0.0/cstruct-v4.0.0.tbz"
+  checksum: "md5=e01a2036d1fb08d1d8e47d4f3e122bf0"
 }

packages/upstream/cstruct.3.3.0/opam → packages/upstream/cstruct.4.0.0/opam

@@ -2,7 +2,7 @@ opam-version: "2.0"
 maintainer:   "anil@recoil.org"
 authors:      ["Anil Madhavapeddy" "Richard Mortier" "Thomas Gazagnaire"
                "Pierre Chambart" "David Kaloper" "Jeremy Yallop" "David Scott"
-               "Mindy Preston" "Thomas Leonard" ]
+               "Mindy Preston" "Thomas Leonard" "Anton Kochkov" "Etienne Millon" ]
 homepage:     "https://github.com/mirage/ocaml-cstruct"
 license:      "ISC"
 dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git"
@@ -18,7 +18,6 @@ build: [
 depends: [
   "ocaml" {>= "4.03.0"}
   "dune" {build & >= "1.0"}
-  "sexplib" {< "v0.12"}
   "alcotest" {with-test}
 ]
 synopsis: "Access C-like structures directly from OCaml"
@@ -28,6 +27,6 @@ structures directly from OCaml.  It supports both reading and writing to these
 structures, and they are accessed via the `Bigarray` module."""
 url {
   src:
-    "https://github.com/mirage/ocaml-cstruct/releases/download/v3.3.0/cstruct-v3.3.0.tbz"
-  checksum: "md5=7451389f3941d938575f8887c55c5e6b"
+    "https://github.com/mirage/ocaml-cstruct/releases/download/v4.0.0/cstruct-v4.0.0.tbz"
+  checksum: "md5=e01a2036d1fb08d1d8e47d4f3e122bf0"
 }

packages/upstream/nocrypto.0.5.4+2/files/0001-add-missing-runtime-dependencies-in-_tags.patch

@@ -0,0 +1,47 @@
+From 6f97531287a3e3ee749f2277248af28bdc85b8e4 Mon Sep 17 00:00:00 2001
+From: Gabriel Scherer <gabriel.scherer@gmail.com>
+Date: Mon, 26 Mar 2018 16:09:16 +0200
+Subject: [PATCH 1/4] add missing runtime dependencies in _tags
+
+Binaries in <bench/*>, <tests/*> depend on ppx_sexp_conv's runtime
+library within ppx_sexp_conv.
+
+The packed modules <src/nocrypto.cm{x,o}> also depend on the package
+ppx_sexp_conv: its presence at pack-creation time influences the
+generated .cmi interface, see
+
+  https://github.com/ocaml/opam-repository/pull/11628#issuecomment-375697444
+
+Note: the package ppx_sexp_conv.runtime-lib would suffice, but it is
+only available as such under recent ppx_sexp_conv versions, so its
+explicit use would make the build description (needlessly)
+incompatible with older ppx_sexp_conv versions.
+---
+ _tags | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/_tags b/_tags
+index 6d4e7de..c2a6610 100644
+--- a/_tags
++++ b/_tags
+@@ -7,6 +7,7 @@ true: package(bytes), package(cstruct)
+ <src/*.ml{,i}>: package(zarith), package(sexplib), package(ppx_sexp_conv)
+ <src/*.cm{x,o}> and not <src/nocrypto.cmx>: for-pack(Nocrypto)
+ <src/*.cm{,x}a>: link_stubs(src/libnocrypto_stubs)
++<src/nocrypto.cm{x,o}>: package(ppx_sexp_conv)
+
+ <unix>: include
+ <unix/*.ml{,i}>: package(unix), package(bytes)
+@@ -19,7 +20,7 @@ true: package(bytes), package(cstruct)
+
+ <**/*.c>: ccopt(--std=c99 -Wall -Wextra -O3)
+
+-<bench/*>: use_nocrypto, package(zarith), package(cstruct.unix)
+-<tests/*>: use_nocrypto, package(zarith), package(oUnit)
++<bench/*>: use_nocrypto, package(zarith), package(ppx_sexp_conv)
++<tests/*>: use_nocrypto, package(zarith), package(ppx_sexp_conv), package(oUnit)
+
+ <rondom>: -traverse
+-- 
+2.18.0
+

packages/upstream/nocrypto.0.5.4+2/files/0002-add-ppx_sexp_conv-as-a-runtime-dependency-in-the-pac.patch

@@ -0,0 +1,39 @@
+From dc799fd2a66c41ca7729201a5d038cd403ca1de6 Mon Sep 17 00:00:00 2001
+From: Gabriel Scherer <gabriel.scherer@gmail.com>
+Date: Tue, 27 Mar 2018 12:00:23 +0200
+Subject: [PATCH 2/4] add ppx_sexp_conv as a runtime dependency in the
+ packaging metadata
+
+---
+ opam     | 2 +-
+ pkg/META | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/opam b/opam
+index ad1dbc7..c35570b 100644
+--- a/opam
++++ b/opam
+@@ -20,7 +20,7 @@ depends: [
+   "topkg" {build}
+   "cpuid" {build}
+   "ocb-stubblr" {build}
+-  "ppx_sexp_conv" {build}
++  "ppx_sexp_conv"
+   "oUnit" {test}
+   "cstruct"
+   "zarith"
+diff --git a/pkg/META b/pkg/META
+index 242b2bb..a7929c7 100644
+--- a/pkg/META
++++ b/pkg/META
+@@ -1,6 +1,6 @@
+ version = "0.5.4"
+ description = "Simple crypto for the modern age"
+-requires = "cstruct zarith sexplib"
++requires = "cstruct zarith sexplib ppx_sexp_conv"
+ archive(byte) = "nocrypto.cma"
+ archive(native) = "nocrypto.cmxa"
+ plugin(byte) = "nocrypto.cma"
+-- 
+2.18.0
+