From e913459a56c149c32fc81d8dd1ba2472a946e3a8 Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Fri, 12 Jul 2019 16:09:56 +0100 Subject: [PATCH] [new release] ipaddr-cstruct, macaddr, macaddr-sexp, ipaddr, ipaddr-sexp and macaddr-cstruct (4.0.0) CHANGES: * Rename the `to/from_bytes` functions to refer to `octets` instead. This distinguishes the meaning of human-readable addresses (`string`s in this library) and byte-packed representations(`octet`s in this library) from the OCaml `bytes` type that represents mutable strings. Porting code should just be a matter of renaming functions such as: - `Ipaddr.of_bytes` becomes `Ipaddr.of_octets` - `Macaddr.to_bytes` becomes `Macaddr.to_octets` * Introduce new `write_octets` functions that can write octet representations of IPv4/v6 into an existing bytestring. * Use the `domain-name` library to produce domain names from IP addresses. * Remove the `ipaddr.sexp` and `macaddr.sexp` ocamlfind subpackages and instead have `ipaddr-sexp` and `macaddr-sexp` to match the opam package names. * Add new `Ipaddr_cstruct` and `Macaddr_cstruct` libraries for conversion to/from cstructs (mirage/ocaml-ipaddr#36 @nojb @avsm) --- .../ipaddr-cstruct/ipaddr-cstruct.4.0.0/opam | 32 ++++++++++++ packages/ipaddr-sexp/ipaddr-sexp.4.0.0/opam | 35 +++++++++++++ packages/ipaddr/ipaddr.4.0.0/opam | 51 +++++++++++++++++++ .../macaddr-cstruct.4.0.0/opam | 32 ++++++++++++ packages/macaddr-sexp/macaddr-sexp.4.0.0/opam | 35 +++++++++++++ packages/macaddr/macaddr.4.0.0/opam | 40 +++++++++++++++ 6 files changed, 225 insertions(+) create mode 100644 packages/ipaddr-cstruct/ipaddr-cstruct.4.0.0/opam create mode 100644 packages/ipaddr-sexp/ipaddr-sexp.4.0.0/opam create mode 100644 packages/ipaddr/ipaddr.4.0.0/opam create mode 100644 packages/macaddr-cstruct/macaddr-cstruct.4.0.0/opam create mode 100644 packages/macaddr-sexp/macaddr-sexp.4.0.0/opam create mode 100644 packages/macaddr/macaddr.4.0.0/opam diff --git a/packages/ipaddr-cstruct/ipaddr-cstruct.4.0.0/opam b/packages/ipaddr-cstruct/ipaddr-cstruct.4.0.0/opam new file mode 100644 index 00000000000..ce0310ad4dd --- /dev/null +++ b/packages/ipaddr-cstruct/ipaddr-cstruct.4.0.0/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"] +synopsis: "A library for manipulation of IP address representations using Cstructs" +license: "ISC" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-ipaddr" +doc: "https://mirage.github.io/ocaml-ipaddr/" +bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {build} + "ipaddr" {=version} + "cstruct" +] +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-ipaddr.git" +description: """ +Cstruct convertions for macaddr +""" +url { + src: + "https://github.com/mirage/ocaml-ipaddr/releases/download/v4.0.0/ipaddr-v4.0.0.tbz" + checksum: [ + "sha256=6f4abf9c210b20ccddf4610691a87b8c870790d8f71d4a7edcfca9e21b59fc29" + "sha512=ca55a8cfa8b84c0a2f4e1fe7afb4c582066bbb562efb94169c0347e441ce076dc426d191772edb869eca6bd77f42f7141378181057ad8886da25ef915a9ee57f" + ] +} diff --git a/packages/ipaddr-sexp/ipaddr-sexp.4.0.0/opam b/packages/ipaddr-sexp/ipaddr-sexp.4.0.0/opam new file mode 100644 index 00000000000..95a40ca49b3 --- /dev/null +++ b/packages/ipaddr-sexp/ipaddr-sexp.4.0.0/opam @@ -0,0 +1,35 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"] +synopsis: "A library for manipulation of IP address representations usnig sexp" +description: """ +Sexp convertions for ipaddr +""" + +license: "ISC" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-ipaddr" +doc: "https://mirage.github.io/ocaml-ipaddr/" +bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {build} + "ipaddr" + "ipaddr-cstruct" {with-test} + "ounit" {with-test} + "ppx_sexp_conv" {>= "v0.9.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-ipaddr.git" +url { + src: + "https://github.com/mirage/ocaml-ipaddr/releases/download/v4.0.0/ipaddr-v4.0.0.tbz" + checksum: [ + "sha256=6f4abf9c210b20ccddf4610691a87b8c870790d8f71d4a7edcfca9e21b59fc29" + "sha512=ca55a8cfa8b84c0a2f4e1fe7afb4c582066bbb562efb94169c0347e441ce076dc426d191772edb869eca6bd77f42f7141378181057ad8886da25ef915a9ee57f" + ] +} diff --git a/packages/ipaddr/ipaddr.4.0.0/opam b/packages/ipaddr/ipaddr.4.0.0/opam new file mode 100644 index 00000000000..1d9051b6360 --- /dev/null +++ b/packages/ipaddr/ipaddr.4.0.0/opam @@ -0,0 +1,51 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"] +synopsis: "A library for manipulation of IP (and MAC) address representations" +description: """ +Features: + * Depends only on sexplib (conditionalization under consideration) + * oUnit-based tests + * IPv4 and IPv6 support + * IPv4 and IPv6 CIDR prefix support + * IPv4 and IPv6 [CIDR-scoped address](http://tools.ietf.org/html/rfc4291#section-2.3) support + * `Ipaddr.V4` and `Ipaddr.V4.Prefix` modules are `Map.OrderedType` + * `Ipaddr.V6` and `Ipaddr.V6.Prefix` modules are `Map.OrderedType` + * `Ipaddr` and `Ipaddr.Prefix` modules are `Map.OrderedType` + * `Ipaddr_unix` in findlib subpackage `ipaddr.unix` provides compatibility with the standard library `Unix` module + * `Ipaddr_top` in findlib subpackage `ipaddr.top` provides top-level pretty printers (requires compiler-libs default since OCaml 4.0) + * IP address scope classification + * IPv4-mapped addresses in IPv6 (::ffff:0:0/96) are an embedding of IPv4 + * MAC-48 (Ethernet) address support + * `Macaddr` is a `Map.OrderedType` + * All types have sexplib serializers/deserializers +""" + +license: "ISC" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-ipaddr" +doc: "https://mirage.github.io/ocaml-ipaddr/" +bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {build} + "macaddr" {=version} + "sexplib0" + "domain-name" {>= "0.3.0"} + "ounit" {with-test} + "ppx_sexp_conv" {with-test & >= "v0.9.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-ipaddr.git" +url { + src: + "https://github.com/mirage/ocaml-ipaddr/releases/download/v4.0.0/ipaddr-v4.0.0.tbz" + checksum: [ + "sha256=6f4abf9c210b20ccddf4610691a87b8c870790d8f71d4a7edcfca9e21b59fc29" + "sha512=ca55a8cfa8b84c0a2f4e1fe7afb4c582066bbb562efb94169c0347e441ce076dc426d191772edb869eca6bd77f42f7141378181057ad8886da25ef915a9ee57f" + ] +} diff --git a/packages/macaddr-cstruct/macaddr-cstruct.4.0.0/opam b/packages/macaddr-cstruct/macaddr-cstruct.4.0.0/opam new file mode 100644 index 00000000000..0dd4553cc27 --- /dev/null +++ b/packages/macaddr-cstruct/macaddr-cstruct.4.0.0/opam @@ -0,0 +1,32 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"] +synopsis: "A library for manipulation of MAC address representations using Cstructs" +license: "ISC" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-ipaddr" +doc: "https://mirage.github.io/ocaml-ipaddr/" +bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {build} + "macaddr" {=version} + "cstruct" +] +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-ipaddr.git" +description: """ +Cstruct convertions for macaddr +""" +url { + src: + "https://github.com/mirage/ocaml-ipaddr/releases/download/v4.0.0/ipaddr-v4.0.0.tbz" + checksum: [ + "sha256=6f4abf9c210b20ccddf4610691a87b8c870790d8f71d4a7edcfca9e21b59fc29" + "sha512=ca55a8cfa8b84c0a2f4e1fe7afb4c582066bbb562efb94169c0347e441ce076dc426d191772edb869eca6bd77f42f7141378181057ad8886da25ef915a9ee57f" + ] +} diff --git a/packages/macaddr-sexp/macaddr-sexp.4.0.0/opam b/packages/macaddr-sexp/macaddr-sexp.4.0.0/opam new file mode 100644 index 00000000000..b137dede7d7 --- /dev/null +++ b/packages/macaddr-sexp/macaddr-sexp.4.0.0/opam @@ -0,0 +1,35 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"] +synopsis: "A library for manipulation of MAC address representations using sexp" +license: "ISC" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-ipaddr" +doc: "https://mirage.github.io/ocaml-ipaddr/" +bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {build} + "macaddr" + "macaddr-cstruct" {with-test} + "ounit" {with-test} + "ppx_sexp_conv" {>= "v0.9.0"} +] +conflicts: [ "ipaddr" {< "3.0.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-ipaddr.git" +description: """ +Sexp convertions for macaddr +""" +url { + src: + "https://github.com/mirage/ocaml-ipaddr/releases/download/v4.0.0/ipaddr-v4.0.0.tbz" + checksum: [ + "sha256=6f4abf9c210b20ccddf4610691a87b8c870790d8f71d4a7edcfca9e21b59fc29" + "sha512=ca55a8cfa8b84c0a2f4e1fe7afb4c582066bbb562efb94169c0347e441ce076dc426d191772edb869eca6bd77f42f7141378181057ad8886da25ef915a9ee57f" + ] +} diff --git a/packages/macaddr/macaddr.4.0.0/opam b/packages/macaddr/macaddr.4.0.0/opam new file mode 100644 index 00000000000..72b508b4105 --- /dev/null +++ b/packages/macaddr/macaddr.4.0.0/opam @@ -0,0 +1,40 @@ +opam-version: "2.0" +maintainer: "anil@recoil.org" +authors: ["David Sheets" "Anil Madhavapeddy" "Hugo Heuzard"] +synopsis: "A library for manipulation of MAC address representations" +license: "ISC" +tags: ["org:mirage" "org:xapi-project"] +homepage: "https://github.com/mirage/ocaml-ipaddr" +doc: "https://mirage.github.io/ocaml-ipaddr/" +bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues" +depends: [ + "ocaml" {>= "4.04.0"} + "dune" {build} + "ounit" {with-test} + "ppx_sexp_conv" {with-test & >= "v0.9.0"} +] +conflicts: [ "ipaddr" {< "3.0.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-ipaddr.git" +description: """ +A library for manipulation of MAC address representations. + +Features: + + * oUnit-based tests + * MAC-48 (Ethernet) address support + * `Macaddr` is a `Map.OrderedType` + * All types have sexplib serializers/deserializers optionally via the `Macaddr_sexp` library. + """ +url { + src: + "https://github.com/mirage/ocaml-ipaddr/releases/download/v4.0.0/ipaddr-v4.0.0.tbz" + checksum: [ + "sha256=6f4abf9c210b20ccddf4610691a87b8c870790d8f71d4a7edcfca9e21b59fc29" + "sha512=ca55a8cfa8b84c0a2f4e1fe7afb4c582066bbb562efb94169c0347e441ce076dc426d191772edb869eca6bd77f42f7141378181057ad8886da25ef915a9ee57f" + ] +}