Attachment #229118 for bug #254178





LICENSE=	MIT

RUN_DEPENDS=	giftopnm:graphics/netpbm \
		p5-libwww>0:www/p5-libwww
LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libgle.so:graphics/gle \
		libharfbuzz.so:print/harfbuzz
CONFLICTS=	xscreensaver-gnome xscreensaver-gnome-hacks

USES=		autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \
		pkgconfig xorg
USE_GL=		gl glu
USE_GNOME=	cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2
USE_PERL5=	run
USE_XORG=	ice sm x11 xext xi xinerama xmu xpm xrandr xrender xt xxf86vm
USE_CSTD=	gnu99
CPE_VENDOR=	xscreensaver_project

CONFLICTS=	xscreensaver-gnome xscreensaver-gnome-hacks

GNU_CONFIGURE=	yes
CONFIGURE_ENV+=	PERL="${PERL}"
CONFIGURE_ARGS=	--enable-locking \
		--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
		--with-dpms-ext \
		--with-gl \
		--with-gle \
		--with-gtk \
		--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
		--with-jpeg=${LOCALBASE} \
		--with-pixbuf \
		--with-randr-ext \
		--with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
		--with-xdbe-ext \
		--with-xf86gamma-ext \
		--with-xf86vmode-ext \
		--with-xinerama-ext \
		--with-xpm \
		--with-xshm-ext \
		--without-kerberos \
		--without-setuid-hacks
MAKE_ARGS+=	install_prefix=${STAGEDIR}
MAKE_JOBS_UNSAFE=	yes

OPTIONS_DEFINE=		FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH XFT \
			XMOUN XPLANET XSNOW
OPTIONS_DEFAULT=	PAM XFT
OPTIONS_SUB=		yes

PAM_CONFIGURE_WITH=	pam

SETUID_HACKS_DESC=	Install sonar hack suid so it can ping

FIREF_DESC=		Add extra port x11/fireflies
FIREF_RUN_DEPENDS=	${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies

NLS_USES=		gettext-runtime
NLS_CONFIGURE_ENABLE=	nls

NSFW_DESC=		Include material that is Not Safe For Work

XAOS1_DESC=		Add extra port graphics/xaos
XAOS1_RUN_DEPENDS=	xaos:graphics/xaos

XDALI_DESC=		Add extra port x11-clocks/xdaliclock
XDALI_RUN_DEPENDS=	xdaliclock:x11-clocks/xdaliclock

XFT_CONFIGURE_WITH=	xft
XFT_USE=		XORG=xft

XEARTH_DESC=		Add extra port astro/xearth
XEARTH_RUN_DEPENDS=	xearth:astro/xearth

XMOUN_DESC=		Add extra port graphics/xmountains
XMOUN_RUN_DEPENDS=	xmountains:graphics/xmountains

XPLANET_DESC=		Add extra port astro/xplanet
XPLANET_RUN_DEPENDS=	xplanet:astro/xplanet

XSNOW_DESC=		Add extra port x11/xsnow
XSNOW_RUN_DEPENDS=	xsnow:x11/xsnow

SUB_FILES=	xscreensaver-blank.desktop xscreensaver-lock.desktop \
		xscreensaver-start.desktop xscreensaver-stop.desktop




bin/xscreensaver-hacks/gears
bin/xscreensaver-hacks/geodesic
bin/xscreensaver-hacks/geodesicgears
bin/xscreensaver-hacks/gibson
bin/xscreensaver-hacks/gflux
bin/xscreensaver-hacks/gibson
bin/xscreensaver-hacks/glblur
bin/xscreensaver-hacks/glcells
bin/xscreensaver-hacks/gleidescope

%%DATADIR%%/config/gears.xml
%%DATADIR%%/config/geodesic.xml
%%DATADIR%%/config/geodesicgears.xml
%%DATADIR%%/config/gibson.xml
%%DATADIR%%/config/gflux.xml
%%DATADIR%%/config/gibson.xml
%%DATADIR%%/config/glblur.xml
%%DATADIR%%/config/glcells.xml
%%DATADIR%%/config/gleidescope.xml
- 
--
x11/xscreensaver/Makefile                     |  8 +-
x11/xscreensaver/distinfo                     |  6 +-
.../files/extra-patch-drop-privileges         | 35 +++++++++
x11/xscreensaver/files/patch-config.h.in      | 10 +--
...{patch-configure.in => patch-configure.ac} |  6 +-
.../files/patch-driver_Makefile.in            | 26 +++----
.../files/patch-driver_XScreenSaver.ad.in     | 34 ++++-----
x11/xscreensaver/pkg-plist                    | 73 +++++++++++++------
8 files changed, 130 insertions(+), 68 deletions(-)
create mode 100644 x11/xscreensaver/files/extra-patch-drop-privileges
rename x11/xscreensaver/files/{patch-configure.in => patch-configure.ac} (77%)




# Created by: dom@myrddin.demon.co.uk

PORTNAME=	xscreensaver
PORTVERSION=	6.02
PORTREVISION=	1
CATEGORIES=	x11
MASTER_SITES=	http://www.jwz.org/xscreensaver/


GNU_CONFIGURE=	yes
CONFIGURE_ENV+=	PERL="${PERL}"
CONFIGURE_ARGS=	--enable-locking \
		--with-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
		--with-configdir=${PREFIX}/share/xscreensaver/config/ \
		--with-dpms-ext \
		--with-gl \

		--with-jpeg=${LOCALBASE} \
		--with-pixbuf \
		--with-randr-ext \
		--with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
		--with-xdbe-ext \
		--with-xf86gamma-ext \
		--with-xf86vmode-ext \

OPTIONS_SUB=		yes

PAM_CONFIGURE_WITH=	pam
PAM_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-drop-privileges

SETUID_HACKS_DESC=	Install sonar hack suid so it can ping


post-patch:
	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
			-e 's|pkg_config --list-all|pkg_config --help|' \
			${WRKSRC}/configure.ac
	${REINPLACE_CMD} -e "s|/etc/pam.d|${PREFIX}/etc/pam.d|g" \
		${WRKSRC}/driver/passwd-pam.c \
		${WRKSRC}/driver/xscreensaver.man

Lines 1-3 Link Here

(-)b/x11/xscreensaver/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1585756235	1	TIMESTAMP = 1635508283
2	SHA256 (xscreensaver-5.44.tar.gz) = 73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95	2	SHA256 (xscreensaver-6.02.tar.gz) = 5e6d6cb09033ad562cfe6d46bf9312e4451f7946bed8a4671aa9344df9193184
3	SIZE (xscreensaver-5.44.tar.gz) = 27001826	3	SIZE (xscreensaver-6.02.tar.gz) = 22672643




--- driver/Makefile.in.orig	2021-06-09 15:47:14 UTC
+++ driver/Makefile.in
@@ -106,10 +106,10 @@ DAEMON_LIBS	= $(LIBS_PRE) $(XINPUT_LIBS) -lX11 $(LIBS_
 
 GFX_DEFS	= -DLOCALEDIR=\"$(localedir)\"
 GFX_SRCS	= xscreensaver-gfx.c screens.c windows.c subprocs.c \
-		  exec.c prefsw.c dpms.c fade.c exts.c atomswm.c
+		  exec.c prefsw.c dpms.c fade.c exts.c atomswm.c setuid.c
 GFX_OBJS	= xscreensaver-gfx.o screens.o windows.o subprocs.o \
 		  exec.o prefsw.o dpms.o fade.o exts.o atomswm.o \
-		  prefs.o blurb.o atoms.o clientmsg.o xinput.o \
+		  prefs.o blurb.o atoms.o clientmsg.o xinput.o setuid.o \
 		  $(UTILS_BIN)/xmu.o \
 		  $(UTILS_BIN)/yarandom.o \
 		  $(UTILS_BIN)/resources.o \
--- driver/xscreensaver-gfx.c.orig	2021-09-21 12:25:20 UTC
+++ driver/xscreensaver-gfx.c
@@ -57,6 +57,8 @@
 #include "clientmsg.h"
 #include "xmu.h"
 
+extern void disavow_privileges (void);
+
 saver_info *global_si_kludge = 0;	/* I hate C so much... */
 
 char *progclass = 0;
@@ -559,6 +561,8 @@ main (int argc, char **argv)
           goto HELP;
         }
     }
