Version bump. Fix CVE-2011-0727. XDMCP IPv6 fixes and other fixes. Clean up old revision.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 35 insertions, 228 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index d84d990028f7..c74e302b0401 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.336 2011/03/16 10:25:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.337 2011/03/28 21:41:26 eva Exp $
+
+*gdm-2.32.1 (28 Mar 2011)
+
+  28 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> -gdm-2.28.2-r1.ebuild,
+  -files/gdm-2.28.2-remove-hal.patch, +gdm-2.32.1.ebuild:
+  Version bump. Fix CVE-2011-0727. XDMCP IPv6 fixes and other fixes. Clean up
+  old revision.
 
   16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gdm-2.20.11.ebuild:
   Fix slot-deps on gtk+ and other libs
diff --git a/gnome-base/gdm/files/gdm-2.28.2-remove-hal.patch b/gnome-base/gdm/files/gdm-2.28.2-remove-hal.patch
deleted file mode 100644
index e72a30f84bae..000000000000
--- a/gnome-base/gdm/files/gdm-2.28.2-remove-hal.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-Remove all traces of HAL. The last hunk which removes test-hal-seats.c has been
-deleted to save space; the file is manually removed instead.
-
-http://bugs.gentoo.org/show_bug.cgi?id=295206
----
-From 3daaac264df2f5a587c35cd8e41ecf18900fa9c9 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Thu, 21 Jan 2010 00:00:02 +0100
-Subject: [PATCH] remove remaining traces of Hal
-
-The code which used the Hal connection already was disabled, so gdm connected
-to Hal in vain (which just triggered Hal startup when using D-Bus activation).
-Remove all remaining traces of hal now.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=593787
----
- daemon/Makefile.am                 |    9 --
- daemon/gdm-local-display-factory.c |  110 -----------------------
- daemon/test-hal-seats.c            |  173 ------------------------------------
- 3 files changed, 0 insertions(+), 293 deletions(-)
- delete mode 100644 daemon/test-hal-seats.c
-
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index a122a15..79bb63e 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -75,18 +75,9 @@ gdm-product-display-glue.h: gdm-product-display.xml Makefile.am
- 	dbus-binding-tool --prefix=gdm_product_display --mode=glib-server --output=gdm-product-display-glue.h $(srcdir)/gdm-product-display.xml
- 
- noinst_PROGRAMS = 		\
--	test-hal-seats		\
- 	test-session		\
- 	$(NULL)
- 
--test_hal_seats_SOURCES = 	\
--	test-hal-seats.c	\
--	$(NULL)
--
--test_hal_seats_LDADD =		\
--	$(DAEMON_LIBS)		\
--	$(NULL)
--
- test_session_SOURCES = 		\
- 	test-session.c	 	\
- 	gdm-session.c		\
-diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
-index 3984ada..69daf9e 100644
---- a/daemon/gdm-local-display-factory.c
-+++ b/daemon/gdm-local-display-factory.c
-@@ -45,12 +45,6 @@
- #define GDM_LOCAL_DISPLAY_FACTORY_DBUS_PATH GDM_DBUS_PATH "/LocalDisplayFactory"
- #define GDM_MANAGER_DBUS_NAME               "org.gnome.DisplayManager.LocalDisplayFactory"
- 
--#define HAL_DBUS_NAME                           "org.freedesktop.Hal"
--#define HAL_DBUS_MANAGER_PATH                   "/org/freedesktop/Hal/Manager"
--#define HAL_DBUS_MANAGER_INTERFACE              "org.freedesktop.Hal.Manager"
--#define HAL_DBUS_DEVICE_INTERFACE               "org.freedesktop.Hal.Device"
--#define SEAT_PCI_DEVICE_CLASS                   3
--
- #define MAX_DISPLAY_FAILURES 5
- 
- struct GdmLocalDisplayFactoryPrivate
-@@ -372,83 +366,6 @@ create_display (GdmLocalDisplayFactory *factory)
-         return display;
- }
- 
--#if 0
--static void
--create_display_for_device (GdmLocalDisplayFactory *factory,
--                           DBusGProxy             *device_proxy)
--{
--        create_display (factory);
--}
--
--static void
--create_displays_for_pci_devices (GdmLocalDisplayFactory *factory)
--{
--        char      **devices;
--        const char *key;
--        const char *value;
--        GError     *error;
--        gboolean    res;
--        int         i;
--
--        g_debug ("GdmLocalDisplayFactory: Getting PCI seat devices");
--
--        key = "info.bus";
--        value = "pci";
--
--        devices = NULL;
--        error = NULL;
--        res = dbus_g_proxy_call (factory->priv->proxy,
--                                 "FindDeviceStringMatch",
--                                 &error,
--                                 G_TYPE_STRING, key,
--                                 G_TYPE_STRING, value,
--                                 G_TYPE_INVALID,
--                                 G_TYPE_STRV, &devices,
--                                 G_TYPE_INVALID);
--        if (! res) {
--                g_warning ("Unable to query HAL: %s", error->message);
--                g_error_free (error);
--        }
--
--        /* now look for pci class 3 */
--        key = "pci.device_class";
--        for (i = 0; devices [i] != NULL; i++) {
--                DBusGProxy *device_proxy;
--                int         class_val;
--
--                device_proxy = dbus_g_proxy_new_for_name (factory->priv->connection,
--                                                          HAL_DBUS_NAME,
--                                                          devices [i],
--                                                          HAL_DBUS_DEVICE_INTERFACE);
--                if (device_proxy == NULL) {
--                        continue;
--                }
--
--                error = NULL;
--                res = dbus_g_proxy_call (device_proxy,
--                                         "GetPropertyInteger",
--                                         &error,
--                                         G_TYPE_STRING, key,
--                                         G_TYPE_INVALID,
--                                         G_TYPE_INT, &class_val,
--                                         G_TYPE_INVALID);
--                if (! res) {
--                        g_warning ("Unable to query HAL: %s", error->message);
--                        g_error_free (error);
--                }
--
--                if (class_val == SEAT_PCI_DEVICE_CLASS) {
--                        g_debug ("GdmLocalDisplayFactory: Found device: %s", devices [i]);
--                        create_display_for_device (factory, device_proxy);
--                }
--
--                g_object_unref (device_proxy);
--        }
--
--        g_strfreev (devices);
--}
--#endif
--
- static gboolean
- gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
- {
-@@ -525,29 +442,6 @@ register_factory (GdmLocalDisplayFactory *factory)
-         return TRUE;
- }
- 
--static gboolean
--connect_to_hal (GdmLocalDisplayFactory *factory)
--{
--        factory->priv->proxy = dbus_g_proxy_new_for_name (factory->priv->connection,
--                                                          HAL_DBUS_NAME,
--                                                          HAL_DBUS_MANAGER_PATH,
--                                                          HAL_DBUS_MANAGER_INTERFACE);
--        if (factory->priv->proxy == NULL) {
--                g_warning ("Couldn't create proxy for HAL Manager");
--                return FALSE;
--        }
--
--        return TRUE;
--}
--
--static void
--disconnect_from_hal (GdmLocalDisplayFactory *factory)
--{
--        if (factory->priv->proxy == NULL) {
--                g_object_unref (factory->priv->proxy);
--        }
--}
--
- static GObject *
- gdm_local_display_factory_constructor (GType                  type,
-                                        guint                  n_construct_properties,
-@@ -565,8 +459,6 @@ gdm_local_display_factory_constructor (GType                  type,
-                 g_warning ("Unable to register local display factory with system bus");
-         }
- 
--        connect_to_hal (factory);
--
-         return G_OBJECT (factory);
- }
- 
-@@ -611,8 +503,6 @@ gdm_local_display_factory_finalize (GObject *object)
- 
-         g_hash_table_destroy (factory->priv->displays);
- 
--        disconnect_from_hal (factory);
--
-         G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->finalize (object);
- }
- 
diff --git a/gnome-base/gdm/gdm-2.28.2-r1.ebuild b/gnome-base/gdm/gdm-2.32.1.ebuild
index 4741e71cfcb0..c2e0e8826bef 100644
--- a/gnome-base/gdm/gdm-2.28.2-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.32.1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v 1.8 2010/11/11 11:48:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.32.1.ebuild,v 1.1 2011/03/28 21:41:26 eva Exp $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 
-inherit eutils pam gnome2 autotools
+inherit autotools eutils gnome2 pam
 
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="http://www.gnome.org/projects/gdm/"
@@ -14,29 +15,26 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86"
 
 IUSE_LIBC="elibc_glibc"
