[Pkg-xen-changes] r608 - in trunk/xen-3/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Wed Dec 24 12:31:11 UTC 2008
Author: waldi
Date: Wed Dec 24 12:31:10 2008
New Revision: 608
Log:
Remove qemu debug script.
* debian/changelog: Update.
* debian/patches/series: Update.
* debian/patches/tools-ioemu-debug.diff: Add.
* debian/patches/tools-ioemu-dm.diff: Remove.
Added:
trunk/xen-3/debian/patches/tools-ioemu-debug.diff
- copied, changed from r607, /trunk/xen-3/debian/patches/tools-ioemu-dm.diff
Removed:
trunk/xen-3/debian/patches/tools-ioemu-dm.diff
Modified:
trunk/xen-3/debian/changelog
trunk/xen-3/debian/patches/series
Modified: trunk/xen-3/debian/changelog
==============================================================================
--- trunk/xen-3/debian/changelog (original)
+++ trunk/xen-3/debian/changelog Wed Dec 24 12:31:10 2008
@@ -1,7 +1,7 @@
xen-3 (3.2.1-3) UNRELEASED; urgency=low
- * Prevent symlink attack from qemu-dm.debug script and fix arch
- recognition (Closes: #496367)
+ [ Bastian Blank ]
+ * Remove useless qemu-dm.debug script. (Closes: #496367)
-- Julien Danjou <acid at debian.org> Mon, 25 Aug 2008 10:01:29 +0200
Modified: trunk/xen-3/debian/patches/series
==============================================================================
--- trunk/xen-3/debian/patches/series (original)
+++ trunk/xen-3/debian/patches/series Wed Dec 24 12:31:10 2008
@@ -16,4 +16,4 @@
tools-misc-xend-race.diff
doc-remove-unused.diff
tools-blktap-crypto.patch
-tools-ioemu-dm.diff
+tools-ioemu-debug.diff
Copied: trunk/xen-3/debian/patches/tools-ioemu-debug.diff (from r607, /trunk/xen-3/debian/patches/tools-ioemu-dm.diff)
==============================================================================
--- /trunk/xen-3/debian/patches/tools-ioemu-dm.diff (original)
+++ trunk/xen-3/debian/patches/tools-ioemu-debug.diff Wed Dec 24 12:31:10 2008
@@ -1,18 +1,10 @@
-diff -Nur xen-3-3.2.1/tools/ioemu/target-i386-dm/qemu-dm.debug xen-3/tools/ioemu/target-i386-dm/qemu-dm.debug
---- xen-3-3.2.1/tools/ioemu/target-i386-dm/qemu-dm.debug 2008-05-12 13:01:56.000000000 +0200
-+++ xen-3/tools/ioemu/target-i386-dm/qemu-dm.debug 2008-08-25 10:31:15.000000000 +0200
-@@ -1,10 +1,11 @@
- #!/bin/sh
+--- a/tools/ioemu/Makefile.target
++++ b/tools/ioemu/Makefile.target
+@@ -632,7 +632,6 @@
+ ifneq ($(PROGS),)
+ $(INSTALL_PROG) $(PROGS) "$(DESTDIR)$(bindir)"
+ endif
+- $(INSTALL_PROG) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
+ $(INSTALL_PROG) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
--if [ "`arch`" = "x86_64" ]; then
-+if [ "`uname -m`" = "x86_64" ]; then
- LIBDIR="lib64"
- else
- LIBDIR="lib"
- fi
--echo $* > /tmp/args
--echo $DISPLAY >> /tmp/args
-+TMPFILE=`mktemp`
-+echo $* > $TMPFILE
-+echo $DISPLAY >> $TMPFILE
- exec /usr/$LIBDIR/xen/bin/qemu-dm $*
+ ifneq ($(wildcard .depend),)
More information about the Pkg-xen-changes
mailing list