Merge pull request #15 from djs55/missing-patches

Add missing patches from xapi-project
djs55 · Jul 3, 2014 · 054859f · 054859f
2 parents a832702 + 4353d11
commit 054859f
Show file tree

Hide file tree

Showing 7 changed files with 434 additions and 293 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -1,5 +1,5 @@
 # OPAM packages needed to build tests.
-OPAM_PACKAGES="vhd-format lwt cstruct uuidm cmdliner tapctl nbd.0.9.1 cohttp xcp xenstore xenstore_transport uri"
+OPAM_PACKAGES="vhd-format lwt cstruct uuidm cmdliner nbd cohttp xenstore xenstore_transport uri ssl sha tar-format"
 
 
 case "$OCAML_VERSION,$OPAM_VERSION" in
@@ -24,7 +24,6 @@ opam --version
 opam --git-version
 
 opam init 
-opam remote add xapi-project git://github.com/xapi-project/opam-repo-dev
 opam install ${OPAM_PACKAGES}
 
 eval `opam config -env`

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+0.7.5 (2014-06-03)
+* Upgrade to cohttp 0.10
+* Fix incorrect handling of tar file prefixes
+
 0.7.3 (2014-04-04)
 * sparse_dd: Fix references to Vhd_lwt.File.use_unbuffered
 

diff --git a/_oasis b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.3
 Name:        vhd-tool
-Version:     0.7.0
+Version:     0.7.5
 Synopsis:    .vhd file manipulation
 Authors:     Jonathan Ludlam and David Scott
 License:     LGPL-2.1 with OCaml linking exception
@@ -16,7 +16,7 @@ Executable "vhd-tool"
   MainIs:             main.ml
   Custom:             true
   Install:            false
-  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp, cohttp.lwt, tar, sha, sha.sha1, io-page.unix
+  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp (>= 0.10.0), cohttp.lwt, tar, sha, sha.sha1, io-page.unix, re.str
 
 Executable "sparse_dd"
   Build$:             flag(xenserver)
@@ -25,4 +25,4 @@ Executable "sparse_dd"
   MainIs:             sparse_dd.ml
   Custom:             true
   Install:            false
-  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp, cohttp.lwt, xenstore, xenstore.client, xenstore.unix, xenstore_transport, xenstore_transport.unix, threads, tapctl, xcp, sha, sha.sha1, tar, io-page.unix
+  BuildDepends:       lwt, lwt.unix, vhd-format, vhd-format.lwt, cmdliner, nbd, nbd.lwt, uri, cohttp (>= 0.10.0), cohttp.lwt, xenstore, xenstore.client, xenstore.unix, xenstore_transport, xenstore_transport.unix, threads, tapctl, xcp, sha, sha.sha1, tar, io-page.unix, re.str
diff --git a/_tags b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: bee6ed95cc9a0dcddb65d89b193ddf96)
+# DO NOT EDIT (digest: f3e306cb3822f9fd188eb6bf627dd3ca)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -14,66 +14,69 @@
 "_darcs": -traverse
 "_darcs": not_hygienic
 # Executable vhd-tool
+<src/main.{native,byte}>: pkg_cmdliner
+<src/main.{native,byte}>: pkg_cohttp
+<src/main.{native,byte}>: pkg_cohttp.lwt
+<src/main.{native,byte}>: pkg_io-page.unix
 <src/main.{native,byte}>: pkg_lwt
 <src/main.{native,byte}>: pkg_lwt.unix
-<src/main.{native,byte}>: pkg_vhd-format
-<src/main.{native,byte}>: pkg_vhd-format.lwt
-<src/main.{native,byte}>: pkg_cmdliner
 <src/main.{native,byte}>: pkg_nbd
 <src/main.{native,byte}>: pkg_nbd.lwt
-<src/main.{native,byte}>: pkg_uri
-<src/main.{native,byte}>: pkg_cohttp
-<src/main.{native,byte}>: pkg_cohttp.lwt
+<src/main.{native,byte}>: pkg_re.str
 <src/main.{native,byte}>: pkg_sha
 <src/main.{native,byte}>: pkg_sha.sha1
 <src/main.{native,byte}>: pkg_tar
-<src/main.{native,byte}>: pkg_io-page.unix
+<src/main.{native,byte}>: pkg_uri
+<src/main.{native,byte}>: pkg_vhd-format
+<src/main.{native,byte}>: pkg_vhd-format.lwt
 <src/main.{native,byte}>: custom
 # Executable sparse_dd
