CVS commit: pkgsrc/x11/xscreensaver

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed May  1 02:51:49 UTC 2019

Modified Files:
        pkgsrc/x11/xscreensaver: Makefile options.mk

Log Message:
xscreensaver: don't install with SETUID if PAM is enabled

If the (non-default) "pam" option is selected, then don't install this
SETUID, it's not necessary. (Or, to put it differently, do what gnome-
screensaver and mate-screensaver are already doing, which is the same.)


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/x11/xscreensaver/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/xscreensaver/options.mk

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

Modified files:

Index: pkgsrc/x11/xscreensaver/Makefile
diff -u pkgsrc/x11/xscreensaver/Makefile:1.116 pkgsrc/x11/xscreensaver/Makefile:1.117
--- pkgsrc/x11/xscreensaver/Makefile:1.116      Sun Sep  2 20:12:03 2018
+++ pkgsrc/x11/xscreensaver/Makefile    Wed May  1 02:51:49 2019
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2018/09/02 20:12:03 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2019/05/01 02:51:49 gutteridge Exp $
 
+PKGREVISION=   1
 COMMENT=       Screen saver and locker for the X window system
 
 CONFLICTS+=    xscreensaver-gnome<4.14
@@ -8,8 +9,6 @@ CONFLICTS+=     xscreensaver-gnome<4.14
 .include "options.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-SPECIAL_PERMS+=                bin/xscreensaver ${SETUID_ROOT_PERMS}
-
 CONFIGURE_ARGS+=       --without-gtk
 #CONFIGURE_ARGS+=      --with-xml=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=       --with-configdir=${PREFIX}/libexec/xscreensaver/config

Index: pkgsrc/x11/xscreensaver/options.mk
diff -u pkgsrc/x11/xscreensaver/options.mk:1.11 pkgsrc/x11/xscreensaver/options.mk:1.12
--- pkgsrc/x11/xscreensaver/options.mk:1.11     Sun Sep  2 20:26:59 2018
+++ pkgsrc/x11/xscreensaver/options.mk  Wed May  1 02:51:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2018/09/02 20:26:59 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2019/05/01 02:51:49 gutteridge Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xscreensaver
 PKG_SUPPORTED_OPTIONS= pam webcollage opengl
@@ -18,6 +18,7 @@ DEPENDS+=     pam-pwauth_suid-[0-9]*:../../s
 CONFIGURE_ARGS+=       --without-pam
 # configure should figure out
 #CONFIGURE_ARGS+=      --without-shadow
+SPECIAL_PERMS+=                bin/xscreensaver ${SETUID_ROOT_PERMS}
 .endif
 
 PLIST_SRC+=    PLIST