From ef0a0c91f153782cd38b84d14147dfa8cef8337f Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Thu, 16 Jul 2015 06:05:59 +0000
Subject: - Update NSS and ca_root_nss to 3.19.2 - Update Firefox and gmp-api
 to 39.0 - Update Firefox ESR and libxul to 38.1.0

Changes:	https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.19.2_release_notes
Changes:	https://www.mozilla.org/firefox/39.0/releasenotes/
Changes:	https://www.mozilla.org/firefox/38.1.0/releasenotes/
MFH:		2015Q3
Security:	https://vuxml.freebsd.org/freebsd/44d9daee-940c-4179-86bb-6e3ffd617869.html
---
 www/firefox-esr/files/patch-bug1013675 | 88 ----------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 www/firefox-esr/files/patch-bug1013675

(limited to 'www/firefox-esr/files/patch-bug1013675')

diff --git a/www/firefox-esr/files/patch-bug1013675 b/www/firefox-esr/files/patch-bug1013675
deleted file mode 100644
index eac435acf3d0..000000000000
--- a/www/firefox-esr/files/patch-bug1013675
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git xpcom/base/nsDebugImpl.cpp xpcom/base/nsDebugImpl.cpp
-index 13a286f..293bd73 100644
---- xpcom/base/nsDebugImpl.cpp
-+++ xpcom/base/nsDebugImpl.cpp
-@@ -45,12 +45,43 @@
- #endif
- #endif
- 
--#if defined(XP_MACOSX)
-+#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
- #include <stdbool.h>
- #include <unistd.h>
-+#include <sys/param.h>
- #include <sys/sysctl.h>
- #endif
- 
-+#if defined(__OpenBSD__)
-+#include <sys/proc.h>
-+#endif
-+
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <sys/user.h>
-+#endif
-+
-+#if defined(__NetBSD__)
-+#undef KERN_PROC
-+#define KERN_PROC KERN_PROC2
-+#define KINFO_PROC struct kinfo_proc2
-+#else
-+#define KINFO_PROC struct kinfo_proc
-+#endif
-+
-+#if defined(XP_MACOSX)
-+#define KP_FLAGS kp_proc.p_flag
-+#elif defined(__DragonFly__)
-+#define KP_FLAGS kp_flags
-+#elif defined(__FreeBSD__)
-+#define KP_FLAGS ki_flag
-+#elif defined(__OpenBSD__) && !defined(_P_TRACED)
-+#define KP_FLAGS p_psflags
-+#define P_TRACED PS_TRACED
-+#else
-+#define KP_FLAGS p_flag
-+#endif
-+
- #include "mozilla/mozalloc_abort.h"
- 
- static void
-@@ -144,16 +175,22 @@ nsDebugImpl::GetIsDebuggerAttached(bool* aResult)
- 
- #if defined(XP_WIN)
-   *aResult = ::IsDebuggerPresent();
--#elif defined(XP_MACOSX)
-+#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \
-+   || defined(__NetBSD__) || defined(__OpenBSD__)
-   // Specify the info we're looking for
--  int mib[4];
--  mib[0] = CTL_KERN;
--  mib[1] = KERN_PROC;
--  mib[2] = KERN_PROC_PID;
--  mib[3] = getpid();
-+  int mib[] = {
-+    CTL_KERN,
-+    KERN_PROC,
-+    KERN_PROC_PID,
-+    getpid(),
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+    sizeof(KINFO_PROC),
-+    1,
-+#endif
-+  };
-   size_t mibSize = sizeof(mib) / sizeof(int);
- 
--  struct kinfo_proc info;
-+  KINFO_PROC info;
-   size_t infoSize = sizeof(info);
-   memset(&info, 0, infoSize);
- 
-@@ -163,7 +200,7 @@ nsDebugImpl::GetIsDebuggerAttached(bool* aResult)
-     return NS_OK;
-   }
- 
--  if (info.kp_proc.p_flag & P_TRACED) {
-+  if (info.KP_FLAGS & P_TRACED) {
-     *aResult = true;
-   }
- #endif
-- 
cgit v1.2.3