Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-keyring: ChangeLog gnome-keyring-3.2.1.ebuild
Date: Sun, 30 Oct 2011 07:22:08
Message-Id: 20111030072157.917E72004B@flycatcher.gentoo.org
1 tetromino 11/10/30 07:21:57
2
3 Modified: ChangeLog
4 Added: gnome-keyring-3.2.1.ebuild
5 Log:
6 Bump to 3.2.1 from the gnome overlay. Now gtk3-only, and uses p11-kit. Drop alpha, arm, ia64, ppc, ppc64, sparc keywords due to p11-kit. Keywording bug will be filed for all of gnome-3.2.
7
8 (Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.212 gnome-base/gnome-keyring/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.212&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.212&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?r1=1.211&r2=1.212
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v
20 retrieving revision 1.211
21 retrieving revision 1.212
22 diff -u -r1.211 -r1.212
23 --- ChangeLog 28 Oct 2011 19:59:54 -0000 1.211
24 +++ ChangeLog 30 Oct 2011 07:21:57 -0000 1.212
25 @@ -1,6 +1,13 @@
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.211 2011/10/28 19:59:54 maekke Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.212 2011/10/30 07:21:57 tetromino Exp $
30 +
31 +*gnome-keyring-3.2.1 (30 Oct 2011)
32 +
33 + 30 Oct 2011; Alexandre Rostovtsev <tetromino@g.o>
34 + +gnome-keyring-3.2.1.ebuild:
35 + Bump to 3.2.1 from the gnome overlay. Now gtk3-only, and uses p11-kit. Drop
36 + alpha, arm, ia64, ppc, ppc64, sparc keywords due to p11-kit.
37
38 28 Oct 2011; Markus Meier <maekke@g.o> gnome-keyring-2.32.1-r1.ebuild:
39 arm stable, bug #385699
40
41
42
43 1.1 gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: gnome-keyring-3.2.1.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.1 2011/10/30 07:21:57 tetromino Exp $
53
54 EAPI="4"
55 GCONF_DEBUG="no"
56 GNOME2_LA_PUNT="yes"
57
58 inherit gnome2 multilib pam virtualx
59
60 DESCRIPTION="Password and keyring managing daemon"
61 HOMEPAGE="http://www.gnome.org/"
62
63 LICENSE="GPL-2 LGPL-2"
64 SLOT="0"
65 IUSE="+caps debug doc pam test"
66 KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
67
68 # USE=valgrind is probably not a good idea for the tree
69 RDEPEND=">=dev-libs/glib-2.25:2
70 >=x11-libs/gtk+-2.90.0:3
71 >=app-crypt/p11-kit-0.6
72 app-misc/ca-certificates
73 >=dev-libs/libgcrypt-1.2.2
74 >=dev-libs/libtasn1-1
75 >=sys-apps/dbus-1.0
76 caps? ( sys-libs/libcap-ng )
77 pam? ( virtual/pam )
78 "
79 # valgrind? ( dev-util/valgrind )
80 DEPEND="${RDEPEND}
81 sys-devel/gettext
82 >=dev-util/gtk-doc-am-1.9
83 >=dev-util/intltool-0.35
84 >=dev-util/pkgconfig-0.9
85 doc? ( >=dev-util/gtk-doc-1.9 )"
86 PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
87 # eautoreconf needs:
88 # >=dev-util/gtk-doc-am-1.9
89
90 pkg_setup() {
91 DOCS="AUTHORS ChangeLog NEWS README"
92 G2CONF="${G2CONF}
93 $(use_enable debug)
94 $(use_enable test tests)
95 $(use_with caps libcap-ng)
96 $(use_enable pam)
97 $(use_with pam pam-dir $(getpam_mod_dir))
98 --with-root-certs=${EPREFIX}/etc/ssl/certs/
99 --enable-ssh-agent
100 --enable-gpg-agent
101 --disable-update-mime"
102 # $(use_enable valgrind)
103 }
104
105 src_prepare() {
106 # Disable gcr tests due to weirdness with opensc
107 # ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
108 sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
109 -i gcr/Makefile.* || die "sed failed"
110
111 gnome2_src_prepare
112 }
113
114 src_test() {
115 # FIXME: /gkm/transaction/ tests fail
116 unset DBUS_SESSION_BUS_ADDRESS
117 Xemake check || die "emake check failed!"
118 }
119
120 pkg_postinst() {
121 use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon
122
123 gnome2_pkg_postinst
124 }
125
126 # borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes
127 # @FUNCTION: fcaps
128 # @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
129 # @RETURN: 0 if all okay; non-zero if failure and fallback
130 # @DESCRIPTION:
131 # fcaps sets the specified capabilities in the effective and permitted set of
132 # the given file. In case of failure fcaps sets the given file-mode.
133 fcaps() {
134 local uid_gid=$1
135 local perms=$2
136 local capset=$3
137 local path=$4
138 local res
139
140 chmod $perms $path && \
141 chown $uid_gid $path
142 res=$?
143
144 use caps || return $res
145
146 #set the capability
147 setcap "$capset=ep" "$path" &> /dev/null
148 #check if the capabilitiy got set correctly
149 setcap -v "$capset=ep" "$path" &> /dev/null
150 res=$?
151
152 if [ $res -ne 0 ]; then
153 ewarn "Failed to set capabilities. Probable reason is missed kernel support."
154 ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
155 ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
156 ewarn "${path}"
157 ewarn
158 ewarn "Falling back to suid now..."
159 chmod u+s ${path}
160 fi
161 return $res
162 }