Merge pull request #11 from jonludlam/0.9.6

0.9.6
xapi-project · Jun 4, 2014 · d6cf85f · d6cf85f
2 parents fc2c63b + 402dd3d
commit d6cf85f
Show file tree

Hide file tree

Showing 31 changed files with 1,836 additions and 583 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+0.9.6 (4-Jun-2014)
+* Fix CPUID functions on ARM to do The Right Thing
+* Update to stdext 0.11.0
+* Add a configurable timeout to the stunnel bindings
+* Set SO_KEEPALIVE on server sockets
+
 0.9.3 (25-Sep-2013):
 * Log to syslog via xcp-idl
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)
+# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954)
 
 SETUP = ocaml setup.ml
 
@@ -12,7 +12,7 @@ doc: setup.data build
 test: setup.data build
 	$(SETUP) -test $(TESTFLAGS)
 
-all: 
+all:
 	$(SETUP) -all $(ALLFLAGS)
 
 install: setup.data
@@ -24,15 +24,18 @@ uninstall: setup.data
 reinstall: setup.data
 	$(SETUP) -reinstall $(REINSTALLFLAGS)
 
-clean: 
+clean:
 	$(SETUP) -clean $(CLEANFLAGS)
 
-distclean: 
+distclean:
 	$(SETUP) -distclean $(DISTCLEANFLAGS)
 
 setup.data:
 	$(SETUP) -configure $(CONFIGUREFLAGS)
 
+configure:
+	$(SETUP) -configure $(CONFIGUREFLAGS)
+
 .PHONY: build doc test all install uninstall reinstall clean distclean configure
 
 # OASIS_STOP
diff --git a/_oasis b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat:  0.3
 Name:         xen-api-libs-transitional
-Version:      0.9.3
+Version:      0.9.6
 Synopsis:     Temporary set of to-be-deprecated libraries
 License:      LGPL-2.1 with OCaml linking exception
 Authors:      various

diff --git a/_tags b/_tags
@@ -1,7 +1,7 @@
 # OASIS_START
-# DO NOT EDIT (digest: f4bc3640085b1f1e76af63fab7500254)
-# Ignore VCS directories, you can use the same kind of rule outside 
-# OASIS_START/STOP if you want to exclude directories that contains 
+# DO NOT EDIT (digest: 6404d67d298a795930eacf50ea0a2535)
+# 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
 <**/.svn>: -traverse
 <**/.svn>: not_hygienic
@@ -15,14 +15,14 @@
 "_darcs": not_hygienic
 # Library sha1
 "sha1/sha1.cmxs": use_sha1
