[xen] update to xen-4.4.1, fixes for ocaml-4.02.0

[myoung]

commit 2c5fb56d2e158b4e28561d7df712a291cbfbd446
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Tue Sep 2 22:28:37 2014 +0100

    update to xen-4.4.1, fixes for ocaml-4.02.0

 .gitignore                                         |    2 +-
 sources                                            |    2 +-
 ...-6b4d71d028f445cba7426a144751fddc8bfdd67b.patch |   45 --
 xen.ocamlfix.patch                                 |   32 ++
 xen.pygrubtitlefix.patch                           |   11 -
 xen.spec                                           |   27 +-
 xsa100.patch                                       |   33 --
 xsa89.patch                                        |   96 ----
 xsa92.patch                                        |   36 --
 xsa96.patch                                        |   38 --
 xsa97-hap-4.4.patch                                |  485 --------------------
 11 files changed, 43 insertions(+), 764 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7623c6c..90f2762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
 polarssl-1.1.4-gpl.tgz
-/xen-4.4.0.tar.gz
+/xen-4.4.1.tar.gz
diff --git a/sources b/sources
index b1c6d73..4711157 100644
--- a/sources
+++ b/sources
@@ -4,4 +4,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib-1.16.0.tar.gz
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
 7b72caf22b01464ee7d6165f2fd85f44  polarssl-1.1.4-gpl.tgz
-fd9031d499af38c5d04108681734027e  xen-4.4.0.tar.gz
+1868433f393503000877d15cd4e93d15  xen-4.4.1.tar.gz
diff --git a/xen.ocamlfix.patch b/xen.ocamlfix.patch
new file mode 100644
index 0000000..648ac1c
--- /dev/null
+++ b/xen.ocamlfix.patch
@@ -0,0 +1,32 @@
+--- xen-4.4.1/tools/ocaml/libs/xb/xs_ring_stubs.c.orig	2014-09-02 07:20:19.000000000 +0100
++++ xen-4.4.1/tools/ocaml/libs/xb/xs_ring_stubs.c	2014-09-02 21:42:36.164254201 +0100
+@@ -20,6 +20,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #include <xenctrl.h>
+ #include <xen/io/xs_wire.h>
+@@ -42,8 +43,8 @@
+ 	XENSTORE_RING_IDX cons, prod; /* offsets only */
+ 	int to_read;
+ 
+-	cons = *(volatile uint32*)&intf->req_cons;
+-	prod = *(volatile uint32*)&intf->req_prod;
++	cons = *(volatile uint32_t*)&intf->req_cons;
++	prod = *(volatile uint32_t*)&intf->req_prod;
+ 	xen_mb();
+ 
+ 	if ((prod - cons) > XENSTORE_RING_SIZE)
+@@ -72,8 +73,8 @@
+ 	XENSTORE_RING_IDX cons, prod;
+ 	int can_write;
+ 
+-	cons = *(volatile uint32*)&intf->rsp_cons;
+-	prod = *(volatile uint32*)&intf->rsp_prod;
++	cons = *(volatile uint32_t*)&intf->rsp_cons;
++	prod = *(volatile uint32_t*)&intf->rsp_prod;
+ 	xen_mb();
+ 	if ( (prod - cons) >= XENSTORE_RING_SIZE )
+ 		return 0;
diff --git a/xen.spec b/xen.spec
index 491da0b..dac4391 100644
--- a/xen.spec
+++ b/xen.spec
@@ -52,8 +52,8 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 4.4.0
-Release: 14%{?dist}
+Version: 4.4.1
+Release: 1%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -97,18 +97,11 @@ Patch13: xend.selinux.fixes.patch
 Patch15: xen.use.fedora.ipxe.patch
 Patch17: xen.fedora.efi.build.patch
 Patch18: xen.fedora19.buildfix.patch
-Patch19: xen.pygrubtitlefix.patch
 Patch20: xen.xsm.enable.patch
 Patch21: xen.64.bit.hyp.on.ix86.patch
 Patch22: xen.console.fix.patch
-Patch23: xsa89.patch
-Patch24: xsa92.patch
-Patch25: xsa96.patch
-Patch26: xsa100.patch
-Patch27: xen.git-6b4d71d028f445cba7426a144751fddc8bfdd67b.patch
-Patch28: xsa97-hap-4.4.patch
-
-Patch99: localgcc490fix.patch
+Patch23: xen.ocamlfix.patch
+
 Patch100: xen-configure-xend.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -285,7 +278,6 @@ manage Xen virtual machines.
 %patch15 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
 %if %build_xsm
 %patch20 -p1
 %endif
@@ -294,13 +286,7 @@ manage Xen virtual machines.
 %endif
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
 
-%patch99 -p1
 %patch100 -p1
 
 # stubdom sources
@@ -896,6 +882,11 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Sep 02 2014 Michael Young <m.a.young at durham.ac.uk> - 4.4.1-1
+- update to xen-4.4.1
+  remove patches for fixes that are now included
+- replace uint32 with uint32_t in ocaml file for ocaml-4.02.0
+
 * Sun Aug 31 2014 Richard W.M. Jones <rjones at redhat.com> - 4.4.0-14
 - Bump release and rebuild.