Fix password string display wrt #349512 by Sergey and Mamoru Tasaka. Fix gtkext memory leak wrt #351173 by Brian Beardall and Mamoru Tasaka.

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

5 files changed, 149 insertions, 2 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 753bb17a8b37..6cfed8469d6e 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.282 2011/01/08 01:16:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.283 2011/01/13 11:34:58 ssuominen Exp $
+
+*xscreensaver-5.12-r1 (13 Jan 2011)
+
+  13 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +xscreensaver-5.12-r1.ebuild,
+  +files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch,
+  +files/xscreensaver-5.12-gltext-memleak.patch:
+  Fix password string display wrt #349512 by Sergey and Mamoru Tasaka. Fix
+  gtkext memory leak wrt #351173 by Brian Beardall and Mamoru Tasaka.
 
   08 Jan 2011; Brent Baude <ranger@gentoo.org> xscreensaver-5.12.ebuild:
   stable ppc, bug 349029
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index a48dd4c861d8..e94e76b28baf 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,7 +1,10 @@
 AUX xscreensaver-5.10-gentoo.patch 3673 RMD160 3b70efb6ae6b4e69471e35ed4674524e8dc4a7c1 SHA1 6e35e2c874c52c08e6ec0962ed964753089e9821 SHA256 ca0f244d52e7c61e1776480ff390a152acac1f5b4b0d8018a8d12f773e233ab3
+AUX xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch 485 RMD160 96622fa4aa95bd13afe4b9dbc9b998319524c972 SHA1 85d8f5e07d08c1080e605a7cdcf9aa89ff7752fd SHA256 6bee564aa12e7533f54f52834681eea12cbee387f3875f114a7751e83e065128
+AUX xscreensaver-5.12-gltext-memleak.patch 219 RMD160 1ab5299f8b6f19fe86714d846b24b810c133f2e4 SHA1 2108fd66fbbb45cb57b31762dd3a13a99d99b579 SHA256 d59c517376c38b09bcda18eea1d61d4dfcbf8d8d6885043447a571594ed516e4
 DIST xscreensaver-5.11.tar.gz 5585001 RMD160 ca9e1ceb570e6e1a9797cbd988232fc80780297b SHA1 8cc46c4e80124fba0890fa9e37e3b4ff87c6a8cf SHA256 47032a8068362a3fe46dd35227e0426289951fe8124f0821f76629d430d08770
 DIST xscreensaver-5.12.tar.gz 5606851 RMD160 c0fbd8cfad2919b06c8479bcebfa9af81aa97ae6 SHA1 7252540b1b1853459a56453714c0974de26fa4c5 SHA256 b11da52775c895e29c312a4472187afdecffc809ef691c7ae603475072efdbce
 EBUILD xscreensaver-5.11.ebuild 2479 RMD160 1e152197bc53db88412f36eb93013a9fa4cd9239 SHA1 2a54f935a688f5cfc7706a7aa0d204fc1fed5295 SHA256 64084cf906daba3efac9ebde1bcd5c0ae9fde6f40442b964be3dcefd54bf927c
+EBUILD xscreensaver-5.12-r1.ebuild 2584 RMD160 11b260219cd58d211a833b3eb504b135101642e1 SHA1 68f063c1dc7bbc2c49d55f38fb2579a0f9d09fa5 SHA256 c2bda7cd709f97c3a9f0bf74058838152aeb546763bdb7485b2bfcb1e50d0899
 EBUILD xscreensaver-5.12.ebuild 2538 RMD160 e5b096ef5852754a668d95d9511f0a9ecd0d5e8f SHA1 4e99370c1a3124c242cc8e44e5828c3f992dc829 SHA256 f639bf17cb33916066924366e8715fc984790fc4abbbb46d389e2e4573cdef56
