Fix segv with phosphor screensaver wrt #256446, thanks to Nick Soveiko.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 132 insertions, 2 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index b49a56711f5c..a4494cac479b 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.249 2009/04/28 16:41:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.250 2009/04/30 14:12:43 ssuominen Exp $
+
+*xscreensaver-5.08-r1 (30 Apr 2009)
+
+  30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xscreensaver-5.08-phosphor-segv.patch,
+  +xscreensaver-5.08-r1.ebuild:
+  Fix segv with phosphor screensaver wrt #256446, thanks to Nick Soveiko.
 
   28 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
   xscreensaver-5.08.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 43b6767945f2..b077493a5d9b 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -3,9 +3,11 @@ AUX 5.07/02_all_no_intltool.patch 2277 RMD160 a24cef7922cd1cfa1a01aece5536d98ebd
 AUX 5.08/01_all_default_settings.patch 3802 RMD160 cc3aa5c566349cc3d73b69b61377607b6694135a SHA1 0b6c986a3afeb0603d8d074b3722eebc7d387e06 SHA256 c69c1afda8f4fdc26f21de07012c4fb7a1f89fcd937cc82fe4162ce393f3ab53
 AUX 5.08/02_all_no_intltool.patch 2277 RMD160 a24cef7922cd1cfa1a01aece5536d98ebdb28ccc SHA1 2c1e221a789d9cda9fc64346503d2d305637e1aa SHA256 e6aff6454346b5811fb9da5d626efaca8af2329e0ab92af8e547b7492c96b19d
 AUX 5.08/03_all_glforrestfire.patch 518 RMD160 29a69330d3f62c8285f3983e7e925302ed7240e3 SHA1 42af34830bb29b8013408ce0a1b5486c87f54734 SHA256 25ae6a3df4b25ad17c6af34b52927caf1bbc81439c658c4994c2f80e994f2e5f
+AUX xscreensaver-5.08-phosphor-segv.patch 568 RMD160 605a433c613f6bd24537f1c755299b54db3699e2 SHA1 f28df04cd5ad42199b3c1fef3bcfa3a31667184b SHA256 3558ae7747b7e09b07020127526740888674d86a9f1820b1703c3a9acaeff45a
 DIST xscreensaver-5.07.tar.gz 5513131 RMD160 d2fee54c3138c717433f5a6ca9a098028082af95 SHA1 82c611ab271807ad871aa46a3a7f6b95706d31aa SHA256 8c50a74c07b1fffcbb20bd79e3ee92f1f52191e5a187433bb49964ccf94badb6
 DIST xscreensaver-5.08.tar.gz 5466460 RMD160 f37ba887a656a4ffd14f3809de3269806271352d SHA1 4e6889d7171eaf18b856c484a87d5701787e5dc6 SHA256 638cb1455cd5fe0c95f53cf048b9b46f5b0ccce026c39246d0dc65ebb09ca9dd
 EBUILD xscreensaver-5.07.ebuild 2667 RMD160 6259a3fef0155424ca6f2c24b98344e0d0421a98 SHA1 1734f61f1ad79deb7f636293a034bb9244fed134 SHA256 d1957f4fbdb055471487023048b2b28145b6b6f34ae06840600f0113de415f6b
+EBUILD xscreensaver-5.08-r1.ebuild 2645 RMD160 08fe7ceac8a47cc09fad80bb1fc9b4b148e4944c SHA1 10ffc317f7bdecbcea41241aad5b223d4b946c86 SHA256 5585abc3a6adc804943696cd4b83dd527566cf6527d2099ff43d500efff38aa0
 EBUILD xscreensaver-5.08.ebuild 2586 RMD160 d2c918065b5096067b88fbcf8aa4430b664617f5 SHA1 b9a31b043622798dc60a7eb6f21ee33404e37776 SHA256 9bb431b105c3d0ef281b30fd1607a8901b1ecbffd203764acc855e8e17c8aa45
-MISC ChangeLog 40921 RMD160 3de39fb4e6f7db26602283bd46d84e09bea29060 SHA1 4b583b8f218b6e652225f5235cb323e635a6fe50 SHA256 a17711de3c885d79d858f6b08ce08bd3bc943669a6d4403a9a01e309aaeff090
+MISC ChangeLog 41167 RMD160 477f88835f824cc5fc69c4b9bd9e7c15ecb60217 SHA1 85aa3d4eb51ae21c87f6f5fdde1c62779daddeea SHA256 5673d31fa91fac0afdcbdbc09b132f07bcda6711959b231cc4c85c443550e476
 MISC metadata.xml 448 RMD160 53a59f7e462fa8a90b1756a85659855c53402e9d SHA1 7cea2f7e7ef26fd4b9598164efab077cf2c606cd SHA256 dd68ded20236cd8fd643730ffe54b297a64a971442d1d4d842cd12c1168dbc73
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch b/x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch
new file mode 100644
index 000000000000..7cf78f9d9eaf
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch
@@ -0,0 +1,19 @@
+--- xscreensaver-5.08/hacks/phosphor.c.debug	2008-07-31 19:01:00.000000000 +0900
++++ xscreensaver-5.08/hacks/phosphor.c	2009-01-22 22:52:11.000000000 +0900
+@@ -1353,6 +1353,7 @@
+ 	  if (state->pid)
+ 	    {
+ 	      waitpid(state->pid, NULL, 0);
++	      state->pid = 0;
+ 	      fclose (state->pipe);
+ 	    }
+ 	  else
+@@ -1436,7 +1437,7 @@
+   resize_grid (state);
+ 
+ # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
+-  if (state->pid)
++  if (state->pid && state->pipe)
+     {
+       /* Tell the sub-process that the screen size has changed. */
+       struct winsize ws;
diff --git a/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild
new file mode 100644
index 000000000000..8e062d77a29e
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.08-r1.ebuild,v 1.1 2009/04/30 14:12:43 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-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? ( media-libs/jpeg )
+	opengl? ( virtual/opengl )
+	xinerama? ( x11-libs/libXinerama )
+	new-login? ( gnome-base/gdm )"
+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 )"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
+	epatch "${FILESDIR}"/${P}-phosphor-segv.patch #256446
+	eautoreconf #113681
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -mabi=altivec
+		filter-flags -maltivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	econf \
+		--with-x-app-defaults=/usr/share/X11/app-defaults \
+		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
+		--with-configdir=/usr/share/${PN}/config \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
+		--with-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-randr-ext \
+		--with-proc-interrupts \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		--without-kerberos \
+		--without-gle \
+		--with-gtk \
+		--with-pixbuf \
+		--with-text-file=/etc/gentoo-release \
+		$(use_with suid setuid-hacks) \
+		$(use_with new-login login-manager) \
+		$(use_with xinerama xinerama-ext) \
+		$(use_with pam) \
+		$(use_with opengl gl) \
+		$(use_with jpeg)
+}
+
+src_compile() {
+	emake -j1 || die "emake failed." #155049
+}
+
+src_install() {
+	emake install_prefix="${D}" install || die "emake install failed."
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	# Collision with electricsheep, bug 135549
+	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}