Merge pull request #262 from samoht/mirage3

Mirage3
moby · Aug 3, 2017 · a06c975 · a06c975
2 parents 596d664 + 333d9a0
commit a06c975
Show file tree

Hide file tree

Showing 823 changed files with 7,525 additions and 6,361 deletions.
diff --git a/Makefile b/Makefile
@@ -30,8 +30,6 @@ src/bin/depends.ml: src/bin/depends.ml.in
 	cp src/bin/depends.ml src/bin/depends.tmp
 	sed -e 's/££VERSION££/$(shell git rev-parse HEAD)/g' src/bin/depends.tmp > src/bin/depends.ml
 	cp src/bin/depends.ml src/bin/depends.tmp
-	sed -e 's/££HOSTNET_PINNED££/$(shell opam info hostnet -f pinned)/g' src/bin/depends.tmp > src/bin/depends.ml
-	cp src/bin/depends.ml src/bin/depends.tmp
 	sed -e 's/££HVSOCK_PINNED££/$(shell opam info hvsock -f pinned)/g' src/bin/depends.tmp > src/bin/depends.ml
 
 vpnkit.tgz: vpnkit.exe

diff --git a/repo/Makefile b/repo/Makefile
@@ -19,4 +19,4 @@ commit:
 	$(MAKE) update-win
 	git add win32/packages/upstream
 	git add darwin/packages/upstream
