[xen] update to xen-4.2.1

[myoung]

commit a4a0b81264ce302571ee8226882d8e48420dc048
Author: Michael Young <m.a.young at durham.ac.uk>
Date:   Tue Dec 18 20:45:04 2012 +0000

    update to xen-4.2.1

 .gitignore                                         |    2 +-
 sources                                            |    2 +-
 xen.fedora.efi.build.patch                         |    2 +-
 ...-fdd0127ae221c1d7da709a7a5b2321fd7c239652.patch |  377 --------------------
 xen.spec                                           |   31 +--
 xsa20.patch                                        |   38 --
 xsa22-4.2-unstable.patch                           |   40 --
 xsa23-4.2-unstable.patch                           |   32 --
 xsa24.patch                                        |   26 --
 xsa26-4.2.patch                                    |  105 ------
 xsa27-4.2.patch                                    |  136 -------
 xsa29-4.2-unstable.patch                           |   49 ---
 xsa30-4.2.patch                                    |   56 ---
 xsa31-4.2-unstable.patch                           |   50 ---
 xsa32-4.2.patch                                    |   22 --
 15 files changed, 10 insertions(+), 958 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2eff48a..5ba7366 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.2.0.tar.gz
+/xen-4.2.1.tar.gz
diff --git a/sources b/sources
index e16cb6f..dafd12c 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
-f4f217969afc38f09251039966d91a87  xen-4.2.0.tar.gz
+0d48cbe1767b82aba12517898d4e0408  xen-4.2.1.tar.gz
diff --git a/xen.fedora.efi.build.patch b/xen.fedora.efi.build.patch
index 1a66098..1f5e402 100644
--- a/xen.fedora.efi.build.patch
+++ b/xen.fedora.efi.build.patch
@@ -27,7 +27,7 @@
 @@ -6,7 +6,7 @@
  
  efi := $(filter y,$(x86_64)$(shell rm -f disabled))
- efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y),$(CFLAGS)) -c check.c 2>disabled && echo y))
+ efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c check.c 2>disabled && echo y))
 -efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
 +efi := $(if $(efi),$(shell $(LD_EFI) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
  efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o)))
diff --git a/xen.spec b/xen.spec
index aa858e2..859af1b 100644
--- a/xen.spec
+++ b/xen.spec
@@ -26,8 +26,8 @@
 
 Summary: Xen is a virtual machine monitor
 Name:    xen
-Version: 4.2.0
-Release: 7%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -73,19 +73,8 @@ Patch46: xen.use.fedora.seabios.patch
 Patch47: xen.use.fedora.ipxe.patch
 Patch48: qemu-xen.tradonly.patch
 Patch49: xen.fedora.efi.build.patch
-Patch50: xen.git-fdd0127ae221c1d7da709a7a5b2321fd7c239652.patch
-Patch51: xsa20.patch
-Patch52: xsa22-4.2-unstable.patch
-Patch53: xsa23-4.2-unstable.patch
-Patch54: xsa24.patch
 Patch55: qemu-xen.trad.buildfix.patch
 Patch56: xen.fedora19.buildfix.patch
-Patch57: xsa26-4.2.patch
-Patch58: xsa27-4.2.patch
-Patch59: xsa29-4.2-unstable.patch
-Patch60: xsa30-4.2.patch
-Patch61: xsa31-4.2-unstable.patch
-Patch62: xsa32-4.2.patch
 
 Patch100: xen-configure-xend.patch
 
@@ -249,19 +238,8 @@ manage Xen virtual machines.
 %patch47 -p1
 %patch48 -p1
 %patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
 %patch55 -p1
 %patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
 
 %patch100 -p1
 
@@ -751,6 +729,11 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Dec 18 2012 Michael Young <m.a.young at durham.ac.uk> - 4.2.1-1
+- update to xen-4.2.1
+- remove patches that are included in 4.2.1
+- rebase xen.fedora.efi.build.patch
+
 * Thu Dec 13 2012 Richard W.M. Jones <rjones at redhat.com> - 4.2.0-7
 - Rebuild for OCaml fix (RHBZ#877128).