+
+  disavow_privileges ();
 
   /* Copy the -dpy arg to $DISPLAY for subprocesses. */
   s = (char *) malloc (strlen(dpy_str) + 20);




--- config.h.in.orig	2021-05-08 15:22:06 UTC
+++ config.h.in
@@ -315,6 +315,9 @@
 /* Define to 1 if you have the <util.h> header file. */
 #undef HAVE_UTIL_H
 
+/* Define to 1 if you have the <libutil.h> header file. */
+#undef HAVE_LIBUTIL_H
+
 /* Define this if you have XF86VidModeGetViewPort, for virtual desktops. */
 #undef HAVE_XF86VMODE
 

Lines 1-6 Link Here

(-)b/x11/xscreensaver/files/patch-configure.ac (-3 / +3 lines)
1	--- configure.in.orig 2016-05-19 17:59:17 UTC	1	--- configure.ac.orig 2021-05-20 16:46:35 UTC
2	+++ configure.in	2	+++ configure.ac
3	@@ -3538,7 +3538,7 @@ fi	3	@@ -4010,7 +4010,7 @@ fi
4	###############################################################################	4	###############################################################################
5		5
6	PTY_LIBS=	6	PTY_LIBS=




--- driver/Makefile.in.orig	2021-06-09 15:47:14 UTC
+++ driver/Makefile.in
@@ -46,7 +46,7 @@ DEPEND_FLAGS	= @DEPEND_FLAGS@
 DEPEND_DEFINES	= @DEPEND_DEFINES@
 
 SHELL		= /bin/sh
 INSTALL		= @INSTALL@
-SUID_FLAGS      = -o root -m 4755
+SUID_FLAGS      = -m 755
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SETUID	= $(INSTALL_PROGRAM) $(SUID_FLAGS)
 INSTALL_DATA	= @INSTALL_DATA@
@@ -76,7 +76,7 @@ INTL_LIBS	= @INTLLIBS@
 
 
 AD_DIR		= @APPDEFAULTS@
-PAM_DIR		= /etc/pam.d
-PAM_CONF	= /etc/pam.conf
+PAM_DIR		= ${prefix}/etc/pam.d
+PAM_CONF	= ${prefix}/etc/pam.conf
 
 # $(sysconfdir) is either /usr/local/etc or /usr/etc but this must be /etc.
-PAM_ROOT	= /etc
+PAM_ROOT	= ${prefix}/etc
 PAM_DIR		= $(PAM_ROOT)/pam.d
 PAM_CONF	= $(PAM_ROOT)/pam.conf
 




--- driver/XScreenSaver.ad.in.orig	2021-06-09 15:47:14 UTC
+++ driver/XScreenSaver.ad.in
@@ -55,7 +55,7 @@
 *splashDuration:	0:00:05
 *visualID:		default
 *installColormap:	True

 *authWarningSlack:	20
 
 *textMode:		file
@@ -103,7 +103,7 @@
 
 
 ! The strftime(3) format string for printing the time on the password dialog.
-*dateFormat:		%I:%M %p, %a %b %e
+*dateFormat:		%Y-%m-%d %H:%M:%S
 ! DD MMM:
 ! *dateFormat:		%I:%M %p, %e %b (%a)
 ! 12 hour time only:
@@ -324,6 +324,18 @@ XScreenSaver.bourneShell:		/bin/sh
 !=============================================================================
 
 *programs:								      \

 				maze -root				    \n\
 @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
 				attraction -root			    \n\
@@ -602,7 +614,6 @@ XScreenSaver.bourneShell:		/bin/sh
 *hacks.dangerball.name:     Danger Ball
 *hacks.decayscreen.name:    Decay Screen
 *hacks.deepstars.name:      Deep Stars
-*hacks.dnalogo.name:        DNA Logo
 *hacks.dymaxionmap.name:    Dymaxion Map
 *hacks.energystream.name:   Energy Stream
 *hacks.etruscanvenus.name:  Etruscan Venus

Lines 1-10 Link Here

(-)b/x11/xscreensaver/pkg-plist (-23 / +51 lines)
1	@(,,4755) bin/xscreensaver	1	%%NO_PAM%%@mode 4555
		2	bin/xscreensaver
		3	%%NO_PAM%%@mode
2	bin/xscreensaver-command	4	bin/xscreensaver-command
3	bin/xscreensaver-demo	5	bin/xscreensaver-demo
4	bin/xscreensaver-getimage
5	bin/xscreensaver-getimage-file
6	bin/xscreensaver-getimage-video
7	bin/xscreensaver-gl-helper
8	bin/xscreensaver-hacks/abstractile	6	bin/xscreensaver-hacks/abstractile
9	bin/xscreensaver-hacks/anemone	7	bin/xscreensaver-hacks/anemone
10	bin/xscreensaver-hacks/anemotaxis	8	bin/xscreensaver-hacks/anemotaxis
Lines 17-22 bin/xscreensaver-hacks/atlantis Link Here
17	bin/xscreensaver-hacks/attraction	15	bin/xscreensaver-hacks/attraction
18	bin/xscreensaver-hacks/atunnel	16	bin/xscreensaver-hacks/atunnel
19	bin/xscreensaver-hacks/barcode	17	bin/xscreensaver-hacks/barcode
		18	bin/xscreensaver-hacks/beats
		19	bin/xscreensaver-hacks/binaryhorizon
