From 2589f64179018d27e5f94b5f9032db716dd34f79 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 18 Aug 2023 10:27:25 +0100 Subject: [PATCH 1/4] xs: update polly to 0.4.1 Adds support for Linux's eventfd Signed-off-by: Pau Ruiz Safont --- packages/xs/polly.0.3.0/opam | 27 --------------------------- packages/xs/polly.0.4.1/opam | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 packages/xs/polly.0.3.0/opam create mode 100644 packages/xs/polly.0.4.1/opam diff --git a/packages/xs/polly.0.3.0/opam b/packages/xs/polly.0.3.0/opam deleted file mode 100644 index 10dab3abc..000000000 --- a/packages/xs/polly.0.3.0/opam +++ /dev/null @@ -1,27 +0,0 @@ -opam-version: "2.0" -name: "polly" -version: "0.3.0" -synopsis: "Bindings for the Linux epoll system call" -description: """ -Bindings for the Linux epoll system call. The binding avoids - most allocation in the event loop by iterating over all file - descriptors that are reported as ready.""" -maintainer: "Christian Lindig " -authors: "Christian Lindig " -license: "MIT" -homepage: "https://github.com/lindig/polly" -doc: "https://github.com/lindig/polly" -bug-reports: "https://github.com/lindig/polly/issues" -depends: [ - "dune" {>= "2.0"} - "ocaml" - "cmdliner" {>= "1.1.0"} - "base-unix" - "conf-linux-libc-dev" -] -build: ["dune" "build" "-p" name "-j" jobs "@install"] -dev-repo: "git+https://github.com/lindig/polly.git" -url { - src: "https://github.com/lindig/polly/archive/refs/tags/0.3.0.tar.gz" - checksum: "sha256=957abbaac82bf9f00aa23c015c5be0d8d2aa79151b8f3d5344bfb26c3c82f4c4" -} diff --git a/packages/xs/polly.0.4.1/opam b/packages/xs/polly.0.4.1/opam new file mode 100644 index 000000000..acbbdc181 --- /dev/null +++ b/packages/xs/polly.0.4.1/opam @@ -0,0 +1,31 @@ +opam-version: "2.0" +name: "polly" +version: "0.4.1" +synopsis: "Bindings for the Linux epoll system call" +description: """\ +Bindings for the Linux epoll system call. The binding avoids +most allocation in the event loop by iterating over all file +descriptors that are reported as ready.""" +maintainer: "Christian Lindig " +authors: "Christian Lindig " +license: "MIT" +homepage: "https://github.com/lindig/polly" +bug-reports: "https://github.com/lindig/polly/issues" +depends: [ + "dune" {>= "2.0"} + "ocaml" {>= "4.08.0"} + "cmdliner" {>= "1.1.0"} + "base-unix" + "conf-linux-libc-dev" +] +build: ["dune" "build" "-p" name "-j" jobs "@install"] +dev-repo: "git://github.com/lindig/polly.git" +url { + src: + "https://github.com/lindig/polly/releases/download/0.4.1/polly-0.4.1.tbz" + checksum: [ + "sha256=d96859f459fc9c072600e0446593959ff34bb82efc38f00b3d14c464ced10ad6" + "sha512=76ebec8f3581f8223d50094cbf592c66bbc8f3c7e97a027e10327e0813ca6ecdc041fd93b8a0e80aa4c6d391e43a806d37031f26d04716b26ebad72905debc7e" + ] +} +x-commit-hash: "2bab081f360329739517cb8f2b6ac9b507a5ee27" From 9b27a77d074952e0a38c5f76ecb7903993fb017d Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 18 Aug 2023 10:31:36 +0100 Subject: [PATCH 2/4] xs: update qmp to 0.20.0 Maintenance release, uses new cmdliner interfaces Signed-off-by: Pau Ruiz Safont --- packages/xs/{qmp.0.19.0 => qmp.0.20.0}/opam | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) rename packages/xs/{qmp.0.19.0 => qmp.0.20.0}/opam (57%) diff --git a/packages/xs/qmp.0.19.0/opam b/packages/xs/qmp.0.20.0/opam similarity index 57% rename from packages/xs/qmp.0.19.0/opam rename to packages/xs/qmp.0.20.0/opam index 25e959f77..2c25e670f 100644 --- a/packages/xs/qmp.0.19.0/opam +++ b/packages/xs/qmp.0.20.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "qmp" -version: "0.19.0" +version: "0.20.0" synopsis: "OCaml implementation of a Qemu Message Protocol (QMP) client" maintainer: "xen-api@lists.xen.org" authors: "Dave Scott" @@ -11,23 +11,23 @@ bug-reports: "https://github.com/xapi-project/ocaml-qmp/issues" depends: [ "ocaml" "base-unix" - "dune" {>= "1.4"} + "dune" {>= "1.4.0"} "yojson" {>= "1.6.0"} - "cmdliner" + "cmdliner" {>= "1.1.0"} "ounit2" {with-test} ] +available: arch != "arm32" & arch != "ppc32" & arch != "x86_32" build: [ ["dune" "build" "-p" name "-j" jobs] - ["dune" "runtest" "-p" name "-j" jobs] - {with-test & arch != "arm32" & arch != "x86_32"} + ["dune" "runtest" "-p" name "-j" jobs] {with-test} ] dev-repo: "git+https://github.com/xapi-project/ocaml-qmp" url { src: - "https://github.com/xapi-project/ocaml-qmp/releases/download/v0.19.0/qmp-0.19.0.tbz" + "https://github.com/xapi-project/ocaml-qmp/releases/download/v0.20.0/qmp-0.20.0.tbz" checksum: [ - "sha256=5456d4ada457eb88155d16aa44cb9158c31fbd7e7ee7bc7fe251fbd973f1453a" - "sha512=9f65b45b863fbe2e73b7240f3526b3ec4398cd69eacc7de4f6b5c7b022dfc4e2c4db674d5e663b7138d512928129fbd150feb7ed50869b52bf0ac7d5689305c6" + "sha256=5672d9433728adec8151990779a2e8662372455369302bc104b9b1c0b853cfb6" + "sha512=504a5eba180c862132de4d85974162ed8eb95ab9e16c8d00bd7f891141766418a354aba004fd49967ac9b7d213c2d910ef1f36cfb8cf409aa7444acac09a7039" ] } -x-commit-hash: "adaa2e9d566593c3faeb776bf18b7c4578199210" +x-commit-hash: "051df743d20d598a10e6b3f2004eb0ee09179515" From a6c8397fef3244be6beab2480a2385c8315caa8c Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 18 Aug 2023 10:35:01 +0100 Subject: [PATCH 3/4] upstream: update unix-errno to 0.6.2 Maintenance release, compatibility with newer ctypes releases Signed-off-by: Pau Ruiz Safont --- .../{unix-errno.0.6.1 => unix-errno.0.6.2}/opam | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) rename packages/upstream/{unix-errno.0.6.1 => unix-errno.0.6.2}/opam (77%) diff --git a/packages/upstream/unix-errno.0.6.1/opam b/packages/upstream/unix-errno.0.6.2/opam similarity index 77% rename from packages/upstream/unix-errno.0.6.1/opam rename to packages/upstream/unix-errno.0.6.2/opam index 808a8b0df..faf4a6a47 100644 --- a/packages/upstream/unix-errno.0.6.1/opam +++ b/packages/upstream/unix-errno.0.6.2/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "unix-errno" -version: "0.6.1" +version: "0.6.2" synopsis: "Unix errno types, maps, and support" description: """\ unix-errno can be used with or without ctypes and OCaml's Unix @@ -21,13 +21,10 @@ depends: [ "ocaml" {>= "4.03.0"} "dune" {>= "2.8"} "alcotest" {with-test} - "base-bytes" "result" "ctypes" {>= "0.12.0"} "integers" ] -depopts: ["base-unix"] -available: arch != "arm32" build: [ ["dune" "subst"] {dev} ["dune" "build" "-p" name "-j" jobs] @@ -36,10 +33,10 @@ build: [ dev-repo: "git+https://github.com/xapi-project/ocaml-unix-errno.git" url { src: - "https://github.com/xapi-project/ocaml-unix-errno/releases/download/0.6.1/unix-errno-0.6.1.tbz" + "https://github.com/xapi-project/ocaml-unix-errno/releases/download/0.6.2/unix-errno-0.6.2.tbz" checksum: [ - "sha256=8d9aad1f050a4df7e3b8e3f68dd28a411b443812b272585f7a23cef7a8448f87" - "sha512=16703e08e8be7e62eb897cbdb62e35c8df0397371dfba12ab87cf211a2925ecdb36f81bb43de77956b09d845cfd00c37043161472ed6a36f1eb77b21259d2083" + "sha256=2d6a9bc86731b3a7ff15c38fa3725847753e00bd091de5828868ee621c71ad65" + "sha512=3f820834fe4dcc246e777a3e4b9d19c85dcccf87aa77b7b9e3a59e5080f6094dc059d5d035831e82cc3efc4c20065422e3299cb44ff49674b7b0a3139fd15ba7" ] } -x-commit-hash: "08ed3586bc6b1810fc27f50b8a5f962909ecdad2" +x-commit-hash: "c91d9ac97e33f7df0d63f95110130130d040c6ce" From 9f32f23c3b5b940cedaf3d15b2c5e76114aee738 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 18 Aug 2023 10:42:29 +0100 Subject: [PATCH 4/4] xs: update xapi-rrd to 1.10.0 Changes the output of the rdd updates, not it's legal JSON and has the same format as other endpoints Signed-off-by: Pau Ruiz Safont --- packages/xs/{xapi-rrd.1.9.2 => xapi-rrd.1.10.0}/opam | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename packages/xs/{xapi-rrd.1.9.2 => xapi-rrd.1.10.0}/opam (75%) diff --git a/packages/xs/xapi-rrd.1.9.2/opam b/packages/xs/xapi-rrd.1.10.0/opam similarity index 75% rename from packages/xs/xapi-rrd.1.9.2/opam rename to packages/xs/xapi-rrd.1.10.0/opam index b758b6e12..d06dca415 100644 --- a/packages/xs/xapi-rrd.1.9.2/opam +++ b/packages/xs/xapi-rrd.1.10.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "xapi-rrd" -version: "1.9.2" +version: "1.10.0" synopsis: "RRD library for use with xapi" description: """\ Round-Robin Databases (RRDs) are constant-space datastructures @@ -27,7 +27,7 @@ depends: [ "crowbar" {with-test} "xapi-stdext-unix" {with-test} ] -available: [arch != "ppc64"] +available: arch != "ppc64" build: [ ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] {with-test} @@ -35,10 +35,10 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xcp-rrd.git" url { src: - "https://github.com/xapi-project/xcp-rrd/releases/download/v1.9.2/xapi-rrd-1.9.2.tbz" + "https://github.com/xapi-project/xcp-rrd/releases/download/v1.10.0/xapi-rrd-1.10.0.tbz" checksum: [ - "sha256=4303c3b1eae263aef72dd82619c6a48182b8ffd0e414bfbea03dc8e09662ae37" - "sha512=463873b7e0886879db04d7ced7954556770b1e2a1bac1e098ea659369d2937f535be544cee2bebce5930188bd35961b21b5bc3ab3bb47d95e5ce50f559fa651e" + "sha256=29ba8104ed5765f1c9ce922dfb2badee0542a0d36aad96badbd57b7099e1447c" + "sha512=3f5e2b8d4448006ace213a133401ffc2bb7924b63c83bf40d126893085e8289bc42b0dfb22c8fbd900fa755fa920f3faeb5a71c8fc047d5f321c7f944d4782f1" ] } -x-commit-hash: "9e793925222556f142e4a973c5491570b2f34ee0" +x-commit-hash: "c1e97c591889537e5a64e00519517fcf920a230e"