From 3d5ab869b3d207787eb482ca17aa91d6daf7e741 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 28 Mar 2011 21:41:26 +0000 Subject: Version bump. Fix CVE-2011-0727. XDMCP IPv6 fixes and other fixes. Clean up old revision. Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64 --- gnome-base/gdm/ChangeLog | 9 +- gnome-base/gdm/Manifest | 18 +- gnome-base/gdm/files/gdm-2.28.2-remove-hal.patch | 194 --------------------- gnome-base/gdm/gdm-2.28.2-r1.ebuild | 206 ----------------------- gnome-base/gdm/gdm-2.32.1.ebuild | 200 ++++++++++++++++++++++ 5 files changed, 221 insertions(+), 406 deletions(-) delete mode 100644 gnome-base/gdm/files/gdm-2.28.2-remove-hal.patch delete mode 100644 gnome-base/gdm/gdm-2.28.2-r1.ebuild create mode 100644 gnome-base/gdm/gdm-2.32.1.ebuild (limited to 'gnome-base') 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 -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 gdm-2.20.11.ebuild: Fix slot-deps on gtk+ and other libs diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index f1e03dbdae3b..517c123f8165 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140 AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be7a34324b269d493585990f134e82cc722a SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b @@ -7,7 +10,6 @@ AUX gdm-2.20.10-gdmsetup-24hr-combo.patch 1108 RMD160 4d4cc4731d07363dbe0d52c08f AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 RMD160 cc84a57a53e0f8ab8688173f96869c6563054b98 SHA1 d15d3187df74570831b6b4a9c125ff9ee218fd72 SHA256 59b0150159776a200c6041290f672f367b4a56f8adc5218d74a271a376c7cfe1 AUX gdm-2.20.2-gksu.patch 544 RMD160 044068ec9c0fac089dcfa8b62597741d6bf6a4ac SHA1 7672aa94ea512cf50740466c6bc072fa236c7d01 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d AUX gdm-2.20.9-parallel-make.patch 1499 RMD160 aaca98cd72b464aec043b2aeb51973f9ab3c9a33 SHA1 1718004f16455a3f3c957b40b2391c563988681e SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d -AUX gdm-2.28.2-remove-hal.patch 6934 RMD160 94083bac8b9b489d47414330cd06601c32a3901c SHA1 0a254daba5dd8c9ee91d362ee64d185c521bf8fa SHA256 a8303f2834132c88c6cd6925dd96a10877c7a180c761246ac701f1dd09de5d7d AUX gdm-2.32.0-automagic-libxklavier-support.patch 2069 RMD160 805e7bfd5b2429c8fb5aeac397c2d564620ae41c SHA1 80bb72815646d40eb6a750a7be52d8e4f399d840 SHA256 91fdd46ab5ad1b4071cb798499ddd98bee47c67961906d1db0ee47cd4919fac5 AUX gdm-2.32.0-broken-VT-detection.patch 2851 RMD160 89475fd5be6f0692a56ad153239335e90bfc7d9c SHA1 fa2f1c9cc1bf14472bce29a68f9f7e3d2f6a9c6c SHA256 d1ab4a0c931e799adf436a8af53b06436e6fe0321ed05b6cc08de7ad3cba3d49 AUX gdm-2.32.0-custom-session.patch 1317 RMD160 ca07b9580da3bb436629c4655a89b4b6374eb6ba SHA1 db023e279217896849c541dfb50cb96491280ad6 SHA256 3f79b0355225669dd791527a50d5bd0f7ceca850a8eab7bb32f52d609b10eed6 @@ -16,12 +18,18 @@ AUX gdm-2.32.0-selinux-remove-attr.patch 851 RMD160 10dc29802fb29047188bff7aafe9 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 863 RMD160 6ea58bdc1fa24d41f3c51fc7cdbabc05417053f0 SHA1 ad98258168b84c80d581085804b61649ac67e4d5 SHA256 71231d08baf41ee7b91c33c3d8a731c078d1d29328e09223efb1f579bacdaffe DIST gdm-2.20.11.tar.bz2 4013059 RMD160 e400bb8a0b78a2e8b0da98edd2e0f3a7a0267f04 SHA1 be23bdf32b7a4254ac80983f4edf25cafa847ff3 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 RMD160 9d8f9954bd0d8b657a2faf2516b4548b9f1556d3 SHA1 28ceedb42440fdb50dffa7e69b18f213b00e3935 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 -DIST gdm-2.26-gentoo-patches.tar.bz2 4175 RMD160 356cd339b733e41c504bf2c951a322da205439be SHA1 a58adde0bb70b56d4b61cd5bf0ca81fbbfa44c69 SHA256 e6ad1a4995eb622cf74e5e897ac0588dff122446af5e1e52f165fd8bccb105d2 -DIST gdm-2.28.2.tar.bz2 2283246 RMD160 9b5cd1fb0a9799e783546331ac117aebc3ee7474 SHA1 c5b3fb7908aeb341a1bf8fc28b4afb601626e601 SHA256 0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a DIST gdm-2.32.0.tar.bz2 2477647 RMD160 e072229b29b1420ea8963ab07cf3133868b434a2 SHA1 f3890176f8b10022ed25f6155a98833ae8ce1ca4 SHA256 f47acd19ed10d6fbb37c3e2b54f5b392c7020db67f71db3f75567ead30ab2fa4 +DIST gdm-2.32.1.tar.bz2 2441685 RMD160 70526a3ddec3ff8a1313243641bf807a2218f3ae SHA1 75017d6acfc8e158e0df848629431021b25998a5 SHA256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 EBUILD gdm-2.20.11.ebuild 6981 RMD160 d89e163666b53c173578abce9846fed4dde4d5f9 SHA1 5dff7be8ab624c3b15b5dfe6bfb14ae1afc6f0d7 SHA256 174e8685993d432e3cad052626a318f6b622a07954d873ac79c27db0d8ebe3f5 -EBUILD gdm-2.28.2-r1.ebuild 5850 RMD160 f0b5729d7c4952c6b455837fb33f8805c8fdd27a SHA1 e0d445c21f9e0ee5ca7bfa04ba5dcd20e828bb35 SHA256 61dbd9ab20bf7967cebfbfc64c69d4b0b49fd07f33430e92a2be60f58b5e53b4 EBUILD gdm-2.32.0.ebuild 5570 RMD160 f2fd8f43fa9f98fa1c750ea1a8f41e473c4a771a SHA1 803d0e900982be406d15f701d28e3dfb61ea4455 SHA256 50422084bd5c0a3c74faee5c4a5f4e4ebdc021cedbd575099ce2efc1180bbfdc -MISC ChangeLog 46510 RMD160 f372328f089e081243f91030c3bd108caa92c7ca SHA1 b59d0a2f611a0660a80faaa60b54a8adcc504ac2 SHA256 5d4b2aed387d3fa3da6a766cc8ff748a697dd77570a2e2019bb704189ed3e579 +EBUILD gdm-2.32.1.ebuild 5564 RMD160 66521c1847ef72639e46c80bff3312581bf211c0 SHA1 6833be35516b42a90510d4ae7212dd2dc0155dbb SHA256 66dfd30db573124795a879bd8a8b28c02fdbe65a9b39e7829c676f5a1877505a +MISC ChangeLog 46762 RMD160 49b074f87ef342753b47c80478a2c1facbac4374 SHA1 b4a022708c1a64697d864f89eb0fba28862d6417 SHA256 7f46f55f4297c8b28473432c3df5da574c7f0933f07a563419d5dd2d260d6b62 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2RAIwACgkQ1fmVwcYIWAZWVQCg0VQHfh27DBeYFxpg4o/v3ozI +LukAnjf1dxf+QgDdY+hRED4ngaGPToBd +=wRm1 +-----END PGP SIGNATURE----- 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 -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.28.2-r1.ebuild deleted file mode 100644 index 4741e71cfcb0..000000000000 --- a/gnome-base/gdm/gdm-2.28.2-r1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2010 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 $ - -EAPI="2" - -inherit eutils pam gnome2 autotools - -DESCRIPTION="GNOME Display Manager" -HOMEPAGE="http://www.gnome.org/projects/gdm/" - -LICENSE="GPL-2" -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" - -# 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 -RDEPEND=" - >=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.15.4 - >=x11-libs/gtk+-2.10.0:2 - >=x11-libs/pango-1.3 - >=media-libs/libcanberra-0.4[gtk] - >=gnome-base/libglade-2 - >=gnome-base/gconf-2.6.1 - >=gnome-base/gnome-panel-2 - >=gnome-base/gnome-session-2.28 - >=x11-misc/xdg-utils-1.0.2-r3 - sys-power/upower - app-text/iso-codes - - x11-base/xorg-server - x11-libs/libXi - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-apps/sessreg - - virtual/pam - consolekit? ( sys-auth/consolekit ) - - accessibility? ( x11-libs/libXevie ) - gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) - selinux? ( sys-libs/libselinux ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - xinerama? ( x11-libs/libXinerama ) - xklavier? ( >=x11-libs/libxklavier-4 ) - - !gnome-extra/fast-user-switch-applet" -DEPEND="${RDEPEND} - test? ( >=dev-libs/check-0.9.4 ) - xinerama? ( x11-proto/xineramaproto ) - app-text/docbook-xml-dtd:4.1.2 - sys-devel/gettext - x11-proto/inputproto - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - >=app-text/scrollkeeper-0.1.4 - >=app-text/gnome-doc-utils-0.3.2" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -pkg_setup() { - # PAM is the only auth scheme supported - # even though configure lists shadow and crypt - # they don't have any corresponding code - G2CONF="${G2CONF} - --disable-schemas-install - --localstatedir=/var - --with-xdmcp=yes - --enable-authentication-scheme=pam - --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) - $(use_with selinux) - $(use_with tcpd tcp-wrappers) - $(use_with xinerama)" - - enewgroup gdm - enewuser gdm -1 -1 /var/lib/gdm gdm -} - -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" - - # Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339) - epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch" - - # Make custom session work, bug #. - epatch "${WORKDIR}/${PN}-2.26.1-custom-session.patch" - - # ssh-agent handling must be done at xinitrc.d - epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch" - - # Fix libxklavier automagic support - epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch" - - # Remove all traces of HAL - epatch "${FILESDIR}/${P}-remove-hal.patch" - rm -vf "${S}/daemon/test-hal-seats.c" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -src_install() { - gnome2_src_install - - local gentoodir="${WORKDIR}/${GDM_EXTRA}" - - # gdm-binary should be gdm to work with our init (#5598) - rm -f "${D}/usr/sbin/gdm" - dosym /usr/sbin/gdm-binary /usr/sbin/gdm - - # our x11's scripts point to /usr/bin/gdm - dosym /usr/sbin/gdm-binary /usr/bin/gdm - - # log, etc. - keepdir /var/log/gdm - keepdir /var/gdm - - fowners root:gdm /var/gdm - fperms 1770 /var/gdm - - # add a custom xsession .desktop by default (#44537) - exeinto /etc/X11/dm/Sessions - doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed" - - # add xinitrc.d scripts - exeinto /etc/X11/xinit/xinitrc.d - doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" - doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" - - # install XDG_DATA_DIRS gdm changes - echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm - doenvd 99xdg-gdm || die "doenvd failed" - - # add a custom sound playing script (#248253) - dobin "${gentoodir}/gdmplay" - - # avoid file collision, bug #213118 - rm -f "${D}/usr/share/xsessions/gnome.desktop" - - # We replace the pam stuff by our own - rm -rf "${D}/etc/pam.d" - - use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* - - dopamd "${gentoodir}"/pam.d/* - dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" -} - -pkg_postinst() { - gnome2_pkg_postinst - - ewarn - ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" - ewarn "visit us on #gentoo-desktop if you have problems." - ewarn - - 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." - - if use gnome-keyring; then - elog "For autologin to unlock your keyring, you need to set an empty" - elog "password on your keyring. Use app-crypt/seahorse for that." - 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 xdm)" != "" ]] ; then - elog "To remove GDM from startup please execute" - elog "'rc-update del xdm default'" - fi -} diff --git a/gnome-base/gdm/gdm-2.32.1.ebuild b/gnome-base/gdm/gdm-2.32.1.ebuild new file mode 100644 index 000000000000..c2e0e8826bef --- /dev/null +++ b/gnome-base/gdm/gdm-2.32.1.ebuild @@ -0,0 +1,200 @@ +# 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.32.1.ebuild,v 1.1 2011/03/28 21:41:26 eva Exp $ + +EAPI="3" +GCONF_DEBUG="yes" + +inherit autotools eutils gnome2 pam + +DESCRIPTION="GNOME Display Manager" +HOMEPAGE="http://www.gnome.org/projects/gdm/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86" + +IUSE_LIBC="elibc_glibc" +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/${GDM_EXTRA}.tar.bz2" + +# 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.22:2 + >=x11-libs/gtk+-2.20.2:2 + >=x11-libs/pango-1.3 + >=media-libs/libcanberra-0.4[gtk] + >=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-0.9 + app-text/iso-codes + + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-apps/sessreg + + virtual/pam + consolekit? ( sys-auth/consolekit ) + + accessibility? ( x11-libs/libXevie ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) + xklavier? ( >=x11-libs/libxklavier-4 ) + + !gnome-extra/fast-user-switch-applet" +DEPEND="${RDEPEND} + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) + app-text/docbook-xml-dtd:4.1.2 + sys-devel/gettext + x11-proto/inputproto + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + >=app-text/scrollkeeper-0.1.4 + >=app-text/gnome-doc-utils-0.3.2" + +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 + G2CONF="${G2CONF} + --disable-schemas-install + --localstatedir=/var + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-pam-prefix=/etc + SOUND_PROGRAM=/usr/bin/gdmplay + $(use_with accessibility xevie) + $(use_enable ipv6) + $(use_enable xklavier libxklavier) + $(use_with consolekit console-kit) + $(use_with selinux) + $(use_with tcpd tcp-wrappers) + $(use_with xinerama)" + + enewgroup gdm + enewuser gdm -1 -1 /var/lib/gdm gdm +} + +src_prepare() { + gnome2_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" + + # fix VT grab problem causing GDM to grab VT2 instead of 7, bug #261339 + epatch "${FILESDIR}/${PN}-2.32.0-broken-VT-detection.patch" + + # make custom session work, bug #216984 + epatch "${FILESDIR}/${PN}-2.32.0-custom-session.patch" + + # 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" + + mkdir "${S}"/m4 + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + +src_install() { + gnome2_src_install + + local gentoodir="${WORKDIR}/${GDM_EXTRA}" + + # gdm-binary should be gdm to work with our init (#5598) + rm -f "${D}/usr/sbin/gdm" + dosym /usr/sbin/gdm-binary /usr/sbin/gdm + + # our x11's scripts point to /usr/bin/gdm + dosym /usr/sbin/gdm-binary /usr/bin/gdm + + # log, etc. + keepdir /var/log/gdm + keepdir /var/gdm + + fowners root:gdm /var/gdm + fperms 1770 /var/gdm + + # add a custom xsession .desktop by default (#44537) + exeinto /etc/X11/dm/Sessions + doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed" + + # add xinitrc.d scripts + exeinto /etc/X11/xinit/xinitrc.d + doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed" + doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed" + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm || die "doenvd failed" + + # add a custom sound playing script (#248253) + dobin "${gentoodir}/gdmplay" + + # avoid file collision, bug #213118 + rm -f "${D}/usr/share/xsessions/gnome.desktop" + + # We replace the pam stuff by our own + rm -rf "${D}/etc/pam.d" + + use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* + + dopamd "${gentoodir}"/pam.d/* + dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" +} + +pkg_postinst() { + gnome2_pkg_postinst + + ewarn + ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" + ewarn "visit us on #gentoo-desktop if you have problems." + ewarn + + 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." + + if use gnome-keyring; then + elog "For autologin to unlock your keyring, you need to set an empty" + elog "password on your keyring. Use app-crypt/seahorse for that." + 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 +} -- cgit v1.2.3-65-gdbad