[gentoo-commits] gentoo-x86 commit in x11-misc/i3status: ChangeLog i3status-2.3.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    11/11/18 09:32:09

  Modified:             ChangeLog i3status-2.3.ebuild
  Log:
  Update fcaps() error message for recent kernels (bug #390903). Acked by xarthisius.
  
  (Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  x11-misc/i3status/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3status/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3status/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3status/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/i3status/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	22 Jul 2011 08:14:00 -0000	1.1
+++ ChangeLog	18 Nov 2011 09:32:09 -0000	1.2
@@ -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@g.o> i3status-2.3.ebuild:
+  Update fcaps() error message for recent kernels (bug #390903). Acked by
+  xarthisius.
 
 *i3status-2.3 (22 Jul 2011)
 



1.2                  x11-misc/i3status/i3status-2.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3status/i3status-2.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3status/i3status-2.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/i3status/i3status-2.3.ebuild?r1=1.1&r2=1.2

Index: i3status-2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- i3status-2.3.ebuild	22 Jul 2011 08:14:00 -0000	1.1
+++ i3status-2.3.ebuild	18 Nov 2011 09:32:09 -0000	1.2
@@ -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 @@
 # @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 @@
 	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}