From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, gnome-base/gdm/files/
Date: Sun, 9 Sep 2012 00:39:01 +0000 (UTC) [thread overview]
Message-ID: <1347145098.1b3bc414cc8c7ec8735dc00349d58999517d28d1.nirbheek@gentoo> (raw)
commit: 1b3bc414cc8c7ec8735dc00349d58999517d28d1
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 8 22:58:18 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Sep 8 22:58:18 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1b3bc414
Add gnome-base/gdm-3.5.91
---
.../gdm-3.5.91-fix-daemonize-regression.patch | 125 ++++++++++++++++++++
.../gdm/{gdm-9999.ebuild => gdm-3.5.91.ebuild} | 32 ++---
gnome-base/gdm/gdm-9999.ebuild | 32 ++---
3 files changed, 149 insertions(+), 40 deletions(-)
diff --git a/gnome-base/gdm/files/gdm-3.5.91-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-3.5.91-fix-daemonize-regression.patch
new file mode 100644
index 0000000..60aea72
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.5.91-fix-daemonize-regression.patch
@@ -0,0 +1,125 @@
+From 7f5104b242e6b36e6143183b14582d362763ff2a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 2 Nov 2010 23:16:51 +0100
+Subject: [PATCH 2/6] daemonize so that the boot process can continue
+
+Gentoo bug: #236701
+
+Originally from: Dan Nicholson <dbn.lists@gmail.com>
+
+Fork gdm-binary, except when -nodaemon is used
+
+gdm-binary now forks and the parent terminates, except when the
+-nodaemon or --nodaemon options are used. This provides compatibility
+with xdm. Fixes bug #550170.
+
+---
+ daemon/main.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 64 insertions(+), 0 deletions(-)
+
+diff --git a/daemon/main.c b/daemon/main.c
+index 5b8d66b..191b6e3 100644
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -513,6 +513,56 @@ is_debug_set (void)
+ return debug;
+ }
+
++static void
++dup_dev_null (int fd, int flags)
++{
++ int nullfd;
++ int dupfd;
++
++ VE_IGNORE_EINTR (nullfd = open ("/dev/null", flags));
++ if (G_UNLIKELY (nullfd < 0)) {
++ gdm_fail (_("Cannot open /dev/null: %s!"),
++ strerror (errno));
++ exit (EXIT_FAILURE);
++ }
++
++ VE_IGNORE_EINTR (dupfd = dup2 (nullfd, fd));
++ if (G_UNLIKELY (dupfd < 0)) {
++ gdm_fail (_("Cannot duplicate /dev/null: %s!"),
++ strerror (errno));
++ exit (EXIT_FAILURE);
++ }
++
++ VE_IGNORE_EINTR (close (nullfd));
++}
++
++static void
++daemonify (void)
++{
++ pid_t pid;
++
++ pid = fork ();
++
++ /* terminate the parent */
++ if (pid > 0)
++ exit (EXIT_SUCCESS);
++
++ if (G_UNLIKELY (pid < 0)) {
++ gdm_fail (_("fork () failed: %s!"), strerror (errno));
++ exit (EXIT_FAILURE);
++ }
++
++ if (G_UNLIKELY (setsid () < 0)) {
++ gdm_fail (_("setsid () failed: %s!"), strerror (errno));
++ exit (EXIT_FAILURE);
++ }
++
++ /* reopen stdin, stdout, stderr with /dev/null */
++ dup_dev_null (STDIN_FILENO, O_RDONLY);
++ dup_dev_null (STDOUT_FILENO, O_RDWR);
++ dup_dev_null (STDERR_FILENO, O_RDWR);
++}
++
+ int
+ main (int argc,
+ char **argv)
+@@ -523,13 +573,16 @@ main (int argc,
+ DBusGConnection *connection;
+ GError *error;
+ int ret;
++ int i;
+ gboolean res;
+ GdmSignalHandler *signal_handler;
+ 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 },
+
+@@ -547,6 +600,14 @@ main (int argc,
+
+ g_type_init ();
+
++ /* preprocess the arguments to support the xdm style
++ * -nodaemon option
++ */
++ 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);
+@@ -617,6 +678,9 @@ main (int argc,
+ exit (-1);
+ }
+
++ if (no_daemon == FALSE)
++ daemonify ();
++
+ /* pid file */
+ delete_pid ();
+ write_pid ();
+--
+1.7.3.1
+
diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-3.5.91.ebuild
similarity index 91%
copy from gnome-base/gdm/gdm-9999.ebuild
copy to gnome-base/gdm/gdm-3.5.91.ebuild
index 6438794..0a34787 100644
--- a/gnome-base/gdm/gdm-9999.ebuild
+++ b/gnome-base/gdm/gdm-3.5.91.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1.ebuild,v 1.2 2012/06/07 22:18:53 zmedico Exp $
EAPI="4"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2 pam systemd
+inherit autotools eutils gnome2 pam systemd user
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,20 +15,19 @@ HOMEPAGE="http://www.gnome.org/projects/gdm/"
LICENSE="GPL-2"
SLOT="0"
+IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth smartcard systemd tcpd test xinerama +xklavier"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~sh ~x86"
fi
-IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth selinux smartcard systemd tcpd test xinerama +xklavier"
-
# 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
+# selinux support is now automagic. Not sure if that really matters.
COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.29.3:2
+ >=dev-libs/glib-2.33.2:2
>=x11-libs/gtk+-2.91.1:3
>=x11-libs/pango-1.3
dev-libs/nspr
@@ -63,16 +62,14 @@ COMMON_DEPEND="
gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
plymouth? ( sys-boot/plymouth )
- selinux? ( sys-libs/libselinux )
systemd? ( >=sys-apps/systemd-39 )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- xinerama? ( x11-libs/libXinerama )
- xklavier? ( >=x11-libs/libxklavier-4 )"
+ xinerama? ( x11-libs/libXinerama )"
DEPEND="${COMMON_DEPEND}
test? ( >=dev-libs/check-0.9.4 )
xinerama? ( x11-proto/xineramaproto )
app-text/docbook-xml-dtd:4.1.2
- sys-devel/gettext
+ >=sys-devel/gettext-0.17
x11-proto/inputproto
x11-proto/randrproto
>=dev-util/intltool-0.40.0
@@ -120,13 +117,14 @@ pkg_setup() {
--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-initial-vt=7
$(use_with accessibility xevie)
$(use_enable ipv6)
$(use_enable xklavier libxklavier)
$(use_with consolekit console-kit)
- $(use_with plymouth)
- $(use_with selinux)
+ $(use_with plymouth ply-boot-client)
$(use_with systemd)
$(use_with tcpd tcp-wrappers)
$(use_with xinerama)"
@@ -148,14 +146,11 @@ pkg_setup() {
}
src_prepare() {
- # remove unneeded linker directive for selinux, bug #41022
- epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
-
# daemonize so that the boot process can continue, bug #236701
- epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
+ epatch "${FILESDIR}/${PN}-3.5.91-fix-daemonize-regression.patch"
# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
- epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
+ #epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
# make custom session work, bug #216984
epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
@@ -163,9 +158,6 @@ src_prepare() {
# ssh-agent handling must be done at xinitrc.d, bug #220603
epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
- # fix libxklavier automagic support
- epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
-
# don't load accessibility support at runtime when USE=-accessibility
use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch"
diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild
index 6438794..0a34787 100644
--- a/gnome-base/gdm/gdm-9999.ebuild
+++ b/gnome-base/gdm/gdm-9999.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1.ebuild,v 1.2 2012/06/07 22:18:53 zmedico Exp $
EAPI="4"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2 pam systemd
+inherit autotools eutils gnome2 pam systemd user
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -15,20 +15,19 @@ HOMEPAGE="http://www.gnome.org/projects/gdm/"
LICENSE="GPL-2"
SLOT="0"
+IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth smartcard systemd tcpd test xinerama +xklavier"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~sh ~x86"
fi
-IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth selinux smartcard systemd tcpd test xinerama +xklavier"
-
# 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
+# selinux support is now automagic. Not sure if that really matters.
COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.29.3:2
+ >=dev-libs/glib-2.33.2:2
>=x11-libs/gtk+-2.91.1:3
>=x11-libs/pango-1.3
dev-libs/nspr
@@ -63,16 +62,14 @@ COMMON_DEPEND="
gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
plymouth? ( sys-boot/plymouth )
- selinux? ( sys-libs/libselinux )
systemd? ( >=sys-apps/systemd-39 )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- xinerama? ( x11-libs/libXinerama )
- xklavier? ( >=x11-libs/libxklavier-4 )"
+ xinerama? ( x11-libs/libXinerama )"
DEPEND="${COMMON_DEPEND}
test? ( >=dev-libs/check-0.9.4 )
xinerama? ( x11-proto/xineramaproto )
app-text/docbook-xml-dtd:4.1.2
- sys-devel/gettext
+ >=sys-devel/gettext-0.17
x11-proto/inputproto
x11-proto/randrproto
>=dev-util/intltool-0.40.0
@@ -120,13 +117,14 @@ pkg_setup() {
--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-initial-vt=7
$(use_with accessibility xevie)
$(use_enable ipv6)
$(use_enable xklavier libxklavier)
$(use_with consolekit console-kit)
- $(use_with plymouth)
- $(use_with selinux)
+ $(use_with plymouth ply-boot-client)
$(use_with systemd)
$(use_with tcpd tcp-wrappers)
$(use_with xinerama)"
@@ -148,14 +146,11 @@ pkg_setup() {
}
src_prepare() {
- # remove unneeded linker directive for selinux, bug #41022
- epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
-
# daemonize so that the boot process can continue, bug #236701
- epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
+ epatch "${FILESDIR}/${PN}-3.5.91-fix-daemonize-regression.patch"
# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
- epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
+ #epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
# make custom session work, bug #216984
epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
@@ -163,9 +158,6 @@ src_prepare() {
# ssh-agent handling must be done at xinitrc.d, bug #220603
epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
- # fix libxklavier automagic support
- epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
-
# don't load accessibility support at runtime when USE=-accessibility
use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch"
next reply other threads:[~2012-09-09 0:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-09 0:39 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-12-11 23:44 [gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, gnome-base/gdm/files/ Gilles Dartiguelongue
2012-12-26 21:45 Gilles Dartiguelongue
2012-09-12 12:08 Nirbheek Chauhan
2012-09-12 12:06 Nirbheek Chauhan
2012-08-18 14:07 Priit Laes
2011-10-23 8:41 Alexandre Restovtsev
2011-08-13 6:08 Alexandre Restovtsev
2011-06-26 6:22 Nirbheek Chauhan
2011-05-03 10:52 Nirbheek Chauhan
2011-04-15 19:36 Nirbheek Chauhan
2011-04-05 0:57 Nirbheek Chauhan
2011-04-02 13:54 Nirbheek Chauhan
2011-02-26 11:41 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347145098.1b3bc414cc8c7ec8735dc00349d58999517d28d1.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox