Check /dev/shm sanity in pkg_setup, bug #299777.

(Portage version: 2.1.7.16/cvs/Linux i686)

6 files changed, 103 insertions, 11 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 86a9afbd116b..89891592fb85 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.52 2010/02/08 11:28:31 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.53 2010/02/11 12:13:29 phajdan.jr Exp $
+
+  11 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-4.0.249.43.ebuild, chromium-4.0.266.0-r1.ebuild,
+  chromium-4.0.302.2.ebuild, chromium-5.0.307.5.ebuild,
+  chromium-9999.ebuild:
+  Check /dev/shm sanity in pkg_setup. This should help in cases like bug
+  #299777.
 
   08 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   -chromium-4.0.295.0.ebuild, chromium-5.0.307.5.ebuild,
diff --git a/www-client/chromium/chromium-4.0.249.43.ebuild b/www-client/chromium/chromium-4.0.249.43.ebuild
index bafbb1c70136..45f791fd927d 100644
--- a/www-client/chromium/chromium-4.0.249.43.ebuild
+++ b/www-client/chromium/chromium-4.0.249.43.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.249.43.ebuild,v 1.8 2010/02/06 20:18:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.249.43.ebuild,v 1.9 2010/02/11 12:13:29 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib portability toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -38,6 +38,23 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
 
+pkg_setup() {
+	# Prevent user problems like bug 299777.
+	if ! grep -q /dev/shm <<< $(get_mounts); then
+		eerror "You don't have tmpfs mounted at /dev/shm."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+		eerror "run 'mount /dev/shm' and try again."
+		die "/dev/shm is not mounted"
+	fi
+	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+		eerror "/dev/shm does not have correct permissions."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please run chmod 1777 /dev/shm and try again."
+		die "/dev/shm has incorrect permissions"
+	fi
+}
+
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
 	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
diff --git a/www-client/chromium/chromium-4.0.266.0-r1.ebuild b/www-client/chromium/chromium-4.0.266.0-r1.ebuild
index 1c25074fb550..e7e29a5a7e14 100644
--- a/www-client/chromium/chromium-4.0.266.0-r1.ebuild
+++ b/www-client/chromium/chromium-4.0.266.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild,v 1.6 2010/02/06 20:18:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.266.0-r1.ebuild,v 1.7 2010/02/11 12:13:29 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib portability toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -39,6 +39,23 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
 
+pkg_setup() {
+	# Prevent user problems like bug 299777.
+	if ! grep -q /dev/shm <<< $(get_mounts); then
+		eerror "You don't have tmpfs mounted at /dev/shm."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+		eerror "run 'mount /dev/shm' and try again."
+		die "/dev/shm is not mounted"
+	fi
+	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+		eerror "/dev/shm does not have correct permissions."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please run chmod 1777 /dev/shm and try again."
+		die "/dev/shm has incorrect permissions"
+	fi
+}
+
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
 	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
diff --git a/www-client/chromium/chromium-4.0.302.2.ebuild b/www-client/chromium/chromium-4.0.302.2.ebuild
index 320b6a3cacc2..238242a76a2c 100644
--- a/www-client/chromium/chromium-4.0.302.2.ebuild
+++ b/www-client/chromium/chromium-4.0.302.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild,v 1.7 2010/02/06 20:18:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.302.2.ebuild,v 1.8 2010/02/11 12:13:29 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib toolchain-funcs flag-o-matic
+inherit eutils flag-o-matic multilib portability toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -39,6 +39,23 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
 
+pkg_setup() {
+	# Prevent user problems like bug 299777.
+	if ! grep -q /dev/shm <<< $(get_mounts); then
+		eerror "You don't have tmpfs mounted at /dev/shm."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+		eerror "run 'mount /dev/shm' and try again."
+		die "/dev/shm is not mounted"
+	fi
+	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+		eerror "/dev/shm does not have correct permissions."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please run chmod 1777 /dev/shm and try again."
+		die "/dev/shm has incorrect permissions"
+	fi
+}
+
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
 	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
diff --git a/www-client/chromium/chromium-5.0.307.5.ebuild b/www-client/chromium/chromium-5.0.307.5.ebuild
index 7a1134965b51..2dd6c09d0c07 100644
--- a/www-client/chromium/chromium-5.0.307.5.ebuild
+++ b/www-client/chromium/chromium-5.0.307.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.5.ebuild,v 1.3 2010/02/08 11:28:31 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.5.ebuild,v 1.4 2010/02/11 12:13:29 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib toolchain-funcs flag-o-matic
+inherit eutils flag-o-matic multilib portability toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -40,6 +40,23 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
 
+pkg_setup() {
+	# Prevent user problems like bug 299777.
+	if ! grep -q /dev/shm <<< $(get_mounts); then
+		eerror "You don't have tmpfs mounted at /dev/shm."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+		eerror "run 'mount /dev/shm' and try again."
+		die "/dev/shm is not mounted"
+	fi
+	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+		eerror "/dev/shm does not have correct permissions."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please run chmod 1777 /dev/shm and try again."
+		die "/dev/shm has incorrect permissions"
+	fi
+}
+
 src_prepare() {
 	# Gentoo uses .kde4, not .kde
 	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 1df31cb61573..d12aae9b10bd 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.26 2010/02/08 11:28:31 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.27 2010/02/11 12:13:29 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils multilib toolchain-funcs subversion flag-o-matic
+inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -41,6 +41,23 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.23
 	sys-devel/flex"
 
+pkg_setup() {
+	# Prevent user problems like bug 299777.
+	if ! grep -q /dev/shm <<< $(get_mounts); then
+		eerror "You don't have tmpfs mounted at /dev/shm."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
+		eerror "run 'mount /dev/shm' and try again."
+		die "/dev/shm is not mounted"
+	fi
+	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+		eerror "/dev/shm does not have correct permissions."
+		eerror "${PN} isn't going to work in that configuration."
+		eerror "Please run chmod 1777 /dev/shm and try again."
+		die "/dev/shm has incorrect permissions"
+	fi
+}
+
 src_unpack() {
 	subversion_src_unpack
 	mv "${S}" "${WORKDIR}"/depot_tools