20	bin/xscreensaver-hacks/binaryring	20	bin/xscreensaver-hacks/binaryring
21	bin/xscreensaver-hacks/blaster	21	bin/xscreensaver-hacks/blaster
22	bin/xscreensaver-hacks/blinkbox	22	bin/xscreensaver-hacks/blinkbox
Lines 41-46 bin/xscreensaver-hacks/cloudlife Link Here
41	bin/xscreensaver-hacks/companioncube	41	bin/xscreensaver-hacks/companioncube
42	bin/xscreensaver-hacks/compass	42	bin/xscreensaver-hacks/compass
43	bin/xscreensaver-hacks/coral	43	bin/xscreensaver-hacks/coral
		44	bin/xscreensaver-hacks/covid19
44	bin/xscreensaver-hacks/crackberg	45	bin/xscreensaver-hacks/crackberg
45	bin/xscreensaver-hacks/crumbler	46	bin/xscreensaver-hacks/crumbler
46	bin/xscreensaver-hacks/crystal	47	bin/xscreensaver-hacks/crystal
Lines 111-116 bin/xscreensaver-hacks/greynetic Link Here
111	bin/xscreensaver-hacks/halftone	112	bin/xscreensaver-hacks/halftone
112	bin/xscreensaver-hacks/halo	113	bin/xscreensaver-hacks/halo
113	bin/xscreensaver-hacks/handsy	114	bin/xscreensaver-hacks/handsy
		115	bin/xscreensaver-hacks/headroom
114	bin/xscreensaver-hacks/helix	116	bin/xscreensaver-hacks/helix
115	bin/xscreensaver-hacks/hexadrop	117	bin/xscreensaver-hacks/hexadrop
116	bin/xscreensaver-hacks/hexstrut	118	bin/xscreensaver-hacks/hexstrut
Lines 135-144 bin/xscreensaver-hacks/kumppa Link Here
135	bin/xscreensaver-hacks/lament	137	bin/xscreensaver-hacks/lament
136	bin/xscreensaver-hacks/lavalite	138	bin/xscreensaver-hacks/lavalite
137	bin/xscreensaver-hacks/lcdscrub	139	bin/xscreensaver-hacks/lcdscrub
138	bin/xscreensaver-hacks/ljlatest
139	bin/xscreensaver-hacks/lockward	140	bin/xscreensaver-hacks/lockward
140	bin/xscreensaver-hacks/loop	141	bin/xscreensaver-hacks/loop
141	bin/xscreensaver-hacks/m6502	142	bin/xscreensaver-hacks/m6502
		143	bin/xscreensaver-hacks/marbling
142	bin/xscreensaver-hacks/maze	144	bin/xscreensaver-hacks/maze
143	bin/xscreensaver-hacks/maze3d	145	bin/xscreensaver-hacks/maze3d
144	bin/xscreensaver-hacks/memscroller	146	bin/xscreensaver-hacks/memscroller
Lines 197-206 bin/xscreensaver-hacks/sierpinski3d Link Here
197	bin/xscreensaver-hacks/skytentacles	199	bin/xscreensaver-hacks/skytentacles
198	bin/xscreensaver-hacks/slidescreen	200	bin/xscreensaver-hacks/slidescreen
199	bin/xscreensaver-hacks/slip	201	bin/xscreensaver-hacks/slip
200	%%SETUID_HACKS%%@mode 4755	202	bin/xscreensaver-hacks/xscreensaver-auth
		203	bin/xscreensaver-hacks/xscreensaver-getimage
		204	bin/xscreensaver-hacks/xscreensaver-getimage-file
		205	bin/xscreensaver-hacks/xscreensaver-getimage-video
		206	bin/xscreensaver-hacks/xscreensaver-gfx
		207	bin/xscreensaver-hacks/xscreensaver-gl-visual
		208	bin/xscreensaver-hacks/xscreensaver-text
		209	%%SETUID_HACKS%%@mode 4555
201	bin/xscreensaver-hacks/sonar	210	bin/xscreensaver-hacks/sonar
202	%%SETUID_HACKS%%@mode	211	%%SETUID_HACKS%%@mode
203	bin/xscreensaver-hacks/speedmine	212	bin/xscreensaver-hacks/speedmine
		213	bin/xscreensaver-hacks/sphereeversion
204	bin/xscreensaver-hacks/spheremonics	214	bin/xscreensaver-hacks/spheremonics
205	bin/xscreensaver-hacks/splitflap	215	bin/xscreensaver-hacks/splitflap
206	bin/xscreensaver-hacks/splodesic	216	bin/xscreensaver-hacks/splodesic
Lines 246-261 bin/xscreensaver-hacks/xmatrix Link Here
246	bin/xscreensaver-hacks/xrayswarm	256	bin/xscreensaver-hacks/xrayswarm
247	bin/xscreensaver-hacks/xspirograph	257	bin/xscreensaver-hacks/xspirograph
248	bin/xscreensaver-hacks/zoom	258	bin/xscreensaver-hacks/zoom
249	bin/xscreensaver-text	259	bin/xscreensaver-settings
250	%%PAM%%etc/pam.d/xscreensaver	260	%%PAM%%etc/pam.d/xscreensaver
251	lib/X11/app-defaults/XScreenSaver	261	lib/X11/app-defaults/XScreenSaver
252	man/man1/xscreensaver-command.1.gz	262	man/man1/xscreensaver-command.1.gz
253	man/man1/xscreensaver-demo.1.gz	263	man/man1/xscreensaver-demo.1.gz
254	man/man1/xscreensaver-getimage-file.1.gz
255	man/man1/xscreensaver-getimage-video.1.gz
256	man/man1/xscreensaver-getimage.1.gz
257	man/man1/xscreensaver-systemd.1.gz
258	man/man1/xscreensaver-text.1.gz
259	man/man1/xscreensaver.1.gz	264	man/man1/xscreensaver.1.gz
260	man/man6/abstractile.6.gz	265	man/man6/abstractile.6.gz
261	man/man6/anemone.6.gz	266	man/man6/anemone.6.gz
Lines 265-274 man/man6/antmaze.6.gz Link Here
265	man/man6/antspotlight.6.gz	270	man/man6/antspotlight.6.gz
266	man/man6/apollonian.6.gz	271	man/man6/apollonian.6.gz
267	man/man6/apple2.6.gz	272	man/man6/apple2.6.gz
		273	man/man1/xscreensaver-settings.1.gz
		274	man/man6/xscreensaver-auth.6.gz
		275	man/man6/xscreensaver-getimage-file.6.gz
		276	man/man6/xscreensaver-getimage-video.6.gz
		277	man/man6/xscreensaver-getimage.6.gz
		278	man/man6/xscreensaver-gfx.6.gz
		279	man/man6/xscreensaver-gl-visual.6.gz
		280	man/man6/xscreensaver-systemd.6.gz
		281	man/man6/xscreensaver-text.6.gz
