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.diff -r1.2 -r0 pkgsrc/x11/xscreensaver/MESSAGE
(gutteridge)
@@ -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 | |||
3 | COMMENT= Screen saver and locker for the X window system | 3 | COMMENT= Screen saver and locker for the X window system | |
4 | PKGREVISION= 1 | 4 | PKGREVISION= 2 | |
5 | 5 | |||
6 | CONFLICTS+= xscreensaver-gnome<4.14 | 6 | CONFLICTS+= 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 | |||
12 | CONFIGURE_ARGS+= --without-gtk | 12 | CONFIGURE_ARGS+= --without-gtk | |
13 | #CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} | 13 | #CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} | |
14 | CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config | 14 | CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config | |
15 | 15 | |||
16 | EGDIR= ${PREFIX}/share/examples/xscreensaver | 16 | INSTALLATION_DIRS= share/doc/${PKGBASE} | |
17 | MESSAGE_SUBST+= EGDIR=${EGDIR:Q} | |||
18 | ||||
19 | INSTALLATION_DIRS= ${EGDIR}/pam.d | |||
20 | 17 | |||
21 | post-install: | 18 | post-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" |
@@ -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 $ | |
2 | bin/xscreensaver | 2 | bin/xscreensaver | |
3 | bin/xscreensaver-command | 3 | bin/xscreensaver-command | |
4 | bin/xscreensaver-getimage | 4 | bin/xscreensaver-getimage | |
5 | bin/xscreensaver-getimage-file | 5 | bin/xscreensaver-getimage-file | |
6 | bin/xscreensaver-getimage-video | 6 | bin/xscreensaver-getimage-video | |
7 | bin/xscreensaver-text | 7 | bin/xscreensaver-text | |
8 | lib/X11/app-defaults/XScreenSaver | 8 | lib/X11/app-defaults/XScreenSaver | |
9 | libexec/xscreensaver/abstractile | 9 | libexec/xscreensaver/abstractile | |
10 | libexec/xscreensaver/anemone | 10 | libexec/xscreensaver/anemone | |
11 | libexec/xscreensaver/anemotaxis | 11 | libexec/xscreensaver/anemotaxis | |
12 | libexec/xscreensaver/apollonian | 12 | libexec/xscreensaver/apollonian | |
13 | libexec/xscreensaver/apple2 | 13 | libexec/xscreensaver/apple2 | |
14 | libexec/xscreensaver/attraction | 14 | libexec/xscreensaver/attraction | |
@@ -364,27 +364,27 @@ man/man6/vermiculate.6 | @@ -364,27 +364,27 @@ man/man6/vermiculate.6 | |||
364 | man/man6/vfeedback.6 | 364 | man/man6/vfeedback.6 | |
365 | man/man6/vidwhacker.6 | 365 | man/man6/vidwhacker.6 | |
366 | man/man6/wander.6 | 366 | man/man6/wander.6 | |
367 | man/man6/whirlwindwarp.6 | 367 | man/man6/whirlwindwarp.6 | |
368 | man/man6/wormhole.6 | 368 | man/man6/wormhole.6 | |
369 | man/man6/xanalogtv.6 | 369 | man/man6/xanalogtv.6 | |
370 | man/man6/xflame.6 | 370 | man/man6/xflame.6 | |
371 | man/man6/xjack.6 | 371 | man/man6/xjack.6 | |
372 | man/man6/xlyap.6 | 372 | man/man6/xlyap.6 | |
373 | man/man6/xmatrix.6 | 373 | man/man6/xmatrix.6 | |
374 | man/man6/xrayswarm.6 | 374 | man/man6/xrayswarm.6 | |
375 | man/man6/xspirograph.6 | 375 | man/man6/xspirograph.6 | |
376 | man/man6/zoom.6 | 376 | man/man6/zoom.6 | |
377 | share/examples/xscreensaver/pam.d/xscreensaver-NetBSD | 377 | share/doc/xscreensaver/README.pkgsrc | |
378 | share/locale/da/LC_MESSAGES/xscreensaver.mo | 378 | share/locale/da/LC_MESSAGES/xscreensaver.mo | |
379 | share/locale/de/LC_MESSAGES/xscreensaver.mo | 379 | share/locale/de/LC_MESSAGES/xscreensaver.mo | |
380 | share/locale/es/LC_MESSAGES/xscreensaver.mo | 380 | share/locale/es/LC_MESSAGES/xscreensaver.mo | |
381 | share/locale/et/LC_MESSAGES/xscreensaver.mo | 381 | share/locale/et/LC_MESSAGES/xscreensaver.mo | |
382 | share/locale/fi/LC_MESSAGES/xscreensaver.mo | 382 | share/locale/fi/LC_MESSAGES/xscreensaver.mo | |
383 | share/locale/fr/LC_MESSAGES/xscreensaver.mo | 383 | share/locale/fr/LC_MESSAGES/xscreensaver.mo | |
384 | share/locale/hu/LC_MESSAGES/xscreensaver.mo | 384 | share/locale/hu/LC_MESSAGES/xscreensaver.mo | |
385 | share/locale/it/LC_MESSAGES/xscreensaver.mo | 385 | share/locale/it/LC_MESSAGES/xscreensaver.mo | |
386 | share/locale/ja/LC_MESSAGES/xscreensaver.mo | 386 | share/locale/ja/LC_MESSAGES/xscreensaver.mo | |
387 | share/locale/ko/LC_MESSAGES/xscreensaver.mo | 387 | share/locale/ko/LC_MESSAGES/xscreensaver.mo | |
388 | share/locale/nb/LC_MESSAGES/xscreensaver.mo | 388 | share/locale/nb/LC_MESSAGES/xscreensaver.mo | |
389 | share/locale/nl/LC_MESSAGES/xscreensaver.mo | 389 | share/locale/nl/LC_MESSAGES/xscreensaver.mo | |
390 | share/locale/pl/LC_MESSAGES/xscreensaver.mo | 390 | share/locale/pl/LC_MESSAGES/xscreensaver.mo |
$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.