motif USE flag dropped; insecure-savers use flag added, which enables setuid root on a few savers for cool effects. stopped debug messages from appearing on blank screens for bug #100465; installs gnome configure option correctly; fixes head-tail for bug #100589

(Portage version: 2.0.51.22-r2)

6 files changed, 92 insertions, 37 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 50df2f562335..481e960e1d08 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.99 2005/07/27 21:49:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.100 2005/07/30 02:58:32 smithj Exp $
+
+*xscreensaver-4.22-r4 (30 Jul 2005)
+
+  30 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/desktop_entries/screensaver-properties.desktop,
+  +files/xscreensaver-blank-screen.patch, -xscreensaver-4.22-r3.ebuild,
+  +xscreensaver-4.22-r4.ebuild:
+  motif USE flag dropped; insecure-savers use flag added, which enables setuid
+  root on a few savers for cool effects. stopped debug messages from appearing
+  on blank screens for bug #100465; installs gnome configure option correctly;
+  fixes head-tail for bug #100589
 
   27 Jul 2005; Joseph Jezak <josejx@gentoo.org> xscreensaver-4.22-r2.ebuild:
   Marked ppc stable for bug #100298.
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 054bd128a715..e69de29bb2d1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,25 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 30baa75aa8ad6b15fa87c15cce9d3f40 xscreensaver-4.20.ebuild 4842
-MD5 3a229399e1540239f31eb3621c9445ea xscreensaver-4.22-r2.ebuild 5473
-MD5 85163ad90d9c7aae0bc7054735c1b7a3 ChangeLog 17629
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 33275facc867a5741d735c061c4456b1 xscreensaver-4.22-r3.ebuild 4949
-MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
-MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
-MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
-MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patch 542
-MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
-MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r2 70
-MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r3 70
-MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
-MD5 f5dcb5acf99e374e9f99a95890b8eb0f files/xscreensaver-4.22-configure.patch 1592
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC6AFccsIHjyDViGQRAm5SAJ9AHXi5h6MjlTKzDd9PjDQcllBDqQCg2TB1
-Peyw4N9cYa0gQkpl+gxP3Eg=
-=V7YD
------END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/desktop_entries/screensaver-properties.desktop b/x11-misc/xscreensaver/files/desktop_entries/screensaver-properties.desktop
new file mode 100644
index 000000000000..bfa0c6c2bb86
--- /dev/null
+++ b/x11-misc/xscreensaver/files/desktop_entries/screensaver-properties.desktop
@@ -0,0 +1,32 @@
+[Desktop Entry]
+Exec=xscreensaver-demo
+Icon=xscreensaver.xpm
+Terminal=false
+Name=Screensaver
+Name[da]=Pauseskærm
+Name[de]=Bildschirmschoner
+Name[es]=Salvapantallas
+Name[et]=Ekraanisäästja
+Name[fi]=Näytönsäästäjä
+Name[fr]=Économiseur d'écran
+Name[hu]=Képernyővédő
+Name[ja]=スクリーンセーバー
+Name[ko]=화면 보호기
+Name[nl]=Schermbeveiliging
+Name[no]=Skjermsparer
+Name[pl]=Wygaszacz ekranu
+Name[pt]=Protecção Ecrã
+Name[ru]=Хранитель экрана
+Name[sk]=Šetrič obrazovky
+Name[sv]=Skärmsläckare
+Name[vi]=Trình bảo vệ màn hình
+Name[wa]=Spårgneu di waitroûle
+Name[zh_CN]=屏幕保护程序
+Name[zh_TW]=螢幕保護程式
+Comment=Change screensaver properties
+Comment[da]=Ændr egenskaber for pauseskærm
+Comment[fi]=Muuta näytönsäästäjän ominaisuuksia
+Comment[fr]=Modifier les propriétés de l'économiseur d'écran
+Comment[nl]=Verander schermbeveiliging voorkeuren
+Type=Application
+Categories=Application;Settings;Appearance;AdvancedSettings;
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r3 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r4
index 6f0f6e359c66..6f0f6e359c66 100644
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r3
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r4
diff --git a/x11-misc/xscreensaver/files/xscreensaver-blank-screen.patch b/x11-misc/xscreensaver/files/xscreensaver-blank-screen.patch
new file mode 100644
index 000000000000..23a7c6986d23
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-blank-screen.patch
@@ -0,0 +1,14 @@
+--- driver/xscreensaver.c	2005-07-27 15:27:57.000000000 -0400
++++ driver/xscreensaver.c	2005-07-27 15:30:08.000000000 -0400
+@@ -1641,8 +1641,11 @@
+       if (hint.res_class) XFree (hint.res_class);
+     }
+ 
++  /*
+   fprintf (stderr, "%s: %d: unrecognised ClientMessage \"%s\" received\n",
+            blurb(), screen, (str ? str : "(null)"));
++  */
++
+   fprintf (stderr, "%s: %d: for window 0x%lx (%s)\n",
+            blurb(), screen, (unsigned long) w, wdesc);
+   if (str) XFree (str);
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
index 3f34183b922e..277df90391d7 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.22-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r3.ebuild,v 1.1 2005/07/26 19:47:06 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r4.ebuild,v 1.1 2005/07/30 02:58:32 smithj Exp $
 
