[xen/f14] update to 4.0.2

[myoung]

commit 4af4ec26b2cb58e8dd84142e3d92ea71a6819ca8
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Thu Jun 16 00:44:08 2011 +0100

    update to 4.0.2

 .gitignore              |    2 +-
 cve-2011-1583-4.0.patch |  208 -----------------------------------------------
 localcleanups.patch     |   16 ----
 localpy27fixes.patch    |   36 --------
 sources                 |    2 +-
 xen.8259afix.patch      |   73 -----------------
 xen.irq.fixes.patch     |   63 --------------
 xen.spec                |   21 ++---
 xen.xsave.disable.patch |   26 ------
 9 files changed, 11 insertions(+), 436 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aeaeab9..aa2ed4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ newlib-1.16.0.tar.gz
 lwip-1.3.0.tar.gz
 pciutils-2.2.9.tar.bz2
 zlib-1.2.3.tar.gz
-xen-4.0.1.tar.gz
+/xen-4.0.2.tar.gz
diff --git a/localcleanups.patch b/localcleanups.patch
index b4c19d1..ba51a47 100644
--- a/localcleanups.patch
+++ b/localcleanups.patch
@@ -9,22 +9,6 @@
  
  echo 1 >/proc/sys/net/ipv4/ip_forward
  echo 1 >/proc/sys/net/ipv4/conf/${netdev}/proxy_arp
---- xen-4.0.1/tools/hotplug/Linux/vif-common.sh.orig	2010-08-25 11:22:09.000000000 +0100
-+++ xen-4.0.1/tools/hotplug/Linux/vif-common.sh	2011-01-28 18:59:39.000000000 +0000
-@@ -73,10 +73,9 @@
-     local c="-D"
-   fi
- 
--  iptables "$c" FORWARD -m physdev --physdev-in "$vif" "$@" -j ACCEPT \
--    2>/dev/null &&
--  iptables "$c" FORWARD -m state --state RELATED,ESTABLISHED -m physdev \
--    --physdev-out "$vif" -j ACCEPT 2>/dev/null
-+  iptables "$c" FORWARD -i "$vif" "$@" -j ACCEPT 2>/dev/null &&
-+  iptables "$c" FORWARD -m state --state RELATED,ESTABLISHED \
-+    -o "$vif" -j ACCEPT 2>/dev/null
- 
-   if [ "$command" == "online" -a $? -ne 0 ]
-   then
 --- xen-4.0.1/docs/misc/network_setup.txt.orig	2010-08-25 11:22:07.000000000 +0100
 +++ xen-4.0.1/docs/misc/network_setup.txt	2011-01-27 22:13:30.000000000 +0000
 @@ -30,7 +30,7 @@
diff --git a/sources b/sources
index 5a08d64..c8d7298 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4  newlib-1.16.0.tar.gz
 36cc57650cffda9a0269493be2a169bb  lwip-1.3.0.tar.gz
 cec05e7785497c5e19da2f114b934ffd  pciutils-2.2.9.tar.bz2
 debc62758716a169df9f62e6ab2bc634  zlib-1.2.3.tar.gz
-d197afad975ab2396a67323d57388c27  xen-4.0.1.tar.gz
+199e1574e90dc1ad3388af9c29e83bee  xen-4.0.2.tar.gz
diff --git a/xen.spec b/xen.spec
index ee1521b..2b875fe 100644
--- a/xen.spec
+++ b/xen.spec
@@ -5,8 +5,8 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 4.0.1
-Release: 11%{?dist}
+Version: 4.0.2
+Release: 1%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -38,16 +38,11 @@ Patch5: xen-net-disable-iptables-on-bridge.patch
 Patch10: xen-no-werror.patch
 
 Patch18: localgcc45fix.patch
-Patch19: localpy27fixes.patch
 Patch20: localgcc451fix.patch
-Patch21: xen.irq.fixes.patch
-Patch22: xen.xsave.disable.patch
 Patch23: grub-ext4-support.patch
-Patch24: xen.8259afix.patch
 Patch25: localcleanups.patch
 Patch26: localgcc46fix.patch
 Patch27: libpermfixes.patch
-Patch29: cve-2011-1583-4.0.patch
 Patch30: gfxpassthrufix.patch
 
 Patch100: xen-configure-xend.patch
@@ -172,15 +167,10 @@ to build the xen packages.
 %patch10 -p1
 
 %patch18 -p1
-%patch19 -p1
 %patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch24 -p1
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%patch29 -p1
 %patch30 -p1
 
 %patch100 -p1
@@ -409,6 +399,7 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rc.d/init.d/blktapctrl
 %{_sysconfdir}/rc.d/init.d/xenstored
 %{_sysconfdir}/rc.d/init.d/xenconsoled
+%{_sysconfdir}/rc.d/init.d/xencommons
 %{_sysconfdir}/bash_completion.d/xl.sh
 
 %config(noreplace) %{_sysconfdir}/sysconfig/xenstored
@@ -537,6 +528,12 @@ rm -rf %{buildroot}
 %doc licensedir/*
 
 %changelog
+* Wed Jun 15 2011 Michael Young <m.a.young at durham.ac.uk> - 4.0.2-1
+- update to 4.0.2
+  remove upstream patches localpy27fixes.patch xen.irq.fixes.patch
+  xen.xsave.disable.patch xen.8259afix.patch cve-2011-1583-4.0.patch
+  rebase localcleanups.patch
+
 * Tue May 10 2011 Michael Young <m.a.young at durham.ac.uk> - 4.0.1-11
 - Overflows in kernel decompression can allow root on xen PV guest to gain
   privileged access to base domain, or access to xen configuration info.