Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to stable-0.61 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 utils/xen/DETAILS      |    2 +-
 utils/xen/HISTORY      |    4 ++++
 utils/xen/PRE_BUILD    |    2 ++
 utils/xen/xsa-19.patch |   11 +++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit a681306705ba3b7843835d9ccc59c0be2cd37474
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    xen: fixed XSA-19 (CVE-2012-4411)
    (cherry picked from commit 6b2823eb0386456ba6e7bbfa12ef9a9aaa1b6481)

diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index 67152df..e04dcd6 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xen
          VERSION=4.1.3
-  SECURITY_PATCH=1
+  SECURITY_PATCH=2
           SOURCE=${SPELL}-${VERSION}.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index f0d4528..7ce226d 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,7 @@
+2012-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: SECURITY_PATCH++
+       * xsa-19.patch: added, to fix CVE-2012-4411
+
 2012-08-11 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.1.3; SECURITY_PATCH=1
 
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index c7f9a4a..4a7ade4 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd ${SOURCE_DIRECTORY} &&
 
+patch -p0 < "$SPELL_DIRECTORY/xsa-19.patch" &&
+
 if [[ $XEN_UPINIT != y ]]; then
   sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
 fi &&
diff --git a/utils/xen/xsa-19.patch b/utils/xen/xsa-19.patch
new file mode 100644
index 0000000..65b25ca
--- /dev/null
+++ b/utils/xen/xsa-19.patch
@@ -0,0 +1,11 @@
+--- tools/ioemu-qemu-xen/vl.c.orig     2012-04-24 21:35:40.000000000 +0400
++++ tools/ioemu-qemu-xen/vl.c  2012-09-19 14:44:19.190522811 +0400
+@@ -4910,7 +4910,7 @@
+     kernel_cmdline = "";
+     cyls = heads = secs = 0;
+     translation = BIOS_ATA_TRANSLATION_AUTO;
+-    monitor_device = "vc:80Cx24C";
++    monitor_device = "null";
+ 
+     serial_devices[0] = "vc:80Cx24C";
+     for(i = 1; i < MAX_SERIAL_PORTS; i++)