diff options
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 8 | ||||
| -rw-r--r-- | gnome-base/gdm/Manifest | 4 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch | 22 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-2.20.10-r3.ebuild | 239 |
4 files changed, 271 insertions, 2 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 4f0f7c3289c6..3f0df8c03d51 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,12 @@ # 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.313 2010/01/17 23:54:29 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.314 2010/01/21 18:27:33 mrpouet Exp $ + +*gdm-2.20.10-r3 (21 Jan 2010) + + 21 Jan 2010; Romain Perier <mrpouet@gentoo.org> +gdm-2.20.10-r3.ebuild, + +files/gdm-2.20.10-gdmsetup-24hr-combo.patch: + Fix 24 hour combo box in gdmsetup, per bug #301151. 17 Jan 2010; Jeroen Roovers <jer@gentoo.org> gdm-2.20.10-r2.ebuild: Stable for HPPA (bug #281427). diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 9b7aa49fd170..4651cb703cf7 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -3,6 +3,7 @@ AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b AUX gdm-2.20.10-custom-session.patch 1105 RMD160 2d300e076dea63a08935ef6c8f3cac6f4909f6c2 SHA1 fdf3b5f24626ebe52502d0d0b31d9bccfff6689b SHA256 58d09e131375f993e46088078993953ea2fedc87ed9deafbfa35eb7f4e731e67 AUX gdm-2.20.10-desktop-session-dmrc-autologin.patch 873 RMD160 41cba29b927036b784048978fb00ff31feecf39c SHA1 86b4822e546e7d2ebb6f22c427afaf5dde701045 SHA256 57f8e88acaf45b0cb84d80bb672dddf8e71a5152e9bff8216ff76d15b1e7dfcf +AUX gdm-2.20.10-gdmsetup-24hr-combo.patch 1108 RMD160 4d4cc4731d07363dbe0d52c08fb6b49132da8f18 SHA1 9617d18ce5051f13f87165e3cb82a90d40f9c14d SHA256 558de681677fd631619dd90aba2b3fe99e783d051d706c536b85268eae40f19c 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.3-logging.patch 646 RMD160 d7494ad8f39d82f72673d59466cc29b8b5c26bfc SHA1 7c00f8c4501d13368f4a25cf34422108356f8761 SHA256 8266a532731609401915a605866e071ba8cbdf25e6425a0a2701427d15f532ce @@ -19,10 +20,11 @@ DIST gdm-2.28.2.tar.bz2 2283246 RMD160 9b5cd1fb0a9799e783546331ac117aebc3ee7474 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e 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 6870 RMD160 0ba86bd89d1705d2636a7ad54aae5e659751d5ce SHA1 26fba0a993d340bbc978748138eb9631f7eaac68 SHA256 b482a4ad944563d4e32fec54f769e16e17cf428708565dff17bbdd249c7a4f33 EBUILD gdm-2.20.3.ebuild 5462 RMD160 01aaa98ab94e130959e550282e4353727d972caa SHA1 7dbff1038ee6f984f2fbf705bf810a73561ea09b SHA256 1ad90379beebf205f16d2d5cc449e60a968e0854c438cd84413175a836accd87 EBUILD gdm-2.20.9-r1.ebuild 6308 RMD160 6540d9e4aebb35e47249fd96e9b65934614ec417 SHA1 35b8a965614b4fc121400b629129fd1e62b49ad5 SHA256 6e706908909dde19646a464056c2838dc7b5c750ba8f6af248cb02a50bfa1453 EBUILD gdm-2.26.1.ebuild 5658 RMD160 af5494ccebe8a176f12d59f201eda2df97bbe152 SHA1 34d31f15cb2ebcf374234918554db028424dd715 SHA256 b226d4231faee7063773054bb53c45d44ce0fdad1e3da893bae7e70eb6d41ca4 EBUILD gdm-2.28.1-r1.ebuild 5635 RMD160 c0d6bfe06cc8a5421628a9bff078b6447cdab565 SHA1 bbffcd977d0043a18d255334ce5c9f1e5d132d7e SHA256 7c7b9d657253e8c080f912ab5ab30ebd09f2ef2bc0b8e84e51cfefaecb5bdc78 EBUILD gdm-2.28.2.ebuild 5729 RMD160 57eb30f30c131bdc1248421a54a0761af0310b8d SHA1 aff34d1109af848bd275b79504936dc6d6d677b9 SHA256 634739e0d41f1a5ca496d9fc55824924d63865d8c210e182291cce5fe92e0abd -MISC ChangeLog 42757 RMD160 9562a374b6f9ed07884625c87a0693559e7f4a68 SHA1 1ed7b69746f35000b22da790d7f21c648320f510 SHA256 d7f21fe894f2b2bdc2b1399b7d42257171bfbbaa5a09295a479e84afd15cbd90 +MISC ChangeLog 42969 RMD160 ac52bb18423aa6a4b1587b5a8d553d3684046233 SHA1 09656b7e7820dc31f69406b8535b7e2310474929 SHA256 1b39507d1edd7ca5cc0f95cea2de0289c01520f7337151d4b484d242b7b6843e MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d diff --git a/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch b/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch new file mode 100644 index 000000000000..327d8e6fec90 --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch @@ -0,0 +1,22 @@ +# +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gdm/+bug/256283 +# Description: Fix 24 hour combo box in gdmsetup +# +Index: gdm-2.20.10/gui/gdmsetup.c +=================================================================== +--- gdm-2.20.10.orig/gui/gdmsetup.c 2009-04-03 14:17:35.000000000 +1100 ++++ gdm-2.20.10/gui/gdmsetup.c 2009-04-03 14:17:45.000000000 +1100 +@@ -1529,11 +1529,11 @@ + val = gdm_config_get_string ((gchar *)key); + + if (new_val) { +- if (strcmp (_(new_val), _("auto"))) { ++ if (strcmp (_(new_val), _("auto")) == 0) { + if (strcasecmp (ve_sure_string (val), "auto") != 0) + gdm_setup_config_set_string (key, "auto"); + } +- else if (strcmp (_(new_val), _("yes"))) { ++ else if (strcmp (_(new_val), _("yes")) == 0) { + if (strcasecmp (ve_sure_string (val), "true") != 0 && + strcasecmp (ve_sure_string (val), "yes") != 0) + gdm_setup_config_set_string (key, "true"); diff --git a/gnome-base/gdm/gdm-2.20.10-r3.ebuild b/gnome-base/gdm/gdm-2.20.10-r3.ebuild new file mode 100644 index 000000000000..c4f2371d31f3 --- /dev/null +++ b/gnome-base/gdm/gdm-2.20.10-r3.ebuild @@ -0,0 +1,239 @@ +# 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.10-r3.ebuild,v 1.1 2010/01/21 18:27:33 mrpouet 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 ) + 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}/${P}-desktop-session-dmrc-autologin.patch" + + # Fix 24 hour combo box in gdmsetup, bug #301151 + # patch imported from ubuntu mirrors + epatch "${FILESDIR}/${P}-gdmsetup-24hr-combo.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 + + 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 +} |