opendoas: added a patch to support wayland environments better by default

This commit is contained in:
Tim Biermann 2021-05-09 13:35:08 +00:00
parent ff3398efa4
commit 4782d381c9
Signed by: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 48 additions and 4 deletions

View File

@ -1,6 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF39mxfk01tFOJZJhC+3Tf8uIVFPNecuY6H3BSaodn5lyqE5MjSFIJqZyL9t+n9JhneCSXDAP5cAWGhYUe+kfGsAo=
SHA256 (Pkgfile) = 5ded75135cb0ff03448d9fba3028db0b0b541f75b1a8e1b31bb0a71cdd61c8cb
RWSagIOpLGJF3ylzMttMrjd2bv36U3AkcrZsm7mEe+bVtKTTqZGmdqInkhF7aS79WCbQQ7K7ZQiZciCrfnMNCM00mGKIhA/kSAY=
SHA256 (Pkgfile) = 16a9d70a3e5a11cf6b1c73891af1b2d73b9b1d30b89757810d04d03f1ae70128
SHA256 (.footprint) = 3dbf2964462ed959de999a87267c0423bf3a30a7c37fa3d1cda0d4e074dca557
SHA256 (opendoas-6.8.1.tar.xz) = 874fcb38ec51cadf9aa34e40dd469657af301588225d979813ad635e7eb40d46
SHA256 (doas.pam) = 7ba3c0ddd65859b711c87f536d7c465339162caee62ff241bebadb15a85a20dd
SHA256 (better-wayland-support.patch) = 1d3958a8519b2e95c3cf4f7a09556e48fe06b3aaffcc85c5b676b51a4c7141eb

View File

@ -5,12 +5,13 @@
name=opendoas
version=6.8.1
release=1
release=2
source=(https://github.com/Duncaen/OpenDoas/releases/download/v$version/$name-$version.tar.xz
doas.pam)
doas.pam better-wayland-support.patch)
build() {
cd $name-$version
patch -Np1 -i $SRC/better-wayland-support.patch
./configure --prefix=/usr \
--with-timestamp
make

View File

@ -0,0 +1,42 @@
From b861d070092ee71ac4208f79b699cf7dadd5c154 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 3 May 2021 15:42:19 +0200
Subject: [PATCH] Copy XDG_RUNTIME_DIR and WAYLAND_DISPLAY
This allows to run Wayland clients under doas.
---
doas.1 | 6 +++++-
env.c | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/doas.1 b/doas.1
index a91705e..bd1f543 100644
--- a/doas.1
+++ b/doas.1
@@ -58,8 +58,12 @@ is set to the name of the user executing
.Nm .
The variables
.Ev DISPLAY
-and
+,
.Ev TERM
+,
+.Ev XDG_RUNTIME_DIR
+and
+.Ev WAYLAND_DISPLAY
are inherited from the current environment.
This behavior may be modified by the config file.
The working directory is not changed.
diff --git a/env.c b/env.c
index e2286fc..b7955d7 100644
--- a/env.c
+++ b/env.c
@@ -91,7 +91,7 @@ createenv(const struct rule *rule, const struct passwd *mypw,
const struct passwd *targpw)
{
static const char *copyset[] = {
- "DISPLAY", "TERM",
+ "DISPLAY", "TERM", "XDG_RUNTIME_DIR", "WAYLAND_DISPLAY",
NULL
};
struct env *env;