ca-certs.0.2.3

ca-certs.0.2.2 was failing its unit tests on Fedora 37. Signed-off-by: Edwin Török <edwin.torok@cloud.com>
xapi-project · Feb 13, 2023 · e356c80 · e356c80
1 parent 0074e7c
commit e356c80
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/packages/upstream/ca-certs.0.2.2/opam → packages/upstream/ca-certs.0.2.3/opam b/packages/upstream/ca-certs.0.2.2/opam → packages/upstream/ca-certs.0.2.3/opam
@@ -1,16 +1,15 @@
 opam-version: "2.0"
-name: "ca-certs"
-version: "0.2.2"
 synopsis: "Detect root CA certificates from the operating system"
-description: """\
+description: """
 TLS requires a set of root anchors (Certificate Authorities) to
 authenticate servers. This library exposes this list so that it can be
-registered with ocaml-tls."""
-maintainer: "Etienne Millon <me@emillon.org>"
-authors:
+registered with ocaml-tls.
+"""
+maintainer: ["Etienne Millon <me@emillon.org>"]
+authors: [
   "Etienne Millon <me@emillon.org>, Hannes Mehnert <hannes@mehnert.org>"
+]
 license: "ISC"
-tags: "org:mirage"
 homepage: "https://github.com/mirage/ca-certs"
 doc: "https://mirage.github.io/ca-certs/doc"
 bug-reports: "https://github.com/mirage/ca-certs/issues"
@@ -30,6 +29,7 @@ depends: [
 conflicts: [
   "result" {< "1.5"}
 ]
+dev-repo: "git+https://github.com/mirage/ca-certs.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -40,18 +40,20 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test & os != "macos"}
+    "@runtest" {with-test & os != "macos"} # the opam sandbox on macos leads to test failures (ocaml/opam#4389)
     "@doc" {with-doc}
   ]
 ]
-depexts: ["ca_root_nss"] {os = "freebsd"}
-dev-repo: "git+https://github.com/mirage/ca-certs.git"
+tags: ["org:mirage"]
+depexts: [
+  ["ca_root_nss"] {os = "freebsd"}
+]
 url {
   src:
-    "https://github.com/mirage/ca-certs/releases/download/v0.2.2/ca-certs-v0.2.2.tbz"
+    "https://github.com/mirage/ca-certs/releases/download/v0.2.3/ca-certs-0.2.3.tbz"
   checksum: [
-    "sha256=4f1e77cc125e99987738387ff22cda8710e826f5ef3452f2000f0b30cd668652"
-    "sha512=70e564a5bb69a66018ff3387bf7b4b6af2ec1507d9f2f140f2aa8519e405920ec1469e56d1fa2aa8b452d05531a35f22df2c1ac08071f9a322525e95de8e3e1f"
+    "sha256=d2d8d6457d915ef6d783def82f3be5ec2f56f92e20214f58edd63c9c2fc60e9c"
+    "sha512=e945112be3b2f1fbcaeb95aebb600cd5119f1f05583ebcc0a4a20dd159d8cfec5adc3443aae678ee159c0e0c32b1d7c0ba3ba4405e3483e3f565e4d29d3da0f7"
   ]
 }
-x-commit-hash: "20c2d4ed91bc7cd76a1bc289ad8dcc5a80006cc6"
+x-commit-hash: "9ee07b8ab77eb9ec8b6d84f98359e45e1beb9b9d"
diff --git a/tools/installtest.sh b/tools/installtest.sh
@@ -12,6 +12,7 @@ set -euo pipefail
 # there are conflicts with some of these test dependencies or bring in too many other packages
 # next time we upgrade them we should aim to make them testable
 # ocaml-system should always be excluded because the system compiler may be quite different from what we use here
-NOTEST=ocaml-system\|ppx_cstruct\|ipaddr-sexp\|vhd-format-lwt\|cohttp-async\|ezjsonm
+NOTEST=ocaml-system\|ppx_cstruct\|ipaddr-sexp\|vhd-format-lwt\|cohttp-async\|ezjsonm\|ppxlib\|mirage-crypto-ec
 ALLDEPS=$(opam admin filter --dry-run --resolve=xs-toolstack | sed -n 2p | tr ' ' '\n' |grep -vE ${NOTEST} | tr '\n' ' ')
-opam install --no-depexts --with-test ${ALLDEPS} -y
+#opam install --no-depexts --with-test ${ALLDEPS} -y
+opam install --with-test ${ALLDEPS} -y