1 |
commit: b2d720ae5fc226fac1e8ce032c4126984b8c377e |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 13 11:42:23 2021 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 13 11:42:23 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d720ae |
7 |
|
8 |
x11-misc/xscreensaver: Drop vulnerable |
9 |
|
10 |
Bug: https://bugs.gentoo.org/794475 |
11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
12 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
13 |
|
14 |
x11-misc/xscreensaver/Manifest | 1 - |
15 |
.../files/xscreensaver-5.05-interix.patch | 32 ---- |
16 |
.../xscreensaver/files/xscreensaver-5.44-gcc.patch | 16 -- |
17 |
x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild | 160 -------------------- |
18 |
x11-misc/xscreensaver/xscreensaver-5.45.ebuild | 167 --------------------- |
19 |
5 files changed, 376 deletions(-) |
20 |
|
21 |
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest |
22 |
index f3efd33ba39..2a8cc3823af 100644 |
23 |
--- a/x11-misc/xscreensaver/Manifest |
24 |
+++ b/x11-misc/xscreensaver/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae |
27 |
DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14 |
28 |
|
29 |
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch |
30 |
deleted file mode 100644 |
31 |
index 2a5eead4879..00000000000 |
32 |
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch |
33 |
+++ /dev/null |
34 |
@@ -1,32 +0,0 @@ |
35 |
-diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c |
36 |
---- xscreensaver-5.05.orig/driver/prefs.c 2006-05-24 00:03:47 +0200 |
37 |
-+++ xscreensaver-5.05/driver/prefs.c 2008-03-11 09:20:58 +0100 |
38 |
-@@ -951,9 +951,12 @@ |
39 |
- { |
40 |
- p->init_file_date = write_date; |
41 |
- |
42 |
-+/* Interix has no sync() or alike. */ |
43 |
-+#ifndef __INTERIX |
44 |
- /* Since the .xscreensaver file is used for IPC, let's try and make |
45 |
- sure that the bits actually land on the disk right away. */ |
46 |
- sync (); |
47 |
-+#endif |
48 |
- |
49 |
- status = 0; /* wrote and renamed successfully! */ |
50 |
- } |
51 |
-diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c |
52 |
---- xscreensaver-5.05.orig/driver/setuid.c 2006-02-09 03:33:29 +0100 |
53 |
-+++ xscreensaver-5.05/driver/setuid.c 2008-03-11 09:22:59 +0100 |
54 |
-@@ -136,9 +136,12 @@ |
55 |
- if (uid == (uid_t) -1) uid = (uid_t) -2; |
56 |
- |
57 |
- errno = 0; |
58 |
-+ |
59 |
-+#ifndef __INTERIX |
60 |
- if (setgroups_needed_p (gid) && |
61 |
- setgroups (1, &gid) < 0) |
62 |
- sgs_errno = errno ? errno : -1; |
63 |
-+#endif |
64 |
- |
65 |
- errno = 0; |
66 |
- if (setgid (gid) != 0) |
67 |
|
68 |
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch |
69 |
deleted file mode 100644 |
70 |
index 16493e1fd1d..00000000000 |
71 |
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch |
72 |
+++ /dev/null |
73 |
@@ -1,16 +0,0 @@ |
74 |
---- a/configure.in |
75 |
-+++ b/configure.in |
76 |
-@@ -468,11 +468,11 @@ |
77 |
- |
78 |
- AC_DEFUN([AC_CHECK_GCC_ARG], |
79 |
- [if test -n "$GCC"; then |
80 |
-- AC_CACHE_CHECK([whether gcc accepts [$2]], |
81 |
-+ AC_CACHE_CHECK([whether [$CC] accepts [$2]], |
82 |
- ac_cv_gcc_accepts_[$1], |
83 |
- [rm -rf conftest.$ac_ext |
84 |
- touch conftest.$ac_ext |
85 |
-- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ |
86 |
-+ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \ |
87 |
- grep unrecognized >/dev/null ); then |
88 |
- ac_cv_gcc_accepts_[$1]=no |
89 |
- else |
90 |
|
91 |
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild |
92 |
deleted file mode 100644 |
93 |
index 12806ff149d..00000000000 |
94 |
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild |
95 |
+++ /dev/null |
96 |
@@ -1,160 +0,0 @@ |
97 |
-# Copyright 1999-2021 Gentoo Authors |
98 |
-# Distributed under the terms of the GNU General Public License v2 |
99 |
- |
100 |
-EAPI=7 |
101 |
- |
102 |
-inherit autotools flag-o-matic l10n multilib pam |
103 |
- |
104 |
-DESCRIPTION="modular screen saver and locker for the X Window System" |
105 |
-HOMEPAGE="https://www.jwz.org/xscreensaver/" |
106 |
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" |
107 |
- |
108 |
-LICENSE="BSD" |
109 |
-SLOT="0" |
110 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
111 |
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama" |
112 |
-REQUIRED_USE=" |
113 |
- gdk-pixbuf? ( gtk ) |
114 |
-" |
115 |
- |
116 |
-COMMON_DEPEND=" |
117 |
- >=gnome-base/libglade-2 |
118 |
- dev-libs/libxml2 |
119 |
- media-libs/netpbm |
120 |
- x11-apps/appres |
121 |
- x11-apps/xwininfo |
122 |
- x11-libs/libX11 |
123 |
- x11-libs/libXext |
124 |
- x11-libs/libXft |
125 |
- x11-libs/libXi |
126 |
- x11-libs/libXmu |
127 |
- x11-libs/libXrandr |
128 |
- x11-libs/libXt |
129 |
- x11-libs/libXxf86vm |
130 |
- caps? ( sys-libs/libcap ) |
131 |
- gdk-pixbuf? ( |
132 |
- x11-libs/gdk-pixbuf-xlib |
133 |
- >=x11-libs/gdk-pixbuf-2.42.0:2 |
134 |
- ) |
135 |
- gtk? ( x11-libs/gtk+:2 ) |
136 |
- jpeg? ( virtual/jpeg:0 ) |
137 |
- new-login? ( |
138 |
- gdm? ( gnome-base/gdm ) |
139 |
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) |
140 |
- ) |
141 |
- opengl? ( |
142 |
- virtual/glu |
143 |
- virtual/opengl |
144 |
- ) |
145 |
- pam? ( sys-libs/pam ) |
146 |
- xinerama? ( x11-libs/libXinerama ) |
147 |
-" |
148 |
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` |
149 |
-RDEPEND=" |
150 |
- ${COMMON_DEPEND} |
151 |
- perl? ( |
152 |
- dev-lang/perl |
153 |
- dev-perl/libwww-perl |
154 |
- virtual/perl-Digest-MD5 |
155 |
- ) |
156 |
- selinux? ( sec-policy/selinux-xscreensaver ) |
157 |
-" |
158 |
-DEPEND=" |
159 |
- ${COMMON_DEPEND} |
160 |
- dev-util/intltool |
161 |
- sys-devel/bc |
162 |
- sys-devel/gettext |
163 |
- virtual/pkgconfig |
164 |
- x11-base/xorg-proto |
165 |
-" |
166 |
-PATCHES=( |
167 |
- "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch |
168 |
- "${FILESDIR}"/${PN}-5.05-interix.patch |
169 |
- "${FILESDIR}"/${PN}-5.31-pragma.patch |
170 |
- "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch |
171 |
- "${FILESDIR}"/${PN}-5.44-gentoo.patch |
172 |
- "${FILESDIR}"/${PN}-5.44-gcc.patch |
173 |
-) |
174 |
- |
175 |
-src_prepare() { |
176 |
- sed -i configure.in -e '/^ALL_LINGUAS=/d' || die |
177 |
- strip-linguas -i po/ |
178 |
- export ALL_LINGUAS="${LINGUAS}" |
179 |
- |
180 |
- if use new-login && ! use gdm; then #392967 |
181 |
- sed -i \ |
182 |
- -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ |
183 |
- configure{,.in} || die |
184 |
- fi |
185 |
- |
186 |
- default |
187 |
- |
188 |
- if ! use offensive; then |
189 |
- sed -i \ |
190 |
- -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ |
191 |
- hacks/barcode.c || die |
192 |
- sed -i \ |
193 |
- -e 's|erect penis|shuffle board|g' \ |
194 |
- -e 's|flaccid penis|flaccid anchor|g' \ |
195 |
- -e 's|vagina|engagement ring|g' \ |
196 |
- -e 's|Penis|Shuttle|g' \ |
197 |
- hacks/glx/glsnake.c || break |
198 |
- fi |
199 |
- |
200 |
- eapply_user |
201 |
- |
202 |
- eautoconf |
203 |
- eautoheader |
204 |
-} |
205 |
- |
206 |
-src_configure() { |
207 |
- if use ppc || use ppc64; then |
208 |
- filter-flags -maltivec -mabi=altivec |
209 |
- append-flags -U__VEC__ |
210 |
- fi |
211 |
- |
212 |
- unset BC_ENV_ARGS #24568 |
213 |
- export RPM_PACKAGE_VERSION=no #368025 |
214 |
- |
215 |
- econf \ |
216 |
- $(use_enable locking) \ |
217 |
- $(use_with caps setcap-hacks) \ |
218 |
- $(use_with gdk-pixbuf pixbuf) \ |
219 |
- $(use_with gtk) \ |
220 |
- $(use_with jpeg) \ |
221 |
- $(use_with new-login login-manager) \ |
222 |
- $(use_with opengl gl) \ |
223 |
- $(use_with pam) \ |
224 |
- $(use_with suid setuid-hacks) \ |
225 |
- $(use_with xinerama xinerama-ext) \ |
226 |
- --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ |
227 |
- --with-dpms-ext \ |
228 |
- --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ |
229 |
- --with-proc-interrupts \ |
230 |
- --with-randr-ext \ |
231 |
- --with-text-file="${EPREFIX}"/etc/gentoo-release \ |
232 |
- --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ |
233 |
- --with-xdbe-ext \ |
234 |
- --with-xf86gamma-ext \ |
235 |
- --with-xf86vmode-ext \ |
236 |
- --with-xinput-ext \ |
237 |
- --with-xshm-ext \ |
238 |
- --without-gle \ |
239 |
- --without-kerberos \ |
240 |
- --without-motif \ |
241 |
- --x-includes="${EPREFIX}"/usr/include \ |
242 |
- --x-libraries="${EPREFIX}"/usr/$(get_libdir) |
243 |
-} |
244 |
- |
245 |
-src_install() { |
246 |
- emake install_prefix="${D}" install |
247 |
- |
248 |
- dodoc README{,.hacking} |
249 |
- |
250 |
- if use pam; then |
251 |
- fperms 755 /usr/bin/${PN} |
252 |
- pamd_mimic_system ${PN} auth |
253 |
- fi |
254 |
- |
255 |
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml |
256 |
-} |
257 |
|
258 |
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45.ebuild |
259 |
deleted file mode 100644 |
260 |
index 424a629aec6..00000000000 |
261 |
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild |
262 |
+++ /dev/null |
263 |
@@ -1,167 +0,0 @@ |
264 |
-# Copyright 1999-2021 Gentoo Authors |
265 |
-# Distributed under the terms of the GNU General Public License v2 |
266 |
- |
267 |
-EAPI=7 |
268 |
-inherit autotools flag-o-matic l10n multilib optfeature pam |
269 |
- |
270 |
-DESCRIPTION="modular screen saver and locker for the X Window System" |
271 |
-HOMEPAGE="https://www.jwz.org/xscreensaver/" |
272 |
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" |
273 |
- |
274 |
-LICENSE="BSD" |
275 |
-SLOT="0" |
276 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
277 |
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama" |
278 |
-REQUIRED_USE=" |
279 |
- gdk-pixbuf? ( gtk ) |
280 |
-" |
281 |
- |
282 |
-COMMON_DEPEND=" |
283 |
- >=gnome-base/libglade-2 |
284 |
- dev-libs/libxml2 |
285 |
- media-libs/netpbm |
286 |
- x11-apps/appres |
287 |
- x11-apps/xwininfo |
288 |
- x11-libs/libX11 |
289 |
- x11-libs/libXext |
290 |
- x11-libs/libXft |
291 |
- x11-libs/libXi |
292 |
- x11-libs/libXmu |
293 |
- x11-libs/libXrandr |
294 |
- x11-libs/libXt |
295 |
- x11-libs/libXxf86vm |
296 |
- caps? ( sys-libs/libcap ) |
297 |
- gdk-pixbuf? ( |
298 |
- x11-libs/gdk-pixbuf-xlib |
299 |
- >=x11-libs/gdk-pixbuf-2.42.0:2 |
300 |
- ) |
301 |
- gtk? ( x11-libs/gtk+:2 ) |
302 |
- jpeg? ( virtual/jpeg:0 ) |
303 |
- new-login? ( |
304 |
- gdm? ( gnome-base/gdm ) |
305 |
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) |
306 |
- ) |
307 |
- opengl? ( |
308 |
- virtual/glu |
309 |
- virtual/opengl |
310 |
- ) |
311 |
- pam? ( sys-libs/pam ) |
312 |
- systemd? ( >=sys-apps/systemd-221 ) |
313 |
- xinerama? ( x11-libs/libXinerama ) |
314 |
-" |
315 |
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` |
316 |
-RDEPEND=" |
317 |
- ${COMMON_DEPEND} |
318 |
- perl? ( |
319 |
- dev-lang/perl |
320 |
- dev-perl/libwww-perl |
321 |
- virtual/perl-Digest-MD5 |
322 |
- ) |
323 |
- selinux? ( sec-policy/selinux-xscreensaver ) |
324 |
-" |
325 |
-DEPEND=" |
326 |
- ${COMMON_DEPEND} |
327 |
- dev-util/intltool |
328 |
- sys-devel/bc |
329 |
- sys-devel/gettext |
330 |
- virtual/pkgconfig |
331 |
- x11-base/xorg-proto |
332 |
-" |
333 |
-PATCHES=( |
334 |
- "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch |
335 |
- "${FILESDIR}"/${PN}-5.45-interix.patch |
336 |
- "${FILESDIR}"/${PN}-5.31-pragma.patch |
337 |
- "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch |
338 |
- "${FILESDIR}"/${PN}-5.44-gentoo.patch |
339 |
- "${FILESDIR}"/${PN}-5.45-gcc.patch |
340 |
- "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch |
341 |
-) |
342 |
- |
343 |
-src_prepare() { |
344 |
- sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die |
345 |
- strip-linguas -i po/ |
346 |
- export ALL_LINGUAS="${LINGUAS}" |
347 |
- |
348 |
- if use new-login && ! use gdm; then #392967 |
349 |
- sed -i \ |
350 |
- -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ |
351 |
- configure{,.ac} || die |
352 |
- fi |
353 |
- |
354 |
- default |
355 |
- |
356 |
- if ! use offensive; then |
357 |
- sed -i \ |
358 |
- -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ |
359 |
- hacks/barcode.c || die |
360 |
- sed -i \ |
361 |
- -e 's|erect penis|shuffle board|g' \ |
362 |
- -e 's|flaccid penis|flaccid anchor|g' \ |
363 |
- -e 's|vagina|engagement ring|g' \ |
364 |
- -e 's|Penis|Shuttle|g' \ |
365 |
- hacks/glx/glsnake.c || break |
366 |
- fi |
367 |
- |
368 |
- eapply_user |
369 |
- |
370 |
- eautoconf |
371 |
- eautoheader |
372 |
-} |
373 |
- |
374 |
-src_configure() { |
375 |
- if use ppc || use ppc64; then |
376 |
- filter-flags -maltivec -mabi=altivec |
377 |
- append-flags -U__VEC__ |
378 |
- fi |
379 |
- |
380 |
- unset BC_ENV_ARGS #24568 |
381 |
- export RPM_PACKAGE_VERSION=no #368025 |
382 |
- |
383 |
- econf \ |
384 |
- $(use_enable locking) \ |
385 |
- $(use_with caps setcap-hacks) \ |
386 |
- $(use_with gdk-pixbuf pixbuf) \ |
387 |
- $(use_with gtk) \ |
388 |
- $(use_with jpeg) \ |
389 |
- $(use_with new-login login-manager) \ |
390 |
- $(use_with opengl gl) \ |
391 |
- $(use_with pam) \ |
392 |
- $(use_with suid setuid-hacks) \ |
393 |
- $(use_with systemd) \ |
394 |
- $(use_with xinerama xinerama-ext) \ |
395 |
- --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ |
396 |
- --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ |
397 |
- --with-dpms-ext \ |
398 |
- --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ |
399 |
- --with-proc-interrupts \ |
400 |
- --with-randr-ext \ |
401 |
- --with-text-file="${EPREFIX}"/etc/gentoo-release \ |
402 |
- --with-xdbe-ext \ |
403 |
- --with-xf86gamma-ext \ |
404 |
- --with-xf86vmode-ext \ |
405 |
- --with-xinput-ext \ |
406 |
- --with-xshm-ext \ |
407 |
- --without-gle \ |
408 |
- --without-kerberos \ |
409 |
- --without-motif \ |
410 |
- --x-includes="${EPREFIX}"/usr/include \ |
411 |
- --x-libraries="${EPREFIX}"/usr/$(get_libdir) |
412 |
-} |
413 |
- |
414 |
-src_install() { |
415 |
- emake install_prefix="${D}" install |
416 |
- |
417 |
- dodoc README{,.hacking} |
418 |
- |
419 |
- if use pam; then |
420 |
- fperms 755 /usr/bin/${PN} |
421 |
- pamd_mimic_system ${PN} auth |
422 |
- fi |
423 |
- |
424 |
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml |
425 |
-} |
426 |
- |
427 |
-pkg_postinst() { |
428 |
- optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi |
429 |
- optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi |
430 |
-} |