268	man/man6/atlantis.6.gz	282	man/man6/atlantis.6.gz
269	man/man6/attraction.6.gz	283	man/man6/attraction.6.gz
270	man/man6/atunnel.6.gz	284	man/man6/atunnel.6.gz
271	man/man6/barcode.6.gz	285	man/man6/barcode.6.gz
		286	man/man6/beats.6.gz
		287	man/man6/binaryhorizon.6.gz
272	man/man6/binaryring.6.gz	288	man/man6/binaryring.6.gz
273	man/man6/blaster.6.gz	289	man/man6/blaster.6.gz
274	man/man6/blinkbox.6.gz	290	man/man6/blinkbox.6.gz
Lines 293-298 man/man6/cloudlife.6.gz Link Here
293	man/man6/companioncube.6.gz	309	man/man6/companioncube.6.gz
294	man/man6/compass.6.gz	310	man/man6/compass.6.gz
295	man/man6/coral.6.gz	311	man/man6/coral.6.gz
		312	man/man6/covid19.6.gz
296	man/man6/crackberg.6.gz	313	man/man6/crackberg.6.gz
297	man/man6/crumbler.6.gz	314	man/man6/crumbler.6.gz
298	man/man6/crystal.6.gz	315	man/man6/crystal.6.gz
Lines 363-368 man/man6/greynetic.6.gz Link Here
363	man/man6/halftone.6.gz	380	man/man6/halftone.6.gz
364	man/man6/halo.6.gz	381	man/man6/halo.6.gz
365	man/man6/handsy.6.gz	382	man/man6/handsy.6.gz
		383	man/man6/headroom.6.gz
366	man/man6/helix.6.gz	384	man/man6/helix.6.gz
367	man/man6/hexadrop.6.gz	385	man/man6/hexadrop.6.gz
368	man/man6/hexstrut.6.gz	386	man/man6/hexstrut.6.gz
Lines 387-395 man/man6/kumppa.6.gz Link Here
387	man/man6/lament.6.gz	405	man/man6/lament.6.gz
388	man/man6/lavalite.6.gz	406	man/man6/lavalite.6.gz
389	man/man6/lcdscrub.6.gz	407	man/man6/lcdscrub.6.gz
390	man/man6/ljlatest.6.gz
391	man/man6/lockward.6.gz	408	man/man6/lockward.6.gz
392	man/man6/loop.6.gz	409	man/man6/loop.6.gz
		410	man/man6/marbling.6.gz
393	man/man6/maze.6.gz	411	man/man6/maze.6.gz
394	man/man6/maze3d.6.gz	412	man/man6/maze3d.6.gz
395	man/man6/memscroller.6.gz	413	man/man6/memscroller.6.gz
Lines 449-454 man/man6/slidescreen.6.gz Link Here
449	man/man6/slip.6.gz	467	man/man6/slip.6.gz
450	man/man6/sonar.6.gz	468	man/man6/sonar.6.gz
451	man/man6/speedmine.6.gz	469	man/man6/speedmine.6.gz
		470	man/man6/sphereeversion.6.gz
452	man/man6/spheremonics.6.gz	471	man/man6/spheremonics.6.gz
453	man/man6/splitflap.6.gz	472	man/man6/splitflap.6.gz
454	man/man6/splodesic.6.gz	473	man/man6/splodesic.6.gz
Lines 491-497 man/man6/xjack.6.gz Link Here
491	man/man6/xlyap.6.gz	510	man/man6/xlyap.6.gz
492	man/man6/xmatrix.6.gz	511	man/man6/xmatrix.6.gz
493	man/man6/xrayswarm.6.gz	512	man/man6/xrayswarm.6.gz
494	man/man6/xscreensaver-gl-helper.6.gz
495	man/man6/xspirograph.6.gz	513	man/man6/xspirograph.6.gz
496	man/man6/zoom.6.gz	514	man/man6/zoom.6.gz
497	share/applications/xscreensaver-blank.desktop	515	share/applications/xscreensaver-blank.desktop
Lines 499-504 share/applications/xscreensaver-lock.desktop Link Here
499	share/applications/xscreensaver-properties.desktop	517	share/applications/xscreensaver-properties.desktop
500	share/applications/xscreensaver-start.desktop	518	share/applications/xscreensaver-start.desktop
501	share/applications/xscreensaver-stop.desktop	519	share/applications/xscreensaver-stop.desktop
		520	share/fonts/xscreensaver/OCRAStd.otf
		521	share/fonts/xscreensaver/SpecialElite.ttf
		522	share/fonts/xscreensaver/clacon.ttf
		523	share/fonts/xscreensaver/gallant12x22.ttf
		524	share/fonts/xscreensaver/luximr.ttf
502	%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo	525	%%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo
503	%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo	526	%%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo
504	%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo	527	%%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo
Lines 523-528 share/applications/xscreensaver-stop.desktop Link Here
523	%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo	546	%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
524	share/pixmaps/xscreensaver.xpm	547	share/pixmaps/xscreensaver.xpm
525	%%DATADIR%%/config/README	548	%%DATADIR%%/config/README
		549	%%DATADIR%%/ui/xscreensaver.ui
526	%%DATADIR%%/config/abstractile.xml	550	%%DATADIR%%/config/abstractile.xml
527	%%DATADIR%%/config/anemone.xml	551	%%DATADIR%%/config/anemone.xml
528	%%DATADIR%%/config/anemotaxis.xml	552	%%DATADIR%%/config/anemotaxis.xml
Lines 535-540 share/pixmaps/xscreensaver.xpm Link Here
535	%%DATADIR%%/config/attraction.xml	559	%%DATADIR%%/config/attraction.xml
536	%%DATADIR%%/config/atunnel.xml	560	%%DATADIR%%/config/atunnel.xml
537	%%DATADIR%%/config/barcode.xml	561	%%DATADIR%%/config/barcode.xml
		562	%%DATADIR%%/config/beats.xml
		563	%%DATADIR%%/config/binaryhorizon.xml
