tor-browser: Remove patches for NetBSD 7, rust dropped support for NetBSD 7

4 files changed, 3 insertions, 59 deletions

diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile
index d4447bdc55b..501e84130df 100644
--- a/security/tor-browser/Makefile
+++ b/security/tor-browser/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2020/06/07 13:06:00 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2020/06/17 18:02:53 nia Exp $
 
 DISTNAME=	src-firefox-tor-browser-68.9.0esr-9.5-1-build2
 PKGNAME=	tor-browser-9.5
+PKGREVISION=	1
 CATEGORIES=	security www
 MASTER_SITES=	https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
diff --git a/security/tor-browser/distinfo b/security/tor-browser/distinfo
index ef94ce70a54..e0774237fbc 100644
--- a/security/tor-browser/distinfo
+++ b/security/tor-browser/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2020/06/07 13:06:00 wiz Exp $
+$NetBSD: distinfo,v 1.22 2020/06/17 18:02:53 nia Exp $
 
 SHA1 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 27b3e18e92341557b9c8b18afd114d458dd2e403
 RMD160 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = db61ef7788f1b6c4111e7a4c6df56c7bd51e6777
@@ -19,7 +19,6 @@ SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp
 SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
-SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = d634805bf3b02475081cb2f263e91e3f4c481a29
@@ -43,6 +42,5 @@ SHA1 (patch-toolkit_moz.configure) = 9f4edca09802f6d3adb517613e879dca8d2d65be
 SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc
 SHA1 (patch-toolkit_xre_glxtest.cpp) = 04942938f45f326c7d5c4da3bf8cc2d09b977c69
 SHA1 (patch-xpcom_base_nscore.h) = 1ac4d34d3c9e80bc1ac966c6c84cb320bc0fa1ec
-SHA1 (patch-xpcom_build_BinaryPath.h) = 92461769d2fee8f015b91a5326247f271afeedea
 SHA1 (patch-xpcom_io_TorFileUtils.cpp) = 3f5c5490a3e4e0117cca3c558de93f2ffea05405
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 6956c90d4c74c71e7e9a5882e4840ba2673160fa
diff --git a/security/tor-browser/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc b/security/tor-browser/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc
deleted file mode 100644
index 9bfadbcc0d5..00000000000
--- a/security/tor-browser/patches/patch-ipc_chromium_src_base_lock__impl__posix.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_lock__impl__posix.cc,v 1.2 2020/03/13 17:59:27 wiz Exp $
-
-- Fix build on NetBSD 7.1 (which doesn't have PTHREAD_PRIO_INHERIT)
-
---- ipc/chromium/src/base/lock_impl_posix.cc.orig	2019-03-07 16:53:35.000000000 +0000
-+++ ipc/chromium/src/base/lock_impl_posix.cc
-@@ -22,7 +22,7 @@ namespace internal {
- // Lock::PriorityInheritanceAvailable still must be checked as the code may
- // compile but the underlying platform still may not correctly support priority
- // inheritance locks.
--#if defined(OS_NACL) || defined(OS_ANDROID)
-+#if defined(OS_NACL) || defined(OS_ANDROID) || (defined(__NetBSD__) && !defined(PTHREAD_PRIO_INHERIT))
- #  define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 0
- #else
- #  define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 1
diff --git a/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h b/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h
deleted file mode 100644
index 2464d25db51..00000000000
--- a/security/tor-browser/patches/patch-xpcom_build_BinaryPath.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-xpcom_build_BinaryPath.h,v 1.3 2020/03/13 17:59:27 wiz Exp $
-
-* Fix build under netbsd-7, PR pkg/52956
-
---- xpcom/build/BinaryPath.h.orig	2019-03-07 16:53:45.000000000 +0000
-+++ xpcom/build/BinaryPath.h
-@@ -21,7 +21,8 @@
-     defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #  include <sys/sysctl.h>
- #endif
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || \
-+    (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
- #  include <sys/stat.h>
- #endif
- #include "mozilla/UniquePtr.h"
-@@ -164,7 +165,8 @@ class BinaryPath {
-   }
- 
- #elif defined(__FreeBSD__) || defined(__DragonFly__) || \
--    defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-+      defined(__FreeBSD_kernel__) || \
-+      (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME))
-   static nsresult Get(char aResult[MAXPATHLEN]) {
-     int mib[4];
-     mib[0] = CTL_KERN;
-@@ -246,6 +248,13 @@ class BinaryPath {
-     return NS_ERROR_FAILURE;
-   }
- 
-+#elif (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-+  static nsresult Get(char aResult[MAXPATHLEN])
-+  {
-+    char path[] = "@PREFIX@/lib/firefox/firefox";
-+    sprintf(aResult, "%s", path);
-+    return NS_OK;
-+  }
- #else
- #  error Oops, you need platform-specific code here
- #endif