Version bump, security fix CVE-2010-0414 (on upstream).

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 132 insertions, 2 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index bea5914d2499..4f3a8573eed1 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.107 2010/02/02 13:22:59 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.108 2010/02/08 18:15:05 mrpouet Exp $
+
+*gnome-screensaver-2.28.2 (08 Feb 2010)
+
+  08 Feb 2010; Romain Perier <mrpouet@gentoo.org>
+  +gnome-screensaver-2.28.2.ebuild:
+  Version bump, security fix CVE-2010-0414 (on upstream).
 
 *gnome-screensaver-2.28.1 (02 Feb 2010)
 
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index db6884da3ced..b25de975a51a 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -5,9 +5,11 @@ DIST gentoo-logo.svg 13764 RMD160 62b740f670377486eb1350c4f180d9f0ab63948c SHA1
 DIST gnome-screensaver-2.26.1.tar.bz2 2031739 RMD160 0ed7655bc9c5a90e0959693cfa2fab119072d202 SHA1 a71f35aaa72d13f641fe30e8eb576e9c0d19eb76 SHA256 14b68dc59646b5a53487c311d770ccc8458581480c201faf003349119d340830
 DIST gnome-screensaver-2.28.0.tar.bz2 4779450 RMD160 3e29efc67cafd66c6aac7c2b4d17b0c2d42b4edb SHA1 7981b09f75076ebb8cd55032696f12ed06b224ca SHA256 4e1a9c1054a8473b73f2bf3e9adee778e0918e793df6e1c2fa6230485f895412
 DIST gnome-screensaver-2.28.1.tar.bz2 4814001 RMD160 848bb5c38946fc3d4eb0a5e9770a718b537100a3 SHA1 ea43cadfbc2d03c458e9c7da2742ebb2c66c3333 SHA256 aeb34d53479cf7f3481b5753b9a4f88d4d446828aa9c6d1a8a7fb11d6c68b714
+DIST gnome-screensaver-2.28.2.tar.bz2 4786755 RMD160 f2eb4524794ac995181ccee361dd7cf58f40cb8c SHA1 ec31c4208c8eed32ba12d27b501b3dd17d3a8c99 SHA256 91c09b1ea61755c86031e6fcc769dd90209032ad86aec0c5fdbe42aa1035c73f
 EBUILD gnome-screensaver-2.26.1-r1.ebuild 3563 RMD160 0aece48c017729edbc26123dca4cb64e7ac58037 SHA1 ecb5d75f1a04f2341745647c0df9c5e50c976739 SHA256 616fd4b46e6a7cc5a1b95eb2559daf62291005a439624f3aadf4755963ca3171
 EBUILD gnome-screensaver-2.26.1.ebuild 3055 RMD160 33f38f29170c517e355a96c56f3198a41efa1ba8 SHA1 8828c37e2586d8533ed29307677c28352c0bb9ae SHA256 58f04705408d0c5c02e79068e8f6d9187418b60b2ef03cace1afad2a729f8b47
 EBUILD gnome-screensaver-2.28.0-r1.ebuild 3706 RMD160 aaa4d3ebd9ee19a4eda4e9dbdbb3fbdca8b44dbd SHA1 f4602ddd3f0f583aa4284771c6a7b7c9e46c108b SHA256 733b95bd4be83db132550108ef4cc201d7c578a407e712a88574b882d18f162b
 EBUILD gnome-screensaver-2.28.1.ebuild 3579 RMD160 d86afb7e78101134c658f8a49e0e40f43ceaf5ec SHA1 7e36f6a66a3c977663db18bfcb8d8da245f3d5a5 SHA256 f3b58e6aa23304e98d94b4b97fc564470160137b07184c74693ff5592f3174ca
-MISC ChangeLog 17483 RMD160 2adae833d0c452f4c9975602e5e8eb50288ae098 SHA1 bae6b40a3fe19c3d4eab92cab9c4db3233909955 SHA256 25da1696a4d5e329d56475b8d47e01b16e21aee51a80978ba7300cb0e0815991
+EBUILD gnome-screensaver-2.28.2.ebuild 3579 RMD160 025895cd55b43868c120719ab52d41864c18b285 SHA1 62d18eeaf486b9c206236189335f38150c2f0762 SHA256 ac4fb816e58e747fda59b0b2123753c0f5b37c1151916fb244b7864b25a0d4fd
+MISC ChangeLog 17669 RMD160 40233525c43ad7d4d0be70935088c3658e0fb0c1 SHA1 bd3b460b5bb318519c4b8814024fc4bb62a1e125 SHA256 81010a99b8af89dfa6302ae97ef57e15a65fa031c1077d8a667b8f38e4ee6cf2
 MISC metadata.xml 371 RMD160 dfd5191336607cf3a6693f63252b562406e1a356 SHA1 b44c1782c057b3258bb13f9e5cfe1bc5235edac1 SHA256 082f57713bdf91aa34c880c0172500802e78dde1c461d88478e957691f4b7699
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.2.ebuild
new file mode 100644
index 000000000000..9c927dd11c82
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.28.2.ebuild,v 1.1 2010/02/08 18:15:05 mrpouet Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
+HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
+SRC_URI="${SRC_URI}
+	branding? ( http://www.gentoo.org/images/gentoo-logo.svg )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KERNEL_IUSE="kernel_linux"
+IUSE="branding debug doc libnotify opengl pam $KERNEL_IUSE"
+
+RDEPEND=">=gnome-base/gconf-2.6.1
+	>=x11-libs/gtk+-2.14.0
+	>=gnome-base/gnome-desktop-2.23.2
+	>=gnome-base/gnome-menus-2.12
+	>=dev-libs/glib-2.15
+	>=gnome-base/libgnomekbd-0.1
+	>=dev-libs/dbus-glib-0.71
+	libnotify? ( x11-libs/libnotify )
+	opengl? ( virtual/opengl )
+	pam? ( virtual/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.1.2
+		~app-text/docbook-xml-dtd-4.4 )
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable doc docbook-docs)
+		$(use_enable debug)
+		$(use_with libnotify)
+		$(use_with opengl gl)
+		$(use_enable pam)
+		--enable-locking
+		--with-xf86gamma-ext
+		--with-kbd-layout-indicator
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# 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
+
+	# Install the conversion script in the documentation
+	dodoc "${S}/data/migrate-xscreensaver-config.sh"
+	dodoc "${S}/data/xscreensaver-config.xsl"
+
+	# Conversion information
+	sed -e "s:\${PF}:${PF}:" < "${FILESDIR}/xss-conversion-2.txt" \
+		> "${S}/xss-conversion.txt" || die "sed failed"
+
+	dodoc "${S}/xss-conversion.txt"
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms u+s /usr/libexec/gnome-screensaver-dialog
+	fi
+
+	if use branding ; then
+		insinto /usr/share/pixmaps/
+		doins "${DISTDIR}/gentoo-logo.svg" || die "doins 1 failed"
+		insinto /usr/share/applications/screensavers/
+		doins "${FILESDIR}/gentoologo-floaters.desktop" || die "doins 2 failed"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+		ewarn "You have a too old xorg-server installation. This will cause"
+		ewarn "gnome-screensaver to eat up your CPU. Please consider upgrading."
+		echo
+	fi
+
+	if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+		ewarn "You have xscreensaver installed, you probably want to disable it."
+		ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+		ewarn "build xscreensaver with -gnome in the USE flags."
+		ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+
+		echo
+	fi
+
+	elog "Information for converting screensavers is located in "
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
+}