From nobody Sat Mar 02 00:07:13 2024 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 4TmldF3r3Vz5DHws; Sat, 2 Mar 2024 00:07:13 +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 4TmldF36qLz4Nrp; Sat, 2 Mar 2024 00:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709338033; 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=+s/Ze+F2On3AbtXIpcpmFKUPxUOfcC1r8fuTee/aOQY=; b=Ibhot7UpkQPVWspkp7nGPpunWbmdwDy2qFTFj1KrbJT4MzHv+bDngpSEbgsok5x/evpp/+ /w0YgkK7G6dOe8D6Ib80og38f7fJ8oqt9a2DjNgYQuYUIjNTdldKdkmuKYUbDqiZj7I5GI ioNC8CdFEPENtH5l2JmjlcTZxwYrYs4wca7Xp+ZTnZtWOLkteY/UGM5WDWhveEjKWlAe2m BEDmWUp1CL+8cPKWavxUj5o2+AmV6xqSdFoPmV6uBga3Efp13E/WssroRWOEHcDtyyb+Zq ZGWauw/IGH1AWkdtURgO3tiJRz7ULc0Ft3NFBExLLKIhGT4LBDD5KtJJ8w4Pjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709338033; a=rsa-sha256; cv=none; b=ebjtnDQ1FMYm9O6ReByS31iPTNKCRSgPnM1aLy1K4xeX4dMag22QTzEfOW768kndESfxza OWvhzR/po83B+iwarGl+Fn7TC1xrA6/RMD5n9zCo9tcUGckaAQUp2CJRSQL4S2wk1aAvMN xA74v2Y+P5pSZPGpPC0M9IgXT7n51w69xmcpKYoFL+IDnEi+to8bHEehLKj+UGLsaKqmeZ vGHZ/ah1cW5OniEJ51W4cDRrAvdod1FlBWH8Sk6McTFkZs4AydlTcErXgdGmAIKcka9lIu kphb8LbSAqU9OHUsZJlGryYd67hI2qshsS6/9buH7hIrmvFY1XpmWxsrNIMRxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709338033; 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=+s/Ze+F2On3AbtXIpcpmFKUPxUOfcC1r8fuTee/aOQY=; b=CMmU9QMeGWqjDDWxapaMf0O1hZYbZj6s1/bbPYlBSsPZ+UeFxD7zfyxCgFJDVhHg66etad mOh98aKlVhP+mH5yOtfzFxbAtHGie8p1kDAojTtzfOw3UZ32zp30yVL29+KoK50F3mk5DC XPMaNO2pf+hEW3I49QsjdhKrfwHVWJuh1NgyRD5bjgVaxa/jhlfdaWpdbySJLpVy/nGNIt uyCQyHpzDMoWoHAIoqpu9RdUcmY0DWn3nron0PfohnzbyiVqRzdnbuLEMHsJ7mYS6H+6/l tL6ct7S17kKfiFkHkpUAGGoMHTvdJTdvotTKf1PkoU7meNc2Yw9ZHu7Y+LTGCg== 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 4TmldF2k4bzmpx; Sat, 2 Mar 2024 00:07:13 +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 42207Dbh042928; Sat, 2 Mar 2024 00:07:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42207DpP042925; Sat, 2 Mar 2024 00:07:13 GMT (envelope-from git) Date: Sat, 2 Mar 2024 00:07:13 GMT Message-Id: <202403020007.42207DpP042925@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: edc1fa32671f - main - x11/hyprlock: adapt to upstream PAM config 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edc1fa32671fc8016b166a3b227a2ed3c95e99f7 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=edc1fa32671fc8016b166a3b227a2ed3c95e99f7 commit edc1fa32671fc8016b166a3b227a2ed3c95e99f7 Author: Jan Beich AuthorDate: 2024-03-01 23:54:46 +0000 Commit: Jan Beich CommitDate: 2024-03-02 00:06:36 +0000 x11/hyprlock: adapt to upstream PAM config --- x11/hyprlock/Makefile | 7 +++---- x11/hyprlock/distinfo | 2 ++ x11/hyprlock/files/patch-pam | 21 --------------------- x11/hyprlock/files/patch-pam_hyprlock | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/x11/hyprlock/Makefile b/x11/hyprlock/Makefile index 44c4ca38cdd5..44cc0508700c 100644 --- a/x11/hyprlock/Makefile +++ b/x11/hyprlock/Makefile @@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.1.0 CATEGORIES= x11 wayland +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= fa2a875e339a.patch:-p1 # https://github.com/hyprwm/hyprlock/pull/115 + MAINTAINER= jbeich@FreeBSD.org COMMENT= Hyprland's GPU-accelerated screen locking utility #' WWW= https://github.com/hyprwm/hyprlock @@ -37,10 +40,6 @@ LIB_DEPENDS+= libdate-tz.so:devel/date USES+= localbase:ldflags .endif -post-install: - ${INSTALL_DATA} ${WRKSRC}/pam/${PORTNAME} \ - ${STAGEDIR}${PREFIX}/etc/pam.d/${PORTNAME} - # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo) .if ${CXX} == c++ && exists(/usr/lib/libc++.so) .if !exists(/usr/include/c++/v1/expected) || make(makesum) || make(fetch) diff --git a/x11/hyprlock/distinfo b/x11/hyprlock/distinfo index 573354f71dc6..fe97d431fc32 100644 --- a/x11/hyprlock/distinfo +++ b/x11/hyprlock/distinfo @@ -3,3 +3,5 @@ SHA256 (hyprwm-hyprlock-v0.1.0_GH0.tar.gz) = 5d0e6547ac073c78e95d4f086a258e1e571 SIZE (hyprwm-hyprlock-v0.1.0_GH0.tar.gz) = 49582 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 +SHA256 (fa2a875e339a.patch) = 51dea8716b4b2b0371b0380e904f9fd0d7b0a35d5527dbe52c0fb86831ea0871 +SIZE (fa2a875e339a.patch) = 1973 diff --git a/x11/hyprlock/files/patch-pam b/x11/hyprlock/files/patch-pam deleted file mode 100644 index 044b0af3a847..000000000000 --- a/x11/hyprlock/files/patch-pam +++ /dev/null @@ -1,21 +0,0 @@ -"su" has "auth sufficient pam_self.so" but a screen locker is -supposed to ask for password regardless. - -pam_unix(8) requires root priveleges to access master.passwd(5), -so try authenticating via setuid helper first. - ---- pam/hyprlock.orig 1970-01-01 00:00:00 UTC -+++ pam/hyprlock -@@ -0,0 +1 @@ -+auth include unix-selfauth ---- src/core/Password.cpp.orig 2024-02-23 21:29:08 UTC -+++ src/core/Password.cpp -@@ -30,7 +30,7 @@ std::shared_ptr CPassw - const pam_conv localConv = {conv, NULL}; - pam_handle_t* handle = NULL; - -- int ret = pam_start("su", getlogin(), &localConv, &handle); -+ int ret = pam_start("hyprlock", getlogin(), &localConv, &handle); - - if (ret != PAM_SUCCESS) { - result->success = false; diff --git a/x11/hyprlock/files/patch-pam_hyprlock b/x11/hyprlock/files/patch-pam_hyprlock new file mode 100644 index 000000000000..a3e78966d632 --- /dev/null +++ b/x11/hyprlock/files/patch-pam_hyprlock @@ -0,0 +1,16 @@ +"login" has "auth sufficient pam_self.so" but a screen locker is +supposed to ask for password regardless. + +pam_unix(8) requires root priveleges to access master.passwd(5), +so try authenticating via setuid helper first. + +--- pam/hyprlock.orig 2024-03-01 23:49:44 UTC ++++ pam/hyprlock +@@ -1,5 +1,4 @@ +-# PAM configuration file for hyprlock +-# the 'login' configuration file (see /etc/pam.d/login) ++# PAM configuration for hyprlock. Only uses auth facilities. + +-auth include login ++auth include unix-selfauth +