1 |
eva 13/05/20 11:52:22 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gdm-3.6.2-r1.ebuild |
5 |
Log: |
6 |
Backport consolekit path fix, bug #461866. |
7 |
|
8 |
(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key C6085806) |
9 |
|
10 |
Revision Changes Path |
11 |
1.372 gnome-base/gdm/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.372&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?rev=1.372&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/ChangeLog?r1=1.371&r2=1.372 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v |
20 |
retrieving revision 1.371 |
21 |
retrieving revision 1.372 |
22 |
diff -u -r1.371 -r1.372 |
23 |
--- ChangeLog 5 May 2013 11:24:19 -0000 1.371 |
24 |
+++ ChangeLog 20 May 2013 11:52:21 -0000 1.372 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for gnome-base/gdm |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.371 2013/05/05 11:24:19 jlec Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.372 2013/05/20 11:52:21 eva Exp $ |
30 |
+ |
31 |
+*gdm-3.6.2-r1 (20 May 2013) |
32 |
+ |
33 |
+ 20 May 2013; Gilles Dartiguelongue <eva@g.o> +gdm-3.6.2-r1.ebuild: |
34 |
+ Backport consolekit path fix, bug #461866. |
35 |
|
36 |
05 May 2013; Justin Lecher <jlec@g.o> gdm-3.6.2.ebuild, |
37 |
gdm-3.8.0.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.1 gnome-base/gdm/gdm-3.6.2-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.6.2-r1.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gdm/gdm-3.6.2-r1.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: gdm-3.6.2-r1.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2013 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2-r1.ebuild,v 1.1 2013/05/20 11:52:21 eva Exp $ |
51 |
|
52 |
EAPI="5" |
53 |
GNOME2_LA_PUNT="yes" |
54 |
|
55 |
inherit autotools eutils gnome2 pam systemd user |
56 |
|
57 |
G_PV="2012.09.25" |
58 |
G_P="gdm-gentoo-${G_PV}" |
59 |
DESCRIPTION="GNOME Display Manager" |
60 |
HOMEPAGE="https://live.gnome.org/GDM" |
61 |
SRC_URI="${SRC_URI} |
62 |
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${G_P}.tar.xz" |
63 |
|
64 |
LICENSE="GPL-2+" |
65 |
SLOT="0" |
66 |
IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" |
68 |
|
69 |
# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 |
70 |
# nspr used by smartcard extension |
71 |
# dconf, dbus and g-s-d are needed at install time for dconf update |
72 |
# libdaemon needed for our fix-daemonize-regression.patch |
73 |
COMMON_DEPEND=" |
74 |
app-text/iso-codes |
75 |
>=dev-libs/glib-2.33.2:2 |
76 |
>=x11-libs/gtk+-2.91.1:3 |
77 |
dev-libs/libdaemon |
78 |
>=x11-libs/pango-1.3 |
79 |
dev-libs/nspr |
80 |
>=dev-libs/nss-3.11.1 |
81 |
>=gnome-base/dconf-0.11.6 |
82 |
>=gnome-base/gnome-settings-daemon-3.1.4 |
83 |
gnome-base/gsettings-desktop-schemas |
84 |
>=media-libs/fontconfig-2.5.0 |
85 |
>=media-libs/libcanberra-0.4[gtk3] |
86 |
sys-apps/dbus |
87 |
>=sys-apps/accountsservice-0.6.12 |
88 |
>=sys-power/upower-0.9 |
89 |
|
90 |
x11-apps/sessreg |
91 |
x11-base/xorg-server |
92 |
x11-libs/libXi |
93 |
x11-libs/libXau |
94 |
x11-libs/libX11 |
95 |
x11-libs/libXdmcp |
96 |
x11-libs/libXext |
97 |
x11-libs/libXft |
98 |
x11-libs/libXrandr |
99 |
>=x11-misc/xdg-utils-1.0.2-r3 |
100 |
|
101 |
virtual/pam |
102 |
sys-auth/pambase[systemd?] |
103 |
|
104 |
accessibility? ( x11-libs/libXevie ) |
105 |
audit? ( sys-process/audit ) |
106 |
consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] ) |
107 |
introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) |
108 |
plymouth? ( sys-boot/plymouth ) |
109 |
selinux? ( sys-libs/libselinux ) |
110 |
systemd? ( >=sys-apps/systemd-186[pam] ) |
111 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
112 |
xinerama? ( x11-libs/libXinerama ) |
113 |
" |
114 |
# XXX: These deps are from session and desktop files in data/ directory |
115 |
# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser) |
116 |
# fprintd is used via dbus by gdm-fingerprint-extension |
117 |
# gnome-session-3.6 needed to avoid freezing with orca |
118 |
RDEPEND="${COMMON_DEPEND} |
119 |
>=gnome-base/gnome-session-3.6 |
120 |
x11-apps/xhost |
121 |
x11-themes/gnome-icon-theme-symbolic |
122 |
|
123 |
accessibility? ( |
124 |
app-accessibility/gnome-mag |
125 |
app-accessibility/gok |
126 |
app-accessibility/orca |
127 |
gnome-extra/at-spi:1 ) |
128 |
consolekit? ( gnome-extra/polkit-gnome ) |
129 |
fallback? ( x11-wm/metacity ) |
130 |
fprint? ( |
131 |
sys-auth/fprintd |
132 |
sys-auth/pam_fprint ) |
133 |
gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) |
134 |
!gnome-shell? ( x11-wm/metacity ) |
135 |
smartcard? ( |
136 |
app-crypt/coolkey |
137 |
sys-auth/pam_pkcs11 ) |
138 |
|
139 |
!gnome-extra/fast-user-switch-applet |
140 |
" |
141 |
DEPEND="${COMMON_DEPEND} |
142 |
app-text/docbook-xml-dtd:4.1.2 |
143 |
>=dev-util/intltool-0.40.0 |
144 |
>=sys-devel/gettext-0.17 |
145 |
virtual/pkgconfig |
146 |
x11-proto/inputproto |
147 |
x11-proto/randrproto |
148 |
test? ( >=dev-libs/check-0.9.4 ) |
149 |
xinerama? ( x11-proto/xineramaproto ) |
150 |
" |
151 |
|
152 |
pkg_setup() { |
153 |
enewgroup gdm |
154 |
enewgroup video # Just in case it hasn't been created yet |
155 |
enewuser gdm -1 -1 /var/lib/gdm gdm,video |
156 |
|
157 |
# For compatibility with certain versions of nvidia-drivers, etc., need to |
158 |
# ensure that gdm user is in the video group |
159 |
if ! egetent group video | grep -q gdm; then |
160 |
# FIXME XXX: is this at all portable, ldap-safe, etc.? |
161 |
# XXX: egetent does not have a 1-argument form, so we can't use it to |
162 |
# get the list of gdm's groups |
163 |
local g=$(groups gdm) |
164 |
elog "Adding user gdm to video group" |
165 |
usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" |
166 |
fi |
167 |
} |
168 |
|
169 |
src_prepare() { |
170 |
# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852 |
171 |
# XXX: We can now pass a hard-coded initial value; temporary fix |
172 |
#epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch" |
173 |
|
174 |
# daemonize so that the boot process can continue, bug #236701 |
175 |
epatch "${FILESDIR}/${PN}-3.6.0-fix-daemonize-regression.patch" |
176 |
|
177 |
# make custom session work, bug #216984 |
178 |
epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" |
179 |
|
180 |
# ssh-agent handling must be done at xinitrc.d, bug #220603 |
181 |
epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" |
182 |
|
183 |
# automagic selinux :/ |
184 |
epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch" |
185 |
|
186 |
# spurious unicode characters causing build failure, bug #449062 |
187 |
# https://bugzilla.gnome.org/show_bug.cgi?id=690842 |
188 |
LC_ALL=C epatch "${FILESDIR}/${PN}-3.6.2-gdm-slave.xml-unicode.patch" |
189 |
|
190 |
# don't load accessibility support at runtime when USE=-accessibility |
191 |
use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch" |
192 |
|
193 |
# make gdm-fallback session the default if USE=-gnome-shell |
194 |
if ! use gnome-shell; then |
195 |
sed -e "s:'gdm-shell':'gdm-fallback':" \ |
196 |
-i data/00-upstream-settings || die "sed failed" |
197 |
fi |
198 |
|
199 |
mkdir -p "${S}"/m4 |
200 |
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die |
201 |
eautoreconf |
202 |
|
203 |
gnome2_src_prepare |
204 |
} |
205 |
|
206 |
src_configure() { |
207 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
208 |
|
209 |
# PAM is the only auth scheme supported |
210 |
# even though configure lists shadow and crypt |
211 |
# they don't have any corresponding code. |
212 |
# --with-at-spi-registryd-directory= needs to be passed explicitly because |
213 |
# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 |
214 |
G2CONF="${G2CONF} |
215 |
--disable-static |
216 |
--localstatedir=${EPREFIX}/var |
217 |
--with-xdmcp=yes |
218 |
--enable-authentication-scheme=pam |
219 |
--with-pam-prefix=${EPREFIX}/etc |
220 |
--with-default-pam-config=none |
221 |
--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec |
222 |
--with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit |
223 |
--with-initial-vt=7 |
224 |
$(use_with accessibility xevie) |
225 |
$(use_with audit libaudit) |
226 |
$(use_enable ipv6) |
227 |
$(use_with consolekit console-kit) |
228 |
$(use_with plymouth) |
229 |
$(use_with selinux) |
230 |
$(use_with systemd) |
231 |
$(systemd_with_unitdir) |
232 |
$(use_with tcpd tcp-wrappers) |
233 |
$(use_with xinerama) |
234 |
ITSTOOL=$(type -P true)" |
235 |
gnome2_src_configure |
236 |
} |
237 |
|
238 |
src_install() { |
239 |
gnome2_src_install |
240 |
|
241 |
# our x11's scripts point to /usr/bin/gdm |
242 |
dosym /usr/sbin/gdm-binary /usr/bin/gdm |
243 |
|
244 |
# log, etc. |
245 |
keepdir /var/log/gdm |
246 |
|
247 |
# gdm user's home directory |
248 |
keepdir /var/lib/gdm |
249 |
fowners gdm:gdm /var/lib/gdm |
250 |
|
251 |
# install XDG_DATA_DIRS gdm changes |
252 |
echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm |
253 |
doenvd 99xdg-gdm |
254 |
|
255 |
cd "${WORKDIR}/${G_P}" |
256 |
local LDAP |
257 |
use ldap && LDAP=yes |
258 |
emake GDM_WELCOME="gdm-launch-environment" LDAP=${LDAP} EPREFIX="${EPREFIX}" \ |
259 |
SYSTEMD_UNITDIR="$(systemd_get_unitdir)" DESTDIR="${D}" install |
260 |
} |
261 |
|
262 |
pkg_postinst() { |
263 |
local d ret |
264 |
|
265 |
gnome2_pkg_postinst |
266 |
|
267 |
dbus-launch dconf update || die "'dconf update' failed" |
268 |
|
269 |
# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm |
270 |
ret=0 |
271 |
ebegin "Fixing ${EROOT}var/lib/gdm ownership" |
272 |
chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 |
273 |
for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do |
274 |
[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 |
275 |
done |
276 |
eend ${ret} |
277 |
|
278 |
elog "To make GDM start at boot, edit /etc/conf.d/xdm" |
279 |
elog "and then execute 'rc-update add xdm default'." |
280 |
elog "If you already have GDM running, you will need to restart it." |
281 |
|
282 |
elog |
283 |
elog "GDM ignores most non-localization environment variables. If you" |
284 |
elog "need GDM to launch gnome-session with a particular environment," |
285 |
elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see" |
286 |
elog "the pam_env man page for more information." |
287 |
elog |
288 |
|
289 |
if has_version sys-auth/pambase[gnome-keyring]; then |
290 |
elog "For passwordless login to unlock your keyring, you need to set an" |
291 |
elog "empty password on your keyring. Use app-crypt/seahorse for that." |
292 |
else |
293 |
elog "To unlock your keyring on login, install sys-auth/pambase" |
294 |
elog "with USE=gnome-keyring" |
295 |
fi |
296 |
|
297 |
if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then |
298 |
elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" |
299 |
elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" |
300 |
mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 |
301 |
fi |
302 |
} |
303 |
|
304 |
pkg_postrm() { |
305 |
gnome2_pkg_postrm |
306 |
|
307 |
if rc-config list default | grep -q xdm; then |
308 |
elog "To remove GDM from startup please execute" |
309 |
elog "'rc-update del xdm default'" |
310 |
fi |
311 |
} |