Mon May 3 23:31:40 2021 UTC ()
xscreensaver: adjust some documentation

Move the existing MESSAGE content to README.pkgsrc, as much of it
pertains to a non-default option that most users don't need to consider,
and otherwise is not a call to action for a user to do anything. While
here, restructure it a bit.

Also remove the sample NetBSD PAM configration file here, as the
security/pam-pwauth_suid package provides its own (slightly newer)
version of the same, and has its own MESSAGE that references its version
and its distinct installation location (and is a call to action that
users very much need to know about, as otherwise they'll end up with an
X session they can't unlock). There's no point possibly confusing people
with different example files. This addresses PR pkg/50622.


(gutteridge)
diff -r1.2 -r0 pkgsrc/x11/xscreensaver/MESSAGE
diff -r1.128 -r1.129 pkgsrc/x11/xscreensaver/Makefile
diff -r1.51 -r1.52 pkgsrc/x11/xscreensaver/PLIST
diff -r0 -r1.1 pkgsrc/x11/xscreensaver/files/README.pkgsrc
diff -r1.1 -r0 pkgsrc/x11/xscreensaver/files/pam-xscreensaver-NetBSD

File Deleted: pkgsrc/x11/xscreensaver/Attic/MESSAGE

cvs diff -r1.128 -r1.129 pkgsrc/x11/xscreensaver/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver/Makefile 2021/04/21 11:40:53 1.128
+++ pkgsrc/x11/xscreensaver/Makefile 2021/05/03 23:31:40 1.129
@@ -1,32 +1,28 @@ @@ -1,32 +1,28 @@
1# $NetBSD: Makefile,v 1.128 2021/04/21 11:40:53 adam Exp $ 1# $NetBSD: Makefile,v 1.129 2021/05/03 23:31:40 gutteridge Exp $
2 2
3COMMENT= Screen saver and locker for the X window system 3COMMENT= Screen saver and locker for the X window system
4PKGREVISION= 1 4PKGREVISION= 2
5 5
6CONFLICTS+= xscreensaver-gnome<4.14 6CONFLICTS+= xscreensaver-gnome<4.14
7 7
8.include "Makefile.common" 8.include "Makefile.common"
9.include "options.mk" 9.include "options.mk"
10.include "../../textproc/libxml2/buildlink3.mk" 10.include "../../textproc/libxml2/buildlink3.mk"
11 11
12CONFIGURE_ARGS+= --without-gtk 12CONFIGURE_ARGS+= --without-gtk
13#CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} 13#CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
14CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config 14CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
15 15
16EGDIR= ${PREFIX}/share/examples/xscreensaver 16INSTALLATION_DIRS= share/doc/${PKGBASE}
17MESSAGE_SUBST+= EGDIR=${EGDIR:Q} 
18 
19INSTALLATION_DIRS= ${EGDIR}/pam.d 
20 17
21post-install: 18post-install:
22 ${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \ 19 ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
23 ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD 
24 20
25.include "../../graphics/png/buildlink3.mk" 21.include "../../graphics/png/buildlink3.mk"
26.include "../../x11/libXScrnSaver/buildlink3.mk" 22.include "../../x11/libXScrnSaver/buildlink3.mk"
27.include "../../x11/libXext/buildlink3.mk" 23.include "../../x11/libXext/buildlink3.mk"
28.include "../../x11/libXinerama/buildlink3.mk" 24.include "../../x11/libXinerama/buildlink3.mk"
29.include "../../x11/libXpm/buildlink3.mk" 25.include "../../x11/libXpm/buildlink3.mk"
30.include "../../x11/libXxf86vm/buildlink3.mk" 26.include "../../x11/libXxf86vm/buildlink3.mk"
31.include "../../x11/libXft/buildlink3.mk" 27.include "../../x11/libXft/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"

cvs diff -r1.51 -r1.52 pkgsrc/x11/xscreensaver/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xscreensaver/PLIST 2020/04/05 17:30:36 1.51
+++ pkgsrc/x11/xscreensaver/PLIST 2021/05/03 23:31:40 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.51 2020/04/05 17:30:36 gutteridge Exp $ 1@comment $NetBSD: PLIST,v 1.52 2021/05/03 23:31:40 gutteridge Exp $
2bin/xscreensaver 2bin/xscreensaver
3bin/xscreensaver-command 3bin/xscreensaver-command
4bin/xscreensaver-getimage 4bin/xscreensaver-getimage
5bin/xscreensaver-getimage-file 5bin/xscreensaver-getimage-file
6bin/xscreensaver-getimage-video 6bin/xscreensaver-getimage-video
7bin/xscreensaver-text 7bin/xscreensaver-text
8lib/X11/app-defaults/XScreenSaver 8lib/X11/app-defaults/XScreenSaver
9libexec/xscreensaver/abstractile 9libexec/xscreensaver/abstractile
10libexec/xscreensaver/anemone 10libexec/xscreensaver/anemone
11libexec/xscreensaver/anemotaxis 11libexec/xscreensaver/anemotaxis
12libexec/xscreensaver/apollonian 12libexec/xscreensaver/apollonian
13libexec/xscreensaver/apple2 13libexec/xscreensaver/apple2
14libexec/xscreensaver/attraction 14libexec/xscreensaver/attraction
@@ -364,27 +364,27 @@ man/man6/vermiculate.6 @@ -364,27 +364,27 @@ man/man6/vermiculate.6
364man/man6/vfeedback.6 364man/man6/vfeedback.6
365man/man6/vidwhacker.6 365man/man6/vidwhacker.6
366man/man6/wander.6 366man/man6/wander.6
367man/man6/whirlwindwarp.6 367man/man6/whirlwindwarp.6
368man/man6/wormhole.6 368man/man6/wormhole.6
369man/man6/xanalogtv.6 369man/man6/xanalogtv.6
370man/man6/xflame.6 370man/man6/xflame.6
371man/man6/xjack.6 371man/man6/xjack.6
372man/man6/xlyap.6 372man/man6/xlyap.6
373man/man6/xmatrix.6 373man/man6/xmatrix.6
374man/man6/xrayswarm.6 374man/man6/xrayswarm.6
375man/man6/xspirograph.6 375man/man6/xspirograph.6
376man/man6/zoom.6 376man/man6/zoom.6
377share/examples/xscreensaver/pam.d/xscreensaver-NetBSD 377share/doc/xscreensaver/README.pkgsrc
378share/locale/da/LC_MESSAGES/xscreensaver.mo 378share/locale/da/LC_MESSAGES/xscreensaver.mo
379share/locale/de/LC_MESSAGES/xscreensaver.mo 379share/locale/de/LC_MESSAGES/xscreensaver.mo
380share/locale/es/LC_MESSAGES/xscreensaver.mo 380share/locale/es/LC_MESSAGES/xscreensaver.mo
381share/locale/et/LC_MESSAGES/xscreensaver.mo 381share/locale/et/LC_MESSAGES/xscreensaver.mo
382share/locale/fi/LC_MESSAGES/xscreensaver.mo 382share/locale/fi/LC_MESSAGES/xscreensaver.mo
383share/locale/fr/LC_MESSAGES/xscreensaver.mo 383share/locale/fr/LC_MESSAGES/xscreensaver.mo
384share/locale/hu/LC_MESSAGES/xscreensaver.mo 384share/locale/hu/LC_MESSAGES/xscreensaver.mo
385share/locale/it/LC_MESSAGES/xscreensaver.mo 385share/locale/it/LC_MESSAGES/xscreensaver.mo
386share/locale/ja/LC_MESSAGES/xscreensaver.mo 386share/locale/ja/LC_MESSAGES/xscreensaver.mo
387share/locale/ko/LC_MESSAGES/xscreensaver.mo 387share/locale/ko/LC_MESSAGES/xscreensaver.mo
388share/locale/nb/LC_MESSAGES/xscreensaver.mo 388share/locale/nb/LC_MESSAGES/xscreensaver.mo
389share/locale/nl/LC_MESSAGES/xscreensaver.mo 389share/locale/nl/LC_MESSAGES/xscreensaver.mo
390share/locale/pl/LC_MESSAGES/xscreensaver.mo 390share/locale/pl/LC_MESSAGES/xscreensaver.mo

File Added: pkgsrc/x11/xscreensaver/files/README.pkgsrc
$NetBSD: README.pkgsrc,v 1.1 2021/05/03 23:31:40 gutteridge Exp $

If xscreensaver is built with the non-default "pam" option, on NetBSD, the
"pam_pwauth_suid.so" module will be used to authenticate against a shadow
password database. Note that use of this module might allow programs with
your privileges to get a copy of your plaintext password as typed in for
unlocking. In order to make unlocking work, you need to add an xscreensaver
file to your PAM configuration directory (usually /etc/pam.d). On NetBSD,
you can find a sample pam.d file for xscreensaver in:
	${PREFIX}/share/examples/pam-pwauth_suid

By default (if the "pam" option isn't set), pkgsrc will set the
	${PREFIX}/bin/xscreensaver
executable setuid root. Since this is a relatively complex program,
there is the risk of other exploits.

File Deleted: pkgsrc/x11/xscreensaver/files/Attic/pam-xscreensaver-NetBSD