Merge pull request #311 from djs55/release.3.1.1

Prepare to release v3.3.1

CHANGES.md

@@ -1,3 +1,9 @@
+### 3.1.1 (2017-05-14)
+
+* fix parsing 20-byte cstructs as ipv4 packets (#307, by @yomimono)
+* udp: payload length parse fix (#307, by @yomimono)
+* support lwt >= 2.7.0 (#308, by @djs55)
+
 ### 3.1.0 (2017-03-14)
 
 * implement MTU setting and querying in the Ethernet module (compatibility with mirage-protocols version 1.1.0), and use this value to inform TCP's MSS. (#288, by @djs55)

_oasis

@@ -1,10 +1,11 @@
 OASISFormat: 0.4
 Name:        tcpip
-Version:     3.1.0
+Version:     3.1.1
 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
+             Magnus Skjegstad, Mindy Preston, Thomas Leonard,
+             David Scott
 License:     ISC
 Plugins:     META (0.4), DevFiles (0.4)
 BuildTools:  ocamlbuild

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: b069ba5262f668db058c35d960036988)
-version = "3.1.0"
+# DO NOT EDIT (digest: 9e2b0ac4fd47d8486991941274776fc8)
+version = "3.1.1"
 description =
 "Implementations for network-related module types from MirageOS."
 requires =
@@ -12,7 +12,7 @@ archive(native, plugin) = "tcpip.cmxs"
 xen_linkopts = "-ltcpip_xen_stubs"
 exists_if = "tcpip.cma"
 package "xen" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  archive(byte) = "tcpip_xen.cma"
@@ -23,7 +23,7 @@ package "xen" (
 )
 
 package "udpv6-socket" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -36,7 +36,7 @@ package "udpv6-socket" (
 )
 
 package "udpv4-socket" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -49,7 +49,7 @@ package "udpv4-socket" (
 )
 
 package "udp" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -62,7 +62,7 @@ package "udp" (
 )
 
 package "tcpv6-socket" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -75,7 +75,7 @@ package "tcpv6-socket" (
 )
 
 package "tcpv4-socket" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -88,7 +88,7 @@ package "tcpv4-socket" (
 )
 
 package "tcp" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -101,7 +101,7 @@ package "tcp" (
 )
 
 package "stack-socket" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -114,7 +114,7 @@ package "stack-socket" (
 )
 
 package "stack-direct" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -127,7 +127,7 @@ package "stack-direct" (
 )
 
 package "ipv6" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -140,7 +140,7 @@ package "ipv6" (
 )
 
 package "ipv4" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -153,7 +153,7 @@ package "ipv4" (
 )
 
 package "icmpv4-socket" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -166,7 +166,7 @@ package "icmpv4-socket" (
 )
 
 package "icmpv4" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -179,7 +179,7 @@ package "icmpv4" (
 )
 
 package "ethif" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =
@@ -192,7 +192,7 @@ package "ethif" (
 )
 
 package "arpv4" (
- version = "3.1.0"
+ version = "3.1.1"
  description =
  "Implementations for network-related module types from MirageOS."
  requires =

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 5168413842659d6c48c89cee459bfaff) *)
+(* DO NOT EDIT (digest: 647dca8118c48de002c8c347a7feadf6) *)
 (*
    Regenerated by OASIS v0.4.8
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7027,7 +7027,7 @@ let setup_t =
        {
           oasis_version = "0.4";
           ocaml_version = None;
-          version = "3.1.0";
+          version = "3.1.1";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7053,7 +7053,8 @@ let setup_t =
                "Vincent Bernardoff";
                "Magnus Skjegstad";
                "Mindy Preston";
-               "Thomas Leonard"
+               "Thomas Leonard";
+               "David Scott"
             ];
           homepage = None;
           bugreports = None;
@@ -9803,15 +9804,16 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.8";
-     oasis_digest = Some "RV\028v(\187\153\202\152o\146a\189:\211\234";
+     oasis_digest =
+       Some "\217\176\234\134\158\157\192\151\136\136*\198\173\229\025_";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 9815 "setup.ml"
+# 9817 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)