PaXify bins to make hardened people happy

Package-Manager: portage-2.1.2.3

6 files changed, 23 insertions, 151 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 694f38c3c092..ea96ad620284 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.6 2007/03/16 22:25:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.7 2007/04/21 07:59:19 jokey Exp $
+
+*virtualbox-bin-1.3.8-r1 (21 Apr 2007)
+
+  21 Apr 2007; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-bin-1.3.6.ebuild, -virtualbox-bin-1.3.8.ebuild,
+  +virtualbox-bin-1.3.8-r1.ebuild:
+  PaXify bins to make hardened people happy
 
 *virtualbox-bin-1.3.8 (16 Mar 2007)
 
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 8c8f0a184724..fb4f1e79cc04 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -2,28 +2,20 @@ AUX virtualbox-bin-wrapper 1608 RMD160 f1f6f855c006316eec85e83e9322d2f2f4a36b1c
 MD5 876d935c04ca8d2a47011bba82493490 files/virtualbox-bin-wrapper 1608
 RMD160 f1f6f855c006316eec85e83e9322d2f2f4a36b1c files/virtualbox-bin-wrapper 1608
 SHA256 3f4084e6e262d79fc57097fb5d49a0afa9620fd4a8f0a6928d09eb6b4a137b9b files/virtualbox-bin-wrapper 1608
-DIST VirtualBox_1.3.6_Linux_x86.run 12225803 RMD160 e1c34c2fe491b5b4db20c4519496a7daa9c594de SHA1 86cab9353eb00cf1ab6517d37dfe3534874a3c78 SHA256 7e49a91db66de06e7c9f49c7ee8481b781dbfdf7055a18eebf67480d124775f7
 DIST VirtualBox_1.3.8_Linux_x86.run 12236712 RMD160 a23292bba9a4742d49715095f04b3b1b6ccd299a SHA1 39fa07dc14daccb46d299a6a65ffd1fd2c06d7ae SHA256 407b2c12450631a19739de5a66eceaeeb93239ee55709b1d2b026030812d7431
 DIST vditool 20884 RMD160 3315e99113be34913790cb2d04956e29494d8551 SHA1 fc175c5177f764ffca47d18d22708d69279fac98 SHA256 7612930d3a21e7b5b25ed0f6464dca3691e5d958f17df864e9f57f85c9ad966d
