Fix a PTRACE_* compilation error, thanks to Thomas Veith <th_veith@web.de>

Package-Manager: portage-2.1.1

5 files changed, 240 insertions, 0 deletions

diff --git a/app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch b/app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch
new file mode 100644
index 000000000000..2132a6378711
--- /dev/null
+++ b/app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch
@@ -0,0 +1,56 @@
+diff -urN xen-3.0.2/tools/pygrub/src/fsys/reiser/reisermodule.c xen-3.0.2-b/tools/pygrub/src/fsys/reiser/reisermodule.c
+--- xen-3.0.2/tools/pygrub/src/fsys/reiser/reisermodule.c	2006-04-09 18:05:53.000000000 -0400
++++ xen-3.0.2-b/tools/pygrub/src/fsys/reiser/reisermodule.c	2006-08-18 12:51:42.000000000 -0400
+@@ -17,7 +17,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+-#include <dal/file_dal.h>
++#include <dal/file.h>
+ #include <reiserfs/reiserfs.h>
+ 
+ #if (PYTHON_API_VERSION >= 1011)
+@@ -46,8 +46,7 @@
+ 
+ 	if (!dal) return;
+ 
+-	close((int)(unsigned long)dal->dev);
+-	dal_free(dal);
++	dal_close(dal);
+ }
+ 
+ /* reiser file object */
+@@ -195,7 +194,7 @@
+     if (fs->fs != NULL)
+     {
+         reiserfs_fs_close(fs->fs);
+-        file_dal_close(fs->dal);
++        file_close(fs->dal);
+ 		fs->fs = NULL;
+     }
+     Py_INCREF(Py_None);
+@@ -218,13 +217,13 @@
+         return NULL;
+     }
+ 
+-    if (!(dal = file_dal_open(name, block_size, O_RDONLY))) {
++    if (!(dal = file_open(name, block_size, O_RDONLY))) {
+         PyErr_SetString(PyExc_ValueError, "Couldn't create device abstraction");
+         return NULL;    
+     }
+     
+     if (!(rfs = reiserfs_fs_open_fast(dal, dal))) {
+-		file_dal_close(dal);
++		file_close(dal);
+         PyErr_SetString(PyExc_ValueError, "unable to open file");
+         return NULL;
+     }
+@@ -265,7 +264,7 @@
+     if (fs->fs != NULL)
+ 	{
+         reiserfs_fs_close(fs->fs);
+-		file_dal_close(fs->dal);
++		file_close(fs->dal);
+ 		fs->fs = NULL;
+ 	}
+ 	PyObject_DEL(fs);
diff --git a/app-emulation/xen-tools/files/3.0.2-r4/xc_ptrace.patch b/app-emulation/xen-tools/files/3.0.2-r4/xc_ptrace.patch
new file mode 100644
index 000000000000..af51c3d88a77
--- /dev/null
+++ b/app-emulation/xen-tools/files/3.0.2-r4/xc_ptrace.patch
@@ -0,0 +1,24 @@
+--- tools/libxc/xc_ptrace.c-orig	2006-10-13 15:53:29.000000000 +1000
++++ tools/libxc/xc_ptrace.c	2006-10-13 15:54:06.000000000 +1000
+@@ -597,17 +597,13 @@
+             online_vcpus_changed(cpumap);
+         break;
+ 
+-    case PTRACE_SETFPREGS:
+-    case PTRACE_SETFPXREGS:
+-    case PTRACE_PEEKUSER:
+-    case PTRACE_POKEUSER:
+-    case PTRACE_SYSCALL:
+-    case PTRACE_KILL:
+-        goto out_unspported; /* XXX not yet supported */
+-
+     case PTRACE_TRACEME:
+         printf("PTRACE_TRACEME is an invalid request under Xen\n");
+         goto out_error;
++
++    default:
++        goto out_unspported; /* XXX not yet supported */
++
+     }
+ 
+     return retval;
diff --git a/app-emulation/xen-tools/files/3.0.2-r4/xend.initd b/app-emulation/xen-tools/files/3.0.2-r4/xend.initd
new file mode 100644
index 000000000000..3ecd31f8661d
--- /dev/null
+++ b/app-emulation/xen-tools/files/3.0.2-r4/xend.initd
@@ -0,0 +1,61 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/3.0.2-r4/xend.initd,v 1.1 2006/10/14 00:00:03 aross Exp $
+
+opts="start stop status restart"
+
+depend() {
+	need net
+	before xendomains sshd ntp-client ntpd nfs nfsmount rsyncd portmap dhcp
+}
+
+await_daemons_up() {
+	for ((i=0; i<5; i++)); do
+		sleep 1
+		/usr/sbin/xend status && return 0
+	done
+	return 1
+}
+
+is_privileged_domain() {
+	grep -qsE '^control_d$' /proc/xen/capabilities
+	return $?
+}
+
+start() {
+	if is_privileged_domain ; then
+		ebegin "Starting Xen control daemon"
+		/usr/sbin/xend start
+		/usr/sbin/xend status || await_daemons_up
+		eend $?
+	else
+		eerror "Can't start xend - this is not a privileged domain."
+		return 1
+	fi
+}
+
+stop() {
+	if [ "$(xm list | wc -l)" -gt 2 ]; then
+		ebegin "  Stopping all domains"
+		/usr/sbin/xm shutdown --all --wait >/dev/null
+		eend $?
+	fi
+
+	ebegin "Stopping Xen control daemon"
+	/usr/sbin/xend stop
+	eend $?
+
+	# This needs more testing (bug #149321)
+	#ebegin "Stopping xenconsoled"
+	#kill $(</var/run/xenconsoled.pid)
+	#eend $?
+
+	#ebegin "Stopping xenstored"
+	#kill $(</var/run/xenstore.pid)
+	#eend $?
+}
+
+status() {
+	is_privileged_domain && /usr/sbin/xend status
+}
diff --git a/app-emulation/xen-tools/files/3.0.2-r4/xendomains.initd b/app-emulation/xen-tools/files/3.0.2-r4/xendomains.initd
new file mode 100755
index 000000000000..039c76527aa1
--- /dev/null
+++ b/app-emulation/xen-tools/files/3.0.2-r4/xendomains.initd
@@ -0,0 +1,96 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/3.0.2-r4/xendomains.initd,v 1.1 2006/10/14 00:00:03 aross Exp $
+
+opts="start stop status restart"
+
+depend() {
+	need xend
+	after dhcp
+}
+
+get_domname() {
+	local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alnum:]_\.-]+)\"?\W*;?/\1/p' "${1}" | tail -n 1)
+
+	if [[ -z ${name_from_file} ]] ; then
+		basename "${1}"
+	else
+		echo ${name_from_file}	
+	fi
+}
+
+is_running() {
+	/usr/sbin/xm list "${1}" >/dev/null 2>&1
+}
+
+using_screen() {
+	[[ "${SCREEN}" == "yes" || "${SCREEN}" == "YES" ]]	
+}
+
+set_screen_cmd() {
+	screen_cmd="screen -q -r ${SCREEN_NAME:=xen} -X"
+}
+
+start() {
+	set_screen_cmd
+
+	einfo "Starting Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	if using_screen ; then
+		ebegin "Creating screen session to hold domain consoles"
+		(  screen -d -m -S ${SCREEN_NAME} -t dom0 \
+		&& ${screen_cmd} zombie dr \
+		&& logrotate -f /etc/xen/xen-consoles.logrotate \
+		&& ${screen_cmd} logfile  /var/log/xen-consoles/%t.log \
+		&& ${screen_cmd} logfile flush ${SCREEN_LOG_INTERVAL:-1} \
+		&& ${screen_cmd} log on \
+		&& ${screen_cmd} deflog on ) >/dev/null
+		if [[ $? -ne 0 ]] ; then
+			eend 1
+			return 1
+		else
+			eend
+		fi
+	fi
+	# Create all domains with config files in AUTODIR.
+	for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do
+		name=$(get_domname ${dom})
+		if ! is_running ${name} ; then
+			ebegin "  Starting domain ${name}"
+			if using_screen ; then
+				${screen_cmd} screen -t ${name} xm create ${dom} -c
+			else
+				xm create --quiet ${dom}
+			fi
+			eend $?
+		else
+			einfo "  Not starting domain ${name} - already running"
+		fi
+	done
+}
+
+stop() {
+	set_screen_cmd
+
+	einfo "Shutting down Xen domains from ${AUTODIR:=/etc/xen/auto}"
+	# Stop all domains with config files in AUTODIR.
+	for dom in $(ls "${AUTODIR}/"* 2>/dev/null); do
+		name=$(get_domname ${dom})
+		if is_running ${name} ; then
+			ebegin "  Stopping domain ${name}"
+				xm shutdown --wait ${name} >/dev/null
+			eend $?
+		else
+			einfo "  Not stopping domain ${name} - not running"
+		fi
+	done
+	if using_screen ; then
+		ebegin "Closing screen session ${SCREEN_NAME}"
+		${screen_cmd} quit
+		eend $?
+	fi
+}
+
+status() {
+	/usr/sbin/xm list
+}
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
new file mode 100644
index 000000000000..724d092d5489
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
@@ -0,0 +1,3 @@
+MD5 544eab940a0734a55459d648e5c3b224 xen-3.0.2-src.tgz 4933621
+RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af xen-3.0.2-src.tgz 4933621
+SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 xen-3.0.2-src.tgz 4933621