Sync with i3 port

"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" -- sthen@

Spotted by sthen@
This commit is contained in:
rsadowski 2019-09-06 18:54:56 +00:00
parent ce6d2fff0f
commit ff5446e487
4 changed files with 32 additions and 4 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2019/08/18 17:45:48 rsadowski Exp $
# $OpenBSD: Makefile,v 1.5 2019/09/06 18:54:56 rsadowski Exp $
COMMENT = improved dynamic tiling window manager, fork with gaps
V = 4.17
DISTNAME = i3-gaps-${V}
REVISION = 0
CATEGORIES = x11
@ -12,7 +13,6 @@ HOMEPAGE = https://i3wm.org/
# BSD
PERMIT_PACKAGE = Yes
# uses pledge()
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1
WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-i3-msg_main_c,v 1.1 2019/09/06 18:54:56 rsadowski 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

@ -1,4 +1,4 @@
$OpenBSD: patch-i3-nagbar_main_c,v 1.1.1.1 2019/03/07 19:34:32 rsadowski Exp $
$OpenBSD: patch-i3-nagbar_main_c,v 1.2 2019/09/06 18:54:56 rsadowski Exp $
Index: i3-nagbar/main.c
--- i3-nagbar/main.c.orig
@ -29,7 +29,7 @@ Index: i3-nagbar/main.c
/* Initialize the drawable bar */
draw_util_surface_init(conn, &bar, win, get_visualtype(root_screen), win_pos.width, win_pos.height);
+
+#if defined(__OpenBSD__)
+#if 0
+ if (pledge("stdio rpath wpath cpath getpw proc exec", NULL) == -1)
+ err(EXIT_FAILURE, "pledge");
+#endif

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_main_c,v 1.1 2019/09/06 18:54:56 rsadowski Exp $
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
@@ -947,7 +947,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