From owner-freebsd-gecko@FreeBSD.ORG Tue Aug 28 19:25:53 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADAAA106566B for ; Tue, 28 Aug 2012 19:25:53 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4604E8FC08 for ; Tue, 28 Aug 2012 19:25:52 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q7SJPpeR091046 for ; Tue, 28 Aug 2012 19:25:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7SJPjPn089571 for freebsd-gecko@freebsd.org; Tue, 28 Aug 2012 19:25:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 28 Aug 2012 19:25:45 GMT Message-Id: <201208281925.q7SJPjPn089571@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r959 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Aug 2012 19:25:53 -0000 Author: jbeich Date: Tue Aug 28 19:25:45 2012 New Revision: 959 Log: unbreak on OpenBSD Submitted by: landry@openbsd.org (earlier version) Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046 branches/experimental/mail/thunderbird/files/patch-bug753046 branches/experimental/www/firefox-esr/files/patch-bug753046 branches/experimental/www/firefox-nightly/files/patch-bug753046 branches/experimental/www/firefox/files/patch-bug753046 branches/experimental/www/libxul/files/patch-bug753046 branches/experimental/www/seamonkey/files/patch-bug753046 Modified: branches/experimental/mail/thunderbird-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Tue Aug 28 15:25:36 2012 (r958) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) @@ -553,7 +553,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -562,7 +562,7 @@ + +#include "base/process_util.h" + -+#include ++#include +#include +#include +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -842,7 +842,11 @@ +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; Modified: branches/experimental/mail/thunderbird/files/patch-bug753046 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bug753046 Tue Aug 28 15:25:36 2012 (r958) +++ branches/experimental/mail/thunderbird/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) @@ -581,7 +581,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -590,7 +590,7 @@ + +#include "base/process_util.h" + -+#include ++#include +#include +#include +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -870,7 +870,11 @@ +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; Modified: branches/experimental/www/firefox-esr/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-bug753046 Tue Aug 28 15:25:36 2012 (r958) +++ branches/experimental/www/firefox-esr/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) @@ -553,7 +553,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -562,7 +562,7 @@ + +#include "base/process_util.h" + -+#include ++#include +#include +#include +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -842,7 +842,11 @@ +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Aug 28 15:25:36 2012 (r958) +++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) @@ -566,7 +566,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,367 @@ +@@ -0,0 +1,371 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -575,7 +575,7 @@ + +#include "base/process_util.h" + -+#include ++#include +#include +#include +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -904,7 +904,11 @@ +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; Modified: branches/experimental/www/firefox/files/patch-bug753046 ============================================================================== --- branches/experimental/www/firefox/files/patch-bug753046 Tue Aug 28 15:25:36 2012 (r958) +++ branches/experimental/www/firefox/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) @@ -581,7 +581,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -590,7 +590,7 @@ + +#include "base/process_util.h" + -+#include ++#include +#include +#include +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -870,7 +870,11 @@ +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; Modified: branches/experimental/www/libxul/files/patch-bug753046 ============================================================================== --- branches/experimental/www/libxul/files/patch-bug753046 Tue Aug 28 15:25:36 2012 (r958) +++ branches/experimental/www/libxul/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) @@ -553,7 +553,7 @@ --- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -562,7 +562,7 @@ + +#include "base/process_util.h" + -+#include ++#include +#include +#include +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -842,7 +842,11 @@ +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue; Modified: branches/experimental/www/seamonkey/files/patch-bug753046 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bug753046 Tue Aug 28 15:25:36 2012 (r958) +++ branches/experimental/www/seamonkey/files/patch-bug753046 Tue Aug 28 19:25:45 2012 (r959) @@ -581,7 +581,7 @@ --- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-01 00:04:28.000000000 +0000 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc -@@ -0,0 +1,318 @@ +@@ -0,0 +1,322 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -590,7 +590,7 @@ + +#include "base/process_util.h" + -+#include ++#include +#include +#include +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) @@ -870,7 +870,11 @@ +# endif +#else + kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); ++#if defined(OS_OPENBSD) ++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries); ++#else + struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); ++#endif + if (procs != NULL && numEntries > 0) { + for (int i = 0; i < numEntries; i++) { + if (exe != procs[i].p_comm) continue;