Don't let "/etc/init.d/xend stop" kill xenconsoled and xenstored just yet (bug #149321). Ditch the hardened USE flag and use test-flag-CC instead (bug #141866, sort of).

svn path=/; revision=25

3 files changed, 26 insertions, 23 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 0a06b4f..cf43e17 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -2,10 +2,10 @@ AUX 3.0.2-r4/pygrub-progsreiserfs-0.3.1.patch 1506 RMD160 c77b33651e07273a613e3f
 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 1140 RMD160 3850b3f5dace285643d51b4aa13e3f1230415fc1 SHA1 0764741535fbe4833ec0296ba8c055f1166b715f SHA256 dfe6b8fe04599325b21f70f2a130cccf4d8f5b9c92bfe78b4357eb05175c0b15
-MD5 c8664f58b15dd3a4937c6622ea425040 files/3.0.2-r4/xend.initd 1140
-RMD160 3850b3f5dace285643d51b4aa13e3f1230415fc1 files/3.0.2-r4/xend.initd 1140
-SHA256 dfe6b8fe04599325b21f70f2a130cccf4d8f5b9c92bfe78b4357eb05175c0b15 files/3.0.2-r4/xend.initd 1140
+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
@@ -59,10 +59,10 @@ EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f
 MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
 RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
 SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
-EBUILD xen-tools-3.0.2-r4.ebuild 5515 RMD160 76583837baf482a2b3ef6215909cb6127ad520f4 SHA1 ed1c13c1b2f5c58281660f3d0972dfc370ce7a71 SHA256 23674dfeef41e0e2e978fce166767c5a2b055cd681fa2c7e1881e02b33c24def
-MD5 eddc06e8897fe318ced77b1cb6e792bd xen-tools-3.0.2-r4.ebuild 5515
-RMD160 76583837baf482a2b3ef6215909cb6127ad520f4 xen-tools-3.0.2-r4.ebuild 5515
-SHA256 23674dfeef41e0e2e978fce166767c5a2b055cd681fa2c7e1881e02b33c24def xen-tools-3.0.2-r4.ebuild 5515
+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
 MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235
 RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235
 SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235
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
index 9f7fb74..7c24793 100644
--- a/app-emulation/xen-tools/files/3.0.2-r4/xend.initd
+++ b/app-emulation/xen-tools/files/3.0.2-r4/xend.initd
@@ -46,13 +46,14 @@ stop() {
 	/usr/sbin/xend stop
 	eend $?
 
-	ebegin "Stopping xenconsoled"
-	kill $(</var/run/xenconsoled.pid)
-	eend $?
-
-	ebegin "Stopping xenstored"
-	kill $(</var/run/xenstore.pid)
-	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() {
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
index aee6012..34dd089 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/xen-${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc debug screen custom-cflags hardened pygrub vnc sdl"
+IUSE="doc debug screen custom-cflags pygrub vnc sdl"
 
 CDEPEND="dev-lang/python
 	sys-libs/zlib
@@ -83,13 +83,13 @@ src_unpack() {
 	fi
 
 	# xen tries to be smart and filter out CFLAGs not supported by gcc.
-	# It's not smart enough to catch no* flags, though, so we force them.
-	if use hardened; then
-		HARDFLAGS="-nopie -fno-stack-protector -fno-stack-protector-all"
-		sed -e "s/CFLAGS :=/CFLAGS := ${HARDFLAGS}/" \
-		-i "${S}"/tools/firmware/hvmloader/Makefile \
-		"${S}"/tools/firmware/vmxassist/Makefile
-	fi
+	# 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
@@ -98,6 +98,8 @@ src_unpack() {
 	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