1 files changed, 159 insertions, 0 deletions
diff --git a/x11/gtk+2/patches/patch-gtk_gtkmountoperation-x11_c b/x11/gtk+2/patches/patch-gtk_gtkmountoperation-x11_c
new file mode 100644
index 0000000..4c805e1
--- /dev/null
+++ b/x11/gtk+2/patches/patch-gtk_gtkmountoperation-x11_c
@@ -0,0 +1,159 @@
+From 7d8be1c1ffc31523e2de09d4829169b78dd391e4 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@openbsd.org>
+Date: Fri, 17 May 2019 11:55:16 +0000
+Subject: [PATCH] pid_get_parent: fix potential leak of kp
+From 0334ea1c889331adb02d361670e24b3f85b5b0d6 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Mon, 13 May 2019 20:47:46 +0200
+Subject: [PATCH] pid_get_parent: fix for OpenBSD
+From ad9da2727d3e3243fd052c9feb0c55645e87d384 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jmatthew@openbsd.org>
+Date: Fri, 8 Jul 2011 10:24:32 +1000
+Subject: GMountOperation::show-processes support for OpenBSD using kvm(3)
+From 3d165c1a902fc0a5f32898e406a79e53ed4bcc97 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@openbsd.org>
+Date: Tue, 20 Sep 2011 11:57:49 +0200
+Subject: gtkmountoperation-x11: unbreak compilation on OpenBSD.
+From d987a01d80126ee351727d1603a599c4edb66eca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@openbsd.org>
+Date: Sat, 15 Oct 2011 11:27:47 +0200
+Subject: GMountOperation on OpenBSD: remove the need for kvm(3)
+From 974212ec825d8d50bdea8ab955b6f19b8ed1672f Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Mon, 9 Jul 2012 18:20:34 +0200
+Subject: OpenBSD: use G_N_ELEMENTS instead of nitems
+From 8935d2f123878c31af69b6c6034069ad540b13c7 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Fri, 25 Apr 2014 14:37:59 +0200
+Subject: openbsd: properly set len for gtkmountoperation-x11
+Index: gtk/gtkmountoperation-x11.c
+--- gtk/gtkmountoperation-x11.c.orig
+++ gtk/gtkmountoperation-x11.c
+@@ -43,9 +43,6 @@
+ #include <errno.h>
+ 
+ #if defined(__OpenBSD__)
+-#include <sys/param.h>
+-#include <kvm.h>
+-#include <fcntl.h>
+ #include <sys/sysctl.h>
+ #endif
+ 
+@@ -724,6 +721,110 @@ pid_get_command_line (GPid pid)
+ }
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+
+#elif defined(__OpenBSD__)
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static GPid
+pid_get_parent (GPid pid)
+{
+  struct kinfo_proc *kp = NULL;
+  size_t len;
+  GPid ppid = 0;
+
+  /* fail if trying to get the parent of the init process (no such thing) */
+  if (pid == 1)
+      goto out;
+
+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
+                sizeof(struct kinfo_proc), 0 };
+
+  if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
+      goto out;
+
+  mib[5] = (len / sizeof(struct kinfo_proc));
+
+  kp = g_malloc0 (len);
+
+  if (sysctl (mib, G_N_ELEMENTS (mib), kp, &len, NULL, 0) < 0)
+      goto out;
+
+  ppid = kp->p_ppid;
+
+out:
+  if (kp)
+      g_free (kp);
+  return ppid;
+}
+
+static gchar *
+pid_get_env (GPid pid, const gchar *key)
+{
+  size_t len;
+  char **strs;
+  char *ret = NULL;
+  char *end;
+  int key_len;
+  int i;
+
+  int mib[] = { CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_ENV };
+
+  if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
+    return ret;
+
+  strs = g_malloc0 (len);
+
+  key_len = strlen (key);
+
+  if (sysctl (mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) != -1)
+    {
+      for (i = 0; strs[i] != NULL; i++)
+       {
+         if (g_str_has_prefix (strs[i], key) && (*(strs[i] + key_len) == '='))
+           {
+             ret = g_strdup (strs[i] + key_len + 1);
+
+             /* skip invalid UTF-8 */
+             if (!g_utf8_validate (ret, -1, (const gchar **) &end))
+               *end = '\0';
+             break;
+           }
+       }
+    }
+
+  g_free (strs);
+  return ret;
+}
+
+static gchar *
+pid_get_command_line (GPid pid)
+{
+  size_t len;
+  char **strs;
+  char *ret, *end;
+
+  int mib[] = { CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_ARGV };
+
+  if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
+    return NULL;
+
+  strs = g_malloc0 (len);
+
+  if (sysctl (mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) == -1) {
+    g_free (strs);
+    return NULL;
+  }
+
+  ret = g_strjoinv (" ", strs);
+  /* skip invalid UTF-8 */
+  if (!g_utf8_validate (ret, -1, (const gchar **) &end))
+    *end = '\0';
+
+  g_free (strs);
+  return ret;
+}
+
+ #else
+ 
+ /* TODO: please implement for your OS - must return valid UTF-8 */

