Bump to 2.22.2. Fix CVE-2008-0887, add a limit to the password field.

Package-Manager: portage-2.1.5_rc2

3 files changed, 128 insertions, 2 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index c5245e8642c8..840f3d48c3e9 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.76 2008/04/03 20:13:18 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.77 2008/04/10 23:29:16 eva Exp $
+
+*gnome-screensaver-2.22.2 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-screensaver-2.22.2.ebuild:
+  Bump to 2.22.2. Fix CVE-2008-0887, add a limit to the password field.
 
   03 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   gnome-screensaver-2.20.0-r3.ebuild:
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 0e47deb36bd5..b3f659f10dd2 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-screensaver-2.20.0-fix-gamma.patch 1637 RMD160 1bda5b646edb2b38218c93ac05b6f592e1366bca SHA1 243191a5c59be9badbba440ef364483a83d69fae SHA256 20c5afb7c058e1a4acf308eee466bbf81fb01e2df9a238fc48b0e89384521005
 AUX gnome-screensaver-CVE-2008-0887.patch 7965 RMD160 9eade48b04e5a617ec427258f3e41d5c33ab750f SHA1 392a477755562b032d24928ac6c2100af7d7fca1 SHA256 71e9bb7735fbc373ee2f19f7740ba759c7eeff0e46bd50ab7401f9d6147a1666
 AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
 DIST gnome-screensaver-2.20.0.tar.bz2 2013842 RMD160 ddea3d536366aab572462f4f66c72daabbeeb119 SHA1 0b99de04caf897642338c61edc12cb7cea27e0a4 SHA256 9ee744058d2c7139634543951a62828b2e1b69fe33cf0b5456737e9c5201dbb9
 DIST gnome-screensaver-2.22.0.tar.bz2 2038929 RMD160 3bd2884d3d676599c23d630893c448617243b4f9 SHA1 51bad55f043ff17e864a79ba24e1c0f6a80abd6c SHA256 e6d66ad1092babe5b9a1ded2a50464e21206fa42a922ea1de0c688e764e05bfb
+DIST gnome-screensaver-2.22.2.tar.bz2 2042396 RMD160 91f57c339fdc025588101b7fbab4d5095d392f0b SHA1 473b00fc6306742ada4e89520c991c31d1f79984 SHA256 a686d41f8623dbfc56c2c0bab5517a6380f538ed6ef7478ca51cfb9062e9f15b
 EBUILD gnome-screensaver-2.20.0-r2.ebuild 2975 RMD160 7cfec93dc5eb9ee7b125c96fd114b6cbbd24340f SHA1 3a1e8dc73d7545ff875f31cdc837ed9527c4150d SHA256 ff550c8d12af56aaead39dfa95c77ab9bca39af56180bb588fa404a15d1d3791
 EBUILD gnome-screensaver-2.20.0-r3.ebuild 3064 RMD160 e540f2068f42fdc67df6453b3626bf0135ba39fe SHA1 fae8399b77b851e02088236d49b88ba42db194ef SHA256 ec59d2bd23d9bd57c976ccb9f3d0165d815ec1fd8deaa7d4de18071f75162a64
 EBUILD gnome-screensaver-2.22.0-r1.ebuild 3082 RMD160 6da07d4f6dda3b76062c2adc10cd0ad41d1bd218 SHA1 ffd6ae9a512045a5e7a5298a49bd05cdb007aba8 SHA256 9eb68484814a06adb1e483a5b4e78f60d292b99b0786c48b85bd97809db216fe
-MISC ChangeLog 12044 RMD160 19afaf87c9690a16882a502c0b48ad02b7e940c3 SHA1 ba6b4d21887bfd0c53effde4737f10891f8afa71 SHA256 1271250fefa06c623c0588896b7f08db6b7f69feee2f11278c5e279059f110b8
+EBUILD gnome-screensaver-2.22.2.ebuild 3067 RMD160 718a8733d1f4543a7f5485c6a56f44588da229e9 SHA1 28b19f9c996a83ac00976297e31241f3e80a0a00 SHA256 dd34877cf96a7e224fbf81fdf84dfe3bf2ec70e96e60d30c1b9e73b22bad3ef0
+MISC ChangeLog 12241 RMD160 945a98927d90a745739516eaede4294fece813a9 SHA1 7a910bfa59816ea049a6c2670ca6d9d5b0af362f SHA256 14b4b990fd47b52f929c459a2f633704a78080c0d3c5d1d3f41f894834c35bb5
 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf+otYACgkQ1fmVwcYIWAa55wCeNda4vyjAMS8yksKZ1LYWaDTH
+aIcAoK6uzCRxrEsMpHHXfOuDZVHcKpN/
+=ufsj
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild
new file mode 100644
index 000000000000..4676683ea27e
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 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.22.2.ebuild,v 1.1 2008/04/10 23:29:16 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
+HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KERNEL_IUSE="kernel_linux"
+IUSE="debug doc libnotify opengl pam xinerama $KERNEL_IUSE"
+
+RDEPEND=">=gnome-base/gconf-2.6.1
+	>=x11-libs/gtk+-2.11.5
+	>=gnome-base/libglade-2.5.0
+	>=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 )
+	xinerama? ( x11-libs/libXinerama )
+	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}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	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
+	xinerama? ( x11-proto/xineramaproto )"
+
+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 libgl)
+		$(use_enable pam)
+		$(use_enable xinerama)
+		--enable-locking
+		--with-xf86gamma-ext
+		--with-kbd-layout-indicator
+		--with-gdm-config=/usr/share/gdm/defaults.conf
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix bug #201019
+	epatch "${FILESDIR}/${PN}-2.20.0-fix-gamma.patch"
+}
+
+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"
+
+	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
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if has_version x11-misc/xscreensaver ; 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"
+	fi
+	echo
+	elog "Information for converting screensavers is located in "
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
+}