Attachment 291474 Details for Bug 428231 – Neccessary specfil changes

[patch] Neccessary specfil changes

xen.spec-pvfb.patch (text/plain), 3.87 KB, created by Daniel Berrangé on 2008-01-12 19:17:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2008-01-12 19:17:35 UTC

Size: 3.87 KB

patch

obsolete

>Index: xen.spec
>===================================================================
>RCS file: /cvs/dist/rpms/xen/RHEL-5/xen.spec,v
>retrieving revision 1.227
>diff -u -r1.227 xen.spec
>--- xen.spec	11 Jan 2008 14:38:58 -0000	1.227
>+++ xen.spec	12 Jan 2008 19:16:58 -0000
>@@ -3,13 +3,12 @@
> Summary: Xen is a virtual machine monitor
> Name:    xen
> Version: 3.0.3
>-Release: 44%{?dist}
>+Release: 44%{?dist}.2dan
> Group:   Development/Libraries
> License: GPLv2+, LGPLv2+
> URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
> Source0: http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/xen-3.1.0-src.tgz
> Source1: http://bits.xensource.com/oss-xen/release/3.0.3-0/src.tgz/xen-3.0.3_0-src.tgz
>-Source2: http://download.sf.net/libvncserver/LibVNCServer-0.8.2.tar.gz
> Source3: xen.sysconfig
> Patch1: xen-initscript.patch
> Patch3: xen-compile-fixes.patch
>@@ -94,14 +93,6 @@
> Patch253: pygrub-dont-exec.patch
> Patch254: pygrub-liloconf.patch
> 
>-# libVNCserver patches
>-Patch300: vnc-thread-fixes.patch
>-Patch301: vnc-invalid-fd.patch
>-Patch302: vnc-ref-counting.patch
>-Patch303: vnc-client-iterator.patch
>-Patch304: vnc-double-cleanup.patch
>-Patch305: vnc-unaligned-access-fix.patch
>-
> # Patches to deal with stuff from the 3.1.0 backport
> # Remove xm i18n from build process
> Patch500: xen-3.1.0-kill-i18n.patch
>@@ -140,6 +131,16 @@
> # CVE-2007-1321
> Patch600: xen-qemu-ne2000-CVE-2007-1321.patch
> 
>+# New VNC TLS support & replacement password support - obsoletes some
>+# of previous 3 patches
>+Patch700: xen-pvfb-01-qemu-fv-machine.patch
>+Patch701: xen-pvfb-02-qemu-pv-machine.patch
>+Patch702: xen-qemu-vnc-revert-password.patch
>+Patch703: xen-qemu-iohandler-delete.patch
>+Patch704: xen-qemu-vnc-authentication.patch
>+Patch705: xen-qemu-vnc-x509-certs.patch
>+Patch706: xen-pvfb-compat-qemu.patch
>+
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
> BuildRequires: libX11-devel python-devel ghostscript tetex-latex 
>@@ -204,7 +205,7 @@
> virtual machines. 
> 
> %prep
>-%setup -q -n xen-3.1.0-src -a 1 -a 2
>+%setup -q -n xen-3.1.0-src -a 1
> 
> # Retrofit original 3.0.3 XenD & XM tool
> for i in sv util web xend xm
>@@ -347,17 +348,6 @@
> %patch253 -p1
> %patch254 -p1
> 
>-# libVNCserver patches
>-pushd LibVNCServer-0.8.2
>-# thread locking fixes
>-%patch300 -p2
>-%patch301 -p2
>-%patch302 -p2
>-%patch303 -p2
>-%patch304 -p2
>-%patch305 -p2
>-popd
>-
> # Patches to deal with stuff from the 3.1.0 backport
> # Remove xm i18n from build process
> %patch500 -p1
>@@ -396,25 +386,36 @@
> # CVE patches
> %patch600 -p1
> 
>+#Backport of new VNC auth from Xen 3.2.0
>+
>+# Create a QEMU fv machine type
>+%patch700 -p1
>+# Create a QEMU pv machine type
>+%patch701 -p1
>+# Revert existing QEMU VNC password code
>+%patch702 -p1
>+# Fix a QEMU event loop bug
>+%patch703 -p1
>+# Add QEMU VNC password + TLS auth
>+%patch704 -p1
>+# Add XenD config for x509 certs
>+%patch705 -p1
>+# Add compat FB support to QEMU
>+%patch706 -p1
>+
> %build
> # libvncserver first
>-pushd LibVNCServer-0.8.2
>-%configure
>-make -C libvncserver
>-vncdir=`pwd`
>-popd
>-sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/xenfb/Makefile
> cat > tools/check/check_libvncserver <<EOF
> #!/bin/sh
> exit 0
> EOF
> chmod +x tools/check/check_libvncserver
> 
>-CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
>+CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=n XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
> 
> %install
> rm -rf %{buildroot}
>-make XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-tools install-docs
>+make XENFB_TOOLS=n XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} prefix=/usr install-tools install-docs
> mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/domain
> mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/vnet
> mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/xend-db/migrate

Actions: View | Diff

Attachments on bug 428231: 291430 | 291431 | 291432 | 291433 | 291434 | 291435 | 291473 | 291474