+<src/sparse_dd.{native,byte}>: pkg_cmdliner
+<src/sparse_dd.{native,byte}>: pkg_cohttp
+<src/sparse_dd.{native,byte}>: pkg_cohttp.lwt
+<src/sparse_dd.{native,byte}>: pkg_io-page.unix
 <src/sparse_dd.{native,byte}>: pkg_lwt
 <src/sparse_dd.{native,byte}>: pkg_lwt.unix
-<src/sparse_dd.{native,byte}>: pkg_vhd-format
-<src/sparse_dd.{native,byte}>: pkg_vhd-format.lwt
-<src/sparse_dd.{native,byte}>: pkg_cmdliner
 <src/sparse_dd.{native,byte}>: pkg_nbd
 <src/sparse_dd.{native,byte}>: pkg_nbd.lwt
+<src/sparse_dd.{native,byte}>: pkg_re.str
+<src/sparse_dd.{native,byte}>: pkg_sha
+<src/sparse_dd.{native,byte}>: pkg_sha.sha1
+<src/sparse_dd.{native,byte}>: pkg_tapctl
+<src/sparse_dd.{native,byte}>: pkg_tar
+<src/sparse_dd.{native,byte}>: pkg_threads
 <src/sparse_dd.{native,byte}>: pkg_uri
-<src/sparse_dd.{native,byte}>: pkg_cohttp
-<src/sparse_dd.{native,byte}>: pkg_cohttp.lwt
+<src/sparse_dd.{native,byte}>: pkg_vhd-format
+<src/sparse_dd.{native,byte}>: pkg_vhd-format.lwt
+<src/sparse_dd.{native,byte}>: pkg_xcp
 <src/sparse_dd.{native,byte}>: pkg_xenstore
 <src/sparse_dd.{native,byte}>: pkg_xenstore.client
 <src/sparse_dd.{native,byte}>: pkg_xenstore.unix
 <src/sparse_dd.{native,byte}>: pkg_xenstore_transport
 <src/sparse_dd.{native,byte}>: pkg_xenstore_transport.unix
-<src/sparse_dd.{native,byte}>: pkg_threads
-<src/sparse_dd.{native,byte}>: pkg_tapctl
-<src/sparse_dd.{native,byte}>: pkg_xcp
-<src/sparse_dd.{native,byte}>: pkg_sha
-<src/sparse_dd.{native,byte}>: pkg_sha.sha1
-<src/sparse_dd.{native,byte}>: pkg_tar
-<src/sparse_dd.{native,byte}>: pkg_io-page.unix
+<src/*.ml{,i}>: pkg_cmdliner
+<src/*.ml{,i}>: pkg_cohttp
+<src/*.ml{,i}>: pkg_cohttp.lwt
+<src/*.ml{,i}>: pkg_io-page.unix
 <src/*.ml{,i}>: pkg_lwt
 <src/*.ml{,i}>: pkg_lwt.unix
-<src/*.ml{,i}>: pkg_vhd-format
-<src/*.ml{,i}>: pkg_vhd-format.lwt
-<src/*.ml{,i}>: pkg_cmdliner
 <src/*.ml{,i}>: pkg_nbd
 <src/*.ml{,i}>: pkg_nbd.lwt
+<src/*.ml{,i}>: pkg_re.str
+<src/*.ml{,i}>: pkg_sha
+<src/*.ml{,i}>: pkg_sha.sha1
+<src/*.ml{,i}>: pkg_tapctl
+<src/*.ml{,i}>: pkg_tar
+<src/*.ml{,i}>: pkg_threads
 <src/*.ml{,i}>: pkg_uri
-<src/*.ml{,i}>: pkg_cohttp
-<src/*.ml{,i}>: pkg_cohttp.lwt
+<src/*.ml{,i}>: pkg_vhd-format
+<src/*.ml{,i}>: pkg_vhd-format.lwt
+<src/*.ml{,i}>: pkg_xcp
 <src/*.ml{,i}>: pkg_xenstore
 <src/*.ml{,i}>: pkg_xenstore.client
 <src/*.ml{,i}>: pkg_xenstore.unix
 <src/*.ml{,i}>: pkg_xenstore_transport
 <src/*.ml{,i}>: pkg_xenstore_transport.unix
-<src/*.ml{,i}>: pkg_threads
-<src/*.ml{,i}>: pkg_tapctl
-<src/*.ml{,i}>: pkg_xcp
-<src/*.ml{,i}>: pkg_sha
-<src/*.ml{,i}>: pkg_sha.sha1
-<src/*.ml{,i}>: pkg_tar
-<src/*.ml{,i}>: pkg_io-page.unix
 <src/sparse_dd.{native,byte}>: custom
 # OASIS_STOP
 <src/chunked.ml>: syntax_camlp4o, pkg_cstruct.syntax