From nobody Wed Jul 26 07:54:59 2023 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 4R9mQW72Vjz4pdJ4; Wed, 26 Jul 2023 07:54:59 +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 4R9mQW6W3Yz43pR; Wed, 26 Jul 2023 07:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690358099; 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=PO0Bn2OM17CvGkWErpzd5baiYjg45e5bcXapEuAY5XE=; b=vvat/LpMU+KeZmb/m+tKqt3LgKvtyPOAEeM1yJU7A0bEuFwNqZle1xOjQ/XbCiP+58SwBL /k3v6Pwki6MPhp9Ma4yWxQQWr5Vr/JNhTNzCVH6ui9wOCBDa/Cz/XY2LRtHgJVMta1WLpH 2RIQEqA9saH32uE87WATWpFehnEb1Drz17TIOF4iKh8Vfzpjb1dLlQNWbvoY+PEpsuXo2f UE14jVg9UZJTUnJjaQX6KczH83VuEWcFAWHCVEcDiV4eAm2JQLbgouaN4kzhXPDfhG20jQ 4RQfjYr+d3D9Y0zXzIpuyizMM15M3HegDv7VipMomCdxqx3ltxs/1aMPpJUV1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690358099; 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=PO0Bn2OM17CvGkWErpzd5baiYjg45e5bcXapEuAY5XE=; b=OvoceJgiItrPUlTDkbfn2S2uj7G7TIeHRR226mXbQM5WkJAOEgIn7NnVl2cVXR4+OvjxKe hW9+NjBc4wiXim220C+G21mXNRk7B0gyGuuNNvuJzbl540pCLG34RF5TacZe8IwI396cwa NQHljIp26th9EAoNtl43baOu8wfLcNsoBQAV6eozNH0Sp+xoZNFqhIMEGYSwS+FweDAhav gZ/nQEkMEqVS8Uqhi4Pw7UM0cK5aJJDBac3yPPKBn2Z/XrYgxxwrgOEYakNyTw2WgK3leO ntpspS5Crrqvr158Lbq9ivSo+LP3k4CoyY9paheeo5norGfEhpwt/eMRIJo8zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690358099; a=rsa-sha256; cv=none; b=k/9IURRRanU65vLGC0Q9cGHKc1ewoEzodoYJtT6j3gcNBCVVWGWCvxGRryMbtx3GMdb0/Y /ysldNRS8Ojku9MZ7RKFvcMYT0TqUE2MfFl2S72F7ekRrU6EaVVSIoPdjYD4NVqurJ/Ybt HUMEQsFjgeDeTMX4Stz1kB4LvC6ZUCsPBJvFdtGTeu8FLPg90/8cW857Gj6CNvxcRQgcUL MCTSO0MGVRPvjUTIeBV35jg24WJWijdRU5e/A6+cJwcmI7huNv75n8oEJ7BuEkqObu+kO7 TPEQVjd/XuYAaa9cl6piXkPesyVMKZN7kF6osFVj3l8rz1OmRCqn6sEcw/mAwg== 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 4R9mQW5bXSzZfs; Wed, 26 Jul 2023 07:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36Q7sxDt074982; Wed, 26 Jul 2023 07:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36Q7sxiI074981; Wed, 26 Jul 2023 07:54:59 GMT (envelope-from git) Date: Wed, 26 Jul 2023 07:54:59 GMT Message-Id: <202307260754.36Q7sxiI074981@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: 93a3cca82fba - main - x11/xscreensaver: Drop custom PAM policy 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: 93a3cca82fba79789e6942a84da81aec2802c44d Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=93a3cca82fba79789e6942a84da81aec2802c44d commit 93a3cca82fba79789e6942a84da81aec2802c44d Author: Felix Palmen AuthorDate: 2023-07-13 18:00:55 +0000 Commit: Felix Palmen CommitDate: 2023-07-26 07:54:38 +0000 x11/xscreensaver: Drop custom PAM policy Instead, symlink to the unix-selfauth policy now delivered with security/unix-selfauth-helper. Approved by: x11 (manu) Differential Revision: https://reviews.freebsd.org/D41174 --- x11/xscreensaver/Makefile | 10 +++++----- x11/xscreensaver/files/xscreensaver.pam.in | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 7f0ef0c45888..19da13ff158b 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,6 +1,6 @@ PORTNAME= xscreensaver DISTVERSION= 6.06 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -86,8 +86,7 @@ XSNOW_DESC= Add extra port x11/xsnow XSNOW_RUN_DEPENDS= xsnow:x11/xsnow SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ - xscreensaver-start.desktop xscreensaver-stop.desktop \ - xscreensaver.pam + xscreensaver-start.desktop xscreensaver-stop.desktop post-patch: ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ @@ -104,7 +103,8 @@ post-patch-NSFW-off: 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 - ${INSTALL_DATA} ${WRKDIR}/xscreensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver + ${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver + ${LN} -s ${LOCALBASE}/etc/pam.d/unix-selfauth \ + ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver .include diff --git a/x11/xscreensaver/files/xscreensaver.pam.in b/x11/xscreensaver/files/xscreensaver.pam.in deleted file mode 100644 index e1a420f35fb0..000000000000 --- a/x11/xscreensaver/files/xscreensaver.pam.in +++ /dev/null @@ -1,4 +0,0 @@ -auth sufficient pam_exec.so return_prog_exit_status \ - expose_authtok %%LOCALBASE%%/libexec/unix-selfauth-helper -auth include system -account include system