kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix build with API differences in xulrunner.

Browse source
This commit is contained in:
joerg 2016-04-04 17:36:34 +00:00
parent 02847b53e7
commit 1318800a28
5 changed files with 84 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/tor-browser/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2016/03/20 06:53:37 ryoon Exp $
# $NetBSD: Makefile,v 1.6 2016/04/04 17:36:34 joerg Exp $
TORBVER= 5.5.4
@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --enable-pie
# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601
CFLAGS+= -fpermissive
# workround for link of libxul.so etc.
# workaround for link of libxul.so etc.
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib
LDFLAGS.SunOS+= -lm

5
security/tor-browser/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.3 2016/03/20 06:53:37 ryoon Exp $
$NetBSD: distinfo,v 1.4 2016/04/04 17:36:34 joerg Exp $
SHA1 (tor-browser-38.7.1esr-5.5-1.tar.xz) = 332d04fc222f9d0778341284736c6da0f61e4607
RMD160 (tor-browser-38.7.1esr-5.5-1.tar.xz) = c57cbdbb0a4a5f0ca8f9963daa4075bbcd754f2e
@ -136,6 +136,9 @@ SHA1 (patch-netwerk_protocol_http_Http2Session.cpp) = 40f4a64657ea2dd0ddc6434caf
SHA1 (patch-pb) = 97c9b2e4cefd524dc6ba825f71c3da2a761aa1f4
SHA1 (patch-pc) = 8b2baa88f0983a2fef4f801cf6b1ae425f6c813a
SHA1 (patch-rc) = affa634564e798184bbe50ba7c491d691a4a8994
SHA1 (patch-security_certverifier_OCSPRequestor.cpp) = 3db71730f36ce5396c7a927981654de0d01482e2
SHA1 (patch-security_manager_ssl_src_nsNSSCallbacks.cpp) = a3f18dc7851c91768504600f1f73746d4da5ad60
SHA1 (patch-security_manager_ssl_src_nsNSSCallbacks.h) = 82c74f042502a286d0128aa67afb3b1583a03b11
SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = 28d216fb8dcb5968c1ff657578b4caf814c146ac
SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 6b926ccd793391ad7bd7101635f4b3eefe3db130
SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2137f2d7fd4d4a6a1e8ef8625866513890

12
security/tor-browser/patches/patch-security_certverifier_OCSPRequestor.cpp Normal file
View file

@ -0,0 +1,12 @@
$NetBSD: patch-security_certverifier_OCSPRequestor.cpp,v 1.1 2016/04/04 17:36:34 joerg Exp $
--- security/certverifier/OCSPRequestor.cpp.orig 2016-04-04 15:32:34.076128034 +0000
+++ security/certverifier/OCSPRequestor.cpp
@@ -174,7 +174,6 @@ DoOCSPRequest(PLArenaPool* arena, const
SEC_HTTP_REQUEST_SESSION requestSessionPtr;
if (nsNSSHttpInterface::createFcn(serverSession.get(), "http",
path.get(), method.get(),
- isolationKey,
timeout, &requestSessionPtr)
!= SECSuccess) {
PR_SetError(SEC_ERROR_NO_MEMORY, 0);

40
security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.cpp Normal file
View file

@ -0,0 +1,40 @@
$NetBSD: patch-security_manager_ssl_src_nsNSSCallbacks.cpp,v 1.1 2016/04/04 17:36:35 joerg Exp $
--- security/manager/ssl/src/nsNSSCallbacks.cpp.orig 2016-04-04 15:21:08.677783866 +0000
+++ security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -106,18 +106,6 @@ nsHTTPDownloadEvent::Run()
chan->SetLoadFlags(nsIRequest::LOAD_ANONYMOUS);
- // If we have an isolation key, use it as the URI for this channel.
- if (!mRequestSession->mIsolationKey.IsEmpty()) {
- nsCOMPtr<nsIHttpChannelInternal> channelInternal(do_QueryInterface(chan));
- if (channelInternal) {
- nsCString documentURISpec("https://");
- documentURISpec.Append(mRequestSession->mIsolationKey);
- nsCOMPtr<nsIURI> documentURI;
- /* nsresult rv = */ NS_NewURI(getter_AddRefs(documentURI), documentURISpec);
- channelInternal->SetDocumentURI(documentURI);
- }
- }
-
// Create a loadgroup for this new channel. This way if the channel
// is redirected, we'll have a way to cancel the resulting channel.
nsCOMPtr<nsILoadGroup> lg = do_CreateInstance(NS_LOADGROUP_CONTRACTID);
@@ -218,7 +206,6 @@ SECStatus nsNSSHttpRequestSession::creat
const char *http_protocol_variant,
const char *path_and_query_string,
const char *http_request_method,
- const char *isolationKey,
const PRIntervalTime timeout,
SEC_HTTP_REQUEST_SESSION *pRequest)
{
@@ -250,8 +237,6 @@ SECStatus nsNSSHttpRequestSession::creat
rs->mURL.AppendInt(hss->mPort);
rs->mURL.Append(path_and_query_string);
- rs->mIsolationKey.Assign(isolationKey);
-
rs->mRequestMethod = http_request_method;
*pRequest = (void*)rs;

26
security/tor-browser/patches/patch-security_manager_ssl_src_nsNSSCallbacks.h Normal file
View file

@ -0,0 +1,26 @@
$NetBSD: patch-security_manager_ssl_src_nsNSSCallbacks.h,v 1.1 2016/04/04 17:36:35 joerg Exp $
--- security/manager/ssl/src/nsNSSCallbacks.h.orig 2016-04-04 15:21:30.039415148 +0000
+++ security/manager/ssl/src/nsNSSCallbacks.h
@@ -93,7 +93,6 @@ public:
const char *http_protocol_variant,
const char *path_and_query_string,
const char *http_request_method,
- const char *isolation_key,
const PRIntervalTime timeout,
SEC_HTTP_REQUEST_SESSION *pRequest);
@@ -171,13 +170,11 @@ public:
const char *http_protocol_variant,
const char *path_and_query_string,
const char *http_request_method,
- const char *isolation_key,
const PRIntervalTime timeout,
SEC_HTTP_REQUEST_SESSION *pRequest)
{
return nsNSSHttpRequestSession::createFcn(session, http_protocol_variant,
path_and_query_string, http_request_method,
- isolation_key,
timeout, pRequest);
}