From nobody Fri Sep 02 20:12:06 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MK8Fz1KY9z4bcty; Fri, 2 Sep 2022 20:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MK8Fz0vk5z3t2t; Fri, 2 Sep 2022 20:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662149527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j9+aL4fyqW4vqIeCGWYVgCOumro3Bk8OYXqEK8lKel4=; b=gjFjjsqw4anc+igEJdCQNmqhuVr/rOKtJ3PnOexJ2F2zqVH3AiT0ps3f28Kii9qHNjWxbK teo6MboLD5/gjDOMUdU3xssIiDOrfbqa/SnZucRE22DQwNk19xdeQ65Bd7ruC7eV3hQV0C OiGeti43GJsEyzcn4wlvj9+jd+nDCvcmz3HAFWBRhDYxVUx7/utOx7jC/kosQF8jVHqz8l E9U8HUujPLdJiHTrEGE90lg7O/uz9ht3waVeLChNsXaUfNoOk7tAObFuaYwO/cSwqa5e/1 dDH8cHdDHMiksdgY7o9oQQE2TUXXzrje6N0eUlJHfnyTWPAqOFDngX7PBK4kvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MK8Fy74Zvzw4k; Fri, 2 Sep 2022 20:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 282KC6QX016806; Fri, 2 Sep 2022 20:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 282KC6Qe016805; Fri, 2 Sep 2022 20:12:06 GMT (envelope-from git) Date: Fri, 2 Sep 2022 20:12:06 GMT Message-Id: <202209022012.282KC6Qe016805@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: ecc6daf598b2 - main - x11/xscreensaver: Remove PAM option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecc6daf598b26b1b3a2e4e48b26d55c1e3636437 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662149527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j9+aL4fyqW4vqIeCGWYVgCOumro3Bk8OYXqEK8lKel4=; b=G5+VHYoA8vICA6xyRpd47JVuskRWGk6QdHQ/elhjLTDoCfYtaK42DqP+V3Kj1KPMB9HYrY FNPOikIXC5voGlRqKa4BXHJPfov/0z3wBzi3EM5WeHeqrDrOaWjqYpSPlsMF/53pnzUra8 1n9Z3eT0ZqZhsfznxAD+2h6Lm6tqmi0sGQSvJQ+g9YtbEWzc1mlz6b3qo33VD4qcqNYyBw DA9neJGBJWIX+HrDb5BMNW1qi1FGvyrBMYDqC7xV+M4q4ieCmVvG8kvOsV2NtVqd6RzmdV S6A/kNnn9y5s4qyAxVTbkIIgHsAy34J/gHNVLVduhNnMPuMdSx6fWJiSnf5EaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662149527; a=rsa-sha256; cv=none; b=OvYJNGMZAJ2M/rzv1/fGZMQJV/bpMz/YS27KRk4EiP9MJl/n8fIoaOcRuRyx8vL3l/wlg+ xSraZTAE5caJbxc04kEUOFGS7XEtcUWH8dPHMeqWUqnYtcr0rk8ihJSEqZMjminTTRvXf2 8dFM4OJyjIb5gQ6f4FFoF64lnGfiOPF3FkVrGlXFPzdWrNAJKJpcpQ1yJSovPwCUOcyQUf MSxhcuyBe5tWQzh5Q4lEHbmDYmg924WyQCUdNSJh7Et9v7ijzMnoqM+QmfCClJl1d1eHT+ wB7eYp4lZqIG3ef70EmyFN0ooW/G+19QRySNJ7yQ/VUyewFlk+AFzF0hKG9Tqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecc6daf598b26b1b3a2e4e48b26d55c1e3636437 commit ecc6daf598b26b1b3a2e4e48b26d55c1e3636437 Author: Felix Palmen AuthorDate: 2022-09-02 06:15:24 +0000 Commit: Felix Palmen CommitDate: 2022-09-02 20:11:33 +0000 x11/xscreensaver: Remove PAM option Upstream ./configure now fails with --without-pam if PAM is found on the build system with this message: Your system seems to have PAM, but PAM is not being used. That is probably not going to work out well. We have PAM in base and can't build base without it any more (WITHOUT_PAM is deprecated), so let's just remove that port option and always build xscreensaver with PAM (previously enabled by default). With PAM enforced, support for shadow passwords is not needed. Forcing it to off, we can avoid installing xscreensaver-auth suid root. PR: 264361 Approved by: x11 (cy, manu), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D36425 --- x11/xscreensaver/Makefile | 16 +++++++--------- x11/xscreensaver/files/patch-driver_Makefile.in | 13 ++----------- x11/xscreensaver/pkg-plist | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index ff132c3b7dc4..390990542eeb 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,5 +1,6 @@ PORTNAME= xscreensaver PORTVERSION= 6.04 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -10,7 +11,8 @@ LICENSE= MIT RUN_DEPENDS= giftopnm:graphics/netpbm \ p5-libwww>0:www/p5-libwww \ - p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https + p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https \ + unix-selfauth-helper>0:security/unix-selfauth-helper LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgle.so:graphics/gle \ @@ -35,6 +37,7 @@ CONFIGURE_ARGS= --enable-locking \ --with-gtk \ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ --with-jpeg=${LOCALBASE} \ + --with-pam \ --with-pixbuf \ --with-randr-ext \ --with-xdbe-ext \ @@ -43,18 +46,15 @@ CONFIGURE_ARGS= --enable-locking \ --with-xft \ --with-xinerama-ext \ --with-xshm-ext \ - --without-kerberos + --without-kerberos \ + --without-shadow MAKE_ARGS+= install_prefix=${STAGEDIR} MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH \ +OPTIONS_DEFINE= FIREF NLS NSFW SETUID_HACKS XAOS1 XDALI XEARTH \ XMOUN XPLANET XSNOW -OPTIONS_DEFAULT= PAM OPTIONS_SUB= yes -PAM_CONFIGURE_WITH= pam -PAM_RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper - SETUID_HACKS_DESC= Install sonar hack suid so it can ping SETUID_HACKS_CONFIGURE_WITH= setuid-hacks @@ -104,8 +104,6 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/ ${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam - -post-install-PAM-on: ${INSTALL_DATA} ${WRKDIR}/xscreensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver .include diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in index 828a4f48818a..c70eddfd7d92 100644 --- a/x11/xscreensaver/files/patch-driver_Makefile.in +++ b/x11/xscreensaver/files/patch-driver_Makefile.in @@ -1,15 +1,6 @@ ---- driver/Makefile.in.orig 2021-10-12 01:04:31 UTC +--- driver/Makefile.in.orig 2022-09-02 09:08:36 UTC +++ driver/Makefile.in -@@ -46,7 +46,7 @@ DEPEND_FLAGS = @DEPEND_FLAGS@ - DEPEND_DEFINES = @DEPEND_DEFINES@ - - INSTALL = @INSTALL@ --SUID_FLAGS = -o root -m 4755 -+SUID_FLAGS = -m 4555 - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SETUID = $(INSTALL_PROGRAM) $(SUID_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ -@@ -76,7 +76,7 @@ INTL_LIBS = @INTLLIBS@ +@@ -78,7 +78,7 @@ INTL_LIBS = @INTLLIBS@ AD_DIR = @APPDEFAULTS@ # $(sysconfdir) is either /usr/local/etc or /usr/etc but this must be /etc. diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist index 06caa646c362..f3982b76e38f 100644 --- a/x11/xscreensaver/pkg-plist +++ b/x11/xscreensaver/pkg-plist @@ -258,7 +258,7 @@ bin/xscreensaver-hacks/xrayswarm bin/xscreensaver-hacks/xspirograph bin/xscreensaver-hacks/zoom bin/xscreensaver-settings -%%PAM%%etc/pam.d/xscreensaver +etc/pam.d/xscreensaver lib/X11/app-defaults/XScreenSaver man/man1/xscreensaver-command.1.gz man/man1/xscreensaver-demo.1.gz