Backport consolekit path fix, bug #461866.

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 277 insertions, 7 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index fc91311dbcc3..93bd0e46ff1d 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.371 2013/05/05 11:24:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.372 2013/05/20 11:52:21 eva Exp $
+
+*gdm-3.6.2-r1 (20 May 2013)
+
+  20 May 2013; Gilles Dartiguelongue <eva@gentoo.org> +gdm-3.6.2-r1.ebuild:
+  Backport consolekit path fix, bug #461866.
 
   05 May 2013; Justin Lecher <jlec@gentoo.org> gdm-3.6.2.ebuild,
   gdm-3.8.0.ebuild:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d901b7dee1a5..33b37eecafee 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 3.2.1.1/gdm 274 SHA256 4c26f02021ffa41500fa98aeda61dde6d059243f027cf93f8fb00fde39a9edd3 SHA512 3860d8756e6ed9b4ba381dcca847fa165ee6cedaba8894bc86249aa02452b6d752c8089649f3630787489fbb80715b1f6e12480991f7310f78951a7616271257 WHIRLPOOL 93d20dc0c109650154f8782161da08fe42d88b5d429d76ceafbc31c282ea54bd0d3068dcac1a971292fd7eacdb6d23ab82c37a86f8c003489edcc6da42f2f2f9
 AUX 3.2.1.1/gdm-autologin 369 SHA256 e964a100e72a8eccea4ed8e1558ae70cbe5b7cbea67415651d0c0bdcea2d06c8 SHA512 bc2208801a09af09309a45150c6e452c2be4b9a236726b3455b5b53d34db66684270b67077995d37fbea9888e233681c106c1c1cdc57c29e341120f0dd528743 WHIRLPOOL cf92af47395bddf34d722688f83cda97e830a635ad9584e1d14aed0c2861168e6f432fac84ccba3e1651270b4f7151b7e0244d0e2cd0c826b3731fab4bf9190a
@@ -35,14 +35,15 @@ DIST gdm-3.8.0.tar.xz 1665812 SHA256 4a0894ae50d1f090c6ccc450b74142243fff9ee17e2
 DIST gdm-gentoo-2012.09.25.tar.xz 1448 SHA256 f5978e4309e5486be41fec437a6e538dbfca3451757f3282a557941c4e70700d SHA512 c9d1a4699c34ce8708a4e7eed1b38d66ead507a4a2a6b45f2ef6254d54b46c755c9195db0593d6aa6785a8986e2ef5235592071c0cae8c1c8963951ecdb7c079 WHIRLPOOL c0efd131977b0036431b9edd6932025247323f198dc1bd7195efb55d31fd6b106ebdf391944b0009cf7a3261e99160fa6041a26348fe020badf26d0785f5dcc8
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 EBUILD gdm-2.20.11-r1.ebuild 7213 SHA256 71ac1e2eaaac38e36b3a11fc9bd883399e57b0bcae84458804f15611b5bf05b0 SHA512 5b78fe76b6ce79f5cab0ff027c1bc117766c234acfa58869155e56cd4fe0aae5a2e971014f2d9ea15637dbc6fcc5d5e536b5f36a6e3e664b2b2cb68779d83b04 WHIRLPOOL 7837696f0f0e54045ae4df101b89aa8ac9147ce064a406ed604ef8c7c04b30953ba35a8773c6bc404a60d62f6bca124db486c498690a561d2e8112b5f4452b5d
+EBUILD gdm-3.6.2-r1.ebuild 8125 SHA256 3992ffe031d3244fa8fb8d349120e58ced57f15930246a65ead05bf0596d16de SHA512 ee3ad68374d8ffbf09c0eeb212a02b03c069ed30c10936136d8123364c0962cf10874844b2e4b6ebd1891e75e945eca439fefa8f6baaf0bc5ecba03ad3874333 WHIRLPOOL 18f95e54da52ebfca663ba5087f6d428707314ba7bcec70a4e716a8df177b6cadf59a20448a3e0a4d3c81ad7b8a11aa3f0ea9230d875ae0f82efff309c0b5989
 EBUILD gdm-3.6.2.ebuild 8038 SHA256 87b27f6d367dad8c2c4b28f0d103eb7c22faece16065bf4585e93e43d17646e5 SHA512 23fd18fd08928e2205f89744f3de9ca1b4ce9440bfbecd700bc0d150162122cbe8a019850580daac1130914fcc70783481a163a5aac47cbbd5b37018971db106 WHIRLPOOL bf9ffc84d8f50f248e083ecb518150f97e6d382b0c4220aec12c3cb9e216332aa66378b9c21261dc42e78392c4e35055b917b46e830809b9d1b3d821cf1723eb
 EBUILD gdm-3.8.0.ebuild 7896 SHA256 34d4c40b63d4771462422ad6d893f2098d087539ccecc102d87d8075f96fee7b SHA512 217e6602f64f1a0b39323376f516f8a814679128f51ef324385e3a1ca29b1decd1c17c105634e551e132f2970a80ad66ea939135334c176b0623ad1e69274bce WHIRLPOOL 1ef57963321faffd68972171b8bde16e49b86ef89a06c25f2ce242a3414cf6fff3e147d7d1d091d863fec6963334bb4e879239bbae07b387cad3ac4963cf42d8
