1 |
commit: 73ae60138d95721997cf1ff81125a7fc362e5c2a |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 27 01:54:37 2012 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Feb 27 01:54:37 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=73ae6013 |
7 |
|
8 |
gnome-base/gnome-keyring: add 3.3.5 |
9 |
|
10 |
--- |
11 |
...ring-9999.ebuild => gnome-keyring-3.3.5.ebuild} | 61 +++++++------------ |
12 |
gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 50 +++++++--------- |
13 |
2 files changed, 44 insertions(+), 67 deletions(-) |
14 |
|
15 |
diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild |
16 |
similarity index 58% |
17 |
copy from gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |
18 |
copy to gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild |
19 |
index 6bcb769..d24922d 100644 |
20 |
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |
21 |
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild |
22 |
@@ -1,40 +1,30 @@ |
23 |
-# Copyright 1999-2011 Gentoo Foundation |
24 |
+# Copyright 1999-2012 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $ |
28 |
|
29 |
EAPI="4" |
30 |
GCONF_DEBUG="no" |
31 |
GNOME2_LA_PUNT="yes" |
32 |
|
33 |
-inherit gnome2 multilib pam virtualx |
34 |
-if [[ ${PV} = 9999 ]]; then |
35 |
- inherit gnome2-live |
36 |
-fi |
37 |
+inherit gnome2 pam versionator virtualx |
38 |
|
39 |
DESCRIPTION="Password and keyring managing daemon" |
40 |
HOMEPAGE="http://www.gnome.org/" |
41 |
|
42 |
LICENSE="GPL-2 LGPL-2" |
43 |
SLOT="0" |
44 |
-IUSE="+caps debug doc pam test" |
45 |
-if [[ ${PV} = 9999 ]]; then |
46 |
- KEYWORDS="" |
47 |
-else |
48 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" |
49 |
-fi |
50 |
+IUSE="+caps debug doc pam selinux" |
51 |
+KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris" |
52 |
|
53 |
-# USE=valgrind is probably not a good idea for the tree |
54 |
-RDEPEND=">=dev-libs/glib-2.25:2 |
55 |
- >=x11-libs/gtk+-2.90.0:3 |
56 |
- >=app-crypt/p11-kit-0.6 |
57 |
+RDEPEND=">=app-crypt/gcr-3.3.4 |
58 |
+ >=dev-libs/glib-2.28:2 |
59 |
+ >=x11-libs/gtk+-3.0:3 |
60 |
app-misc/ca-certificates |
61 |
>=dev-libs/libgcrypt-1.2.2 |
62 |
- >=dev-libs/libtasn1-1 |
63 |
>=sys-apps/dbus-1.0 |
64 |
caps? ( sys-libs/libcap-ng ) |
65 |
pam? ( virtual/pam ) |
66 |
" |
67 |
-# valgrind? ( dev-util/valgrind ) |
68 |
DEPEND="${RDEPEND} |
69 |
sys-devel/gettext |
70 |
>=dev-util/gtk-doc-am-1.9 |
71 |
@@ -45,34 +35,25 @@ PDEPEND=">=gnome-base/libgnome-keyring-3.1.92" |
72 |
# eautoreconf needs: |
73 |
# >=dev-util/gtk-doc-am-1.9 |
74 |
|
75 |
+# FIXME: tests are very flaky and write to /tmp (instead of TMPDIR) |
76 |
+RESTRICT="test" |
77 |
+ |
78 |
pkg_setup() { |
79 |
DOCS="AUTHORS ChangeLog NEWS README" |
80 |
G2CONF="${G2CONF} |
81 |
$(use_enable debug) |
82 |
- $(use_enable test tests) |
83 |
$(use_with caps libcap-ng) |
84 |
$(use_enable pam) |
85 |
$(use_with pam pam-dir $(getpam_mod_dir)) |
86 |
+ $(use_enable selinux) |
87 |
--with-root-certs=${EPREFIX}/etc/ssl/certs/ |
88 |
--enable-ssh-agent |
89 |
- --enable-gpg-agent |
90 |
- --disable-update-mime" |
91 |
-# $(use_enable valgrind) |
92 |
-} |
93 |
- |
94 |
-src_prepare() { |
95 |
- # Disable gcr tests due to weirdness with opensc |
96 |
- # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged |
97 |
- sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \ |
98 |
- -i gcr/Makefile.* || die "sed failed" |
99 |
- |
100 |
- gnome2_src_prepare |
101 |
+ --enable-gpg-agent" |
102 |
} |
103 |
|
104 |
src_test() { |
105 |
- # FIXME: /gkm/transaction/ tests fail |
106 |
unset DBUS_SESSION_BUS_ADDRESS |
107 |
- Xemake check || die "emake check failed!" |
108 |
+ Xemake check |
109 |
} |
110 |
|
111 |
pkg_postinst() { |
112 |
@@ -88,6 +69,7 @@ pkg_postinst() { |
113 |
# @DESCRIPTION: |
114 |
# fcaps sets the specified capabilities in the effective and permitted set of |
115 |
# the given file. In case of failure fcaps sets the given file-mode. |
116 |
+# Requires versionator.eclass |
117 |
fcaps() { |
118 |
local uid_gid=$1 |
119 |
local perms=$2 |
120 |
@@ -103,15 +85,18 @@ fcaps() { |
121 |
|
122 |
#set the capability |
123 |
setcap "$capset=ep" "$path" &> /dev/null |
124 |
- #check if the capabilitiy got set correctly |
125 |
+ #check if the capability got set correctly |
126 |
setcap -v "$capset=ep" "$path" &> /dev/null |
127 |
res=$? |
128 |
|
129 |
if [ $res -ne 0 ]; then |
130 |
- ewarn "Failed to set capabilities. Probable reason is missed kernel support." |
131 |
- ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY" |
132 |
- ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store" |
133 |
- ewarn "${path}" |
134 |
+ ewarn "Failed to set capabilities. Probable reason is missing kernel support." |
135 |
+ ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)" |
136 |
+ ewarn "where <FS> is the filesystem to store ${path}" |
137 |
+ if ! version_is_at_least 2.6.33 "$(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} |
144 |
|
145 |
diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |
146 |
index 6bcb769..6653828 100644 |
147 |
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |
148 |
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |
149 |
@@ -1,4 +1,4 @@ |
150 |
-# Copyright 1999-2011 Gentoo Foundation |
151 |
+# Copyright 1999-2012 Gentoo Foundation |
152 |
# Distributed under the terms of the GNU General Public License v2 |
153 |
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $ |
154 |
|
155 |
@@ -16,25 +16,22 @@ HOMEPAGE="http://www.gnome.org/" |
156 |
|
157 |
LICENSE="GPL-2 LGPL-2" |
158 |
SLOT="0" |
159 |
-IUSE="+caps debug doc pam test" |
160 |
+IUSE="+caps debug doc pam selinux" |
161 |
if [[ ${PV} = 9999 ]]; then |
162 |
KEYWORDS="" |
163 |
else |
164 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" |
165 |
+ KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris" |
166 |
fi |
167 |
|
168 |
-# USE=valgrind is probably not a good idea for the tree |
169 |
-RDEPEND=">=dev-libs/glib-2.25:2 |
170 |
- >=x11-libs/gtk+-2.90.0:3 |
171 |
- >=app-crypt/p11-kit-0.6 |
172 |
+RDEPEND=">=app-crypt/gcr-3.3.4 |
173 |
+ >=dev-libs/glib-2.28:2 |
174 |
+ >=x11-libs/gtk+-3.0:3 |
175 |
app-misc/ca-certificates |
176 |
>=dev-libs/libgcrypt-1.2.2 |
177 |
- >=dev-libs/libtasn1-1 |
178 |
>=sys-apps/dbus-1.0 |
179 |
caps? ( sys-libs/libcap-ng ) |
180 |
pam? ( virtual/pam ) |
181 |
" |
182 |
-# valgrind? ( dev-util/valgrind ) |
183 |
DEPEND="${RDEPEND} |
184 |
sys-devel/gettext |
185 |
>=dev-util/gtk-doc-am-1.9 |
186 |
@@ -45,34 +42,25 @@ PDEPEND=">=gnome-base/libgnome-keyring-3.1.92" |
187 |
# eautoreconf needs: |
188 |
# >=dev-util/gtk-doc-am-1.9 |
189 |
|
190 |
+# FIXME: tests are very flaky and write to /tmp (instead of TMPDIR) |
191 |
+RESTRICT="test" |
192 |
+ |
193 |
pkg_setup() { |
194 |
DOCS="AUTHORS ChangeLog NEWS README" |
195 |
G2CONF="${G2CONF} |
196 |
$(use_enable debug) |
197 |
- $(use_enable test tests) |
198 |
$(use_with caps libcap-ng) |
199 |
$(use_enable pam) |
200 |
$(use_with pam pam-dir $(getpam_mod_dir)) |
201 |
+ $(use_enable selinux) |
202 |
--with-root-certs=${EPREFIX}/etc/ssl/certs/ |
203 |
--enable-ssh-agent |
204 |
- --enable-gpg-agent |
205 |
- --disable-update-mime" |
206 |
-# $(use_enable valgrind) |
207 |
-} |
208 |
- |
209 |
-src_prepare() { |
210 |
- # Disable gcr tests due to weirdness with opensc |
211 |
- # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged |
212 |
- sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \ |
213 |
- -i gcr/Makefile.* || die "sed failed" |
214 |
- |
215 |
- gnome2_src_prepare |
216 |
+ --enable-gpg-agent" |
217 |
} |
218 |
|
219 |
src_test() { |
220 |
- # FIXME: /gkm/transaction/ tests fail |
221 |
unset DBUS_SESSION_BUS_ADDRESS |
222 |
- Xemake check || die "emake check failed!" |
223 |
+ Xemake check |
224 |
} |
225 |
|
226 |
pkg_postinst() { |
227 |
@@ -88,6 +76,7 @@ pkg_postinst() { |
228 |
# @DESCRIPTION: |
229 |
# fcaps sets the specified capabilities in the effective and permitted set of |
230 |
# the given file. In case of failure fcaps sets the given file-mode. |
231 |
+# Requires versionator.eclass |
232 |
fcaps() { |
233 |
local uid_gid=$1 |
234 |
local perms=$2 |
235 |
@@ -103,15 +92,18 @@ fcaps() { |
236 |
|
237 |
#set the capability |
238 |
setcap "$capset=ep" "$path" &> /dev/null |
239 |
- #check if the capabilitiy got set correctly |
240 |
+ #check if the capability got set correctly |
241 |
setcap -v "$capset=ep" "$path" &> /dev/null |
242 |
res=$? |
243 |
|
244 |
if [ $res -ne 0 ]; then |
245 |
- ewarn "Failed to set capabilities. Probable reason is missed kernel support." |
246 |
- ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY" |
247 |
- ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store" |
248 |
- ewarn "${path}" |
249 |
+ ewarn "Failed to set capabilities. Probable reason is missing kernel support." |
250 |
+ ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)" |
251 |
+ ewarn "where <FS> is the filesystem to store ${path}" |
252 |
+ if ! version_is_at_least 2.6.33 "$(uname -r)"; then |
253 |
+ ewarn "For kernel 2.6.32 or older, you will also need to enable" |
254 |
+ ewarn "SECURITY_FILE_CAPABILITIES." |
255 |
+ fi |
256 |
ewarn |
257 |
ewarn "Falling back to suid now..." |
258 |
chmod u+s ${path} |