diff options
author | Mart Raudsepp <leio@gentoo.org> | 2006-12-14 15:55:52 +0000 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2006-12-14 15:55:52 +0000 |
commit | 4c00998019a12a57edb5f21f1f0ef3c3208dda4f (patch) | |
tree | 07f398074704cbdaf3dcea2e4285a5930b80fc55 /gnome-base/gdm | |
parent | Fixed error messages, bug #157285. (diff) | |
download | gentoo-2-4c00998019a12a57edb5f21f1f0ef3c3208dda4f.tar.gz gentoo-2-4c00998019a12a57edb5f21f1f0ef3c3208dda4f.tar.bz2 gentoo-2-4c00998019a12a57edb5f21f1f0ef3c3208dda4f.zip |
Version bump for the 2.14 series, security bug 158072
(Portage version: 2.1.2_rc3-r5)
Diffstat (limited to 'gnome-base/gdm')
-rw-r--r-- | gnome-base/gdm/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-base/gdm/files/digest-gdm-2.14.11 | 9 | ||||
-rw-r--r-- | gnome-base/gdm/gdm-2.14.11.ebuild | 171 |
3 files changed, 186 insertions, 1 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 7c3ed9f0ecc9..94f5887659b7 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,11 @@ # 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.189 2006/12/12 16:26:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.190 2006/12/14 15:55:52 leio Exp $ + +*gdm-2.14.11 (14 Dec 2006) + + 14 Dec 2006; Mart Raudsepp <leio@gentoo.org> +gdm-2.14.11.ebuild: + Version bump for the 2.14 series, security bug 158072 12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gdm-2.16.2.ebuild: Stable on amd64 wrt bug #156662. diff --git a/gnome-base/gdm/files/digest-gdm-2.14.11 b/gnome-base/gdm/files/digest-gdm-2.14.11 new file mode 100644 index 000000000000..d92788f56ffe --- /dev/null +++ b/gnome-base/gdm/files/digest-gdm-2.14.11 @@ -0,0 +1,9 @@ +MD5 fe821639889fecf6e8bf4faa5c03ecb4 gdm-2.14.11.tar.bz2 3045508 +RMD160 7f5ef00aeb3226ff614b6f8ec6944d50ddeb199f gdm-2.14.11.tar.bz2 3045508 +SHA256 2b20e1ca43f4359aee319a9b9af7c41d2f8b9559601843378aee1f94d83dc9a2 gdm-2.14.11.tar.bz2 3045508 +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.14.11.ebuild b/gnome-base/gdm/gdm-2.14.11.ebuild new file mode 100644 index 000000000000..17354b74ed65 --- /dev/null +++ b/gnome-base/gdm/gdm-2.14.11.ebuild @@ -0,0 +1,171 @@ +# 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.14.11.ebuild,v 1.1 2006/12/14 15:55:52 leio 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-1.99.2 + >=gnome-base/libgnomecanvas-1.109 + >=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 ) ) + virtual/x11 )" + +DEPEND="${RDEPEND} + || ( ( + x11-proto/inputproto + x11-proto/dmxproto ) + virtual/x11 ) + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.28 + sys-devel/gettext + >=app-text/gnome-doc-utils-0.3.2 + >=app-text/scrollkeeper-0.1.4" + +DOCS="AUTHORS ChangeLog NEWS README README.install TODO" +MAKEOPTS="${MAKEOPTS} -j1" + + +pkg_setup() { + G2CONF="--disable-scrollkeeper \ + --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() { + unpack ${A} + cd "${S}" + + # 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 + + gnome2_omf_fix docs/*/Makefile.in docs/Makefile.in +} + +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 + + # Soft restart, assumes Gentoo defaults for file locations + 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 + + einfo "To make GDM start at boot, edit /etc/conf.d/xdm" + 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." +} + +pkg_postrm() { + gnome2_pkg_postrm + + einfo "To remove GDM from startup please execute" + einfo "'rc-update del xdm default'" +} |