neuter pledges (committed to upstream code) with #if 0, some change in

the 4.16.1->4.17 timeframe is causing calls into cairo which do shm access.
shm is not possible in a pledged process.

reported by Ralf Horstmann; for more details see
https://marc.info/?l=openbsd-ports&m=156762440931634&w=2

(missing pieces after forgotten cvs add)
This commit is contained in:
sthen 2019-09-04 20:25:48 +00:00
parent a4a9f41dd7
commit 5a03c386ba
3 changed files with 30 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.121 2019/09/04 20:24:04 sthen Exp $
# $OpenBSD: Makefile,v 1.122 2019/09/04 20:25:48 sthen Exp $
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.17.1
REVISION = 0
REVISION = 1
CATEGORIES = x11

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-i3-msg_main_c,v 1.6 2019/09/04 20:25:48 sthen Exp $
Index: i3-msg/main.c
--- i3-msg/main.c.orig
+++ i3-msg/main.c
@@ -156,7 +156,7 @@ static yajl_callbacks config_callbacks = {
};
int main(int argc, char *argv[]) {
-#if defined(__OpenBSD__)
+#if 0
if (pledge("stdio rpath unix", NULL) == -1)
err(EXIT_FAILURE, "pledge");
#endif

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_main_c,v 1.19 2019/09/04 20:25:48 sthen Exp $
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
@@ -948,7 +948,7 @@ int main(int argc, char *argv[]) {
xcb_free_pixmap(conn, pixmap);
}
-#if defined(__OpenBSD__)
+#if 0
if (pledge("stdio rpath wpath cpath proc exec unix", NULL) == -1)
err(EXIT_FAILURE, "pledge");
#endif