rpms/xen/devel .cvsignore, 1.34, 1.35 sources, 1.48, 1.49 xen-pvfb-01-qemu-fv-machine.patch, 1.1, 1.2 xen-pvfb-02-qemu-pv-machine.patch, 1.2, 1.3 xen-pvfb-03-xenfb-remove.patch, 1.1, 1.2 xen-pvfb-04-compat.patch, 1.4, 1.5 xen-qemu-vnc-authentication.patch, 1.3, 1.4 xen-qemu-vnc-revert-password.patch, 1.1, 1.2 xen-qemu-vnc-x509-certs.patch, 1.1, 1.2 xen-xs-transactions.patch, 1.1, 1.2 xen.spec, 1.196, 1.197 pygrub-dont-exec.patch, 1.1, NONE xen-3.1.0-dev-native-protocol.patch, 1.1, NONE xen-3.1.0-libxc-native-protocol.patch, 1.1, NONE xen-baked-tmpfile.patch, 1.1, NONE xen-blktap-error-returns.patch, 1.2, NONE xen-clobber-vif-type.patch, 1.1, NONE xen-keyboard.patch, 1.1, NONE xen-qemu-ne2000-CVE-2007-1321.patch, 1.1, NONE xen-qemu-rtl8139-checksum.patch, 1.1, NONE xen-qemu-vnc-delete.patch, 1.1, NONE xen-remove-python-path-check.patch, 1.1, NONE xen-start-fail-cleanup.patch, 1.1, NONE xen-tpm-functions.patch, 1.1, NONE xen-vmxassist-irqs.patch, 1.1, NONE
Daniel P. Berrange (berrange)
fedora-extras-commits at redhat.com
Sat Dec 1 22:08:28 UTC 2007
- Previous message (by thread): rpms/xen/F-8 .cvsignore, 1.34, 1.35 sources, 1.48, 1.49 xen-pvfb-01-qemu-fv-machine.patch, 1.1, 1.2 xen-pvfb-02-qemu-pv-machine.patch, 1.2, 1.3 xen-pvfb-03-xenfb-remove.patch, 1.1, 1.2 xen-pvfb-04-compat.patch, 1.4, 1.5 xen-qemu-vnc-authentication.patch, 1.3, 1.4 xen-qemu-vnc-revert-password.patch, 1.1, 1.2 xen-qemu-vnc-x509-certs.patch, 1.1, 1.2 xen-xs-transactions.patch, 1.1, 1.2 xen.spec, 1.195, 1.196 pygrub-dont-exec.patch, 1.1, NONE xen-3.1.0-dev-native-protocol.patch, 1.1, NONE xen-3.1.0-libxc-native-protocol.patch, 1.1, NONE xen-baked-tmpfile.patch, 1.1, NONE xen-blktap-error-returns.patch, 1.2, NONE xen-clobber-vif-type.patch, 1.1, NONE xen-keyboard.patch, 1.1, NONE xen-qemu-ne2000-CVE-2007-1321.patch, 1.1, NONE xen-qemu-rtl8139-checksum.patch, 1.1, NONE xen-qemu-vnc-delete.patch, 1.1, NONE xen-remove-python-path-check.patch, 1.1, NONE xen-start-fail-cleanup.patch, 1.1, NONE xen-tpm-functions.patch, 1.1, NONE xen-vmxassist-irqs.patch, 1.1, NONE
- Next message (by thread): rpms/xen/devel xen-xs-transactions.patch,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: berrange
Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32395
Modified Files:
.cvsignore sources xen-pvfb-01-qemu-fv-machine.patch
xen-pvfb-02-qemu-pv-machine.patch
xen-pvfb-03-xenfb-remove.patch xen-pvfb-04-compat.patch
xen-qemu-vnc-authentication.patch
xen-qemu-vnc-revert-password.patch
xen-qemu-vnc-x509-certs.patch xen-xs-transactions.patch
xen.spec
Removed Files:
pygrub-dont-exec.patch xen-3.1.0-dev-native-protocol.patch
xen-3.1.0-libxc-native-protocol.patch xen-baked-tmpfile.patch
xen-blktap-error-returns.patch xen-clobber-vif-type.patch
xen-keyboard.patch xen-qemu-ne2000-CVE-2007-1321.patch
xen-qemu-rtl8139-checksum.patch xen-qemu-vnc-delete.patch
xen-remove-python-path-check.patch
xen-start-fail-cleanup.patch xen-tpm-functions.patch
xen-vmxassist-irqs.patch
Log Message:
Upgrade to Xen 3.1.2 bugfix release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 24 Sep 2007 20:03:10 -0000 1.34
+++ .cvsignore 1 Dec 2007 22:07:49 -0000 1.35
@@ -1,3 +1,3 @@
-xen-3.1.0-src.tgz
*.rpm
.build*.log
+xen-*-src*
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources 28 Aug 2007 21:49:31 -0000 1.48
+++ sources 1 Dec 2007 22:07:49 -0000 1.49
@@ -1 +1 @@
-b7ae1f652b071862ae4c90b72d549627 xen-3.1.0-src.tgz
+14a7d4220ec5f4fc4fcecb7feb548f76 xen-3.1.2-src.tgz
xen-pvfb-01-qemu-fv-machine.patch:
Index: xen-pvfb-01-qemu-fv-machine.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-01-qemu-fv-machine.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-01-qemu-fv-machine.patch 28 Aug 2007 21:50:58 -0000 1.1
+++ xen-pvfb-01-qemu-fv-machine.patch 1 Dec 2007 22:07:49 -0000 1.2
@@ -1,6 +1,6 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_fv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_fv.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_fv.c 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_fv.c 2007-08-23 10:42:55.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/xen_machine_fv.c xen-3.1.2-src.new/tools/ioemu/hw/xen_machine_fv.c
+--- xen-3.1.2-src.orig/tools/ioemu/hw/xen_machine_fv.c 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/xen_machine_fv.c 2007-12-01 14:47:49.000000000 -0500
@@ -0,0 +1,286 @@
+/*
+ * QEMU Xen FV Machine
@@ -288,9 +288,9 @@
+ * tab-width: 4
+ * End:
+ */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-08-23 10:42:55.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/Makefile.target xen-3.1.2-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.2-src.orig/tools/ioemu/Makefile.target 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/Makefile.target 2007-12-01 14:47:49.000000000 -0500
@@ -369,6 +369,7 @@ VL_OBJS+= usb-uhci.o
VL_OBJS+= piix4acpi.o
VL_OBJS+= xenstore.o
@@ -299,9 +299,9 @@
VL_OBJS+= tpm_tis.o
DEFINES += -DHAS_AUDIO
endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
---- xen-3.1.0-src.orig/tools/ioemu/vl.c 2007-08-23 10:41:10.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.c 2007-08-23 10:45:27.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.c xen-3.1.2-src.new/tools/ioemu/vl.c
+--- xen-3.1.2-src.orig/tools/ioemu/vl.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.c 2007-12-01 14:47:49.000000000 -0500
@@ -88,7 +88,6 @@
#include "exec-all.h"
@@ -310,7 +310,7 @@
#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
#define DEFAULT_BRIDGE "xenbr0"
-@@ -5694,8 +5693,12 @@ static void read_passwords(void)
+@@ -5696,8 +5695,12 @@ static void read_passwords(void)
void register_machines(void)
{
#if defined(TARGET_I386)
@@ -323,7 +323,7 @@
#elif defined(TARGET_PPC)
qemu_register_machine(&heathrow_machine);
qemu_register_machine(&core99_machine);
-@@ -5910,156 +5913,6 @@ void suspend(int sig)
+@@ -5912,156 +5915,6 @@ void suspend(int sig)
suspend_requested = 1;
}
@@ -480,7 +480,7 @@
int main(int argc, char **argv)
{
-@@ -6094,14 +5947,6 @@ int main(int argc, char **argv)
+@@ -6096,14 +5949,6 @@ int main(int argc, char **argv)
QEMUMachine *machine;
char usb_devices[MAX_USB_CMDLINE][128];
int usb_devices_index;
@@ -495,7 +495,7 @@
char qemu_dm_logfilename[64];
-@@ -6586,6 +6431,7 @@ int main(int argc, char **argv)
+@@ -6583,6 +6428,7 @@ int main(int argc, char **argv)
#ifdef CONFIG_DM
bdrv_init();
@@ -503,7 +503,7 @@
xenstore_parse_domain_config(domid);
#endif /* CONFIG_DM */
-@@ -6639,99 +6485,17 @@ int main(int argc, char **argv)
+@@ -6636,99 +6482,17 @@ int main(int argc, char **argv)
exit(1);
}
@@ -604,10 +604,10 @@
/* we always create the cdrom drive, even if no disk is there */
bdrv_init();
if (cdrom_index >= 0) {
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
---- xen-3.1.0-src.orig/tools/ioemu/vl.h 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.h 2007-08-23 10:42:55.000000000 -0400
-@@ -966,6 +966,9 @@ extern void pci_piix4_acpi_init(PCIBus *
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.h xen-3.1.2-src.new/tools/ioemu/vl.h
+--- xen-3.1.2-src.orig/tools/ioemu/vl.h 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.h 2007-12-01 14:47:49.000000000 -0500
+@@ -965,6 +965,9 @@ extern void pci_piix4_acpi_init(PCIBus *
/* pc.c */
extern QEMUMachine pc_machine;
extern QEMUMachine isapc_machine;
xen-pvfb-02-qemu-pv-machine.patch:
Index: xen-pvfb-02-qemu-pv-machine.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-02-qemu-pv-machine.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xen-pvfb-02-qemu-pv-machine.patch 24 Sep 2007 20:01:25 -0000 1.2
+++ xen-pvfb-02-qemu-pv-machine.patch 1 Dec 2007 22:07:49 -0000 1.3
@@ -1,6 +1,6 @@
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c 2007-09-24 13:22:06.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.2-src.new/tools/ioemu/hw/xen_machine_pv.c
+--- xen-3.1.2-src.orig/tools/ioemu/hw/xen_machine_pv.c 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/xen_machine_pv.c 2007-12-01 14:49:01.000000000 -0500
@@ -0,0 +1,231 @@
+/*
+ * QEMU Xen PV Machine
@@ -233,9 +233,9 @@
+ * tab-width: 4
+ * End:
+ */
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-09-24 13:21:38.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-09-24 13:22:06.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/Makefile.target xen-3.1.2-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.2-src.orig/tools/ioemu/Makefile.target 2007-12-01 14:48:49.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/Makefile.target 2007-12-01 14:49:01.000000000 -0500
@@ -370,6 +370,8 @@ VL_OBJS+= piix4acpi.o
VL_OBJS+= xenstore.o
VL_OBJS+= xen_platform.o
@@ -245,10 +245,10 @@
VL_OBJS+= tpm_tis.o
DEFINES += -DHAS_AUDIO
endif
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c
---- xen-3.1.0-src.orig/tools/ioemu/target-i386-dm/helper2.c 2007-09-24 13:21:38.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/target-i386-dm/helper2.c 2007-09-24 13:22:06.000000000 -0400
-@@ -614,14 +614,15 @@ int main_loop(void)
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/target-i386-dm/helper2.c xen-3.1.2-src.new/tools/ioemu/target-i386-dm/helper2.c
+--- xen-3.1.2-src.orig/tools/ioemu/target-i386-dm/helper2.c 2007-12-01 14:47:23.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/target-i386-dm/helper2.c 2007-12-01 14:49:01.000000000 -0500
+@@ -616,14 +616,15 @@ int main_loop(void)
extern int shutdown_requested;
extern int suspend_requested;
CPUState *env = cpu_single_env;
@@ -266,9 +266,9 @@
while (!(vm_running && suspend_requested))
/* Wait up to 10 msec. */
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
---- xen-3.1.0-src.orig/tools/ioemu/vl.c 2007-09-24 13:21:38.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.c 2007-09-24 13:22:06.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.c xen-3.1.2-src.new/tools/ioemu/vl.c
+--- xen-3.1.2-src.orig/tools/ioemu/vl.c 2007-12-01 14:48:49.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.c 2007-12-01 14:49:01.000000000 -0500
@@ -168,7 +168,7 @@ int xc_handle;
time_t timeoffset = 0;
@@ -278,7 +278,7 @@
extern int domid;
char vncpasswd[64];
-@@ -5698,6 +5698,7 @@ void register_machines(void)
+@@ -5700,6 +5700,7 @@ void register_machines(void)
qemu_register_machine(&isapc_machine);
#else
qemu_register_machine(&xenfv_machine);
@@ -286,7 +286,7 @@
#endif
#elif defined(TARGET_PPC)
qemu_register_machine(&heathrow_machine);
-@@ -6398,7 +6399,8 @@ int main(int argc, char **argv)
+@@ -6395,7 +6396,8 @@ int main(int argc, char **argv)
acpi_enabled = 0;
break;
case QEMU_OPTION_domainname:
@@ -296,10 +296,10 @@
break;
case QEMU_OPTION_d:
domid = atoi(optarg);
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
---- xen-3.1.0-src.orig/tools/ioemu/vl.h 2007-09-24 13:21:38.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.h 2007-09-24 13:22:06.000000000 -0400
-@@ -968,6 +968,7 @@ extern QEMUMachine pc_machine;
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.h xen-3.1.2-src.new/tools/ioemu/vl.h
+--- xen-3.1.2-src.orig/tools/ioemu/vl.h 2007-12-01 14:48:49.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.h 2007-12-01 14:49:01.000000000 -0500
+@@ -967,6 +967,7 @@ extern QEMUMachine pc_machine;
extern QEMUMachine isapc_machine;
#ifdef CONFIG_DM
extern QEMUMachine xenfv_machine;
@@ -307,9 +307,9 @@
#endif
extern int fd_bootchk;
-diff -ruNp xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py 2007-09-24 13:22:54.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.2-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/server/vfbif.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/server/vfbif.py 2007-12-01 14:51:55.000000000 -0500
@@ -6,6 +6,7 @@ import xen.xend
import os
@@ -331,7 +331,7 @@
t = config.get("type", None)
if t == "vnc":
passwd = None
-@@ -65,26 +68,24 @@ class VfbifController(DevController):
+@@ -65,15 +68,14 @@ class VfbifController(DevController):
else:
log.debug("No VNC passwd configured for vfb access")
@@ -353,12 +353,17 @@
+
if config.has_key("keymap"):
args += ["-k", "%s" % config["keymap"]]
+ else:
+@@ -81,7 +83,7 @@ class VfbifController(DevController):
+ if xoptions.get_keymap():
+ args += ["-k", "%s" % xoptions.get_keymap()]
+
- spawn_detached(args[0], args + std_args, os.environ)
+ spawn_detached(args[0], args, os.environ)
elif t == "sdl":
-- args = [xen.util.auxbin.pathTo("xen-sdlfb")]
+ args = [xen.util.auxbin.pathTo("xen-sdlfb")]
env = dict(os.environ)
- if config.has_key("display"):
+@@ -89,7 +91,7 @@ class VfbifController(DevController):
env['DISPLAY'] = config["display"]
if config.has_key("xauthority"):
env['XAUTHORITY'] = config["xauthority"]
@@ -367,9 +372,9 @@
else:
raise VmError('Unknown vfb type %s (%s)' % (t, repr(config)))
-diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
---- xen-3.1.0-src.orig/tools/xenfb/xenfb.c 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.c 2007-09-24 13:22:06.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/xenfb/xenfb.c xen-3.1.2-src.new/tools/xenfb/xenfb.c
+--- xen-3.1.2-src.orig/tools/xenfb/xenfb.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/xenfb/xenfb.c 2007-12-01 14:49:01.000000000 -0500
@@ -677,37 +677,58 @@ static int xenfb_on_state_change(struct
return 0;
}
@@ -479,9 +484,9 @@
+ * tab-width: 8
+ * End:
+ */
-diff -ruNp xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
---- xen-3.1.0-src.orig/tools/xenfb/xenfb.h 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.h 2007-09-24 13:22:06.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/xenfb/xenfb.h xen-3.1.2-src.new/tools/xenfb/xenfb.h
+--- xen-3.1.2-src.orig/tools/xenfb/xenfb.h 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/xenfb/xenfb.h 2007-12-01 14:49:01.000000000 -0500
@@ -25,8 +25,12 @@ void xenfb_teardown(struct xenfb *xenfb)
int xenfb_attach_dom(struct xenfb *xenfb, int domid);
xen-pvfb-03-xenfb-remove.patch:
Index: xen-pvfb-03-xenfb-remove.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-03-xenfb-remove.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-pvfb-03-xenfb-remove.patch 28 Aug 2007 21:50:58 -0000 1.1
+++ xen-pvfb-03-xenfb-remove.patch 1 Dec 2007 22:07:49 -0000 1.2
@@ -1,7 +1,7 @@
-diff -rupN xen-3.1.0-src.orig/Config.mk xen-3.1.0-src.new/Config.mk
---- xen-3.1.0-src.orig/Config.mk 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/Config.mk 2007-08-23 11:05:41.000000000 -0400
-@@ -90,7 +90,6 @@ ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_
+diff -rupN xen-3.1.2-src.orig/Config.mk xen-3.1.2-src.new/Config.mk
+--- xen-3.1.2-src.orig/Config.mk 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/Config.mk 2007-12-01 14:53:57.000000000 -0500
+@@ -96,7 +96,6 @@ ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n
LIBXENAPI_BINDINGS ?= n
@@ -9,9 +9,9 @@
PYTHON_TOOLS ?= y
-include $(XEN_ROOT)/.config
-diff -rupN xen-3.1.0-src.orig/tools/check/check_libvncserver xen-3.1.0-src.new/tools/check/check_libvncserver
---- xen-3.1.0-src.orig/tools/check/check_libvncserver 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/check/check_libvncserver 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/check/check_libvncserver xen-3.1.2-src.new/tools/check/check_libvncserver
+--- xen-3.1.2-src.orig/tools/check/check_libvncserver 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/check/check_libvncserver 1969-12-31 19:00:00.000000000 -0500
@@ -1,27 +0,0 @@
-#!/bin/sh
-# CHECK-BUILD CHECK-INSTALL
@@ -40,9 +40,9 @@
-fi
-
-exit $RC
-diff -rupN xen-3.1.0-src.orig/tools/check/check_sdl xen-3.1.0-src.new/tools/check/check_sdl
---- xen-3.1.0-src.orig/tools/check/check_sdl 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/check/check_sdl 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/check/check_sdl xen-3.1.2-src.new/tools/check/check_sdl
+--- xen-3.1.2-src.orig/tools/check/check_sdl 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/check/check_sdl 1969-12-31 19:00:00.000000000 -0500
@@ -1,27 +0,0 @@
-#!/bin/sh
-# CHECK-BUILD CHECK-INSTALL
@@ -71,9 +71,9 @@
-fi
-
-exit $RC
-diff -rupN xen-3.1.0-src.orig/tools/check/Makefile xen-3.1.0-src.new/tools/check/Makefile
---- xen-3.1.0-src.orig/tools/check/Makefile 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/check/Makefile 2007-08-23 11:06:47.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/check/Makefile xen-3.1.2-src.new/tools/check/Makefile
+--- xen-3.1.2-src.orig/tools/check/Makefile 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/check/Makefile 2007-12-01 14:53:57.000000000 -0500
@@ -7,7 +7,7 @@ all: build
# Check this machine is OK for building on.
.PHONY: build
@@ -92,9 +92,9 @@
.PHONY: clean
clean:
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c 2007-08-23 11:05:47.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.2-src.new/tools/ioemu/hw/xenfb.c
+--- xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.c 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/xenfb.c 2007-12-01 14:53:57.000000000 -0500
@@ -0,0 +1,825 @@
+#include <stdarg.h>
+#include <stdlib.h>
@@ -921,9 +921,9 @@
+ * tab-width: 8
+ * End:
+ */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h 2007-08-23 11:05:47.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.2-src.new/tools/ioemu/hw/xenfb.h
+--- xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.h 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/xenfb.h 2007-12-01 14:53:57.000000000 -0500
@@ -0,0 +1,39 @@
+#ifndef _XENFB_H_
+#define _XENFB_H_
@@ -964,9 +964,9 @@
+int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
+
+#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xen_machine_pv.c 2007-08-23 11:05:27.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xen_machine_pv.c 2007-08-23 11:05:47.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/xen_machine_pv.c xen-3.1.2-src.new/tools/ioemu/hw/xen_machine_pv.c
+--- xen-3.1.2-src.orig/tools/ioemu/hw/xen_machine_pv.c 2007-12-01 14:53:45.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/xen_machine_pv.c 2007-12-01 14:53:57.000000000 -0500
@@ -23,7 +23,7 @@
*/
@@ -976,9 +976,9 @@
#include <linux/input.h>
/* A convenient function for munging pixels between different depths */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-08-23 11:05:27.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-08-23 11:05:47.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/Makefile.target xen-3.1.2-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.2-src.orig/tools/ioemu/Makefile.target 2007-12-01 14:53:45.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/Makefile.target 2007-12-01 14:53:57.000000000 -0500
@@ -371,7 +371,7 @@ VL_OBJS+= xenstore.o
VL_OBJS+= xen_platform.o
VL_OBJS+= xen_machine_fv.o
@@ -988,9 +988,9 @@
VL_OBJS+= tpm_tis.o
DEFINES += -DHAS_AUDIO
endif
-diff -rupN xen-3.1.0-src.orig/tools/Makefile xen-3.1.0-src.new/tools/Makefile
---- xen-3.1.0-src.orig/tools/Makefile 2007-08-23 11:05:27.000000000 -0400
-+++ xen-3.1.0-src.new/tools/Makefile 2007-08-23 11:05:41.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/Makefile xen-3.1.2-src.new/tools/Makefile
+--- xen-3.1.2-src.orig/tools/Makefile 2007-12-01 14:47:23.000000000 -0500
++++ xen-3.1.2-src.new/tools/Makefile 2007-12-01 14:53:57.000000000 -0500
@@ -19,7 +19,6 @@ SUBDIRS-y += xenstat
SUBDIRS-y += libaio
SUBDIRS-y += blktap
@@ -999,9 +999,9 @@
SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
# These don't cross-compile
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/Makefile xen-3.1.0-src.new/tools/xenfb/Makefile
---- xen-3.1.0-src.orig/tools/xenfb/Makefile 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/Makefile 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/xenfb/Makefile xen-3.1.2-src.new/tools/xenfb/Makefile
+--- xen-3.1.2-src.orig/tools/xenfb/Makefile 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/xenfb/Makefile 1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
-XEN_ROOT=../..
-include $(XEN_ROOT)/tools/Rules.mk
@@ -1035,9 +1035,9 @@
-vncfb: LDLIBS += $(shell libvncserver-config --libs) -lxenctrl -lxenstore
-
-sdlfb.o xenfb.o vncfb.o: xenfb.h
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/sdlfb.c xen-3.1.0-src.new/tools/xenfb/sdlfb.c
---- xen-3.1.0-src.orig/tools/xenfb/sdlfb.c 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/sdlfb.c 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/xenfb/sdlfb.c xen-3.1.2-src.new/tools/xenfb/sdlfb.c
+--- xen-3.1.2-src.orig/tools/xenfb/sdlfb.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/xenfb/sdlfb.c 1969-12-31 19:00:00.000000000 -0500
@@ -1,342 +0,0 @@
-#include <SDL.h>
-#include <errno.h>
@@ -1381,9 +1381,9 @@
-
- return 0;
-}
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/vncfb.c xen-3.1.0-src.new/tools/xenfb/vncfb.c
---- xen-3.1.0-src.orig/tools/xenfb/vncfb.c 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/vncfb.c 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/xenfb/vncfb.c xen-3.1.2-src.new/tools/xenfb/vncfb.c
+--- xen-3.1.2-src.orig/tools/xenfb/vncfb.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/xenfb/vncfb.c 1969-12-31 19:00:00.000000000 -0500
@@ -1,422 +0,0 @@
-#define _GNU_SOURCE
-#include <errno.h>
@@ -1807,9 +1807,9 @@
-
- return 0;
-}
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.c xen-3.1.0-src.new/tools/xenfb/xenfb.c
---- xen-3.1.0-src.orig/tools/xenfb/xenfb.c 2007-08-23 11:05:27.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.c 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/xenfb/xenfb.c xen-3.1.2-src.new/tools/xenfb/xenfb.c
+--- xen-3.1.2-src.orig/tools/xenfb/xenfb.c 2007-12-01 14:53:45.000000000 -0500
++++ xen-3.1.2-src.new/tools/xenfb/xenfb.c 1969-12-31 19:00:00.000000000 -0500
@@ -1,826 +0,0 @@
-#include <stdarg.h>
-#include <stdlib.h>
@@ -2637,9 +2637,9 @@
- * tab-width: 8
- * End:
- */
-diff -rupN xen-3.1.0-src.orig/tools/xenfb/xenfb.h xen-3.1.0-src.new/tools/xenfb/xenfb.h
---- xen-3.1.0-src.orig/tools/xenfb/xenfb.h 2007-08-23 11:05:27.000000000 -0400
-+++ xen-3.1.0-src.new/tools/xenfb/xenfb.h 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/xenfb/xenfb.h xen-3.1.2-src.new/tools/xenfb/xenfb.h
+--- xen-3.1.2-src.orig/tools/xenfb/xenfb.h 2007-12-01 14:53:45.000000000 -0500
++++ xen-3.1.2-src.new/tools/xenfb/xenfb.h 1969-12-31 19:00:00.000000000 -0500
@@ -1,39 +0,0 @@
-#ifndef _XENFB_H_
-#define _XENFB_H_
xen-pvfb-04-compat.patch:
Index: xen-pvfb-04-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-pvfb-04-compat.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xen-pvfb-04-compat.patch 26 Sep 2007 15:20:15 -0000 1.4
+++ xen-pvfb-04-compat.patch 1 Dec 2007 22:07:49 -0000 1.5
@@ -1,6 +1,6 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.c 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.c 2007-09-25 00:46:38.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/oldxenfb.c xen-3.1.2-src.new/tools/ioemu/hw/oldxenfb.c
+--- xen-3.1.2-src.orig/tools/ioemu/hw/oldxenfb.c 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/oldxenfb.c 2007-12-01 14:54:46.000000000 -0500
@@ -0,0 +1,693 @@
+#include <stdarg.h>
+#include <stdlib.h>
@@ -695,9 +695,9 @@
+ xs_unwatch(xsh, p, "");
+ return ret;
+}
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenfb.h 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenfb.h 2007-09-25 00:44:17.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/oldxenfb.h xen-3.1.2-src.new/tools/ioemu/hw/oldxenfb.h
+--- xen-3.1.2-src.orig/tools/ioemu/hw/oldxenfb.h 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/oldxenfb.h 2007-12-01 14:54:46.000000000 -0500
@@ -0,0 +1,133 @@
+/*
+ * linux/include/linux/xenfb.h -- Xen virtual frame buffer device
@@ -832,9 +832,9 @@
+};
+
+#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/oldxenkbd.h 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/hw/oldxenkbd.h 2007-09-25 00:42:39.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/oldxenkbd.h xen-3.1.2-src.new/tools/ioemu/hw/oldxenkbd.h
+--- xen-3.1.2-src.orig/tools/ioemu/hw/oldxenkbd.h 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/oldxenkbd.h 2007-12-01 14:54:46.000000000 -0500
@@ -0,0 +1,92 @@
+/*
+ * linux/include/linux/xenkbd.h -- Xen virtual keyboard/mouse
@@ -928,9 +928,9 @@
+void xenkbd_resume(void);
+
+#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.c 2007-09-25 00:39:46.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.c 2007-09-25 00:42:39.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.c xen-3.1.2-src.new/tools/ioemu/hw/xenfb.c
+--- xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.c 2007-12-01 14:54:37.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/xenfb.c 2007-12-01 14:54:46.000000000 -0500
@@ -41,6 +41,7 @@ struct xenfb_private {
struct xenfb_device fb, kbd;
size_t fb_len; /* size of framebuffer */
@@ -1006,9 +1006,9 @@
memset(&event, 0, XENKBD_IN_EVENT_SIZE);
event.type = XENKBD_TYPE_POS;
event.pos.abs_x = abs_x;
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h
---- xen-3.1.0-src.orig/tools/ioemu/hw/xenfb.h 2007-09-25 00:39:46.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/hw/xenfb.h 2007-09-25 00:42:39.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.h xen-3.1.2-src.new/tools/ioemu/hw/xenfb.h
+--- xen-3.1.2-src.orig/tools/ioemu/hw/xenfb.h 2007-12-01 14:54:37.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/hw/xenfb.h 2007-12-01 14:54:46.000000000 -0500
@@ -36,4 +36,18 @@ int xenfb_send_key(struct xenfb *xenfb,
int xenfb_send_motion(struct xenfb *xenfb, int rel_x, int rel_y);
int xenfb_send_position(struct xenfb *xenfb, int abs_x, int abs_y);
@@ -1028,9 +1028,9 @@
+
+
#endif
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-09-25 00:39:46.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-09-25 00:42:39.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/Makefile.target xen-3.1.2-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.2-src.orig/tools/ioemu/Makefile.target 2007-12-01 14:54:37.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/Makefile.target 2007-12-01 14:54:46.000000000 -0500
@@ -371,7 +371,7 @@ VL_OBJS+= xenstore.o
VL_OBJS+= xen_platform.o
VL_OBJS+= xen_machine_fv.o
@@ -1040,9 +1040,9 @@
VL_OBJS+= tpm_tis.o
DEFINES += -DHAS_AUDIO
endif
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py 2007-09-25 00:39:46.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py 2007-09-25 00:42:39.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.2-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/server/vfbif.py 2007-12-01 14:53:45.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/server/vfbif.py 2007-12-01 14:54:46.000000000 -0500
@@ -50,7 +50,11 @@ class VfbifController(DevController):
if self.vm.info.is_hvm():
# is HVM, so qemu-dm will handle the vfb.
@@ -1056,10 +1056,10 @@
args = [ xen.util.auxbin.pathTo("qemu-dm"),
"-M", "xenpv",
"-d", "%d" % self.vm.getDomid(),
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/XendConfig.py 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/XendConfig.py 2007-09-25 00:42:39.000000000 -0400
-@@ -689,7 +689,7 @@ class XendConfig(dict):
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/XendConfig.py xen-3.1.2-src.new/tools/python/xen/xend/XendConfig.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/XendConfig.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/XendConfig.py 2007-12-01 14:54:46.000000000 -0500
+@@ -712,7 +712,7 @@ class XendConfig(dict):
self['vtpm_refs'] = cfg.get('vtpm_refs', [])
# coalesce hvm vnc frame buffer with vfb config
@@ -1068,7 +1068,7 @@
# add vfb device if it isn't there already
has_rfb = False
for console_uuid in self['console_refs']:
-@@ -704,7 +704,7 @@ class XendConfig(dict):
+@@ -727,7 +727,7 @@ class XendConfig(dict):
dev_config = ['vfb']
# copy VNC related params from platform config to vfb dev conf
for key in ['vncpasswd', 'vncunused', 'vncdisplay',
@@ -1077,9 +1077,9 @@
if key in self['platform']:
dev_config.append([key, self['platform'][key]])
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xm/create.py xen-3.1.0-src.new/tools/python/xen/xm/create.py
---- xen-3.1.0-src.orig/tools/python/xen/xm/create.py 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xm/create.py 2007-09-25 00:42:39.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xm/create.py xen-3.1.2-src.new/tools/python/xen/xm/create.py
+--- xen-3.1.2-src.orig/tools/python/xen/xm/create.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xm/create.py 2007-12-01 14:54:46.000000000 -0500
@@ -610,7 +610,7 @@ def configure_vfbs(config_devs, vals):
d['type'] = 'sdl'
for (k,v) in d.iteritems():
xen-qemu-vnc-authentication.patch:
Index: xen-qemu-vnc-authentication.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-authentication.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xen-qemu-vnc-authentication.patch 11 Oct 2007 00:47:59 -0000 1.3
+++ xen-qemu-vnc-authentication.patch 1 Dec 2007 22:07:49 -0000 1.4
@@ -1,6 +1,6 @@
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/configure xen-3.1.0-src.new/tools/ioemu/configure
---- xen-3.1.0-src.orig/tools/ioemu/configure 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/configure 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/configure xen-3.1.2-src.new/tools/ioemu/configure
+--- xen-3.1.2-src.orig/tools/ioemu/configure 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/configure 2007-12-01 14:57:36.000000000 -0500
@@ -85,6 +85,7 @@ alsa="no"
fmod="no"
fmod_lib=""
@@ -69,9 +69,9 @@
+fi
+
rm -f $TMPO $TMPC $TMPE $TMPS
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/d3des.c xen-3.1.0-src.new/tools/ioemu/d3des.c
---- xen-3.1.0-src.orig/tools/ioemu/d3des.c 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/d3des.c 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/d3des.c xen-3.1.2-src.new/tools/ioemu/d3des.c
+--- xen-3.1.2-src.orig/tools/ioemu/d3des.c 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/d3des.c 2007-12-01 14:57:36.000000000 -0500
@@ -0,0 +1,434 @@
+/*
+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -507,9 +507,9 @@
+ *
+ * d3des V5.0a rwo 9208.07 18:44 Graven Imagery
+ **********************************************************************/
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/d3des.h xen-3.1.0-src.new/tools/ioemu/d3des.h
---- xen-3.1.0-src.orig/tools/ioemu/d3des.h 1969-12-31 19:00:00.000000000 -0500
-+++ xen-3.1.0-src.new/tools/ioemu/d3des.h 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/d3des.h xen-3.1.2-src.new/tools/ioemu/d3des.h
+--- xen-3.1.2-src.orig/tools/ioemu/d3des.h 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/d3des.h 2007-12-01 14:57:36.000000000 -0500
@@ -0,0 +1,51 @@
+/*
+ * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -562,9 +562,9 @@
+
+/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
+ ********************************************************************/
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/Makefile.target xen-3.1.2-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.2-src.orig/tools/ioemu/Makefile.target 2007-12-01 14:58:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/Makefile.target 2007-12-01 14:57:36.000000000 -0500
@@ -347,6 +347,11 @@ SOUND_HW += fmopl.o adlib.o
endif
AUDIODRV+= wavcapture.o
@@ -595,9 +595,9 @@
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
sdlaudio.o: sdlaudio.c
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/monitor.c xen-3.1.0-src.new/tools/ioemu/monitor.c
---- xen-3.1.0-src.orig/tools/ioemu/monitor.c 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/monitor.c 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/monitor.c xen-3.1.2-src.new/tools/ioemu/monitor.c
+--- xen-3.1.2-src.orig/tools/ioemu/monitor.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/monitor.c 2007-12-01 14:57:36.000000000 -0500
@@ -343,7 +343,7 @@ void do_eject(int force, const char *fil
eject_device(bs, force);
}
@@ -638,9 +638,9 @@
static void do_screen_dump(const char *filename)
{
vga_hw_screen_dump(filename);
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/qemu_socket.h xen-3.1.0-src.new/tools/ioemu/qemu_socket.h
---- xen-3.1.0-src.orig/tools/ioemu/qemu_socket.h 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/qemu_socket.h 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/qemu_socket.h xen-3.1.2-src.new/tools/ioemu/qemu_socket.h
+--- xen-3.1.2-src.orig/tools/ioemu/qemu_socket.h 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/qemu_socket.h 2007-12-01 14:57:36.000000000 -0500
@@ -19,6 +19,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
@@ -649,9 +649,9 @@
#define socket_error() errno
#define closesocket(s) close(s)
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
---- xen-3.1.0-src.orig/tools/ioemu/vl.c 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.c 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.c xen-3.1.2-src.new/tools/ioemu/vl.c
+--- xen-3.1.2-src.orig/tools/ioemu/vl.c 2007-12-01 14:58:04.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.c 2007-12-01 14:57:36.000000000 -0500
@@ -122,7 +122,6 @@ static DisplayState display_state;
int nographic;
int vncviewer;
@@ -669,7 +669,7 @@
#if defined(TARGET_SPARC)
#define MAX_CPUS 16
#elif defined(TARGET_I386)
-@@ -5545,7 +5544,6 @@ enum {
+@@ -5547,7 +5546,6 @@ enum {
QEMU_OPTION_acpi,
QEMU_OPTION_vncviewer,
QEMU_OPTION_vncunused,
@@ -677,7 +677,7 @@
};
typedef struct QEMUOption {
-@@ -5624,7 +5622,6 @@ const QEMUOption qemu_options[] = {
+@@ -5626,7 +5624,6 @@ const QEMUOption qemu_options[] = {
{ "vnc", HAS_ARG, QEMU_OPTION_vnc },
{ "vncviewer", 0, QEMU_OPTION_vncviewer },
{ "vncunused", 0, QEMU_OPTION_vncunused },
@@ -685,7 +685,7 @@
/* temporary options */
{ "usb", 0, QEMU_OPTION_usb },
-@@ -6031,8 +6028,6 @@ int main(int argc, char **argv)
+@@ -6028,8 +6025,6 @@ int main(int argc, char **argv)
nb_nics = 0;
/* default mac address of the first network interface */
@@ -694,7 +694,7 @@
/* init debug */
sprintf(qemu_dm_logfilename, "/var/log/xen/qemu-dm.%ld.log", (long)getpid());
cpu_set_log_filename(qemu_dm_logfilename);
-@@ -6383,11 +6378,7 @@ int main(int argc, char **argv)
+@@ -6380,11 +6375,7 @@ int main(int argc, char **argv)
}
break;
case QEMU_OPTION_vnc:
@@ -707,7 +707,7 @@
break;
case QEMU_OPTION_no_acpi:
acpi_enabled = 0;
-@@ -6415,11 +6406,8 @@ int main(int argc, char **argv)
+@@ -6412,11 +6403,8 @@ int main(int argc, char **argv)
break;
case QEMU_OPTION_vncunused:
vncunused++;
@@ -721,7 +721,7 @@
break;
}
}
-@@ -6550,11 +6538,18 @@ int main(int argc, char **argv)
+@@ -6547,11 +6535,18 @@ int main(int argc, char **argv)
/* terminal init */
if (nographic) {
dumb_display_init(ds);
@@ -744,7 +744,7 @@
} else {
#if defined(CONFIG_SDL)
sdl_display_init(ds, full_screen);
-@@ -6626,7 +6621,7 @@ int main(int argc, char **argv)
+@@ -6623,7 +6618,7 @@ int main(int argc, char **argv)
}
}
@@ -753,10 +753,10 @@
gui_timer = qemu_new_timer(rt_clock, gui_update, NULL);
qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock));
}
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
---- xen-3.1.0-src.orig/tools/ioemu/vl.h 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.h 2007-10-10 17:31:52.000000000 -0400
-@@ -813,7 +813,10 @@ void sdl_display_init(DisplayState *ds,
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.h xen-3.1.2-src.new/tools/ioemu/vl.h
+--- xen-3.1.2-src.orig/tools/ioemu/vl.h 2007-12-01 14:58:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.h 2007-12-01 14:57:36.000000000 -0500
+@@ -812,7 +812,10 @@ void sdl_display_init(DisplayState *ds,
void cocoa_display_init(DisplayState *ds, int full_screen);
/* vnc.c */
@@ -768,9 +768,9 @@
int vnc_start_viewer(int port);
/* ide.c */
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/vnc.c xen-3.1.0-src.new/tools/ioemu/vnc.c
---- xen-3.1.0-src.orig/tools/ioemu/vnc.c 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vnc.c 2007-10-10 20:24:32.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vnc.c xen-3.1.2-src.new/tools/ioemu/vnc.c
+--- xen-3.1.2-src.orig/tools/ioemu/vnc.c 2007-12-01 14:58:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vnc.c 2007-12-01 14:57:36.000000000 -0500
@@ -44,6 +44,28 @@
#include "vnc_keysym.h"
@@ -1968,9 +1968,9 @@
}
int vnc_start_viewer(int port)
-diff -rupN xen-3.1.0-src.orig/tools/ioemu/xenstore.c xen-3.1.0-src.new/tools/ioemu/xenstore.c
---- xen-3.1.0-src.orig/tools/ioemu/xenstore.c 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/xenstore.c 2007-10-10 17:31:52.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/xenstore.c xen-3.1.2-src.new/tools/ioemu/xenstore.c
+--- xen-3.1.2-src.orig/tools/ioemu/xenstore.c 2007-12-01 14:58:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/xenstore.c 2007-12-01 14:57:36.000000000 -0500
@@ -367,7 +367,7 @@ void xenstore_write_vncport(int display)
if (pasprintf(&buf, "%s/console/vnc-port", path) == -1)
goto out;
@@ -1988,18 +1988,18 @@
free(uuid);
free(path);
return rc;
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/image.py xen-3.1.0-src.new/tools/python/xen/xend/image.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/image.py 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/image.py 2007-10-10 20:19:46.000000000 -0400
-@@ -30,6 +30,7 @@ from xen.xend.XendOptions import instanc
- from xen.xend.server.netif import randomMAC
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/image.py xen-3.1.2-src.new/tools/python/xen/xend/image.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/image.py 2007-12-01 14:47:23.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/image.py 2007-12-01 14:57:36.000000000 -0500
+@@ -29,6 +29,7 @@ from xen.xend.XendLogging import log
+ from xen.xend.XendOptions import instance as xenopts
from xen.xend.xenstore.xswatch import xswatch
from xen.xend import arch
+from xen.xend import XendOptions
xc = xen.lowlevel.xc.xc()
-@@ -387,30 +388,26 @@ class HVMImageHandler(ImageHandler):
+@@ -386,30 +387,26 @@ class HVMImageHandler(ImageHandler):
if key in vmConfig['platform']:
vnc_config[key] = vmConfig['platform'][key]
@@ -2046,10 +2046,10 @@
elif has_sdl:
# SDL is default in QEMU.
pass
-diff -rupN xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/server/vfbif.py 2007-10-10 20:20:09.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/server/vfbif.py 2007-10-10 17:31:52.000000000 -0400
-@@ -69,8 +69,10 @@ class VfbifController(DevController):
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/server/vfbif.py xen-3.1.2-src.new/tools/python/xen/xend/server/vfbif.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/server/vfbif.py 2007-12-01 14:55:08.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/server/vfbif.py 2007-12-01 14:57:37.000000000 -0500
+@@ -66,8 +66,10 @@ class VfbifController(DevController):
passwd = config["vncpasswd"]
else:
passwd = xen.xend.XendOptions.instance().get_vncpasswd_default()
@@ -2060,7 +2060,7 @@
log.debug("Stored a VNC password for vfb access")
else:
log.debug("No VNC passwd configured for vfb access")
-@@ -78,7 +80,7 @@ class VfbifController(DevController):
+@@ -75,7 +77,7 @@ class VfbifController(DevController):
vnclisten = config.get('vnclisten',
xen.xend.XendOptions.instance().get_vnclisten_address())
vncdisplay = config.get('vncdisplay', 0)
xen-qemu-vnc-revert-password.patch:
Index: xen-qemu-vnc-revert-password.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-revert-password.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-vnc-revert-password.patch 28 Aug 2007 21:49:31 -0000 1.1
+++ xen-qemu-vnc-revert-password.patch 1 Dec 2007 22:07:49 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/d3des.c xen-3.1.0-src.new/tools/ioemu/d3des.c
---- xen-3.1.0-src.orig/tools/ioemu/d3des.c 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/d3des.c 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/d3des.c xen-3.1.2-src.new/tools/ioemu/d3des.c
+--- xen-3.1.2-src.orig/tools/ioemu/d3des.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/d3des.c 1969-12-31 19:00:00.000000000 -0500
@@ -1,434 +0,0 @@
-/*
- * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -436,9 +436,9 @@
- *
- * d3des V5.0a rwo 9208.07 18:44 Graven Imagery
- **********************************************************************/
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/d3des.h xen-3.1.0-src.new/tools/ioemu/d3des.h
---- xen-3.1.0-src.orig/tools/ioemu/d3des.h 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/d3des.h 1969-12-31 19:00:00.000000000 -0500
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/d3des.h xen-3.1.2-src.new/tools/ioemu/d3des.h
+--- xen-3.1.2-src.orig/tools/ioemu/d3des.h 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/d3des.h 1969-12-31 19:00:00.000000000 -0500
@@ -1,51 +0,0 @@
-/*
- * This is D3DES (V5.09) by Richard Outerbridge with the double and
@@ -491,10 +491,10 @@
-
-/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery
- ********************************************************************/
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/Makefile.target xen-3.1.0-src.new/tools/ioemu/Makefile.target
---- xen-3.1.0-src.orig/tools/ioemu/Makefile.target 2007-08-23 15:33:41.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/Makefile.target 2007-08-23 15:35:32.000000000 -0400
-@@ -412,7 +412,6 @@ ifdef CONFIG_SDL
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/Makefile.target xen-3.1.2-src.new/tools/ioemu/Makefile.target
+--- xen-3.1.2-src.orig/tools/ioemu/Makefile.target 2007-12-01 14:55:08.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/Makefile.target 2007-12-01 14:55:51.000000000 -0500
+@@ -411,7 +411,6 @@ ifdef CONFIG_SDL
VL_OBJS+=sdl.o
endif
VL_OBJS+=vnc.o
@@ -502,7 +502,7 @@
ifdef CONFIG_COCOA
VL_OBJS+=cocoa.o
COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
-@@ -473,9 +472,6 @@ sdl.o: sdl.c keymaps.c sdl_keysym.h
+@@ -472,9 +471,6 @@ sdl.o: sdl.c keymaps.c sdl_keysym.h
vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h
$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
@@ -512,9 +512,9 @@
sdlaudio.o: sdlaudio.c
$(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.c xen-3.1.0-src.new/tools/ioemu/vl.c
---- xen-3.1.0-src.orig/tools/ioemu/vl.c 2007-08-23 15:33:41.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.c 2007-08-23 15:35:32.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.c xen-3.1.2-src.new/tools/ioemu/vl.c
+--- xen-3.1.2-src.orig/tools/ioemu/vl.c 2007-12-01 14:53:45.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.c 2007-12-01 14:55:51.000000000 -0500
@@ -171,9 +171,6 @@ time_t timeoffset = 0;
char domain_name[1024] = "Xen-no-name";
extern int domid;
@@ -525,7 +525,7 @@
/***********************************************************/
/* x86 ISA bus support */
-@@ -6004,7 +6001,6 @@ int main(int argc, char **argv)
+@@ -6006,7 +6003,6 @@ int main(int argc, char **argv)
vncunused = 0;
kernel_filename = NULL;
kernel_cmdline = "";
@@ -533,7 +533,7 @@
#ifndef CONFIG_DM
#ifdef TARGET_PPC
cdrom_index = 1;
-@@ -6553,10 +6549,6 @@ int main(int argc, char **argv)
+@@ -6550,10 +6546,6 @@ int main(int argc, char **argv)
init_ioports();
@@ -544,10 +544,10 @@
/* terminal init */
if (nographic) {
dumb_display_init(ds);
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vl.h xen-3.1.0-src.new/tools/ioemu/vl.h
---- xen-3.1.0-src.orig/tools/ioemu/vl.h 2007-08-23 15:33:41.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vl.h 2007-08-23 15:40:33.000000000 -0400
-@@ -1246,7 +1246,7 @@ int xenstore_fd(void);
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vl.h xen-3.1.2-src.new/tools/ioemu/vl.h
+--- xen-3.1.2-src.orig/tools/ioemu/vl.h 2007-12-01 14:53:45.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vl.h 2007-12-01 14:56:13.000000000 -0500
+@@ -1245,7 +1245,7 @@ int xenstore_fd(void);
void xenstore_process_event(void *opaque);
void xenstore_check_new_media_present(int timeout);
void xenstore_write_vncport(int vnc_display);
@@ -556,17 +556,19 @@
int xenstore_domain_has_devtype(struct xs_handle *handle,
const char *devtype);
-@@ -1283,7 +1283,4 @@ extern char domain_name[];
+@@ -1282,9 +1282,6 @@ extern char domain_name[];
void destroy_hvm_domain(void);
-/* VNC Authentication */
-#define AUTHCHALLENGESIZE 16
-
- #endif /* VL_H */
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/vnc.c xen-3.1.0-src.new/tools/ioemu/vnc.c
---- xen-3.1.0-src.orig/tools/ioemu/vnc.c 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/vnc.c 2007-08-23 15:42:10.000000000 -0400
+ #ifdef __ia64__
+ static inline void xc_domain_shutdown_hook(int xc_handle, uint32_t domid)
+ {
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/vnc.c xen-3.1.2-src.new/tools/ioemu/vnc.c
+--- xen-3.1.2-src.orig/tools/ioemu/vnc.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/vnc.c 2007-12-01 14:55:51.000000000 -0500
@@ -44,7 +44,6 @@
#include "vnc_keysym.h"
@@ -715,9 +717,9 @@
-
- return;
-}
-diff -ruNp xen-3.1.0-src.orig/tools/ioemu/xenstore.c xen-3.1.0-src.new/tools/ioemu/xenstore.c
---- xen-3.1.0-src.orig/tools/ioemu/xenstore.c 2007-08-23 15:33:41.000000000 -0400
-+++ xen-3.1.0-src.new/tools/ioemu/xenstore.c 2007-08-23 15:40:29.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/ioemu/xenstore.c xen-3.1.2-src.new/tools/ioemu/xenstore.c
+--- xen-3.1.2-src.orig/tools/ioemu/xenstore.c 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/ioemu/xenstore.c 2007-12-01 14:55:51.000000000 -0500
@@ -378,9 +378,8 @@ void xenstore_write_vncport(int display)
free(buf);
}
xen-qemu-vnc-x509-certs.patch:
Index: xen-qemu-vnc-x509-certs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-qemu-vnc-x509-certs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-qemu-vnc-x509-certs.patch 11 Oct 2007 00:47:59 -0000 1.1
+++ xen-qemu-vnc-x509-certs.patch 1 Dec 2007 22:07:49 -0000 1.2
@@ -1,11 +1,11 @@
-diff -rup xen-3.1.0-src.orig/tools/examples/xend-config.sxp xen-3.1.0-src.new/tools/examples/xend-config.sxp
---- xen-3.1.0-src.orig/tools/examples/xend-config.sxp 2007-10-10 17:31:42.000000000 -0400
-+++ xen-3.1.0-src.new/tools/examples/xend-config.sxp 2007-10-10 17:55:25.000000000 -0400
-@@ -202,3 +202,33 @@
- # The default password for VNC console on HVM domain.
- # Empty string is no authentication.
- (vncpasswd '')
-+
+diff -rupN xen-3.1.2-src.orig/tools/examples/xend-config.sxp xen-3.1.2-src.new/tools/examples/xend-config.sxp
+--- xen-3.1.2-src.orig/tools/examples/xend-config.sxp 2007-12-01 14:47:23.000000000 -0500
++++ xen-3.1.2-src.new/tools/examples/xend-config.sxp 2007-12-01 14:59:34.000000000 -0500
+@@ -207,4 +207,32 @@
+ # when not specififed in VM's configuration
+ #(keymap 'en-us')
+
+-
+# The VNC server can be told to negotiate a TLS session
+# to encryption all traffic, and provide x509 cert to
+# clients enalbing them to verify server identity. The
@@ -35,9 +35,9 @@
+# checking uncomment this:
+#
+# (vnc-x509-verify 1)
-diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/image.py xen-3.1.0-src.new/tools/python/xen/xend/image.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/image.py 2007-10-10 17:31:42.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/image.py 2007-10-10 19:54:22.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/image.py xen-3.1.2-src.new/tools/python/xen/xend/image.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/image.py 2007-12-01 14:58:47.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/image.py 2007-12-01 14:58:59.000000000 -0500
@@ -17,7 +17,7 @@
#============================================================================
@@ -47,7 +47,7 @@
import re
import math
import signal
-@@ -400,6 +400,19 @@ class HVMImageHandler(ImageHandler):
+@@ -399,6 +399,19 @@ class HVMImageHandler(ImageHandler):
else:
log.debug("No VNC passwd configured for vfb access")
@@ -67,9 +67,9 @@
vnclisten = vnc_config.get('vnclisten',
XendOptions.instance().get_vnclisten_address())
vncdisplay = vnc_config.get('vncdisplay', 0)
-diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/XendOptions.py xen-3.1.0-src.new/tools/python/xen/xend/XendOptions.py
---- xen-3.1.0-src.orig/tools/python/xen/xend/XendOptions.py 2007-05-18 10:45:21.000000000 -0400
-+++ xen-3.1.0-src.new/tools/python/xen/xend/XendOptions.py 2007-10-10 17:55:49.000000000 -0400
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/XendOptions.py xen-3.1.2-src.new/tools/python/xen/xend/XendOptions.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/XendOptions.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/XendOptions.py 2007-12-01 14:59:00.000000000 -0500
@@ -102,6 +102,15 @@ class XendOptions:
"""Default interface to listen for VNC connections on"""
xend_vnc_listen_default = '127.0.0.1'
@@ -86,9 +86,9 @@
"""Default session storage path."""
xend_domains_path_default = '/var/lib/xend/domains'
-@@ -278,6 +287,16 @@ class XendOptions:
- return self.get_config_string('vncpasswd',
- self.vncpasswd_default)
+@@ -281,6 +290,16 @@ class XendOptions:
+ def get_keymap(self):
+ return self.get_config_value('keymap', None)
+ def get_vnc_tls(self):
+ return self.get_config_string('vnc-tls', self.xend_vnc_tls)
xen-xs-transactions.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 xen-xs-transactions.patch
Index: xen-xs-transactions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen-xs-transactions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xen-xs-transactions.patch 1 May 2007 02:27:22 -0000 1.1
+++ xen-xs-transactions.patch 1 Dec 2007 22:07:49 -0000 1.2
@@ -1,15 +1,258 @@
-diff -r 8ca89a9e54a7 tools/python/xen/xend/XendConfig.py
---- a/tools/python/xen/xend/XendConfig.py Wed Apr 25 09:44:20 2007 +0100
-+++ b/tools/python/xen/xend/XendConfig.py Wed Apr 25 12:52:29 2007 -0400
-@@ -26,6 +26,7 @@ from xen.xend.XendDevices import XendDev
+diff -rupN xen-3.1.2-src.orig/tools/examples/#xend-config.sxp.rej# xen-3.1.2-src.new/tools/examples/#xend-config.sxp.rej#
+--- xen-3.1.2-src.orig/tools/examples/#xend-config.sxp.rej# 1969-12-31 19:00:00.000000000 -0500
++++ xen-3.1.2-src.new/tools/examples/#xend-config.sxp.rej# 2007-12-01 15:00:04.000000000 -0500
+@@ -0,0 +1,39 @@
++***************
++*** 202,204 ****
++ # The default password for VNC console on HVM domain.
++ # Empty string is no authentication.
++ (vncpasswd '')
++--- 202,234 ----
++ # The default password for VNC console on HVM domain.
++ # Empty string is no authentication.
++ (vncpasswd '')
+++
+++ # The VNC server can be told to negotiate a TLS session
+++ # to encryption all traffic, and provide x509 cert to
+++ # clients enalbing them to verify server identity. The
+++ # GTK-VNC widget, virt-viewer, virt-manager and VeNCrypt
+++ # all support the VNC extension for TLS used in QEMU. The
+++ # TightVNC/RealVNC/UltraVNC clients do not.
+++ #
+++ # To enable this create x509 certificates / keys in the
+++ # directory /etc/xen/vnc
+++ #
+++ # ca-cert.pem - The CA certificate
+++ # server-cert.pem - The Server certificate signed by the CA
+++ # server-key.pem - The server private key
+++ #
+++ # and then uncomment this next line
+++ # (vnc-tls 1)
+++ #
+++ # The certificate dir can be pointed elsewhere..
+++ #
+++ # (vnc-x509-cert-dir /etc/xen/vnc)
+++ #
+++ # The server can be told to request & validate an x509
+++ # certificate from the client. Only clients with a cert
+++ # signed by the trusted CA will be able to connect. This
+++ # is more secure the password auth alone. Passwd auth can
+++ # used at the same time if desired. To enable client cert
+++ # checking uncomment this:
+++ #
+++ # (vnc-x509-verify 1)
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/server/blkif.py xen-3.1.2-src.new/tools/python/xen/xend/server/blkif.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/server/blkif.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/server/blkif.py 2007-12-01 15:01:00.000000000 -0500
+@@ -112,19 +112,26 @@ class BlkifController(DevController):
+ (self.deviceClass, devid, config))
+
+
+- def getDeviceConfiguration(self, devid):
++ def getDeviceConfiguration(self, devid, transaction = None):
+ """Returns the configuration of a device.
+
+ @note: Similar to L{configuration} except it returns a dict.
+ @return: dict
+ """
+- config = DevController.getDeviceConfiguration(self, devid)
+- devinfo = self.readBackend(devid, 'dev', 'type', 'params', 'mode',
+- 'uuid')
++ config = DevController.getDeviceConfiguration(self, devid, transaction)
++ if transaction is None:
++ devinfo = self.readBackend(devid, 'dev', 'type', 'params', 'mode',
++ 'uuid')
++ else:
++ devinfo = self.readBackendTxn(transaction, devid,
++ 'dev', 'type', 'params', 'mode', 'uuid')
+ dev, typ, params, mode, uuid = devinfo
+
+ if dev:
+- dev_type = self.readFrontend(devid, 'device-type')
++ if transaction is None:
++ dev_type = self.readFrontend(devid, 'device-type')
++ else:
++ dev_type = self.readFrontendTxn(transaction, devid, 'device-type')
+ if dev_type:
+ dev += ':' + dev_type
+ config['dev'] = dev
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/server/ConsoleController.py xen-3.1.2-src.new/tools/python/xen/xend/server/ConsoleController.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/server/ConsoleController.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/server/ConsoleController.py 2007-12-01 15:01:00.000000000 -0500
+@@ -19,9 +19,12 @@ class ConsoleController(DevController):
+ return (self.allocateDeviceID(), back, {})
+
+
+- def getDeviceConfiguration(self, devid):
+- result = DevController.getDeviceConfiguration(self, devid)
+- devinfo = self.readBackend(devid, *self.valid_cfg)
++ def getDeviceConfiguration(self, devid, transaction = None):
++ result = DevController.getDeviceConfiguration(self, devid, transaction)
++ if transaction is None:
++ devinfo = self.readBackend(devid, *self.valid_cfg)
++ else:
++ devinfo = self.readBackendTxn(transaction, devid, *self.valid_cfg)
+ config = dict(zip(self.valid_cfg, devinfo))
+ config = dict([(key, val) for key, val in config.items()
+ if val != None])
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/server/DevController.py xen-3.1.2-src.new/tools/python/xen/xend/server/DevController.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/server/DevController.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/server/DevController.py 2007-12-01 15:01:00.000000000 -0500
+@@ -239,15 +239,15 @@ class DevController:
+
+ self.vm._removeVm("device/%s/%d" % (self.deviceClass, dev))
+
+- def configurations(self):
+- return map(self.configuration, self.deviceIDs())
++ def configurations(self, transaction = None):
++ return map(lambda x: self.configuration(x, transaction), self.deviceIDs(transaction))
+
+
+- def configuration(self, devid):
++ def configuration(self, devid, transaction = None):
+ """@return an s-expression giving the current configuration of the
+ specified device. This would be suitable for giving to {@link
+ #createDevice} in order to recreate that device."""
+- configDict = self.getDeviceConfiguration(devid)
++ configDict = self.getDeviceConfiguration(devid, transaction)
+ sxpr = [self.deviceClass]
+ for key, val in configDict.items():
+ if isinstance(val, (types.ListType, types.TupleType)):
+@@ -273,13 +273,16 @@ class DevController:
+ 'id', devid]]
+
+
+- def getDeviceConfiguration(self, devid):
++ def getDeviceConfiguration(self, devid, transaction = None):
+ """Returns the configuration of a device.
+
+ @note: Similar to L{configuration} except it returns a dict.
+ @return: dict
+ """
+- backdomid = xstransact.Read(self.frontendPath(devid), "backend-id")
++ if transaction is None:
++ backdomid = xstransact.Read(self.frontendPath(devid), "backend-id")
++ else:
++ backdomid = transaction.read(self.frontendPath(devid) + "/backend-id")
+ if backdomid is None:
+ raise VmError("Device %s not connected" % devid)
+
+@@ -416,14 +419,28 @@ class DevController:
+ else:
+ raise VmError("Device %s not connected" % devid)
+
++ def readBackendTxn(self, transaction, devid, *args):
++ frontpath = self.frontendPath(devid)
++ backpath = transaction.read(frontpath + "/backend")
++ if backpath:
++ paths = map(lambda x: backpath + "/" + x, args)
++ return transaction.read(*paths)
++ else:
++ raise VmError("Device %s not connected" % devid)
++
+ def readFrontend(self, devid, *args):
+ return xstransact.Read(self.frontendPath(devid), *args)
+
++ def readFrontendTxn(self, transaction, devid, *args):
++ paths = map(lambda x: self.frontendPath(devid) + "/" + x, args)
++ return transaction.read(*paths)
++
+ def deviceIDs(self, transaction = None):
+ """@return The IDs of each of the devices currently configured for
+ this instance's deviceClass.
+ """
+ fe = self.backendRoot()
++
+ if transaction:
+ return map(lambda x: int(x.split('/')[-1]), transaction.list(fe))
+ else:
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/server/netif.py xen-3.1.2-src.new/tools/python/xen/xend/server/netif.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/server/netif.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/server/netif.py 2007-12-01 15:01:00.000000000 -0500
+@@ -147,16 +147,19 @@ class NetifController(DevController):
+ return (devid, back, front)
+
+
+- def getDeviceConfiguration(self, devid):
++ def getDeviceConfiguration(self, devid, transaction = None):
+ """@see DevController.configuration"""
+
+- result = DevController.getDeviceConfiguration(self, devid)
++ result = DevController.getDeviceConfiguration(self, devid, transaction)
+
+ config_path = "device/%s/%d/" % (self.deviceClass, devid)
+ devinfo = ()
+ for x in ( 'script', 'ip', 'bridge', 'mac',
+ 'type', 'vifname', 'rate', 'uuid', 'model' ):
+- y = self.vm._readVm(config_path + x)
[...2902 lines suppressed...]
++ vcpu_util[str(i)] = util
++
++ return vcpu_util
++
++ def get_consoles(self):
++ return self.info.get('console_refs', [])
++
++ def get_vifs(self):
++ return self.info.get('vif_refs', [])
++
++ def get_vbds(self):
++ return self.info.get('vbd_refs', [])
++
++ def get_vtpms(self):
++ return self.info.get('vtpm_refs', [])
++
++ def create_vbd(self, xenapi_vbd, vdi_image_path):
++ """Create a VBD using a VDI from XendStorageRepository.
++
++ @param xenapi_vbd: vbd struct from the Xen API
++ @param vdi_image_path: VDI UUID
++ @rtype: string
++ @return: uuid of the device
++ """
++ xenapi_vbd['image'] = vdi_image_path
++ if vdi_image_path.startswith('tap'):
++ dev_uuid = self.info.device_add('tap', cfg_xenapi = xenapi_vbd)
++ else:
++ dev_uuid = self.info.device_add('vbd', cfg_xenapi = xenapi_vbd)
++
++ if not dev_uuid:
++ raise XendError('Failed to create device')
++
++ if self._stateGet() in (XEN_API_VM_POWER_STATE_RUNNING,
++ XEN_API_VM_POWER_STATE_PAUSED):
++ _, config = self.info['devices'][dev_uuid]
++
++ if vdi_image_path.startswith('tap'):
++ dev_control = self.getDeviceController('tap')
++ else:
++ dev_control = self.getDeviceController('vbd')
++
++ try:
++ devid = dev_control.createDevice(config)
++ dev_control.waitForDevice(devid)
++ self.info.device_update(dev_uuid,
++ cfg_xenapi = {'devid': devid})
++ except Exception, exn:
++ log.exception(exn)
++ del self.info['devices'][dev_uuid]
++ self.info['vbd_refs'].remove(dev_uuid)
++ raise
++
++ return dev_uuid
++
++ def create_phantom_vbd_with_vdi(self, xenapi_vbd, vdi_image_path):
++ """Create a VBD using a VDI from XendStorageRepository.
++
++ @param xenapi_vbd: vbd struct from the Xen API
++ @param vdi_image_path: VDI UUID
++ @rtype: string
++ @return: uuid of the device
++ """
++ xenapi_vbd['image'] = vdi_image_path
++ dev_uuid = self.info.phantom_device_add('tap', cfg_xenapi = xenapi_vbd)
++ if not dev_uuid:
++ raise XendError('Failed to create device')
++
++ if self._stateGet() == XEN_API_VM_POWER_STATE_RUNNING:
++ _, config = self.info['devices'][dev_uuid]
++ config['devid'] = self.getDeviceController('tap').createDevice(config)
++
++ return config['devid']
++
++ def create_vif(self, xenapi_vif):
++ """Create VIF device from the passed struct in Xen API format.
++
++ @param xenapi_vif: Xen API VIF Struct.
++ @rtype: string
++ @return: UUID
++ """
++ dev_uuid = self.info.device_add('vif', cfg_xenapi = xenapi_vif)
++ if not dev_uuid:
++ raise XendError('Failed to create device')
++
++ if self._stateGet() in (XEN_API_VM_POWER_STATE_RUNNING,
++ XEN_API_VM_POWER_STATE_PAUSED):
++
++ _, config = self.info['devices'][dev_uuid]
++ dev_control = self.getDeviceController('vif')
++
++ try:
++ devid = dev_control.createDevice(config)
++ dev_control.waitForDevice(devid)
++ self.info.device_update(dev_uuid,
++ cfg_xenapi = {'devid': devid})
++ except Exception, exn:
++ log.exception(exn)
++ del self.info['devices'][dev_uuid]
++ self.info['vif_refs'].remove(dev_uuid)
++ raise
++
++ return dev_uuid
++
++ def create_vtpm(self, xenapi_vtpm):
++ """Create a VTPM device from the passed struct in Xen API format.
++
++ @return: uuid of the device
++ @rtype: string
++ """
++
++ if self._stateGet() not in (DOM_STATE_HALTED,):
++ raise VmError("Can only add vTPM to a halted domain.")
++ if self.get_vtpms() != []:
++ raise VmError('Domain already has a vTPM.')
++ dev_uuid = self.info.device_add('vtpm', cfg_xenapi = xenapi_vtpm)
++ if not dev_uuid:
++ raise XendError('Failed to create device')
++
++ return dev_uuid
++
++ def create_console(self, xenapi_console):
++ """ Create a console device from a Xen API struct.
++
++ @return: uuid of device
++ @rtype: string
++ """
++ if self._stateGet() not in (DOM_STATE_HALTED,):
++ raise VmError("Can only add console to a halted domain.")
++
++ dev_uuid = self.info.device_add('console', cfg_xenapi = xenapi_console)
++ if not dev_uuid:
++ raise XendError('Failed to create device')
++
++ return dev_uuid
++
++ def destroy_device_by_uuid(self, dev_type, dev_uuid):
++ if dev_uuid not in self.info['devices']:
++ raise XendError('Device does not exist')
++
++ try:
++ if self._stateGet() in (XEN_API_VM_POWER_STATE_RUNNING,
++ XEN_API_VM_POWER_STATE_PAUSED):
++ _, config = self.info['devices'][dev_uuid]
++ devid = config.get('devid')
++ if devid != None:
++ self.getDeviceController(dev_type).destroyDevice(devid, force = False)
++ else:
++ raise XendError('Unable to get devid for device: %s:%s' %
++ (dev_type, dev_uuid))
++ finally:
++ del self.info['devices'][dev_uuid]
++ self.info['%s_refs' % dev_type].remove(dev_uuid)
++
++ def destroy_vbd(self, dev_uuid):
++ self.destroy_device_by_uuid('vbd', dev_uuid)
++
++ def destroy_vif(self, dev_uuid):
++ self.destroy_device_by_uuid('vif', dev_uuid)
++
++ def destroy_vtpm(self, dev_uuid):
++ self.destroy_device_by_uuid('vtpm', dev_uuid)
++
++ def has_device(self, dev_class, dev_uuid):
++ return (dev_uuid in self.info['%s_refs' % dev_class.lower()])
++
++ def __str__(self):
++ return '<domain id=%s name=%s memory=%s state=%s>' % \
++ (str(self.domid), self.info['name_label'],
++ str(self.info['memory_dynamic_max']), DOM_STATES[self._stateGet()])
++
++ __repr__ = __str__
++
+diff -rupN xen-3.1.2-src.orig/tools/python/xen/xend/XendDomain.py xen-3.1.2-src.new/tools/python/xen/xend/XendDomain.py
+--- xen-3.1.2-src.orig/tools/python/xen/xend/XendDomain.py 2007-11-14 18:35:27.000000000 -0500
++++ xen-3.1.2-src.new/tools/python/xen/xend/XendDomain.py 2007-12-01 15:01:00.000000000 -0500
+@@ -393,13 +393,22 @@ class XendDomain:
+ @rtype: None
+ """
+
++ txn = xstransact()
++ try:
++ self._refreshTxn(txn, refresh_shutdown)
++ txn.commit()
++ except:
++ txn.abort()
++ raise
++
++ def _refreshTxn(self, transaction, refresh_shutdown):
+ running = self._running_domains()
+ # Add domains that are not already tracked but running in Xen,
+ # and update domain state for those that are running and tracked.
+ for dom in running:
+ domid = dom['domid']
+ if domid in self.domains:
+- self.domains[domid].update(dom, refresh_shutdown)
++ self.domains[domid].update(dom, refresh_shutdown, transaction)
+ elif domid not in self.domains and dom['dying'] != 1:
+ try:
+ new_dom = XendDomainInfo.recreate(dom, False)
Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- xen.spec 3 Nov 2007 19:11:15 -0000 1.196
+++ xen.spec 1 Dec 2007 22:07:49 -0000 1.197
@@ -2,8 +2,8 @@
Summary: Xen is a virtual machine monitor
Name: xen
-Version: 3.1.0
-Release: 14%{?dist}
+Version: 3.1.2
+Release: 1%{?dist}
Group: Development/Libraries
License: GPL
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -16,23 +16,13 @@
Patch6: xen-net-bridge.patch
Patch13: xen-dumpdir.patch
Patch18: xen-block-readonly.patch
-Patch19: xen-start-fail-cleanup.patch
Patch20: xen-blktap-no-aio-epoll.patch
-Patch21: xen-blktap-error-returns.patch
-Patch25: xen-qemu-vnc-delete.patch
Patch26: xen-hvm-save-paths.patch
Patch27: xen-console-log.patch
-Patch28: xen-keyboard.patch
-Patch29: xen-3.1.0-libxc-native-protocol.patch
-Patch30: xen-3.1.0-dev-native-protocol.patch
-Patch31: xen-tpm-functions.patch
-Patch32: xen-clobber-vif-type.patch
-Patch33: xen-vmxassist-irqs.patch
+
Patch34: xen-3.1.0-no-xenapi-docs.patch
-Patch35: xen-qemu-rtl8139-checksum.patch
Patch36: xen-qemu-bootmenu.patch
-Patch37: xen-baked-tmpfile.patch
# Patches to modify the default config of xend
Patch100: xen-config-dom0-minmem.patch
@@ -55,11 +45,6 @@
# Performance fix for listing domains
Patch280: xen-xs-transactions.patch
-# CVE-2007-1321
-Patch600: xen-qemu-ne2000-CVE-2007-1321.patch
-# CVE-2007-4993
-Patch601: pygrub-dont-exec.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
@@ -127,24 +112,13 @@
%patch6 -p1
%patch13 -p1
%patch18 -p1
-%patch19 -p1
%patch20 -p1
-%patch21 -p1
-%patch25 -p1
%patch26 -p1
%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
+
%patch34 -p1
-%patch35 -p1
%patch36 -p1
-%patch37 -p1
# config patches
%patch100 -p1
@@ -171,10 +145,6 @@
# performance patch
%patch280 -p1
-# CVE patches
-%patch600 -p1
-%patch601 -p1
-
%build
CFLAGS="$RPM_OPT_FLAGS" %{__make} XENFB_TOOLS=y XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs
@@ -239,6 +209,9 @@
/sbin/chkconfig --del xendomains
fi
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -295,6 +268,9 @@
%{_libdir}/*.a
%changelog
+* Sat Dec 1 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.2-1.fc9
+- Upgrade to 3.1.2 bugfix release
+
* Sat Nov 3 2007 Daniel P. Berrange <berrange at redhat.com> - 3.1.0-14.fc9
- Disable network-bridge script since it conflicts with NetworkManager
which is now on by default
--- pygrub-dont-exec.patch DELETED ---
--- xen-3.1.0-dev-native-protocol.patch DELETED ---
--- xen-3.1.0-libxc-native-protocol.patch DELETED ---
--- xen-baked-tmpfile.patch DELETED ---
--- xen-blktap-error-returns.patch DELETED ---
--- xen-clobber-vif-type.patch DELETED ---
--- xen-keyboard.patch DELETED ---
--- xen-qemu-ne2000-CVE-2007-1321.patch DELETED ---
--- xen-qemu-rtl8139-checksum.patch DELETED ---
--- xen-qemu-vnc-delete.patch DELETED ---
--- xen-remove-python-path-check.patch DELETED ---
--- xen-start-fail-cleanup.patch DELETED ---
--- xen-tpm-functions.patch DELETED ---
--- xen-vmxassist-irqs.patch DELETED ---
- Previous message (by thread): rpms/xen/F-8 .cvsignore, 1.34, 1.35 sources, 1.48, 1.49 xen-pvfb-01-qemu-fv-machine.patch, 1.1, 1.2 xen-pvfb-02-qemu-pv-machine.patch, 1.2, 1.3 xen-pvfb-03-xenfb-remove.patch, 1.1, 1.2 xen-pvfb-04-compat.patch, 1.4, 1.5 xen-qemu-vnc-authentication.patch, 1.3, 1.4 xen-qemu-vnc-revert-password.patch, 1.1, 1.2 xen-qemu-vnc-x509-certs.patch, 1.1, 1.2 xen-xs-transactions.patch, 1.1, 1.2 xen.spec, 1.195, 1.196 pygrub-dont-exec.patch, 1.1, NONE xen-3.1.0-dev-native-protocol.patch, 1.1, NONE xen-3.1.0-libxc-native-protocol.patch, 1.1, NONE xen-baked-tmpfile.patch, 1.1, NONE xen-blktap-error-returns.patch, 1.2, NONE xen-clobber-vif-type.patch, 1.1, NONE xen-keyboard.patch, 1.1, NONE xen-qemu-ne2000-CVE-2007-1321.patch, 1.1, NONE xen-qemu-rtl8139-checksum.patch, 1.1, NONE xen-qemu-vnc-delete.patch, 1.1, NONE xen-remove-python-path-check.patch, 1.1, NONE xen-start-fail-cleanup.patch, 1.1, NONE xen-tpm-functions.patch, 1.1, NONE xen-vmxassist-irqs.patch, 1.1, NONE
- Next message (by thread): rpms/xen/devel xen-xs-transactions.patch,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list