diff options
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/Manifest | 19 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 | 3 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch | 13 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild | 165 |
5 files changed, 204 insertions, 5 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 489ceea8c0f2..8840c5fb9ee1 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.182 2007/05/27 05:00:19 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.183 2007/06/06 19:11:00 drac Exp $ + +*xscreensaver-5.02-r2 (06 Jun 2007) + + 06 Jun 2007; Samuli Suominen <drac@gentoo.org> + +files/xscreensaver-5.02-pam.patch, +xscreensaver-5.02-r2.ebuild: + Patch to fix segmentation fault with non-interactive pam by Andrea Luzzardi + in bug 180542. 27 May 2007; Joshua Kinard <kumba@gentoo.org> xscreensaver-5.02-r1.ebuild: Stable on mips. diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 39b336f53836..d924dd120aab 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -22,6 +22,10 @@ AUX xscreensaver-5.02-nsfw.patch 7020 RMD160 dcd2e6a9b49087be76ab6d567bb6259b758 MD5 2ff74ddf7eaa13452ded84caeed509f6 files/xscreensaver-5.02-nsfw.patch 7020 RMD160 dcd2e6a9b49087be76ab6d567bb6259b7584cbd9 files/xscreensaver-5.02-nsfw.patch 7020 SHA256 27d5893ac5a123d33c1029c4cd5e2690212562c2b4113c3b9c1d39c34210ff40 files/xscreensaver-5.02-nsfw.patch 7020 +AUX xscreensaver-5.02-pam.patch 358 RMD160 94fe95bd7c37afd5917cff9e313cbbf90e553efb SHA1 15851e6da8df5aa50158786a1400b676556ed104 SHA256 2bd73cdea88eed6fa2ee31de2a9eaf76435a0110ac3c12bdb0062e74cca4c958 +MD5 77f3bc0683305f7f2312b5b64d36d4f7 files/xscreensaver-5.02-pam.patch 358 +RMD160 94fe95bd7c37afd5917cff9e313cbbf90e553efb files/xscreensaver-5.02-pam.patch 358 +SHA256 2bd73cdea88eed6fa2ee31de2a9eaf76435a0110ac3c12bdb0062e74cca4c958 files/xscreensaver-5.02-pam.patch 358 DIST xscreensaver-5.01.tar.gz 5270954 RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b SHA1 c371241c54f4c4cc2dd670852e39f212da3ca991 SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf DIST xscreensaver-5.02.tar.gz 5371759 RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 SHA1 3e02f516efc25755f1a89f5af3983423f639f82b SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d EBUILD xscreensaver-5.01-r2.ebuild 4858 RMD160 e6aa618f8b918c205588eccdc0c25377a83b71cd SHA1 fec7ba8fe15f22e3a6138b241848565abcf83a35 SHA256 631c12133622aae5056bff900a5b958fd5eceb04cc99d8984365ed9782d900bf @@ -32,14 +36,18 @@ EBUILD xscreensaver-5.02-r1.ebuild 4667 RMD160 f4dde2484a349cfca6a6bc67cba0bd73c MD5 426ebc5189e3a96aa32b1a2b46e88a78 xscreensaver-5.02-r1.ebuild 4667 RMD160 f4dde2484a349cfca6a6bc67cba0bd73c0275a68 xscreensaver-5.02-r1.ebuild 4667 SHA256 9c58626bd5bb490a44e2f8346f01a3ed8e4d2fd5c913902fa6338a84a5d4fcb7 xscreensaver-5.02-r1.ebuild 4667 +EBUILD xscreensaver-5.02-r2.ebuild 4773 RMD160 2cd0f8c338d4d1936a70a173de9a451464056db1 SHA1 0f1c15732b6bdc7470bf393634465e59caa60f79 SHA256 bfcb754e0c19caf1c9701a8c2808a2857e07eed64858cc0a368b82b6be820fe4 +MD5 e8f0f113666e781e83af6b307f520170 xscreensaver-5.02-r2.ebuild 4773 +RMD160 2cd0f8c338d4d1936a70a173de9a451464056db1 xscreensaver-5.02-r2.ebuild 4773 +SHA256 bfcb754e0c19caf1c9701a8c2808a2857e07eed64858cc0a368b82b6be820fe4 xscreensaver-5.02-r2.ebuild 4773 EBUILD xscreensaver-5.02.ebuild 4608 RMD160 6e31c496d2666a2dde2f6ff79b501b82f1d7f698 SHA1 d588569f58cb79cf6d0b9981daeb2356df37b3e7 SHA256 433d510dcf39ba4b539692783cd4915c5a5a3876dce124eaa32dd2d7d61ddc8d MD5 11d17232397f3864648a39be55209d12 xscreensaver-5.02.ebuild 4608 RMD160 6e31c496d2666a2dde2f6ff79b501b82f1d7f698 xscreensaver-5.02.ebuild 4608 SHA256 433d510dcf39ba4b539692783cd4915c5a5a3876dce124eaa32dd2d7d61ddc8d xscreensaver-5.02.ebuild 4608 -MISC ChangeLog 30337 RMD160 bea884bb8cad91faf937b5551f105483a8cf37b6 SHA1 a445b262662f9156a08976178ed0395083c3471f SHA256 b2726b85d0e57c9bf7f6b17be30a6f48ee5f70558caf1037436c42c289d9e382 -MD5 5d0637c78324292a53a72718ae12d51b ChangeLog 30337 -RMD160 bea884bb8cad91faf937b5551f105483a8cf37b6 ChangeLog 30337 -SHA256 b2726b85d0e57c9bf7f6b17be30a6f48ee5f70558caf1037436c42c289d9e382 ChangeLog 30337 +MISC ChangeLog 30586 RMD160 70541d75f0b7a28df1b6e460014e39d27e69f4b6 SHA1 509973670d7df86826b643a7a3721f96a3f26cfd SHA256 bf5deb7002897fd05c742c06a856837b55f489028a594df5d764d3ebf0dec77f +MD5 eb4ce6f5fce7e51ce50ef90dd8462bae ChangeLog 30586 +RMD160 70541d75f0b7a28df1b6e460014e39d27e69f4b6 ChangeLog 30586 +SHA256 bf5deb7002897fd05c742c06a856837b55f489028a594df5d764d3ebf0dec77f ChangeLog 30586 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166 @@ -53,3 +61,6 @@ SHA256 2fe607acbd85f0d6d4fcad4d3f7339d9635beb16204735d3592886159383e584 files/di 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 +MD5 36502656b074298bd4f82303278ce293 files/digest-xscreensaver-5.02-r2 256 +RMD160 91196636c0d193376f6ce7a21720ae4385d60e64 files/digest-xscreensaver-5.02-r2 256 +SHA256 2fe607acbd85f0d6d4fcad4d3f7339d9635beb16204735d3592886159383e584 files/digest-xscreensaver-5.02-r2 256 diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 new file mode 100644 index 000000000000..fdfae96d63a8 --- /dev/null +++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02-r2 @@ -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-pam.patch b/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch new file mode 100644 index 000000000000..c4653727b2db --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.02-pam.patch @@ -0,0 +1,13 @@ +diff -ur xscreensaver-5.02.orig/driver/lock.c xscreensaver-5.02/driver/lock.c +--- xscreensaver-5.02.orig/driver/lock.c 2007-04-20 13:15:56.000000000 +0300 ++++ xscreensaver-5.02/driver/lock.c 2007-06-06 21:48:51.000000000 +0300 +@@ -2066,7 +2066,8 @@ + } + } + +- destroy_passwd_window (si); ++ if (si->pw_data) ++ destroy_passwd_window (si); + } + + diff --git a/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild new file mode 100644 index 000000000000..32531c72aba0 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.02-r2.ebuild @@ -0,0 +1,165 @@ +# 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-r2.ebuild,v 1.1 2007/06/06 19:11:00 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 + dev-util/intltool + 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 + + # bug 180542. fix for segmentation fault with non-interactive pam. + epatch "${FILESDIR}"/${P}-pam.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 +} |