Update to 10.0.12 Changelog: from http://www.mozilla.org/en-US/thunderbird/10.0.12/releasenotes/ FIXED Security fixes can be found here MFSA 2013-20 Mis-issued TURKTRUST certificates MFSA 2013-17 Use-after-free in ListenerManager MFSA 2013-16 Use-after-free in serializeToStream MFSA 2013-15 Privilege escalation through plugin objects MFSA 2013-12 Buffer overflow in Javascript string concatenation MFSA 2013-11 Address space layout leaked in XBL objects MFSA 2013-09 Compartment mismatch with quickstubs returned values MFSA 2013-05 Use-after-free when displaying table with many columns and column groups MFSA 2013-04 URL spoofing in addressbar during page loads MFSA 2013-02 Use-after-free and buffer overflow issues found using Address Sanitizer MFSA 2013-01 Miscellaneous memory safety hazards (rv:18.0/ rv:10.0.12 / rv:17.0.2)diff -r1.18 -r1.19 pkgsrc/mail/thunderbird10/Makefile
(ryoon)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.18 2012/11/22 08:14:15 is Exp $ | 1 | # $NetBSD: Makefile,v 1.19 2013/01/10 16:09:59 ryoon Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= thunderbird-${TB_VER}esr.source | 4 | DISTNAME= thunderbird-${TB_VER}esr.source | |
5 | PKGNAME= thunderbird10-${TB_VER} | 5 | PKGNAME= thunderbird10-${TB_VER} | |
6 | TB_VER= 10.0.11 | 6 | TB_VER= 10.0.12 | |
7 | CATEGORIES= mail | 7 | CATEGORIES= mail | |
8 | MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/} | 8 | MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/} | |
9 | EXTRACT_SUFX= .tar.bz2 | 9 | EXTRACT_SUFX= .tar.bz2 | |
10 | 10 | |||
11 | MAINTAINER= tnn@NetBSD.org | 11 | MAINTAINER= tnn@NetBSD.org | |
12 | HOMEPAGE= http://www.mozilla.org/en-US/thunderbird/organizations/ | 12 | HOMEPAGE= http://www.mozilla.org/en-US/thunderbird/organizations/ | |
13 | COMMENT= Organize, secure and customize your mail | 13 | COMMENT= Organize, secure and customize your mail | |
14 | 14 | |||
15 | USE_TOOLS+= unzip pax | 15 | USE_TOOLS+= unzip pax | |
16 | WRKSRC= ${WRKDIR}/comm-esr10 | 16 | WRKSRC= ${WRKDIR}/comm-esr10 | |
17 | MOZILLA_DIR= mozilla/ | 17 | MOZILLA_DIR= mozilla/ | |
18 | PLIST_SRC+= ${PLIST_SRC_DFLT} | 18 | PLIST_SRC+= ${PLIST_SRC_DFLT} | |
19 | 19 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.4 2012/11/22 08:14:15 is Exp $ | 1 | @comment $NetBSD: PLIST,v 1.5 2013/01/10 16:09:59 ryoon Exp $ | |
2 | bin/thunderbird10 | 2 | bin/thunderbird10 | |
3 | include/thunderbird10/AtkSocketAccessible.h | 3 | include/thunderbird10/AtkSocketAccessible.h | |
4 | include/thunderbird10/BasicLayers.h | 4 | include/thunderbird10/BasicLayers.h | |
5 | include/thunderbird10/CheckedInt.h | 5 | include/thunderbird10/CheckedInt.h | |
6 | include/thunderbird10/CustomQS_Canvas2D.h | 6 | include/thunderbird10/CustomQS_Canvas2D.h | |
7 | include/thunderbird10/CustomQS_WebGL.h | 7 | include/thunderbird10/CustomQS_WebGL.h | |
8 | include/thunderbird10/EGLUtils.h | 8 | include/thunderbird10/EGLUtils.h | |
9 | include/thunderbird10/ForceDiscreteGPUHelperCGL.h | 9 | include/thunderbird10/ForceDiscreteGPUHelperCGL.h | |
10 | include/thunderbird10/FrameLayerBuilder.h | 10 | include/thunderbird10/FrameLayerBuilder.h | |
11 | include/thunderbird10/FramePropertyTable.h | 11 | include/thunderbird10/FramePropertyTable.h | |
12 | include/thunderbird10/GLContext.h | 12 | include/thunderbird10/GLContext.h | |
13 | include/thunderbird10/GLContextProvider.h | 13 | include/thunderbird10/GLContextProvider.h | |
14 | include/thunderbird10/GLContextProviderImpl.h | 14 | include/thunderbird10/GLContextProviderImpl.h | |
@@ -210,29 +210,31 @@ include/thunderbird10/mozIStorageService | @@ -210,29 +210,31 @@ include/thunderbird10/mozIStorageService | |||
210 | include/thunderbird10/mozIStorageServiceQuotaManagement.h | 210 | include/thunderbird10/mozIStorageServiceQuotaManagement.h | |
211 | include/thunderbird10/mozIStorageStatement.h | 211 | include/thunderbird10/mozIStorageStatement.h | |
212 | include/thunderbird10/mozIStorageStatementCallback.h | 212 | include/thunderbird10/mozIStorageStatementCallback.h | |
213 | include/thunderbird10/mozIStorageStatementWrapper.h | 213 | include/thunderbird10/mozIStorageStatementWrapper.h | |
214 | include/thunderbird10/mozIStorageVacuumParticipant.h | 214 | include/thunderbird10/mozIStorageVacuumParticipant.h | |
215 | include/thunderbird10/mozIStorageValueArray.h | 215 | include/thunderbird10/mozIStorageValueArray.h | |
216 | include/thunderbird10/mozITXTToHTMLConv.h | 216 | include/thunderbird10/mozITXTToHTMLConv.h | |
217 | include/thunderbird10/mozIThirdPartyUtil.h | 217 | include/thunderbird10/mozIThirdPartyUtil.h | |
218 | include/thunderbird10/mozStorage.h | 218 | include/thunderbird10/mozStorage.h | |
219 | include/thunderbird10/mozStorageCID.h | 219 | include/thunderbird10/mozStorageCID.h | |
220 | include/thunderbird10/mozStorageHelper.h | 220 | include/thunderbird10/mozStorageHelper.h | |
221 | include/thunderbird10/mozcontainer.h | 221 | include/thunderbird10/mozcontainer.h | |
222 | include/thunderbird10/mozilla-config.h | 222 | include/thunderbird10/mozilla-config.h | |
223 | include/thunderbird10/mozilla/Attributes.h | |||
223 | include/thunderbird10/mozilla/AutoRestore.h | 224 | include/thunderbird10/mozilla/AutoRestore.h | |
224 | include/thunderbird10/mozilla/Base64.h | 225 | include/thunderbird10/mozilla/Base64.h | |
225 | include/thunderbird10/mozilla/BlockingResourceBase.h | 226 | include/thunderbird10/mozilla/BlockingResourceBase.h | |
227 | include/thunderbird10/mozilla/CheckedInt.h | |||
226 | include/thunderbird10/mozilla/CondVar.h | 228 | include/thunderbird10/mozilla/CondVar.h | |
227 | include/thunderbird10/mozilla/DeadlockDetector.h | 229 | include/thunderbird10/mozilla/DeadlockDetector.h | |
228 | include/thunderbird10/mozilla/FileUtils.h | 230 | include/thunderbird10/mozilla/FileUtils.h | |
229 | include/thunderbird10/mozilla/FloatingPoint.h | 231 | include/thunderbird10/mozilla/FloatingPoint.h | |
230 | include/thunderbird10/mozilla/FunctionTimer.h | 232 | include/thunderbird10/mozilla/FunctionTimer.h | |
231 | include/thunderbird10/mozilla/GenericFactory.h | 233 | include/thunderbird10/mozilla/GenericFactory.h | |
232 | include/thunderbird10/mozilla/IHistory.h | 234 | include/thunderbird10/mozilla/IHistory.h | |
233 | include/thunderbird10/mozilla/IntentionalCrash.h | 235 | include/thunderbird10/mozilla/IntentionalCrash.h | |
234 | include/thunderbird10/mozilla/Module.h | 236 | include/thunderbird10/mozilla/Module.h | |
235 | include/thunderbird10/mozilla/ModuleLoader.h | 237 | include/thunderbird10/mozilla/ModuleLoader.h | |
236 | include/thunderbird10/mozilla/ModuleUtils.h | 238 | include/thunderbird10/mozilla/ModuleUtils.h | |
237 | include/thunderbird10/mozilla/Monitor.h | 239 | include/thunderbird10/mozilla/Monitor.h | |
238 | include/thunderbird10/mozilla/Mutex.h | 240 | include/thunderbird10/mozilla/Mutex.h |
@@ -1,21 +1,18 @@ | @@ -1,21 +1,18 @@ | |||
1 | $NetBSD: distinfo,v 1.11 2012/12/24 21:14:19 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.12 2013/01/10 16:09:59 ryoon Exp $ | |
2 | 2 | |||
3 | SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4 | 3 | SHA1 (thunderbird-10.0.12esr.source.tar.bz2) = 260a3baca5eaa80bcc075b08c9f12016d61877de | |
4 | RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51 | 4 | RMD160 (thunderbird-10.0.12esr.source.tar.bz2) = 63586fc3460f4522900b84f58805c3a3a9cfe7a6 | |
5 | Size (enigmail-1.4.tar.gz) = 1323467 bytes | 5 | Size (thunderbird-10.0.12esr.source.tar.bz2) = 97703324 bytes | |
6 | SHA1 (thunderbird-10.0.11esr.source.tar.bz2) = c7b2dd2fbead11d61da9508926e4c3e82bc2d099 | |||
7 | RMD160 (thunderbird-10.0.11esr.source.tar.bz2) = 29a600de7cf87adfcad58b1d097583b28a38a746 | |||
8 | Size (thunderbird-10.0.11esr.source.tar.bz2) = 97793584 bytes | |||
9 | SHA1 (patch-aa) = e526125da549e9924135379cffae4754db94154f | 6 | SHA1 (patch-aa) = e526125da549e9924135379cffae4754db94154f | |
10 | SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1 | 7 | SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1 | |
11 | SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5 | 8 | SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5 | |
12 | SHA1 (patch-ac) = 805455591b4a9fc8e51ba65ac8ff41016b4edc7f | 9 | SHA1 (patch-ac) = 805455591b4a9fc8e51ba65ac8ff41016b4edc7f | |
13 | SHA1 (patch-ad) = d6bad741c4bdfdd0ee0ca8062c2121ce82eb7fb0 | 10 | SHA1 (patch-ad) = d6bad741c4bdfdd0ee0ca8062c2121ce82eb7fb0 | |
14 | SHA1 (patch-ae) = 2627a9f9dfcbb03474c5e003cab9c8c6cc5dafa1 | 11 | SHA1 (patch-ae) = 2627a9f9dfcbb03474c5e003cab9c8c6cc5dafa1 | |
15 | SHA1 (patch-af) = 5a7112ce46f9a3843a78ae0a234527080c04f529 | 12 | SHA1 (patch-af) = 5a7112ce46f9a3843a78ae0a234527080c04f529 | |
16 | SHA1 (patch-ag) = 40e9b2f82d7267ab0822a5f3b5120a0ef6e977cf | 13 | SHA1 (patch-ag) = 40e9b2f82d7267ab0822a5f3b5120a0ef6e977cf | |
17 | SHA1 (patch-ai) = f03ec2d47f1a4772ec567cd38a79b841a4c0022e | 14 | SHA1 (patch-ai) = f03ec2d47f1a4772ec567cd38a79b841a4c0022e | |
18 | SHA1 (patch-aj) = 2a06c22133a05c51f56c4cf6650dcb6ae031ab06 | 15 | SHA1 (patch-aj) = 2a06c22133a05c51f56c4cf6650dcb6ae031ab06 | |
19 | SHA1 (patch-ak) = 1b9038728e0e4d3cc23fd6a74d3d48759d77cbdd | 16 | SHA1 (patch-ak) = 1b9038728e0e4d3cc23fd6a74d3d48759d77cbdd | |
20 | SHA1 (patch-al) = f12eb736f87a779becdd10631314ee5f8f88f080 | 17 | SHA1 (patch-al) = f12eb736f87a779becdd10631314ee5f8f88f080 | |
21 | SHA1 (patch-am) = 108252ed517d9388f2a6c70ffa15782045ae23d5 | 18 | SHA1 (patch-am) = 108252ed517d9388f2a6c70ffa15782045ae23d5 | |
@@ -25,27 +22,27 @@ SHA1 (patch-as) = d200d5b59f8a0d406f4fd8 | @@ -25,27 +22,27 @@ SHA1 (patch-as) = d200d5b59f8a0d406f4fd8 | |||
25 | SHA1 (patch-at) = 519a2d835e0cc9183bf7a899aee382fae72c3d5e | 22 | SHA1 (patch-at) = 519a2d835e0cc9183bf7a899aee382fae72c3d5e | |
26 | SHA1 (patch-au) = 23a04bb48df4e54c058f09ab9036d4766d1f9e3e | 23 | SHA1 (patch-au) = 23a04bb48df4e54c058f09ab9036d4766d1f9e3e | |
27 | SHA1 (patch-av) = 1ef659c3fe6ecdaabc247b04d8f002f2d860602d | 24 | SHA1 (patch-av) = 1ef659c3fe6ecdaabc247b04d8f002f2d860602d | |
28 | SHA1 (patch-aw) = 480343cbefae9249f57948047d94f28312db94d4 | 25 | SHA1 (patch-aw) = 480343cbefae9249f57948047d94f28312db94d4 | |
29 | SHA1 (patch-ax) = 4fb8419d749ef5371bc3b227849bcfb42ab61453 | 26 | SHA1 (patch-ax) = 4fb8419d749ef5371bc3b227849bcfb42ab61453 | |
30 | SHA1 (patch-ay) = f1d70709ac86475131f6b9cfd5b942bbda37cea4 | 27 | SHA1 (patch-ay) = f1d70709ac86475131f6b9cfd5b942bbda37cea4 | |
31 | SHA1 (patch-az) = 67cbe6fd7e09692f095ce2bfd76f0f554eec240d | 28 | SHA1 (patch-az) = 67cbe6fd7e09692f095ce2bfd76f0f554eec240d | |
32 | SHA1 (patch-ba) = b015d5d067e21d134517410f68be43f414ffe669 | 29 | SHA1 (patch-ba) = b015d5d067e21d134517410f68be43f414ffe669 | |
33 | SHA1 (patch-bd) = 7d23bbf11b84aaad5f2c39bb68b95ecfc7def6b5 | 30 | SHA1 (patch-bd) = 7d23bbf11b84aaad5f2c39bb68b95ecfc7def6b5 | |
34 | SHA1 (patch-bf) = bfee07121770f85a1a5f85ee6b9ac4c97066d109 | 31 | SHA1 (patch-bf) = bfee07121770f85a1a5f85ee6b9ac4c97066d109 | |
35 | SHA1 (patch-bg) = 9fcb2b715d5d2fdec3dceef63aa1dbbd5d40a377 | 32 | SHA1 (patch-bg) = 9fcb2b715d5d2fdec3dceef63aa1dbbd5d40a377 | |
36 | SHA1 (patch-bi) = 40fe7fb45d2bce5c783cb3277a2b45e86ac84777 | 33 | SHA1 (patch-bi) = 40fe7fb45d2bce5c783cb3277a2b45e86ac84777 | |
37 | SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 1267429d7c38dd8d18132bd2afe6d0ffb1ea5062 | 34 | SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 1267429d7c38dd8d18132bd2afe6d0ffb1ea5062 | |
38 | SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = b6c0d2866075e02364e6ce497e4a08670f97d969 | 35 | SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 56327f66ba59aa0d67b5b23d38cd045eca68dd7a | |
39 | SHA1 (patch-ipc_chromium_src_base_file__util.h) = 8009f5d95351778445b95bffb9628a4a60604bd7 | 36 | SHA1 (patch-ipc_chromium_src_base_file__util.h) = 8009f5d95351778445b95bffb9628a4a60604bd7 | |
40 | SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 924f9f08e669b0bb2de6f057a6b73437451717a3 | 37 | SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 924f9f08e669b0bb2de6f057a6b73437451717a3 | |
41 | SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = a46f6f521fed6b20790adf2e61e8c8035ed82e62 | 38 | SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = a46f6f521fed6b20790adf2e61e8c8035ed82e62 | |
42 | SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 390225a35ddbee30c267ecb49e6e94528688d6a9 | 39 | SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 390225a35ddbee30c267ecb49e6e94528688d6a9 | |
43 | SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 41dfad0a3832617f35ffd5ad28b46629af0a4e39 | 40 | SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 41dfad0a3832617f35ffd5ad28b46629af0a4e39 | |
44 | SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 953144000b151c3f66a853fbceedffb2c59af1fe | 41 | SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 953144000b151c3f66a853fbceedffb2c59af1fe | |
45 | SHA1 (patch-ipc_chromium_src_build_build__config.h) = 70f999b89dd404d9c570df392f2ebb73b2fd566f | 42 | SHA1 (patch-ipc_chromium_src_build_build__config.h) = 70f999b89dd404d9c570df392f2ebb73b2fd566f | |
46 | SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = baca4a739d33af57603ed59daa1f70cd7f27c643 | 43 | SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = baca4a739d33af57603ed59daa1f70cd7f27c643 | |
47 | SHA1 (patch-ma) = 3ddbfa886f3bd575846aab40aad897d19b888c9d | 44 | SHA1 (patch-ma) = 3ddbfa886f3bd575846aab40aad897d19b888c9d | |
48 | SHA1 (patch-ma-toplevel) = b1d2f38dfa6dece871dcf7670fe4e82c490ab03c | 45 | SHA1 (patch-ma-toplevel) = b1d2f38dfa6dece871dcf7670fe4e82c490ab03c | |
49 | SHA1 (patch-mb) = e56283233f9508257e29df55c02ba5664c9f08ed | 46 | SHA1 (patch-mb) = e56283233f9508257e29df55c02ba5664c9f08ed | |
50 | SHA1 (patch-md) = fe60fd55649258fc5aa28cf754bf9a2b257b7c69 | 47 | SHA1 (patch-md) = fe60fd55649258fc5aa28cf754bf9a2b257b7c69 | |
51 | SHA1 (patch-me) = 9439d2e31355e618d35168b0458bc244d51459e9 | 48 | SHA1 (patch-me) = 9439d2e31355e618d35168b0458bc244d51459e9 |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ | 1 | $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.2 2013/01/10 16:09:59 ryoon Exp $ | |
2 | 2 | |||
3 | --- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2012-02-16 10:25:01.000000000 +0000 | 3 | --- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2013-01-05 14:22:10.000000000 +0000 | |
4 | +++ mozilla/ipc/chromium/src/base/debug_util_posix.cc | 4 | +++ mozilla/ipc/chromium/src/base/debug_util_posix.cc | |
5 | @@ -5,7 +5,7 @@ | 5 | @@ -5,7 +5,7 @@ | |
6 | #include "build/build_config.h" | 6 | #include "build/build_config.h" | |
7 | #include "base/debug_util.h" | 7 | #include "base/debug_util.h" | |
8 | 8 | |||
9 | -#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__)) | 9 | -#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__)) | |
10 | +#define MOZ_HAVE_EXECINFO_H (defined(__linux__) && !defined(ANDROID)) | 10 | +#define MOZ_HAVE_EXECINFO_H (defined(__linux__) && !defined(ANDROID)) | |
11 | 11 | |||
12 | #include <errno.h> | 12 | #include <errno.h> | |
13 | #include <fcntl.h> | 13 | #include <fcntl.h> | |
14 | @@ -17,8 +17,11 @@ | 14 | @@ -17,8 +17,11 @@ | |
15 | #include <unistd.h> | 15 | #include <unistd.h> | |
16 | #if MOZ_HAVE_EXECINFO_H | 16 | #if MOZ_HAVE_EXECINFO_H | |
@@ -23,25 +23,54 @@ $NetBSD: patch-ipc_chromium_src_base_deb | @@ -23,25 +23,54 @@ $NetBSD: patch-ipc_chromium_src_base_deb | |||
23 | +#include <sys/sysctl.h> | 23 | +#include <sys/sysctl.h> | |
24 | 24 | |||
25 | #include "base/basictypes.h" | 25 | #include "base/basictypes.h" | |
26 | #include "base/eintr_wrapper.h" | 26 | #include "base/eintr_wrapper.h" | |
27 | @@ -32,7 +35,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u | 27 | @@ -32,7 +35,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u | |
28 | return false; | 28 | return false; | |
29 | } | 29 | } | |
30 | 30 | |||
31 | -#if defined(OS_MACOSX) | 31 | -#if defined(OS_MACOSX) | |
32 | +#if defined(OS_MACOSX) || defined(OS_BSD) | 32 | +#if defined(OS_MACOSX) || defined(OS_BSD) | |
33 | 33 | |||
34 | // Based on Apple's recommended method as described in | 34 | // Based on Apple's recommended method as described in | |
35 | // http://developer.apple.com/qa/qa2004/qa1361.html | 35 | // http://developer.apple.com/qa/qa2004/qa1361.html | |
36 | @@ -71,7 +74,11 @@ bool DebugUtil::BeingDebugged() { | 36 | @@ -51,14 +54,22 @@ bool DebugUtil::BeingDebugged() { | |
37 | // we're looking for information about a specific process ID. | |||
38 | int mib[] = { | |||
39 | CTL_KERN, | |||
40 | +#if defined(OS_NETBSD) | |||
41 | + KERN_PROC2, | |||
42 | +#else | |||
43 | KERN_PROC, | |||
44 | +#endif | |||
45 | KERN_PROC_PID, | |||
46 | getpid() | |||
47 | }; | |||
48 | ||||
49 | // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and | |||
50 | // binary interfaces may change. | |||
51 | +#if defined(OS_NETBSD) | |||
52 | + struct kinfo_proc2 info; | |||
53 | +#else | |||
54 | struct kinfo_proc info; | |||
55 | +#endif | |||
56 | size_t info_size = sizeof(info); | |||
57 | ||||
58 | int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0); | |||
59 | @@ -71,7 +82,17 @@ bool DebugUtil::BeingDebugged() { | |||
37 | 60 | |||
38 | // This process is being debugged if the P_TRACED flag is set. | 61 | // This process is being debugged if the P_TRACED flag is set. | |
39 | is_set = true; | 62 | is_set = true; | |
40 | +#if defined(__DragonFly__) | 63 | +#if defined(__DragonFly__) | |
41 | + being_debugged = (info.kp_flags & P_TRACED) != 0; | 64 | + being_debugged = (info.kp_flags & P_TRACED) != 0; | |
65 | +#elif defined(OS_FREEBSD) | |||
66 | + being_debugged = (info.ki_flag & P_TRACED) != 0; | |||
67 | +#elif defined(OS_OPENBSD) | |||
68 | + being_debugged = (info.p_flag & P_TRACED) != 0; | |||
69 | +#elif defined(OS_NETBSD) | |||
70 | + being_debugged = (info.p_flag & P_TRACED) != 0; | |||
42 | +#else | 71 | +#else | |
43 | being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; | 72 | being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; | |
44 | +#endif | 73 | +#endif | |
45 | return being_debugged; | 74 | return being_debugged; | |
46 | } | 75 | } | |
47 | 76 |