aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremmett1 <emmett1.2miligrams@protonmail.com>2025-05-25 12:48:54 +0800
committeremmett1 <emmett1.2miligrams@protonmail.com>2025-05-25 12:48:54 +0800
commitda90ad55ae0be57f2de7eaeaba9d71797ba3c50a (patch)
tree5b2e59f2aae70ecf4bb9f2b795ae3856e5ac618d
parentfc9b0956a2ee65a2371f4de7a8f2293ccbeef4e3 (diff)
downloadalicelinux-da90ad55ae0be57f2de7eaeaba9d71797ba3c50a.tar.gz
alicelinux-da90ad55ae0be57f2de7eaeaba9d71797ba3c50a.zip
opendoas: added patch for better wayland support
-rw-r--r--repos/extra/opendoas/.checksum1
-rw-r--r--repos/extra/opendoas/abuild5
-rw-r--r--repos/extra/opendoas/better-wayland-support.patch42
3 files changed, 46 insertions, 2 deletions
diff --git a/repos/extra/opendoas/.checksum b/repos/extra/opendoas/.checksum
index c8148b4a..db719d77 100644
--- a/repos/extra/opendoas/.checksum
+++ b/repos/extra/opendoas/.checksum
@@ -1,2 +1,3 @@
+de5c561e6570e64562f6e5294d6993672abef3d01742f01ea0681847a0c88af2 better-wayland-support.patch
e46e0b0581322a2fd5c02b96033544dd8df5e9d8d9e86b1c022daf653ee63df4 doas.conf
55d03b4c113bfa6c16f2abdee04192b8416c5ed91baef825f8fb27450aeaa197 opendoas-6.8.2.tar.xz
diff --git a/repos/extra/opendoas/abuild b/repos/extra/opendoas/abuild
index 8f96fdde..449a92d7 100644
--- a/repos/extra/opendoas/abuild
+++ b/repos/extra/opendoas/abuild
@@ -1,8 +1,9 @@
name=opendoas
version=6.8.2
-release=1
+release=2
source="https://github.com/Duncaen/OpenDoas/releases/download/v${version}/${name}-${version}.tar.xz
- doas.conf"
+ doas.conf
+ better-wayland-support.patch"
build() {
BINOWN="$(id -u)" \
diff --git a/repos/extra/opendoas/better-wayland-support.patch b/repos/extra/opendoas/better-wayland-support.patch
new file mode 100644
index 00000000..e77bf0a1
--- /dev/null
+++ b/repos/extra/opendoas/better-wayland-support.patch
@@ -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;