-MISC ChangeLog 55813 SHA256 afcf44f654efba89e50c394a345ce2e0b4a644e8abc4615cdbdc426319f09e24 SHA512 6f49ff4670b26f8daef5982122e8167a0ff5138dac2c346e2bd8999c668421938da5bf5fa00d4b599f5694feb5ffd7c5a11eed750d6ecc4a34d456b4b80b8bcc WHIRLPOOL c2788c5ba03bfaac1a097986da19f1b385d02db4084db6014e48d8f7b33c1cf141cfc43df6ce18bc1720da77c45594914e72455e0e42ccf8fa332e049a746f83
+MISC ChangeLog 55963 SHA256 1b94b447a2b189d81e9033ec8adf80ff216f38ed7a18a52bc23a5c97e46e31e6 SHA512 55543c2f869102136377d192b04b6d772d3ef1b7f59681019d5f387245a1f58345e5d5a222a88d349d23dc2aeb121e0b40c71b6866cb11a320f509e7c76a45f5 WHIRLPOOL c9f05b79541aeb590042f711a263f8f2213619524e9efd44c5ed4f7aa52b64cc46e5277f2f71ef82d8402770812ca4be024e3800bee8f920c2647b0abfaab901
 MISC metadata.xml 1022 SHA256 37e58ae7dcad61901d81d13c5594664f8d4c6b6ff44171884e6ac65b3561625b SHA512 91b08a96b496de46786985dfc069d51886d6507a15c25b2731f8272bc8bc170644744b88216f9eb2943274a752ff4c6bb6577c543cded31d745d92cc7781e286 WHIRLPOOL 863c72a48f63279bcd4762e652c2c25b17b4d07fda26c3a43828240206d10bfb5e68461523572c081fdbcc9e097930c873d7e5604fd2d8d77e4cc6edec08885a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGGQWQACgkQgAnW8HDreRZ1ZgCgwDaSiioZzESbgwF5wk2sJOaC
-MlMAoKpz/z46xc0OOKpLxjZB7owswRCY
-=KwJV
+iEYEAREIAAYFAlGaDncACgkQ1fmVwcYIWAb83wCePBzbhGS7N+kVY41dwjZ6+SPG
+fasAn1DUZLidsJ09s+1V2A3HikOgCw/O
+=DN6a
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-3.6.2-r1.ebuild b/gnome-base/gdm/gdm-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..47089d82624c
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.6.2-r1.ebuild
@@ -0,0 +1,264 @@
+# 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.6.2-r1.ebuild,v 1.1 2013/05/20 11:52:21 eva 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.33.2: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[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 fix
+	#epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
+
+	# daemonize so that the boot process can continue, bug #236701
+	epatch "${FILESDIR}/${PN}-3.6.0-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"
+
+	# spurious unicode characters causing build failure, bug #449062
+	# https://bugzilla.gnome.org/show_bug.cgi?id=690842
+	LC_ALL=C epatch "${FILESDIR}/${PN}-3.6.2-gdm-slave.xml-unicode.patch"
+
+	# don't load accessibility support at runtime when USE=-accessibility
+	use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.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
+
+	mkdir -p "${S}"/m4
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	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.
+	# --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-binary /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
+}