diff options
author | Andrew Ross <aross@gentoo.org> | 2007-06-14 06:29:06 +0000 |
---|---|---|
committer | Andrew Ross <aross@gentoo.org> | 2007-06-14 06:29:06 +0000 |
commit | 7fe5b6a300e8399a6ef90d001f506b2ec2488dc2 (patch) | |
tree | 95778f32308cdd4541882d2407aed4e9c55490fc | |
parent | postfix-2.4 has hit the main tree already! (diff) | |
download | aross-7fe5b6a300e8399a6ef90d001f506b2ec2488dc2.tar.gz aross-7fe5b6a300e8399a6ef90d001f506b2ec2488dc2.tar.bz2 aross-7fe5b6a300e8399a6ef90d001f506b2ec2488dc2.zip |
Remove old Xen-related ebuilds.
svn path=/; revision=52
43 files changed, 0 insertions, 1849 deletions
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest deleted file mode 100644 index bbb3bef..0000000 --- a/app-emulation/libvirt/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -DIST libvirt-0.1.4.tar.gz 609075 RMD160 bf120066a7c551c307cdf68d0e8ec283d1547cda SHA1 56233639f56133cd3b503b8691188b72a2e76504 SHA256 ad7a27c732aaec3c1c1f56304326509eb031fd79d06bb72abd872a1e663e1566 -EBUILD libvirt-0.1.4.ebuild 635 RMD160 3ef4d369d7dec38f16acbf4947b1007cb498b4ed SHA1 fc7a1eaf764ae8610e2a45925f5edae2eefae19a SHA256 9a02e64d86c3e3357643b28a47d0b0a6427616fdd7532455118df77d60fd25d5 -MD5 1395c32e034687575baa13e2d716a671 libvirt-0.1.4.ebuild 635 -RMD160 3ef4d369d7dec38f16acbf4947b1007cb498b4ed libvirt-0.1.4.ebuild 635 -SHA256 9a02e64d86c3e3357643b28a47d0b0a6427616fdd7532455118df77d60fd25d5 libvirt-0.1.4.ebuild 635 -MD5 ea2b94745f7deeac5286231bd7bfe568 files/digest-libvirt-0.1.4 241 -RMD160 4b9c4e810002d6dfde861a0b19ab7535746bcfab files/digest-libvirt-0.1.4 241 -SHA256 3b6f9a8be1f9f2155db2f82efe1628b2255c9cc3447fedcf2766e45823a37fe5 files/digest-libvirt-0.1.4 241 diff --git a/app-emulation/libvirt/files/digest-libvirt-0.1.4 b/app-emulation/libvirt/files/digest-libvirt-0.1.4 deleted file mode 100644 index 9a760bb..0000000 --- a/app-emulation/libvirt/files/digest-libvirt-0.1.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d8479551ac2b7ff19341961b8ef9acc4 libvirt-0.1.4.tar.gz 609075 -RMD160 bf120066a7c551c307cdf68d0e8ec283d1547cda libvirt-0.1.4.tar.gz 609075 -SHA256 ad7a27c732aaec3c1c1f56304326509eb031fd79d06bb72abd872a1e663e1566 libvirt-0.1.4.tar.gz 609075 diff --git a/app-emulation/libvirt/libvirt-0.1.4.ebuild b/app-emulation/libvirt/libvirt-0.1.4.ebuild deleted file mode 100644 index 539de65..0000000 --- a/app-emulation/libvirt/libvirt-0.1.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.1.4.ebuild,v 1.1 2006/08/24 21:45:03 agriffis Exp $ - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="http://www.libvirt.org/" -SRC_URI="ftp://libvirt.org/libvirt/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-libs/readline - sys-libs/ncurses - dev-libs/libxml2 - app-emulation/xen-tools - dev-lang/python" - -src_install() { - make DESTDIR=${D} install || die - mv ${D}/usr/share/doc/{${PN}-python*,${P}/python} -} diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest deleted file mode 100644 index d936d19..0000000 --- a/app-emulation/xen-tools/Manifest +++ /dev/null @@ -1,68 +0,0 @@ -AUX 3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 RMD160 c77b33651e07273a613e3fc6379d80eb48315f39 SHA1 92256c3d1caeacc54f6e75c987ea302bb234a649 SHA256 1cbbd32e3130f375ca95409bd39ab817be987f029bd0ba349f1b9279eaf5b857 -MD5 c8951e871a571c6dd3d00d8b4642bd76 files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 -RMD160 c77b33651e07273a613e3fc6379d80eb48315f39 files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 -SHA256 1cbbd32e3130f375ca95409bd39ab817be987f029bd0ba349f1b9279eaf5b857 files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 -AUX 3.0.2-r4/xend.initd 1187 RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 SHA1 f16d2d5e014c91b6bc0ff63da717e79b4faada1d SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd -MD5 e62f964336e77b320dcff0321d6166cf files/3.0.2-r4/xend.initd 1187 -RMD160 6e5313e02198700204b27e4b02f8579a247aa2a0 files/3.0.2-r4/xend.initd 1187 -SHA256 1e619990ccebe11dab4c6fa1a6e4e0e1101854f633ef9c05836d0e9fba25d5cd files/3.0.2-r4/xend.initd 1187 -AUX 3.0.2-r4/xendomains.initd 2168 RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 SHA1 a7f75a7aff0ffdb3ca330f853855b888cfb7f752 SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0 -MD5 a3b477fa44710894c47b0aeca7d6a57a files/3.0.2-r4/xendomains.initd 2168 -RMD160 c6dc22f50cf575393cb076c2abfff8b3f24b5540 files/3.0.2-r4/xendomains.initd 2168 -SHA256 ed1adcb24e5ffe1c0abc33d6bd69f129b31b3d4f068222ee343809a8dd12b8d0 files/3.0.2-r4/xendomains.initd 2168 -AUX xen-consoles.logrotate 63 RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 SHA1 6f88a4da3349aade6070dfc5c4465e2c00f3e68c SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 -MD5 9df68ac65dc3f372f5d61183abdc83ff files/xen-consoles.logrotate 63 -RMD160 035bd8baf1ba68a5525bab4379c0c4e350001a74 files/xen-consoles.logrotate 63 -SHA256 0da87a4b9094f934e3de937e8ef8d3afc752e76793aa3d730182d0241e118b19 files/xen-consoles.logrotate 63 -AUX xen-tools-3.0.2--as-needed.patch 283 RMD160 852e850b72b9860420f5f2132c2e071474bc87ba SHA1 cb33bd39091a7ddca2a97a3e80d673adcec77895 SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919 -MD5 7c8f508f547c0e1f78b185fd9f980b1b files/xen-tools-3.0.2--as-needed.patch 283 -RMD160 852e850b72b9860420f5f2132c2e071474bc87ba files/xen-tools-3.0.2--as-needed.patch 283 -SHA256 9fcf772662863f74f4dc7cbc7ec195c2ad447ea757364e0cd6907d633d237919 files/xen-tools-3.0.2--as-needed.patch 283 -AUX xen-tools-3.0.2-bxclobber.patch 734 RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 SHA1 438b38917239aa4e40d65b2378ca44f2c2aaca5f SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191 -MD5 fc279066e82ced30850c046be2642ee1 files/xen-tools-3.0.2-bxclobber.patch 734 -RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 files/xen-tools-3.0.2-bxclobber.patch 734 -SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191 files/xen-tools-3.0.2-bxclobber.patch 734 -AUX xen-tools-3.0.2-pushpop.patch 796 RMD160 d15cb8ed948f4706912da53d9406852103438895 SHA1 1fc228381bfcbfa5c0203cd37352d912e66f7b37 SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96 -MD5 d77478e538be4f38ca70f3b3ead939f4 files/xen-tools-3.0.2-pushpop.patch 796 -RMD160 d15cb8ed948f4706912da53d9406852103438895 files/xen-tools-3.0.2-pushpop.patch 796 -SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96 files/xen-tools-3.0.2-pushpop.patch 796 -AUX xen-tools-3.0.2-test-uuid.patch 777 RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 SHA1 2c60427e1dcc7995a25e38295297a2c7ae620893 SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c -MD5 3b1e6f226e33f6d583cd1a6b6760c9f4 files/xen-tools-3.0.2-test-uuid.patch 777 -RMD160 268ddfc7d8c194d43e8c24a9966561df04246196 files/xen-tools-3.0.2-test-uuid.patch 777 -SHA256 e789ef34b4a7066b7b476675d04d14b1a4272708c8ba51c5d4930119acbec76c files/xen-tools-3.0.2-test-uuid.patch 777 -AUX xen-tools-3.0.2-test-xauthority.patch 2362 RMD160 4974965318e02b151c0ba2cb516b4f246388e465 SHA1 45ad2861132d7dda81788cc2854cf8be33afb7d6 SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452 -MD5 0f94816ea4743531f5919592ce077c00 files/xen-tools-3.0.2-test-xauthority.patch 2362 -RMD160 4974965318e02b151c0ba2cb516b4f246388e465 files/xen-tools-3.0.2-test-xauthority.patch 2362 -SHA256 a232f43a7a560b6cdea93daca422addbbc85f3ee75d10895423db3d5d3c6a452 files/xen-tools-3.0.2-test-xauthority.patch 2362 -AUX xend.initd 993 RMD160 0d24a6f194976e0f7b9173a29c49b45e7acec656 SHA1 30344990846eaaf46b6cc7182f493fe14dcff1ae SHA256 339bcae98acd8137992c91e424d5bb805e11b29e5391215da24241ba710742ef -MD5 bf51eb9bcb9a310dd7f9d7b90c0b2970 files/xend.initd 993 -RMD160 0d24a6f194976e0f7b9173a29c49b45e7acec656 files/xend.initd 993 -SHA256 339bcae98acd8137992c91e424d5bb805e11b29e5391215da24241ba710742ef files/xend.initd 993 -AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a -MD5 65a57a4fae5a300aed8b84c24cdeee42 files/xendomains-screen.confd 594 -RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 files/xendomains-screen.confd 594 -SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a files/xendomains-screen.confd 594 -AUX xendomains.confd 163 RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 SHA1 bf9a43a4812947189c9bedbf0f1b457f39f50893 SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef -MD5 b9420a9887a4b4ca6749006f5586f130 files/xendomains.confd 163 -RMD160 4bbf857cdfe7c15b5e3eac437020f4d9ac7dd837 files/xendomains.confd 163 -SHA256 980eca0fe5723ac9941b28227818c430a16d63786f499f621cf62ddcc99f9aef files/xendomains.confd 163 -AUX xendomains.initd 2272 RMD160 ef57e016a0c6076f385ece4da77ea62b18349924 SHA1 2cca3a2aff6a42db6c00e228da84a23220f3a760 SHA256 6cdba349028a8af689a960a700f32f2e146334c38ae75b8afd7141dbd160d000 -MD5 99faf5e0acd1af480c0676189ffe7c9a files/xendomains.initd 2272 -RMD160 ef57e016a0c6076f385ece4da77ea62b18349924 files/xendomains.initd 2272 -SHA256 6cdba349028a8af689a960a700f32f2e146334c38ae75b8afd7141dbd160d000 files/xendomains.initd 2272 -DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 -DIST xen-3.0.3_0-src.tgz 5465968 RMD160 528020035ee32144b52bcdfccc8c44708b0196ea SHA1 9505ae3a5a42bc969836de81f501341409291f78 SHA256 7220bb4b0474e530559f558fcb4da8c88f1095c8e2f420602a26dfea5020443f -EBUILD xen-tools-3.0.2-r4.ebuild 5606 RMD160 4e79b938e0c67f8b74b0c7a59634e0f95408a913 SHA1 1ed7cec4f074a923e85d4abe055f4f68610225f3 SHA256 4bbfe1ce372e6c21e87e7177757b847361669e371dfa9c30ba80590d80527e74 -MD5 0ddef7e6f6bf4b683d51ac27aed477c8 xen-tools-3.0.2-r4.ebuild 5606 -RMD160 4e79b938e0c67f8b74b0c7a59634e0f95408a913 xen-tools-3.0.2-r4.ebuild 5606 -SHA256 4bbfe1ce372e6c21e87e7177757b847361669e371dfa9c30ba80590d80527e74 xen-tools-3.0.2-r4.ebuild 5606 -EBUILD xen-tools-3.0.3.ebuild 5342 RMD160 f3d0c4f548466e8953fd7179babd3dca108d7819 SHA1 d083c0e5d6bded1b11bdc97b08f83b4ab1393698 SHA256 37ced9dbd238a877d96e193d3c2513d3cdbc99aa1dab54e04d786764a1ab9730 -MD5 3d94dc14583940c924da1d6408385967 xen-tools-3.0.3.ebuild 5342 -RMD160 f3d0c4f548466e8953fd7179babd3dca108d7819 xen-tools-3.0.3.ebuild 5342 -SHA256 37ced9dbd238a877d96e193d3c2513d3cdbc99aa1dab54e04d786764a1ab9730 xen-tools-3.0.3.ebuild 5342 -MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r4 235 -RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r4 235 -SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r4 235 -MD5 12dd00fa0bb9c2e41430eb5ce8982919 files/digest-xen-tools-3.0.3 241 -RMD160 49d94fe9ef9ea6b0c3b47ab119fe58bfee581e89 files/digest-xen-tools-3.0.3 241 -SHA256 bd445798febcfd9845666be6a1f8a0969d951389aa4984f6a8445eab6bac43fd files/digest-xen-tools-3.0.3 241 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 deleted file mode 100644 index 2132a63..0000000 --- a/app-emulation/xen-tools/files/3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch +++ /dev/null @@ -1,56 +0,0 @@ -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/xend.initd b/app-emulation/xen-tools/files/3.0.2-r4/xend.initd deleted file mode 100644 index 7c24793..0000000 --- a/app-emulation/xen-tools/files/3.0.2-r4/xend.initd +++ /dev/null @@ -1,61 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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 deleted file mode 100755 index 6b408f9..0000000 --- a/app-emulation/xen-tools/files/3.0.2-r4/xendomains.initd +++ /dev/null @@ -1,96 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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 deleted file mode 100644 index 724d092..0000000 --- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4 +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.3 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.3 deleted file mode 100644 index c045c5b..0000000 --- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 75d895858a467405114599abf94d60a2 xen-3.0.3_0-src.tgz 5465968 -RMD160 528020035ee32144b52bcdfccc8c44708b0196ea xen-3.0.3_0-src.tgz 5465968 -SHA256 7220bb4b0474e530559f558fcb4da8c88f1095c8e2f420602a26dfea5020443f xen-3.0.3_0-src.tgz 5465968 diff --git a/app-emulation/xen-tools/files/xen-consoles.logrotate b/app-emulation/xen-tools/files/xen-consoles.logrotate deleted file mode 100644 index c644523..0000000 --- a/app-emulation/xen-tools/files/xen-consoles.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xen-consoles/*.log { - rotate 7 - missingok - compress -} diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch deleted file mode 100644 index 362e495..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- xen-3.0.2/tools/xenmon/Makefile 2006-06-01 13:40:40.468687762 +0100 -+++ xen-3.0.2/tools/xenmon/Makefile 2006-06-01 13:41:04.000000000 +0100 -@@ -43,6 +43,6 @@ - - - %: %.c Makefile -- $(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl - - diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch deleted file mode 100644 index 8f0b561..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# User vhanquez@kneesa.uk.xensource.com -# Date Mon Apr 10 14:51:10 2006 +0000 -# Node ID bdec77028194e6f51872b66b0575ed86ad542333 -# parent: 07af1b34d4c49ac52faaff6cb315231655212316 -fix bug #609 - error: PIC register `bx' clobbered in `asm' - -Signed-off-by: Vincent Hanquez <vincent@xensource.com> - - ---- a/tools/ioemu/hw/vga.c Mon Apr 10 14:47:51 2006 +0100 -+++ b/tools/ioemu/hw/vga.c Mon Apr 10 14:51:10 2006 +0000 -@@ -1369,10 +1369,10 @@ static inline unsigned int cpuid_edx(uns - { - unsigned int eax, edx; - -- __asm__("cpuid" -+ __asm__("pushl %%ebx; cpuid; popl %%ebx" - : "=a" (eax), "=d" (edx) - : "0" (op) -- : "bx", "cx"); -+ : "cx"); - - return edx; - } - diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch deleted file mode 100644 index 807e007..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch +++ /dev/null @@ -1,32 +0,0 @@ -# HG changeset patch -# User kaf24@firebug.cl.cam.ac.uk -# Date Mon Apr 10 17:25:42 2006 +0100 -# Node ID c89d62e7015a25a48225daa929616a5ed44205b4 -# parent: 4088dd0856a9cbc7ef050d7272e81666b7dfbcc7 -Fix push/pop usage in tools/ioemu for x86/64. - -Signed-off-by: Keir Fraser <keir@xensource.com> - - - ---- a/tools/ioemu/hw/vga.c Mon Apr 10 17:16:25 2006 +0100 -+++ b/tools/ioemu/hw/vga.c Mon Apr 10 17:25:42 2006 +0100 -@@ -1369,10 +1369,16 @@ static inline unsigned int cpuid_edx(uns - { - unsigned int eax, edx; - -- __asm__("pushl %%ebx; cpuid; popl %%ebx" -+#ifdef __x86_64__ -+#define __bx "rbx" -+#else -+#define __bx "ebx" -+#endif -+ __asm__("push %%"__bx"; cpuid; pop %%"__bx - : "=a" (eax), "=d" (edx) - : "0" (op) - : "cx"); -+#undef __ebx - - return edx; - } - diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch deleted file mode 100644 index b4829e4..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Backported from -# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00086.html - ---- tools/python/xen/xend/tests/test_uuid.py 2006-07-22 12:10:00.000000000 +1000 -+++ tools/python/xen/xend/tests/test_uuid.py 2006-07-22 12:11:01.000000000 +1000 -@@ -21,9 +21,9 @@ - self.assertEqual(uuid.toString(inp), expected) - self.assertEqual(uuid.fromString(expected), inp) - -- t([0 for _ in range(0, 16)], "00000000-00000000-00000000-00000000") -+ t([0 for _ in range(0, 16)], "00000000-0000-0000-0000-000000000000") - t([185, 158, 125, 206, 250, 178, 125, 57, 2, 6, 162, 74, 178, 236, -- 196, 5], "b99e7dce-fab27d39-0206a24a-b2ecc405") -+ 196, 5], "b99e7dce-fab2-7d39-0206-a24ab2ecc405") - - - def test_suite(): diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch deleted file mode 100644 index c462c59..0000000 --- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch +++ /dev/null @@ -1,72 +0,0 @@ -# Backported from -# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00087.html - ---- tools/python/xen/xm/create.py 2006-07-22 12:50:35.000000000 +1000 -+++ tools/python/xen/xm/create.py 2006-07-22 12:52:52.000000000 +1000 -@@ -850,6 +850,16 @@ - opts.info("Started domain %s" % (dom)) - return int(sxp.child_value(dominfo, 'domid')) - -+def get_xauthority(): -+ xauth = os.getenv("XAUTHORITY") -+ if not xauth: -+ home = os.getenv("HOME") -+ if not home: -+ import posix, pwd -+ home = pwd.getpwuid(posix.getuid())[5] -+ xauth = home + "/.Xauthority" -+ return xauth -+ - def parseCommandLine(argv): - gopts.reset() - args = gopts.parse(argv) -@@ -864,14 +874,7 @@ - gopts.vals.display = os.getenv("DISPLAY") - - if not gopts.vals.xauthority: -- xauth = os.getenv("XAUTHORITY") -- if not xauth: -- home = os.getenv("HOME") -- if not home: -- import posix, pwd -- home = pwd.getpwuid(posix.getuid())[5] -- xauth = home + "/.Xauthority" -- gopts.vals.xauthority = xauth -+ gopts.vals.xauthority = get_xauthority() - - # Process remaining args as config variables. - for arg in args: ---- tools/python/xen/xm/tests/test_create.py 2006-07-22 12:59:13.000000000 +1000 -+++ tools/python/xen/xm/tests/test_create.py 2006-07-22 12:59:13.000000000 +1000 -@@ -51,6 +51,7 @@ - 'path' : '.:/etc/xen', - 'builder' : 'linux', - 'nics' : -1, -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - -@@ -99,6 +100,7 @@ - 'interface' : 'eth0', - 'path' : '.:/etc/xen', - 'builder' : 'linux', -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - -@@ -138,6 +140,7 @@ - 'path' : '.:/etc/xen', - 'builder' : 'linux', - 'nics' : -1, -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - -@@ -188,6 +191,7 @@ - 'dhcp' : 'off', - 'interface' : 'eth0', - 'path' : '.:/etc/xen', -+ 'xauthority': xen.xm.create.get_xauthority(), - }) - - diff --git a/app-emulation/xen-tools/files/xend.initd b/app-emulation/xen-tools/files/xend.initd deleted file mode 100644 index d7e3bd2..0000000 --- a/app-emulation/xen-tools/files/xend.initd +++ /dev/null @@ -1,52 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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 $? -} - -status() { - is_privileged_domain && /usr/sbin/xend status -} diff --git a/app-emulation/xen-tools/files/xendomains-screen.confd b/app-emulation/xen-tools/files/xendomains-screen.confd deleted file mode 100644 index 1482c0a..0000000 --- a/app-emulation/xen-tools/files/xendomains-screen.confd +++ /dev/null @@ -1,15 +0,0 @@ -# When SCREEN="yes", domains in AUTODIR have their consoles connected to a -# screen session named SCREEN_NAME, with output logged to individual files -# named after each domain and written to /var/log/xen-consoles/ . These files -# are rotated (using app-admin/logrotate) every time xendomains is started. - -SCREEN="yes" -SCREEN_NAME="xen" - -# Number of seconds between writes to screen's logfiles. -# -# Lower values mean more disk activity and hence a possible performance -# impact, but higher values mean a greater chance of loosing some output -# in the event of a crash. - -SCREEN_LOG_INTERVAL="1" diff --git a/app-emulation/xen-tools/files/xendomains.confd b/app-emulation/xen-tools/files/xendomains.confd deleted file mode 100644 index f1d810d..0000000 --- a/app-emulation/xen-tools/files/xendomains.confd +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/conf.d/xendomains - -# Directory of domains to boot. AUTODIR should contain one or more symlinks -# to domain config files in /etc/xen - -AUTODIR=/etc/xen/auto - diff --git a/app-emulation/xen-tools/files/xendomains.initd b/app-emulation/xen-tools/files/xendomains.initd deleted file mode 100755 index 15a263a..0000000 --- a/app-emulation/xen-tools/files/xendomains.initd +++ /dev/null @@ -1,96 +0,0 @@ -#!/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/xendomains.initd,v 1.1 2006/08/14 07:11:47 aross Exp $ - -opts="start stop status restart" - -depend() { - need xend - after dhcp -} - -get_domname() { - local name_from_file=$(sed -rn 's/^name\W*=\W*\"?([[:alpha:]_]+)\"?\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/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild deleted file mode 100644 index 34dd089..0000000 --- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit mount-boot flag-o-matic distutils eutils multilib - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.sourceforge.net" -SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${PV}-src.tgz" -S="${WORKDIR}/xen-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags pygrub vnc sdl" - -CDEPEND="dev-lang/python - sys-libs/zlib - sdl? ( media-libs/libsdl ) - vnc? ( media-libs/libsdl ) - pygrub? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )" - -DEPEND="${CDEPEND} - sys-devel/gcc - dev-lang/perl - app-misc/pax-utils - doc? ( - dev-tex/latex2html - media-gfx/transfig - ) - vnc? ( net-libs/libvncserver )" - -RDEPEND="${CDEPEND} - >=app-emulation/xen-3.0.2 - sys-apps/iproute2 - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( sys-fs/udev sys-apps/hotplug )" - -PYTHON_MODNAME="xen grub" - -pkg_setup() { - if use vnc && ! use sdl ; then - ewarn "You have the 'vnc' USE flag set, but not 'sdl'." - ewarn "VNC functionality requires SDL support, so it" - ewarn "will be enabled anyway." - fi - - if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 ; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # xen tries to be smart and filter out CFLAGs not supported by gcc. - # It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does. - for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do - test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}" - done - sed -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" \ - "${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile - - - # Disable the 32bit-only vmxassist if we are not on x86 - # and we don't support the x86 ABI - if ! use x86 && ! has x86 $(get_all_abis); then - sed -i -e "/SUBDIRS += vmxassist/d" "${S}"tools/firmware/Makefile - fi - - if use pygrub; then - # Upstream use Debian and hence progsreiserfs-0.3.0, - # which has a different API to 0.3.1 - epatch "${FILESDIR}/${PVR}"/pygrub-progsreiserfs-0.3.1.patch - else - sed -i -e "/^SUBDIRS += pygrub$/d" "${S}"/tools/Makefile - fi - - # Fixes for hardened and amd64 - epatch "${FILESDIR}"/${P}-bxclobber.patch - epatch "${FILESDIR}"/${P}-pushpop.patch - - # Allow --as-needed LDFLAGS - epatch "${FILESDIR}/${P}"--as-needed.patch - - # Allow building with python-2.5 (bug #149138) - # Backported from upstream - should be in 3.0.3 - sed -i 's/\.2|^2\.3|^2\.4/.[2345]/' "${S}"/tools/check/check_python - - # Fix upstream's broken test cases (bug #141233) - epatch "${FILESDIR}/${P}"-test-uuid.patch - epatch "${FILESDIR}/${P}"-test-xauthority.patch -} - -src_compile() { - local myopt myconf - use debug && myopt="${myopt} debug=y" - - myconf="${myconf} $(use_enable vnc)" - if use vnc ; then - myconf="${myconf} --enable-sdl" - else - myconf="${myconf} $(use_enable sdl)" - fi - - use custom-cflags || unset CFLAGS - gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all - - (cd tools/ioemu && econf ${myconf}) || die "configure failured" - emake -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake -C docs || die "compiling docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - local myopt="XEN_PYTHON_NATIVE_INSTALL=1" - - make DESTDIR="${D}" ${myopt} install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - if use doc; then - make DESTDIR="${D}" -C docs install || die "install docs failed" - # Rename doc/xen to the Gentoo-style doc/xen-x.y - mv "${D}"/usr/share/doc/{${PN},${PF}} - fi - - doman docs/man?/* - - newinitd "${FILESDIR}/${PVR}"/xend.initd xend - newconfd "${FILESDIR}"/xendomains.confd xendomains - newinitd "${FILESDIR}/${PVR}"/xendomains.initd xendomains - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump -} - -pkg_postinst() { - elog "Please visit the Xen and Gentoo wiki:" - elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - if ! built_with_use dev-lang/python ncurses; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen-tools/xen-tools-3.0.3.ebuild b/app-emulation/xen-tools/xen-tools-3.0.3.ebuild deleted file mode 100644 index 653f987..0000000 --- a/app-emulation/xen-tools/xen-tools-3.0.3.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit flag-o-matic distutils eutils multilib - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.sourceforge.net" -XEN_VERSION="3.0.3_0" -SRC_URI="http://bits.xensource.com/oss-xen/release/${XEN_VERSION/_/-}/src.tgz/xen-${XEN_VERSION}-src.tgz" -S="${WORKDIR}/xen-${XEN_VERSION}-src/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags pygrub ioemu" - -CDEPEND="dev-lang/python - sys-libs/zlib - ioemu? ( media-libs/libsdl ) - pygrub? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )" - -DEPEND="${CDEPEND} - sys-devel/gcc - dev-lang/perl - app-misc/pax-utils - doc? ( - dev-tex/latex2html - media-gfx/transfig - ) - ioemu? ( - net-libs/libvncserver - x11-proto/xproto - )" - -RDEPEND="${CDEPEND} - ~app-emulation/xen-${PV} - sys-apps/iproute2 - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( sys-fs/udev sys-apps/hotplug )" - -PYTHON_MODNAME="xen grub" - -pkg_setup() { - if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866" - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 ; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # xen tries to be smart and filter out CFLAGs not supported by gcc. - # It doesn't handle no* flags though, but flag-o-matic's test-flag-CC does. - for FLAG in -nopie -fno-stack-protector -fno-stack-protector-all; do - test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}" - done - sed -i "s/^CFLAGS :=$/& ${HARDFLAGS}/" \ - "${S}"/tools/firmware/{hvmloader,vmxassist}/Makefile - - - # Disable the 32bit-only vmxassist if we are not on x86 and we don't - # support the x86 ABI. Also disable hvmloader, since it requires vmxassist. - if ! use x86 && ! has x86 $(get_all_abis); then - sed -i -e "/SUBDIRS += vmxassist/d" "${S}"/tools/firmware/Makefile - sed -i -e "/SUBDIRS += hvmloader/d" "${S}"/tools/firmware/Makefile - fi - - if use pygrub; then - # Upstream use Debian and hence progsreiserfs-0.3.0, - # which has a different API to 0.3.1 - epatch "${FILESDIR}/"3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch - else - sed -i -e "/^SUBDIRS-y += pygrub$/d" "${S}"/tools/Makefile - fi - - # Don't bother with ioemu, only needed for fully virtualised guests - if ! use ioemu; then - sed -i -e "/^CONFIG_IOEMU := y$/d" "${S}"/config/*.mk - fi -} - -src_compile() { - local myopt myconf - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - gcc-specs-ssp && append-flags -fno-stack-protector -fno-stack-protector-all - - if use ioemu; then - myconf="${myconf} --disable-system --disable-user" - (cd tools/ioemu && econf ${myconf}) || die "configure failured" - fi - - emake -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake -C docs || die "compiling docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - local myopt="XEN_PYTHON_NATIVE_INSTALL=1" - - make DESTDIR="${D}" ${myopt} install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - if use doc; then - make DESTDIR="${D}" -C docs install || die "install docs failed" - # Rename doc/xen to the Gentoo-style doc/xen-x.y - mv "${D}"/usr/share/doc/{${PN},${PF}} - fi - - doman docs/man?/* - - newinitd "${FILESDIR}/3.0.2-r4"/xend.initd xend \ - || die "Couldn't install xen.initd" - newconfd "${FILESDIR}"/xendomains.confd xendomains \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}/3.0.2-r4"/xendomains.initd xendomains \ - || die "Couldn't install xendomains.initd" - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen -} - -pkg_postinst() { - elog "Please visit the Xen and Gentoo wiki:" - elog "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - if ! built_with_use dev-lang/python ncurses; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi -} diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest deleted file mode 100644 index bc57764..0000000 --- a/app-emulation/xen/Manifest +++ /dev/null @@ -1,47 +0,0 @@ -AUX gentoo-makefile-targets 118 RMD160 0ffa087d15a57377b5a32356bdb4f264e4f04f01 SHA1 63012c9b267a270d6dc23ca4a216ece0849318e2 SHA256 21f04a03aeeba9862740669f77b846f1c4745e6d1e070e582fb9312b364f2df9 -MD5 cbd69f44ee0f0649253e7ab4af11d909 files/gentoo-makefile-targets 118 -RMD160 0ffa087d15a57377b5a32356bdb4f264e4f04f01 files/gentoo-makefile-targets 118 -SHA256 21f04a03aeeba9862740669f77b846f1c4745e6d1e070e582fb9312b364f2df9 files/gentoo-makefile-targets 118 -AUX xen-3.0.2-nopiessp.patch 443 RMD160 6143efc84069b1d66c9b3fcc625e7c44b27dbce6 SHA1 d838ea87de1cbf13f3984cc05502a2491acd5c26 SHA256 b206dbb8bf55ece33a851f8c9de511d5abd031825b339df9446ef5689f05c088 -MD5 eb2960e0572c35e38e37d9f16282cfed files/xen-3.0.2-nopiessp.patch 443 -RMD160 6143efc84069b1d66c9b3fcc625e7c44b27dbce6 files/xen-3.0.2-nopiessp.patch 443 -SHA256 b206dbb8bf55ece33a851f8c9de511d5abd031825b339df9446ef5689f05c088 files/xen-3.0.2-nopiessp.patch 443 -AUX xend-conf 347 RMD160 8cc17df2b744342f728f933dea16f61295d52ad0 SHA1 867bd23679aa3a9e99bd5101125de9ebc31c8453 SHA256 3a3f6c87fd4bda91ec944ec7d81e3240e3669f7a089280c5c27385b7062a37ae -MD5 16d372298e94a8eef72c1943b1ed5561 files/xend-conf 347 -RMD160 8cc17df2b744342f728f933dea16f61295d52ad0 files/xend-conf 347 -SHA256 3a3f6c87fd4bda91ec944ec7d81e3240e3669f7a089280c5c27385b7062a37ae files/xend-conf 347 -AUX xend-init 844 RMD160 9d95e22738333da4767c8aa5a53fd993ef79c977 SHA1 a0aba81287cd7b664983474baafd487f00c13b33 SHA256 9f6c5f5e3ca65599cccf2058399a2723b1fdf1d58d572e93ba1303c9915ae6f3 -MD5 b16cb40a29cb947b2a9b76cc8f9f3894 files/xend-init 844 -RMD160 9d95e22738333da4767c8aa5a53fd993ef79c977 files/xend-init 844 -SHA256 9f6c5f5e3ca65599cccf2058399a2723b1fdf1d58d572e93ba1303c9915ae6f3 files/xend-init 844 -AUX xendomains-conf 180 RMD160 17f791a0369e9e1f1cbd15c7513a4ca14d3f5f18 SHA1 b0448805ff0dd0567f5b7d5ce3832553852e6f11 SHA256 78427be48c93ec744206df4dcafaedb584dee8a200efbbc54cba432d96cf0ca3 -MD5 11ef318e35fcfed12931f182fc01955a files/xendomains-conf 180 -RMD160 17f791a0369e9e1f1cbd15c7513a4ca14d3f5f18 files/xendomains-conf 180 -SHA256 78427be48c93ec744206df4dcafaedb584dee8a200efbbc54cba432d96cf0ca3 files/xendomains-conf 180 -AUX xendomains-init 1671 RMD160 e2dbb7b4da5ff8be60532e5a393988f47f28c036 SHA1 9146eaec333f3e4b49066d1b34a390bd27b98cc5 SHA256 19aac7da0ba103ae800ed10b7d151912b3a9476edf63c3651073a197ea291e49 -MD5 a3c0c26c30ce1271b439661b68ca9e74 files/xendomains-init 1671 -RMD160 e2dbb7b4da5ff8be60532e5a393988f47f28c036 files/xendomains-init 1671 -SHA256 19aac7da0ba103ae800ed10b7d151912b3a9476edf63c3651073a197ea291e49 files/xendomains-init 1671 -DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 -DIST xen-3.0.3_0-src.tgz 5465968 RMD160 528020035ee32144b52bcdfccc8c44708b0196ea SHA1 9505ae3a5a42bc969836de81f501341409291f78 SHA256 7220bb4b0474e530559f558fcb4da8c88f1095c8e2f420602a26dfea5020443f -EBUILD xen-3.0.2-r1.ebuild 2513 RMD160 de1bf27d680c6fca08040d08595ce8aebf3e71d2 SHA1 1baf5e3e35ee86d8e958b8d32b1fb12207f8a97d SHA256 b5f532a44bdcdb4258e89abd8a9752a3b534d9a17a3a7c9bfc4a40e052691f5b -MD5 a5d26c8799ac4141a64d7bdf05213ab2 xen-3.0.2-r1.ebuild 2513 -RMD160 de1bf27d680c6fca08040d08595ce8aebf3e71d2 xen-3.0.2-r1.ebuild 2513 -SHA256 b5f532a44bdcdb4258e89abd8a9752a3b534d9a17a3a7c9bfc4a40e052691f5b xen-3.0.2-r1.ebuild 2513 -EBUILD xen-3.0.2.ebuild 2813 RMD160 a976c13cccc9dd0fabab095c7a6f495f58a05728 SHA1 70afd3b5b3306a90b2960854f35524c3f961013d SHA256 2d6ff896b947f7235d4a61689cadb499b2783177ad7eda9f1ffee7ea800c4eae -MD5 824b5794d05d8bccb56eee25012dc09b xen-3.0.2.ebuild 2813 -RMD160 a976c13cccc9dd0fabab095c7a6f495f58a05728 xen-3.0.2.ebuild 2813 -SHA256 2d6ff896b947f7235d4a61689cadb499b2783177ad7eda9f1ffee7ea800c4eae xen-3.0.2.ebuild 2813 -EBUILD xen-3.0.3.ebuild 2448 RMD160 b75f4477bd36333c716bf26c1f93481a66e4d0e9 SHA1 72c0074e673bfe320233333fb984d03842825d10 SHA256 14d6957a8ebf5a6284fe24f707b0ba6fe0c37360898f8dc3b0657d593245851f -MD5 7f1b7f15867ccfc9695cae7046fc9ef9 xen-3.0.3.ebuild 2448 -RMD160 b75f4477bd36333c716bf26c1f93481a66e4d0e9 xen-3.0.3.ebuild 2448 -SHA256 14d6957a8ebf5a6284fe24f707b0ba6fe0c37360898f8dc3b0657d593245851f xen-3.0.3.ebuild 2448 -MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-3.0.2 235 -RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-3.0.2 235 -SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-3.0.2 235 -MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-3.0.2-r1 235 -RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-3.0.2-r1 235 -SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-3.0.2-r1 235 -MD5 12dd00fa0bb9c2e41430eb5ce8982919 files/digest-xen-3.0.3 241 -RMD160 49d94fe9ef9ea6b0c3b47ab119fe58bfee581e89 files/digest-xen-3.0.3 241 -SHA256 bd445798febcfd9845666be6a1f8a0969d951389aa4984f6a8445eab6bac43fd files/digest-xen-3.0.3 241 diff --git a/app-emulation/xen/files/digest-xen-3.0.2 b/app-emulation/xen/files/digest-xen-3.0.2 deleted file mode 100644 index 724d092..0000000 --- a/app-emulation/xen/files/digest-xen-3.0.2 +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/app-emulation/xen/files/digest-xen-3.0.2-r1 b/app-emulation/xen/files/digest-xen-3.0.2-r1 deleted file mode 100644 index 724d092..0000000 --- a/app-emulation/xen/files/digest-xen-3.0.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/app-emulation/xen/files/digest-xen-3.0.3 b/app-emulation/xen/files/digest-xen-3.0.3 deleted file mode 100644 index c045c5b..0000000 --- a/app-emulation/xen/files/digest-xen-3.0.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 75d895858a467405114599abf94d60a2 xen-3.0.3_0-src.tgz 5465968 -RMD160 528020035ee32144b52bcdfccc8c44708b0196ea xen-3.0.3_0-src.tgz 5465968 -SHA256 7220bb4b0474e530559f558fcb4da8c88f1095c8e2f420602a26dfea5020443f xen-3.0.3_0-src.tgz 5465968 diff --git a/app-emulation/xen/files/gentoo-makefile-targets b/app-emulation/xen/files/gentoo-makefile-targets deleted file mode 100644 index 2f6defe..0000000 --- a/app-emulation/xen/files/gentoo-makefile-targets +++ /dev/null @@ -1,8 +0,0 @@ - -gentoo-compile: - $(MAKE) -C xen - $(MAKE) -C tools - -gentoo-install: - $(MAKE) -C xen install - $(MAKE) -C tools install diff --git a/app-emulation/xen/files/xen-3.0.2-nopiessp.patch b/app-emulation/xen/files/xen-3.0.2-nopiessp.patch deleted file mode 100644 index 2735124..0000000 --- a/app-emulation/xen/files/xen-3.0.2-nopiessp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./xen/Rules.mk 2006-04-09 22:05:55.000000000 +0000 -+++ ./xen/Rules.mk 2006-04-16 16:39:26.000000000 +0000 -@@ -48,6 +48,7 @@ - ALL_OBJS-y += $(BASEDIR)/arch/$(TARGET_ARCH)/built_in.o - - CFLAGS-y += -g -D__XEN__ -+CFLAGS-y += -fno-pie -fno-stack-protector-all -fno-stack-protector - CFLAGS-$(ACM_SECURITY) += -DACM_SECURITY - CFLAGS-$(verbose) += -DVERBOSE - CFLAGS-$(crash_debug) += -DCRASH_DEBUG diff --git a/app-emulation/xen/files/xend-conf b/app-emulation/xen/files/xend-conf deleted file mode 100644 index e82a727..0000000 --- a/app-emulation/xen/files/xend-conf +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/files/xend-conf,v 1.1 2005/09/07 18:18:59 chrb Exp $ - -# set to YES to enable the web frontend to xend on port 8080. -# To change the port, edit /usr/lib/python/xen/sv/params.py -XENSV="NO" diff --git a/app-emulation/xen/files/xend-init b/app-emulation/xen/files/xend-init deleted file mode 100644 index 8d35528..0000000 --- a/app-emulation/xen/files/xend-init +++ /dev/null @@ -1,42 +0,0 @@ -#!/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/files/xend-init,v 1.4 2005/12/23 14:22:55 chrb Exp $ - -opts="start stop status restart" - -depend() { - need net - before xendomains sshd 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 -} - -start() { - ebegin "Starting Xen control daemon" - /usr/sbin/xend start - /usr/sbin/xend status || await_daemons_up - eend $? -} - -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 $? -} - -status() { - /usr/sbin/xend status -} diff --git a/app-emulation/xen/files/xendomains-conf b/app-emulation/xen/files/xendomains-conf deleted file mode 100644 index bbc8ff6..0000000 --- a/app-emulation/xen/files/xendomains-conf +++ /dev/null @@ -1,6 +0,0 @@ -# Directory of domain configs to automatically boot -AUTODIR=/etc/xen/auto - -# set to yes to run all auto 'xm create's in screen -# with logging to /var/log/xen-consoles/ -SCREEN="no" diff --git a/app-emulation/xen/files/xendomains-init b/app-emulation/xen/files/xendomains-init deleted file mode 100644 index 9e68970..0000000 --- a/app-emulation/xen/files/xendomains-init +++ /dev/null @@ -1,68 +0,0 @@ -#!/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/files/xendomains-init,v 1.5 2005/12/23 14:22:55 chrb Exp $ - -opts="start stop status restart" - -depend() { - need xend - after dhcp -} - -get_domname() { - sed -ne 's/^[ \t]*name[ \t]*=[ \t]*"\([^"]*\)"/\1/p' $1 -} - -is_running() { - [ -n "`/usr/sbin/xm list | grep "^${1} "`" ] -} - -start() { - einfo "Starting ${AUTODIR} Xen domains" - if [[ ${SCREEN} == "yes" ]]; then - screen -d -m -S xen -t dom0 - screen -r xen -X zombie dr - logrotate -f /usr/share/xen/xen-consoles-logrotate - screen -r xen -X logfile /var/log/xen-consoles/%t - screen -r xen -X logfile flush 1 - screen -r xen -X deflog on - 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 [[ ${SCREEN} == "yes" ]]; then - screen -r xen -X screen -t ${name} xm create ${dom} -c - else - xm create --quiet ${dom} - fi - eend $? - else - einfo " Not Starting domain ${name} - allready running" - fi - done -} - -stop() { - einfo "Shutting down ${AUTODIR} Xen domains" - # 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 [[ ${SCREEN} == "yes" ]]; then - screen -r xen -X quit - fi -} - -status() { - /usr/sbin/xm list -} diff --git a/app-emulation/xen/xen-3.0.2-r1.ebuild b/app-emulation/xen/xen-3.0.2-r1.ebuild deleted file mode 100644 index 145446f..0000000 --- a/app-emulation/xen/xen-3.0.2-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.2.ebuild,v 1.6 2006/08/04 15:09:42 chrb Exp $ - -inherit mount-boot flag-o-matic - -DESCRIPTION="The Xen hypervisor" -HOMEPAGE="http://www.xensource.com/xen/xen/" -SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/${P}-src.tgz" -S="${WORKDIR}/xen-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug custom-cflags pae" - -DEPEND="sys-devel/dev86" -RDEPEND="" - -RESTRICT="test" - -pkg_setup() { - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - -src_unpack() { - unpack ${A} - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - for FLAG in -fno-stack-protector -fno-stack-protector-all -nopie -fnopie ; - do - test-flag-CC ${FLAG} && HARDFLAGS="${HARDFLAGS} ${FLAG}" - done - sed -i "s/^CFLAGS-y += -g -D__XEN__$/&\nCFLAGS-y += ${HARDFLAGS}/" "${S}"/xen/Rules.mk -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector -fstack-protector-all - else - unset CFLAGS - fi - - # Send raw LDFLAGS so that --as-needed works - emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed" -} - -src_install() { - local myopt - use pae && myopt="${myopt} pae=y" - - make DESTDIR="${D}" ${myopt} install-xen \ - || die "install failed" -} - -pkg_postinst() { - einfo "Please visit the Xen and Gentoo wiki:" - einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - echo - einfo "Note: xen tools have been moved to app-emulation/xen-tools;" - einfo "you need to install that package to manage your domains." - - if use pae; then - echo - einfo "This is a PAE build of Xen. It will *only* boot PAE kernels!" - fi -} diff --git a/app-emulation/xen/xen-3.0.2.ebuild b/app-emulation/xen/xen-3.0.2.ebuild deleted file mode 100644 index d0fb237..0000000 --- a/app-emulation/xen/xen-3.0.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-3.0.2.ebuild,v 1.7 2006/10/06 23:20:25 aross Exp $ - -inherit mount-boot flag-o-matic - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.sourceforge.net" -if [[ ${PV} == *_p* ]]; then - XEN_UNSTABLE="xen-unstable-${PV#*_p}" - SRC_URI="mirror://gentoo/${XEN_UNSTABLE}.tar.bz2" - S="${WORKDIR}/${XEN_UNSTABLE}" -else - SRC_URI="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/${P}-src.tgz" - S="${WORKDIR}/xen-${PV}" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug custom-cflags pae hardened" - -DEPEND="sys-devel/dev86" -RDEPEND="" - -RESTRICT="test" - -pkg_setup() { - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - - -src_unpack() { - unpack ${A} - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - if use hardened; then - cd "${S}" - epatch "${FILESDIR}/${PN}"-3.0.2-nopiessp.patch - fi -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - else - unset CFLAGS - fi - - # Send raw LDFLAGS so that --as-needed works - emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed" -} - -src_install() { - local myopt - use pae && myopt="${myopt} pae=y" - - make DESTDIR="${D}" ${myopt} install-xen \ - || die "install failed" - - # for upstream change tracking - if [[ -n ${XEN_UNSTABLE} ]]; then - dodoc "${S}"/XEN-VERSION - fi -} - -pkg_postinst() { - einfo "Please visit the Xen and Gentoo wiki:" - einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - echo - einfo "Note: xen tools have been moved to app-emulation/xen-tools;" - einfo "you need to install that package to manage your domains." - - if [[ -n ${XEN_UNSTABLE} ]]; then - echo - einfo "This is a snapshot of the xen-unstable tree." - einfo "Please report bugs in xen itself (and not the packaging) to" - einfo "bugzilla.xensource.com" - fi - - if use pae; then - echo - einfo "This is a PAE build of Xen. It will *only* boot PAE kernels!" - fi -} diff --git a/app-emulation/xen/xen-3.0.3.ebuild b/app-emulation/xen/xen-3.0.3.ebuild deleted file mode 100644 index 39f1e26..0000000 --- a/app-emulation/xen/xen-3.0.3.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit mount-boot flag-o-matic - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="http://xen.sourceforge.net" -XEN_VERSION="3.0.3_0" -SRC_URI="http://bits.xensource.com/oss-xen/release/${XEN_VERSION/_/-}/src.tgz/xen-${XEN_VERSION}-src.tgz" -S="${WORKDIR}/xen-${XEN_VERSION}-src" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug custom-cflags pae hardened" - -DEPEND="sys-devel/dev86" -RDEPEND="sys-boot/grub" -PDEPEND="~app-emulation/xen-tools-${PV}" - -RESTRICT="test" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${XEN_VERSION/_/-}" - -pkg_setup() { - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi -} - - -src_unpack() { - unpack ${A} - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - if use hardened; then - cd "${S}" - epatch "${FILESDIR}/${PN}"-3.0.2-nopiessp.patch - fi -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use pae && myopt="${myopt} pae=y" - - if use custom-cflags; then - filter-flags -fPIE -fstack-protector - else - unset CFLAGS - fi - - # Send raw LDFLAGS so that --as-needed works - emake LDFLAGS="$(raw-ldflags)" -C xen ${myopt} || die "compile failed" -} - -src_install() { - local myopt - use pae && myopt="${myopt} pae=y" - - make DESTDIR="${D}" ${myopt} install-xen || die "install failed" -} - -pkg_postinst() { - einfo "Please visit the Xen and Gentoo wiki:" - einfo "http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo" - - echo - einfo "Note: xen tools have been moved to app-emulation/xen-tools;" - einfo "you need to install that package to manage your domains." - - if use pae; then - echo - einfo "This is a PAE build of Xen. It will *only* boot PAE kernels!" - fi -} diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest deleted file mode 100644 index 7acb086..0000000 --- a/sys-kernel/xen-sources/Manifest +++ /dev/null @@ -1,34 +0,0 @@ -AUX xen-sources-2.6.16.28-CVE-2006-3468.patch 3700 RMD160 6f4f016f1e8586384824803228729490e15478c4 SHA1 8409d2d61224c3ca6c8341baed9de4a0e28bb04b SHA256 235e7d34d6545480e6fa1e1e190860ed2c081d7890bb6532c0aad2d973084fdc -MD5 07597cf53abbd6bf2a90bba4c514a8fb files/xen-sources-2.6.16.28-CVE-2006-3468.patch 3700 -RMD160 6f4f016f1e8586384824803228729490e15478c4 files/xen-sources-2.6.16.28-CVE-2006-3468.patch 3700 -SHA256 235e7d34d6545480e6fa1e1e190860ed2c081d7890bb6532c0aad2d973084fdc files/xen-sources-2.6.16.28-CVE-2006-3468.patch 3700 -AUX xen-sources-2.6.16.28-CVE-2006-6333.patch 1070 RMD160 613f13d96b8fbfca43dc893ff90cf0f9c8745cf0 SHA1 40d742c69e50c3b85f83c64bcec3c13b6b00b264 SHA256 ff0c2e31316fd9f33fea8a40349733ce2e307838b78cf9a2c9a95495e185a855 -MD5 3a65727b79f61d986594734845f058a4 files/xen-sources-2.6.16.28-CVE-2006-6333.patch 1070 -RMD160 613f13d96b8fbfca43dc893ff90cf0f9c8745cf0 files/xen-sources-2.6.16.28-CVE-2006-6333.patch 1070 -SHA256 ff0c2e31316fd9f33fea8a40349733ce2e307838b78cf9a2c9a95495e185a855 files/xen-sources-2.6.16.28-CVE-2006-6333.patch 1070 -DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 -DIST patch-2.6.16.28.bz2 76693 RMD160 5235c0b5f9665a279f5bf5d42f942cef215e822f SHA1 7b1d450cf300ec6788919e4b5601389e258d28cc SHA256 6b05fd7121a86a5a6cfd0177200259eeb9a3d276a3cb16ba8cf2acdd747fa6be -DIST patch-2.6.16.29.bz2 86922 RMD160 9a20ca718ccf2b486f3825d5263840eb0467be49 SHA1 ee40534bc4439b77b078148252747d26dc10d975 SHA256 da632ce49b5f3a78560445211237ecce0f68de3584212e4b830f2e55778e0634 -DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 -DIST xen-3.0.3_0-src.tgz 5465968 RMD160 528020035ee32144b52bcdfccc8c44708b0196ea SHA1 9505ae3a5a42bc969836de81f501341409291f78 SHA256 7220bb4b0474e530559f558fcb4da8c88f1095c8e2f420602a26dfea5020443f -EBUILD xen-sources-2.6.16.28-r1.ebuild 1502 RMD160 9a65c57b5496966f712c15d3ada8140619639c99 SHA1 3c29096fb1f50b3a1f624a2de9ebac99ed5b8be9 SHA256 30c3dde698ce920d6ae7d9047220613cbbc4bf918ff07e78f1ef98895d1c3e7a -MD5 c408f1cbf8358a575522ca351c3adc36 xen-sources-2.6.16.28-r1.ebuild 1502 -RMD160 9a65c57b5496966f712c15d3ada8140619639c99 xen-sources-2.6.16.28-r1.ebuild 1502 -SHA256 30c3dde698ce920d6ae7d9047220613cbbc4bf918ff07e78f1ef98895d1c3e7a xen-sources-2.6.16.28-r1.ebuild 1502 -EBUILD xen-sources-2.6.16.28.ebuild 1612 RMD160 e10fd59aae61b3c1c1d256053c166b47b7f575c7 SHA1 afad39fe7539a2796593edc95be1d498be995ff8 SHA256 1579641cae4d4e6cf4ce1c11f4b860b36d2b01ae81ea2ae64e49eb1decb7804c -MD5 cdd1574a18b704893fa9dee6e63e59a9 xen-sources-2.6.16.28.ebuild 1612 -RMD160 e10fd59aae61b3c1c1d256053c166b47b7f575c7 xen-sources-2.6.16.28.ebuild 1612 -SHA256 1579641cae4d4e6cf4ce1c11f4b860b36d2b01ae81ea2ae64e49eb1decb7804c xen-sources-2.6.16.28.ebuild 1612 -EBUILD xen-sources-2.6.16.29.ebuild 1578 RMD160 df5ff923cfd39c2cbad230c0c55f919a18155e4c SHA1 7bf00e87635461c319d7b08899f0bea1045a0a01 SHA256 14ea18e187b533a1513cf0a44baab171b2a5a98b395bd5b66e33048f8f55b4bd -MD5 24f51266bdb40429b69c57782227730b xen-sources-2.6.16.29.ebuild 1578 -RMD160 df5ff923cfd39c2cbad230c0c55f919a18155e4c xen-sources-2.6.16.29.ebuild 1578 -SHA256 14ea18e187b533a1513cf0a44baab171b2a5a98b395bd5b66e33048f8f55b4bd xen-sources-2.6.16.29.ebuild 1578 -MD5 577d28e423cb641a10a19426dd7d4b75 files/digest-xen-sources-2.6.16.28 717 -RMD160 733fddcdf423e30d8e952092cf4d2d2b8ecae621 files/digest-xen-sources-2.6.16.28 717 -SHA256 432b14d8eb07be2c7b17c028a5724598eae329997631a5bd3cee8251eec694bb files/digest-xen-sources-2.6.16.28 717 -MD5 577d28e423cb641a10a19426dd7d4b75 files/digest-xen-sources-2.6.16.28-r1 717 -RMD160 733fddcdf423e30d8e952092cf4d2d2b8ecae621 files/digest-xen-sources-2.6.16.28-r1 717 -SHA256 432b14d8eb07be2c7b17c028a5724598eae329997631a5bd3cee8251eec694bb files/digest-xen-sources-2.6.16.28-r1 717 -MD5 e3dd60d0bb0cb4389169dd12b87fda93 files/digest-xen-sources-2.6.16.29 723 -RMD160 d3d06eb72807564bbbcbd7758e836ec4731b0f09 files/digest-xen-sources-2.6.16.29 723 -SHA256 f2ca6938f7cfb5fb8167c27707a6c3fd1bbe7b631ddc2e2f08a37f604c72412d files/digest-xen-sources-2.6.16.29 723 diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.28 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.28 deleted file mode 100644 index 30347f3..0000000 --- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.28 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005 -RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005 -SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005 -MD5 736e7d741c0650c320c2b37bf6de3c0b patch-2.6.16.28.bz2 76693 -RMD160 5235c0b5f9665a279f5bf5d42f942cef215e822f patch-2.6.16.28.bz2 76693 -SHA256 6b05fd7121a86a5a6cfd0177200259eeb9a3d276a3cb16ba8cf2acdd747fa6be patch-2.6.16.28.bz2 76693 -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 diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.28-r1 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.28-r1 deleted file mode 100644 index 30347f3..0000000 --- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.28-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005 -RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005 -SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005 -MD5 736e7d741c0650c320c2b37bf6de3c0b patch-2.6.16.28.bz2 76693 -RMD160 5235c0b5f9665a279f5bf5d42f942cef215e822f patch-2.6.16.28.bz2 76693 -SHA256 6b05fd7121a86a5a6cfd0177200259eeb9a3d276a3cb16ba8cf2acdd747fa6be patch-2.6.16.28.bz2 76693 -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 diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.29 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.29 deleted file mode 100644 index 60444b2..0000000 --- a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.29 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005 -RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005 -SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005 -MD5 eaac691e53491e9523e0adea2bb0a3c0 patch-2.6.16.29.bz2 86922 -RMD160 9a20ca718ccf2b486f3825d5263840eb0467be49 patch-2.6.16.29.bz2 86922 -SHA256 da632ce49b5f3a78560445211237ecce0f68de3584212e4b830f2e55778e0634 patch-2.6.16.29.bz2 86922 -MD5 75d895858a467405114599abf94d60a2 xen-3.0.3_0-src.tgz 5465968 -RMD160 528020035ee32144b52bcdfccc8c44708b0196ea xen-3.0.3_0-src.tgz 5465968 -SHA256 7220bb4b0474e530559f558fcb4da8c88f1095c8e2f420602a26dfea5020443f xen-3.0.3_0-src.tgz 5465968 diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.16.28-CVE-2006-3468.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.16.28-CVE-2006-3468.patch deleted file mode 100644 index 1452939..0000000 --- a/sys-kernel/xen-sources/files/xen-sources-2.6.16.28-CVE-2006-3468.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -u -ruN linux-2.6.16.orig/fs/ext3/inode.c linux-2.6.16/fs/ext3/inode.c ---- linux-2.6.16.orig/fs/ext3/inode.c 2006-03-20 00:53:29.000000000 -0500 -+++ linux-2.6.16/fs/ext3/inode.c 2006-09-06 17:58:38.000000000 -0400 -@@ -1005,7 +1005,7 @@ - ret = PTR_ERR(handle); - goto out; - } -- if (test_opt(inode->i_sb, NOBH)) -+ if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode)) - ret = nobh_prepare_write(page, from, to, ext3_get_block); - else - ret = block_prepare_write(page, from, to, ext3_get_block); -@@ -1093,7 +1093,7 @@ - if (new_i_size > EXT3_I(inode)->i_disksize) - EXT3_I(inode)->i_disksize = new_i_size; - -- if (test_opt(inode->i_sb, NOBH)) -+ if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode)) - ret = nobh_commit_write(file, page, from, to); - else - ret = generic_commit_write(file, page, from, to); -@@ -1343,7 +1343,7 @@ - goto out_fail; - } - -- if (test_opt(inode->i_sb, NOBH)) -+ if (test_opt(inode->i_sb, NOBH) && ext3_should_writeback_data(inode)) - ret = nobh_writepage(page, ext3_get_block, wbc); - else - ret = block_write_full_page(page, ext3_get_block, wbc); -@@ -2258,17 +2258,15 @@ - struct buffer_head *bh; - struct ext3_group_desc * gdp; - -- -- if ((ino != EXT3_ROOT_INO && -- ino != EXT3_JOURNAL_INO && -- ino != EXT3_RESIZE_INO && -- ino < EXT3_FIRST_INO(sb)) || -- ino > le32_to_cpu( -- EXT3_SB(sb)->s_es->s_inodes_count)) { -- ext3_error (sb, "ext3_get_inode_block", -- "bad inode number: %lu", ino); -+ if (!ext3_valid_inum(sb, ino)) { -+ /* -+ * This error is already checked for in namei.c unless we are -+ * looking at an NFS filehandle, in which case no error -+ * report is needed -+ */ - return 0; - } -+ - block_group = (ino - 1) / EXT3_INODES_PER_GROUP(sb); - if (block_group >= EXT3_SB(sb)->s_groups_count) { - ext3_error (sb, "ext3_get_inode_block", -diff --exclude-from=/home/dang/.diffrc -u -ruN linux-2.6.16.orig/fs/ext3/namei.c linux-2.6.16/fs/ext3/namei.c ---- linux-2.6.16.orig/fs/ext3/namei.c 2006-03-20 00:53:29.000000000 -0500 -+++ linux-2.6.16/fs/ext3/namei.c 2006-09-06 17:55:59.000000000 -0400 -@@ -1000,7 +1000,12 @@ - if (bh) { - unsigned long ino = le32_to_cpu(de->inode); - brelse (bh); -- inode = iget(dir->i_sb, ino); -+ if (!ext3_valid_inum(dir->i_sb, ino)) { -+ ext3_error(dir->i_sb, "ext3_lookup", -+ "bad inode number: %lu", ino); -+ inode = NULL; -+ } else -+ inode = iget(dir->i_sb, ino); - - if (!inode) - return ERR_PTR(-EACCES); -@@ -1028,7 +1033,13 @@ - return ERR_PTR(-ENOENT); - ino = le32_to_cpu(de->inode); - brelse(bh); -- inode = iget(child->d_inode->i_sb, ino); -+ -+ if (!ext3_valid_inum(child->d_inode->i_sb, ino)) { -+ ext3_error(child->d_inode->i_sb, "ext3_get_parent", -+ "bad inode number: %lu", ino); -+ inode = NULL; -+ } else -+ inode = iget(child->d_inode->i_sb, ino); - - if (!inode) - return ERR_PTR(-EACCES); -diff --exclude-from=/home/dang/.diffrc -u -ruN linux-2.6.16.orig/include/linux/ext3_fs.h linux-2.6.16/include/linux/ext3_fs.h ---- linux-2.6.16.orig/include/linux/ext3_fs.h 2006-03-20 00:53:29.000000000 -0500 -+++ linux-2.6.16/include/linux/ext3_fs.h 2006-09-06 17:55:59.000000000 -0400 -@@ -494,6 +494,15 @@ - { - return container_of(inode, struct ext3_inode_info, vfs_inode); - } -+ -+static inline int ext3_valid_inum(struct super_block *sb, unsigned long ino) -+{ -+ return ino == EXT3_ROOT_INO || -+ ino == EXT3_JOURNAL_INO || -+ ino == EXT3_RESIZE_INO || -+ (ino >= EXT3_FIRST_INO(sb) && -+ ino <= le32_to_cpu(EXT3_SB(sb)->s_es->s_inodes_count)); -+} - #else - /* Assume that user mode programs are passing in an ext3fs superblock, not - * a kernel struct super_block. This will allow us to call the feature-test diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.16.28-CVE-2006-6333.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.16.28-CVE-2006-6333.patch deleted file mode 100644 index 66445ef..0000000 --- a/sys-kernel/xen-sources/files/xen-sources-2.6.16.28-CVE-2006-6333.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Al Viro <viro@hera.kernel.org> -Date: Mon, 4 Dec 2006 22:05:09 +0000 (+0000) -Subject: [PATCH] remote memory corruptor in ibmtr.c -X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ee28b0da1069ced1688aa9d0b7b378353b988321 - -[PATCH] remote memory corruptor in ibmtr.c - -ip_summed changes last summer had missed that one. As the result, -we have ip_summed interpreted as CHECKSUM_PARTIAL now. IOW, -->csum is interpreted as offset of checksum in the packet. net/core/* -will both read and modify the value as that offset, with obvious -reasons. At the very least it's a remote memory corruptor. - -Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> -Signed-off-by: Linus Torvalds <torvalds@osdl.org> ---- - ---- a/drivers/net/tokenring/ibmtr.c -+++ b/drivers/net/tokenring/ibmtr.c -@@ -1826,7 +1826,7 @@ static void tr_rx(struct net_device *dev - skb->protocol = tr_type_trans(skb, dev); - if (IPv4_p) { - skb->csum = chksum; -- skb->ip_summed = 1; -+ skb->ip_summed = CHECKSUM_COMPLETE; - } - netif_rx(skb); - dev->last_rx = jiffies; diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.28-r1.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.28-r1.ebuild deleted file mode 100644 index 26bd921..0000000 --- a/sys-kernel/xen-sources/xen-sources-2.6.16.28-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -ETYPE="sources" -inherit kernel-2 eutils -detect_arch -detect_version -[ "${PR}" == "r0" ] && KV=${PV/_/-}-xen || KV=${PV/_/-}-xen-${PR} - -DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen" -HOMEPAGE="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html" -XEN_VERSION="3.0.2" -MY_P="xen-${XEN_VERSION}" -SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PV}.bz2 http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${XEN_VERSION}-src.tgz" - -KEYWORDS="~x86 ~amd64" -S="${WORKDIR}" -RESTRICT="nostrip" -XEN_KV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} - -src_unpack() { - unpack ${A} - cd ${MY_P} - mv "${WORKDIR}"/patch-${PV} patches/linux-${XEN_KV}/linux-${PV}.patch \ - || die "failed to mv ${WORKDIR}/patch-${PV}" - sed -e 's:relative_lndir \([^(].*\):cp -dpPR \1/* .:' \ - -i linux-2.6-xen-sparse/mkbuildtree || die - - # No need to run oldconfig - sed -e 's:$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig::' \ - -i buildconfigs/mk.linux-2.6-xen - - make LINUX_SRC_PATH=${DISTDIR} -f buildconfigs/mk.linux-2.6-xen \ - linux-${XEN_KV}-xen/include/linux/autoconf.h || die - mv linux-${XEN_KV}-xen "${WORKDIR}"/linux-${KV} || die - rm -rf "${WORKDIR}"/linux-${XEN_KV} || die - rm -rf "${WORKDIR}/${MY_P}" || die - - cd "${WORKDIR}"/linux-${KV} - epatch "${FILESDIR}/${P}"-CVE-2006-3468.patch - epatch "${FILESDIR}/${P}"-CVE-2006-6333.patch -} diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.28.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.28.ebuild deleted file mode 100644 index c88c873..0000000 --- a/sys-kernel/xen-sources/xen-sources-2.6.16.28.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16.28.ebuild,v 1.1 2006/09/10 11:36:22 aross Exp $ - -ETYPE="sources" -inherit kernel-2 eutils -detect_arch -detect_version -[ "${PR}" == "r0" ] && KV=${PV/_/-}-xen || KV=${PV/_/-}-xen-${PR} - -DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen" -HOMEPAGE="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html" -XEN_VERSION="3.0.2" -MY_P="xen-${XEN_VERSION}" -SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PV}.bz2 http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-${XEN_VERSION}-src.tgz" - -KEYWORDS="~x86 ~amd64" -#RDEPEND="~app-emulation/xen-${XEN_VERSION}" -S="${WORKDIR}" -RESTRICT="nostrip" -XEN_KV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} - -src_unpack() { - unpack ${A} - cd ${MY_P} - mv "${WORKDIR}"/patch-${PV} patches/linux-${XEN_KV}/linux-${PV}.patch \ - || die "failed to mv ${WORKDIR}/patch-${PV}" - sed -e 's:relative_lndir \([^(].*\):cp -dpPR \1/* .:' \ - -i linux-2.6-xen-sparse/mkbuildtree || die - - # No need to run oldconfig - sed -e 's:$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig::' \ - -i buildconfigs/mk.linux-2.6-xen - - make LINUX_SRC_PATH=${DISTDIR} -f buildconfigs/mk.linux-2.6-xen \ - linux-${XEN_KV}-xen/include/linux/autoconf.h || die - mv linux-${XEN_KV}-xen "${WORKDIR}"/linux-${KV} || die - rm -rf "${WORKDIR}"/linux-${XEN_KV} || die - rm -rf "${WORKDIR}/${MY_P}" || die - - cd "${WORKDIR}"/linux-${KV} - epatch "${FILESDIR}/${P}"-CVE-2006-3468.patch -} diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.29.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.29.ebuild deleted file mode 100644 index ef71868..0000000 --- a/sys-kernel/xen-sources/xen-sources-2.6.16.29.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -ETYPE="sources" -inherit kernel-2 eutils -detect_arch -detect_version -[ "${PR}" == "r0" ] && KV=${PV/_/-}-xen || KV=${PV/_/-}-xen-${PR} - -DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen" -HOMEPAGE="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html" -XEN_VERSION="3.0.3_0" -MY_P="xen-${XEN_VERSION}-src" -SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PV}.bz2 http://bits.xensource.com/oss-xen/release/${XEN_VERSION/_/-}/src.tgz/xen-${XEN_VERSION}-src.tgz" - -KEYWORDS="~x86 ~amd64" -#RDEPEND="~app-emulation/xen-${XEN_VERSION}" -S="${WORKDIR}" -RESTRICT="nostrip" -XEN_KV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} - -src_unpack() { - unpack ${A} - - # patch to the latest kernel first - cd "${WORKDIR}"/linux-${XEN_KV} - epatch "${WORKDIR}"/patch-${PV} - - cd "${WORKDIR}"/${MY_P} - sed -e 's:relative_lndir \([^(].*\):cp -dpPR \1/* .:' \ - -i linux-2.6-xen-sparse/mkbuildtree || die - - # No need to run oldconfig - sed -e 's:$(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig::' \ - -i buildconfigs/mk.linux-2.6-xen - - # Move the kernel sources to pristine-linux-${PV} - mv "${WORKDIR}"/linux-${XEN_KV} pristine-linux-${PV} || die - touch pristine-linux-${PV}/.valid-pristine || die - - make LINUX_SRC_PATH=${DISTDIR} XEN_ROOT=${WORKDIR}/${MY_P} \ - -f buildconfigs/mk.linux-2.6-xen \ - linux-${PV}-xen/include/linux/autoconf.h || die - mv linux-${KV} "${WORKDIR}"/linux-${KV} || die - rm -rf "${WORKDIR}/${MY_P}" || die -} |