diff options
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 9 | ||||
| -rwxr-xr-x | gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch | 34 | ||||
| -rwxr-xr-x | gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch | 134 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-3.8.0.ebuild | 258 |
4 files changed, 434 insertions, 1 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index e7444fdc0ec1..d6868a503512 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.369 2013/03/14 04:32:36 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.370 2013/03/28 22:47:35 pacho Exp $ + +*gdm-3.8.0 (28 Mar 2013) + + 28 Mar 2013; Pacho Ramos <pacho@gentoo.org> + +files/gdm-3.7.3.1-disable-accessibility.patch, + +files/gdm-3.7.90-fix-daemonize-regression.patch, +gdm-3.8.0.ebuild: + Version bump for Gnome 3.8 14 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-3.6.2.ebuild: Remove unnecessary dependency on consolekit[pam] and pam[consolekit], thanks diff --git a/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch new file mode 100755 index 000000000000..bf684640a16d --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.7.3.1-disable-accessibility.patch @@ -0,0 +1,34 @@ +From 07fb1b31d818f308beb1c3800c4b90830b57d01b Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> +Date: Fri, 25 Jan 2013 10:03:31 +0330 +Subject: [PATCH] don't load accessbility + +--- + data/00-upstream-settings | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/00-upstream-settings b/data/00-upstream-settings +index 660a295..3993786 100644 +--- a/data/00-upstream-settings ++++ b/data/00-upstream-settings +@@ -7,7 +7,7 @@ + # + + [org/gnome/desktop/a11y/keyboard] +-enable=true ++enable=false + + [org/gnome/desktop/background] + show-desktop-icons=false +@@ -16,7 +16,7 @@ show-desktop-icons=false + exec='/bin/true' + + [org/gnome/desktop/interface] +-toolkit-accessibility=true ++toolkit-accessibility=false + + [org/gnome/desktop/lockdown] + disable-application-handlers=true +-- +1.8.1 + diff --git a/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch new file mode 100755 index 000000000000..810bd6e83646 --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.7.90-fix-daemonize-regression.patch @@ -0,0 +1,134 @@ +From bda248c1e184f92aedf9f8d932ebd20746910d52 Mon Sep 17 00:00:00 2001 +From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr> +Date: Mon, 4 Mar 2013 21:23:45 +0330 +Subject: [PATCH] gdm-3.7.90 fix daemonize regression + +--- + configure.ac | 4 ++++ + daemon/Makefile.am | 1 + + daemon/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 50 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 0918060..d4ea271 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,10 @@ PKG_CHECK_MODULES(DAEMON, + AC_SUBST(DAEMON_CFLAGS) + AC_SUBST(DAEMON_LIBS) + ++PKG_CHECK_MODULES(LIBDAEMON, libdaemon) ++AC_SUBST(LIBDAEMON_CFLAGS) ++AC_SUBST(LIBDAEMON_LIBS) ++ + GLIB_GSETTINGS + + PKG_CHECK_MODULES(NSS, +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index ead9096..b810089 100644 +--- a/daemon/Makefile.am ++++ b/daemon/Makefile.am +@@ -385,6 +385,7 @@ gdm_LDADD = \ + $(top_builddir)/common/libgdmcommon.la \ + $(XLIB_LIBS) \ + $(DAEMON_LIBS) \ ++ $(LIBDAEMON_LIBS) \ + $(XDMCP_LIBS) \ + $(LIBWRAP_LIBS) \ + $(SYSTEMD_LIBS) \ +diff --git a/daemon/main.c b/daemon/main.c +index 8176fe3..0151862 100644 +--- a/daemon/main.c ++++ b/daemon/main.c +@@ -34,6 +34,8 @@ + #include <locale.h> + #include <signal.h> + ++#include <libdaemon/dfork.h> ++ + #include <glib.h> + #include <glib/gi18n.h> + #include <glib/gstdio.h> +@@ -329,8 +331,10 @@ main (int argc, + static gboolean do_timed_exit = FALSE; + static gboolean print_version = FALSE; + static gboolean fatal_warnings = FALSE; ++ static gboolean no_daemon = FALSE; + static GOptionEntry entries [] = { + { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL }, ++ { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL }, + { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL }, + { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL }, + +@@ -343,6 +347,15 @@ main (int argc, + + ret = 1; + ++ /* preprocess the arguments to support the xdm style ++ * -nodaemon option ++ */ ++ int i; ++ for ( i = 0; i < argc; i++) { ++ if (strcmp (argv[i], "-nodaemon") == 0) ++ argv[i] = "--nodaemon"; ++ } ++ + context = g_option_context_new (_("GNOME Display Manager")); + g_option_context_add_main_entries (context, entries, NULL); + g_option_context_set_ignore_unknown_options (context, TRUE); +@@ -369,6 +382,33 @@ main (int argc, + g_log_set_always_fatal (fatal_mask); + } + ++ if (!no_daemon) { ++ pid_t pid; ++ if (daemon_retval_init () < 0) { ++ g_warning ("Failed to create pipe"); ++ exit (-1); ++ } ++ if ((pid = daemon_fork ()) < 0) { ++ /* Fork failed */ ++ daemon_retval_done (); ++ exit (1); ++ } else if (pid) { ++ /* Parent process: wait 20s for daemon_retval_send() in the daemon process */ ++ if ((ret = daemon_retval_wait (20)) < 0) { ++ g_warning ("Timed out waiting for daemon process: %s", strerror(errno)); ++ exit (255); ++ } else if (ret > 0) { ++ g_warning ("Daemon process returned error code %d", ret); ++ exit (ret); ++ } ++ exit (0); ++ } ++ /* Daemon process */ ++ daemon_close_all (-1); ++ /* Start a new process group so that killing the daemon will kill the processes that it spawned */ ++ setsid (); ++ } ++ + gdm_log_init (); + + settings = gdm_settings_new (); +@@ -418,6 +458,9 @@ main (int argc, + g_timeout_add_seconds (30, (GSourceFunc) timed_exit_cb, main_loop); + } + ++ if (!no_daemon) ++ daemon_retval_send (0); ++ + g_main_loop_run (main_loop); + + g_debug ("GDM finished, cleaning up..."); +@@ -433,6 +476,8 @@ main (int argc, + ret = 0; + + out: ++ if (!no_daemon) ++ daemon_retval_send (ret); + if (error) { + g_printerr ("%s\n", error->message); + g_clear_error (&error); +-- +1.8.1.2 + diff --git a/gnome-base/gdm/gdm-3.8.0.ebuild b/gnome-base/gdm/gdm-3.8.0.ebuild new file mode 100644 index 000000000000..a6e9ab0ef4bc --- /dev/null +++ b/gnome-base/gdm/gdm-3.8.0.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.8.0.ebuild,v 1.1 2013/03/28 22:47:35 pacho Exp $ + +EAPI="5" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 pam systemd user + +G_PV="2012.09.25" +G_P="gdm-gentoo-${G_PV}" +DESCRIPTION="GNOME Display Manager" +HOMEPAGE="https://live.gnome.org/GDM" +SRC_URI="${SRC_URI} + http://dev.gentoo.org/~tetromino/distfiles/${PN}/${G_P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~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 +# libdaemon needed for our fix-daemonize-regression.patch +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.35:2 + >=x11-libs/gtk+-2.91.1:3 + dev-libs/libdaemon + >=x11-libs/pango-1.3 + dev-libs/nspr + >=dev-libs/nss-3.11.1 + >=gnome-base/dconf-0.11.6 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + >=media-libs/fontconfig-2.5.0 + >=media-libs/libcanberra-0.4[gtk3] + sys-apps/dbus + >=sys-apps/accountsservice-0.6.12 + >=sys-power/upower-0.9 + + 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/libXrandr + >=x11-misc/xdg-utils-1.0.2-r3 + + virtual/pam + sys-auth/pambase[consolekit?,systemd?] + + accessibility? ( x11-libs/libXevie ) + audit? ( sys-process/audit ) + consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-186[pam] ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) +" +# XXX: These deps are from session and desktop files in data/ directory +# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser) +# 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 + x11-apps/xhost + x11-themes/gnome-icon-theme-symbolic + + accessibility? ( + app-accessibility/gnome-mag + app-accessibility/gok + app-accessibility/orca + gnome-extra/at-spi:1 ) + consolekit? ( gnome-extra/polkit-gnome ) + fallback? ( x11-wm/metacity ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) + !gnome-shell? ( x11-wm/metacity ) + smartcard? ( + app-crypt/coolkey + sys-auth/pam_pkcs11 ) + + !gnome-extra/fast-user-switch-applet +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + x11-proto/inputproto + x11-proto/randrproto + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) +" + +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() { + # GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852 + # XXX: We can now pass a hard-coded initial value; temporary + # FIXME +# epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch" + + # daemonize so that the boot process can continue, bug #236701 + epatch "${FILESDIR}/${PN}-3.7.90-fix-daemonize-regression.patch" + + # make custom session work, bug #216984 + epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" + + # ssh-agent handling must be done at xinitrc.d, bug #220603 + epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # automagic selinux :/ + epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch" + + # make gdm-fallback session the default if USE=-gnome-shell + if ! use gnome-shell; then + sed -e "s:'gdm-shell':'gdm-fallback':" \ + -i data/00-upstream-settings || die "sed failed" + fi + + # don't load accessibility support at runtime when USE=-accessibility + use accessibility || epatch "${FILESDIR}/${PN}-3.7.3.1-disable-accessibility.patch" + + mkdir -p "${S}"/m4 + eautoreconf + + gnome2_src_prepare +} + +src_configure() { + # 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 + G2CONF="${G2CONF} + --disable-static + --localstatedir=${EPREFIX}/var + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-pam-prefix=${EPREFIX}/etc + --with-default-pam-config=none + --with-at-spi-registryd-directory=${EPREFIX}/usr/libexec + --with-consolekit-directory=${EPREFIX}/usr/lib/ConsoleKit + --with-initial-vt=7 + $(use_with accessibility xevie) + $(use_with audit libaudit) + $(use_enable ipv6) + $(use_with consolekit console-kit) + $(use_with plymouth) + $(use_with selinux) + $(use_with systemd) + $(systemd_with_unitdir) + $(use_with tcpd tcp-wrappers) + $(use_with xinerama) + ITSTOOL=$(type -P true)" + gnome2_src_configure +} + +src_install() { + gnome2_src_install + + # our x11's scripts point to /usr/bin/gdm + dosym /usr/sbin/gdm /usr/bin/gdm + + # log, etc. + keepdir /var/log/gdm + + # 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 + + cd "${WORKDIR}/${G_P}" + local LDAP + use ldap && LDAP=yes + emake GDM_WELCOME="gdm-launch-environment" LDAP=${LDAP} EPREFIX="${EPREFIX}" \ + SYSTEMD_UNITDIR="$(systemd_get_unitdir)" DESTDIR="${D}" install +} + +pkg_postinst() { + local d ret + + gnome2_pkg_postinst + + dbus-launch dconf update || die "'dconf update' failed" + + # 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} + + elog "To make GDM start at boot, edit /etc/conf.d/xdm" + elog "and then execute 'rc-update add xdm default'." + elog "If you already have GDM running, you will need to restart it." + + elog + elog "GDM ignores most non-localization environment variables. If you" + elog "need GDM to launch gnome-session with a particular environment," + elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see" + elog "the pam_env man page for more information." + elog + + if has_version sys-auth/pambase[gnome-keyring]; then + elog "For passwordless login to unlock your keyring, you need to set an" + elog "empty password on your keyring. Use app-crypt/seahorse for that." + else + elog "To unlock your keyring on login, install sys-auth/pambase" + elog "with USE=gnome-keyring" + fi + + if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then + elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" + elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" + mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if rc-config list default | grep -q xdm; then + elog "To remove GDM from startup please execute" + elog "'rc-update del xdm default'" + fi +} |