Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1620084701218240"
MIME-Version: 1.0
Date: Mon, 3 May 2021 23:31:41 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/x11/xscreensaver
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
Message-Id: <20210503233141.09FEDFA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1620084701218240
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Mon May  3 23:31:40 UTC 2021

Modified Files:
	pkgsrc/x11/xscreensaver: Makefile PLIST
Added Files:
	pkgsrc/x11/xscreensaver/files: README.pkgsrc
Removed Files:
	pkgsrc/x11/xscreensaver: MESSAGE
	pkgsrc/x11/xscreensaver/files: pam-xscreensaver-NetBSD

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xscreensaver/MESSAGE
cvs rdiff -u -r1.128 -r1.129 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/xscreensaver/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xscreensaver/files/README.pkgsrc
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xscreensaver/files/pam-xscreensaver-NetBSD

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1620084701218240
Content-Disposition: inline
Content-Length: 3077
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/xscreensaver/Makefile
diff -u pkgsrc/x11/xscreensaver/Makefile:1.128 pkgsrc/x11/xscreensaver/Makefile:1.129
--- pkgsrc/x11/xscreensaver/Makefile:1.128	Wed Apr 21 11:40:53 2021
+++ pkgsrc/x11/xscreensaver/Makefile	Mon May  3 23:31:40 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2021/04/21 11:40:53 adam Exp $
+# $NetBSD: Makefile,v 1.129 2021/05/03 23:31:40 gutteridge Exp $
 
 COMMENT=	Screen saver and locker for the X window system
-PKGREVISION=	1
+PKGREVISION=	2
 
 CONFLICTS+=	xscreensaver-gnome<4.14
 
@@ -13,14 +13,10 @@ CONFIGURE_ARGS+=	--without-gtk
 #CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
 
-EGDIR=			${PREFIX}/share/examples/xscreensaver
-MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}
-
-INSTALLATION_DIRS=	${EGDIR}/pam.d
+INSTALLATION_DIRS=	share/doc/${PKGBASE}
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/pam-xscreensaver-NetBSD \
-	    ${DESTDIR}${EGDIR}/pam.d/xscreensaver-NetBSD
+	${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"

Index: pkgsrc/x11/xscreensaver/PLIST
diff -u pkgsrc/x11/xscreensaver/PLIST:1.51 pkgsrc/x11/xscreensaver/PLIST:1.52
--- pkgsrc/x11/xscreensaver/PLIST:1.51	Sun Apr  5 17:30:36 2020
+++ pkgsrc/x11/xscreensaver/PLIST	Mon May  3 23:31:40 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2020/04/05 17:30:36 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.52 2021/05/03 23:31:40 gutteridge Exp $
 bin/xscreensaver
 bin/xscreensaver-command
 bin/xscreensaver-getimage
@@ -374,7 +374,7 @@ man/man6/xmatrix.6
 man/man6/xrayswarm.6
 man/man6/xspirograph.6
 man/man6/zoom.6
-share/examples/xscreensaver/pam.d/xscreensaver-NetBSD
+share/doc/xscreensaver/README.pkgsrc
 share/locale/da/LC_MESSAGES/xscreensaver.mo
 share/locale/de/LC_MESSAGES/xscreensaver.mo
 share/locale/es/LC_MESSAGES/xscreensaver.mo

Added files:

Index: pkgsrc/x11/xscreensaver/files/README.pkgsrc
diff -u /dev/null pkgsrc/x11/xscreensaver/files/README.pkgsrc:1.1
--- /dev/null	Mon May  3 23:31:40 2021
+++ pkgsrc/x11/xscreensaver/files/README.pkgsrc	Mon May  3 23:31:40 2021
@@ -0,0 +1,15 @@
+$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.


--_----------=_1620084701218240--