Bump to 3.1.2, clean out old versions

Package-Manager: portage-2.1.3.9

10 files changed, 3 insertions, 309 deletions

diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.4_p1-r2 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.4_p1-r2
deleted file mode 100644
index 7aadef066796..000000000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.4_p1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e85e16ad3dc354338e3ac4a8951f9649 xen-3.0.4_1-src.tgz 6473636
-RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b xen-3.0.4_1-src.tgz 6473636
-SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb xen-3.0.4_1-src.tgz 6473636
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0-r2 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0-r2
deleted file mode 100644
index e436de9ac59e..000000000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b7ae1f652b071862ae4c90b72d549627 xen-3.1.0-src.tgz 6831094
-RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 xen-3.1.0-src.tgz 6831094
-SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 xen-3.1.0-src.tgz 6831094
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.1-r1 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.1-r1
deleted file mode 100644
index e739866b2661..000000000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d5bafac9c819206d6a85c11352cc90fd xen-3.1.1.tgz 6868014
-RMD160 23f522a76815a64ba18eaf9eec19f38ea01e8c32 xen-3.1.1.tgz 6868014
-SHA256 c6c986177e75e41e7412920d453b5b759568a90266b09e2fea6043f8890f75e2 xen-3.1.1.tgz 6868014
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.2 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.2
new file mode 100644
index 000000000000..9d0a411de636
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.1.2
@@ -0,0 +1,3 @@
+MD5 4bb2aec65694c880b5ff90a472dacca9 xen-3.1.2.tar.gz 6881935
+RMD160 c0644576a3f5d8552c7359f53a29296458804d3b xen-3.1.2.tar.gz 6881935
+SHA256 711e97d8a4e711cd0d9e368999d83366ee93296d26034e773be15964e4f6422d xen-3.1.2.tar.gz 6881935
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-pygrub-security-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-pygrub-security-fix.patch
deleted file mode 100644
index 73432d412faf..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-pygrub-security-fix.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Protect pygrub from possible malicious content in guest grub
-config file.  This fixes CVE-2007-4993.  Original patch from
-Jeremy Katz, I updated to close 2 remaining issues pointed out
-by Christian and Keir, and to use setattr(self, ...).
-
-Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-
-(Tweeked for Xen 3.0.4)
----
-diff -r a00cc97b392a tools/pygrub/src/GrubConf.py
---- a/tools/pygrub/src/GrubConf.py	Wed Sep 12 09:43:33 2007 +0100
-+++ b/tools/pygrub/src/GrubConf.py	Mon Sep 24 12:43:19 2007 -0700
-@@ -101,7 +101,7 @@ class GrubImage(object):
- 
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored image directive %s" %(com,))
-         else:
-@@ -142,11 +142,11 @@ class GrubImage(object):
-     initrd = property(get_initrd, set_initrd)
- 
-     # set up command handlers
--    commands = { "title": "self.title",
--                 "root": "self.root",
--                 "rootnoverify": "self.root",
--                 "kernel": "self.kernel",
--                 "initrd": "self.initrd",
-+    commands = { "title": "title",
-+                 "root": "root",
-+                 "rootnoverify": "root",
-+                 "kernel": "kernel",
-+                 "initrd": "initrd",
-                  "chainloader": None,
-                  "module": None}
-         
-@@ -195,7 +195,7 @@ class GrubConfigFile(object):
-             (com, arg) = grub_exact_split(l, 2)
-             if self.commands.has_key(com):
-                 if self.commands[com] is not None:
--                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                    setattr(self, self.commands[com], arg.strip())
-                 else:
-                     logging.info("Ignored directive %s" %(com,))
-             else:
-@@ -208,7 +208,7 @@ class GrubConfigFile(object):
-         (com, arg) = grub_exact_split(line, 2)
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored directive %s" %(com,))
-         else:
-@@ -236,12 +236,12 @@ class GrubConfigFile(object):
-     splash = property(get_splash, set_splash)
- 
-     # set up command handlers
--    commands = { "default": "self.default",
--                 "timeout": "self.timeout",
--                 "fallback": "self.fallback",
--                 "hiddenmenu": "self.hiddenmenu",
--                 "splashimage": "self.splash",
--                 "password": "self.password" }
-+    commands = { "default": "default",
-+                 "timeout": "timeout",
-+                 "fallback": "fallback",
-+                 "hiddenmenu": "hiddenmenu",
-+                 "splashimage": "splash",
-+                 "password": "password" }
-     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
-               "pager", "partnew", "parttype", "rarp", "serial",
-               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
deleted file mode 100644
index 07e9735ea8df..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
-index 6d7cc31..9e2d535 100644
---- a/tools/ioemu/vnc.c
-+++ b/tools/ioemu/vnc.c
-@@ -962,18 +962,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
- 	case XK_Num_Lock:
- 	    vs->numlock = !vs->numlock;
- 	    break;
--
--	case XK_1 ... XK_9:
--	    if ((vs->ctl_keys & 3) != 3)
--		break;
--
--	    console_select(sym - XK_1);
--	    if (is_graphic_console()) {
--		/* tell the vga console to redisplay itself */
--		vga_hw_invalidate();
--		vnc_dpy_update(vs->ds, 0, 0, vs->ds->width, vs->ds->height);
--	    }
--	    break;
- 	}
-     }
- }
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
deleted file mode 100644
index a22bebefbd32..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rpuN xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py
---- xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py	Mon Dec 11 15:06:53 2006 +0000
-+++ xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py	Tue Jan 30 13:36:15 2007 -0500
-@@ -229,7 +229,8 @@ LEGACY_IMAGE_CFG = [
-     ('sdl', int),
-     ('vncdisplay', int),
-     ('vncunused', int),
--    ('vncpasswd', str),    
-+    ('vncpasswd', str),
-+    ('vnclisten', str),
- ]
-
- LEGACY_IMAGE_HVM_CFG = [
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-pygrub-security-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-pygrub-security-fix.patch
deleted file mode 100644
index c4e1222caf7a..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.0-pygrub-security-fix.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Protect pygrub from possible malicious content in guest grub
-config file.  This fixes CVE-2007-4993.  Original patch from
-Jeremy Katz, I updated to close 2 remaining issues pointed out
-by Christian and Keir, and to use setattr(self, ...).
-
-Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-
-(Tweeked for Xen 3.1.0)
-diff -rup xen-3.1.0-src.orig/tools/pygrub/src/GrubConf.py xen-3.1.0-src/tools/pygrub/src/GrubConf.py
---- xen-3.1.0-src.orig/tools/pygrub/src/GrubConf.py	2007-05-18 07:45:21.000000000 -0700
-+++ xen-3.1.0-src/tools/pygrub/src/GrubConf.py	2007-09-26 14:49:21.000000000 -0700
-@@ -101,7 +101,7 @@ class GrubImage(object):
- 
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored image directive %s" %(com,))
-         else:
-@@ -142,11 +142,11 @@ class GrubImage(object):
-     initrd = property(get_initrd, set_initrd)
- 
-     # set up command handlers
--    commands = { "title": "self.title",
--                 "root": "self.root",
--                 "rootnoverify": "self.root",
--                 "kernel": "self.kernel",
--                 "initrd": "self.initrd",
-+    commands = { "title": "title",
-+                 "root": "root",
-+                 "rootnoverify": "root",
-+                 "kernel": "kernel",
-+                 "initrd": "initrd",
-                  "chainloader": None,
-                  "module": None}
-         
-@@ -195,7 +195,7 @@ class GrubConfigFile(object):
-             (com, arg) = grub_exact_split(l, 2)
-             if self.commands.has_key(com):
-                 if self.commands[com] is not None:
--                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                    setattr(self, self.commands[com], arg.strip())
-                 else:
-                     logging.info("Ignored directive %s" %(com,))
-             else:
-@@ -208,7 +208,7 @@ class GrubConfigFile(object):
-         (com, arg) = grub_exact_split(line, 2)
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                setattr(self, self.commands[com], arg.strip())
-             else:
-                 logging.info("Ignored directive %s" %(com,))
-         else:
-@@ -236,12 +236,12 @@ class GrubConfigFile(object):
-     splash = property(get_splash, set_splash)
- 
-     # set up command handlers
--    commands = { "default": "self.default",
--                 "timeout": "self.timeout",
--                 "fallback": "self.fallback",
--                 "hiddenmenu": "self.hiddenmenu",
--                 "splashimage": "self.splash",
--                 "password": "self.password" }
-+    commands = { "default": "default",
-+                 "timeout": "timeout",
-+                 "fallback": "fallback",
-+                 "hiddenmenu": "hiddenmenu",
-+                 "splashimage": "splash",
-+                 "password": "password" }
-     for c in ("bootp", "color", "device", "dhcp", "hide", "ifconfig",
-               "pager", "partnew", "parttype", "rarp", "serial",
-               "setkey", "terminal", "terminfo", "tftpserver", "unhide"):
-diff -rup xen-3.1.0-src.orig/tools/pygrub/src/LiloConf.py xen-3.1.0-src/tools/pygrub/src/LiloConf.py
---- xen-3.1.0-src.orig/tools/pygrub/src/LiloConf.py	2007-05-18 07:45:21.000000000 -0700
-+++ xen-3.1.0-src/tools/pygrub/src/LiloConf.py	2007-09-26 14:52:30.000000000 -0700
-@@ -30,7 +30,7 @@ class LiloImage(object):
- 
-         if self.commands.has_key(com):
-             if self.commands[com] is not None:
--                exec("%s = r\'%s\'" %(self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())))
-+                setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip()))
-             else:
-                 logging.info("Ignored image directive %s" %(com,))
-         else:
-@@ -56,12 +56,12 @@ class LiloImage(object):
-     initrd = property(get_initrd, set_initrd)
- 
-     # set up command handlers
--    commands = { "label": "self.title",
--                 "root": "self.root",
--                 "rootnoverify": "self.root",
--                 "image": "self.kernel",
--                 "initrd": "self.initrd",
--                 "append": "self.args",
-+    commands = { "label": "title",
-+                 "root": "root",
-+                 "rootnoverify": "root",
-+                 "image": "kernel",
-+                 "initrd": "initrd",
-+                 "append": "args",
-                  "read-only": None,
-                  "chainloader": None,
-                  "module": None}
-@@ -111,7 +111,7 @@ class LiloConfigFile(object):
-             (com, arg) = GrubConf.grub_exact_split(l, 2)
-             if self.commands.has_key(com):
-                 if self.commands[com] is not None:
--                    exec("%s = r\"%s\"" %(self.commands[com], arg.strip()))
-+                    setattr(self, self.commands[com], arg.strip())
-                 else:
-                     logging.info("Ignored directive %s" %(com,))
-             else:
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
deleted file mode 100644
index ea5a2177b6a0..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-With xen-3.1.0 on Pardus 2007, "/usr/sbin/xend start" returns "Cannot find Xen 
-Python modules." cause Xen Python modules installed 
-into "/usr/lib/python2.4/site-packages/"
-
-Following patch adds site-packages into search path
-
-Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
-
-diff -r aee991c7723a tools/misc/xen-python-path
---- a/tools/misc/xen-python-path	Wed May 09 16:34:47 2007 +0100
-+++ b/tools/misc/xen-python-path	Sat May 19 02:24:24 2007 +0300
-@@ -30,12 +30,13 @@ import sys
- 
- for p in ['python%s' % sys.version[:3], 'python']:
-     for l in ['/usr/lib64', '/usr/lib']:
--        d = os.path.join(l, p)
--        if os.path.exists(os.path.join(d, AUXBIN)):
--            sys.path.append(d)
--            import xen.util.auxbin
--            print os.path.join(xen.util.auxbin.libpath(), p)
--            sys.exit(0)
-+        for k in ['', 'site-packages/']:
-+            d = os.path.join(l, p, k)
-+            if os.path.exists(os.path.join(d, AUXBIN)):
-+                sys.path.append(d)
-+                import xen.util.auxbin
-+                print os.path.join(xen.util.auxbin.libpath(), p)
-+                sys.exit(0)
- 
- print >>sys.stderr, "Cannot find Xen Python modules."
- sys.exit(1)
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.1-insecure-file-creation-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.1.1-insecure-file-creation-fix.patch
deleted file mode 100644
index 9746f6ffca64..000000000000
--- a/app-emulation/xen-tools/files/xen-tools-3.1.1-insecure-file-creation-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-
-# HG changeset patch
-# User Keir Fraser <keir@xensource.com>
-# Date 1193128003 -3600
-# Node ID b28ae5f00553ea053bd4e4576634d8ea49e77bc3
-# Parent 118a21c66fd53a08d7191159e5b2888f8d9e4ad2
-xenmon: Fix security vulnerability CVE-2007-3919.
-
-The xenbaked daemon and xenmon utility communicate via a mmap'ed
-shared file. Since this file is located in /tmp, unprivileged users
-can cause arbitrary files to be truncated by creating a symlink from
-the well-known /tmp filename to e.g., /etc/passwd.
-
-The fix is to place the shared file in a directory to which only root
-should have access (in this case /var/run/).
-
-This bug was reported, and the fix suggested, by Steve Kemp
-<skx@debian.org>. Thanks!
-
-Signed-off-by: Keir Fraser <keir@xensource.com>
-
---- a/tools/xenmon/xenbaked.c	Mon Oct 22 21:06:11 2007 +0100
-+++ b/tools/xenmon/xenbaked.c	Tue Oct 23 09:26:43 2007 +0100
-@@ -589,7 +589,7 @@ error_t cmd_parser(int key, char *arg, s
-     return 0;
- }
- 
--#define SHARED_MEM_FILE "/tmp/xenq-shm"
-+#define SHARED_MEM_FILE "/var/run/xenq-shm"
- void alloc_qos_data(int ncpu)
- {
-     int i, n, pgsize, off=0;
---- a/tools/xenmon/xenmon.py	Mon Oct 22 21:06:11 2007 +0100
-+++ b/tools/xenmon/xenmon.py	Tue Oct 23 09:26:43 2007 +0100
-@@ -46,7 +46,7 @@ QOS_DATA_SIZE = struct.calcsize(ST_QDATA
- QOS_DATA_SIZE = struct.calcsize(ST_QDATA)*NSAMPLES + struct.calcsize(ST_DOM_INFO)*NDOMAINS + struct.calcsize("4i")
- 
- # location of mmaped file, hard coded right now
--SHM_FILE = "/tmp/xenq-shm"
-+SHM_FILE = "/var/run/xenq-shm"
- 
- # format strings
- TOTALS = 15*' ' + "%6.2f%%" + 35*' ' + "%6.2f%%"
-