commit: b2d720ae5fc226fac1e8ce032c4126984b8c377e Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Sun Jun 13 11:42:23 2021 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Jun 13 11:42:23 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d720ae
x11-misc/xscreensaver: Drop vulnerable Bug: https://bugs.gentoo.org/794475 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-3.0.19, Repoman-3.0.3 x11-misc/xscreensaver/Manifest | 1 - .../files/xscreensaver-5.05-interix.patch | 32 ---- .../xscreensaver/files/xscreensaver-5.44-gcc.patch | 16 -- x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild | 160 -------------------- x11-misc/xscreensaver/xscreensaver-5.45.ebuild | 167 --------------------- 5 files changed, 376 deletions(-) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index f3efd33ba39..2a8cc3823af 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,2 +1 @@ -DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch deleted file mode 100644 index 2a5eead4879..00000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c ---- xscreensaver-5.05.orig/driver/prefs.c 2006-05-24 00:03:47 +0200 -+++ xscreensaver-5.05/driver/prefs.c 2008-03-11 09:20:58 +0100 -@@ -951,9 +951,12 @@ - { - p->init_file_date = write_date; - -+/* Interix has no sync() or alike. */ -+#ifndef __INTERIX - /* Since the .xscreensaver file is used for IPC, let's try and make - sure that the bits actually land on the disk right away. */ - sync (); -+#endif - - status = 0; /* wrote and renamed successfully! */ - } -diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c ---- xscreensaver-5.05.orig/driver/setuid.c 2006-02-09 03:33:29 +0100 -+++ xscreensaver-5.05/driver/setuid.c 2008-03-11 09:22:59 +0100 -@@ -136,9 +136,12 @@ - if (uid == (uid_t) -1) uid = (uid_t) -2; - - errno = 0; -+ -+#ifndef __INTERIX - if (setgroups_needed_p (gid) && - setgroups (1, &gid) < 0) - sgs_errno = errno ? errno : -1; -+#endif - - errno = 0; - if (setgid (gid) != 0) diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch deleted file mode 100644 index 16493e1fd1d..00000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -468,11 +468,11 @@ - - AC_DEFUN([AC_CHECK_GCC_ARG], - [if test -n "$GCC"; then -- AC_CACHE_CHECK([whether gcc accepts [$2]], -+ AC_CACHE_CHECK([whether [$CC] accepts [$2]], - ac_cv_gcc_accepts_[$1], - [rm -rf conftest.$ac_ext - touch conftest.$ac_ext -- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ -+ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ - grep unrecognized >/dev/null ); then - ac_cv_gcc_accepts_[$1]=no - else diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild deleted file mode 100644 index 12806ff149d..00000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic l10n multilib pam - -DESCRIPTION="modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/"; -SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) -" - -COMMON_DEPEND=" - >=gnome-base/libglade-2 - dev-libs/libxml2 - media-libs/netpbm - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - caps? ( sys-libs/libcap ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - gtk? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch - "${FILESDIR}"/${PN}-5.05-interix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch - "${FILESDIR}"/${PN}-5.44-gentoo.patch - "${FILESDIR}"/${PN}-5.44-gcc.patch -) - -src_prepare() { - sed -i configure.in -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.in} || die - fi - - default - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || break - fi - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_enable locking) \ - $(use_with caps setcap-hacks) \ - $(use_with gdk-pixbuf pixbuf) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with xinerama xinerama-ext) \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --without-motif \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild deleted file mode 100644 index 424a629aec6..00000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic l10n multilib optfeature pam - -DESCRIPTION="modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/"; -SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gdk-pixbuf? ( gtk ) -" - -COMMON_DEPEND=" - >=gnome-base/libglade-2 - dev-libs/libxml2 - media-libs/netpbm - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - caps? ( sys-libs/libcap ) - gdk-pixbuf? ( - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - ) - gtk? ( x11-libs/gtk+:2 ) - jpeg? ( virtual/jpeg:0 ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - pam? ( sys-libs/pam ) - systemd? ( >=sys-apps/systemd-221 ) - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - dev-util/intltool - sys-devel/bc - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch - "${FILESDIR}"/${PN}-5.45-interix.patch - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch - "${FILESDIR}"/${PN}-5.44-gentoo.patch - "${FILESDIR}"/${PN}-5.45-gcc.patch - "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch -) - -src_prepare() { - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - default - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || break - fi - - eapply_user - - eautoconf - eautoheader -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - export RPM_PACKAGE_VERSION=no #368025 - - econf \ - $(use_enable locking) \ - $(use_with caps setcap-hacks) \ - $(use_with gdk-pixbuf pixbuf) \ - $(use_with gtk) \ - $(use_with jpeg) \ - $(use_with new-login login-manager) \ - $(use_with opengl gl) \ - $(use_with pam) \ - $(use_with suid setuid-hacks) \ - $(use_with systemd) \ - $(use_with xinerama xinerama-ext) \ - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ - --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ - --with-dpms-ext \ - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-proc-interrupts \ - --with-randr-ext \ - --with-text-file="${EPREFIX}"/etc/gentoo-release \ - --with-xdbe-ext \ - --with-xf86gamma-ext \ - --with-xf86vmode-ext \ - --with-xinput-ext \ - --with-xshm-ext \ - --without-gle \ - --without-kerberos \ - --without-motif \ - --x-includes="${EPREFIX}"/usr/include \ - --x-libraries="${EPREFIX}"/usr/$(get_libdir) -} - -src_install() { - emake install_prefix="${D}" install - - dodoc README{,.hacking} - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml -} - -pkg_postinst() { - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi -}
