Merge pull request #25 from hannesm/ipaddr3

ipaddr3 compatibility

Author: hannesm

.travis.yml

@@ -8,9 +8,7 @@ env:
   global:
   - PACKAGE="mirage-vnetif"
   matrix:
-  - DISTRO="debian-stable" OCAML_VERSION="4.03"
   - DISTRO="debian-testing" OCAML_VERSION="4.04"
-  - DISTRO="debian-unstable" OCAML_VERSION="4.04"
-  - DISTRO="ubuntu-16.04" OCAML_VERSION="4.04"
-  - DISTRO="alpine" OCAML_VERSION="4.04"
-  - DISTRO="alpine" OCAML_VERSION="4.03"
+  - DISTRO="debian-unstable" OCAML_VERSION="4.05"
+  - DISTRO="ubuntu-16.04" OCAML_VERSION="4.06"
+  - DISTRO="alpine" OCAML_VERSION="4.07"

mirage-vnetif.opam

@@ -1,30 +1,32 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name: "mirage-vnetif"
 maintainer: "Magnus Skjegstad <[email protected]>"
 authors: "Magnus Skjegstad <[email protected]>"
 homepage: "https://github.com/mirage/mirage-vnetif"
 bug-reports: "https://github.com/mirage/mirage-vnetif/issues/"
-dev-repo: "https://github.com/mirage/mirage-vnetif.git"
+dev-repo: "git+https://github.com/mirage/mirage-vnetif.git"
 doc: "https://docs.mirage.io/mirage-vnetif"
 license: "ISC"
 
 build: [
-  ["jbuilder" "subst"] {pinned}
+  ["jbuilder" "subst" "-p" name] {pinned}
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
 
 depends: [
+  "ocaml" {>= "4.04.2"}
   "jbuilder"  {build & >="1.0+beta7"}
   "lwt"
   "mirage-time-lwt" {>= "1.0.0"}
   "mirage-clock-lwt" {>= "1.2.0"}
   "mirage-net-lwt" {>= "1.0.0"}
   "cstruct" {>="2.4.0"}
-  "ipaddr"
+  "ipaddr" {>= "3.0.0"}
+  "macaddr"
   "io-page"
   "mirage-profile"
   "duration"
   "logs"
 ]
 tags: ["org:mirage"]
-available: [ocaml-version >= "4.03.0"]
+synopsis: "Virtual network interface and software switch for Mirage"

src/jbuild

@@ -4,5 +4,5 @@
    (public_name mirage-vnetif)
    (modules (basic_backend vnetif))
    (wrapped false)
-   (libraries (cstruct lwt mirage-clock-lwt ipaddr mirage-profile io-page duration result mirage-time-lwt mirage-net mirage-net-lwt logs))
+   (libraries (cstruct lwt mirage-clock-lwt ipaddr macaddr mirage-profile io-page duration result mirage-time-lwt mirage-net mirage-net-lwt logs))
 ))