-EBUILD virtualbox-bin-1.3.6.ebuild 3573 RMD160 6ef5547d6c6c3211d55981b305d713e5ef9d0ac1 SHA1 ba7b7f253551773edfe385c92a1d46034cb2fc9c SHA256 9a9f8477f57436b19a347e8c26253ba4fbf85a062c14c298c4df3e48df2c9c22
-MD5 7dbd1bca2f4cdc4302eec0d25fae89be virtualbox-bin-1.3.6.ebuild 3573
-RMD160 6ef5547d6c6c3211d55981b305d713e5ef9d0ac1 virtualbox-bin-1.3.6.ebuild 3573
-SHA256 9a9f8477f57436b19a347e8c26253ba4fbf85a062c14c298c4df3e48df2c9c22 virtualbox-bin-1.3.6.ebuild 3573
-EBUILD virtualbox-bin-1.3.8.ebuild 3573 RMD160 6ef5547d6c6c3211d55981b305d713e5ef9d0ac1 SHA1 ba7b7f253551773edfe385c92a1d46034cb2fc9c SHA256 9a9f8477f57436b19a347e8c26253ba4fbf85a062c14c298c4df3e48df2c9c22
-MD5 7dbd1bca2f4cdc4302eec0d25fae89be virtualbox-bin-1.3.8.ebuild 3573
-RMD160 6ef5547d6c6c3211d55981b305d713e5ef9d0ac1 virtualbox-bin-1.3.8.ebuild 3573
-SHA256 9a9f8477f57436b19a347e8c26253ba4fbf85a062c14c298c4df3e48df2c9c22 virtualbox-bin-1.3.8.ebuild 3573
-MISC ChangeLog 1210 RMD160 d7c826d204e93c32b5990ec6695ee608fb221474 SHA1 e8a162fc936203af0d1b74e49a61f43b94e21049 SHA256 b4bb1a3e194757cdb69e41db042af1e87331c14005c4c2bb7528fc10df5030b6
-MD5 f8f7b4af95048e9e623031a9a04b3776 ChangeLog 1210
-RMD160 d7c826d204e93c32b5990ec6695ee608fb221474 ChangeLog 1210
-SHA256 b4bb1a3e194757cdb69e41db042af1e87331c14005c4c2bb7528fc10df5030b6 ChangeLog 1210
+EBUILD virtualbox-bin-1.3.8-r1.ebuild 3721 RMD160 83a3864537af11539f2db9275f9878dba23bd081 SHA1 c9ddeb9624fbb6ebdf9a36e9d8f3aca53157671a SHA256 1a634cae2da85f3c90ee122a8f08d3bbfbbc307d1f004634942478fdc5919b87
+MD5 b20f6b74d0371e2aec082a57d8a91293 virtualbox-bin-1.3.8-r1.ebuild 3721
+RMD160 83a3864537af11539f2db9275f9878dba23bd081 virtualbox-bin-1.3.8-r1.ebuild 3721
+SHA256 1a634cae2da85f3c90ee122a8f08d3bbfbbc307d1f004634942478fdc5919b87 virtualbox-bin-1.3.8-r1.ebuild 3721
+MISC ChangeLog 1441 RMD160 3c3a915285d32e14f50bbf24d62a505391026d8c SHA1 e273b6fe373b9ac4a23db0b96365cf5f21f63fe3 SHA256 4e01cb40a5b2458e16f3866184678a78513f3e4a35f05d7e679256804d0ff8d7
+MD5 63594d457d1de77d56b89a9bf562f8d1 ChangeLog 1441
+RMD160 3c3a915285d32e14f50bbf24d62a505391026d8c ChangeLog 1441
+SHA256 4e01cb40a5b2458e16f3866184678a78513f3e4a35f05d7e679256804d0ff8d7 ChangeLog 1441
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 metadata.xml 344
-MD5 5575ac5752dde2af447ffd11c4394964 files/digest-virtualbox-bin-1.3.6 476
-RMD160 7fa471182895532701729ccc5e2d9e296dde5194 files/digest-virtualbox-bin-1.3.6 476
-SHA256 c0c37cb437c71c60f2e076717054da14101e719f33c4da8b6f333d3304404bdc files/digest-virtualbox-bin-1.3.6 476
-MD5 3b4f4fe4310a3dd5e6a7eebc00cff3bc files/digest-virtualbox-bin-1.3.8 476
-RMD160 7338768b7130a7aed62fe70dd08b66ffcdf3488b files/digest-virtualbox-bin-1.3.8 476
-SHA256 e89db085615561e5add8e13ccd1d825e5dd6b3234b278ba20f2dcd88fcb05aa7 files/digest-virtualbox-bin-1.3.8 476
+MD5 7a52be6decdd6c404b762e4877a4737e files/digest-virtualbox-bin-1.3.8-r1 348
+RMD160 263e6ee5247e5f39fb30bbdcf5cb2ec198aaf5a0 files/digest-virtualbox-bin-1.3.8-r1 348
+SHA256 a7c7582f46a84f24aa126b6646822d8d233d2ccbcd17c88b0070bdfb1768bbce files/digest-virtualbox-bin-1.3.8-r1 348
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.6 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.6
deleted file mode 100644
index ee8e9808d04e..000000000000
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 2606c576680b4b86afd37898d4244a3d VirtualBox_1.3.6_Linux_x86.run 12225803
-RMD160 e1c34c2fe491b5b4db20c4519496a7daa9c594de VirtualBox_1.3.6_Linux_x86.run 12225803
-SHA256 7e49a91db66de06e7c9f49c7ee8481b781dbfdf7055a18eebf67480d124775f7 VirtualBox_1.3.6_Linux_x86.run 12225803
-MD5 1396c7f206f7c6a69f183a0b32c07671 vditool 20884
-RMD160 3315e99113be34913790cb2d04956e29494d8551 vditool 20884
-SHA256 7612930d3a21e7b5b25ed0f6464dca3691e5d958f17df864e9f57f85c9ad966d vditool 20884
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8-r1
index a7022235d0d5..d17dfcc481c8 100644
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.3.8-r1
@@ -1,6 +1,4 @@
-MD5 a6b8a863ad3270f7765b47d9f33ee46e VirtualBox_1.3.8_Linux_x86.run 12236712
 RMD160 a23292bba9a4742d49715095f04b3b1b6ccd299a VirtualBox_1.3.8_Linux_x86.run 12236712
 SHA256 407b2c12450631a19739de5a66eceaeeb93239ee55709b1d2b026030812d7431 VirtualBox_1.3.8_Linux_x86.run 12236712
-MD5 1396c7f206f7c6a69f183a0b32c07671 vditool 20884
 RMD160 3315e99113be34913790cb2d04956e29494d8551 vditool 20884
 SHA256 7612930d3a21e7b5b25ed0f6464dca3691e5d958f17df864e9f57f85c9ad966d vditool 20884
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.3.8-r1.ebuild
index a0018d3af513..61cf98903356 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.6.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.3.8-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header $
 
-inherit eutils qt3
+inherit eutils qt3 pax-utils
 
 MY_P=VirtualBox_${PV}_Linux_x86.run
 
@@ -74,11 +74,13 @@ src_install() {
 	if use sdk; then
 		doins -r sdk
 		fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
+		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
 		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 	fi
 	if use vditool; then
 		doins "${DISTDIR}"/vditool
 		fperms 0755 /opt/VirtualBox/vditool
+		pax-mark -m "${D}"/opt/VirtualBox/vditool
 		make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 	fi
 
@@ -89,6 +91,7 @@ src_install() {
 	doins -r *
 	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP} VirtualBox ; do
 		fperms 0755 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${each}
 	done
 
 	if use nowrapper ; then
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.8.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.3.8.ebuild
deleted file mode 100644
index a0018d3af513..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.3.8.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-inherit eutils qt3
-
-MY_P=VirtualBox_${PV}_Linux_x86.run
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}
-	vditool? ( http://www.virtualbox.org/download/testcase/vditool )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="-amd64 ~x86"
-IUSE="additions nowrapper sdk vditool"
-
-DEPEND=">=sys-libs/glibc-2.3.5"
-RDEPEND="!app-emulation/virtualbox
-	~app-emulation/virtualbox-modules-${PV}
-	sdk? ( dev-libs/libIDL )
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-2.5.5-r3
-		>=app-emulation/emul-linux-x86-qtlibs-3.4.4
-		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-sdl )
-	x86? (
-		virtual/xft
-		x11-libs/libX11
-		x11-libs/libXtst
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXrender
-		=virtual/libstdc++-3.3
-		x11-libs/libXcursor
-		media-libs/libsdl
-		$(qt_min_version 3.3.5) )"
-
-S=${WORKDIR}
-
-RESTRICT="primaryuri"
-
-pkg_setup() {
-	check_license
-}
-
-src_unpack() {
-	unpack_makeself ${MY_P}
-	unpack ./VirtualBox.tar.bz2
-}
-
-src_install() {
-	cd "${S}"
-
-	# desktop entry
-	insinto /usr/share/pixmaps
-	newins VBox.png virtualbox.png
-	insinto /usr/share/applications
-	newins VirtualBox.desktop virtualbox.desktop
-	dosed -e "10d" /usr/share/applications/virtualbox.desktop
-	dosed -e "5d" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/VirtualBox/virtualbox/" /usr/share/applications/virtualbox.desktop
-	dosed -e "s/VBox.png/virtualbox.png/" /usr/share/applications/virtualbox.desktop
-
-	insinto /opt/VirtualBox
-	doins UserManual.pdf
-	if use additions; then
-		doins -r additions
-	fi
-	if use sdk; then
-		doins -r sdk
-		fperms 0755 /opt/VirtualBox/sdk/bin/xpidl
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	fi
-	if use vditool; then
-		doins "${DISTDIR}"/vditool
-		fperms 0755 /opt/VirtualBox/vditool
-		make_wrapper vditool "./vditool" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	fi
-
-	rm -rf src sdk tst* UserManual.pdf rdesktop-vrdp.tar.gz deffiles install.sh \
-	routines.sh runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions \
-	VirtualBox.desktop VirtualBox.chm VirtualBox.tar.bz2 LICENSE
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP} VirtualBox ; do
-		fperms 0755 /opt/VirtualBox/${each}
-	done
-
-	if use nowrapper ; then
-		make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	else
-		exeinto /opt/VirtualBox
-		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh"
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxvrdp
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	if use nowrapper; then
-		elog "In order to launch VirtualBox you need to start the"
-		elog "VirtualBox XPCom Server first, with:"
-		elog "vboxsvc --daemonize && virtualbox"
-	else
-		elog "To launch VirtualBox just type: \"virtualbox\""
-	fi
-	elog ""
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-}