pushed upstream

This commit is contained in:
jasper 2013-04-01 11:42:18 +00:00
parent f515e98f9e
commit f7f14f0e06
2 changed files with 13 additions and 3 deletions

View File

@ -1,6 +1,11 @@
$OpenBSD: patch-src_daemon_server_c,v 1.2 2011/08/17 12:34:47 jasper Exp $
$OpenBSD: patch-src_daemon_server_c,v 1.3 2013/04/01 11:42:18 jasper Exp $
From FreeBSD.
From a44392d948535a4f1a3a5906f0c4b3fe5430a167 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Mon, 01 Apr 2013 11:35:24 +0000
Subject: Don't error out when running on a different release than built on
https://bugzilla.gnome.org/show_bug.cgi?id=653177
--- src/daemon/server.c.orig Mon Mar 14 23:08:03 2011
+++ src/daemon/server.c Mon Aug 1 09:22:45 2011

View File

@ -1,10 +1,15 @@
$OpenBSD: patch-sysdeps_openbsd_prockernel_c,v 1.5 2013/03/27 07:57:38 jasper Exp $
$OpenBSD: patch-sysdeps_openbsd_prockernel_c,v 1.6 2013/04/01 11:42:18 jasper Exp $
From b11aa1517e203e36a8901f03ea57c50a25dfbfc7 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sun, 22 Jan 2012 11:47:49 +0000
Subject: OpenBSD: kinfo_proc2 -> kinfo_proc
From dc7eab432973e659a7d7054193da42260e148988 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Mon, 01 Apr 2013 11:40:11 +0000
Subject: Adjust for the fact that regular users cannot read wchan anymore in OpenBSD 5.4.
--- sysdeps/openbsd/prockernel.c.orig Sun Jul 24 21:13:56 2011
+++ sysdeps/openbsd/prockernel.c Wed Mar 27 08:53:04 2013
@@ -57,7 +57,7 @@ glibtop_get_proc_kernel_p (glibtop *server,