+<sha1/*.ml{,i}>: pkg_forkexec
 <sha1/*.ml{,i}>: pkg_stdext
 <sha1/*.ml{,i}>: pkg_threads
-<sha1/*.ml{,i}>: pkg_forkexec
 # Library gzip
 "gzip/gzip.cmxs": use_gzip
+<gzip/*.ml{,i}>: pkg_forkexec
 <gzip/*.ml{,i}>: pkg_stdext
 <gzip/*.ml{,i}>: pkg_threads
-<gzip/*.ml{,i}>: pkg_forkexec
 # Library xenstore
 "xenstore/xenstore.cmxs": use_xenstore
 <xenstore/*.ml{,i}>: pkg_stdext
@@ -32,44 +32,44 @@
 # Library xenctrlext
 "xenctrlext/xenctrlext.cmxs": use_xenctrlext
 <xenctrlext/xenctrlext.{cma,cmxa}>: use_libxenctrlext_stubs
-<xenctrlext/*.ml{,i}>: use_xenstore
 <xenctrlext/*.ml{,i}>: pkg_stdext
 <xenctrlext/*.ml{,i}>: pkg_threads
 <xenctrlext/*.ml{,i}>: pkg_xenctrl
 <xenctrlext/*.ml{,i}>: pkg_xenstore.unix
 <xenctrlext/*.ml{,i}>: pkg_xenstore_transport.unix
-"xenctrlext/xenctrlext_stubs.c": use_xenstore
+<xenctrlext/*.ml{,i}>: use_xenstore
 "xenctrlext/xenctrlext_stubs.c": pkg_stdext
 "xenctrlext/xenctrlext_stubs.c": pkg_threads
 "xenctrlext/xenctrlext_stubs.c": pkg_xenctrl
 "xenctrlext/xenctrlext_stubs.c": pkg_xenstore.unix
 "xenctrlext/xenctrlext_stubs.c": pkg_xenstore_transport.unix
+"xenctrlext/xenctrlext_stubs.c": use_xenstore
 # Library xenutils
 "xen-utils/xenutils.cmxs": use_xenutils
+<xen-utils/*.ml{,i}>: pkg_forkexec
 <xen-utils/*.ml{,i}>: pkg_stdext
 <xen-utils/*.ml{,i}>: pkg_threads
-<xen-utils/*.ml{,i}>: pkg_forkexec
 # Library cpuid
 "cpuid/cpuid.cmxs": use_cpuid
 <cpuid/cpuid.{cma,cmxa}>: use_libcpuid_stubs
-<cpuid/*.ml{,i}>: use_xenctrlext
-<cpuid/*.ml{,i}>: use_xenstore
-<cpuid/*.ml{,i}>: use_xenutils
+<cpuid/*.ml{,i}>: pkg_forkexec
 <cpuid/*.ml{,i}>: pkg_stdext
 <cpuid/*.ml{,i}>: pkg_threads
-<cpuid/*.ml{,i}>: pkg_forkexec
 <cpuid/*.ml{,i}>: pkg_xenctrl
 <cpuid/*.ml{,i}>: pkg_xenstore.unix
 <cpuid/*.ml{,i}>: pkg_xenstore_transport.unix
-"cpuid/cpuid_stubs.c": use_xenctrlext
-"cpuid/cpuid_stubs.c": use_xenstore
-"cpuid/cpuid_stubs.c": use_xenutils
+<cpuid/*.ml{,i}>: use_xenctrlext
+<cpuid/*.ml{,i}>: use_xenstore
+<cpuid/*.ml{,i}>: use_xenutils
+"cpuid/cpuid_stubs.c": pkg_forkexec
 "cpuid/cpuid_stubs.c": pkg_stdext
 "cpuid/cpuid_stubs.c": pkg_threads
-"cpuid/cpuid_stubs.c": pkg_forkexec
 "cpuid/cpuid_stubs.c": pkg_xenctrl
 "cpuid/cpuid_stubs.c": pkg_xenstore.unix
 "cpuid/cpuid_stubs.c": pkg_xenstore_transport.unix
+"cpuid/cpuid_stubs.c": use_xenctrlext
+"cpuid/cpuid_stubs.c": use_xenstore
+"cpuid/cpuid_stubs.c": use_xenutils
 # Library pciutil
 "pciutil/pciutil.cmxs": use_pciutil
 <pciutil/*.ml{,i}>: pkg_stdext
@@ -83,21 +83,21 @@
 <xml-light2/*.ml{,i}>: pkg_xmlm
 # Library stunnel
 "stunnel/stunnel.cmxs": use_stunnel
+<stunnel/*.ml{,i}>: pkg_forkexec
 <stunnel/*.ml{,i}>: pkg_stdext
 <stunnel/*.ml{,i}>: pkg_threads
 <stunnel/*.ml{,i}>: pkg_xcp
-<stunnel/*.ml{,i}>: pkg_forkexec
 # Library httpsvr
 "http-svr/httpsvr.cmxs": use_httpsvr
-<http-svr/*.ml{,i}>: use_xmllight2
-<http-svr/*.ml{,i}>: use_stunnel
-<http-svr/*.ml{,i}>: pkg_stdext
-<http-svr/*.ml{,i}>: pkg_threads
+<http-svr/*.ml{,i}>: pkg_forkexec
 <http-svr/*.ml{,i}>: pkg_rpclib
 <http-svr/*.ml{,i}>: pkg_rpclib.syntax
+<http-svr/*.ml{,i}>: pkg_stdext
+<http-svr/*.ml{,i}>: pkg_threads
 <http-svr/*.ml{,i}>: pkg_xcp
-<http-svr/*.ml{,i}>: pkg_forkexec
 <http-svr/*.ml{,i}>: pkg_xmlm
+<http-svr/*.ml{,i}>: use_stunnel
+<http-svr/*.ml{,i}>: use_xmllight2
 # Library sexpr
 "sexpr/sexpr.cmxs": use_sexpr
 <sexpr/*.ml{,i}>: pkg_stdext

diff --git a/configure b/configure
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 # OASIS_START
-# DO NOT EDIT (digest: 425187ed8bfdbdd207fd76392dd243a7)
+# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499)
 set -e
 
 FST=true
-for i in "$@"; do 
+for i in "$@"; do
   if $FST; then
     set --
     FST=false

diff --git a/cpuid/META b/cpuid/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: d648e9c0ab0e77f27b87210b0a0ef1a4)
-version = "0.9.3"
+# DO NOT EDIT (digest: 5d9d5f8dea6678f0bafc4c237b3e0281)
+version = "0.9.6"
 description = "Temporary set of to-be-deprecated libraries"
 requires = "stdext threads xenctrl xenctrlext xen-utils"
 archive(byte) = "cpuid.cma"

diff --git a/cpuid/cpuid.mldylib b/cpuid/cpuid.mldylib
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: d5d2892cca3439b5aff6a6a9737fba8d)
+Cpuid
+# OASIS_STOP
diff --git a/gzip/META b/gzip/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: ae2e22d207a18b6e5bda1c5cc8dad4fb)
-version = "0.9.3"
+# DO NOT EDIT (digest: c279e1f099f8513330c32eec73d68e3d)
+version = "0.9.6"
 description = "Temporary set of to-be-deprecated libraries"
 requires = "stdext forkexec threads"
 archive(byte) = "gzip.cma"

diff --git a/gzip/gzip.mldylib b/gzip/gzip.mldylib
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 2548e50da66f41afea53de1cbbf3b30c)
+Gzip
+# OASIS_STOP
diff --git a/http-svr/META b/http-svr/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 267496ae803f096613ccc5bec3130461)
-version = "0.9.3"
+# DO NOT EDIT (digest: 27601504cbe6e316c168f3cfae26b522)
+version = "0.9.6"
 description = "Temporary set of to-be-deprecated libraries"
 requires = "stdext threads rpclib rpclib.syntax xml-light2 stunnel xcp"
 archive(byte) = "httpsvr.cma"

diff --git a/http-svr/httpsvr.mldylib b/http-svr/httpsvr.mldylib
@@ -0,0 +1,14 @@
+# OASIS_START
+# DO NOT EDIT (digest: 21a89b39772380329355b6196b13baed)
+Buf_io
+Http_client
+Http
+Http_proxy
+Http_svr
+Mime
+Radix_tree
+Server_io
+Ws_helpers
+Xmlrpc_client
+XMLRPC
+# OASIS_STOP