Udev rules fix, closes #236819. Thanks to Frank Ridderbusch for the shiny patch

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 261 insertions, 2 deletions

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 7afe96d3ce6b..dad5fde3185e 100644
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/xen-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.47 2009/06/22 12:09:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.48 2009/06/22 16:33:24 patrick Exp $
+
+*xen-tools-3.4.0-r1 (22 Jun 2009)
+
+  22 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +xen-tools-3.4.0-r1.ebuild, +files/xen-tools-3.4.0-udevinfo.patch:
+  Udev rules fix, closes #236819. Thanks to Frank Ridderbusch for the shiny
+  patch
 
 *xen-tools-3.4.0 (22 Jun 2009)
 
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index e731eee1e72c..8fe0c839a161 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -11,6 +11,7 @@ AUX xen-tools-3.3.0-warning-fix.patch 1434 RMD160 28f6077a55c5ef7989f3880de999ce
 AUX xen-tools-3.3.0-xen-detect-nopie-fix.patch 394 RMD160 77f48ee4bdeb61f91f5dd1c0ebf2351c8ffa1b55 SHA1 07eea51bb2979f7fe342954902b8680a6bd1a7bc SHA256 64266079194f5b8374ae0c2537645f4e3658817b42e55971ebc869dc03f37208
 AUX xen-tools-3.3.1-sandbox-fix.patch 828 RMD160 6c637b0883b72f12ce33b9c6d2dc7cf5267fc85a SHA1 51b35f096c0ad5c83e9654cfe0267b8efc51367e SHA256 519236a71e81e1da1c9a7616745422e6f205f4f7901abba7af0e0aef665af343
 AUX xen-tools-3.4.0-network-bridge-broadcast.patch 495 RMD160 996e25bfd7802ab11768fdf6d212ac2127ba8c57 SHA1 4590d0323528f9da2689620eae03f9ac6f7f8ecd SHA256 14bbe5afb8cf36b12f88211dceb2088ab26572b2b81ec66acaad1ef995202863
+AUX xen-tools-3.4.0-udevinfo.patch 610 RMD160 dd786337bc5be9dc5b0ef0f054b4aba7339208e5 SHA1 b203bfb1d5ee31692952d7b84e995401971ecff4 SHA256 687912b0a12960689abd02f11e96b8bb7e9fbf606a877394336534219d1c1b4a
 AUX xend.initd 1291 RMD160 96659d237688d0c42e5c30491ad883d4af0f1c0f SHA1 2ffe2b29df7014d1dbf69f850a23a95e1b294288 SHA256 41ae7f38565a477abc1fb8ac5af9d6285bf90d171b922c6413aa8aefe5b00889
 AUX xendomains-screen.confd 594 RMD160 79c7a3546cf1d3f8558c2120d6e8c93c753e66b9 SHA1 7f9ed2986495d5fa4a6f8b050cd632fde6a19994 SHA256 c4d7ffcdbeccc5e93460e2abbf70d642a78a363d79ccbbce0407f50cace54e0a
 AUX xendomains.confd 291 RMD160 75d55db5360da12fc3d721c37001ccbfbb844e52 SHA1 e7be8973a4bcbfc7680258e369b07e2ed097ef49 SHA256 2fac318bb96b357dd185f7729d83c0a0b941799cdb89c24ed83051bb085735dc
@@ -25,6 +26,7 @@ EBUILD xen-tools-3.1.3.ebuild 6657 RMD160 908c386349e533e85e7ed3aaf30c21960da26d
 EBUILD xen-tools-3.2.1.ebuild 6831 RMD160 5c59bc41afbab20a9cd6d42aa48bbfc8bb71d187 SHA1 3fdec239a85be84b6f321f42ece5b9b7c01ab555 SHA256 60a352407c7e737ab278cbef4ea78091de26ee54e1d56ad09259d65c4bf1ce6e
 EBUILD xen-tools-3.3.0.ebuild 7817 RMD160 0e6ac767cb100959c3274a038bef0ce5c25a0428 SHA1 0eb2b151306888302ed5083abd6954bd4a2bb081 SHA256 5328c8d3b388fc4d2ea5a42f73db6aab4191dd339abfbccb3cedfafc2e381cdc
 EBUILD xen-tools-3.3.1.ebuild 7102 RMD160 d1777e8006b669077d73104c384613d6c0e19f4b SHA1 a633182e2be5dfb408dca158fad64ae94ab442f9 SHA256 f5a023b1cf3d60cb8cfaedc0641d1d5fd3226bdd1e77860d2ff28b357549bd1f
+EBUILD xen-tools-3.4.0-r1.ebuild 7032 RMD160 df3dc119d919c25800d04c13ab4452cb46a04ba3 SHA1 4723ae2b08dd6138851b4db228a42f579d057df0 SHA256 ad2781adfac7a251f9889e661c2179db7b072fd0cd0555a13f8c5fd280207f39
 EBUILD xen-tools-3.4.0.ebuild 6950 RMD160 5fbdec9b74e5385c985001a4d0bed65d1f778cb4 SHA1 6538d6e9015d91e7cdd780bb746d03c39c8efec0 SHA256 95712f8cd89dbfe5aa75648e591eb26dc2b9270a08aefd4f8ab64b3d0f3f56d9
-MISC ChangeLog 13540 RMD160 c23bea2920284f82f44b1cec22d44fc9f50b83d9 SHA1 abae20b704da6e985bb0a6463b75b244fc7f78d2 SHA256 0bb8d3516bd7320b5849b1088f1fe387c50f901ab5602527b9a4819514db09d5
+MISC ChangeLog 13779 RMD160 0a35f1731a9416510cedb080331743f7befaaa1f SHA1 9fee00ebcd5fc1052a312bbd7d7f165dabffc455 SHA256 4887017912da5f7c4c5205319972a601e7e0f78ff2d09239672eb64fedbcd70f
 MISC metadata.xml 673 RMD160 021c0a8f46b9d3025871c246aa7611904be2e2f9 SHA1 3af764dc6af79bcda8611546d4fb8693f784fa0c SHA256 137fa204b41b1b552deff15a977df2a3acde6f263c5034f75735de4f80028609
diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.0-udevinfo.patch b/app-emulation/xen-tools/files/xen-tools-3.4.0-udevinfo.patch
new file mode 100644
index 000000000000..165db6a77514
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.4.0-udevinfo.patch
@@ -0,0 +1,11 @@
+--- xen-3.4.0/tools/hotplug/Linux/Makefile.orig	2009-06-10 10:54:12.000000000 +0200
++++ xen-3.4.0/tools/hotplug/Linux/Makefile	2009-06-10 10:57:24.000000000 +0200
+@@ -36,7 +36,7 @@
+ ifeq ($(findstring $(DI),$(DE)),$(DI))
+ HOTPLUGS=install-hotplug install-udev
+ else
+-ifeq ($(shell [ -x /usr/bin/udevinfo ] && [ `/usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
++ifeq ($(shell [ -x /sbin/udevadm ] && [ `/sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/'` -ge 059 ] && echo 1),1)
+ HOTPLUGS=install-udev
+ else
+ HOTPLUGS=install-hotplug
diff --git a/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild
new file mode 100644
index 000000000000..7c0c19708e65
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.0-r1.ebuild,v 1.1 2009/06/22 16:33:24 patrick Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils multilib python
+
+# TPMEMUFILE=tpm_emulator-0.4.tar.gz
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
+#	vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )"
+S="${WORKDIR}/xen-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug screen custom-cflags pygrub hvm api acm flask"
+
+CDEPEND="dev-lang/python[ncurses,threads]
+	sys-libs/zlib
+	hvm? ( media-libs/libsdl )
+	acm? ( dev-libs/libxml2 )
+	api? ( dev-libs/libxml2 net-misc/curl )"
+#	vtpm? ( dev-libs/gmp dev-libs/openssl )
+
+DEPEND="${CDEPEND}
+	sys-devel/gcc
+	dev-lang/perl
+	dev-lang/python
+	app-misc/pax-utils
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+		media-gfx/graphviz
+	)
+	hvm? (
+		x11-proto/xproto
+		sys-devel/dev86
+	)"
+
+RDEPEND="${CDEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	dev-python/pyxml
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	|| ( sys-fs/udev sys-apps/hotplug )"
+
+PYTHON_MODNAME="xen grub"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
+QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32
+	usr/share/xen/qemu/openbios-sparc64"
+
+pkg_setup() {
+	export "CONFIG_LOMOUNT=y"
+
+	if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then
+		eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or"
+		eerror "an amd64 multilib profile is required. Remove the hvm use flag"
+		eerror "to build xen-tools on your current profile."
+		die "USE=hvm is unsupported on this system."
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif 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
+
+#	use vtpm    && export "VTPM_TOOLS=y"
+	use api     && export "LIBXENAPI_BINDINGS=y"
+	use acm     && export "ACM_SECURITY=y"
+	use flask   && export "FLASK_ENABLE=y"
+}
+
+src_prepare() {
+#	use vtpm && cp "${DISTDIR}"/${TPMEMUFILE}  tools/vtpm
+
+	# 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
+
+	# Disable hvm support on systems that don't support x86_32 binaries.
+	if ! use hvm; then
+		chmod 644 tools/check/check_x11_devel
+		sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk
+		sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile
+	fi
+
+	if ! use pygrub; then
+		sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile
+	fi
+
+	# Fix network broadcast on bridged networks
+	epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
+
+	# Do not strip binaries
+	epatch "${FILESDIR}/${PN}-3.3.0-nostrip.patch"
+
+	# fix variable declaration to avoid sandbox issue, #253134
+	epatch "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch"
+
+	# fix for udev changes bug #236819
+	epatch "${FILESDIR}/${P}-udevinfo.patch"
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake -C tools ${myopt} || die "compile failed"
+
+	if use doc; then
+		sh ./docs/check_pkgs || die "package check failed"
+		emake docs || die "compiling docs failed"
+		emake dev-docs || die "make dev-docs failed"
+	fi
+
+	emake -C docs man-pages || die "make man-pages failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools  \
+		|| die "install failed"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"/etc/sysconfig
+
+	dodoc README docs/README.xen-bugtool docs/ChangeLog
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \
+			|| die "install docs failed"
+
+		dohtml -r docs/api/
+		docinto pdf
+		dodoc docs/api/tools/python/latex/refman.pdf
+
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+	rm -rf "${D}"/usr/share/doc/xen/
+
+	doman docs/man?/*
+
+	newinitd "${FILESDIR}"/xend.initd xend \
+		|| die "Couldn't install xen.initd"
+	newconfd "${FILESDIR}"/xendomains.confd xendomains \
+		|| die "Couldn't install xendomains.confd"
+	newinitd "${FILESDIR}"/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
+
+	# for xendomains
+	keepdir /etc/xen/auto
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the unoffical wiki page:"
+	elog " http://www.gentoo.org/doc/en/xen-guide.xml"
+	elog " http://gentoo-wiki.com/HOWTO_Xen_and_Gentoo"
+
+	if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then
+		echo
+		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"
+		ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug."
+	fi
+
+	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 built_with_use sys-apps/iproute2 minimal; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 multilib system is required to build HVM support."
+		echo
+		elog "The ioemu use flag has been removed and replaced with hvm."
+	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
+
+	python_mod_optimize
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}