Skip to content

Commit

Permalink
Merge pull request #116 from avsm/master
Browse files Browse the repository at this point in the history
bump to 2.3.0
  • Loading branch information
avsm committed Mar 9, 2015
2 parents 52e5e04 + d7bb698 commit 42c25fc
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 32 deletions.
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2.3.0 (2015-03-09):
* Fix `STACKV4` for the `DEVICE` signature which has `connect` removed (in Mirage types 2.3+).

2.2.3 (2015-03-09):
* Add ICMPv6 error reporting functions (#101)
* Add universal IP address converters (#108)
Expand Down
6 changes: 3 additions & 3 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
OASISFormat: 0.3
OASISFormat: 0.4
Name: tcpip
Version: 2.2.3
Version: 2.3.0
Synopsis: Ethernet, TCP/IPv4 and DHCPv4 library
Authors: Anil Madhavapeddy, Balraj Singh, Richard Mortier, Nicolas Ojeda Bar
License: ISC
Plugins: META (0.3), DevFiles (0.3)
Plugins: META (0.4), DevFiles (0.4)
BuildTools: ocamlbuild
PostConfCommand: ocaml postconf.ml

Expand Down
48 changes: 24 additions & 24 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: b584953ae9074375bbcc192769af4b98)
version = "2.2.3"
# DO NOT EDIT (digest: 22882ae34792fd8f66fa101d4ff23bcd)
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page mirage-types ipaddr cstruct mirage-profile bytes"
archive(byte) = "tcpip.cma"
Expand All @@ -10,7 +10,7 @@ archive(native, plugin) = "tcpip.cmxs"
xen_linkopts = "-ltcpip_xen_stubs"
exists_if = "tcpip.cma"
package "xen" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
archive(byte) = "tcpip_xen.cma"
archive(byte, plugin) = "tcpip_xen.cma"
Expand All @@ -20,7 +20,7 @@ package "xen" (
)

package "udpv6-unix" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"tcpip.udp tcpip.ipv6-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
Expand All @@ -32,7 +32,7 @@ package "udpv6-unix" (
)

package "udpv6-socket" (
version = "2.2.3"
version = "2.3.0"
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"
Expand All @@ -43,7 +43,7 @@ package "udpv6-socket" (
)

package "udpv4-unix" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"tcpip.udp tcpip.ipv4-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
Expand All @@ -55,7 +55,7 @@ package "udpv4-unix" (
)

package "udpv4-socket" (
version = "2.2.3"
version = "2.3.0"
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"
Expand All @@ -66,7 +66,7 @@ package "udpv4-socket" (
)

package "udp" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
archive(byte) = "udp.cma"
Expand All @@ -77,7 +77,7 @@ package "udp" (
)

package "tcpv6-unix" (
version = "2.2.3"
version = "2.3.0"
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"
Expand All @@ -89,7 +89,7 @@ package "tcpv6-unix" (
)

package "tcpv6-socket" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
archive(byte) = "tcpv6-socket.cma"
Expand All @@ -100,7 +100,7 @@ package "tcpv6-socket" (
)

package "tcpv4-unix" (
version = "2.2.3"
version = "2.3.0"
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"
Expand All @@ -112,7 +112,7 @@ package "tcpv4-unix" (
)

package "tcpv4-socket" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
archive(byte) = "tcpv4-socket.cma"
Expand All @@ -123,7 +123,7 @@ package "tcpv4-socket" (
)

package "tcp" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"io-page mirage-types ipaddr cstruct lwt tcpip tcpip.ipv4 tcpip.ipv6"
Expand All @@ -135,7 +135,7 @@ package "tcp" (
)

package "stack-unix" (
version = "2.2.3"
version = "2.3.0"
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"
Expand All @@ -147,7 +147,7 @@ package "stack-unix" (
)

package "stack-socket" (
version = "2.2.3"
version = "2.3.0"
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"
Expand All @@ -159,7 +159,7 @@ package "stack-socket" (
)

package "stack-direct" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires =
"io-page mirage-types ipaddr cstruct lwt tcpip.ethif tcpip.udp tcpip.tcp tcpip.dhcpv4"
Expand All @@ -171,7 +171,7 @@ package "stack-direct" (
)

package "ipv6-unix" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "tcpip.ethif-unix tcpip.ipv6 lwt lwt.unix"
archive(byte) = "ipv6-unix.cma"
Expand All @@ -182,7 +182,7 @@ package "ipv6-unix" (
)

package "ipv6" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
archive(byte) = "ipv6.cma"
Expand All @@ -193,7 +193,7 @@ package "ipv6" (
)

package "ipv4-unix" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "tcpip.ethif-unix tcpip.ipv4 lwt lwt.unix"
archive(byte) = "ipv4-unix.cma"
Expand All @@ -204,7 +204,7 @@ package "ipv4-unix" (
)

package "ipv4" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
archive(byte) = "ipv4.cma"
Expand All @@ -215,7 +215,7 @@ package "ipv4" (
)

package "ethif-unix" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "tcpip.ethif mirage-net-unix lwt lwt.unix"
archive(byte) = "ethif-unix.cma"
Expand All @@ -226,7 +226,7 @@ package "ethif-unix" (
)

package "ethif" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "tcpip io-page mirage-types ipaddr cstruct lwt"
archive(byte) = "ethif.cma"
Expand All @@ -237,7 +237,7 @@ package "ethif" (
)

package "dhcpv4" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page bytes mirage-types ipaddr cstruct lwt tcpip.udp"
archive(byte) = "dhcpv4.cma"
Expand All @@ -248,7 +248,7 @@ package "dhcpv4" (
)

package "channel" (
version = "2.2.3"
version = "2.3.0"
description = "Ethernet, TCP/IPv4 and DHCPv4 library"
requires = "io-page mirage-types ipaddr cstruct lwt"
archive(byte) = "channel.cma"
Expand Down
10 changes: 5 additions & 5 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.5 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 42e4e7cf436688bf14beec25b4787822) *)
(* DO NOT EDIT (digest: c5f78a57dac8286d7b31e0d58bd7934b) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6667,13 +6667,13 @@ let setup_t =
distclean_doc = [];
package =
{
oasis_version = "0.3";
oasis_version = "0.4";
ocaml_version = None;
findlib_version = None;
alpha_features = [];
beta_features = [];
name = "tcpip";
version = "2.2.3";
version = "2.3.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -7650,14 +7650,14 @@ let setup_t =
})
];
plugins =
[(`Extra, "META", Some "0.3"); (`Extra, "DevFiles", Some "0.3")];
[(`Extra, "META", Some "0.4"); (`Extra, "DevFiles", Some "0.4")];
disable_oasis_section = [];
schema_data = PropList.Data.create ();
plugin_data = []
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "rM\151õç\138¢t\127\006\016×î¼Ç\128";
oasis_digest = Some "¾s\136ÃÛþ\148\145öèì4\tÅá\011";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
Expand Down

0 comments on commit 42c25fc

Please sign in to comment.