Merge pull request #196 from yomimono/2.8.0

Prepare 2.8.0 release.
mirage · Apr 6, 2016 · 1617953 · 1617953
2 parents 264789f + fd9ff74
commit 1617953
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 63 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+### 2.8.0 (2016-04-04)
+
+* Provide an implementation for the ICMPV4 module type defined in mirage-types 2.8.0.  Remove default ICMP handling from the IPv4 module, but preserve it in tcpip-stack-direct. (#195 by @yomimono)
+* Explicitly require the use of an OCaml compiler >= 4.02.3 . (#195 by @yomimono)
+* Explicitly depend on `result`. (#195 by @yomimono)
+
 ### 2.7.0 (2016-03-20)
 * Raise Invalid_argument if given an invalid port number in listen_{tcp,udp}v4
   (#173 by @matildah and #175 by @hannesm)

diff --git a/_oasis b/_oasis
@@ -1,7 +1,7 @@
 OASISFormat: 0.4
 Name:        tcpip
-Version:     2.7.0
-Synopsis:    Ethernet, TCP/IPv4 and DHCPv4 library
+Version:     2.8.0
+Synopsis:    Implementations for network-related module types from MirageOS.
 Authors:     Anil Madhavapeddy, Balraj Singh, Richard Mortier,
              Nicolas Ojeda Bar, Thomas Gazagnaire, Vincent Bernardoff,
              Magnus Skjegstad, Mindy Preston, Thomas Leonard
@@ -25,7 +25,7 @@ Library tcpip
   Modules:            Wire_structs, Tcpip_checksum
   CSources:           checksum_stubs.c
   CCOpt:              -O2 -fno-stack-protector
-  BuildDepends:       io-page,mirage-types,ipaddr,cstruct (>= 1.9.0),cstruct.ppx,mirage-profile,bytes
+  BuildDepends:       io-page,mirage-types (>= 2.8.0),ipaddr,cstruct (>= 1.9.0),cstruct.ppx,mirage-profile,bytes
   XMETAExtraLines:    xen_linkopts = "-ltcpip_xen_stubs"
 
 Library tcpip_xen

diff --git a/lib/META b/lib/META
@@ -1,7 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: 26b45639776908908c4a28c96b7f512a)
-version = "2.7.0"
-description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+# DO NOT EDIT (digest: 71f162b768346818e543ecd443a3a10b)
+version = "2.8.0"
+description =
+"Implementations for network-related module types from MirageOS."
 requires =
 "io-page mirage-types ipaddr cstruct cstruct.ppx mirage-profile bytes"
 archive(byte) = "tcpip.cma"
@@ -11,8 +12,9 @@ archive(native, plugin) = "tcpip.cmxs"
 xen_linkopts = "-ltcpip_xen_stubs"
 exists_if = "tcpip.cma"
 package "xen" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  archive(byte) = "tcpip_xen.cma"
  archive(byte, plugin) = "tcpip_xen.cma"
  archive(native) = "tcpip_xen.cmxa"
@@ -21,8 +23,9 @@ package "xen" (
 )
 
 package "udpv6-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "tcpip.udp tcpip.ipv6-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv6-unix.cma"
@@ -33,8 +36,9 @@ package "udpv6-unix" (
 )
 
 package "udpv6-socket" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip.udp lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv6-socket.cma"
  archive(byte, plugin) = "udpv6-socket.cma"
@@ -44,8 +48,9 @@ package "udpv6-socket" (
 )
 
 package "udpv4-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "tcpip.udp tcpip.ipv4-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv4-unix.cma"
@@ -56,8 +61,9 @@ package "udpv4-unix" (
 )
 
 package "udpv4-socket" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip.udp lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv4-socket.cma"
  archive(byte, plugin) = "udpv4-socket.cma"
@@ -67,8 +73,9 @@ package "udpv4-socket" (
 )
 
 package "udp" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "udp.cma"
  archive(byte, plugin) = "udp.cma"
@@ -78,8 +85,9 @@ package "udp" (
 )
 
 package "tcpv6-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "tcpip.tcp tcpip.ipv6-unix channel lwt lwt.unix mirage-unix mirage-clock-unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv6-unix.cma"
@@ -90,8 +98,9 @@ package "tcpv6-unix" (
 )
 
 package "tcpv6-socket" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv6-socket.cma"
  archive(byte, plugin) = "tcpv6-socket.cma"
@@ -101,8 +110,9 @@ package "tcpv6-socket" (
 )
 
 package "tcpv4-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "tcpip.tcp tcpip.ipv4-unix channel lwt lwt.unix mirage-unix mirage-clock-unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv4-unix.cma"
@@ -113,8 +123,9 @@ package "tcpv4-unix" (
 )
 
 package "tcpv4-socket" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv4-socket.cma"
  archive(byte, plugin) = "tcpv4-socket.cma"
@@ -124,8 +135,9 @@ package "tcpv4-socket" (
 )
 
 package "tcp" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "io-page mirage-types ipaddr cstruct cstruct.ppx lwt tcpip tcpip.ipv4 tcpip.ipv6 mirage-profile"
  archive(byte) = "tcp.cma"
@@ -136,8 +148,9 @@ package "tcp" (
 )
 
 package "stack-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "tcpip.udpv4-unix tcpip.tcpv4-unix tcpip.icmpv4-unix tcpip.udpv6-unix tcpip.tcpv6-unix tcpip.stack-direct lwt lwt.unix ipaddr.unix mirage-unix mirage-clock-unix mirage-console.unix mirage-types.lwt io-page.unix"
  archive(byte) = "tcpip-stack-unix.cma"
@@ -148,8 +161,9 @@ package "stack-unix" (
 )
 
 package "stack-socket" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "tcpip.udpv4-socket tcpip.udpv6-socket tcpip.tcpv4-socket tcpip.tcpv6-socket lwt lwt.unix ipaddr.unix io-page.unix"
  archive(byte) = "tcpip-stack-socket.cma"
@@ -160,8 +174,9 @@ package "stack-socket" (
 )
 
 package "stack-direct" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "io-page mirage-types ipaddr cstruct lwt tcpip.ethif tcpip.arpv4 tcpip.icmpv4 tcpip.udp tcpip.tcp tcpip.dhcpv4"
  archive(byte) = "tcpip-stack-direct.cma"
@@ -172,8 +187,9 @@ package "stack-direct" (
 )
 
 package "ipv6-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip.ethif-unix tcpip.ipv6 lwt lwt.unix"
  archive(byte) = "ipv6-unix.cma"
  archive(byte, plugin) = "ipv6-unix.cma"
@@ -183,8 +199,9 @@ package "ipv6-unix" (
 )
 
 package "ipv6" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "ipv6.cma"
  archive(byte, plugin) = "ipv6.cma"
@@ -194,8 +211,9 @@ package "ipv6" (
 )
 
 package "ipv4-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip.ethif-unix tcpip.ipv4 lwt lwt.unix"
  archive(byte) = "ipv4-unix.cma"
  archive(byte, plugin) = "ipv4-unix.cma"
@@ -205,8 +223,9 @@ package "ipv4-unix" (
 )
 
 package "ipv4" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "ipv4.cma"
  archive(byte, plugin) = "ipv4.cma"
@@ -216,8 +235,9 @@ package "ipv4" (
 )
 
 package "icmpv4-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "tcpip.ipv4-unix lwt lwt.unix mirage-unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "icmpv4-unix.cma"
@@ -228,8 +248,9 @@ package "icmpv4-unix" (
 )
 
 package "icmpv4" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip result"
  archive(byte) = "icmpv4.cma"
  archive(byte, plugin) = "icmpv4.cma"
@@ -239,8 +260,9 @@ package "icmpv4" (
 )
 
 package "ethif-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip.ethif mirage-net-unix lwt lwt.unix"
  archive(byte) = "ethif-unix.cma"
  archive(byte, plugin) = "ethif-unix.cma"
@@ -250,8 +272,9 @@ package "ethif-unix" (
 )
 
 package "ethif" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip io-page mirage-types ipaddr cstruct lwt"
  archive(byte) = "ethif.cma"
  archive(byte, plugin) = "ethif.cma"
@@ -261,8 +284,9 @@ package "ethif" (
 )
 
 package "dhcpv4" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires =
  "io-page bytes mirage-types ipaddr cstruct cstruct.ppx lwt tcpip.udp"
  archive(byte) = "dhcpv4.cma"
@@ -273,8 +297,9 @@ package "dhcpv4" (
 )
 
 package "arpv4-unix" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip.ethif mirage-net-unix lwt lwt.unix"
  archive(byte) = "arpv4-unix.cma"
  archive(byte, plugin) = "arpv4-unix.cma"
@@ -284,8 +309,9 @@ package "arpv4-unix" (
 )
 
 package "arpv4" (
- version = "2.7.0"
- description = "Ethernet, TCP/IPv4 and DHCPv4 library"
+ version = "2.8.0"
+ description =
+ "Implementations for network-related module types from MirageOS."
  requires = "tcpip io-page mirage-types ipaddr cstruct cstruct.ppx lwt"
  archive(byte) = "arpv4.cma"
  archive(byte, plugin) = "arpv4.cma"

diff --git a/opam b/opam
@@ -47,7 +47,7 @@ depends: [
   "cstruct" {>= "1.9.0"}
   "ppx_tools"
   "channel"
-  "mirage-types" {>= "2.6.0"}
+  "mirage-types" {>= "2.8.0"}
   "mirage-unix" {>= "1.1.0"}
   "mirage-console"
   "mirage-clock-unix" {>= "1.0.0"}