-	git commit -a -s -m "AUTO: Update upstream packages"
+	git commit . -s -m "AUTO: Update upstream packages"
diff --git a/repo/darwin/packages/dev/channel.1.1.0/descr b/repo/darwin/packages/dev/channel.1.1.0/descr
diff --git a/repo/darwin/packages/dev/channel.1.1.0/opam b/repo/darwin/packages/dev/channel.1.1.0/opam
diff --git a/repo/darwin/packages/dev/channel.1.1.0/url b/repo/darwin/packages/dev/channel.1.1.0/url
diff --git a/repo/darwin/packages/dev/charrua-client-lwt.dev/opam b/repo/darwin/packages/dev/charrua-client-lwt.dev/opam
@@ -0,0 +1,36 @@
+opam-version: "1.2"
+name:         "charrua-client-lwt"
+maintainer:   ["Mindy Preston"]
+authors   :   ["Mindy Preston"]
+homepage:     "https://github.com/mirage/charrua-core"
+bug-reports:  "https://github.com/mirage/charrua-core/issues"
+dev-repo:     "https://github.com/mirage/charrua-core.git"
+tags:         [ "org:mirage"]
+doc:          "https://docs.mirage.io"
+
+build: [
+  ["jbuilder" "subst" "-n" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+
+build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
+
+depends: [
+  "jbuilder" {>="1.0+beta9"}
+  "ounit" {test}
+  "alcotest"     {test}
+  "charrua-core" {>= "0.4"}
+  "charrua-client"
+  "cstruct" {>="3.0.2"}
+  "ipaddr"
+  "rresult"
+  "mirage-random" {>= "1.0.0"}
+  "duration"
+  "logs"
+  "tcpip" {>= "3.0.0"}
+  "fmt"
+  "lwt"
+  "mirage-types-lwt" {>="3.0.0"}
+  "mirage-time-lwt"
+]
+available: [ocaml-version >= "4.03.0"]
diff --git a/repo/darwin/packages/dev/charrua-client-lwt.dev/url b/repo/darwin/packages/dev/charrua-client-lwt.dev/url
@@ -0,0 +1 @@
+git: "https://github.com/mirage/charrua-core.git"
diff --git a/repo/darwin/packages/dev/charrua-client-mirage.dev/opam b/repo/darwin/packages/dev/charrua-client-mirage.dev/opam
@@ -0,0 +1,36 @@
+opam-version: "1.2"
+name:         "charrua-client-mirage"
+maintainer:   ["Mindy Preston"]
+authors   :   ["Mindy Preston"]
+homepage:     "https://github.com/mirage/charrua-core"
+bug-reports:  "https://github.com/mirage/charrua-core/issues"
+dev-repo:     "https://github.com/mirage/charrua-core.git"
+tags:         [ "org:mirage"]
+doc:          "https://docs.mirage.io"
+
+build: [
+  ["jbuilder" "subst" "-n" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+
+build-test: ["jbuilder" "runtest" "-p" name "-j" jobs]
+
+depends: [
+  "jbuilder" {>="1.0+beta9"}
+  "ounit" {test}
+  "alcotest"     {test}
+  "charrua-core" {>= "0.4"}
+  "charrua-client-lwt"
+  "charrua-client"
+  "cstruct" {>="3.0.2"}
+  "ipaddr"
+  "rresult"
+  "mirage-random" {>= "1.0.0"}
+  "duration"
+  "logs"
+  "tcpip" {>= "3.0.0"}
+  "fmt"
+  "lwt"
+  "mirage-types-lwt" {>="3.0.0"}
+]
+available: [ocaml-version >= "4.03.0"]
diff --git a/repo/darwin/packages/dev/charrua-client-mirage.dev/url b/repo/darwin/packages/dev/charrua-client-mirage.dev/url
@@ -0,0 +1 @@
+git: "https://github.com/mirage/charrua-core.git"
diff --git a/repo/darwin/packages/dev/charrua-client.dev/descr b/repo/darwin/packages/dev/charrua-client.dev/descr
@@ -0,0 +1 @@
+Library using charrua-core to provide a DHCP-configured IPv4 implementation.
diff --git a/repo/darwin/packages/dev/charrua-client.dev/opam b/repo/darwin/packages/dev/charrua-client.dev/opam
@@ -0,0 +1,28 @@
+opam-version: "1.2"
+name:         "charrua-client"
+maintainer:   ["Mindy Preston"]
+authors   :   ["Mindy Preston"]
+homepage:     "https://github.com/mirage/charrua-core"
+bug-reports:  "https://github.com/mirage/charrua-core/issues"
+dev-repo:     "https://github.com/mirage/charrua-core.git"
+tags:         [ "org:mirage"]
+doc:          "https://docs.mirage.io"
+
+build: [
+  [ "jbuilder" "subst" "-n" name ] {pinned}
+  [ "jbuilder" "build" "-p" name "-j" jobs ]
+]
+
+build-test: [
+  [ "jbuilder" "runtest" "-p" name "-j" jobs ]
+]
+
+depends: [
+  "jbuilder" {>="1.0+beta9"}
+  "ounit" {test}
+  "alcotest"     {test}
+  "charrua-core" {>= "0.8"}
+  "cstruct" {>="3.0.2"}
+  "ipaddr"
+]
+available: [ocaml-version >= "4.03.0"]
diff --git a/repo/darwin/packages/dev/charrua-client.dev/url b/repo/darwin/packages/dev/charrua-client.dev/url
@@ -0,0 +1 @@
+git: "https://github.com/mirage/charrua-core.git"
diff --git a/repo/darwin/packages/dev/charrua-core.999/descr b/repo/darwin/packages/dev/charrua-core.999/descr
diff --git a/repo/darwin/packages/dev/charrua-core.999/opam b/repo/darwin/packages/dev/charrua-core.999/opam
diff --git a/repo/darwin/packages/dev/charrua-core.999/url b/repo/darwin/packages/dev/charrua-core.999/url
diff --git a/repo/darwin/packages/dev/charrua-core.dev/opam b/repo/darwin/packages/dev/charrua-core.dev/opam
@@ -0,0 +1,34 @@
+opam-version: "1.2"
+name: "charrua-core"
+maintainer: "Christiano F. Haesbaert <[email protected]>"
+authors: "Christiano F. Haesbaert <[email protected]>"
+license: "ISC"
+homepage: "https://github.com/mirage/charrua-core"
+bug-reports: "https://github.com/mirage/charrua-core/issues"
+dev-repo: "https://github.com/mirage/charrua-core.git"
+doc: "https://mirage.github.io/charrua-core/api"
+
+available: [ocaml-version >= "4.03" & opam-version >= "1.2"]
+
+build: [
+  ["jbuilder" "subst" "-n" name] {pinned}
+  ["jbuilder" "build" "-p" name "-j" jobs]
+]
+
+build-test: [
+  ["jbuilder" "runtest" "-p" name "-j" jobs]
+]
+
+depends: [
+  "jbuilder" {build & >="1.0+beta7"}
+  "ppx_sexp_conv" {build}
+  "ppx_cstruct"   {build}
+  "menhir"        {build}
+  "cstruct"       {>= "3.0.1"}
+  "sexplib"
+  "ipaddr"        {>= "2.5.0"}
+  "tcpip"         {>= "3.1.0"}
+  "rresult"
+  "io-page-unix"  {test}
+  "cstruct-unix"  {test}
+]
diff --git a/repo/darwin/packages/dev/charrua-core.dev/url b/repo/darwin/packages/dev/charrua-core.dev/url
@@ -0,0 +1 @@
+git: "https://github.com/mirage/charrua-core.git"
diff --git a/repo/darwin/packages/dev/dns-forward.0.8.4/descr b/repo/darwin/packages/dev/dns-forward.0.8.4/descr
diff --git a/repo/darwin/packages/dev/dns-forward.0.8.4/findlib b/repo/darwin/packages/dev/dns-forward.0.8.4/findlib
diff --git a/repo/darwin/packages/dev/dns-forward.0.8.4/opam b/repo/darwin/packages/dev/dns-forward.0.8.4/opam
diff --git a/repo/darwin/packages/dev/dns-forward.0.8.4/url b/repo/darwin/packages/dev/dns-forward.0.8.4/url
diff --git a/repo/darwin/packages/dev/dns.999/descr b/repo/darwin/packages/dev/dns.999/descr
diff --git a/repo/darwin/packages/dev/dns.999/opam b/repo/darwin/packages/dev/dns.999/opam
diff --git a/repo/darwin/packages/dev/dns.999/url b/repo/darwin/packages/dev/dns.999/url
diff --git a/repo/darwin/packages/dev/dnssd.0.4/descr b/repo/darwin/packages/dev/dnssd.0.4/descr
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		git: "https://github.com/mirage/charrua-core.git"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Library using charrua-core to provide a DHCP-configured IPv4 implementation.