-MISC ChangeLog 45452 RMD160 2b944aa84e31994d793ef5e6f1650d5e859e216a SHA1 287bcca59df14f915244e4b42ca943cd8fcc91f3 SHA256 0a0cbb47872a68430a37e118a0b94e02e885ea15e96be4898fdda31171c31efe
+MISC ChangeLog 45839 RMD160 8e02ffc10cc6fd721fcb7e7d75400603e9f6b3cb SHA1 8bbccf0be5f3795f169cd82d1c2c02356dfb312f SHA256 7b06069ab2b96506d57ece8d28ff039ae40897dc3152a580cabdd484897ea5f0
 MISC metadata.xml 494 RMD160 ba20404c67b1049332bae94a7a3543d33fb0579f SHA1 431f3a7cacea2e341fed0ef301f70941c9e5adb4 SHA256 b49839244c1c8d9df0ede500471c7d7e9037a8d62150c97ced979e50e68f8a10
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch b/x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
new file mode 100644
index 000000000000..14a9f789a770
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.12-for-now-set-lang-on-daemon-to-C.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/349512
+
+--- driver/xscreensaver.c
++++ driver/xscreensaver.c
+@@ -1382,6 +1382,7 @@
+   struct passwd *spasswd;
+   int i;
+ 
++#if 0
+ #ifdef ENABLE_NLS
+   if (!setlocale (LC_ALL, ""))
+     fprintf (stderr, "locale not supported by C library\n");
+@@ -1389,6 +1390,7 @@
+   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+   textdomain (GETTEXT_PACKAGE);
+ #endif /* ENABLE_NLS */
++#endif
+ 
+   memset(si, 0, sizeof(*si));
+   global_si_kludge = si;	/* I hate C so much... */
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch b/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch
new file mode 100644
index 000000000000..0a80767735ee
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.12-gltext-memleak.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/351173
+
+--- hacks/glx/tube.c
++++ hacks/glx/tube.c
+@@ -181,6 +181,8 @@
+         glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
+       }
+ 
++  free(array);
++
+   return polys;
+ }
+ 
diff --git a/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild
new file mode 100644
index 000000000000..57c0ca41b469
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.12-r1.ebuild,v 1.1 2011/01/13 11:34:59 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils flag-o-matic multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="jpeg new-login opengl pam suid xinerama"
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libXxf86vm
+	x11-libs/libXrandr
+	x11-libs/libXxf86misc
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-apps/xwininfo
+	x11-apps/appres
+	media-libs/netpbm
+	>=dev-libs/libxml2-2.5
+	>=x11-libs/gtk+-2:2
+	>=gnome-base/libglade-1.99
+	pam? ( virtual/pam )
+	jpeg? ( virtual/jpeg )
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	new-login? ( || ( gnome-base/gdm kde-base/kdm ) )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/scrnsaverproto
+	x11-proto/recordproto
+	x11-proto/xf86miscproto
+	sys-devel/bc
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+	xinerama? ( x11-proto/xineramaproto )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.10-gentoo.patch \
+		"${FILESDIR}"/${P}-*.patch
+	eautoconf
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -mabi=altivec
+		filter-flags -maltivec
+		append-flags -U__VEC__
+	fi
+
+	unset LINGUAS #113681
+	unset BC_ENV_ARGS #24568
+
+	econf \
+		--x-includes=/usr/include \
+		--x-libraries=/usr/$(get_libdir) \
+		--enable-locking \
+		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir=/usr/share/${PN}/config \
+		--with-x-app-defaults=/usr/share/X11/app-defaults \
+		--with-dpms-ext \
+		$(use_with xinerama xinerama-ext) \
+		--with-xinput-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-randr-ext \
+		--with-proc-interrupts \
+		$(use_with pam) \
+		--without-kerberos \
+		$(use_with new-login login-manager) \
+		--with-gtk \
+		$(use_with opengl gl) \
+		--without-gle \
+		--with-pixbuf \
+		$(use_with jpeg) \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--with-text-file=/etc/gentoo-release \
+		$(use_with suid setuid-hacks)
+}
+
+src_install() {
+	emake install_prefix="${D}" install || die
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}