Fix the fcaps() error message to take the running kernel version into account.

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

4 files changed, 26 insertions, 15 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 6d4c95f616bb..32d9008a017f 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.216 2011/11/18 03:40:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.217 2011/11/18 04:31:07 tetromino Exp $
+
+  18 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild:
+  Fix the fcaps() error message to take the running kernel version into
+  account.
 
   18 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild:
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 8598303729c0..bf7964857034 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -7,14 +7,14 @@ DIST gnome-keyring-3.2.1.tar.xz 1580488 RMD160 76d657a926efa077f3303251bd872dbb1
 DIST gnome-keyring-3.2.2.tar.xz 1579860 RMD160 190391c13d2a988801c023c0293bb56953901f3f SHA1 5b4a7868266d11855dea8aa488b730a4eaec3838 SHA256 f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2053 RMD160 bfdd0a71b05622ad2c407aa607a669699adedb9a SHA1 60711dc3e2fcfbc425e0710dfc72ce38045d58fa SHA256 c4cccc5d479c700893913dc7601757dbfa0499c149c6739ae9511e5dca9660ff
 EBUILD gnome-keyring-2.32.1.ebuild 1977 RMD160 030a2705ce3022ca94e224a29eb5c10e42cc14c8 SHA1 220870dfcd9b733277925629184c16891ef437b7 SHA256 87e5e15e57d3212bb7cd84f79cf3519461e68dcb416a1abfb4e83de6f654c587
-EBUILD gnome-keyring-3.2.1.ebuild 3228 RMD160 c937448aef5ebee64fd2cd2140a6e3bfe99745e6 SHA1 ae30181947f7574c42cdbf0624321d02d592bab9 SHA256 e9acd5230695c75595587073c42fd3d2c03ee26b20a7e15ee8f8bad1d49e14c9
-EBUILD gnome-keyring-3.2.2.ebuild 3240 RMD160 d40ebecd2cc9f090089abf7cdb366b26e426f3de SHA1 5b7e696aa44220de5cda9b2b627562733e280f0d SHA256 1c0f5b118294fa0393b9c872de809dd5a644703cc08bd4bb0e16a9360ba7ca85
-MISC ChangeLog 30617 RMD160 3a42648a780a1b0179f8fc9bd5de776ff9c51593 SHA1 446159eef2ccb83bbd1b5fe6e9c36e3a4e3e5ba5 SHA256 4182c5c4f86adc7dacf377522e1e08579a1d2210afdd79e98d5e5db3c9b685b1
+EBUILD gnome-keyring-3.2.1.ebuild 3318 RMD160 1467a988686d30683f2944a240ff7070ef1e72a3 SHA1 66934160bb7fb9d6279ae7bca56b51fa844daf59 SHA256 35a22c0caed12576245f51d1c3e9605d5c3a9ced48e1a351642ecdafbb90b19b
+EBUILD gnome-keyring-3.2.2.ebuild 3330 RMD160 934e6e2d6d7380221c1a176e7362bb531d52bc60 SHA1 a6421f0b73c9cb09bae52a54cf353d800d7dc8f7 SHA256 eec381955ddee04414b946e91fa71d3d334a66b1a193c6cf855655bb7aaecb51
+MISC ChangeLog 30818 RMD160 2f1180102ec0597650709d4255ca085882a26c9a SHA1 a388aab1b89b60ae4bcfe75356dabda0a0b713d7 SHA256 a2ccd57259d32a5f2f70cca3aa9bc58e949d0a27dc38e9b1bb294e86ab2d55e6
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7F08wACgkQdjK8w9WeBnAfcgD/c5YSLRyhhu1ncrZmJCMjVKST
-3qrdnzX9ttzJGsxuT34A/1cDCnPWNtN0HweJUalZWx/jc3zRpvCplFSsKAu29FvD
-=RIri
+iF4EAREIAAYFAk7F35EACgkQdjK8w9WeBnDYBQEAupv1ThYBzyLxiksTLH3tYjwA
+1yjpcoV6CP5RRwolYa0A/jpuZJf0wYeYon5TPjvrNTP0vMPlLHUMiMXUbXhl0KE7
+=kGe8
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
index f2e7fcca6119..2f723474a2a0 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.2 2011/11/18 03:40:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.3 2011/11/18 04:31:08 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 multilib pam virtualx
+inherit gnome2 multilib pam versionator virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -81,6 +81,7 @@ pkg_postinst() {
 # @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
@@ -104,8 +105,10 @@ fcaps() {
 		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}"
-		ewarn "If you are using kernel 2.6.32 or older, you will also need to enable"
-		ewarn "SECURITY_FILE_CAPABILITIES."
+		if ! version_is_at_least 2.6.32 "$(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}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
index 83e9113166db..e828df48a24a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.2 2011/11/18 03:40:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.3 2011/11/18 04:31:07 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 multilib pam virtualx
+inherit gnome2 multilib pam versionator virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -83,6 +83,7 @@ pkg_postinst() {
 # @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
@@ -106,8 +107,10 @@ fcaps() {
 		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}"
-		ewarn "If you are using kernel 2.6.32 or older, you will also need to enable"
-		ewarn "SECURITY_FILE_CAPABILITIES."
+		if ! version_is_at_least 2.6.32 "$(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}