Fri Aug 31 11:52:13 2012 UTC ()
Add one more patch from https://bugzilla.mozilla.org/show_bug.cgi?id=753046,
mainly improve OpenBSD build.


(ryoon)
diff -r1.75 -r1.76 pkgsrc/devel/xulrunner/distinfo
diff -r1.7 -r1.8 pkgsrc/devel/xulrunner/patches/patch-ipc_chromium_src_base_process__util__bsd.cc
cvs diff -r1.75 -r1.76 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2012/08/28 23:27:10 1.75
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2012/08/31 11:52:13 1.76
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.75 2012/08/28 23:27:10 ryoon Exp $ 1$NetBSD: distinfo,v 1.76 2012/08/31 11:52:13 ryoon Exp $
2 2
3SHA1 (firefox-15.0.source.tar.bz2) = a5e6067cf3fb7741818b630d90778928873a2b04 3SHA1 (firefox-15.0.source.tar.bz2) = a5e6067cf3fb7741818b630d90778928873a2b04
4RMD160 (firefox-15.0.source.tar.bz2) = e70629dbd92db68e39707e28fbe53df7f0946c36 4RMD160 (firefox-15.0.source.tar.bz2) = e70629dbd92db68e39707e28fbe53df7f0946c36
5Size (firefox-15.0.source.tar.bz2) = 83713360 bytes 5Size (firefox-15.0.source.tar.bz2) = 83713360 bytes
6SHA1 (patch-aa) = 2c9a546ae951630e07668c9875d20041a6e5adac 6SHA1 (patch-aa) = 2c9a546ae951630e07668c9875d20041a6e5adac
7SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128 7SHA1 (patch-ab) = b0d7975a291c63e07773e13b023f71e88c883128
8SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f 8SHA1 (patch-ac) = 18640ddf00b7da9276fd67d95bd6f1b191a99d4f
9SHA1 (patch-ad) = cf84430cb1d9c22caf6beaa89288f90577ae6352 9SHA1 (patch-ad) = cf84430cb1d9c22caf6beaa89288f90577ae6352
10SHA1 (patch-ae) = 2d1ffba3f41564d672d05968ff09b188c904fd73 10SHA1 (patch-ae) = 2d1ffba3f41564d672d05968ff09b188c904fd73
11SHA1 (patch-af) = 3dc276155f456a66ce0db9d1a0427d8f11cb74aa 11SHA1 (patch-af) = 3dc276155f456a66ce0db9d1a0427d8f11cb74aa
12SHA1 (patch-ag) = c236c83c7b6a64c19c01010d19cad0120250047c 12SHA1 (patch-ag) = c236c83c7b6a64c19c01010d19cad0120250047c
13SHA1 (patch-ai) = ec2a8bce48ec8a27066667d367cf1bac4874462b 13SHA1 (patch-ai) = ec2a8bce48ec8a27066667d367cf1bac4874462b
14SHA1 (patch-aj) = 25008e1761306f90a31b4e2bff4dc52b2d8167de 14SHA1 (patch-aj) = 25008e1761306f90a31b4e2bff4dc52b2d8167de
@@ -37,27 +37,27 @@ SHA1 (patch-dom_plugins_ipc_PluginModule @@ -37,27 +37,27 @@ SHA1 (patch-dom_plugins_ipc_PluginModule
37SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 775c13ca6a77b3f39f23e15fbbcf4b1cae4e9478 37SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 775c13ca6a77b3f39f23e15fbbcf4b1cae4e9478
38SHA1 (patch-ipc_chromium_Makefile.in) = 4fbd046e80824669547d5dcb809a3126ce2b96b8 38SHA1 (patch-ipc_chromium_Makefile.in) = 4fbd046e80824669547d5dcb809a3126ce2b96b8
39SHA1 (patch-ipc_chromium_chromium-config.mk) = 24b1fe7cc7f3f14dd8a79f8eedf6f3638c304020 39SHA1 (patch-ipc_chromium_chromium-config.mk) = 24b1fe7cc7f3f14dd8a79f8eedf6f3638c304020
40SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 0b8e231055cde854f31b9aa44392692a53d806f0 40SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 0b8e231055cde854f31b9aa44392692a53d806f0
41SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 46bf793870b4fbc2c8594186eea6bd3c7db885e9 41SHA1 (patch-ipc_chromium_src_base_debug__util__posix.cc) = 46bf793870b4fbc2c8594186eea6bd3c7db885e9
42SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 26257fc46798b00c469875cf249a23c4a45e631e 42SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 26257fc46798b00c469875cf249a23c4a45e631e
43SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = d6dd15f644de3fa755f8c9be9190eb4092295091 43SHA1 (patch-ipc_chromium_src_base_dir__reader__posix.h) = d6dd15f644de3fa755f8c9be9190eb4092295091
44SHA1 (patch-ipc_chromium_src_base_file__util__linux.cc) = f5a4b391c5c21708c51ad94d6cd02156be78c999 44SHA1 (patch-ipc_chromium_src_base_file__util__linux.cc) = f5a4b391c5c21708c51ad94d6cd02156be78c999
45SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6 45SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 96a5a0d4b61ec69b80db3c9ff212d7a7a3d506f6
46SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = c53a8962a197a3160087ad31e1a55f647a8d8fc8 46SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = c53a8962a197a3160087ad31e1a55f647a8d8fc8
47SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 1f6eb9d0da16b415df6c2ced4e507d1cbf7dfdae 47SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 1f6eb9d0da16b415df6c2ced4e507d1cbf7dfdae
48SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 771bcb1d149b5bdaf1c94bd231ccc8c032721a80 48SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 771bcb1d149b5bdaf1c94bd231ccc8c032721a80
49SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be 49SHA1 (patch-ipc_chromium_src_base_process__util.h) = f0e705d9e7951d12225ad132f462527651d3b1be
50SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 4d2d66b37452134148e6a726117fce6ff4569798 50SHA1 (patch-ipc_chromium_src_base_process__util__bsd.cc) = 1cb9b20816fc749f4f376cd98383ec0a7575c6f3
51SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 4644a4a2f37fae689b5997eda1c9b548372fa252 51SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = 4644a4a2f37fae689b5997eda1c9b548372fa252
52SHA1 (patch-ipc_chromium_src_base_ref__counted.h) = 89d6be3faaed51c7ed2e49ee8698d730916ce12f 52SHA1 (patch-ipc_chromium_src_base_ref__counted.h) = 89d6be3faaed51c7ed2e49ee8698d730916ce12f
53SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = ce9b899f181d8339110d3a9a151bff9ab734df42 53SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = ce9b899f181d8339110d3a9a151bff9ab734df42
54SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 73969db2001bb9178fcfe6df73afd2b9dbd3b21d 54SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 73969db2001bb9178fcfe6df73afd2b9dbd3b21d
55SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 9a897d9828dc5d93807d578ab8526facc846c263 55SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prtime.cc) = 9a897d9828dc5d93807d578ab8526facc846c263
56SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 986f4a648d812c67248bd5e2c7b96963f2aa1a03 56SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = 986f4a648d812c67248bd5e2c7b96963f2aa1a03
57SHA1 (patch-ipc_chromium_src_build_build__config.h) = 041342ccb534e8e3b07cf454e1f3bd61372b376b 57SHA1 (patch-ipc_chromium_src_build_build__config.h) = 041342ccb534e8e3b07cf454e1f3bd61372b376b
58SHA1 (patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h) = 3cd047d60e91d85458812796950c4eb8b153bd0b 58SHA1 (patch-ipc_chromium_src_chrome_common_file__descriptor__set__posix.h) = 3cd047d60e91d85458812796950c4eb8b153bd0b
59SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = 2b176b9bc689cec41542aa00f5201e27ca694594 59SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = 2b176b9bc689cec41542aa00f5201e27ca694594
60SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 2258766f2c57323c90fadfc7b95e0a1b04ca4655 60SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 2258766f2c57323c90fadfc7b95e0a1b04ca4655
61SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = 84a078bdf4e8478bac30a3ff85ff286081a866db 61SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = 84a078bdf4e8478bac30a3ff85ff286081a866db
62SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 15146bd327bb51b8de0783ff28b70201e3bfa532 62SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 15146bd327bb51b8de0783ff28b70201e3bfa532
63SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = abee0bd47a76448cd5709a34ed5ac0d56d00ac6f 63SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = abee0bd47a76448cd5709a34ed5ac0d56d00ac6f
cvs diff -r1.7 -r1.8 pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_process__util__bsd.cc (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_process__util__bsd.cc 2012/08/28 23:27:10 1.7
+++ pkgsrc/devel/xulrunner/patches/Attic/patch-ipc_chromium_src_base_process__util__bsd.cc 2012/08/31 11:52:13 1.8
@@ -1,55 +1,51 @@ @@ -1,55 +1,51 @@
1$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.7 2012/08/28 23:27:10 ryoon Exp $ 1$NetBSD: patch-ipc_chromium_src_base_process__util__bsd.cc,v 1.8 2012/08/31 11:52:13 ryoon Exp $
2 2
3--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-08-28 18:53:59.000000000 +0000 3--- ipc/chromium/src/base/process_util_bsd.cc.orig 2012-08-28 18:53:59.000000000 +0000
4+++ ipc/chromium/src/base/process_util_bsd.cc 4+++ ipc/chromium/src/base/process_util_bsd.cc
5@@ -0,0 +1,318 @@ 5@@ -0,0 +1,318 @@
6+// Copyright (c) 2008 The Chromium Authors. All rights reserved. 6+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
7+// Use of this source code is governed by a BSD-style license that can be 7+// Use of this source code is governed by a BSD-style license that can be
8+// found in the LICENSE file. 8+// found in the LICENSE file.
9+ 9+
10+// derived from process_util_linux.cc and process_util_mac.cc 10+// derived from process_util_linux.cc and process_util_mac.cc
11+ 11+
12+#include "base/process_util.h" 12+#include "base/process_util.h"
13+ 13+
14+#include <sys/types.h> 14+#include <sys/param.h>
15+#include <sys/sysctl.h> 15+#include <sys/sysctl.h>
16+#include <sys/wait.h> 16+#include <sys/wait.h>
17+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) 17+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
18+#include <sys/user.h> 18+#include <sys/user.h>
19+#endif 19+#endif
20+ 20+
21+#include <ctype.h> 21+#include <ctype.h>
22+#include <fcntl.h> 22+#include <fcntl.h>
23+#include <kvm.h> 23+#include <kvm.h>
24+#include <unistd.h> 24+#include <unistd.h>
25+ 25+
26+#include <string> 26+#include <string>
27+ 27+
28+#include "base/debug_util.h" 28+#include "base/debug_util.h"
29+#include "base/eintr_wrapper.h" 29+#include "base/eintr_wrapper.h"
30+#include "base/file_util.h" 30+#include "base/file_util.h"
31+#include "base/logging.h" 31+#include "base/logging.h"
32+#include "base/string_tokenizer.h" 32+#include "base/string_tokenizer.h"
33+#include "base/string_util.h" 33+#include "base/string_util.h"
34+ 34+
35+#if defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0 35+#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \
36+#define HAVE_POSIX_SPAWN 1 36+ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500)
37+#elif defined(OS_NETBSD) 
38+#include <sys/param.h> 
39+#if __NetBSD_Version__ >= 599006500 
40+#define HAVE_POSIX_SPAWN 1 37+#define HAVE_POSIX_SPAWN 1
41+#endif 38+#endif
42+#endif 
43+ 39+
44+#ifndef __dso_public 40+#ifndef __dso_public
45+# ifdef __exported 41+# ifdef __exported
46+# define __dso_public __exported 42+# define __dso_public __exported
47+# else 43+# else
48+# define __dso_public __attribute__((__visibility__("default"))) 44+# define __dso_public __attribute__((__visibility__("default")))
49+# endif 45+# endif
50+#endif 46+#endif
51+ 47+
52+#ifdef HAVE_POSIX_SPAWN 48+#ifdef HAVE_POSIX_SPAWN
53+#include <spawn.h> 49+#include <spawn.h>
54+extern "C" char **environ __dso_public; 50+extern "C" char **environ __dso_public;
55+#endif 51+#endif
@@ -281,27 +277,31 @@ $NetBSD: patch-ipc_chromium_src_base_pro @@ -281,27 +277,31 @@ $NetBSD: patch-ipc_chromium_src_base_pro
281+ strlcpy(e.szExeFile, procs[i].kp_comm, sizeof e.szExeFile); 277+ strlcpy(e.szExeFile, procs[i].kp_comm, sizeof e.szExeFile);
282+ content.push_back(e); 278+ content.push_back(e);
283+# elif defined(OS_FREEBSD) 279+# elif defined(OS_FREEBSD)
284+ if (exe != procs[i].ki_comm) continue; 280+ if (exe != procs[i].ki_comm) continue;
285+ if (filter && !filter->Includes(procs[i].ki_pid, procs[i].ki_ppid)) continue; 281+ if (filter && !filter->Includes(procs[i].ki_pid, procs[i].ki_ppid)) continue;
286+ ProcessEntry e; 282+ ProcessEntry e;
287+ e.pid = procs[i].ki_pid; 283+ e.pid = procs[i].ki_pid;
288+ e.ppid = procs[i].ki_ppid; 284+ e.ppid = procs[i].ki_ppid;
289+ strlcpy(e.szExeFile, procs[i].ki_comm, sizeof e.szExeFile); 285+ strlcpy(e.szExeFile, procs[i].ki_comm, sizeof e.szExeFile);
290+ content.push_back(e); 286+ content.push_back(e);
291+# endif 287+# endif
292+#else 288+#else
293+ kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); 289+ kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
 290+#if defined(OS_OPENBSD)
 291+ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries);
 292+#else
