diff options
author | Mart Raudsepp <leio@gentoo.org> | 2018-02-03 21:46:20 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2018-02-03 22:53:40 +0200 |
commit | c4eaab4165a3db91ac359c3b407f7da97c1d0b5b (patch) | |
tree | 1d6ccdd392ecf4a1b6f1334af2211e7ee843ea34 /gnome-base | |
parent | gnome-base/dconf-editor: remove old (diff) | |
download | gentoo-c4eaab4165a3db91ac359c3b407f7da97c1d0b5b.tar.gz gentoo-c4eaab4165a3db91ac359c3b407f7da97c1d0b5b.tar.bz2 gentoo-c4eaab4165a3db91ac359c3b407f7da97c1d0b5b.zip |
gnome-base/gdm: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gdm/Manifest | 2 | ||||
-rw-r--r-- | gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch | 52 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-3.22.3-r1.ebuild | 218 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-3.24.2.ebuild | 213 |
4 files changed, 0 insertions, 485 deletions
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index b7093703d82c..95025337e8fd 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,4 +1,2 @@ -DIST gdm-3.22.3.tar.xz 1110740 BLAKE2B 9b41a5e4a01acf14037622ee344613f80d6fc6ef352f8b655e9ec1ce939ca2d20de43f982aa54a24763695c612da5b3d9de8d0ce6080f487ccf1d644df95cbef SHA512 b87acfca13c1d71ed1d7390625d1c36d58cfcde0ea969fa29cde5cabcb2fdf386e30e3b4d3ca057c2cdb99c202dca19d2a478b55083c468c7fb595e69881aebf -DIST gdm-3.24.2.tar.xz 1113644 BLAKE2B 597187008b8ef0ce05d0d3641550a0738a1eabc6d9f683b37bfd49bf71bcfa0b41f46951fe95bcbf18169c9a846df4ed63dda27a3c55dfabf8b5386f5023808a SHA512 6e2649bce5520532a2976bac8a47629fc4c852d7127b913c29a9c43a7dba26d75472a083cbfff7b64bab56deb38ed13d8387d4d302d55f263c80120255a4a270 DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 diff --git a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch b/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch deleted file mode 100644 index 7dc4392e41cb..000000000000 --- a/gnome-base/gdm/files/gdm-3.22.1-pam-module-dir.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4fc9023bb86689f1391651fa744d9e63ee1d7bbc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Mon, 21 Nov 2016 08:18:32 +0100 -Subject: [PATCH] pam_gdm: allow setting pam module dir at configure time - -Code taken almost verbatim from gnome-keyring. ---- - configure.ac | 10 +++++++++- - pam_gdm/Makefile.am | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dd98992..e0074dd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -476,7 +476,7 @@ dnl --------------------------------------------------------------------------- - dnl - Check for PAM stuff - dnl --------------------------------------------------------------------------- - --dnl PAM prefix -+dnl PAM prefix (configuration files) - withval="" - AC_ARG_WITH(pam-prefix, - AS_HELP_STRING([--with-pam-prefix=<prefix>], -@@ -492,6 +492,14 @@ else - fi - AC_SUBST(PAM_PREFIX) - -+dnl PAM dir (dynamic modules) -+AC_ARG_WITH([pam-dir], -+ [AC_HELP_STRING([--with-pam-dir=DIR], -+ [directory to install pam modules in])], -+ [], [with_pam_dir='${libdir}/security']) -+PAM_DEST_DIR="$with_pam_dir" -+AC_SUBST(PAM_DEST_DIR) -+ - have_pam=no - AC_CHECK_LIB(pam, pam_start, have_pam=yes) - -diff --git a/pam_gdm/Makefile.am b/pam_gdm/Makefile.am -index 61d672b..980b31c 100644 ---- a/pam_gdm/Makefile.am -+++ b/pam_gdm/Makefile.am -@@ -36,4 +36,4 @@ pam_gdm_LTLIBRARIES = \ - pam_gdm.la \ - $(END_OF_LIST) - --pam_gdmdir = $(libdir)/security -+pam_gdmdir = $(PAM_DEST_DIR) --- -2.10.2 - diff --git a/gnome-base/gdm/gdm-3.22.3-r1.ebuild b/gnome-base/gdm/gdm-3.22.3-r1.ebuild deleted file mode 100644 index ea15676a90dc..000000000000 --- a/gnome-base/gdm/gdm-3.22.3-r1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools eutils gnome2 pam readme.gentoo-r1 systemd user versionator - -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 branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2[dbus] - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0:1.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.12 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libxcb - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=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 - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.0 - dev-util/itstool - virtual/pkgconfig - x11-proto/inputproto - x11-proto/randrproto - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \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 -" - -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" - fi -} - -src_prepare() { - # ssh-agent handling must be done at xinitrc.d, bug #220603 - eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # Gentoo does not have a fingerprint-auth pam stack - eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" - - # allow setting pam module dir, bug #599714 - eapply "${FILESDIR}/${PN}-3.22.1-pam-module-dir.patch" - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - local myconf - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code. - # --with-at-spi-registryd-directory= needs to be passed explicitly because - # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 - # Xevie is obsolete, bug #482304 - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - ! use plymouth && myconf="${myconf} --with-initial-vt=7" - - gnome2_src_configure \ - --enable-gdm-xsession \ - --enable-user-display-server \ - --with-run-dir=/run/gdm \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --with-xdmcp=yes \ - --enable-authentication-scheme=pam \ - --with-default-pam-config=exherbo \ - --with-pam-dir=$(getpam_mod_dir) \ - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --without-xevie \ - --enable-systemd-journal \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(use_with audit libaudit) \ - $(use_enable ipv6) \ - $(use_with plymouth) \ - $(use_with selinux) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable wayland wayland-support) \ - $(use_with xinerama) \ - ${myconf} -} - -src_install() { - gnome2_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}/49-keychain-r1" 49-keychain - newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - - # 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() { - local d ret - - gnome2_pkg_postinst - - # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do - [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - - readme.gentoo_print_elog -} diff --git a/gnome-base/gdm/gdm-3.24.2.ebuild b/gnome-base/gdm/gdm-3.24.2.ebuild deleted file mode 100644 index 98e6db80fbba..000000000000 --- a/gnome-base/gdm/gdm-3.24.2.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator - -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 branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86" - -# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 -# nspr used by smartcard extension -# dconf, dbus and g-s-d are needed at install time for dconf update -# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784 -COMMON_DEPEND=" - app-text/iso-codes - >=dev-libs/glib-2.36:2[dbus] - >=x11-libs/gtk+-2.91.1:3 - >=gnome-base/dconf-0.20 - >=gnome-base/gnome-settings-daemon-3.1.4 - gnome-base/gsettings-desktop-schemas - >=media-libs/fontconfig-2.5.0:1.0 - >=media-libs/libcanberra-0.4[gtk3] - sys-apps/dbus - >=sys-apps/accountsservice-0.6.35 - - x11-apps/sessreg - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libxcb - >=x11-misc/xdg-utils-1.0.2-r3 - - virtual/pam - >=sys-apps/systemd-186:0=[pam] - - sys-auth/pambase[systemd] - - audit? ( sys-process/audit ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - plymouth? ( sys-boot/plymouth ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) -" -# XXX: These deps are from session and desktop files in data/ directory -# fprintd is used via dbus by gdm-fingerprint-extension -# gnome-session-3.6 needed to avoid freezing with orca -RDEPEND="${COMMON_DEPEND} - >=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 - sys-auth/pam_fprint ) - - !gnome-extra/fast-user-switch-applet -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xml-dtd:4.1.2 - dev-util/gdbus-codegen - >=dev-util/intltool-0.40.0 - dev-util/itstool - virtual/pkgconfig - x11-proto/inputproto - x11-proto/randrproto - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) -" - -DOC_CONTENTS=" - To make GDM start at boot, run:\n - # systemctl enable gdm.service\n - \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 -" - -pkg_setup() { - enewgroup gdm - enewgroup video # Just in case it hasn't been created yet - enewuser gdm -1 -1 /var/lib/gdm gdm,video - - # For compatibility with certain versions of nvidia-drivers, etc., need to - # ensure that gdm user is in the video group - if ! egetent group video | grep -q gdm; then - # FIXME XXX: is this at all portable, ldap-safe, etc.? - # XXX: egetent does not have a 1-argument form, so we can't use it to - # get the list of gdm's groups - local g=$(groups gdm) - elog "Adding user gdm to video group" - usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" - fi -} - -src_prepare() { - # ssh-agent handling must be done at xinitrc.d, bug #220603 - eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" - - # Gentoo does not have a fingerprint-auth pam stack - eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" - - # Show logo when branding is enabled - use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch" - - gnome2_src_prepare -} - -src_configure() { - local myconf - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code. - # --with-at-spi-registryd-directory= needs to be passed explicitly because - # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 - # Xevie is obsolete, bug #482304 - # --with-initial-vt=7 conflicts with plymouth, bug #453392 - ! use plymouth && myconf="${myconf} --with-initial-vt=7" - - gnome2_src_configure \ - --enable-gdm-xsession \ - --enable-user-display-server \ - --with-run-dir=/run/gdm \ - --localstatedir="${EPREFIX}"/var \ - --disable-static \ - --with-xdmcp=yes \ - --enable-authentication-scheme=pam \ - --with-default-pam-config=exherbo \ - --with-pam-mod-dir=$(getpam_mod_dir) \ - --with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \ - --without-xevie \ - --enable-systemd-journal \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $(use_with audit libaudit) \ - $(use_enable ipv6) \ - $(use_with plymouth) \ - $(use_with selinux) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable wayland wayland-support) \ - $(use_with xinerama) \ - ${myconf} -} - -src_install() { - gnome2_src_install - - if ! use accessibility ; then - rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die - fi - - exeinto /etc/X11/xinit/xinitrc.d - newexe "${FILESDIR}/49-keychain-r1" 49-keychain - newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent - - # gdm user's home directory - keepdir /var/lib/gdm - fowners gdm:gdm /var/lib/gdm - - # 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() { - local d ret - - gnome2_pkg_postinst - - # bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm - ret=0 - ebegin "Fixing "${EROOT}"var/lib/gdm ownership" - chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1 - for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do - [[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1 - done - eend ${ret} - - systemd_reenable gdm.service - - readme.gentoo_print_elog -} |