Merge pull request #97 from avsm/master

bump to 2.2.2

CHANGES

@@ -1,4 +1,5 @@
-* Readded tracing and ARP fixes which got accidentally reverted in the IPv6 merge.
+2.2.2 (2015-01-11):
+* Readded tracing and ARP fixes which got accidentally reverted in the IPv6 merge. (#96)
 
 2.2.1 (2014-12-20):
 * Use `Bytes` instead of `String` to begin the `-safe-string` migration in OCaml 4.02.0 (#93).

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.3
 Name:        tcpip
-Version:     2.2.1
+Version:     2.2.2
 Synopsis:    Ethernet, TCP/IPv4 and DHCPv4 library
 Authors:     Anil Madhavapeddy, Balraj Singh, Richard Mortier, Nicolas Ojeda Bar
 License:     ISC

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: f15df63bf06f9b2d59bdfa061c8bb0e0)
-version = "2.2.1"
+# DO NOT EDIT (digest: 8598ab7407235bccaedb9d35ea7deec2)
+version = "2.2.2"
 description = "Ethernet, TCP/IPv4 and DHCPv4 library"
 requires = "io-page mirage-types ipaddr cstruct mirage-profile bytes"
 archive(byte) = "tcpip.cma"
@@ -10,7 +10,7 @@ archive(native, plugin) = "tcpip.cmxs"
 xen_linkopts = "-ltcpip_xen_stubs"
 exists_if = "tcpip.cma"
 package "xen" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  archive(byte) = "tcpip_xen.cma"
  archive(byte, plugin) = "tcpip_xen.cma"
@@ -20,7 +20,7 @@ package "xen" (
 )
 
 package "udpv6-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udp tcpip.ipv6-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -32,7 +32,7 @@ package "udpv6-unix" (
 )
 
 package "udpv6-socket" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.udp lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv6-socket.cma"
@@ -43,7 +43,7 @@ package "udpv6-socket" (
 )
 
 package "udpv4-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udp tcpip.ipv4-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -55,7 +55,7 @@ package "udpv4-unix" (
 )
 
 package "udpv4-socket" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.udp lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv4-socket.cma"
@@ -66,7 +66,7 @@ package "udpv4-socket" (
 )
 
 package "udp" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "udp.cma"
@@ -77,7 +77,7 @@ package "udp" (
 )
 
 package "tcpv6-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.tcp tcpip.ipv6-unix tcpip.channel lwt lwt.unix mirage-unix mirage-clock-unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -89,7 +89,7 @@ package "tcpv6-unix" (
 )
 
 package "tcpv6-socket" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv6-socket.cma"
@@ -100,7 +100,7 @@ package "tcpv6-socket" (
 )
 
 package "tcpv4-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.tcp tcpip.ipv4-unix tcpip.channel lwt lwt.unix mirage-unix mirage-clock-unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -112,7 +112,7 @@ package "tcpv4-unix" (
 )
 
 package "tcpv4-socket" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv4-socket.cma"
@@ -123,7 +123,7 @@ package "tcpv4-socket" (
 )
 
 package "tcp" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "io-page mirage-types ipaddr cstruct lwt tcpip tcpip.ipv4 tcpip.ipv6"
@@ -135,7 +135,7 @@ package "tcp" (
 )
 
 package "stack-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udpv4-unix tcpip.tcpv4-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"
@@ -147,7 +147,7 @@ package "stack-unix" (
 )
 
 package "stack-socket" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udpv4-socket tcpip.udpv6-socket tcpip.tcpv4-socket tcpip.tcpv6-socket lwt lwt.unix ipaddr.unix io-page.unix"
@@ -159,7 +159,7 @@ package "stack-socket" (
 )
 
 package "stack-direct" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "io-page mirage-types ipaddr cstruct lwt tcpip.ethif tcpip.udp tcpip.tcp tcpip.dhcpv4"
@@ -171,7 +171,7 @@ package "stack-direct" (
 )
 
 package "ipv6-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.ethif-unix tcpip.ipv6 lwt lwt.unix"
  archive(byte) = "ipv6-unix.cma"
@@ -182,7 +182,7 @@ package "ipv6-unix" (
 )
 
 package "ipv6" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "ipv6.cma"
@@ -193,7 +193,7 @@ package "ipv6" (
 )
 
 package "ipv4-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.ethif-unix tcpip.ipv4 lwt lwt.unix"
  archive(byte) = "ipv4-unix.cma"
@@ -204,7 +204,7 @@ package "ipv4-unix" (
 )
 
 package "ipv4" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "ipv4.cma"
@@ -215,7 +215,7 @@ package "ipv4" (
 )
 
 package "ethif-unix" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.ethif mirage-net-unix lwt lwt.unix"
  archive(byte) = "ethif-unix.cma"
@@ -226,7 +226,7 @@ package "ethif-unix" (
 )
 
 package "ethif" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip io-page mirage-types ipaddr cstruct lwt"
  archive(byte) = "ethif.cma"
@@ -237,7 +237,7 @@ package "ethif" (
 )
 
 package "dhcpv4" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page bytes mirage-types ipaddr cstruct lwt tcpip.udp"
  archive(byte) = "dhcpv4.cma"
@@ -248,7 +248,7 @@ package "dhcpv4" (
 )
 
 package "channel" (
- version = "2.2.1"
+ version = "2.2.2"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page mirage-types ipaddr cstruct lwt"
  archive(byte) = "channel.cma"

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: d1c4a92731e6f57c00463248457cb8c3) *)
+(* DO NOT EDIT (digest: 1957055837a6aa8756c8b2cf6fe96fc6) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6673,7 +6673,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "tcpip";
-          version = "2.2.1";
+          version = "2.2.2";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7658,7 +7658,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "\149s˹\148ómX¨\150Xç?¬\133ð";
+     oasis_digest = Some "\161\225\006n\154y>\218\254F}\131ho*\251";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false