-inherit eutils flag-o-matic pam
+inherit eutils flag-o-matic pam fixheadtails
 
-IUSE="gnome jpeg kde kerberos krb4 motif new-login nls offensive opengl pam xinerama"
+IUSE="gnome jpeg kde kerberos krb4 insecure-savers new-login nls offensive opengl pam xinerama"
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -42,7 +42,6 @@ DEPEND="${RDEPEND}
 	sys-devel/bc
 	dev-lang/perl
 	dev-util/pkgconfig
-	motif? ( virtual/motif )
 	nls? ( sys-devel/gettext )"
 
 # simple workaround for the flurry screensaver
@@ -74,12 +73,22 @@ src_unpack() {
 	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
 	# use gnome-terminal in tests rather than gnome-open (bug #94708)
 	epatch ${FILESDIR}/${PN}-4.22-configure.patch
+
 	# tweaks the default configuration (driver/XScreenSaver.ad.in)
 	epatch ${FILESDIR}/${PN}-4.22-settings.patch
+
+	# makes the blank screen REALLY blank
+	epatch ${FILESDIR}/${PN}-blank-screen.patch
+
 	# fixes wrong argument for inter-aggregate screensaver
 	epatch ${FILESDIR}/${PN}-4.22-interaggregate.patch
+
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
+
+	# change old head/tail to POSIX ones
+	#cd hacks
+	ht_fix_all
 }
 
 src_compile() {
@@ -104,7 +113,7 @@ src_compile() {
 		--enable-locking \
 		--with-gtk \
 		--with-xml \
-		$(use_with motif) \
+		$(use_with insecure-savers setuid-hacks) \
 		$(use_with new-login login-manager) \
 		$(use_with xinerama xinerama-ext) \
 		$(use_with pam) \
@@ -123,11 +132,20 @@ src_install() {
 
 	dodoc README
 
-	# install correctly in gnome
+	# 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
+
+		dodir /usr/share/pixmaps
+		insinto /usr/share/pixmaps
+		newins ${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
 
 	# install symlink to satisfy kde
@@ -136,11 +154,6 @@ src_install() {
 	# Remove "extra" capplet
 	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
 
-	if use gnome ; then
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	fi
-
 	use pam && fperms 755 /usr/bin/xscreensaver
 	pamd_mimic_system xscreensaver auth
 }
@@ -157,6 +170,16 @@ pkg_postinst() {
 		einfo
 	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 privledges. You have been warned."
+		ewarn
+	fi
+
 	einfo
 	einfo "The gtk USE flag has been dropped. gtk is now required for Gentoo's"
 	einfo "xscreensaver. If this is a problem, bug upstream."