Fix gdmflexiserver handling for bug 141627. Thanks to Michal Varady.

Package-Manager: portage-2.1.2.7

5 files changed, 199 insertions, 5 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 0c42c767160b..de580cd055a0 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.179 2007/05/05 05:23:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.180 2007/05/11 09:09:08 drac Exp $
+
+*xscreensaver-5.02-r1 (11 May 2007)
+
+  11 May 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xscreensaver-5.02-gdmflexiserver.patch,
+  +xscreensaver-5.02-r1.ebuild:
+  Fix gdmflexiserver handling for bug 141627. Thanks to Michal Varady.
 
   05 May 2007; Jeroen Roovers <jer@gentoo.org> xscreensaver-5.02.ebuild:
   Stable for HPPA (bug #176584).
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 4c1c2d16f4c0..30b3e1bac5a9 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -38,6 +38,10 @@ AUX xscreensaver-5.01-nsfw.patch 6673 RMD160 511aa5ce86beca16896e6657fe07f3d5451
 MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.01-nsfw.patch 6673
 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.01-nsfw.patch 6673
 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.01-nsfw.patch 6673
+AUX xscreensaver-5.02-gdmflexiserver.patch 502 RMD160 0464f2947b45a35fa5637b2a2a9844643ee0abd5 SHA1 d9816a534afdc7aaf29ea85ec5ccfcf25e90fafb SHA256 be09476349915072b2ebf6343aff9557b556a90bcb599b63e1f90ce1a85c58ae
+MD5 bd96031a45071588407c6a224ba35fd1 files/xscreensaver-5.02-gdmflexiserver.patch 502
+RMD160 0464f2947b45a35fa5637b2a2a9844643ee0abd5 files/xscreensaver-5.02-gdmflexiserver.patch 502
+SHA256 be09476349915072b2ebf6343aff9557b556a90bcb599b63e1f90ce1a85c58ae files/xscreensaver-5.02-gdmflexiserver.patch 502
 AUX xscreensaver-5.02-nsfw.patch 7020 RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 SHA1 25060506a26d6e406622fcc38b6c7899e662b0e8 SHA256 27d5893ac5a123d33c1029c4cd5e2690212562c2b4113c3b9c1d39c34210ff40
 MD5 2ff74ddf7eaa13452ded84caeed509f6 files/xscreensaver-5.02-nsfw.patch 7020
 RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 files/xscreensaver-5.02-nsfw.patch 7020
@@ -53,14 +57,18 @@ EBUILD xscreensaver-5.01-r2.ebuild 4858 RMD160 e6aa618f8b918c205588eccdc0c25377a
 MD5 807261a708a578c61acf12298ae77363 xscreensaver-5.01-r2.ebuild 4858
 RMD160 e6aa618f8b918c205588eccdc0c25377a83b71cd xscreensaver-5.01-r2.ebuild 4858
 SHA256 631c12133622aae5056bff900a5b958fd5eceb04cc99d8984365ed9782d900bf xscreensaver-5.01-r2.ebuild 4858
+EBUILD xscreensaver-5.02-r1.ebuild 4648 RMD160 322b6d73b692f1f1ea99b3bc6c365a605a9659f4 SHA1 aca7a89c2e683833e3b554308f389cfd2e7c9a22 SHA256 764a0b271128ace7568645d8cf03a0dd573a494d6b8439f305a4fcdf49793446
+MD5 dabbb2bcf79d518d8fa9ccf1631dfe29 xscreensaver-5.02-r1.ebuild 4648
+RMD160 322b6d73b692f1f1ea99b3bc6c365a605a9659f4 xscreensaver-5.02-r1.ebuild 4648
+SHA256 764a0b271128ace7568645d8cf03a0dd573a494d6b8439f305a4fcdf49793446 xscreensaver-5.02-r1.ebuild 4648
 EBUILD xscreensaver-5.02.ebuild 4587 RMD160 5677ffef7f58a96824bf9c1eb80bbb91badb90b9 SHA1 fed651a697360c8996e56504e7a7689a361d7404 SHA256 c0ed1fe2b9e9f763257289c85b3b25a90718e0bec11eebd083b459c58af1049b
 MD5 d27fc4453bef158fee25e1348d2b5c76 xscreensaver-5.02.ebuild 4587
 RMD160 5677ffef7f58a96824bf9c1eb80bbb91badb90b9 xscreensaver-5.02.ebuild 4587
 SHA256 c0ed1fe2b9e9f763257289c85b3b25a90718e0bec11eebd083b459c58af1049b xscreensaver-5.02.ebuild 4587
-MISC ChangeLog 29850 RMD160 7fa5a1a4927b6e757681a0ca26e7503653c75bcf SHA1 6adb2b932d53a4c1bd1a2e8ce2326069cca3cf22 SHA256 5b86efd68a329fbe15cf3efd8a3f4db6a55dc959df27755268f6f603aa205d57
-MD5 4d56db75c9ec9bc9baac93c26fbb8b50 ChangeLog 29850
-RMD160 7fa5a1a4927b6e757681a0ca26e7503653c75bcf ChangeLog 29850
-SHA256 5b86efd68a329fbe15cf3efd8a3f4db6a55dc959df27755268f6f603aa205d57 ChangeLog 29850
+MISC ChangeLog 30090 RMD160 2075f899fba235315e5b5f11d72c6d1107e1bf8e SHA1 12d602656e044e111ba5226903820e72914c1d49 SHA256 0f583e1a262a578dc53d9de4fb8620f4e8485eaf5b3cbc6ec9116a1206a61014
+MD5 a3d96337381bbe385c838d30101c4f15 ChangeLog 30090
+RMD160 2075f899fba235315e5b5f11d72c6d1107e1bf8e ChangeLog 30090
+SHA256 0f583e1a262a578dc53d9de4fb8620f4e8485eaf5b3cbc6ec9116a1206a61014 ChangeLog 30090
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -74,3 +82,6 @@ SHA256 373fdb9ab0176f3509fbeeffdb25e3b2266e496475024636029574913943f921 files/di
 MD5 36502656b074298bd4f82303278ce293 files/digest-xscreensaver-5.02 256
 RMD160 91196636c0d193376f6ce7a21720ae4385d60e64 files/digest-xscreensaver-5.02 256
 SHA256 2fe607acbd85f0d6d4fcad4d3f7339d9635beb16204735d3592886159383e584 files/digest-xscreensaver-5.02 256
+MD5 36502656b074298bd4f82303278ce293 files/digest-xscreensaver-5.02-r1 256
+RMD160 91196636c0d193376f6ce7a21720ae4385d60e64 files/digest-xscreensaver-5.02-r1 256
+SHA256 2fe607acbd85f0d6d4fcad4d3f7339d9635beb16204735d3592886159383e584 files/digest-xscreensaver-5.02-r1 256
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r1 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r1
new file mode 100644
index 000000000000..fdfae96d63a8
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r1
@@ -0,0 +1,3 @@
+MD5 83937791b30f55f52011d4fee0f5dff3 xscreensaver-5.02.tar.gz 5371759
+RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 xscreensaver-5.02.tar.gz 5371759
+SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d xscreensaver-5.02.tar.gz 5371759
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch
new file mode 100644
index 000000000000..01638d6c2503
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.02-gdmflexiserver.patch
@@ -0,0 +1,12 @@
+diff -ur xscreensaver-5.02.orig/configure.in xscreensaver-5.02/configure.in
+--- xscreensaver-5.02.orig/configure.in	2007-04-17 07:56:11.000000000 +0300
++++ xscreensaver-5.02/configure.in	2007-05-11 12:02:20.000000000 +0300
+@@ -2265,7 +2265,7 @@
+ 
+ have_login_manager=no
+ with_login_manager_req=unspecified
+-default_login_manager='gdmflexiserver -l'
++default_login_manager='gdmflexiserver -ls'
+ 
+ AC_ARG_WITH(login-manager,
+ [  --with-login-manager    Put a "New Login" button on the unlock dialog that
diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
new file mode 100644
index 000000000000..9bc4b5e35fa5
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02-r1.ebuild,v 1.1 2007/05/11 09:09:08 drac Exp $
+
+inherit eutils flag-o-matic pam fixheadtails autotools
+
+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="gnome jpeg insecure-savers new-login offensive opengl pam xinerama"
+
+RDEPEND="x11-libs/libXxf86misc
+	x11-apps/xwininfo
+	x11-apps/appres
+	media-libs/netpbm
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/libxml2-2.5
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-1.99
+	>=dev-libs/glib-2
+	pam? ( virtual/pam )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl
+		>=media-libs/gle-3.0.1 )
+	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
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug fixes:
+	epatch "${FILESDIR}/${PN}-5.01-gentoo.patch"
+
+	# disable not-safe-for-work xscreensavers
+	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
+
+	# Fix bug #154444 - hypertorus hack:
+	epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
+
+	epatch "${FILESDIR}"/${P}-gdmflexiserver.patch
+
+	eautoreconf
+
+	# change old head/tail to POSIX ones
+	ht_fix_all
+
+}
+
+src_compile() {
+	# simple workaround for the flurry screensaver
+	filter-flags -mabi=altivec
+	filter-flags -maltivec
+	append-flags -U__VEC__
+
+	unset BC_ENV_ARGS
+	econf \
+		--with-hackdir=/usr/lib/misc/xscreensaver \
+		--with-configdir=/usr/share/xscreensaver/config \
+		--x-libraries=/usr/$(get_libdir) \
+		--x-includes=/usr/include \
+		--with-dpms-ext \
+		--with-xf86vmode-ext \
+		--with-xf86gamma-ext \
+		--with-proc-interrupts \
+		--with-xpm \
+		--with-xshm-ext \
+		--with-xdbe-ext \
+		--enable-locking \
+		--with-gtk \
+		--without-kerberos \
+		$(use_with insecure-savers setuid-hacks) \
+		$(use_with new-login login-manager) \
+		$(use_with xinerama xinerama-ext) \
+		$(use_with pam) \
+		$(use_with opengl gl) $(use_with opengl gle) \
+		$(use_with jpeg)
+
+	# bug 155049
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	[[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
+
+	emake install_prefix="${D}" install || die "emake install failed."
+
+	dodoc README*
+
+	# install correctly in gnome, including info about configuration preferences
+	if use gnome; then
+		dodir /usr/share/gnome/capplets
+		insinto /usr/share/gnome/capplets
+		doins driver/screensaver-properties.desktop
+
+		newicon "${S}/utils/images/logo-50.xpm" xscreensaver.xpm
+
+		dodir /usr/share/control-center-2.0/capplets
+		insinto /usr/share/control-center-2.0/capplets
+		newins "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
+	fi
+
+	# Remove "extra" capplet
+	rm -f "${D}/usr/share/applications/gnome-screensaver-properties.desktop"
+
+	# Allways install Settings .desktop for enviroments following
+	# freedesktop.org standard, e.g. xfce-base/xfdesktop and rox-base/xdg-menu
+	domenu "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
+
+	use pam && fperms 755 /usr/bin/xscreensaver
+	pamd_mimic_system xscreensaver auth
+
+	# Fix bug #135549:
+	rm -f "${D}/usr/share/xscreensaver/config/electricsheep.xml"
+	rm -f "${D}/usr/share/xscreensaver/config/fireflies.xml"
+	dodir /usr/share/man/man6x
+	mv "${D}/usr/share/man/man6/worm.6" \
+		"${D}/usr/share/man/man6x/worm.6x"
+
+	# Fix bug #152250:
+	dodir "/usr/share/X11/app-defaults"
+	mv "${D}/usr/lib/X11/app-defaults/XScreenSaver" \
+		"${D}/usr/share/X11/app-defaults/XScreenSaver"
+}
+
+pkg_postinst() {
+	if ! use new-login; then
+		elog
+		elog "You have chosen to not use the new-login USE flag."
+		elog "This is a new USE flag which enables individuals to"
+		elog "create new logins when the screensaver is active,"
+		elog "allowing others to use their account, even though the"
+		elog "screen is locked to another account. If you want this"
+		elog "feature, please recompile with USE=\"new-login\"."
+		elog
+	fi
+
+	if use insecure-savers;then
+		ewarn
+		ewarn "You have chosen USE=insecure-savers. While upstream"
+		ewarn "has made every effort to make sure these savers do not"
+		ewarn "abuse their setuid root status, the possibilty exists that"
+		ewarn "someone will exploit xscreensaver and will be able to gain"
+		ewarn "root privileges. You have been warned."
+		ewarn
+	fi
+}