| 1 |
tetromino 11/11/18 04:31:08 |
| 2 |
|
| 3 |
Modified: ChangeLog gnome-keyring-3.2.2.ebuild |
| 4 |
gnome-keyring-3.2.1.ebuild |
| 5 |
Log: |
| 6 |
Fix the fcaps() error message to take the running kernel version into account. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.217 gnome-base/gnome-keyring/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.217&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.217&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?r1=1.216&r2=1.217 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v |
| 20 |
retrieving revision 1.216 |
| 21 |
retrieving revision 1.217 |
| 22 |
diff -u -r1.216 -r1.217 |
| 23 |
--- ChangeLog 18 Nov 2011 03:40:54 -0000 1.216 |
| 24 |
+++ ChangeLog 18 Nov 2011 04:31:07 -0000 1.217 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for gnome-base/gnome-keyring |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.216 2011/11/18 03:40:54 tetromino Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.217 2011/11/18 04:31:07 tetromino Exp $ |
| 30 |
+ |
| 31 |
+ 18 Nov 2011; Alexandre Rostovtsev <tetromino@g.o> |
| 32 |
+ gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild: |
| 33 |
+ Fix the fcaps() error message to take the running kernel version into |
| 34 |
+ account. |
| 35 |
|
| 36 |
18 Nov 2011; Alexandre Rostovtsev <tetromino@g.o> |
| 37 |
gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.3 gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild?rev=1.3&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild?rev=1.3&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild?r1=1.2&r2=1.3 |
| 46 |
|
| 47 |
Index: gnome-keyring-3.2.2.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v |
| 50 |
retrieving revision 1.2 |
| 51 |
retrieving revision 1.3 |
| 52 |
diff -u -r1.2 -r1.3 |
| 53 |
--- gnome-keyring-3.2.2.ebuild 18 Nov 2011 03:40:54 -0000 1.2 |
| 54 |
+++ gnome-keyring-3.2.2.ebuild 18 Nov 2011 04:31:07 -0000 1.3 |
| 55 |
@@ -1,12 +1,12 @@ |
| 56 |
# Copyright 1999-2011 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $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 $ |
| 59 |
+# $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 $ |
| 60 |
|
| 61 |
EAPI="4" |
| 62 |
GCONF_DEBUG="no" |
| 63 |
GNOME2_LA_PUNT="yes" |
| 64 |
|
| 65 |
-inherit gnome2 multilib pam virtualx |
| 66 |
+inherit gnome2 multilib pam versionator virtualx |
| 67 |
|
| 68 |
DESCRIPTION="Password and keyring managing daemon" |
| 69 |
HOMEPAGE="http://www.gnome.org/" |
| 70 |
@@ -83,6 +83,7 @@ |
| 71 |
# @DESCRIPTION: |
| 72 |
# fcaps sets the specified capabilities in the effective and permitted set of |
| 73 |
# the given file. In case of failure fcaps sets the given file-mode. |
| 74 |
+# Requires versionator.eclass |
| 75 |
fcaps() { |
| 76 |
local uid_gid=$1 |
| 77 |
local perms=$2 |
| 78 |
@@ -106,8 +107,10 @@ |
| 79 |
ewarn "Failed to set capabilities. Probable reason is missing kernel support." |
| 80 |
ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)" |
| 81 |
ewarn "where <FS> is the filesystem to store ${path}" |
| 82 |
- ewarn "If you are using kernel 2.6.32 or older, you will also need to enable" |
| 83 |
- ewarn "SECURITY_FILE_CAPABILITIES." |
| 84 |
+ if ! version_is_at_least 2.6.32 "$(uname -r)"; then |
| 85 |
+ ewarn "For kernel 2.6.32 or older, you will also need to enable" |
| 86 |
+ ewarn "SECURITY_FILE_CAPABILITIES." |
| 87 |
+ fi |
| 88 |
ewarn |
| 89 |
ewarn "Falling back to suid now..." |
| 90 |
chmod u+s ${path} |
| 91 |
|
| 92 |
|
| 93 |
|
| 94 |
1.3 gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild |
| 95 |
|
| 96 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild?rev=1.3&view=markup |
| 97 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild?rev=1.3&content-type=text/plain |
| 98 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild?r1=1.2&r2=1.3 |
| 99 |
|
| 100 |
Index: gnome-keyring-3.2.1.ebuild |
| 101 |
=================================================================== |
| 102 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v |
| 103 |
retrieving revision 1.2 |
| 104 |
retrieving revision 1.3 |
| 105 |
diff -u -r1.2 -r1.3 |
| 106 |
--- gnome-keyring-3.2.1.ebuild 18 Nov 2011 03:40:54 -0000 1.2 |
| 107 |
+++ gnome-keyring-3.2.1.ebuild 18 Nov 2011 04:31:08 -0000 1.3 |
| 108 |
@@ -1,12 +1,12 @@ |
| 109 |
# Copyright 1999-2011 Gentoo Foundation |
| 110 |
# Distributed under the terms of the GNU General Public License v2 |
| 111 |
-# $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 $ |
| 112 |
+# $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 $ |
| 113 |
|
| 114 |
EAPI="4" |
| 115 |
GCONF_DEBUG="no" |
| 116 |
GNOME2_LA_PUNT="yes" |
| 117 |
|
| 118 |
-inherit gnome2 multilib pam virtualx |
| 119 |
+inherit gnome2 multilib pam versionator virtualx |
| 120 |
|
| 121 |
DESCRIPTION="Password and keyring managing daemon" |
| 122 |
HOMEPAGE="http://www.gnome.org/" |
| 123 |
@@ -81,6 +81,7 @@ |
| 124 |
# @DESCRIPTION: |
| 125 |
# fcaps sets the specified capabilities in the effective and permitted set of |
| 126 |
# the given file. In case of failure fcaps sets the given file-mode. |
| 127 |
+# Requires versionator.eclass |
| 128 |
fcaps() { |
| 129 |
local uid_gid=$1 |
| 130 |
local perms=$2 |
| 131 |
@@ -104,8 +105,10 @@ |
| 132 |
ewarn "Failed to set capabilities. Probable reason is missing kernel support." |
| 133 |
ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)" |
| 134 |
ewarn "where <FS> is the filesystem to store ${path}" |
| 135 |
- ewarn "If you are using kernel 2.6.32 or older, you will also need to enable" |
| 136 |
- ewarn "SECURITY_FILE_CAPABILITIES." |
| 137 |
+ if ! version_is_at_least 2.6.32 "$(uname -r)"; then |
| 138 |
+ ewarn "For kernel 2.6.32 or older, you will also need to enable" |
| 139 |
+ ewarn "SECURITY_FILE_CAPABILITIES." |
| 140 |
+ fi |
| 141 |
ewarn |
| 142 |
ewarn "Falling back to suid now..." |
| 143 |
chmod u+s ${path} |
Archives