-IUSE="accessibility +consolekit debug ipv6 gnome-keyring selinux tcpd test xinerama +xklavier $IUSE_LIBC"
+IUSE="accessibility +consolekit ipv6 gnome-keyring selinux tcpd test xinerama +xklavier $IUSE_LIBC"
 
 # Name of the tarball with gentoo specific files
 GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
 
 SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.26-gentoo-patches.tar.bz2
 	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
 
-# FIXME: gdm has a strange behaviour on reboot (from runlevel), especially when xdm tries to stop it (its blocks).
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug 295686
+# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 RDEPEND="
 	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.15.4
-	>=x11-libs/gtk+-2.10.0:2
+	>=dev-libs/glib-2.22:2
+	>=x11-libs/gtk+-2.20.2:2
 	>=x11-libs/pango-1.3
 	>=media-libs/libcanberra-0.4[gtk]
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2.6.1
+	>=gnome-base/gconf-2.31.3
 	>=gnome-base/gnome-panel-2
 	>=gnome-base/gnome-session-2.28
 	>=x11-misc/xdg-utils-1.0.2-r3
-	sys-power/upower
+	>=sys-power/upower-0.9
 	app-text/iso-codes
 
 	x11-base/xorg-server
@@ -70,9 +68,9 @@ DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.1.4
 	>=app-text/gnome-doc-utils-0.3.2"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+
 	# PAM is the only auth scheme supported
 	# even though configure lists shadow and crypt
 	# they don't have any corresponding code
