From: Leonardo Boshell Date: Thu, 8 Jun 2006 05:01:07 +0000 (+0000) Subject: New release: 2.8.0.8 and 2.14.8, for bug #135027 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a7e2ca3e4ac89f50e817361e691a7393fc81077;p=gentoo.git New release: 2.8.0.8 and 2.14.8, for bug #135027 Package-Manager: portage-2.1_rc4-r3 --- diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index b591e29c2f96..4048c1d98b08 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,18 @@ # 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.159 2006/05/03 02:40:29 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.160 2006/06/08 05:01:07 leonardop Exp $ + +*gdm-2.14.8 (08 Jun 2006) + + 08 Jun 2006; Leonardo Boshell -gdm-2.14.5.ebuild, + +gdm-2.14.8.ebuild: + New release for GNOME 2.14. Updated dependencies. Previous version pulled + out because of bug #135027. + +*gdm-2.8.0.8 (08 Jun 2006) + + 08 Jun 2006; Leonardo Boshell +gdm-2.8.0.8.ebuild: + New stable release; related to bug #135027. *gdm-2.14.5 (03 May 2006) diff --git a/gnome-base/gdm/files/digest-gdm-2.14.8 b/gnome-base/gdm/files/digest-gdm-2.14.8 new file mode 100644 index 000000000000..9f29ddb50c1e --- /dev/null +++ b/gnome-base/gdm/files/digest-gdm-2.14.8 @@ -0,0 +1,9 @@ +MD5 03ecfced7b4331542b35746f3b4b92a4 gdm-2.14.8.tar.bz2 3044411 +RMD160 edd44dfb1b50324c03752363e7b51cd836085b1a gdm-2.14.8.tar.bz2 3044411 +SHA256 b59c1cd595a45b243f3cb50ac045a0dea2c3449b13690434e95402cbef8171ab gdm-2.14.8.tar.bz2 3044411 +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/files/digest-gdm-2.8.0.8 b/gnome-base/gdm/files/digest-gdm-2.8.0.8 new file mode 100644 index 000000000000..b391993ff771 --- /dev/null +++ b/gnome-base/gdm/files/digest-gdm-2.8.0.8 @@ -0,0 +1,9 @@ +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 0743336a8b25e4b479d4630dce4f5e74 gdm-2.8.0.8.tar.bz2 2785955 +RMD160 755f69a3158d9fd56a5c93b6e6a1b51013050e86 gdm-2.8.0.8.tar.bz2 2785955 +SHA256 37aba29a59f8d78ff3ee3a808972183eb38b897d710fc2715a12381729df2dc4 gdm-2.8.0.8.tar.bz2 2785955 +MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934 +RMD160 58088fe8a8141938a3efb9352020b14731d6ac56 gentoo-gdm-theme-r2.tar.bz2 418934 +SHA256 29927ac5a0d265703150ffee4eaa4399eace73792365eacfd4174b36c4a9909e gentoo-gdm-theme-r2.tar.bz2 418934 diff --git a/gnome-base/gdm/gdm-2.14.8.ebuild b/gnome-base/gdm/gdm-2.14.8.ebuild new file mode 100644 index 000000000000..8bb17b998428 --- /dev/null +++ b/gnome-base/gdm/gdm-2.14.8.ebuild @@ -0,0 +1,165 @@ +# 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.8.ebuild,v 1.1 2006/06/08 05:01:07 leonardop 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 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:" \ + /etc/X11/gdm/gdm.conf + # list available users + dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /etc/X11/gdm/gdm.conf + dosed "s:^#IncludeAll=.*:IncludeAll=true:" /etc/X11/gdm/gdm.conf + # Fix old X11R6 paths + dosed "s:/usr/X11R6/bin:/usr/bin:" /etc/X11/gdm/gdm.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/rc.conf" + einfo "and then execute 'rc-update add xdm default'." +} + +pkg_postrm() { + gnome2_pkg_postrm + + einfo "To remove GDM from startup please execute" + einfo "'rc-update del xdm default'" +} diff --git a/gnome-base/gdm/gdm-2.8.0.8.ebuild b/gnome-base/gdm/gdm-2.8.0.8.ebuild new file mode 100644 index 000000000000..de8efa6f0716 --- /dev/null +++ b/gnome-base/gdm/gdm-2.8.0.8.ebuild @@ -0,0 +1,157 @@ +# 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.8.0.8.ebuild,v 1.1 2006/06/08 05:01:07 leonardop 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="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-r2.tar.bz2 + mirror://gentoo/${GDM_EXTRA}.tar.bz2" + +RDEPEND="pam? ( virtual/pam ) + !pam? ( sys-apps/shadow ) + >=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.3 + >=x11-libs/pango-1.3 + >=gnome-base/libglade-1.99.2 + >=gnome-base/libgnome-1.96 + >=gnome-base/libgnomeui-1.96 + >=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/libdmx + x11-apps/sessreg ) + virtual/x11 )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.28 + >=app-text/scrollkeeper-0.1.4" + +DOCS="AUTHORS ChangeLog NEWS README TODO" +USE_DESTDIR="1" +MAKEOPTS="${MAKEOPTS} -j1" + + +pkg_setup() { + G2CONF="--sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-xdmcp \ + --with-pam-prefix=/etc \ + $(use_enable ipv6) \ + $(use_with tcpd tcp-wrappers) \ + $(use_with xinerama) \ + $(use_with selinux)" + + + 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.4.4-selinux_remove_attr.patch + + # Fix locale string translation (Bug #100753) + epatch "${FILESDIR}"/${PN}-2.13.0.4-esperanto.patch + + # Fix for ~/.ICEauthority checks (bug #129151) + epatch "${FILESDIR}"/${PN}-2.8-CVE-2006-1057.patch + + gnome2_omf_fix 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:" \ + /etc/X11/gdm/gdm.conf + # list available users + dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /etc/X11/gdm/gdm.conf + dosed "s:^#IncludeAll=.*:IncludeAll=true:" /etc/X11/gdm/gdm.conf + # Fix old X11R6 paths + dosed "s:/usr/X11R6/bin:/usr/bin:" /etc/X11/gdm/gdm.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}" ] && [ -f "${PIDFILE}" ] ; then + if kill -0 `cat ${PIDFILE}`; then + (echo;echo SOFT_RESTART) >> ${FIFOFILE} + fi + fi + + einfo "To make GDM start at boot, edit /etc/rc.conf" + einfo "and then execute 'rc-update add xdm default'." + +} + +pkg_postrm() { + gnome2_pkg_postrm + + einfo "To remove GDM from startup please execute" + einfo "'rc-update del xdm default'" +}