sync with dfa59dade20b7bd14fff98536750be50

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=137

xen.spec

@@ -26,6 +26,13 @@ ExclusiveArch:  %ix86 x86_64
 %define xen_build_dir xen-4.1.1-testing
 %define with_kmp 1
 %define with_stubdom 1
+# EFI requires gcc46 or newer
+# its available in 12.1 or >= sles11sp2
+%if %suse_version > 1140 || %suse_version == 1110
+%define with_gcc46 1
+%else
+%define with_gcc46 0
+%endif
 %ifarch x86_64
 %define with_dom0_support 1
 %else
@@ -72,9 +79,10 @@ BuildRequires:  te_latex
 BuildRequires:  tetex
 %endif
 %ifarch x86_64
-# EFI requires gcc45 or newer
+%if %{?with_gcc46}0
 BuildRequires:  gcc46
 BuildRequires:  libgcc46 libgcc46-32bit
+%endif
 BuildRequires:  glibc-32bit glibc-devel-32bit
 BuildRequires:  gcc-32bit
 BuildRequires:  gcc43-32bit
@@ -88,8 +96,8 @@ BuildRequires:  glibc-devel
 %if %{?with_kmp}0
 BuildRequires:  kernel-source kernel-syms module-init-tools xorg-x11
 %endif
-Version:        4.1.1_02
-Release:        3
+Version:        4.1.1_05
+Release:        1
 License:        GPLv2+
 Group:          System/Kernel
 AutoReqProv:    on
@@ -174,10 +182,17 @@ Patch40:        23614-x86_64-EFI-boot.patch
 Patch41:        23615-x86_64-EFI-runtime.patch
 Patch42:        23616-x86_64-EFI-MPS.patch
 Patch43:        23676-x86_64-image-map-bounds.patch
-Patch44:        23706-fix-20892.patch
-Patch45:        23723-x86-CMOS-lock.patch
-Patch46:        23724-x86-smpboot-x2apic.patch
-Patch47:        23726-x86-intel-flexmigration.patch
+Patch44:        23685-libxl-segfault-fix.patch
+Patch45:        23706-fix-20892.patch
+Patch46:        23723-x86-CMOS-lock.patch
+Patch47:        23724-x86-smpboot-x2apic.patch
+Patch48:        23726-x86-intel-flexmigration.patch
+Patch49:        23732-sedf.patch
+Patch50:        23735-guest-dom0-cap.patch
+Patch51:        23746-vtd-cleanup-timers.patch
+Patch52:        23747-mmcfg-base-address.patch
+Patch53:        23749-mmcfg-reservation.patch
+Patch54:        23762-CVE-2011-3131.patch
 # Upstream qemu patches
 # Our patches
 Patch300:       xen-config.diff
@@ -223,16 +238,17 @@ Patch356:       ioemu-vnc-resize.patch
 Patch357:       ioemu-debuginfo.patch
 Patch358:       vif-bridge-no-iptables.patch
 Patch359:       xenconsole-no-multiple-connections.patch
+Patch360:       disable-xl-when-using-xend.patch
 # Needs to go upstream
-Patch360:       checkpoint-rename.patch
-Patch361:       xm-save-check-file.patch
-Patch362:       xm-create-xflag.patch
-Patch370:       xend-sysconfig.patch
-Patch371:       domu-usb-controller.patch
-Patch372:       usb-list.patch
-Patch373:       xend-devid-or-name.patch
-Patch374:       suspend_evtchn_lock.patch
-Patch375:       log-guest-console.patch
+Patch370:       checkpoint-rename.patch
+Patch371:       xm-save-check-file.patch
+Patch372:       xm-create-xflag.patch
+Patch373:       xend-sysconfig.patch
+Patch374:       domu-usb-controller.patch
+Patch375:       usb-list.patch
+Patch376:       xend-devid-or-name.patch
+Patch377:       suspend_evtchn_lock.patch
+Patch378:       log-guest-console.patch
 # Patches for snapshot support
 Patch400:       snapshot-ioemu-save.patch
 Patch401:       snapshot-ioemu-restore.patch
@@ -276,6 +292,8 @@ Patch450:       ioemu-watchdog-support.patch
 Patch451:       ioemu-watchdog-linkage.patch
 Patch452:       ioemu-watchdog-ib700-timer.patch
 Patch453:       tools-watchdog-support.patch
+Patch454:       xend-console-port-restore.patch
+Patch455:       xencommons-proc-xen.patch
 # Jim's domain lock patch
 Patch480:       xend-domain-lock.patch
 Patch481:       xend-domain-lock-sfex.patch
@@ -710,6 +728,13 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch45 -p1
 %patch46 -p1
 %patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
 %patch300 -p1
 %patch301 -p1
 %patch302 -p1
@@ -754,14 +779,15 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch358 -p1
 %patch359 -p1
 %patch360 -p1
-%patch361 -p1
-%patch362 -p1
 %patch370 -p1
 %patch371 -p1
 %patch372 -p1
 %patch373 -p1
-#%patch374 -p1 suspend_evtchn_lock, buildservice build problem
+%patch374 -p1
 %patch375 -p1
+%patch376 -p1
+#%patch377 -p1 suspend_evtchn_lock, buildservice build problem
+%patch378 -p1
 %patch400 -p1
 %patch401 -p1
 %patch402 -p1
@@ -802,6 +828,8 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch451 -p1
 %patch452 -p1
 %patch453 -p1
+%patch454 -p1
+%patch455 -p1
 %patch480 -p1
 %patch481 -p1
 %patch500 -p1
@@ -928,6 +956,12 @@ make -C tools/misc/serial-split install \
 mkdir -p $RPM_BUILD_ROOT/${_libdir}/xen/bin/
 ln -s /usr/lib/xen/bin/qemu-dm $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm
 %endif
+# efi depends on gcc46
+echo > xen.files.txt
+if test -d $RPM_BUILD_ROOT%{_libdir}/efi
+then
+	echo %{_libdir}/efi >> xen.files.txt
+fi
 cp -avL xenalyze.hg/dump-raw $RPM_BUILD_ROOT/%{_bindir}/xenalyze.dump-raw
 cp -avL xenalyze.hg/xenalyze $RPM_BUILD_ROOT/%{_bindir}
 %else
@@ -1072,7 +1106,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 
 %if %{?with_dom0_support}0
 
-%files
+%files -f xen.files.txt
 %defattr(-,root,root)
 /boot/xen-%{version}-%{release}.gz
 /boot/xen-%{xvermaj}.gz
@@ -1086,11 +1120,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 /boot/xen-syms-dbg
 /boot/xen-syms-dbg-%{version}-%{release}
 /boot/xen.gz
-# EFI
-%ifarch x86_64
-%dir %{_libdir}/efi
-%{_libdir}/efi/xen*.efi
-%endif
 %endif
 
 %files libs