From c8db6f83ccea5c2700425ca9793bae2fb55d9407 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Thu, 14 Dec 2006 15:55:52 +0000 Subject: [PATCH] Version bump for the 2.14 series, security bug 158072 Package-Manager: portage-2.1.2_rc3-r5 --- gnome-base/gdm/ChangeLog | 7 +- gnome-base/gdm/Manifest | 24 ++-- gnome-base/gdm/files/digest-gdm-2.14.11 | 9 ++ gnome-base/gdm/gdm-2.14.11.ebuild | 171 ++++++++++++++++++++++++ 4 files changed, 202 insertions(+), 9 deletions(-) create mode 100644 gnome-base/gdm/files/digest-gdm-2.14.11 create mode 100644 gnome-base/gdm/gdm-2.14.11.ebuild 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 +gdm-2.14.11.ebuild: + Version bump for the 2.14 series, security bug 158072 12 Dec 2006; Chris Gianelloni gdm-2.16.2.ebuild: Stable on amd64 wrt bug #156662. diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 599ebe4e4443..ec2de91cb0bd 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -13,12 +13,17 @@ AUX gdm-2.16.2-gksu.patch 584 RMD160 2a5a15de412910c1f30c22bcd78190b2cb75921c SH MD5 e7b6239a767727a16557ddf5ae59b13a files/gdm-2.16.2-gksu.patch 584 RMD160 2a5a15de412910c1f30c22bcd78190b2cb75921c files/gdm-2.16.2-gksu.patch 584 SHA256 3208bc0025bb9e02104bb1b1dd6a3de550a4cd6e0be6546c3bae60ab5af08f8d files/gdm-2.16.2-gksu.patch 584 +DIST gdm-2.14.11.tar.bz2 3045508 RMD160 7f5ef00aeb3226ff614b6f8ec6944d50ddeb199f SHA1 751fc37a7a4584194c04cc1900859c69a54ac9e7 SHA256 2b20e1ca43f4359aee319a9b9af7c41d2f8b9559601843378aee1f94d83dc9a2 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.16.2.tar.bz2 3137531 RMD160 18ab2777a2fd5b6086a075483caf5ed138436666 SHA1 3fabd423042fecc7e0f8ebbcfaaa5dafe09fbec7 SHA256 7ab98b0c0342d8aa1a37412a31b9920f629056cedf5faf496a177ba960eb205a 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.14.11.ebuild 4566 RMD160 767d2c224e414bccbe55553771cd73d0c62d899e SHA1 074ff3d57695716d4c67dc190bd3ba2b92c8acd8 SHA256 2a056a3a8295cb20b2ccbe337fb93a2999987bbebae8108afc201868b279cb21 +MD5 8f9bd5bef80f1eee60c273d6b39ece3d gdm-2.14.11.ebuild 4566 +RMD160 767d2c224e414bccbe55553771cd73d0c62d899e gdm-2.14.11.ebuild 4566 +SHA256 2a056a3a8295cb20b2ccbe337fb93a2999987bbebae8108afc201868b279cb21 gdm-2.14.11.ebuild 4566 EBUILD gdm-2.14.9-r1.ebuild 4560 RMD160 0b93c85b90ed5fe0fd9b7facd9ed054753994f60 SHA1 3d55f7f5d8d4b69137bdd23aeacadfb4ffed5d09 SHA256 363b76ffb54714ce2326ab16c92e55e4e2ea783da6ac85a892616f22d5be6431 MD5 23773e75ab525a27c1fc25016b883df5 gdm-2.14.9-r1.ebuild 4560 RMD160 0b93c85b90ed5fe0fd9b7facd9ed054753994f60 gdm-2.14.9-r1.ebuild 4560 @@ -35,14 +40,17 @@ EBUILD gdm-2.16.2.ebuild 4800 RMD160 f44ad7483d8754c5a238156c9a1b1b514a4d3e3b SH MD5 14c317c76128f2196f3af89e136864b8 gdm-2.16.2.ebuild 4800 RMD160 f44ad7483d8754c5a238156c9a1b1b514a4d3e3b gdm-2.16.2.ebuild 4800 SHA256 ba52f94092e522fcd5c78ed12f281c73480a12023903dff7d02018283fd698bf gdm-2.16.2.ebuild 4800 -MISC ChangeLog 25563 RMD160 37a402b4429f0add388c90b0e163d62678038cd6 SHA1 872fcfb616b47d224c7ac7ad84bca57127c2c34e SHA256 5312c0eb8dc1a8437aba9bf7e0f9bc7eac88b9c0d51594d33ce0a2ba1aad3d15 -MD5 7de69661d0b8be6bb17884eed1ce8047 ChangeLog 25563 -RMD160 37a402b4429f0add388c90b0e163d62678038cd6 ChangeLog 25563 -SHA256 5312c0eb8dc1a8437aba9bf7e0f9bc7eac88b9c0d51594d33ce0a2ba1aad3d15 ChangeLog 25563 +MISC ChangeLog 25712 RMD160 3b7202710e9c810e2e40a575f768ded8d8ca4789 SHA1 e8c2247154192678eb9f930fcab98638e74ee8e4 SHA256 dfe33a9f41c54ee278958c8119e7a6bcc9a0eb3b14dfa8a6bdfa3b5e537855b5 +MD5 11a4c5aa280d23459e616b465dea9524 ChangeLog 25712 +RMD160 3b7202710e9c810e2e40a575f768ded8d8ca4789 ChangeLog 25712 +SHA256 dfe33a9f41c54ee278958c8119e7a6bcc9a0eb3b14dfa8a6bdfa3b5e537855b5 ChangeLog 25712 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158 +MD5 b78f197a563736dae7c6c29c072b2cc4 files/digest-gdm-2.14.11 771 +RMD160 15ba8a5e6367f02ab0dcc8ba706f14e17f803743 files/digest-gdm-2.14.11 771 +SHA256 0c18d5a8cd1447967985fae34c3bf1bbd7dd9d6d24249462fc854834c139e44e files/digest-gdm-2.14.11 771 MD5 ea4fc423e9d653330920d389a43122f0 files/digest-gdm-2.14.9-r1 768 RMD160 71291a8c33d020c4d3766e41dd8a243fa159a41e files/digest-gdm-2.14.9-r1 768 SHA256 34ff0a74b881c8f694b858c4918511a843ad6b4c650f58d1007aeb9ab75d6bf7 files/digest-gdm-2.14.9-r1 768 @@ -56,9 +64,9 @@ MD5 84c06381f937cf9ad8363355467dc03f files/digest-gdm-2.16.2 768 RMD160 a930a5422c71d89318ce1322a6b8c551853fbf65 files/digest-gdm-2.16.2 768 SHA256 10cc2d64639090426efbeba50263eeaa8db63b9d4498ec364b571d7757761674 files/digest-gdm-2.16.2 768 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFftg4kT4lNIS36YERAtdSAKCRBJ7QzHTTEzptIqssV1aL9u0GdgCgpC5V -HghYuWNlrStsHITT2vOKDRc= -=2+wA +iD8DBQFFgXQSkeYb6olFHJcRAqJ+AKCxNb5OR+jzZ++aQraPI40vNCJu7wCgt4LY +XQFR/9dLTd0Fln1//rUhfPc= +=m9U8 -----END PGP SIGNATURE----- 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'" +} -- 2.26.2