Received: by mail.netbsd.org (Postfix, from userid 605) id A24C084D90; Wed, 1 May 2019 02:51:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2A2B184D83 for ; Wed, 1 May 2019 02:51:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 4PTRkWEeRjex for ; Wed, 1 May 2019 02:51:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A438D84C81 for ; Wed, 1 May 2019 02:51:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9EBCCFB16; Wed, 1 May 2019 02:51:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1556679109105400" MIME-Version: 1.0 Date: Wed, 1 May 2019 02:51:49 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/x11/xscreensaver To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20190501025149.9EBCCFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1556679109105400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1556679109105400 Content-Disposition: inline Content-Length: 1618 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.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 --_----------=_1556679109105400--