538	%%DATADIR%%/config/binaryring.xml	564	%%DATADIR%%/config/binaryring.xml
539	%%DATADIR%%/config/blaster.xml	565	%%DATADIR%%/config/blaster.xml
540	%%DATADIR%%/config/blinkbox.xml	566	%%DATADIR%%/config/blinkbox.xml
Lines 559-564 share/pixmaps/xscreensaver.xpm Link Here
559	%%DATADIR%%/config/companioncube.xml	585	%%DATADIR%%/config/companioncube.xml
560	%%DATADIR%%/config/compass.xml	586	%%DATADIR%%/config/compass.xml
561	%%DATADIR%%/config/coral.xml	587	%%DATADIR%%/config/coral.xml
		588	%%DATADIR%%/config/covid19.xml
562	%%DATADIR%%/config/crackberg.xml	589	%%DATADIR%%/config/crackberg.xml
563	%%DATADIR%%/config/crumbler.xml	590	%%DATADIR%%/config/crumbler.xml
564	%%DATADIR%%/config/crystal.xml	591	%%DATADIR%%/config/crystal.xml
Lines 629-634 share/pixmaps/xscreensaver.xpm Link Here
629	%%DATADIR%%/config/halftone.xml	656	%%DATADIR%%/config/halftone.xml
630	%%DATADIR%%/config/halo.xml	657	%%DATADIR%%/config/halo.xml
631	%%DATADIR%%/config/handsy.xml	658	%%DATADIR%%/config/handsy.xml
		659	%%DATADIR%%/config/headroom.xml
632	%%DATADIR%%/config/helix.xml	660	%%DATADIR%%/config/helix.xml
633	%%DATADIR%%/config/hexadrop.xml	661	%%DATADIR%%/config/hexadrop.xml
634	%%DATADIR%%/config/hexstrut.xml	662	%%DATADIR%%/config/hexstrut.xml
Lines 656-661 share/pixmaps/xscreensaver.xpm Link Here
656	%%DATADIR%%/config/lockward.xml	684	%%DATADIR%%/config/lockward.xml
657	%%DATADIR%%/config/loop.xml	685	%%DATADIR%%/config/loop.xml
658	%%DATADIR%%/config/m6502.xml	686	%%DATADIR%%/config/m6502.xml
		687	%%DATADIR%%/config/marbling.xml
659	%%DATADIR%%/config/maze.xml	688	%%DATADIR%%/config/maze.xml
660	%%DATADIR%%/config/maze3d.xml	689	%%DATADIR%%/config/maze3d.xml
661	%%DATADIR%%/config/memscroller.xml	690	%%DATADIR%%/config/memscroller.xml
Lines 716-721 share/pixmaps/xscreensaver.xpm Link Here
716	%%DATADIR%%/config/slip.xml	745	%%DATADIR%%/config/slip.xml
717	%%DATADIR%%/config/sonar.xml	746	%%DATADIR%%/config/sonar.xml
718	%%DATADIR%%/config/speedmine.xml	747	%%DATADIR%%/config/speedmine.xml
		748	%%DATADIR%%/config/sphereeversion.xml
719	%%DATADIR%%/config/spheremonics.xml	749	%%DATADIR%%/config/spheremonics.xml
720	%%DATADIR%%/config/splitflap.xml	750	%%DATADIR%%/config/splitflap.xml
721	%%DATADIR%%/config/splodesic.xml	751	%%DATADIR%%/config/splodesic.xml
Lines 766-775 share/pixmaps/xscreensaver.xpm Link Here
766	%%DATADIR%%/config/xsnow.xml	796	%%DATADIR%%/config/xsnow.xml
767	%%DATADIR%%/config/xspirograph.xml	797	%%DATADIR%%/config/xspirograph.xml
768	%%DATADIR%%/config/zoom.xml	798	%%DATADIR%%/config/zoom.xml
769	%%DATADIR%%/glade/screensaver-cmndln.png	799	%%DATADIR%%/ui/screensaver-cmndln.png
770	%%DATADIR%%/glade/screensaver-colorselector.png	800	%%DATADIR%%/ui/screensaver-colorselector.png
771	%%DATADIR%%/glade/screensaver-diagnostic.png	801	%%DATADIR%%/ui/screensaver-diagnostic.png
772	%%DATADIR%%/glade/screensaver-locking.png	802	%%DATADIR%%/ui/screensaver-locking.png
773	%%DATADIR%%/glade/screensaver-power.png	803	%%DATADIR%%/ui/screensaver-power.png
774	%%DATADIR%%/glade/screensaver-snap.png	804	%%DATADIR%%/ui/screensaver-snap.png
775	%%DATADIR%%/glade/xscreensaver-demo.glade2
776	-

Return to bug 254178

Lines 11-83 COMMENT= Save your screen while you entertain your cat Link Here

(-)b/x11/xscreensaver/Makefile (-40 / +52 lines)
11		11
12	LICENSE= MIT	12	LICENSE= MIT
13		13
14	RUN_DEPENDS= p5-libwww>0:www/p5-libwww \	14	RUN_DEPENDS= giftopnm:graphics/netpbm \
15	giftopnm:graphics/netpbm	15	p5-libwww>0:www/p5-libwww
16	LIB_DEPENDS= libgle.so:graphics/gle \	16	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
17	libfontconfig.so:x11-fonts/fontconfig \	17	libfreetype.so:print/freetype2 \
18	libfreetype.so:print/freetype2	18	libgle.so:graphics/gle \
19		19	libharfbuzz.so:print/harfbuzz
20	CONFLICTS= xscreensaver-gnome xscreensaver-gnome-hacks
21		20
22	USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \	21	USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \
23	pkgconfig xorg	22	pkgconfig xorg
24	USE_GL= gl glu	23	USE_GL= gl glu
25	USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2	24	USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2
26	USE_PERL5= run	25	USE_PERL5= run
27	USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xpm xt xxf86vm	26	USE_XORG= ice sm x11 xext xi xinerama xmu xpm xrandr xrender xt xxf86vm
28	USE_CSTD= gnu99	27	USE_CSTD= gnu99
29	CPE_VENDOR= xscreensaver_project	28	CPE_VENDOR= xscreensaver_project
30		29
		30	CONFLICTS= xscreensaver-gnome xscreensaver-gnome-hacks
		31
31	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
32	CONFIGURE_ENV+= PERL="${PERL}"	33	CONFIGURE_ENV+= PERL="${PERL}"
33	CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \	34	CONFIGURE_ARGS= --enable-locking \
34	--with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \
35	--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
36	--with-configdir=${PREFIX}/share/xscreensaver/config/ \	35	--with-configdir=${PREFIX}/share/xscreensaver/config/ \
		36	--with-dpms-ext \
		37	--with-gl \
		38	--with-gle \
		39	--with-gtk \
		40	--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
		41	--with-jpeg=${LOCALBASE} \
		42	--with-pixbuf \
		43	--with-randr-ext \