diff --git a/x11/gtk+2/patches/patch-gtk_gtkmountoperation-x11_c b/x11/gtk+2/patches/patch-gtk_gtkmountoperation-x11_c new file mode 100644 index 0000000..4c805e1 --- /dev/null +++ b/x11/gtk+2/patches/patch-gtk_gtkmountoperation-x11_c
@@ -0,0 +1,159 @@
	1	From 7d8be1c1ffc31523e2de09d4829169b78dd391e4 Mon Sep 17 00:00:00 2001
	2	From: Antoine Jacoutot <ajacoutot@openbsd.org>
	3	Date: Fri, 17 May 2019 11:55:16 +0000
	4	Subject: [PATCH] pid_get_parent: fix potential leak of kp
	5
	6	From 0334ea1c889331adb02d361670e24b3f85b5b0d6 Mon Sep 17 00:00:00 2001
	7	From: Antoine Jacoutot <ajacoutot@gnome.org>
	8	Date: Mon, 13 May 2019 20:47:46 +0200
	9	Subject: [PATCH] pid_get_parent: fix for OpenBSD
	10
	11	From ad9da2727d3e3243fd052c9feb0c55645e87d384 Mon Sep 17 00:00:00 2001
	12	From: Jonathan Matthew <jmatthew@openbsd.org>
	13	Date: Fri, 8 Jul 2011 10:24:32 +1000
	14	Subject: GMountOperation::show-processes support for OpenBSD using kvm(3)
	15
	16	From 3d165c1a902fc0a5f32898e406a79e53ed4bcc97 Mon Sep 17 00:00:00 2001
	17	From: Antoine Jacoutot <ajacoutot@openbsd.org>
	18	Date: Tue, 20 Sep 2011 11:57:49 +0200
	19	Subject: gtkmountoperation-x11: unbreak compilation on OpenBSD.
	20
	21	From d987a01d80126ee351727d1603a599c4edb66eca Mon Sep 17 00:00:00 2001
	22	From: Antoine Jacoutot <ajacoutot@openbsd.org>
	23	Date: Sat, 15 Oct 2011 11:27:47 +0200
	24	Subject: GMountOperation on OpenBSD: remove the need for kvm(3)
	25
	26	From 974212ec825d8d50bdea8ab955b6f19b8ed1672f Mon Sep 17 00:00:00 2001
	27	From: Antoine Jacoutot <ajacoutot@gnome.org>
	28	Date: Mon, 9 Jul 2012 18:20:34 +0200
	29	Subject: OpenBSD: use G_N_ELEMENTS instead of nitems
	30
	31	From 8935d2f123878c31af69b6c6034069ad540b13c7 Mon Sep 17 00:00:00 2001
	32	From: Antoine Jacoutot <ajacoutot@gnome.org>
	33	Date: Fri, 25 Apr 2014 14:37:59 +0200
	34	Subject: openbsd: properly set len for gtkmountoperation-x11
	35
	36	Index: gtk/gtkmountoperation-x11.c
	37	--- gtk/gtkmountoperation-x11.c.orig
	38	+++ gtk/gtkmountoperation-x11.c
	39	@@ -43,9 +43,6 @@
	40	#include <errno.h>
	41
	42	#if defined(__OpenBSD__)
	43	-#include <sys/param.h>
	44	-#include <kvm.h>
	45	-#include <fcntl.h>
	46	#include <sys/sysctl.h>
	47	#endif
	48
	49	@@ -724,6 +721,110 @@ pid_get_command_line (GPid pid)
	50	}
	51
	52	/* ---------------------------------------------------------------------------------------------------- */
	53	+
	54	+#elif defined(__OpenBSD__)
	55	+
	56	+/* ---------------------------------------------------------------------------------------------------- */
	57	+
	58	+static GPid
	59	+pid_get_parent (GPid pid)
	60	+{
	61	+ struct kinfo_proc *kp = NULL;
	62	+ size_t len;
	63	+ GPid ppid = 0;
	64	+
	65	+ /* fail if trying to get the parent of the init process (no such thing) */
	66	+ if (pid == 1)
	67	+ goto out;
	68	+
	69	+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
	70	+ sizeof(struct kinfo_proc), 0 };
	71	+
	72	+ if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
	73	+ goto out;
	74	+
	75	+ mib[5] = (len / sizeof(struct kinfo_proc));
	76	+
	77	+ kp = g_malloc0 (len);
	78	+
	79	+ if (sysctl (mib, G_N_ELEMENTS (mib), kp, &len, NULL, 0) < 0)
	80	+ goto out;
	81	+
	82	+ ppid = kp->p_ppid;
	83	+
	84	+out:
	85	+ if (kp)
	86	+ g_free (kp);
	87	+ return ppid;
	88	+}
	89	+
	90	+static gchar *
	91	+pid_get_env (GPid pid, const gchar *key)
	92	+{
	93	+ size_t len;
	94	+ char **strs;
	95	+ char *ret = NULL;
	96	+ char *end;
	97	+ int key_len;
	98	+ int i;
	99	+
	100	+ int mib[] = { CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_ENV };
	101	+
	102	+ if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
	103	+ return ret;
	104	+
	105	+ strs = g_malloc0 (len);
	106	+
	107	+ key_len = strlen (key);
	108	+
	109	+ if (sysctl (mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) != -1)
	110	+ {
	111	+ for (i = 0; strs[i] != NULL; i++)
	112	+ {
	113	+ if (g_str_has_prefix (strs[i], key) && (*(strs[i] + key_len) == '='))
	114	+ {
	115	+ ret = g_strdup (strs[i] + key_len + 1);
	116	+
	117	+ /* skip invalid UTF-8 */
	118	+ if (!g_utf8_validate (ret, -1, (const gchar **) &end))
	119	+ *end = '\0';
	120	+ break;
	121	+ }
	122	+ }
	123	+ }
	124	+
	125	+ g_free (strs);
	126	+ return ret;
	127	+}
	128	+
	129	+static gchar *
	130	+pid_get_command_line (GPid pid)
	131	+{
	132	+ size_t len;
	133	+ char **strs;
	134	+ char ret, end;
	135	+
	136	+ int mib[] = { CTL_KERN, KERN_PROC_ARGS, pid, KERN_PROC_ARGV };
	137	+
	138	+ if (sysctl (mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
	139	+ return NULL;
	140	+
	141	+ strs = g_malloc0 (len);
	142	+
	143	+ if (sysctl (mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) == -1) {
	144	+ g_free (strs);
	145	+ return NULL;
	146	+ }
	147	+
	148	+ ret = g_strjoinv (" ", strs);
	149	+ /* skip invalid UTF-8 */
	150	+ if (!g_utf8_validate (ret, -1, (const gchar **) &end))
	151	+ *end = '\0';
	152	+
	153	+ g_free (strs);
	154	+ return ret;
	155	+}
	156	+
	157	#else
	158
	159	/* TODO: please implement for your OS - must return valid UTF-8 */