From b0e2d84668d92140b65d08b93b43820ffc5a48fb Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 13 Jun 2010 15:17:51 +0000 Subject: [PATCH] Version bump with upstream fixes for xinerama support and others. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- gnome-base/gdm/ChangeLog | 7 +- gnome-base/gdm/Manifest | 14 +- gnome-base/gdm/gdm-2.20.11.ebuild | 244 ++++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 gnome-base/gdm/gdm-2.20.11.ebuild diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index d59ff26a0c17..b7b6b8cdfafc 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.320 2010/05/22 16:20:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.321 2010/06/13 15:17:51 pacho Exp $ + +*gdm-2.20.11 (13 Jun 2010) + + 13 Jun 2010; Pacho Ramos +gdm-2.20.11.ebuild: + Version bump with upstream fixes for xinerama support and others. 22 May 2010; Raúl Porcel gdm-2.26.1.ebuild, gdm-2.28.2-r1.ebuild: diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 69e72b30a1a4..f10926075aad 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 @@ -10,6 +13,7 @@ AUX gdm-2.20.9-parallel-make.patch 1499 RMD160 aaca98cd72b464aec043b2aeb51973f9a AUX gdm-2.26.1-libxklavier4.patch 1842 RMD160 cae9308944ff4118bd06e411b11e1df6b97fdf99 SHA1 0fbb97f83b980c9bfaab1e95108d9462640c9134 SHA256 7978417318e80628939cdbf62d59ba56cb15242748cb89b5a8b6c02b5265173a AUX gdm-2.28.2-remove-hal.patch 6934 RMD160 94083bac8b9b489d47414330cd06601c32a3901c SHA1 0a254daba5dd8c9ee91d362ee64d185c521bf8fa SHA256 a8303f2834132c88c6cd6925dd96a10877c7a180c761246ac701f1dd09de5d7d DIST gdm-2.20.10.tar.bz2 3940077 RMD160 4bb50375d30638143b47b7884405e9999e304da5 SHA1 42e9e52184393352f005f1735843a30f764aef18 SHA256 5d4a2e5973a778871c9bfb91d76580747a4ef40771fd4368169a5868bb2db127 +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.26.1.tar.bz2 2526832 RMD160 abba568b616d5837f6aeedf3d2759a349df66c9e SHA1 7c0b665c1235b903b58e5bfff8678e435529ff6c SHA256 34abc69bdfd1b6bb6d1f64dd1e34652c61310dc69305712d7aeec6203678fa4c @@ -17,7 +21,15 @@ DIST gdm-2.28.2.tar.bz2 2283246 RMD160 9b5cd1fb0a9799e783546331ac117aebc3ee7474 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 EBUILD gdm-2.20.10-r2.ebuild 6714 RMD160 51ec36566d48b4a565faf9c91770b084a87901be SHA1 058e00a26aab1642d1f54c95b9e7ce3dcf1aab39 SHA256 96af7b13bd13537c337cf6c82e85488a821940803984ab0d497753c0dd9a8fb2 EBUILD gdm-2.20.10-r3.ebuild 6900 RMD160 35a6fbd6eb866230065a74e20e98cbd47891e0f9 SHA1 be456b880c718df0a8137249f392256840b34da4 SHA256 9f4168421d824407884e87639bc475eabb212c44abd967e26d143598c67a95b4 +EBUILD gdm-2.20.11.ebuild 7057 RMD160 aadb02aef6157fb21f1340d47243849be40e894b SHA1 f69e98397bbf32539b89cc3dae17105f646b785a SHA256 6bc62f42ee32a5920e3eb29e174696cfb80b9dc03b8c93412d31d70e0c45045a EBUILD gdm-2.26.1.ebuild 5756 RMD160 106b1bf721b869f6111a616d6359b2f8aaf5bc31 SHA1 5b098d18cd7f38318f329ff6668110df6656860b SHA256 09884474ea22b35e5199a4ca041ae48812bdf7dff96080600d4825031d695f5e EBUILD gdm-2.28.2-r1.ebuild 5925 RMD160 25c2b99d8dbd93f9cb2fdd700c49213cbaf61fcf SHA1 f303081f42793fe430c3a0bfae64f51f5c26bb1b SHA256 1f1c2b0df69d96f2ac813c17fa3eea8723604df8bc7f04c03a62f490de0a30f1 -MISC ChangeLog 44008 RMD160 94e6a81f26aeebe0f4a4b7b88934bd11fea63be1 SHA1 8d232702194b7da783a320d1c588ba09ec469cd5 SHA256 b4242865cc8b6d25bfcc40ce1e90de126bd3a4fafe16e730a8995d8bb587a099 +MISC ChangeLog 44170 RMD160 9e5bace0e0f1228f19eeb4e2ebf02c41b8902b9c SHA1 ffae7345cfbcc5b85cb77782a7ae3793f5f71208 SHA256 8da7a880e103655d764cc8ab8fa53336e8f900fe3558b047d11c47be546146bb MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkwU9qgACgkQCaWpQKGI+9RBsACgho/vQ6L7m8oIMUirP3oW9Pbz +6L0An1ZcHF9Jha+cBTBhgPEsZTHZOdlM +=4HHv +-----END PGP SIGNATURE----- diff --git a/gnome-base/gdm/gdm-2.20.11.ebuild b/gnome-base/gdm/gdm-2.20.11.ebuild new file mode 100644 index 000000000000..aa60148b6663 --- /dev/null +++ b/gnome-base/gdm/gdm-2.20.11.ebuild @@ -0,0 +1,244 @@ +# 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.20.11.ebuild,v 1.1 2010/06/13 15:17:51 pacho Exp $ + +EAPI="2" + +inherit eutils pam gnome2 + +DESCRIPTION="GNOME Display Manager" +HOMEPAGE="http://www.gnome.org/projects/gdm/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +IUSE_LIBC="elibc_glibc" +IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $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 + branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" + +RDEPEND=">=dev-libs/glib-2.12 + >=x11-libs/gtk+-2.6 + >=x11-libs/pango-1.3 + >=gnome-base/libglade-2 + >=gnome-base/libgnomecanvas-2 + >=gnome-base/librsvg-1.1.1 + >=dev-libs/libxml2-2.4.12 + >=media-libs/libart_lgpl-2.3.11 + x11-libs/gksu + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXext + x11-apps/sessreg + x11-libs/libXdmcp + xinerama? ( x11-libs/libXinerama ) + consolekit? ( + sys-auth/consolekit + dev-libs/dbus-glib ) + accessibility? ( x11-libs/libXevie ) + afs? ( net-fs/openafs sys-libs/lwp ) + dmx? ( x11-libs/libdmx ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) + pam? ( virtual/pam ) + !pam? ( elibc_glibc? ( sys-apps/shadow ) ) + remote? ( gnome-extra/zenity ) + selinux? ( sys-libs/libselinux ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + >=x11-misc/xdg-utils-1.0.2-r3" +DEPEND="${RDEPEND} + dmx? ( x11-proto/dmxproto ) + xinerama? ( x11-proto/xineramaproto ) + app-text/docbook-xml-dtd:4.1.2 + sys-devel/gettext + x11-proto/inputproto + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.19 + >=app-text/scrollkeeper-0.1.4 + >=app-text/gnome-doc-utils-0.3.2" +PDEPEND="pam? ( >=sys-auth/pambase-20090430[consolekit=,gnome-keyring=] )" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + +pkg_setup() { + G2CONF="${G2CONF} + --with-prefetch + --sysconfdir=/etc/X11 + --localstatedir=/var + --with-xdmcp=yes + --with-pam-prefix=/etc + SOUND_PROGRAM=/usr/bin/gdmplay + $(use_enable accessibility xevie) + $(use_enable ipv6) + $(use_enable remote secureremote) + $(use_with consolekit console-kit) + $(use_with dmx) + $(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" + if use elibc_glibc ; then + G2CONF="${G2CONF} --enable-authentication-scheme=shadow" + else + G2CONF="${G2CONF} --enable-authentication-scheme=crypt" + fi + fi + + enewgroup gdm + enewuser gdm -1 -1 /var/lib/gdm gdm +} + +src_prepare() { + gnome2_src_prepare + + # remove unneeded linker directive for selinux (#41022) + epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch" + + # Add gksu to gdmsetup menu entry + epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch" + + # Fix parallel install, bug #217037 + epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch" + + # Make custom session work, bug #216984 + epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch" + + # ssh-agent handling must be done at xinitrc.d, bug #220603 + epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch" + + # Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or + # does not contain any relevant data and autologin enabled, bug #281442 + epatch "${FILESDIR}/${PN}-2.20.10-desktop-session-dmrc-autologin.patch" + + # Fix 24 hour combo box in gdmsetup, bug #301151 + # patch imported from ubuntu mirrors + epatch "${FILESDIR}/${PN}-2.20.10-gdmsetup-24hr-combo.patch" + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ + || die "sed failed" +} + +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" + + # add xinitrc.d scripts + exeinto /etc/X11/xinit/xinitrc.d + doexe "${FILESDIR}/49-keychain" || die "doexe 1 failed" + doexe "${FILESDIR}/50-ssh-agent" || die "doexe 2 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" || die "dobin failed" + + # 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" + + if use pam ; then + use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/* + + dopamd "${gentoodir}"/pam.d/* + dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup" + fi + + # 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 + + # Use Clearlooks as default theme, bug #268496 + dosed "s:#GtkTheme=Default:GtkTheme=Clearlooks:" /usr/share/gdm/defaults.conf + + # Move Gentoo theme in + if use branding ; then + mv "${WORKDIR}"/gentoo-* "${D}/usr/share/gdm/themes" + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + + elog "To make GDM start at boot, edit /etc/conf.d/xdm" + elog "and then execute 'rc-update add xdm default'." + + elog "GDM has changed the location of its configuration file. Please" + elog "edit /etc/X11/gdm/custom.conf. The factory defaults are located" + elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}" + + elog "See README.install for more information about the change." + + 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 + + # 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 + + if [ "$(rc-config list default | grep xdm)" != "" ] ; then + elog "To remove GDM from startup please execute" + elog "'rc-update del xdm default'" + fi +} -- 2.26.2