[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/nss

[Christian Lohmaier]

 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss-winXP-sdk.patch.1  |9 +
 2 files changed, 11 insertions(+)

New commits:
commit 74c4ae75c06068f8c208973636825603ca49a00e
Author: Christian Lohmaier 
Date:   Tue Mar 15 15:09:45 2016 +0100

fix nss build when targeting windows XP (using 7.1A SDK)

otherwise build fails because of macro redefinitions warnings (that are
now fatal because of warnings=errors)

(cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51)

Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7
Reviewed-on: https://gerrit.libreoffice.org/23272
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 803e809..f7409e1 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -28,6 +28,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
external/nss/nss.cygwin64.in32bit.patch) \
+$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
+external/nss/nss-winXP-sdk.patch.1) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss-winXP-sdk.patch.1 
b/external/nss/nss-winXP-sdk.patch.1
new file mode 100644
index 000..2c81892
--- /dev/null
+++ b/external/nss/nss-winXP-sdk.patch.1
@@ -0,0 +1,9 @@
+diff -ur nss.org/nss/coreconf/config.mk nss/nss/coreconf/config.mk
+--- nss.org/nss/coreconf/config.mk 2016-03-15 14:52:19.706093300 +0100
 nss/nss/coreconf/config.mk 2016-03-15 14:56:51.549914800 +0100
+@@ -188,3 +188,5 @@
+ 
+ # Hide old, deprecated, TLS cipher suite names when building NSS
+ DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
++# build with 7.1A SDK for winXP compatibility
++DEFINES += -D_USING_V110_SDK71_
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/nss

[David Ostrovsky]

 external/nss/nss.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 5e4f1ab7c045f46d2c21639e69b96c38b1f0
Author: David Ostrovsky 
Date:   Fri Mar 4 19:59:18 2016 +0100

nss: Fix pointer truncation from 'char *' to 'long'

Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005
Reviewed-on: https://gerrit.libreoffice.org/22916
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 
(cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b)
Reviewed-on: https://gerrit.libreoffice.org/23103
Reviewed-by: Michael Stahl 
Reviewed-by: David Ostrovsky 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 2cb23be..5483635 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -1,3 +1,14 @@
+--- a/nss.orig/nspr/pr/src/misc/prnetdb.c  2016-02-12 14:51:25.0 
+0100
 b/nss/nspr/pr/src/misc/prnetdb.c   2016-03-04 19:23:00.462892600 +0100
+@@ -438,7 +438,7 @@
+   char *buf = *bufp;
+   PRIntn buflen = *buflenp;
+ 
+-  if (align && ((long)buf & (align - 1))) {
++  if (align && ((ptrdiff_t)buf & (align - 1))) {
+   PRIntn skip = align - ((ptrdiff_t)buf & (align - 1));
+   if (buflen < skip) {
+   return 0;
 diff -ru a/nspr/configure b/nspr/configure
 --- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100
 +++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/nss

[Stephan Bergmann]

 external/nss/ubsan.patch.0 |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit b99a91b790eedbfddb1ee93c183adb6d2405285e
Author: Stephan Bergmann 
Date:   Fri Jun 12 08:22:22 2015 +0200

external/nss: -fsanitize=nonnull-attribute

Change-Id: Ic3a20f56250d99a347df5deaf785800a2f96e470
(cherry picked from commit 8d2ac08383f894f428da63f4653d0cbd6649e0db)
Reviewed-on: https://gerrit.libreoffice.org/23101
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
index 298ca40..956e07b 100644
--- a/external/nss/ubsan.patch.0
+++ b/external/nss/ubsan.patch.0
@@ -1,3 +1,14 @@
+--- nss/lib/certdb/crl.c
 nss/lib/certdb/crl.c
+@@ -2150,7 +2150,7 @@
+ return SECSuccess;
+ }
+ /* all CRLs are good, sort them by thisUpdate */
+-qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*),
++if (cache->ncrls != 0) qsort(cache->crls, cache->ncrls, 
sizeof(CachedCrl*),
+   SortCRLsByThisUpdate);
+ 
+ if (cache->ncrls)
 --- nss/lib/libpkix/pkix/util/pkix_tools.h
 +++ nss/lib/libpkix/pkix/util/pkix_tools.h
 @@ -1458,8 +1458,8 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits