diff options
| -rw-r--r-- | gnome-base/gdm/Manifest | 1 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch | 29 | ||||
| -rw-r--r-- | gnome-base/gdm/files/pam-elogind.patch | 24 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-41.3.ebuild | 213 |
4 files changed, 0 insertions, 267 deletions
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index c98e3e2ad584..0da97ff6eeff 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,3 +1,2 @@ -DIST gdm-41.3.tar.xz 807452 BLAKE2B ff6a264220c2ddc60c21fb767154bfdc2844a177e4043749cc393387b116865f5b9dc56c4ce996e83c0a258370f59b7fd1865f455aa67258671ae0bae8671997 SHA512 71a93eef02fccee22ca4f90e3217431923da2b1ac4f5995ff7b64c9b4cac839f4695f4122d255407b570635d34e86e233fa7e4d5d22a8d8185ccfa8ad20f83aa DIST gdm-42.0.tar.xz 811200 BLAKE2B 98f39fc4e80bb7160b7da57d5c606ce1fa2f66ea1ab817c82c6db7328df60b91a1e9a829f67a716c67a5e5ada9f9356e4c82e40065b2692f32aa80c545adc616 SHA512 e07a4e9233573069dd5628e7b7e6dbe462e90bd8f30267d3faf1cbe3dcb8b990afe3ad6af1edf5f0ec689c6eb245aaacd4e8565a7e4feea34cc754d43904daaa DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch deleted file mode 100644 index cd19077a5f1d..000000000000 --- a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Tue, 30 Jul 2013 22:56:30 -0400 -Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack - ---- - data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam -index 41639ec..d9633fb 100644 ---- a/data/pam-exherbo/gdm-fingerprint.pam -+++ b/data/pam-exherbo/gdm-fingerprint.pam -@@ -1,6 +1,11 @@ - account include system-login - --auth substack fingerprint-auth -+auth optional pam_env.so -+auth required pam_tally2.so onerr=succeed -+auth required pam_shells.so -+auth required pam_nologin.so -+auth required pam_fprintd.so -+auth required pam_permit.so - auth optional pam_gnome_keyring.so - - password required pam_deny.so --- -1.8.5.1 - diff --git a/gnome-base/gdm/files/pam-elogind.patch b/gnome-base/gdm/files/pam-elogind.patch deleted file mode 100644 index e17bed395b54..000000000000 --- a/gnome-base/gdm/files/pam-elogind.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 96e605d6bd832a89f022872492a9c9cb1eb62f66 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Tue, 19 Mar 2019 23:13:29 +0200 -Subject: [PATCH 2/2] pam-exherbo: Support elogind - ---- - data/pam-exherbo/gdm-launch-environment.pam | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam -index 51a8e003..c697a528 100644 ---- a/data/pam-exherbo/gdm-launch-environment.pam -+++ b/data/pam-exherbo/gdm-launch-environment.pam -@@ -8,6 +8,7 @@ auth required pam_permit.so - - password required pam_deny.so - -+-session optional pam_elogind.so - -session optional pam_systemd.so - session optional pam_keyinit.so force revoke - session required pam_succeed_if.so audit quiet_success user = gdm --- -2.17.0 - diff --git a/gnome-base/gdm/gdm-41.3.ebuild b/gnome-base/gdm/gdm-41.3.ebuild deleted file mode 100644 index 8bef669a63d7..000000000000 --- a/gnome-base/gdm/gdm-41.3.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev - -DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" -HOMEPAGE="https://wiki.gnome.org/Projects/GDM" - -SRC_URI="${SRC_URI} - branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) -" - -LICENSE=" - GPL-2+ - branding? ( CC-BY-SA-4.0 ) -" - -SLOT="0" - -IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE="^^ ( elogind systemd )" - -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" - -# dconf, dbus and g-s-d are needed at install time for dconf update -# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring) -# dbus-run-session used at runtime -COMMON_DEPEND=" - virtual/udev - >=dev-libs/glib-2.56:2 - >=x11-libs/gtk+-2.91.1:3 - >=media-libs/libcanberra-0.4[gtk3] - >=sys-apps/accountsservice-0.6.35 - x11-libs/libxcb - sys-apps/keyutils:= - selinux? ( sys-libs/libselinux ) - - x11-libs/libX11 - x11-libs/libXau - x11-base/xorg-server[-minimal] - x11-libs/libXdmcp - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - - systemd? ( >=sys-apps/systemd-186:0=[pam] ) - elogind? ( >=sys-auth/elogind-239.3[pam] ) - - plymouth? ( sys-boot/plymouth ) - audit? ( sys-process/audit ) - - sys-libs/pam - sys-auth/pambase[elogind?,systemd?] - - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - sys-apps/dbus - - >=x11-misc/xdg-utils-1.0.2-r3 - - >=dev-libs/gobject-introspection-0.9.12:= -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -RDEPEND="${COMMON_DEPEND} - acct-group/gdm - acct-user/gdm - >=gnome-base/gnome-session-3.6 - >=gnome-base/gnome-shell-3.1.90 - x11-apps/xhost - - accessibility? ( - >=app-accessibility/orca-3.10 - gnome-extra/mousetweaks - ) - fprint? ( sys-auth/fprintd[pam] ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=gnome-base/dconf-0.20 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( >=dev-libs/check-0.9.4 ) - app-text/yelp-tools -" - -DOC_CONTENTS=" - To make GDM start at boot with systemd, run:\n - # systemctl enable gdm.service\n - \n - To make GDM start at boot with OpenRC, edit /etc/conf.d to have - DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n - # rc-update add xdm - \n - For passwordless login to unlock your keyring, you need to install - sys-auth/pambase with USE=gnome-keyring and set an empty password - on your keyring. Use app-crypt/seahorse for that.\n - \n - You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 - for smartcard support -" - -PATCHES=( - # Gentoo does not have a fingerprint-auth pam stack - "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # Add elogind support - "${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch" - - # Support pam_elogind.so in gdm-launch-environment.pam - "${FILESDIR}/pam-elogind.patch" -) - -src_prepare() { - default - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" -} - -src_configure() { - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which - # saves on memory. However this means if we don't start on VT1, gdm doesn't start up - # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, - # so lets try always having it in VT1 and see if that is an issue for people before - # hacking up workarounds for the initial start case. - local emesonargs=( - --localstatedir /var - - -Ddefault-pam-config=exherbo - -Dgdm-xsession=true - -Dgroup=gdm - $(meson_use ipv6) - $(meson_feature audit libaudit) - -Dlogind-provider=$(usex systemd systemd elogind) - -Dpam-mod-dir=$(getpam_mod_dir) - $(meson_feature plymouth) - -Drun-dir=/run/gdm - $(meson_feature selinux) - $(meson_use systemd systemd-journal) - $(meson_use tcpd tcp-wrappers) - -Dudev-dir=$(get_udevdir)/rules.d - -Duser=gdm - -Duser-display-server=true - $(meson_use wayland wayland-support) - -Dxdmcp=enabled - ) - - if use elogind; then - emesonargs+=( - -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility - -Dsystemdsystemunitdir=no - -Dsystemduserunitdir=no - ) - else - emesonargs+=( - -Dinitial-vt=1 - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - if ! use bluetooth-sound ; then - # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 - # bug #679526 - insinto /var/lib/gdm/.config/pulse - doins "${FILESDIR}"/default.pa - fi - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm - - use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - local d ret - - # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"/var/lib/gdm ownership" - chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1 - for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do - [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - readme.gentoo_print_elog -} |