1 |
commit: cfd78b0b5523a9dbad83597136be0d3759062e90 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 27 22:55:51 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 13:49:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfd78b0b |
7 |
|
8 |
gnome-base/gdm: bump to 3.26.2.1 |
9 |
|
10 |
This is a -r1 revision because gnome overlay had a -r0 that lacked |
11 |
CVE-2018-14424 fix patches. |
12 |
|
13 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
14 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
15 |
|
16 |
gnome-base/gdm/Manifest | 1 + |
17 |
gnome-base/gdm/gdm-3.26.2.1-r1.ebuild | 203 ++++++++++++++++++++++++++++++++++ |
18 |
2 files changed, 204 insertions(+) |
19 |
|
20 |
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest |
21 |
index 95025337e8f..a88429ce191 100644 |
22 |
--- a/gnome-base/gdm/Manifest |
23 |
+++ b/gnome-base/gdm/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345 |
26 |
+DIST gdm-3.26.2.1.tar.xz 1119568 BLAKE2B 42ccd3d30a5b22124777792ea3e0bb003771df1d3c5a729d29ff14efe5c6365a82126e6b204301b22dd51e4aaffcef4e018b8fdda45eb52e3b76bd921aca9312 SHA512 4a0009935f2f86803a4dd6cdc01c80c9ee89fb8a71f82ffa6fadb16322e4c7f51d82e0e887c30aa09d1b242c3cc82a1ec0d83463e5d8942719a747f6945cbec9 |
27 |
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 |
28 |
|
29 |
diff --git a/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild b/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..c0da4dfdaff |
32 |
--- /dev/null |
33 |
+++ b/gnome-base/gdm/gdm-3.26.2.1-r1.ebuild |
34 |
@@ -0,0 +1,203 @@ |
35 |
+# Copyright 1999-2018 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+GNOME2_LA_PUNT="yes" |
40 |
+ |
41 |
+inherit eutils gnome2 pam readme.gentoo-r1 systemd user |
42 |
+ |
43 |
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" |
44 |
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM" |
45 |
+ |
46 |
+SRC_URI="${SRC_URI} |
47 |
+ branding? ( https://www.mail-archive.com/tango-artists@×××××××××××××××××.org/msg00043/tango-gentoo-v1.1.tar.gz ) |
48 |
+" |
49 |
+ |
50 |
+LICENSE=" |
51 |
+ GPL-2+ |
52 |
+ branding? ( CC-BY-SA-4.0 ) |
53 |
+" |
54 |
+ |
55 |
+SLOT="0" |
56 |
+ |
57 |
+IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" |
58 |
+ |
59 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" |
60 |
+ |
61 |
+# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 |
62 |
+# nspr used by smartcard extension |
63 |
+# dconf, dbus and g-s-d are needed at install time for dconf update |
64 |
+# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 |
65 |
+COMMON_DEPEND=" |
66 |
+ app-text/iso-codes |
67 |
+ >=dev-libs/glib-2.36:2[dbus] |
68 |
+ >=x11-libs/gtk+-2.91.1:3 |
69 |
+ >=gnome-base/dconf-0.20 |
70 |
+ >=gnome-base/gnome-settings-daemon-3.1.4 |
71 |
+ gnome-base/gsettings-desktop-schemas |
72 |
+ >=media-libs/fontconfig-2.5.0:1.0 |
73 |
+ >=media-libs/libcanberra-0.4[gtk3] |
74 |
+ sys-apps/dbus |
75 |
+ >=sys-apps/accountsservice-0.6.35 |
76 |
+ |
77 |
+ x11-apps/sessreg |
78 |
+ x11-base/xorg-server |
79 |
+ x11-libs/libXi |
80 |
+ x11-libs/libXau |
81 |
+ x11-libs/libX11 |
82 |
+ x11-libs/libXdmcp |
83 |
+ x11-libs/libXext |
84 |
+ x11-libs/libXft |
85 |
+ x11-libs/libxcb |
86 |
+ >=x11-misc/xdg-utils-1.0.2-r3 |
87 |
+ |
88 |
+ virtual/pam |
89 |
+ >=sys-apps/systemd-186:0=[pam] |
90 |
+ |
91 |
+ sys-auth/pambase[systemd] |
92 |
+ |
93 |
+ audit? ( sys-process/audit ) |
94 |
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) |
95 |
+ plymouth? ( sys-boot/plymouth ) |
96 |
+ selinux? ( sys-libs/libselinux ) |
97 |
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
98 |
+ xinerama? ( x11-libs/libXinerama ) |
99 |
+" |
100 |
+# XXX: These deps are from session and desktop files in data/ directory |
101 |
+# fprintd is used via dbus by gdm-fingerprint-extension |
102 |
+# gnome-session-3.6 needed to avoid freezing with orca |
103 |
+RDEPEND="${COMMON_DEPEND} |
104 |
+ >=gnome-base/gnome-session-3.6 |
105 |
+ >=gnome-base/gnome-shell-3.1.90 |
106 |
+ x11-apps/xhost |
107 |
+ |
108 |
+ accessibility? ( |
109 |
+ >=app-accessibility/orca-3.10 |
110 |
+ gnome-extra/mousetweaks ) |
111 |
+ fprint? ( |
112 |
+ sys-auth/fprintd |
113 |
+ sys-auth/pam_fprint ) |
114 |
+ |
115 |
+ !gnome-extra/fast-user-switch-applet |
116 |
+" |
117 |
+DEPEND="${COMMON_DEPEND} |
118 |
+ app-text/docbook-xml-dtd:4.1.2 |
119 |
+ dev-util/gdbus-codegen |
120 |
+ dev-util/glib-utils |
121 |
+ >=dev-util/intltool-0.40.0 |
122 |
+ dev-util/itstool |
123 |
+ virtual/pkgconfig |
124 |
+ x11-base/xorg-proto |
125 |
+ test? ( >=dev-libs/check-0.9.4 ) |
126 |
+" |
127 |
+ |
128 |
+DOC_CONTENTS=" |
129 |
+ To make GDM start at boot, run:\n |
130 |
+ # systemctl enable gdm.service\n |
131 |
+ \n |
132 |
+ For passwordless login to unlock your keyring, you need to install |
133 |
+ sys-auth/pambase with USE=gnome-keyring and set an empty password |
134 |
+ on your keyring. Use app-crypt/seahorse for that.\n |
135 |
+ \n |
136 |
+ You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 |
137 |
+ for smartcard support |
138 |
+" |
139 |
+ |
140 |
+pkg_setup() { |
141 |
+ enewgroup gdm |
142 |
+ enewgroup video # Just in case it hasn't been created yet |
143 |
+ enewuser gdm -1 -1 /var/lib/gdm gdm,video |
144 |
+ |
145 |
+ # For compatibility with certain versions of nvidia-drivers, etc., need to |
146 |
+ # ensure that gdm user is in the video group |
147 |
+ if ! egetent group video | grep -q gdm; then |
148 |
+ # FIXME XXX: is this at all portable, ldap-safe, etc.? |
149 |
+ # XXX: egetent does not have a 1-argument form, so we can't use it to |
150 |
+ # get the list of gdm's groups |
151 |
+ local g=$(groups gdm) |
152 |
+ elog "Adding user gdm to video group" |
153 |
+ usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" |
154 |
+ fi |
155 |
+} |
156 |
+ |
157 |
+src_prepare() { |
158 |
+ # ssh-agent handling must be done at xinitrc.d, bug #220603 |
159 |
+ eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" |
160 |
+ |
161 |
+ # Gentoo does not have a fingerprint-auth pam stack |
162 |
+ eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" |
163 |
+ |
164 |
+ # CVE-2018-14424, bug #662782 |
165 |
+ eapply "${FILESDIR}/3.24.3-CVE-2018-14424.patch" |
166 |
+ eapply "${FILESDIR}/3.24.3-display-object-lifetime-fix.patch" |
167 |
+ |
168 |
+ # Show logo when branding is enabled |
169 |
+ use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" |
170 |
+ |
171 |
+ gnome2_src_prepare |
172 |
+} |
173 |
+ |
174 |
+src_configure() { |
175 |
+ local myconf |
176 |
+ # PAM is the only auth scheme supported |
177 |
+ # even though configure lists shadow and crypt |
178 |
+ # they don't have any corresponding code. |
179 |
+ # --with-at-spi-registryd-directory= needs to be passed explicitly because |
180 |
+ # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 |
181 |
+ # Xevie is obsolete, bug #482304 |
182 |
+ # --with-initial-vt=7 conflicts with plymouth, bug #453392 |
183 |
+ ! use plymouth && myconf="${myconf} --with-initial-vt=7" |
184 |
+ |
185 |
+ gnome2_src_configure \ |
186 |
+ --enable-gdm-xsession \ |
187 |
+ --enable-user-display-server \ |
188 |
+ --with-run-dir=/run/gdm \ |
189 |
+ --localstatedir="${EPREFIX}"/var \ |
190 |
+ --disable-static \ |
191 |
+ --with-xdmcp=yes \ |
192 |
+ --enable-authentication-scheme=pam \ |
193 |
+ --with-default-pam-config=exherbo \ |
194 |
+ --with-pam-mod-dir=$(getpam_mod_dir) \ |
195 |
+ --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ |
196 |
+ --without-xevie \ |
197 |
+ --enable-systemd-journal \ |
198 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
199 |
+ $(use_with audit libaudit) \ |
200 |
+ $(use_enable ipv6) \ |
201 |
+ $(use_with plymouth) \ |
202 |
+ $(use_with selinux) \ |
203 |
+ $(use_with tcpd tcp-wrappers) \ |
204 |
+ $(use_enable wayland wayland-support) \ |
205 |
+ $(use_with xinerama) \ |
206 |
+ ${myconf} |
207 |
+} |
208 |
+ |
209 |
+src_install() { |
210 |
+ gnome2_src_install |
211 |
+ |
212 |
+ if ! use accessibility ; then |
213 |
+ rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die |
214 |
+ fi |
215 |
+ |
216 |
+ exeinto /etc/X11/xinit/xinitrc.d |
217 |
+ newexe "${FILESDIR}/49-keychain-r1" 49-keychain |
218 |
+ newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent |
219 |
+ |
220 |
+ # gdm user's home directory |
221 |
+ keepdir /var/lib/gdm |
222 |
+ fowners gdm:gdm /var/lib/gdm |
223 |
+ |
224 |
+ # install XDG_DATA_DIRS gdm changes |
225 |
+ echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm |
226 |
+ doenvd 99xdg-gdm |
227 |
+ |
228 |
+ use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg |
229 |
+ |
230 |
+ readme.gentoo_create_doc |
231 |
+} |
232 |
+ |
233 |
+pkg_postinst() { |
234 |
+ gnome2_pkg_postinst |
235 |
+ systemd_reenable gdm.service |
236 |
+ readme.gentoo_print_elog |
237 |
+} |