294+ struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries); 293+ struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries);
 294+#endif
295+ if (procs != NULL && numEntries > 0) { 295+ if (procs != NULL && numEntries > 0) {
296+ for (int i = 0; i < numEntries; i++) { 296+ for (int i = 0; i < numEntries; i++) {
297+ if (exe != procs[i].p_comm) continue; 297+ if (exe != procs[i].p_comm) continue;
298+ if (filter && !filter->Includes(procs[i].p_pid, procs[i].p_ppid)) continue; 298+ if (filter && !filter->Includes(procs[i].p_pid, procs[i].p_ppid)) continue;
299+ ProcessEntry e; 299+ ProcessEntry e;
300+ e.pid = procs[i].p_pid; 300+ e.pid = procs[i].p_pid;
301+ e.ppid = procs[i].p_ppid; 301+ e.ppid = procs[i].p_ppid;
302+ strlcpy(e.szExeFile, procs[i].p_comm, sizeof e.szExeFile); 302+ strlcpy(e.szExeFile, procs[i].p_comm, sizeof e.szExeFile);
303+ content.push_back(e); 303+ content.push_back(e);
304+#endif 304+#endif
305+ } 305+ }
306+ } 306+ }
307+ nextEntry = 0; 307+ nextEntry = 0;