diff options
Diffstat (limited to 'mail/thunderbird')
-rw-r--r-- | mail/thunderbird/distinfo | 4 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-aa-toplevel | 2 | ||||
-rw-r--r-- | mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc | 31 |
3 files changed, 31 insertions, 6 deletions
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 08f7fc3172c..94885659dd2 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.109 2012/12/12 08:35:58 ryoon Exp $ +$NetBSD: distinfo,v 1.110 2013/01/07 21:12:15 ryoon Exp $ SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a @@ -39,7 +39,7 @@ SHA1 (patch-bg) = 2e55ec7ad6d823b518af9bc59c4425f981f8b94d SHA1 (patch-bi) = bc44d47f386901d261a7a5401520a3905cb29d5a SHA1 (patch-config_baseconfig.mk) = f5494ace3f5947715cf6918b7d3e19c25fa26bf8 SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = a6d40c6b92aee607fb4f18d5a7c97b3d7833c74a -SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 94db51e427931edefd3df5b2c476702242a34926 +SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 84e3588ede7c1c0a03b23e5aa054e0c1ab2cfe27 SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 5f792d717f6373270dbee4aa9dbe278cc12d5f92 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 882b0987defaed4475317b8c500d3dffeb9d0866 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 1207a1e779ea0d48cb41f6a98edbe22f187b309b diff --git a/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel index 8e4b8141eb1..191658c2901 100644 --- a/mail/thunderbird/patches/patch-aa-toplevel +++ b/mail/thunderbird/patches/patch-aa-toplevel @@ -1,4 +1,4 @@ -$NetBSD: patch-aa-toplevel,v 1.9 2012/12/12 08:35:59 ryoon Exp $ +$NetBSD: patch-aa-toplevel,v 1.10 2013/01/07 21:12:15 ryoon Exp $ --- configure.in.orig 2012-11-19 22:35:28.000000000 +0000 +++ configure.in diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc index 8d74ff7ae11..5e1c6c49768 100644 --- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc +++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc @@ -1,6 +1,6 @@ -$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/09/02 06:43:40 ryoon Exp $ +$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.6 2013/01/07 21:12:15 ryoon Exp $ ---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000 +--- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2012-11-19 22:42:22.000000000 +0000 +++ mozilla/ipc/chromium/src/base/debug_util_posix.cc @@ -5,7 +5,7 @@ #include "build/build_config.h" @@ -37,7 +37,30 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/09/02 06:4 // Based on Apple's recommended method as described in // http://developer.apple.com/qa/qa2004/qa1361.html -@@ -71,7 +78,15 @@ bool DebugUtil::BeingDebugged() { +@@ -51,14 +58,22 @@ bool DebugUtil::BeingDebugged() { + // we're looking for information about a specific process ID. + int mib[] = { + CTL_KERN, ++#if defined(OS_NETBSD) ++ KERN_PROC2, ++#else + KERN_PROC, ++#endif + KERN_PROC_PID, + getpid() + }; + + // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and + // binary interfaces may change. ++#if defined(OS_NETBSD) ++ struct kinfo_proc2 info; ++#else + struct kinfo_proc info; ++#endif + size_t info_size = sizeof(info); + + int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0); +@@ -71,7 +86,17 @@ bool DebugUtil::BeingDebugged() { // This process is being debugged if the P_TRACED flag is set. is_set = true; @@ -47,6 +70,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/09/02 06:4 + being_debugged = (info.ki_flag & P_TRACED) != 0; +#elif defined(OS_OPENBSD) + being_debugged = (info.p_flag & P_TRACED) != 0; ++#elif defined(OS_NETBSD) ++ being_debugged = (info.p_flag & P_TRACED) != 0; +#else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif |