Update fcaps() error message for recent kernels (bug #390903). Acked by xarthisius.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

diff --git a/x11-misc/i3status/ChangeLog b/x11-misc/i3status/ChangeLog
index cf1b9733fffbddb66e009a3c2e6c24eedd733693..d12d31424e7f50c617f63bd3eff59823544a08c0 100644 (file)
--- a/x11-misc/i3status/ChangeLog
+++ b/x11-misc/i3status/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/i3status
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/ChangeLog,v 1.1 2011/07/22 08:14:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/ChangeLog,v 1.2 2011/11/18 09:32:09 tetromino Exp $
+
+  18 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> i3status-2.3.ebuild:
+  Update fcaps() error message for recent kernels (bug #390903). Acked by
+  xarthisius.
 
 *i3status-2.3 (22 Jul 2011)
 

diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 564c0d0c36e9319b166e6531e40ef89cc87fdd34..7d6a966517606f0a7570196e6006370737aab70c 100644 (file)
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST i3status-2.3.tar.bz2 24814 RMD160 f37cbb61efe274d974bd38686755cd94d45ac230 SHA1 3d02ae2bc46f5a81453b4cab713211e04d466c16 SHA256 552dac4649f4e142c88ad3c42faace1fc372515c1b9dd979ebca58d36fa4bb1a
-EBUILD i3status-2.3.ebuild 1978 RMD160 9054166c1cd31d9b80cac9dcc3289d809b5b00ca SHA1 2ae2830d8c4936c0ac7554669a730dff29001009 SHA256 ea9ff1f5cdaa9e24a273f8389ed0646c980bce01e4966180a6a1563fb45fb51f
-MISC ChangeLog 469 RMD160 8116c85908ad42520b472e51cb02731be3d67dd8 SHA1 e54d6504e98d49654268b0bdfa0f770d2a77c110 SHA256 597e8388f876eec965233a1d7f9e39d7cb92f1ab1c2fac4c725d72b2a0df7d2c
+EBUILD i3status-2.3.ebuild 2149 RMD160 9c5b411f847e068040895538e5233682714a3fcb SHA1 efbed8602868465b524802c0405bfda1093beed7 SHA256 613e35104431e96613329a4ce486e9847816c0798cb1215e31aab1ceed3377a9
+MISC ChangeLog 637 RMD160 c8b5d52f2a49ae47d3265beaa2f2e95f24954211 SHA1 76b6883bc7d461b3ecc156ebc3c8239a113ddc3a SHA256 86f5c3df7c613cd87b462463e1fcb9fa8341f4a2c2c003b38ac8bd803e2b2b89
 MISC metadata.xml 781 RMD160 41843de6254f08a4cd9519b20c86e9a28f0c1f20 SHA1 1d6ecc85ed13e42018d388b4249ce98d565fcdbd SHA256 97cc7157bfe2d05a4c77793b89190fef0f94d1decd52e41c717c37583696f3f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4pMVEACgkQIiMqcbOVdxQwTwQAnqbfaJ4F47N3j8191UsLeb6O
-kGLuZULp/pgQTn62Wp3xDiV5yDD2jQqB0k2LnYotekBdhP8tdvBQ0ps5xwTopKSg
-b38iAn/WEnorKhQVZU+Wj2aeo60Yhp5uZJrjTFfZXFs9SdqxZD2JgmgLtvAwt7o+
-LsHMzn0vMlWJ5rOqOIw=
-=ZTIQ
+iF4EAREIAAYFAk7GJh4ACgkQdjK8w9WeBnBO6QEAoAEY5Q5k+sbe5NWqFc9p40pH
+qV0GOYElihVxlkgB/UQA/j6o8IdPgFTzB6/tH2+CIsWsI59sL/hWPIKALB3cftv+
+=G9qu
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/i3status/i3status-2.3.ebuild b/x11-misc/i3status/i3status-2.3.ebuild
index cc51b40cd3a67aca2310c9ac4b85e653bf9cb916..9fa810f4f3543f4cb7ce3f685a35f0f655c683f3 100644 (file)
--- a/x11-misc/i3status/i3status-2.3.ebuild
+++ b/x11-misc/i3status/i3status-2.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.3.ebuild,v 1.1 2011/07/22 08:14:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.3.ebuild,v 1.2 2011/11/18 09:32:09 tetromino Exp $
 
 EAPI=4
 
-inherit toolchain-funcs
+inherit toolchain-funcs versionator
 
 DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
 HOMEPAGE="http://i3wm.org/i3status/"
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
 # @DESCRIPTION:
 # fcaps sets the specified capabilities in the effective and permitted set of
 # the given file. In case of failure fcaps sets the given file-mode.
+# Requires versionator.eclass
 fcaps() {
        local uid_gid=$1
        local perms=$2
@@ -48,10 +49,13 @@ fcaps() {
        res=$?
 
        if [ $res -ne 0 ]; then
-               ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-               ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-               ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-               ewarn "${path}"
+               ewarn "Failed to set capabilities. Probable reason is missing kernel support."
+               ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
+               ewarn "where <FS> is the filesystem to store ${path}"
+               if ! version_is_at_least 2.6.33 "$(uname -r)"; then
+                       ewarn "For kernel 2.6.32 or older, you will also need to enable"
+                       ewarn "SECURITY_FILE_CAPABILITIES."
+               fi
                ewarn
                ewarn "Falling back to suid now..."
                chmod u+s ${path}