@@ -84,7 +82,6 @@ pkg_setup() {
 		--with-pam-prefix=/etc
 		SOUND_PROGRAM=/usr/bin/gdmplay
 		$(use_with accessibility xevie)
-		$(use_enable debug)
 		$(use_enable ipv6)
 		$(use_enable xklavier libxklavier)
 		$(use_with consolekit console-kit)
@@ -99,28 +96,25 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch"
-
-	# Make it daemonize so that the boot process can continue (#236701)
-	epatch "${WORKDIR}/${PN}-2.26.1-fix-daemonize-regression.patch"
+	# remove unneeded linker directive for selinux, bug #41022
+	epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
 
-	# Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339)
-	epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch"
+	# daemonize so that the boot process can continue, bug #236701
+	epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
 
-	# Make custom session work, bug #.
-	epatch "${WORKDIR}/${PN}-2.26.1-custom-session.patch"
+	# fix VT grab problem causing GDM to grab VT2 instead of 7, bug #261339
+	epatch "${FILESDIR}/${PN}-2.32.0-broken-VT-detection.patch"
 
-	# ssh-agent handling must be done at xinitrc.d
-	epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch"
+	# make custom session work, bug #216984
+	epatch "${FILESDIR}/${PN}-2.32.0-custom-session.patch"
 
-	# Fix libxklavier automagic support
-	epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch"
+	# ssh-agent handling must be done at xinitrc.d, bug #220603
+	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
 
-	# Remove all traces of HAL
-	epatch "${FILESDIR}/${P}-remove-hal.patch"
-	rm -vf "${S}/daemon/test-hal-seats.c"
+	# fix libxklavier automagic support
+	epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
 
+	mkdir "${S}"/m4
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
@@ -199,7 +193,7 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 
-	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
+	if rc-config list default | grep -q xdm; then
 		elog "To remove GDM from startup please execute"
 		elog "'rc-update del xdm default'"
 	fi