From nobody Fri Aug 11 13:42:20 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 4RMlMw5dx5z4Tq43; Fri, 11 Aug 2023 13:42:20 +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 4RMlMw50R9z4NrW; Fri, 11 Aug 2023 13:42:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691761340; 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=hzGFO+yUyRHf1osnbnx4pEyHtm5lHnPSDBweN7Kfc5o=; b=B4IpkZqF866F8F8zYci0UDzP6w22FPEykZkZRclvv4ovwrhgLQGn4w5oXaI/3jIhSVmvcA 5GTcTf4P4p6VPZ6UOX/OpymvQLL6TGSQ1HgQMe0zFS8h2Ekn0564ZhdUzx1m/Sb2dqdmLu 0tVHoNITCHWpX+eKFZEl7TwXqMmIMP41HAqdjpaT+J3glEJzRX+yDlbrssiiMrzzhTYX9Q B3S5NGF+Qt+wtw2zP0bTSW1yb+yQR1cxe74Xw9Bd9dM/ei3iDw5S287badPjpfMNykf1zl 9CqfHNZNTVv5u6gpUydEireX7409j1WzI54smjV63MBtcDLVSkbVn/RjKqVQ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691761340; 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=hzGFO+yUyRHf1osnbnx4pEyHtm5lHnPSDBweN7Kfc5o=; b=xauBbnXJ61gBZmZvJTiY1imuVR/+axOXeuBEO3BMyGGQnnXzOhMkElVM2PAICaIM6jYVxs okVDaRqHARRp1mUnbBEqGe9C3yn7AxUYL0I1eMhqK3oasnL1uLg16lHfHRfpdZKAPdGW+s tR8S2VXDfR/0L+XW5KXZKifj8cHrJ0sOOxfdWZ1ZKr8U+++ZyJ5phFzy9+hQRCd7juMGsc gpgFlF38Kq+rfnAVMo92UXRTYqA8RsGtrVxl5wh7IZhG2ycF98SLlaAx6GDE2PGAC4626I 31g00gFbZT1EcNGrTWBDIOArkfkmeN4JPzHx+xbpde4yAZzO4Iip+OHgbFXXsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691761340; a=rsa-sha256; cv=none; b=Ka8RR5e9pMD5RHvGHEect8NefeLGEvhQtnxDM2QmOf+PbMuDOo8QxlhS99IkvwjVsgxUjA RhWXky+7SIp135l0naVUAMkzU0hQUTKWyUClQghFHirbs7pxAg0Jc9EKEApztpDedkUxAW QB4JXicbBT0pgCJwzZ6l/yl81NxtTmx61qhmGEHHmHDydIVioS+EIBpyX7cSRWEPKHB3EH mnfd/Qc/synijqFR1TgSxP3CJn2S1iDefjZeMFlI5scpHwDBnHt6fm9uyEvey9FH46vdQP PQQd2ZoBYnCq20nXAUoDacH8sYeHzObibKbJvxp5ObARaVriP1PCeehp6BCpFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RMlMw44HczhXy; Fri, 11 Aug 2023 13:42:20 +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 37BDgKkY056672; Fri, 11 Aug 2023 13:42:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BDgKJe056669; Fri, 11 Aug 2023 13:42:20 GMT (envelope-from git) Date: Fri, 11 Aug 2023 13:42:20 GMT Message-Id: <202308111342.37BDgKJe056669@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: 592d2bec114d - main - x11-wm/hikari: drop setuid bit from hikari-unlocker 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: 592d2bec114d2ae04e564c22b6a175773c28ab40 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=592d2bec114d2ae04e564c22b6a175773c28ab40 commit 592d2bec114d2ae04e564c22b6a175773c28ab40 Author: Jan Beich AuthorDate: 2023-08-10 09:31:47 +0000 Commit: Jan Beich CommitDate: 2023-08-11 13:41:28 +0000 x11-wm/hikari: drop setuid bit from hikari-unlocker PR: 273042 Approved by: ashish (maintainer) --- x11-wm/hikari/Makefile | 3 ++- x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD | 8 ++++++++ x11-wm/hikari/pkg-plist | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile index 782bd3a62968..0077486cb809 100644 --- a/x11-wm/hikari/Makefile +++ b/x11-wm/hikari/Makefile @@ -1,6 +1,6 @@ PORTNAME= hikari DISTVERSION= 2.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland MASTER_SITES= https://hikari.acmelabs.space/releases/ @@ -19,6 +19,7 @@ LIB_DEPENDS= libinput.so:x11/libinput \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libxkbcommon.so:x11/libxkbcommon +RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper USES= compiler:c11 gnome pkgconfig xorg USE_GNOME= cairo pango diff --git a/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD b/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD new file mode 100644 index 000000000000..3b2fdc56f0f9 --- /dev/null +++ b/x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD @@ -0,0 +1,8 @@ +pam_unix(8) requires root priveleges to access master.passwd(5), +so try authenticating via setuid helper first. + +--- etc/pam.d/hikari-unlocker.FreeBSD.orig 2020-03-05 21:52:17 UTC ++++ etc/pam.d/hikari-unlocker.FreeBSD +@@ -1 +1 @@ +-auth include passwd ++auth include unix-selfauth diff --git a/x11-wm/hikari/pkg-plist b/x11-wm/hikari/pkg-plist index db696af0e930..20d253a8166b 100644 --- a/x11-wm/hikari/pkg-plist +++ b/x11-wm/hikari/pkg-plist @@ -1,5 +1,5 @@ bin/hikari -@(,,4755) bin/hikari-unlocker +bin/hikari-unlocker etc/pam.d/hikari-unlocker @sample %%ETCDIR%%/hikari.conf.sample share/backgrounds/hikari/hikari_wallpaper.png