37	--with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \	44	--with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
38	--with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \	45	--with-xdbe-ext \
39	--with-xf86gamma-ext --with-randr-ext --without-kerberos \	46	--with-xf86gamma-ext \
40	--without-setuid-hacks --enable-locking	47	--with-xf86vmode-ext \
		48	--with-xinerama-ext \
		49	--with-xpm \
		50	--with-xshm-ext \
		51	--without-kerberos \
		52	--without-setuid-hacks
41	MAKE_ARGS+= install_prefix=${STAGEDIR}	53	MAKE_ARGS+= install_prefix=${STAGEDIR}
42	MAKE_JOBS_UNSAFE=yes	54	MAKE_JOBS_UNSAFE= yes
43		55
44	OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS NSFW XAOS1 XDALI XEARTH \	56	OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH XFT \
45	XFT XMOUN XPLANET XSNOW	57	XMOUN XPLANET XSNOW
46	OPTIONS_DEFAULT=PAM XFT	58	OPTIONS_DEFAULT= PAM XFT
47	OPTIONS_SUB= yes	59	OPTIONS_SUB= yes
48		60
49	PAM_CONFIGURE_WITH= pam	61	PAM_CONFIGURE_WITH= pam
50		62
51	SETUID_HACKS_DESC= Install sonar hack suid so it can ping	63	SETUID_HACKS_DESC= Install sonar hack suid so it can ping
52		64
53	FIREF_DESC= Add extra port x11/fireflies	65	FIREF_DESC= Add extra port x11/fireflies
54	FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies	66	FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies
55		67
56	NLS_USES= gettext-runtime	68	NLS_USES= gettext-runtime
57	NLS_CONFIGURE_ENABLE= nls	69	NLS_CONFIGURE_ENABLE= nls
58		70
59	NSFW_DESC= Include material that is Not Safe For Work	71	NSFW_DESC= Include material that is Not Safe For Work
60		72
61	XAOS1_DESC= Add extra port graphics/xaos	73	XAOS1_DESC= Add extra port graphics/xaos
62	XAOS1_RUN_DEPENDS= xaos:graphics/xaos	74	XAOS1_RUN_DEPENDS= xaos:graphics/xaos
63		75
64	XDALI_DESC= Add extra port x11-clocks/xdaliclock	76	XDALI_DESC= Add extra port x11-clocks/xdaliclock
65	XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock	77	XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock
66		78
67	XFT_CONFIGURE_WITH= xft	79	XFT_CONFIGURE_WITH= xft
68	XFT_USE= XORG=xft	80	XFT_USE= XORG=xft
69		81
70	XEARTH_DESC= Add extra port astro/xearth	82	XEARTH_DESC= Add extra port astro/xearth
71	XEARTH_RUN_DEPENDS= xearth:astro/xearth	83	XEARTH_RUN_DEPENDS= xearth:astro/xearth
72		84
73	XMOUN_DESC= Add extra port graphics/xmountains	85	XMOUN_DESC= Add extra port graphics/xmountains
74	XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains	86	XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains
75		87
76	XPLANET_DESC= Add extra port astro/xplanet	88	XPLANET_DESC= Add extra port astro/xplanet
77	XPLANET_RUN_DEPENDS= xplanet:astro/xplanet	89	XPLANET_RUN_DEPENDS= xplanet:astro/xplanet
78		90
79	XSNOW_DESC= Add extra port x11/xsnow	91	XSNOW_DESC= Add extra port x11/xsnow
80	XSNOW_RUN_DEPENDS= xsnow:x11/xsnow	92	XSNOW_RUN_DEPENDS= xsnow:x11/xsnow
81		93
82	SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \	94	SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \
83	xscreensaver-start.desktop xscreensaver-stop.desktop	95	xscreensaver-start.desktop xscreensaver-stop.desktop

Lines 90-97 bin/xscreensaver-hacks/galaxy Link Here

(-)b/x11/xscreensaver/pkg-plist (-4 / +2 lines)
90	bin/xscreensaver-hacks/gears	90	bin/xscreensaver-hacks/gears
91	bin/xscreensaver-hacks/geodesic	91	bin/xscreensaver-hacks/geodesic
92	bin/xscreensaver-hacks/geodesicgears	92	bin/xscreensaver-hacks/geodesicgears
93	bin/xscreensaver-hacks/gibson
94	bin/xscreensaver-hacks/gflux	93	bin/xscreensaver-hacks/gflux
		94	bin/xscreensaver-hacks/gibson
95	bin/xscreensaver-hacks/glblur	95	bin/xscreensaver-hacks/glblur
96	bin/xscreensaver-hacks/glcells	96	bin/xscreensaver-hacks/glcells
97	bin/xscreensaver-hacks/gleidescope	97	bin/xscreensaver-hacks/gleidescope
Lines 608-615 share/pixmaps/xscreensaver.xpm Link Here
608	%%DATADIR%%/config/gears.xml	608	%%DATADIR%%/config/gears.xml
609	%%DATADIR%%/config/geodesic.xml	609	%%DATADIR%%/config/geodesic.xml
610	%%DATADIR%%/config/geodesicgears.xml	610	%%DATADIR%%/config/geodesicgears.xml
611	%%DATADIR%%/config/gibson.xml
612	%%DATADIR%%/config/gflux.xml	611	%%DATADIR%%/config/gflux.xml
		612	%%DATADIR%%/config/gibson.xml
