Attachment 244001 Details for Bug 273042 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug273042.diff (text/plain), 2.12 KB, created by Jan Beich on 2023-08-10 09:37:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2023-08-10 09:37:54 UTC

Size: 2.12 KB

patch

obsolete

>From a7eacba9163be55a5229c3934624604422fff91f Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Thu, 10 Aug 2023 11:31:47 +0200
>Subject: [PATCH] x11-wm/hikari: drop setuid bit from hikari-unlocker
>
>PR:		273042
>Approved by:	ashish (maintainer)
>---
> x11-wm/hikari/Makefile                                    | 3 ++-
> .../hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD  | 8 ++++++++
> x11-wm/hikari/pkg-plist                                   | 2 +-
> 3 files changed, 11 insertions(+), 2 deletions(-)
> create mode 100644 x11-wm/hikari/files/patch-etc_pam.d_hikari-unlocker.FreeBSD
>
>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

Actions: View | Diff

Attachments on bug 273042: 244001