external/nss/UnpackedTarball_nss.mk | 1
external/nss/nss.windowbuild.patch.0 | 55 -----------------------------------
2 files changed, 56 deletions(-)
New commits:
commit 489414f2395b6c8008ebcda7c37a150fd4ed7ad5
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Apr 21 14:41:53 2017 +0200
nss: try to remove nss.windowbuild.patch.0
It's not obvious to me what problem this solves. Maybe the problem no
longer exsists in the new upstream release?
Change-Id: I16762e0024536afb821eac70c6ba3929d5b8927a
Reviewed-on: https://gerrit.libreoffice.org/36798
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 09baf787e536..a9ce14ea20bb 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.patch) \
external/nss/ubsan.patch.0 \
external/nss/clang-cl.patch.0 \
- external/nss/nss.windowbuild.patch.0 \
$(if $(filter IOS,$(OS)), \
external/nss/nss-chromium-nss-static.patch \
external/nss/nss-more-static.patch \
diff --git a/external/nss/nss.windowbuild.patch.0
b/external/nss/nss.windowbuild.patch.0
deleted file mode 100644
index c25ff4d6437b..000000000000
--- a/external/nss/nss.windowbuild.patch.0
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./nss/gtests/ssl_gtest/tls_connect.cc
-+++ ./nss/gtests/ssl_gtest/tls_connect.cc
-@@ -375,6 +375,12 @@
- }
- }
-
-+// A simple value of "a", "b". Note that the preferred value of "a" is placed
-+// at the end, because the NSS API follows the now defunct NPN specification,
-+// which places the preferred (and default) entry at the end of the list.
-+// NSS will move this final entry to the front when used with ALPN.
-+const uint8_t alpn_dummy_val_[4] = { 0x01, 0x62, 0x01, 0x61 };
-+
- void TlsConnectTestBase::EnableAlpn() {
- client_->EnableAlpn(alpn_dummy_val_, sizeof(alpn_dummy_val_));
- server_->EnableAlpn(alpn_dummy_val_, sizeof(alpn_dummy_val_));
---- ./nss/gtests/ssl_gtest/tls_connect.h
-+++ ./nss/gtests/ssl_gtest/tls_connect.h
-@@ -113,12 +113,6 @@
- SessionResumptionMode expected_resumption_mode_;
- std::vector<std::vector<uint8_t>> session_ids_;
-
-- // A simple value of "a", "b". Note that the preferred value of "a" is
placed
-- // at the end, because the NSS API follows the now defunct NPN
specification,
-- // which places the preferred (and default) entry at the end of the list.
-- // NSS will move this final entry to the front when used with ALPN.
-- const uint8_t alpn_dummy_val_[4] = {0x01, 0x62, 0x01, 0x61};
--
- private:
- static inline Mode ToMode(const std::string& str) {
- return str == "TLS" ? STREAM : DGRAM;
---- ./nss/gtests/ssl_gtest/ssl_loopback_unittest.cc
-+++ ./nss/gtests/ssl_gtest/ssl_loopback_unittest.cc
-@@ -51,6 +51,12 @@
- CheckAlpn("a");
- }
-
-+// A simple value of "a", "b". Note that the preferred value of "a" is placed
-+// at the end, because the NSS API follows the now defunct NPN specification,
-+// which places the preferred (and default) entry at the end of the list.
-+// NSS will move this final entry to the front when used with ALPN.
-+const uint8_t alpn_dummy_val_[4] = { 0x01, 0x62, 0x01, 0x61 };
-+
- TEST_P(TlsConnectGeneric, ConnectAlpnClone) {
- EnsureModelSockets();
- client_model_->EnableAlpn(alpn_dummy_val_, sizeof(alpn_dummy_val_));
---- ./nss/gtests/ssl_gtest/databuffer.h
-+++ ./nss/gtests/ssl_gtest/databuffer.h
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <cassert>
- #include <cstring>
-+#include <cstdint>
- #include <iomanip>
- #include <iostream>
- #if defined(WIN32) || defined(WIN64)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