613	%%DATADIR%%/config/glblur.xml	613	%%DATADIR%%/config/glblur.xml
614	%%DATADIR%%/config/glcells.xml	614	%%DATADIR%%/config/glcells.xml
615	%%DATADIR%%/config/gleidescope.xml	615	%%DATADIR%%/config/gleidescope.xml
616	-
617	--
618	x11/xscreensaver/Makefile \| 8 +-	616	x11/xscreensaver/Makefile \| 8 +-
619	x11/xscreensaver/distinfo \| 6 +-	617	x11/xscreensaver/distinfo \| 6 +-
620	.../files/extra-patch-drop-privileges \| 35 +++++++++	618	.../files/extra-patch-drop-privileges \| 35 +++++++++
621	x11/xscreensaver/files/patch-config.h.in \| 10 +--	619	x11/xscreensaver/files/patch-config.h.in \| 10 +--
622	...{patch-configure.in => patch-configure.ac} \| 6 +-	620	...{patch-configure.in => patch-configure.ac} \| 6 +-
623	.../files/patch-driver_Makefile.in \| 26 +++----	621	.../files/patch-driver_Makefile.in \| 26 +++----
624	.../files/patch-driver_XScreenSaver.ad.in \| 34 ++++-----	622	.../files/patch-driver_XScreenSaver.ad.in \| 34 ++++-----
625	x11/xscreensaver/pkg-plist \| 73 +++++++++++++------	623	x11/xscreensaver/pkg-plist \| 73 +++++++++++++------
626	8 files changed, 130 insertions(+), 68 deletions(-)	624	8 files changed, 130 insertions(+), 68 deletions(-)
627	create mode 100644 x11/xscreensaver/files/extra-patch-drop-privileges	625	create mode 100644 x11/xscreensaver/files/extra-patch-drop-privileges
628	rename x11/xscreensaver/files/{patch-configure.in => patch-configure.ac} (77%)	626	rename x11/xscreensaver/files/{patch-configure.in => patch-configure.ac} (77%)

Lines 1-8 Link Here

(-)b/x11/xscreensaver/Makefile (-4 / +4 lines)
1	# Created by: dom@myrddin.demon.co.uk	1	# Created by: dom@myrddin.demon.co.uk
2		2
3	PORTNAME= xscreensaver	3	PORTNAME= xscreensaver
4	PORTVERSION= 5.44	4	PORTVERSION= 6.02
5	PORTREVISION= 1
6	CATEGORIES= x11	5	CATEGORIES= x11
7	MASTER_SITES= http://www.jwz.org/xscreensaver/	6	MASTER_SITES= http://www.jwz.org/xscreensaver/
8		7
Lines 32-37 CONFLICTS= xscreensaver-gnome xscreensaver-gnome-hacks Link Here
32	GNU_CONFIGURE= yes	31	GNU_CONFIGURE= yes
33	CONFIGURE_ENV+= PERL="${PERL}"	32	CONFIGURE_ENV+= PERL="${PERL}"
34	CONFIGURE_ARGS= --enable-locking \	33	CONFIGURE_ARGS= --enable-locking \
		34	--with-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
35	--with-configdir=${PREFIX}/share/xscreensaver/config/ \	35	--with-configdir=${PREFIX}/share/xscreensaver/config/ \
36	--with-dpms-ext \	36	--with-dpms-ext \
37	--with-gl \	37	--with-gl \
Lines 41-47 CONFIGURE_ARGS= --enable-locking \ Link Here
41	--with-jpeg=${LOCALBASE} \	41	--with-jpeg=${LOCALBASE} \
42	--with-pixbuf \	42	--with-pixbuf \
43	--with-randr-ext \	43	--with-randr-ext \
44	--with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \
45	--with-xdbe-ext \	44	--with-xdbe-ext \
46	--with-xf86gamma-ext \	45	--with-xf86gamma-ext \
47	--with-xf86vmode-ext \	46	--with-xf86vmode-ext \
Lines 59-64 OPTIONS_DEFAULT= PAM XFT Link Here
59	OPTIONS_SUB= yes	58	OPTIONS_SUB= yes
60		59
61	PAM_CONFIGURE_WITH= pam	60	PAM_CONFIGURE_WITH= pam
		61	PAM_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-drop-privileges
62		62
63	SETUID_HACKS_DESC= Install sonar hack suid so it can ping	63	SETUID_HACKS_DESC= Install sonar hack suid so it can ping
64		64
Lines 97-103 SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ Link Here
97	post-patch:	97	post-patch:
98	${REINPLACE_CMD} -e 's\|/usr/X11R6\|${LOCALBASE}\|g' \	98	${REINPLACE_CMD} -e 's\|/usr/X11R6\|${LOCALBASE}\|g' \
99	-e 's\|pkg_config --list-all\|pkg_config --help\|' \	99	-e 's\|pkg_config --list-all\|pkg_config --help\|' \
100	${WRKSRC}/configure.in	100	${WRKSRC}/configure.ac
101	${REINPLACE_CMD} -e "s\|/etc/pam.d\|${PREFIX}/etc/pam.d\|g" \	101	${REINPLACE_CMD} -e "s\|/etc/pam.d\|${PREFIX}/etc/pam.d\|g" \
102	${WRKSRC}/driver/passwd-pam.c \	102	${WRKSRC}/driver/passwd-pam.c \
103	${WRKSRC}/driver/xscreensaver.man	103	${WRKSRC}/driver/xscreensaver.man

Added Link Here

(-)b/x11/xscreensaver/files/extra-patch-drop-privileges (+35 lines)
1	--- driver/Makefile.in.orig 2021-06-09 15:47:14 UTC
2	+++ driver/Makefile.in
3	@@ -106,10 +106,10 @@ DAEMON_LIBS = $(LIBS_PRE) $(XINPUT_LIBS) -lX11 $(LIBS_
4
5	GFX_DEFS = -DLOCALEDIR=\"$(localedir)\"
6	GFX_SRCS = xscreensaver-gfx.c screens.c windows.c subprocs.c \
7	- exec.c prefsw.c dpms.c fade.c exts.c atomswm.c
8	+ exec.c prefsw.c dpms.c fade.c exts.c atomswm.c setuid.c
9	GFX_OBJS = xscreensaver-gfx.o screens.o windows.o subprocs.o \
10	exec.o prefsw.o dpms.o fade.o exts.o atomswm.o \
11	- prefs.o blurb.o atoms.o clientmsg.o xinput.o \
12	+ prefs.o blurb.o atoms.o clientmsg.o xinput.o setuid.o \
13	$(UTILS_BIN)/xmu.o \
14	$(UTILS_BIN)/yarandom.o \
15	$(UTILS_BIN)/resources.o \
16	--- driver/xscreensaver-gfx.c.orig 2021-09-21 12:25:20 UTC
17	+++ driver/xscreensaver-gfx.c
18	@@ -57,6 +57,8 @@
19	#include "clientmsg.h"
20	#include "xmu.h"
21
22	+extern void disavow_privileges (void);
23	+
24	saver_info global_si_kludge = 0; / I hate C so much... */
25
26	char *progclass = 0;
27	@@ -559,6 +561,8 @@ main (int argc, char **argv)
28	goto HELP;
29	}
30	}
31	+
32	+ disavow_privileges ();
33
34	/* Copy the -dpy arg to $DISPLAY for subprocesses. */
35	s = (char *) malloc (strlen(dpy_str) + 20);

Lines 1-12 Link Here

