Upstream bump; add check to remove gdm.conf (bug #142687)

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 217 insertions, 5 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 71f98b17a399..22c7b88bbc37 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.181 2006/09/14 00:46:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.182 2006/10/13 18:49:11 dang Exp $
+
+  13 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> +gdm-2.16.1.ebuild:
+  Upstream bump; add check to remove gdm.conf (bug #142687)
+
+*gdm-2.16.1 (13 Oct 2006)
+
+  13 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> +gdm-2.16.1.ebuild:
+  Bump to 2.16.1
 
   14 Sep 2006; Aron Griffis <agriffis@gentoo.org> gdm-2.14.9-r1.ebuild:
   Mark 2.14.9-r1 stable on ia64. #139612
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 81351fbee259..d808d7ef5d79 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.2.5/gnomerc 235 RMD160 59cfaf71d564bced9a93bfb64120ed60b4791783 SHA1 2aa4bcafeacd0f1e411b2f52bd2825138ae98add SHA256 f98d23145170f3461481ae53a052c71bed117a88219efad4e82f99e2d1c2519a
 MD5 2a4dc345919a4094ead16d7a122e40bf files/2.2.5/gnomerc 235
 RMD160 59cfaf71d564bced9a93bfb64120ed60b4791783 files/2.2.5/gnomerc 235
@@ -36,6 +39,7 @@ RMD160 a8cdac77abe6b7c00b242d834daf872d50dfedc0 files/gdm-2.8-CVE-2006-1057.patc
 SHA256 4574e37308e1186f50d601daae7fdc0cf1fc108ede4e2138b1c3d21504cdbadb files/gdm-2.8-CVE-2006-1057.patch 3670
 DIST gdm-2.14.9.tar.bz2 3046665 RMD160 f043ed11a8b174556b114e52dc50daa5432e68bb SHA1 264eaa09874a930c4080f903f43631dbf621e111 SHA256 0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2
 DIST gdm-2.16.0.tar.bz2 3160137 RMD160 e6775e55b0f4f7ec2dbde8e2295af7dcab4ae3b4 SHA1 dba97d43b83a27351b53866d06a1b99c1ce21557 SHA256 e017abdf55561ad0efb8520f6a3be00f7ceb78f038e7b5a464e5f639def39d5f
+DIST gdm-2.16.1.tar.bz2 3130299 RMD160 2aa56bf08be354778b9f0c55cbd441b2a354ac2f SHA1 2a684d194cea825a6fc14be551d7d33e373ef55c SHA256 9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6
 DIST gdm-2.2.5.4.tar.bz2 1586241 RMD160 ce4df48deaf595ca1008f9d1589649198e124daf SHA256 25ac704433cbd84ab8e80eea8cbf1890aae33ef8de94520b544584bbf598e9ec
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gdm-2.8.0.7.tar.bz2 2777760 RMD160 1c75d83e1a0f94ec1b927491a0409ea86e12a51f SHA1 8643faefc7151f38021a83c7986f08e3a4e2d1b6 SHA256 bd83a23cad86de545f57a7c38cb9b7fa52aedc5bd2f8103f1cc7a35b0bfc6a10
@@ -50,6 +54,10 @@ EBUILD gdm-2.16.0-r1.ebuild 4431 RMD160 9eaa366a363d4da16f351a754adad25c82e12ae6
 MD5 609be880f1f5c1aaa7bd9b79fe31defa gdm-2.16.0-r1.ebuild 4431
 RMD160 9eaa366a363d4da16f351a754adad25c82e12ae6 gdm-2.16.0-r1.ebuild 4431
 SHA256 d2d30bcc28dc89314966a04ad1f8ef54cfd9e1bf85ea8a61ad17106717eb87cd gdm-2.16.0-r1.ebuild 4431
+EBUILD gdm-2.16.1.ebuild 4714 RMD160 99cd2e0daee54529aa3f864e79f7352e58d1dc86 SHA1 bbc048efa69eb443d6c4a419d01cbc4628fcacf4 SHA256 b48b1fc7bb8229dc83acfc9e425ab3a473c85ae34e7903da32f47192b608e125
+MD5 caf82580884aa6d63f673e0648f97b52 gdm-2.16.1.ebuild 4714
+RMD160 99cd2e0daee54529aa3f864e79f7352e58d1dc86 gdm-2.16.1.ebuild 4714
+SHA256 b48b1fc7bb8229dc83acfc9e425ab3a473c85ae34e7903da32f47192b608e125 gdm-2.16.1.ebuild 4714
 EBUILD gdm-2.2.5.4-r5.ebuild 4685 RMD160 c09585b38e20221a4f5fe1a17e6b2a5d442126d1 SHA1 01d17c66e2b2f7fc22f874a3901ce9434f0556b1 SHA256 c0315f95a1149276eb30d68d5ae2594e5dad2a38dd5e4cb6ac1a9900dc884c32
 MD5 1e8602e01ca98f77438fd5a4327e4df7 gdm-2.2.5.4-r5.ebuild 4685
 RMD160 c09585b38e20221a4f5fe1a17e6b2a5d442126d1 gdm-2.2.5.4-r5.ebuild 4685
@@ -66,10 +74,10 @@ EBUILD gdm-2.8.0.8.ebuild 3987 RMD160 77cb40f3845a8f6e5794e7fadd1a2825c33ac50a S
 MD5 132b4ab207f147144ad0230b9d494c5f gdm-2.8.0.8.ebuild 3987
 RMD160 77cb40f3845a8f6e5794e7fadd1a2825c33ac50a gdm-2.8.0.8.ebuild 3987
 SHA256 ba363063dfc8cfda93cd2ae309108130fadf238f5866ff89fc9aab2c25b3a70c gdm-2.8.0.8.ebuild 3987
-MISC ChangeLog 23846 RMD160 0231579bef1c36360d5de7e96bc9a4efb8e92480 SHA1 a31599f62c121d802721cc3d53fee6474d6cb10c SHA256 3ffb2094f4cedc269b6b2988a800145799b191f0975c91e0505b99e06d7f0805
-MD5 7acbcc9a089bb3d52e20a35e719c44e7 ChangeLog 23846
-RMD160 0231579bef1c36360d5de7e96bc9a4efb8e92480 ChangeLog 23846
-SHA256 3ffb2094f4cedc269b6b2988a800145799b191f0975c91e0505b99e06d7f0805 ChangeLog 23846
+MISC ChangeLog 24090 RMD160 6fe76190a6afe92b6643fd62c1fccd12b82f2529 SHA1 d1d79b3a9a130ef58f27f2352b9ba39f7f6fde56 SHA256 e54428cf72fb7fe9f065ca0c8ba30bf2e17650201bdc2f0deb6f725af3764365
+MD5 dddedefcd72a9dccb92336090ff2ed7a ChangeLog 24090
+RMD160 6fe76190a6afe92b6643fd62c1fccd12b82f2529 ChangeLog 24090
+SHA256 e54428cf72fb7fe9f065ca0c8ba30bf2e17650201bdc2f0deb6f725af3764365 ChangeLog 24090
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -80,6 +88,9 @@ SHA256 34ff0a74b881c8f694b858c4918511a843ad6b4c650f58d1007aeb9ab75d6bf7 files/di
 MD5 8a3cea7c75a2d6dfcc7b524ab802cc2b files/digest-gdm-2.16.0-r1 768
 RMD160 7aa8ab521857c248d138785a98cc23f0d7f3aefd files/digest-gdm-2.16.0-r1 768
 SHA256 0729df514ae4c98246a6f401913f8924361e2168ee22cbd5341d11c448ea83cb files/digest-gdm-2.16.0-r1 768
+MD5 1506d284f056923a395aa22eee6d5e79 files/digest-gdm-2.16.1 768
+RMD160 7d0b64d5e2ab4bc686cbaa31f1b779be3a6d0701 files/digest-gdm-2.16.1 768
+SHA256 768f0a7dd22736e72dca348867e873b873b08116e26edc97cee245321985fb52 files/digest-gdm-2.16.1 768
 MD5 6b95da6d4ca477ed00d5c30d142a7147 files/digest-gdm-2.2.5.4-r5 241
 RMD160 16efdcfca9892db66b724607b3c744fe5ee93db1 files/digest-gdm-2.2.5.4-r5 241
 SHA256 abe4d784a03cce322c289f7ab49e93307c112886e90d2a60d683b7e280bf741a files/digest-gdm-2.2.5.4-r5 241
@@ -92,3 +103,10 @@ SHA256 7475dd25d42bc78f3412406b9cf6624ce73515339c3af9f61bc975ba0573f6cf files/di
 MD5 f7f9c46002cfa46b24296654874527cb files/digest-gdm-2.8.0.8 771
 RMD160 126add0aa5231fa56c948ff69f4acb3b63398660 files/digest-gdm-2.8.0.8 771
 SHA256 c0a06a42d9256d58b8af8c138b0b8339a6b45ff5449139faba1c5e3eb518947c files/digest-gdm-2.8.0.8 771
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFL9+somPajV0RnrERAs4JAJ9dt23TSueUzieStIRNXA4mhKdAOgCfb8+k
+UoAFh3CXBju0LhzqaSg8bIc=
+=ItU6
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.1 b/gnome-base/gdm/files/digest-gdm-2.16.1
new file mode 100644
index 000000000000..4921eec4eb9a
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.16.1
@@ -0,0 +1,9 @@
+MD5 a0bf247fdaf32add6d5a69495a433bbf gdm-2.16.1.tar.bz2 3130299
+RMD160 2aa56bf08be354778b9f0c55cbd441b2a354ac2f gdm-2.16.1.tar.bz2 3130299
+SHA256 9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6 gdm-2.16.1.tar.bz2 3130299
+MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
+SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
+MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
+RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
+SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/gdm-2.16.1.ebuild b/gnome-base/gdm/gdm-2.16.1.ebuild
new file mode 100644
index 000000000000..9f4bfe7054de
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.16.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.16.1.ebuild,v 1.1 2006/10/13 18:49:11 dang Exp $
+
+inherit eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="accessibility ipv6 pam selinux tcpd xinerama"
+
+# Name of the tarball with gentoo specific files
+GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2
+	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
+
+RDEPEND="pam? ( virtual/pam )
+	!pam? ( sys-apps/shadow )
+	>=dev-libs/glib-2.8
+	>=x11-libs/gtk+-2.6
+	>=x11-libs/pango-1.3
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/librsvg-1.1.1
+	>=dev-libs/libxml2-2.4.12
+	>=media-libs/libart_lgpl-2.3.11
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libdmx
+	x11-libs/libXau
+	x11-apps/sessreg
+	accessibility? ( x11-libs/libXevie )"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/dmxproto
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.3.2
+	>=app-text/scrollkeeper-0.1.4"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="--sysconfdir=/etc/X11         \
+		--localstatedir=/var              \
+		--with-xdmcp                      \
+		--with-pam-prefix=/etc            \
+		$(use_enable accessibility xevie) \
+		$(use_enable ipv6)                \
+		$(use_with selinux)               \
+		$(use_with tcpd tcp-wrappers)     \
+		$(use_with xinerama)"
+
+	if use pam; then
+		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
+	else
+		G2CONF="${G2CONF} --enable-console-helper=no \
+			--enable-authentication-scheme=shadow"
+	fi
+
+	enewgroup gdm
+	enewuser gdm -1 -1 /var/lib/gdm gdm
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# remove unneeded linker directive for selinux (#41022)
+	epatch ${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch
+
+	# Fix missing intllib
+	epatch ${FILESDIR}/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
+}
+
+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
+
+	chown root:gdm ${D}/var/gdm
+	chmod 1770 ${D}/var/gdm
+
+	# use our own session script
+	rm -f ${D}/etc/X11/gdm/Xsession
+	exeinto /etc/X11/gdm
+	doexe ${gentoodir}/Xsession
+
+	# add a custom xsession .desktop by default (#44537)
+	exeinto /etc/X11/dm/Sessions
+	doexe ${gentoodir}/custom.desktop
+
+	# We replace the pam stuff by our own
+	rm -rf ${D}/etc/pam.d
+
+	dopamd ${gentoodir}/pam.d/*
+	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
+
+	# use graphical greeter local
+	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
+		/usr/share/gdm/defaults.conf
+
+	# list available users
+	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
+	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
+
+	# Fix old X11R6 paths
+	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
+
+	# Move Gentoo theme in
+	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	einfo "To make GDM start at boot, edit /etc/rc.conf"
+	einfo "and then execute 'rc-update add xdm default'."
+
+	einfo "GDM has changed the location of its configuration file.  Please"
+	einfo "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
+	einfo "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
+
+	einfo "See README.install for more information about the change."
+
+	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+		einfo "You had /etc/X11/gdm/gdm.conf which is the old configuration"
+		einfo "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
+
+	# Soft restart, assumes Gentoo defaults for file locations
+	# Do restart after gdm.conf move above
+	FIFOFILE=/var/gdm/.gdmfifo
+	PIDFILE=/var/run/gdm.pid
+
+	if [ -w ${FIFOFILE} ] ; then
+		if [ -f ${PIDFILE} ] ; then
+			if kill -0 `cat ${PIDFILE}`; then
+				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
+			fi
+		fi
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	einfo "To remove GDM from startup please execute"
+	einfo "'rc-update del xdm default'"
+}