(-)b/x11/xscreensaver/files/patch-config.h.in (-5 / +5 lines)
1	--- config.h.in.orig 2016-04-03 20:07:59 UTC	1	--- config.h.in.orig 2021-05-08 15:22:06 UTC
2	+++ config.h.in	2	+++ config.h.in
3	@@ -307,6 +307,9 @@	3	@@ -315,6 +315,9 @@
4	/* Define to 1 if you have the <util.h> header file. */	4	/* Define to 1 if you have the <util.h> header file. */
5	#undef HAVE_UTIL_H	5	#undef HAVE_UTIL_H
6		6
7	+/* Define to 1 if you have the <libutil.h> header file. */	7	+/* Define to 1 if you have the <libutil.h> header file. */
8	+#undef HAVE_LIBUTIL_H	8	+#undef HAVE_LIBUTIL_H
9	+	9	+
10	/* Define this if you have the XF86MiscSetGrabKeysState function (which allows	10	/* Define this if you have XF86VidModeGetViewPort, for virtual desktops. */
11	the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key sequences to be temporarily	11	#undef HAVE_XF86VMODE
12	disabled. Sadly, it doesn't affect Ctrl-Alt-BS or Ctrl-Alt-F1.) */	12

Lines 1-22 Link Here

(-)b/x11/xscreensaver/files/patch-driver_Makefile.in (-14 / +12 lines)
1	--- driver/Makefile.in.orig 2016-05-24 18:02:30 UTC	1	--- driver/Makefile.in.orig 2021-06-09 15:47:14 UTC
2	+++ driver/Makefile.in	2	+++ driver/Makefile.in
3	@@ -51,7 +51,7 @@ DEPEND_DEFINES = @DEPEND_DEFINES@	3	@@ -46,7 +46,7 @@ DEPEND_FLAGS = @DEPEND_FLAGS@
		4	DEPEND_DEFINES = @DEPEND_DEFINES@
4		5
5	SHELL = /bin/sh
6	INSTALL = @INSTALL@	6	INSTALL = @INSTALL@
7	-SUID_FLAGS = -o root -m 4755	7	-SUID_FLAGS = -o root -m 4755
8	+SUID_FLAGS = -m 755	8	+SUID_FLAGS = -m 755
9	INSTALL_PROGRAM = @INSTALL_PROGRAM@	9	INSTALL_PROGRAM = @INSTALL_PROGRAM@
10	INSTALL_SCRIPT = @INSTALL_SCRIPT@	10	INSTALL_SETUID = $(INSTALL_PROGRAM) $(SUID_FLAGS)
11	INSTALL_SETUID = @INSTALL_SETUID@	11	INSTALL_DATA = @INSTALL_DATA@
12	@@ -81,8 +81,8 @@ XPM_LIBS = @XPM_LIBS@	12	@@ -76,7 +76,7 @@ INTL_LIBS = @INTLLIBS@
13
14
15	AD_DIR = @APPDEFAULTS@	13	AD_DIR = @APPDEFAULTS@
16	-PAM_DIR = /etc/pam.d
17	-PAM_CONF = /etc/pam.conf
18	+PAM_DIR = ${prefix}/etc/pam.d
19	+PAM_CONF = ${prefix}/etc/pam.conf
20		14
21	UTILS_SRC = $(srcdir)/../utils	15	# $(sysconfdir) is either /usr/local/etc or /usr/etc but this must be /etc.
22	UTILS_BIN = ../utils	16	-PAM_ROOT = /etc
		17	+PAM_ROOT = ${prefix}/etc
		18	PAM_DIR = $(PAM_ROOT)/pam.d
		19	PAM_CONF = $(PAM_ROOT)/pam.conf
		20

Lines 1-6 Link Here

(-)b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in (-17 / +17 lines)
1	--- driver/XScreenSaver.ad.in.orig 2019-07-10 03:31:26 UTC	1	--- driver/XScreenSaver.ad.in.orig 2021-06-09 15:47:14 UTC
2	+++ driver/XScreenSaver.ad.in	2	+++ driver/XScreenSaver.ad.in
3	@@ -56,7 +56,7 @@	3	@@ -55,7 +55,7 @@
4	*splashDuration: 0:00:05	4	*splashDuration: 0:00:05
5	*visualID: default	5	*visualID: default
6	*installColormap: True	6	*installColormap: True
Lines 9-24 Link Here
9	*authWarningSlack: 20	9	*authWarningSlack: 20
10		10
11	*textMode: file	11	*textMode: file
12	@@ -124,7 +124,7 @@	12	@@ -103,7 +103,7 @@
13		13
14	! The format used for printing the date and time in the password dialog box	14
15	! (see the strftime(3) manual page for details.)	15	! The strftime(3) format string for printing the time on the password dialog.
16	-*dateFormat: %d-%b-%y (%a); %I:%M %p	16	-*dateFormat: %I:%M %p, %a %b %e
17	+*dateFormat: %Y-%m-%d %H:%M:%S	17	+*dateFormat: %Y-%m-%d %H:%M:%S
18	! For day month date:	18	! DD MMM:
19	! *dateFormat: %a %b %d, %I:%M %p	19	! *dateFormat: %I:%M %p, %e %b (%a)
20	! To show the time only:	20	! 12 hour time only:
21	@@ -343,6 +343,18 @@ XScreenSaver.bourneShell: /bin/sh	21	@@ -324,6 +324,18 @@ XScreenSaver.bourneShell: /bin/sh
22	!=============================================================================	22	!=============================================================================
23		23
24	*programs: \	24	*programs: \
Lines 37-47 Link Here
37	maze -root \n\	37	maze -root \n\
38	@GL_KLUDGE@ GL: superquadrics -root \n\	38	@GL_KLUDGE@ GL: superquadrics -root \n\
39	attraction -root \n\	39	attraction -root \n\
40	@@ -610,7 +622,6 @@ XScreenSaver.bourneShell: /bin/sh	40	@@ -602,7 +614,6 @@ XScreenSaver.bourneShell: /bin/sh
41	*hacks.dangerball.name: DangerBall	41	*hacks.dangerball.name: Danger Ball
42	*hacks.decayscreen.name: DecayScreen	42	*hacks.decayscreen.name: Decay Screen
43	*hacks.deepstars.name: DeepStars	43	*hacks.deepstars.name: Deep Stars
44	-*hacks.dnalogo.name: DNA Logo	44	-*hacks.dnalogo.name: DNA Logo
45	*hacks.dymaxionmap.name: DymaxionMap	45	*hacks.dymaxionmap.name: Dymaxion Map
46	*hacks.energystream.name: EnergyStream	46	*hacks.energystream.name: Energy Stream
47	*hacks.euler2d.name: Euler2D	47	*hacks.etruscanvenus.name: Etruscan Venus