[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

 external/nss/UnpackedTarball_nss.mk   |1 
 external/nss/Wincompatible-function-pointer-types.patch.0 |  234 ++
 2 files changed, 235 insertions(+)

New commits:
commit 5b5f6b147f5f2a02476a14ed2d8feb247d5a7c79
Author: Stephan Bergmann 
AuthorDate: Mon Aug 15 08:19:55 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 15 13:38:14 2022 +0200

external/nss: Fix -Wincompatible-function-pointer-types

...with recent Clang 16 trunk since


"Default implicit function pointer conversions diagnostic to be an error",
causing

> ../../../pr/tests/testfile.c:126:41: error: incompatible function pointer 
types passing 'void (*)(void *)' to parameter of type 'void *(*)(void *)' 
[-Wincompatible-function-pointer-types]
> if (!pthread_create(, NULL, start, arg)) {
> ^
> /usr/include/pthread.h:204:15: note: passing argument to parameter 
'__start_routine' here
>void *(*__start_routine) (void *),
>^

and

> ../../../pr/tests/testfile.c:576:31: error: incompatible function pointer 
types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 
'void (*)(void *)' [-Wincompatible-function-pointer-types]
>   DirTest, ,
>   ^~~
> ../../../pr/tests/testfile.c:93:36: note: passing argument to parameter 
'start' here
> void (*start)(void *arg),
>^

Change-Id: I642e5ca69289993c86abafded65ac23a63fd837e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138267
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 32ba88f2bd5a..b7373772152a 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-bz1646594.patch.1 \
 external/nss/macos-dlopen.patch.0 \
 external/nss/nss-restore-manual-pre-dependencies.patch.1 \
+external/nss/Wincompatible-function-pointer-types.patch.0 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/Wincompatible-function-pointer-types.patch.0 
b/external/nss/Wincompatible-function-pointer-types.patch.0
new file mode 100644
index ..1e9b7550e1da
--- /dev/null
+++ b/external/nss/Wincompatible-function-pointer-types.patch.0
@@ -0,0 +1,234 @@
+--- nspr/pr/tests/testfile.c
 nspr/pr/tests/testfile.c
+@@ -86,7 +86,7 @@
+ #endif
+ #define TMPDIR_LEN  64
+ char testdir[TMPDIR_LEN];
+-static PRInt32 PR_CALLBACK DirTest(void *argunused);
++static void PR_CALLBACK DirTest(void *argunused);
+ PRInt32 dirtest_failed = 0;
+ 
+ PRThread* create_new_thread(PRThreadType type,
+@@ -123,7 +123,7 @@
+ if (native_thread) {
+ #if defined(_PR_PTHREADS)
+ pthread_t tid;
+-if (!pthread_create(, NULL, start, arg)) {
++if (!pthread_create(, NULL, (void *(*)(void *))start, arg)) {
+ return((PRThread *) tid);
+ }
+ else {
+@@ -594,7 +594,7 @@
+ return 0;
+ }
+ 
+-static PRInt32 PR_CALLBACK DirTest(void *arg)
++static void PR_CALLBACK DirTest(void *arg)
+ {
+ struct dirtest_arg *tinfo = (struct dirtest_arg *) arg;
+ PRFileDesc *fd_file;
+@@ -618,14 +618,14 @@
+ printf(
+ "testfile failed to create dir %s [%d, %d]\n",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+-return -1;
++return;
+ }
+ fd_dir = PR_OpenDir(TEST_DIR);
+ if (fd_dir == NULL) {
+ printf(
+ "testfile failed to open dirctory %s [%d, %d]\n",
+ TEST_DIR, PR_GetError(), PR_GetOSError());
+-return -1;
++return;
+ }
+ 
+ strcpy(pathname, TEST_DIR);
+@@ -645,7 +645,7 @@
+ printf(
+ "testfile failed to create/open file %s [%d, %d]\n",
+ pathname, PR_GetError(), PR_GetOSError());
+-return -1;
++return;
+ }
+ PR_Close(fd_file);
+ }
+@@ -664,7 +664,7 @@
+ printf(
+ "testfile failed to create/open hidden file %s [%d, %d]\n",
+ pathname, PR_GetError(), PR_GetOSError());
+-return -1;
++return;
+ }
+ 
+ PR_Close(fd_file);
+@@ -681,7 +681,7 @@
+ if (hfile == INVALID_HANDLE_VALUE) {
+ printf("testfile failed to create/open hidden file %s [0, %d]\n",
+pathname, GetLastError());
+-return -1;
++return;
+ }
+ CloseHandle(hfile);
+ 
+@@ -696,7 +696,7 @@
+ if (hfile == INVALID_HANDLE_VALUE) {
+ 

[Libreoffice-commits] core.git: external/nss

[Michael Stahl (via logerrit)]

 external/nss/UnpackedTarball_nss.mk   |1 -
 external/nss/nss-3.13.5-zlib-werror.patch |   13 -
 2 files changed, 14 deletions(-)

New commits:
commit f2dc0bedeb7e32e1c78bf218a7277110cdb71ce5
Author: Michael Stahl 
AuthorDate: Wed Jun 1 12:42:43 2022 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 1 19:51:39 2022 +0200

nss: remove nss-3.13.5-zlib-werror.patch

The zlib module should be used instead of NSS' bundled zlib since
commit 1c748fefc3c5b42e3548a1a7f5017a579982005a

Change-Id: I0d820cdd795712a7dbe27ef114f0efddd3f436ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135235
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 4f8499e8a835..32ba88f2bd5a 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -16,7 +16,6 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,nss,nspr/build/autoconf
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.patch \
 external/nss/nss.aix.patch \
-external/nss/nss-3.13.5-zlib-werror.patch \
 external/nss/nss_macosx.patch \
 external/nss/nss-win32-make.patch.1 \
 external/nss/ubsan.patch.0 \
diff --git a/external/nss/nss-3.13.5-zlib-werror.patch 
b/external/nss/nss-3.13.5-zlib-werror.patch
deleted file mode 100644
index 0cdbf7808f81..
--- a/external/nss/nss-3.13.5-zlib-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 a/a/nss/lib/zlib/gzguts.h  2010-08-22 03:07:03.0 +0200
-+++ b/b/nss/lib/zlib/gzguts.h  2012-07-17 08:52:14.821552788 +0200
-@@ -26,6 +26,10 @@
- #  define write _write
- #  define close _close
- #endif
-+
-+#ifndef _WIN32
-+#include 
-+#endif
- 
- #ifdef NO_DEFLATE   /* for compatibility with old definition */
- #  define NO_GZCOMPRESS

[Libreoffice-commits] core.git: external/nss

[Michael Stahl (via logerrit)]

 external/nss/ExternalProject_nss.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit b11a5d3900e3c19e94833c1b1e5218288320c3e3
Author: Michael Stahl 
AuthorDate: Wed Apr 6 21:39:45 2022 +0200
Commit: Michael Stahl 
CommitDate: Thu Apr 7 10:38:35 2022 +0200

nss: depend on zlib

Required on WNT since 1c748fefc3c5b42e3548a1a7f5017a579982005a, may
be needed on other platforms if using --without-system-zlib.

Change-Id: Ib8e544d81881f425d257514fc475e272ca2e53ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132648
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jenkins

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index d9f19c0d5e09..4297be931e69 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
build \
 ))
 
+$(eval $(call gb_ExternalProject_use_externals,nss,\
+   zlib \
+))
+
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,nss,build): \
$(call gb_ExternalExecutable_get_dependencies,python) \

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

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

New commits:
commit a5d3a3446832a7761584a00f7d2bc76ee713eb64
Author: Stephan Bergmann 
AuthorDate: Wed Nov 3 22:13:42 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 3 23:17:55 2021 +0100

external/nss: Silence invalid-null-argument

...that happens now with --with-webdav=curl,

> libc.c:107:21: runtime error: null pointer passed as argument 1, which is 
declared to never be null
> /usr/include/string.h:65:33: note: nonnull attribute specified here
>  #0 in nsslibc_memequal at 
workdir/UnpackedTarball/nss/nss/lib/base/libc.c:107:14 
(instdir/program/libnss3.so +0x68cdb7)
>  #1 in nssItem_Equal at 
workdir/UnpackedTarball/nss/nss/lib/base/item.c:185:12 
(instdir/program/libnss3.so +0x68f59c)
>  #2 in find_object_in_collection at 
workdir/UnpackedTarball/nss/nss/lib/pki/pkibase.c:714:18 
(instdir/program/libnss3.so +0x63a72c)
> [...]
>  #49 in (anonymous namespace)::UpdateCheckThread::run() at 
extensions/source/update/check/updatecheck.cxx:534:48 
(instdir/program/../program/libupdchklo.so +0x2235de)
>  #50 in threadFunc at include/osl/thread.hxx:189:15 
(instdir/program/../program/libupdchklo.so +0x251c74)
>  #51 in osl_thread_start_Impl(void*) at sal/osl/unx/thread.cxx:264:9 
(instdir/program/libuno_sal.so.3 +0x65689f)

The topmost nsslibc_memequal itself appears to be modeled after memcmp and 
not
be intended to be called with null pointer arguments even if the size 
argument
is zero, see its leading

  #ifdef NSSDEBUG
  if void *)NULL == a) || ((void *)NULL == b))) {
  nss_SetError(NSS_ERROR_INVALID_POINTER);
  if ((PRStatus *)NULL != statusOpt) {
  *statusOpt = PR_FAILURE;
  }
  return PR_FALSE;
  }
  #endif /* NSSDEBUG */

in workdir/UnpackedTarball/nss/nss/lib/base/libc.c, so rather put the check 
for
zero into the calling code in nssItem_Equal.  However, it is unclear to
me whether one->data can legitimately be null there (and the patch is thus
correct) or not (and the patch would thus silence a bug elsewhere; esp. 
given
that nsslibc_memequal would return false instead of true in this case when
compiled with NSSDEBUG.)

Change-Id: Ie7556283cda500130dfcd1cfd315294277573b7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124663
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
index 059a9f3b2c0a..2c32d90b00ce 100644
--- a/external/nss/ubsan.patch.0
+++ b/external/nss/ubsan.patch.0
@@ -1,3 +1,12 @@
+--- nss/lib/base/item.c
 nss/lib/base/item.c
+@@ -182,5 +182,5 @@
+ return PR_FALSE;
+ }
+ 
+-return nsslibc_memequal(one->data, two->data, one->size, statusOpt);
++return one->size == 0 || nsslibc_memequal(one->data, two->data, 
one->size, statusOpt);
+ }
 --- nss/lib/softoken/legacydb/pk11db.c
 +++ nss/lib/softoken/legacydb/pk11db.c
 @@ -65,7 +65,7 @@

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 2f39a7b8f90a65d0be9894a0edcf01c161289459
Author: Stephan Bergmann 
AuthorDate: Fri Oct 29 09:21:51 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 29 13:25:53 2021 +0200

external/nss: More -Werror,-Wunknown-pragmas with clang-cl

> In file included from 
C:/lo-clang/core/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx:28:
> In file included from 
C:/lo-clang/core/workdir/UnpackedTarball/nss/dist/public/nss\pk11pub.h:12:
> In file included from 
C:/lo-clang/core/workdir/UnpackedTarball/nss/dist/public/nss/pk11hpke.h:8:
> 
C:/lo-clang/core/workdir/UnpackedTarball/nss/dist/public/nss/blapit.h(66,9): 
error: unknown pragma ignored [-Werror,-Wunknown-pragmas]
> #pragma deprecated(DSA_SUBPRIME_LEN, DSA_SIGNATURE_LEN, DSA_QBITS)
> ^

Change-Id: If84d8640d770ed20a6492678a9bc7fe4f4a547f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124407
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index 1d615c2397d8..b02fff60e36b 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -61,6 +61,17 @@
  #pragma deprecated(CERTDB_VALID_PEER)
  #endif
  #define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD
+--- nss/lib/freebl/blapit.h
 nss/lib/freebl/blapit.h
+@@ -53,7 +53,7 @@
+  * Mark the old defines as deprecated. This will warn code that expected
+  * DSA1 only that they need to change if the are to support DSA2.
+  */
+-#if defined(__GNUC__) && (__GNUC__ > 3)
++#if defined(__GNUC__) && (__GNUC__ > 3) || defined __clang__
+ /* make GCC warn when we use these #defines */
+ typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
+ #define DSA_SUBPRIME_LEN ((__BLAPI_DEPRECATED)DSA1_SUBPRIME_LEN)
 --- nss/lib/util/pkcs11n.h
 +++ nss/lib/util/pkcs11n.h
 @@ -426,7 +426,7 @@

[Libreoffice-commits] core.git: external/nss

[Paul Menzel (via logerrit)]

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 33c96dcef9a729625d091d28db493318b7e21590
Author: Paul Menzel 
AuthorDate: Thu Aug 12 11:59:17 2021 +0200
Commit: Michael Stahl 
CommitDate: Fri Aug 13 13:20:23 2021 +0200

nss: fix build on ppc64le Linux

Change-Id: Id67afe505e97a4e2ac8502d32d9cdda475234b64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120386
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 81e5dfb45d3e..b0c4ae9f7c97 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -52,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
+   $(if $(filter POWERPC64,$(CPUNAME)),USE_64=1 CPU_ARCH=ppc64le) \
$(if $(filter MACOSX,$(OS)),\
MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \

[Libreoffice-commits] core.git: external/nss

[Christian Lohmaier (via logerrit)]

 external/nss/ExternalProject_nss.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b8a968d83dec047bed47c1d7a6fac1b14dc7651b
Author: Christian Lohmaier 
AuthorDate: Thu Jan 28 15:17:51 2021 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jan 28 23:11:13 2021 +0100

nss: makefile bitrot: no need for android spcial case anymore

check for AARCH64 is done for all OS now, so get rid of the superfluous
statement.

The all-OS line was initially ARM64 for apple silicon, then AARCH64 was
added in addtion since that is what ~all other tools use as label - and
finally use withing LO was also unified to use AARCH64 and ARM64 was
removed…

Change-Id: Ief7e5d8bd399c839ff2910fa91ca5bbbff4bcf31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110080
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 759ef461e3f8..ef2ae95d7a5f 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -51,7 +51,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
-   $(if $(filter ANDROID,$(OS)),$(if $(filter 
AARCH64,$(CPUNAME)),USE_64=1)) \
$(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
$(if $(filter MACOSX,$(OS)),\
MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Michael Stahl (via logerrit)]

 external/nss/ExternalProject_nss.mk |8 ++--
 external/nss/nsinstall.py   |   12 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 6f5186a94dcd1989cdd819e35163af0542912559
Author: Michael Stahl 
AuthorDate: Tue Jan 19 11:28:41 2021 +0100
Commit: Michael Stahl 
CommitDate: Tue Jan 19 13:53:17 2021 +0100

nss: fix parallel build race in nsinstall.py

  File 
"/home/tdf/lode/jenkins/workspace/android_aarch64/external/nss/nsinstall.py", 
line 112, in nsinstall
os.makedirs(args[0])
  File "/opt/rh/rh-python38/root/usr/lib64/python3.8/os.py", line 223, in 
makedirs
mkdir(name, mode)
FileExistsError: [Errno 17] File exists: '../../../../dist/public/dbm'
../../../coreconf/rules.mk:119: recipe for target 
'../../../../dist/public/dbm/d' failed

Change-Id: I4273e6d3d5fa520353fff8738823ef281fe237ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109619
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index c7738ca2d759..759ef461e3f8 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 ))
 
 ifeq ($(OS),WNT)
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): \
+   $(call gb_ExternalExecutable_get_dependencies,python) \
+   $(SRCDIR)/external/nss/nsinstall.py
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
@@ -43,7 +45,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
 else # OS!=WNT
 # make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so 
nss can append it's own defaults
 # OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so 
they will overrule nss makefile values
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): \
+   $(call gb_ExternalExecutable_get_dependencies,python) \
+   $(SRCDIR)/external/nss/nsinstall.py
$(call gb_Trace_StartRange,nss,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
diff --git a/external/nss/nsinstall.py b/external/nss/nsinstall.py
index 80e9c1679373..d90a85e6c540 100644
--- a/external/nss/nsinstall.py
+++ b/external/nss/nsinstall.py
@@ -99,17 +99,17 @@ def nsinstall(argv):
   if options.D:
 if len(args) != 1:
   return 1
-if os.path.exists(args[0]):
+try:
+  if options.m:
+os.makedirs(args[0], options.m)
+  else:
+os.makedirs(args[0])
+except FileExistsError:
   if not os.path.isdir(args[0]):
 sys.stderr.write('nsinstall: ' + args[0] + ' is not a directory\n')
 sys.exit(1)
   if options.m:
 os.chmod(args[0], options.m)
-  sys.exit()
-if options.m:
-  os.makedirs(args[0], options.m)
-else:
-  os.makedirs(args[0])
 return 0
 
   # nsinstall arg1 [...] directory
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Julien Nabet (via logerrit)]

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 61d9a4a24405b151d212fa19e5c1edb09f5f2a42
Author: Julien Nabet 
AuthorDate: Sun Jan 3 14:09:46 2021 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 3 17:20:27 2021 +0100

Fix nss build on Raspberry pi4

In file included from gcm-arm32-neon.c:16:
/usr/lib/llvm-11/lib/clang/11.0.0/include/arm_neon.h:32:2: error: "NEON 
support not enabled"
error "NEON support not enabled"
 ^

gcm-arm32-neon.c:21:5: warning: implicit declaration of function 'vst1_u8' 
is invalid in C99 [-Wimplicit-function-declaration]
vst1_u8(outbuf, vrev64_u8(vcreate_u8(ghash->x_high)));
^
gcm-arm32-neon.c:21:21: warning: implicit declaration of function 
'vrev64_u8' is invalid in C99 [-Wimplicit-function-declaration]
vst1_u8(outbuf, vrev64_u8(vcreate_u8(ghash->x_high)));
^
gcm-arm32-neon.c:21:31: warning: implicit declaration of function 
'vcreate_u8' is invalid in C99 [-Wimplicit-function-declaration]
vst1_u8(outbuf, vrev64_u8(vcreate_u8(ghash->x_high)));
  ^
gcm-arm32-neon.c:27:15: error: unknown type name 'uint8x16_t'; did you mean 
'uint16_t'?
static inline uint8x16_t
  ^~
  uint16_t
/usr/include/arm-linux-gnueabihf/bits/stdint-uintn.h:25:20: note: 
'uint16_t' declared here
typedef __uint16_t uint16_t;
   ^
gcm-arm32-neon.c:28:13: error: unknown type name 'uint8x8_t'; did you mean 
'uint8_t'?
clmul(const uint8x8_t a, const uint8x8_t b)
^
uint8_t
etc.

Change-Id: I1e241cea5becb159f8b0f898270dc88f93f68670
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108634
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 19831b6c3633..c7738ca2d759 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -54,6 +54,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter LINUX,$(OS)),$(if 
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
+   $(if $(filter ARM,$(CPUNAME)),NSS_DISABLE_ARM32_NEON=1) \
$(if $(CROSS_COMPILING),\
CROSS_COMPILE=1 \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss ios/CustomTarget_iOS_link.mk

[Michael Stahl (via logerrit)]

 external/nss/ExternalProject_nss.mk |2 +-
 ios/CustomTarget_iOS_link.mk|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4041c68ea59181f1c4774c356809066d2051db41
Author: Michael Stahl 
AuthorDate: Sun Dec 20 21:20:28 2020 +0100
Commit: Tor Lillqvist 
CommitDate: Mon Dec 21 18:34:11 2020 +0100

ios,nss: use AARCH64 consistently

Presumably missing from 1cee06c080bceab86ac894f8ae86d4d296b050aa

Change-Id: I0f658bb36179b741f6f47264ee1400633db69d6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108064
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b9f56d24de0c..19831b6c3633 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter ANDROID,$(OS)),$(if $(filter 
AARCH64,$(CPUNAME)),USE_64=1)) \
-   $(if $(filter AARCH64 ARM64,$(CPUNAME)),USE_64=1 
CPU_ARCH=aarch64) \
+   $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
$(if $(filter MACOSX,$(OS)),\
MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \
diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk
index 240f38d071b4..ed4b7b2b0525 100644
--- a/ios/CustomTarget_iOS_link.mk
+++ b/ios/CustomTarget_iOS_link.mk
@@ -23,7 +23,7 @@ else
 IOSKIT = $(IOSGEN)/Debug_arm64/libKit.dylib
 endif
 else
-ifeq ($(CPUNAME),ARM64)
+ifeq ($(CPUNAME),AARCH64)
 IOSKIT = $(IOSGEN)/Release_arm64/libKit.dylib
 endif
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/nss_macosx.patch |   21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 796c7f612603490dda9277ced0f6ab3cce3bc116
Author: Tor Lillqvist 
AuthorDate: Sun Dec 6 18:43:10 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 7 00:01:35 2020 +0100

More NSS fixes for macOS on arm64

I think the attempt to set CPU_ARCH in
external/nss/ExternalProject_nss.mk does not actually work. And
anyway, it should be arm64 for macOS on arm64, not aarch64.

Now NSS configury correctly finds the APIs present in the system when
building for macOS on arm64. Previously, it attempted to compile the
test snippets for PowerPC... which caused for instance dladdr() not to
be found, which caused the softokn3 loading to fail.

(It's somewhat surprising that the NSS configury still has "support"
for MacOS on PowerPC... Do people really build latest and greatest NSS
on such machines? Or is it just a leftover and the NSS people never,
ever, remove anything?)

Change-Id: I0dc35df0460db7997efcfdf92594fd8ae352aa49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107316
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index c45c5107f094..07b60a5ed00d 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,7 +1,17 @@
 diff -ru a/nspr/configure b/nspr/configure
 --- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
 +++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100
-@@ -6577,7 +6579,7 @@
+@@ -6453,6 +6453,9 @@
+ AS='$(CC) -x assembler-with-cpp'
+ CFLAGS="$CFLAGS -Wall -fno-common"
+ case "${target_cpu}" in
++aarch64)
++CPU_ARCH=arm64
++;;
+ arm*)
+ CPU_ARCH=arm
+ ;;
+@@ -6578,7 +6579,7 @@
  
  
  DSO_CFLAGS=-fPIC
@@ -31,7 +41,14 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
  override CPU_ARCH = x86
  endif
  else
-@@ -40,12 +48,16 @@
+@@ -40,19 +48,20 @@
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+-OS_REL_CFLAGS = -Dppc
+-CC  += -arch ppc
+-CCC += -arch ppc
+ endif
  endif
  
  ifneq (,$(MACOS_SDK_DIR))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/ExternalProject_nss.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db6457fc6035a9c271edbaedd33d04985d1235b2
Author: Tor Lillqvist 
AuthorDate: Mon Oct 19 20:52:46 2020 +0100
Commit: Tor Lillqvist 
CommitDate: Tue Oct 20 07:31:35 2020 +0200

Unbreak nss build for the native arm64 on an Apple Silicon Mac

I had managed to break it with 92b99bddb63b1bf4a639fc969727ac35b3ed1ac8
that made it possible to build for (Rosettafied) x86_64 on an Apple
Silicon Mac.

Change-Id: I337f2a8e777394e586f659fadd819cf7dfc0a332
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104546
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 062f6642f6f6..b9f56d24de0c 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(CROSS_COMPILING),\
CROSS_COMPILE=1 \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
-   $(if $(filter MACOSX-arm64,$(OS)-$(shell uname -m)), \
+   $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell 
uname -m)), \
CPU_ARCH=x86_64 \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/ExternalProject_nss.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 92b99bddb63b1bf4a639fc969727ac35b3ed1ac8
Author: Tor Lillqvist 
AuthorDate: Wed Oct 14 09:09:34 2020 +0100
Commit: Tor Lillqvist 
CommitDate: Wed Oct 14 18:59:14 2020 +0200

Fix build for Intel on an Apple Silicon Mac

Change-Id: Id1a5906db87b05218b0810045c698e5ab2a09eca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104271
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 25d4995ced44..062f6642f6f6 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -57,6 +57,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(CROSS_COMPILING),\
CROSS_COMPILE=1 \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
+   $(if $(filter MACOSX-arm64,$(OS)-$(shell uname -m)), \
+   CPU_ARCH=x86_64 \
+   NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
$(MAKE) \
AR="$(AR)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/nss-ios.patch |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 83615f4ee8c5e78fb45389b5ea3c1204625e3fe2
Author: Tor Lillqvist 
AuthorDate: Mon Oct 5 01:21:20 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Oct 5 09:08:23 2020 +0200

Fix nss build for iOS

Change-Id: Ib7d1fdfc8394c7356db436e5d1bf6126c164bacc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103937
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch
index 3fbe1541e741..4293cc5243ad 100644
--- a/external/nss/nss-ios.patch
+++ b/external/nss/nss-ios.patch
@@ -30,10 +30,10 @@
  
  CORE_DEPTH = ../../..
  
--DIRS = . testlib
+-DIRS = testlib
 +DIRS =
  
- testlib: .
+ MODULE = nss
  
 --- a/a/nss/lib/nss/nssinit.c
 +++ a/a/nss/lib/nss/nssinit.c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Jan-Marek Glogowski (via logerrit)]

 external/nss/ExternalProject_nss.mk  |1 
 external/nss/UnpackedTarball_nss.mk  |1 
 external/nss/nss-android.patch.1 |6 -
 external/nss/nss-restore-manual-pre-dependencies.patch.1 |   83 +++
 4 files changed, 86 insertions(+), 5 deletions(-)

New commits:
commit d2f9c55e065d559de903d540da28502646714a24
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 1 12:57:53 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Oct 2 13:38:10 2020 +0200

nss: restore manual pre-dependency build

We had some seldom build failures on Windows, with errors like:
PermissionError: [WinError 32] The process cannot access the file
because it is being used by another process: '/nssckmdt.h'.

This happens, because of the "." / parent shell hack. Thinking
about it again, it doesn't prevent the parent make to run in
parallel to the "." directory make. So I tried to use a terminal
match-all rule like

ifneq (,$(filter .,$(DIRS)))
%::
# empty terminal rule triggered
$(error can't happen)
endif

to stop the original parent make, but that doesn't work and the
$(error ...) is triggered.

So AFAIK I'm out of options here and have to restore the old
manual pre-dependency build variant - still much better then no
parallel build.

An alternative idea was to put the rest of the rules.mk in the
"else" of the terminal rule, to skip all normal rules, but this
still leaves out all rules from the rest of the make-files,
which might result in some hard to debug errors.

This reverts my upstream patch 15608:744881490c78.

Change-Id: I9e2e9e1ec9f35697c7853c92f60434f514cba5ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103777
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index a7099e34e7e7..25d4995ced44 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -59,7 +59,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
$(MAKE) \
-   -j1 \
AR="$(AR)" \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 7921d36078bf..fb8b8b061265 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/macos-dlopen.patch.0 \
external/nss/nss.getopt.patch.0 \
external/nss/nss-win-arm64.patch \
+external/nss/nss-restore-manual-pre-dependencies.patch.1 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 7d3807f73589..0f75715e8b86 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -62,13 +62,11 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
 --- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 
+0100
 +++ nss/nss/lib/ckfw/builtins/manifest.mn  2019-11-26 15:18:29.281982387 
+0100
-@@ -5,9 +5,7 @@
+@@ -5,7 +5,7 @@
  
  CORE_DEPTH = ../../..
  
--DIRS = . testlib
--
--testlib: .
+-DIRS = testlib
 +DIRS =
  
  MODULE = nss
diff --git a/external/nss/nss-restore-manual-pre-dependencies.patch.1 
b/external/nss/nss-restore-manual-pre-dependencies.patch.1
new file mode 100644
index ..ebcc5b48c540
--- /dev/null
+++ b/external/nss/nss-restore-manual-pre-dependencies.patch.1
@@ -0,0 +1,83 @@
+Revert of upstream:
+
+changeset:   15608:744881490c78
+user:Jan-Marek Glogowski 
+date:Wed May 13 19:00:40 2020 +
+summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea
+
+--- b/nss/coreconf/rules.mkWed May 13 19:00:40 2020 +
 a/nss/coreconf/rules.mkTue May 12 21:33:43 2020 +
+@@ -31,21 +31,10 @@
+ USE_NT_C_SYNTAX=1
+ endif
+ 
+-# For whatever reason, "." can't be handled using make conditionals.
+-# Based on automake's SUBDIRS "." handling.
+ ifdef DIRS
+ ifndef IGNORE_DIRS
+-ifneq (,$(filter .,$(DIRS)))
+-TARGETS = $(NULL)
+-ALL_TRASH = $(NULL)
+-endif
+-
+ $(DIRS):
++  $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS)
+-  $(IGNORE_ERROR)@if [ "$@" != "." ]; then \
+-  $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+-  else \
+-  IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+-  fi
+   @$(CLICK_STOPWATCH)
+ 

[Libreoffice-commits] core.git: external/nss

[Jan-Marek Glogowski (via logerrit)]

 external/nss/ExternalProject_nss.mk |6 +++
 external/nss/UnpackedTarball_nss.mk |1 
 external/nss/nss-win-arm64.patch|   66 
 3 files changed, 73 insertions(+)

New commits:
commit dab9f9afe214fd5c5803e880c0e3d69f6fad3b14
Author: Jan-Marek Glogowski 
AuthorDate: Sat Jul 18 03:56:14 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu Sep 17 06:38:43 2020 +0200

nss: fix Windows Arm64 build

Change-Id: I59834daebd6c9ccd1255be6f08e5f61b20ee06e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102853
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 3679af52b614..8b14ce58153d 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -26,11 +26,17 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalExecuta
OPT_CODE_SIZE=0) \
OS_TARGET=WIN95 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
+   $(if $(filter ARM64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
XCFLAGS="$(SOLARINC)" \
+   $(if $(CROSS_COMPILING),\
+   CROSS_COMPILE=1 \
+   $(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
+   NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
$(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
NSS_DISABLE_GTESTS=1 \
+   CCC="$(CXX)" \
,nss)
$(call gb_Trace_EndRange,nss,EXTERNAL)
 
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 4aaa70fc2131..7921d36078bf 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-bz1646594.patch.1 \
 external/nss/macos-dlopen.patch.0 \
external/nss/nss.getopt.patch.0 \
+   external/nss/nss-win-arm64.patch \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss-win-arm64.patch b/external/nss/nss-win-arm64.patch
new file mode 100644
index ..eda198f85afc
--- /dev/null
+++ b/external/nss/nss-win-arm64.patch
@@ -0,0 +1,66 @@
+--- a/a/nspr/configure
 a/a/nspr/configure
+@@ -821,6 +821,7 @@
+ linux*)   OS_ARCH=Linux ;;
+ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
+ mingw*)   OS_ARCH=WINNT CPU_ARCH=x86 ;;
++cygwin*)  OS_ARCH=WINNT ;;
+ darwin*)  OS_ARCH=Darwin ;;
+ riscos*)  OS_ARCH=RISCOS ;;
+ esac
+--- a/a/nss/lib/freebl/Makefile.orig
 a/a/nss/lib/freebl/Makefile
+@@ -119,8 +119,23 @@
+ endif
+ endif
+ ifeq ($(CPU_ARCH),aarch64)
+-DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
+-EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
++ifdef CC_IS_CLANG
++DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
++EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
++else ifeq (1,$(CC_IS_GCC))
++# GCC versions older than 4.9 don't support ARM AES. The check
++# is done in two parts, first allows "major.minor" == "4.9",
++# and then rejects any major versions prior to 5. Note that
++# there has been no GCC 4.10, as it is renamed to GCC 5.
++ifneq (,$(filter 4.9,$(word 1,$(GCC_VERSION)).$(word 
2,$(GCC_VERSION
++DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
++EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
++endif
++ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION
++DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
++EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
++endif
++endif
+ endif
+ ifeq ($(CPU_ARCH),arm)
+ ifndef NSS_DISABLE_ARM32_NEON
+@@ -133,7 +146,10 @@
+ DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
+ EXTRA_SRCS += aes-armv8.c sha256-armv8.c
+ else ifeq (1,$(CC_IS_GCC))
+-# Old compiler doesn't support ARM AES.
++# GCC versions older than 4.9 don't support ARM AES. The check
++# is done in two parts, first allows "major.minor" == "4.9",
++# and then rejects any major versions prior to 5. Note that
++# there has been no GCC 4.10, as it is renamed to GCC 5.
+ ifneq (,$(filter 4.9,$(word 1,$(GCC_VERSION)).$(word 
2,$(GCC_VERSION
+ DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
+ EXTRA_SRCS += aes-armv8.c sha256-armv8.c
+@@ -198,6 +200,7 @@
+ ifdef BUILD_OPT
+   OPTIMIZER += -Ox  # maximum optimization for freebl
+ endif
++ifeq ($(CPU_ARCH),x86_64)
+ ASFILES  = arcfour-amd64-masm.asm 

[Libreoffice-commits] core.git: external/nss

[Michael Stahl (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss-bz1646594.patch.1  |   15 +++
 2 files changed, 16 insertions(+)

New commits:
commit c7d1bb119d88faaafb53d65ad8907ede97d89c8c
Author: Michael Stahl 
AuthorDate: Tue Aug 18 14:36:33 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 18 15:38:45 2020 +0200

nss: fix Android build

Change-Id: I8d6704a00ee70c1cb397f8f12dac8050f24f44be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100917
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index beb9afe11890..4aaa70fc2131 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.vs2015.patch \
 external/nss/nss.vs2015.pdb.patch \
 external/nss/nss.bzmozilla1238154.patch \
+   external/nss/nss-bz1646594.patch.1 \
 external/nss/macos-dlopen.patch.0 \
external/nss/nss.getopt.patch.0 \
 $(if $(filter iOS,$(OS)), \
diff --git a/external/nss/nss-bz1646594.patch.1 
b/external/nss/nss-bz1646594.patch.1
new file mode 100644
index ..e6c75922a7dc
--- /dev/null
+++ b/external/nss/nss-bz1646594.patch.1
@@ -0,0 +1,15 @@
+regression from https://bugzilla.mozilla.org/show_bug.cgi?id=1646594
+
+--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200
 nss/nss/coreconf/arch.mk   2020-08-18 14:33:46.360320806 +0200
+@@ -116,8 +116,10 @@
+   OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
+ endif
+ KERNEL = Linux
++ifneq ($(OS_TARGET),Android)
+ include $(CORE_DEPTH)/coreconf/Linux.mk
+ endif
++endif
+ 
+ # Since all uses of OS_ARCH that follow affect only userland, we can
+ # merge other Glibc systems with Linux here.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

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

New commits:
commit cba368b233ea874df0d9c9fcd4d234d412ac8681
Author: Tor Lillqvist 
AuthorDate: Thu Aug 6 22:43:14 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Aug 7 12:02:45 2020 +0200

Use USE_DLFCN also on macOS on arm64

Change-Id: I8975ea2d4f33a101b5ac6db247a6dd062bc0c410
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100273
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 3144fa687761..c45c5107f094 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -71,3 +71,17 @@ diff -ru a/nss/Makefile b/nss/Makefile
  ifdef USE_DEBUG_RTL
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
+--- a/a/nspr/pr/include/md/_darwin.h
 b/b/nspr/pr/include/md/_darwin.h
+@@ -40,11 +40,7 @@
+ 
+ #undef  HAVE_STACK_GROWING_UP
+ #define HAVE_DLL
+-#if defined(__x86_64__) || TARGET_OS_IPHONE
+ #define USE_DLFCN
+-#else
+-#define USE_MACH_DYLD
+-#endif
+ #define _PR_HAVE_SOCKADDR_LEN
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_HAVE_LARGE_OFF_T
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2869eacfeba42549e3014b54bde50c48d7862cfd
Author: Tor Lillqvist 
AuthorDate: Sat Jul 4 23:07:52 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Jul 5 09:10:19 2020 +0200

Set CROSS_COMPILE=1 when cross-compiling nss

Change-Id: Iad826eb83e4c49078e6c668661446b5b70e6a981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97987
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index d3c09eb47a45..316a1fe9c3ef 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -49,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(filter LINUX,$(OS)),$(if 
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
+   CROSS_COMPILE=1 \
$(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/ExternalProject_nss.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 429f5c788a73d69c4286f08ea3757869e1fa3da8
Author: Tor Lillqvist 
AuthorDate: Sat Jul 4 22:37:09 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Jul 5 09:09:51 2020 +0200

Be more generic for CPUNAME=ARM64

It's used not just for iOS but can be macOS too.

Also, nss wants to call it CPU_ARCH=aarch64.

Change-Id: I6398c3bf1409f2ccf16b0d154ad7c2b56f493b15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97986
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index c3cb301e8afb..d3c09eb47a45 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -42,14 +42,14 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalExecuta
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter ANDROID,$(OS)),$(if $(filter 
AARCH64,$(CPUNAME)),USE_64=1)) \
-   $(if $(filter iOS,$(OS)),USE_64=1) \
+   $(if $(filter ARM64,$(CPUNAME)),USE_64=1) \
$(if $(filter MACOSX,$(OS)),\
MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter LINUX,$(OS)),$(if 
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
-   $(if $(filter 
iOS-ARM64,$(OS)-$(CPUNAME)),CPU_ARCH=arm64) \
+   $(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
$(MAKE) AR="$(AR)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/ExternalProject_nss.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f019f4aa6e3e69899d7b7c06b66aa4077c60c4c5
Author: Tor Lillqvist 
AuthorDate: Sat Jul 4 22:34:52 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Jul 5 09:09:12 2020 +0200

We don't actually build nss for iOS, but if we did, it would be for arm64

iOS is 64-bit only since long.

Change-Id: Ic0d9f69764951f420be10947c5b8889a3f95962c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97985
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 4bb51aa7c402..c3cb301e8afb 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -42,14 +42,14 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalExecuta
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter ANDROID,$(OS)),$(if $(filter 
AARCH64,$(CPUNAME)),USE_64=1)) \
-   $(if $(filter iOS,$(OS)),$(if $(filter 
ARM64,$(CPUNAME)),USE_64=1)) \
+   $(if $(filter iOS,$(OS)),USE_64=1) \
$(if $(filter MACOSX,$(OS)),\
MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter LINUX,$(OS)),$(if 
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
-   $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
+   $(if $(filter 
iOS-ARM64,$(OS)-$(CPUNAME)),CPU_ARCH=arm64) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
$(MAKE) AR="$(AR)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bb649c3156bee3b7a8d9138a598136b4b90ddf22
Author: Tor Lillqvist 
AuthorDate: Sat Jul 4 22:20:56 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Jul 5 09:08:37 2020 +0200

Use up-to-date config.{guess,sub} for external/nss, too

Change-Id: I387aba22b90ab1bde1ae3659ea06a5838c1c829d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97983
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 54119b9c2d9b..5904e267b668 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,nss))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,nss,$(NSS_TARBALL)))
 
+$(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,nss,nspr/build/autoconf))
+
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.patch \
 external/nss/nss.aix.patch \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/ExternalProject_nss.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 50889effe57d9e28ecd9403ea0d695ecd73ac791
Author: Tor Lillqvist 
AuthorDate: Sat Jul 4 15:10:38 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sat Jul 4 22:02:07 2020 +0200

Remove leftovers for OS X on PowerPC

Change-Id: Id9d553e58635c2fa7414108467ff7d22f5c74c41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97980
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b4c4f37cf07c..4bb51aa7c402 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -44,12 +44,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalExecuta
$(if $(filter ANDROID,$(OS)),$(if $(filter 
AARCH64,$(CPUNAME)),USE_64=1)) \
$(if $(filter iOS,$(OS)),$(if $(filter 
ARM64,$(CPUNAME)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),\
-   $(if $(filter-out 
POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
+   MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
NSS_USE_SYSTEM_SQLITE=1) \
$(if $(filter LINUX,$(OS)),$(if 
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
-   $(if $(filter 
MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
$(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss.getopt.patch.0 |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit 70848c7e5ab2035aa7727fa97492e4535fd6937e
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 01:19:23 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 23 17:26:18 2020 +0200

Add getopt declarations

Avoids: implicit declaration of function 'getopt' is invalid in C99
[-Werror,-Wimplicit-function-declaration].

Change-Id: Ic178f53d1002425df52e220b1723fb12edca13df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96910
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8801c7cdad63..54119b9c2d9b 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.bzmozilla1238154.patch \
 external/nss/macos-dlopen.patch.0 \
 external/nss/nss.nspr-parallel-win-debug_build.patch \
+   external/nss/nss.getopt.patch.0 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss.getopt.patch.0 b/external/nss/nss.getopt.patch.0
new file mode 100644
index ..aeabb33f9b97
--- /dev/null
+++ b/external/nss/nss.getopt.patch.0
@@ -0,0 +1,25 @@
+# pr/tests/sel_spd.c:427:20: error: implicit declaration of function 'getopt' 
is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+--- nspr/pr/tests/sel_spd.c
 nspr/pr/tests/sel_spd.c
+@@ -15,6 +15,9 @@
+ #include 
+ #include 
+ #include 
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ #ifdef DEBUG
+ #define PORT_INC_DO +100
+--- nspr/pr/tests/testfile.c
 nspr/pr/tests/testfile.c
+@@ -23,6 +23,9 @@
+ #include 
+ #include 
+ #endif /* XP_OS2 */
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ static int _debug_on = 0;
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Jan-Marek Glogowski (via logerrit)]

 external/nss/nss-android.patch.1 |8 +---
 external/nss/nss-ios.patch   |4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit d585cad3e63c894aba33993ad970ca5452fdfcc0
Author: Jan-Marek Glogowski 
AuthorDate: Mon Jun 1 04:44:50 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon Jun 1 04:55:52 2020 +0200

NSS: update Android and iOS patches

They now apply again without any fuzz hunks.

Change-Id: I8200494b43b97ada66aeb4fa8f9737c3a720dbe2

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index b77663c59eb3..7d3807f73589 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -62,15 +62,17 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
 --- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 
+0100
 +++ nss/nss/lib/ckfw/builtins/manifest.mn  2019-11-26 15:18:29.281982387 
+0100
-@@ -5,7 +5,7 @@
+@@ -5,9 +5,7 @@
  
  CORE_DEPTH = ../../..
  
--DIRS = testlib
+-DIRS = . testlib
+-
+-testlib: .
 +DIRS =
  
  MODULE = nss
- MAPFILE = $(OBJDIR)/nssckbi.def
+ 
 diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk
 --- nss/nss/coreconf/arch.mk   2019-11-01 10:29:44.933245745 +0100
 +++ nss/nss/coreconf/arch.mk   2019-11-01 10:32:04.347181076 +0100
diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch
index 9d4af2c724e9..000d1685abf5 100644
--- a/external/nss/nss-ios.patch
+++ b/external/nss/nss-ios.patch
@@ -62,7 +62,7 @@
MKSHLIB += -exported_symbols_list $(MAPFILE)
 --- a/a/nss/coreconf/UNIX.mk
 +++ a/a/nss/coreconf/UNIX.mk
-@@ -21,10 +21,14 @@
+@@ -19,10 +19,14 @@
  
  ifdef BUILD_TREE
  NSINSTALL_DIR  = $(BUILD_TREE)/nss
@@ -76,7 +76,7 @@
 +endif
  endif
  
- MKDEPEND_DIR= $(CORE_DEPTH)/coreconf/mkdepend
+ 
 --- a/a/nspr/pr/include/md/_darwin.h
 +++ a/a/nspr/pr/include/md/_darwin.h
 @@ -26,6 +26,8 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Tor Lillqvist (via logerrit)]

 external/nss/nss-android.patch.1 |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 95747c630766c9e3287c2bfea7255ad23a24ce5d
Author: Tor Lillqvist 
AuthorDate: Thu Apr 23 14:05:26 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Apr 23 15:21:53 2020 +0200

Use equal number of leading and trailing context lines in patch

At least the patch program on macOS seems to require it.

Change-Id: I9943134c7fb672226cbde52e35ef78f74f060ed0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92756
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 368b7a23668b..b77663c59eb3 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -41,7 +41,8 @@ diff -ur nss.org/nspr/configure nss/nspr/configure
 diff -ur nss.org/nss/Makefile nss/nss/Makefile
 --- nss.org/nss/Makefile   2017-09-07 15:29:44.933245745 +0200
 +++ nss/nss/Makefile   2017-09-07 15:32:04.347181076 +0200
-@@ -62,6 +62,6 @@
+@@ -62,7 +62,7 @@
+ 
  ifeq ($(OS_TARGET),Android)
  NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
 -   --target=$(ANDROID_PREFIX) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Luboš Luňák (via logerrit)]

 external/nss/gyp-buildsystem.patch.0 |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c76fdcf1cfa1242e66b50ebe80d6eac1baae37a9
Author: Luboš Luňák 
AuthorDate: Thu Mar 26 17:09:07 2020 +0100
Commit: Luboš Luňák 
CommitDate: Thu Mar 26 18:28:21 2020 +0100

try to fix UnicodeDecodeError with gyp when building nss

https://ci.libreoffice.org/job/gerrit_windows/60353/consoleFull
fails for some reason when gyp tries to read the variables set up
by the MSVC .bat file that sets up environment for cl.exe .
Presumably there is some env. variable that has incorrect content
for cp1252 encoding. Try to simply ignore such errors and make
Python replace the character with something.

Change-Id: Id5fca688fdd533fad2789a391928777b5065ec20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91149
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/external/nss/gyp-buildsystem.patch.0 
b/external/nss/gyp-buildsystem.patch.0
index 8323d1a7a7c3..56502ab874f3 100644
--- a/external/nss/gyp-buildsystem.patch.0
+++ b/external/nss/gyp-buildsystem.patch.0
@@ -5,7 +5,7 @@
  # Setup params to pass to and attempt to launch reg.exe.
  cmd = ['reg.exe', 'query', r'HKLM\Software\Microsoft\DirectX', '/s']
 -p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+p = subprocess.Popen(cmd, stdout=subprocess.PIPE, 
stderr=subprocess.PIPE,universal_newlines=True)
++p = subprocess.Popen(cmd, stdout=subprocess.PIPE, 
stderr=subprocess.PIPE,universal_newlines=True,errors='replace')
  for line in p.communicate()[0].splitlines():
if 'InstallPath' in line:
  dxsdk_dir = line.split('')[3] + "\\"
@@ -32,7 +32,7 @@
  args.extend(('&&', 'set'))
  popen = subprocess.Popen(
 -args, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-+args, shell=True, stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True)
++args, shell=True, stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True,errors='replace')
  variables, _ = popen.communicate()
  if popen.returncode != 0:
raise Exception('"%s" failed with error %d' % (args, popen.returncode))
@@ -41,7 +41,7 @@
  args.extend(('&&',
'for', '%i', 'in', '(cl.exe)', 'do', '@echo', 'LOC:%~$PATH:i'))
 -popen = subprocess.Popen(args, shell=True, stdout=subprocess.PIPE)
-+popen = subprocess.Popen(args, shell=True, 
stdout=subprocess.PIPE,universal_newlines=True)
++popen = subprocess.Popen(args, shell=True, 
stdout=subprocess.PIPE,universal_newlines=True,errors='replace')
  output, _ = popen.communicate()
  cl_paths[arch] = _ExtractCLPath(output)
return cl_paths
@@ -66,7 +66,7 @@
  # non-Windows don't do that there.
  link = subprocess.Popen(args, shell=sys.platform == 'win32', env=env,
 -stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-+stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True)
++stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True,errors='replace')
  out, _ = link.communicate()
  for line in out.splitlines():
if (not line.startswith('   Creating library ') and
@@ -86,7 +86,7 @@
  env = self._GetEnv(arch)
  popen = subprocess.Popen(args, shell=True, env=env,
 - stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-+ stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True)
++ stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True,errors='replace')
  out, _ = popen.communicate()
  for line in out.splitlines():
if line and 'manifest authoring warning 81010002' not in line:
@@ -95,7 +95,7 @@
  env = self._GetEnv(arch)
  popen = subprocess.Popen(args, shell=True, env=env,
 - stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-+ stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True)
++ stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True,errors='replace')
  out, _ = popen.communicate()
  # Filter junk out of stdout, and write filtered versions. Output we want
  # to filter is pairs of lines that look like this:
@@ -104,7 +104,7 @@
  env = self._GetEnv(arch)
  popen = subprocess.Popen(args, shell=True, env=env,
 - stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-+ stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True)
++ stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT,universal_newlines=True,errors='replace')
  out, _ = popen.communicate()
  for line in 

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

 external/nss/ExternalProject_nss.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eac806e8dcd9ee6439ac8695978ff6b62cc6b8d2
Author: Stephan Bergmann 
AuthorDate: Wed Mar 25 12:04:57 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Mar 25 14:52:05 2020 +0100

Properly quote $(NINJA)

At least on my Windows machine I had always had

  C:\Program Files (x86)\Ninja 1.7.1

in Path, so that `which ninja` in configure.ac puts

  export NINJA=/cygdrive/c/Program Files (x86)/Ninja 1.7.1/ninja

into config_host.mk, with spaces and parentheses that need to be quoted 
here.

Change-Id: I938f8914cbc9b7eff7a41009f12cd95abeb4421c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91042
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index e39f1449df64..28e2476c5c8c 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
COMMA=$(COMMA) \
PATH=$$(cygpath $(call 
gb_UnpackedTarball_get_dir,nss)):$$(cygpath $(call 
gb_UnpackedTarball_get_dir,gyp)):$$PATH \
MAKE=$(MAKE) \
-   NINJA=$(NINJA) \
+   NINJA='$(subst ','\'',$(NINJA))' \
NSINSTALL='$(SRCDIR)/external/nss/nsinstall.py' \
LIB="$(ILIB)" \
RC="rc.exe $(SOLARINC)" \
@@ -70,7 +70,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(call gb_ExternalProject_run,build,\
COMMA=$(COMMA) \
PATH=$(call gb_UnpackedTarball_get_dir,nss):$(call 
gb_UnpackedTarball_get_dir,gyp):$$PATH \
-   NINJA=$(NINJA) \
+   NINJA='$(subst ','\'',$(NINJA))' \
./build.sh -v --disable-tests --enable-libpkix \
$(if $(ENABLE_DBGUTIL),,--opt) \
$(if $(COM_IS_CLANG),$(if $(filter 
-fsanitize=%,$(CC)),--no-zdefs)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Luboš Luňák (via logerrit)]

 external/nss/ExternalProject_nss.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d591a682e46ff352f06a61c024ef661dd17f4ea4
Author: Luboš Luňák 
AuthorDate: Wed Mar 25 10:04:32 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Mar 25 13:26:55 2020 +0100

remove a dependency that doesn't make a sense

Change-Id: Idc88476213a01643f5ba6b8ea9fbee78673d7769
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91032
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index a0ca7cf04528..e39f1449df64 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -23,9 +23,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,nss,build))
 nss_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/python
 nss_SETUP_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/setup-python
 
-$(call gb_ExternalProject_get_state_target,nss,build): \
-$(call gb_ExternalExecutable_get_dependencies,python) \
-$(call gb_UnpackedTarball_get_target,gyp) | $(dir $(call 
gb_ExternalProject_get_target,gyp)).dir
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python) $(call 
gb_UnpackedTarball_get_target,gyp)
$(call gb_Trace_StartRange,nss,EXTERNAL)
cp $(SRCDIR)/external/nss/python-cygwin-template $(nss_PYTHON)
pythondir=$$($(call gb_ExternalExecutable_get_command,python) -c 
'import sys; import os; sys.stdout.write(os.path.dirname(sys.executable))') \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

 external/nss/ExternalProject_nss.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12235d3390a7fc5146bf65f9d6166034b8a048ee
Author: Stephan Bergmann 
AuthorDate: Tue Mar 24 22:15:22 2020 +0100
Commit: Luboš Luňák 
CommitDate: Wed Mar 25 09:59:59 2020 +0100

Missing dependency

Change-Id: I877364593025de65695995729a12294748c949ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91010
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 404331512c90..a0ca7cf04528 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -60,7 +60,7 @@ else ifneq (,$(filter FREEBSD LINUX NETBSD OPENBSD 
SOLARIS,$(OS)))
 nss_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/python
 nss_SETUP_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/setup-python
 
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python) $(call 
gb_UnpackedTarball_get_target,gyp)
$(call gb_Trace_StartRange,nss,EXTERNAL)
echo "#! /bin/sh" > $(nss_PYTHON)
pythondir=$$($(call gb_ExternalExecutable_get_command,python) -c 
'import sys; import os; sys.stdout.write(os.path.dirname(sys.executable))') \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

 external/nss/UnpackedTarball_gyp.mk |3 +++
 external/nss/gyp-rpath.patch|   12 
 2 files changed, 15 insertions(+)

New commits:
commit 23245f723fb29262b8543d6447d1b0bb69cb50fb
Author: Stephan Bergmann 
AuthorDate: Tue Mar 24 22:45:23 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Mar 25 08:25:22 2020 +0100

external/nss: Fix rpath for Linux et al

See CustomTarget_postprocess/check_dynamic_objects (in a
--with-package-format=... build) failing after
8512f4ca090c85477a6670438aeefe7fdfcf8a98 "build nss using their new build 
system
(gyp/ninja-based)" with

> instdir/program/libsmime3.so has no RPATH
> instdir/program/libnssutil3.so has no RPATH
> instdir/program/libnssdbm3.so has no RPATH
> instdir/program/libfreeblpriv3.so has no RPATH
> instdir/program/libsqlite3.so has no RPATH
> instdir/program/libfreebl3.so has no RPATH
> instdir/program/libnssckbi.so has no RPATH
> instdir/program/libnss3.so has no RPATH
> instdir/program/libsoftokn3.so has no RPATH
> instdir/program/libssl3.so has no RPATH

workdir/UnpackedTarball/gyp/pylib/gyp/generator/ninja.py already has logic 
to
add -Wl,-rpath=$ORIGIN/... to certain link command lines, presumably for
building certain executables, but of which we apparently include none in
ExternalPackage_nss, so it shouldn't hurt to keep them using that other
-Wl,-rpath=$ORIGIN/...  I have no idea whether there would be a cleaner way 
than
this patch to pass an additional -Wl,-rpath=$ORIGIN to all link command 
lines
via the invocation of build.sh in ExternalProject_nss (even if those 
executables
mentioned in the previous sentence would then have two -Wl,-rpath=..., that
should not hurt in practice).

(Most, if not all of the rpath-related hunks of external/nss/nss.patch that 
were
needed for the make-based nss build on Linux et al prior to
8512f4ca090c85477a6670438aeefe7fdfcf8a98 can probably be removed in a 
follow-up
commit.)

Change-Id: I65eaf52efeb6feceb8540e0aedf340f9a9a18599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91012
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/UnpackedTarball_gyp.mk 
b/external/nss/UnpackedTarball_gyp.mk
index ce44ae51f996..72358686e97a 100644
--- a/external/nss/UnpackedTarball_gyp.mk
+++ b/external/nss/UnpackedTarball_gyp.mk
@@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,gyp))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,gyp,$(GYP_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,gyp,0))
+
 $(eval $(call gb_UnpackedTarball_add_patches,gyp,\
external/nss/gyp-buildsystem.patch.0 \
+   external/nss/gyp-rpath.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/nss/gyp-rpath.patch b/external/nss/gyp-rpath.patch
new file mode 100644
index ..d918584c9745
--- /dev/null
+++ b/external/nss/gyp-rpath.patch
@@ -0,0 +1,12 @@
+--- pylib/gyp/generator/ninja.py
 pylib/gyp/generator/ninja.py
+@@ -1241,6 +1241,8 @@
+ else:
+   ldflags.append('-Wl,-rpath=%s' % self.target_rpath)
+ ldflags.append('-Wl,-rpath-link=%s' % rpath)
++  elif not is_executable:
++ldflags.append('-Wl,-rpath=\$$ORIGIN')
+ self.WriteVariableList(ninja_file, 'ldflags',
+map(self.ExpandSpecial, ldflags))
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

 external/nss/ExternalProject_nss.mk |1 +
 external/nss/UnpackedTarball_nss.mk |8 
 external/nss/asan.patch.1   |   12 
 3 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 91658b402b66b67c785687d5b3a76e3183fe76bf
Author: Stephan Bergmann 
AuthorDate: Mon Mar 23 22:57:16 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Mar 23 23:37:22 2020 +0100

external/nss: --no-zdefs for gyp-base sanitizer builds

Change-Id: I0516295c340e4b6df2fae852303e423a08784172
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90943
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 1ddcc1fc70e8..404331512c90 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -75,6 +75,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
NINJA=$(NINJA) \
./build.sh -v --disable-tests --enable-libpkix \
$(if $(ENABLE_DBGUTIL),,--opt) \
+   $(if $(COM_IS_CLANG),$(if $(filter 
-fsanitize=%,$(CC)),--no-zdefs)) \
&& rm -f $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
,nss)
$(call gb_Trace_EndRange,nss,EXTERNAL)
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 2cffb09212d7..8bfc2557bece 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -44,12 +44,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 ))
 endif
 
-ifeq ($(COM_IS_CLANG),TRUE)
-ifneq ($(filter -fsanitize=%,$(CC)),)
-$(eval $(call gb_UnpackedTarball_add_patches,nss,\
-   external/nss/asan.patch.1 \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
deleted file mode 100644
index 7dfd6ed4e782..
--- a/external/nss/asan.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
 nss.org/nss/coreconf/Linux.mk  2014-05-06 04:36:01.817838877 +0200
-+++ nss/nss/coreconf/Linux.mk  2014-05-06 04:37:25.387835456 +0200
-@@ -146,7 +146,7 @@
- # we don't use -z defs there.
- # Also, -z defs conflicts with Address Sanitizer, which emits relocations
- # against the libsanitizer runtime built into the main executable.
--ZDEFS_FLAG= -Wl,-z,defs
-+ZDEFS_FLAG=
- DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) $(if $(filter-out 
$(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin '-Wl$(COMMA)-rpath$(COMMA)$$ORIGIN')
- LDFLAGS   += $(ARCHFLAG) -z noexecstack
- 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/macos-dlopen.patch.0   |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit a3ca9b88b4b38c008efa868844ba7a3105b4bcca
Author: Stephan Bergmann 
AuthorDate: Fri Jan 17 11:13:43 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 17 12:56:29 2020 +0100

tdf#127619: external/nss: Load smime3 lib with a path on macOS

A plain dlopen("libsmime3.dylib",...) would search (among other places)
DYLD_FALLBACK_LIBRARY_PATH, which when unset defaults to a set of paths
including /usr/local/lib (so would erroneously find Homebrew's
/usr/local/lib/libsmime3.dylib instead of LO's
LibreOffice.app/Contents/Frameworks/libsmime3.dylib next to the calling
LibreOffice.app/Contents/Frameworks/libnspr4.dylib).

At least macOS 10.15.2 supports a "@loader_path/" prefix in dlopen, to find 
the
requested library next to the calling code, so use that as a quick fix.  
(Should
that turn out to be problematic, there is PORT_LoadLibraryFromOrigin in
workdir/UnpackedTarball/nss/nss/lib/util/secload.c that might be useful in a
more elaborate fix.)

Change-Id: I8688606017a4b32a2dd55740f67b8fdb36fc5435
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86966
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 3079216b674e..0e174879a702 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(filter ANDROID,$(OS)), \
external/nss/nss-android.patch.1) \
external/nss/nss.bzmozilla1238154.patch \
+external/nss/macos-dlopen.patch.0 \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/macos-dlopen.patch.0 
b/external/nss/macos-dlopen.patch.0
new file mode 100644
index ..8c484e4c6841
--- /dev/null
+++ b/external/nss/macos-dlopen.patch.0
@@ -0,0 +1,25 @@
+--- nspr/pr/src/linking/prlink.c
 nspr/pr/src/linking/prlink.c
+@@ -793,7 +793,7 @@
+ /* ensure the file exists if it contains a slash character i.e. path 
*/
+ /* DARWIN's dlopen ignores the provided path and checks for the */
+ /* plain filename in DYLD_LIBRARY_PATH */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0 ||
+ PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
+ h = dlopen(name, dl_flags);
+ }
+--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+@@ -224,7 +224,11 @@
+ static PRStatus PR_CALLBACK pkix_getDecodeFunction(void)
+ {
+ pkix_decodeFunc.smimeLib = 
++#if defined DARWIN
++  PR_LoadLibrary("@loader_path/" 
SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#else
+   PR_LoadLibrary(SHLIB_PREFIX"smime3."SHLIB_SUFFIX);
++#endif
+ if (pkix_decodeFunc.smimeLib == NULL) {
+   return PR_FAILURE;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Michael Weghorn (via logerrit)]

 external/nss/nss-android.patch.1 |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b5dd9bd25ebad0bcf679d079ecb701304433d602
Author: Michael Weghorn 
AuthorDate: Tue Dec 3 14:49:59 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Dec 4 11:44:55 2019 +0100

nss: Fix Android build for x86 and x86_64

... which previously failed with

cd freebl; make libs
error: unknown target CPU 'armv8-a'

and

cd freebl; make libs
error: unknown target CPU 'armv8-a+crypto'

respectively.

Change-Id: Ib8a6bfc615c4fb15a1e5dd3e55bba187ff34a891
Reviewed-on: https://gerrit.libreoffice.org/84369
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 560623080c73..368b7a23668b 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -73,15 +73,19 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
 diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk
 --- nss/nss/coreconf/arch.mk   2019-11-01 10:29:44.933245745 +0100
 +++ nss/nss/coreconf/arch.mk   2019-11-01 10:32:04.347181076 +0100
-@@ -234,7 +234,11 @@
+@@ -234,7 +234,15 @@
  #
  # this should be  configurable from the user
  #
 -   OS_TEST := arm
-+   ifeq ($(USE_64),1)
-+  OS_TEST := aarch64
++   ifneq (,$(filter x86 x86_64,$(ANDROID_APP_ABI)))
++   OS_TEST := $(ANDROID_APP_ABI)
 +   else
-+  OS_TEST := arm
++   ifeq ($(USE_64),1)
++  OS_TEST := aarch64
++   else
++  OS_TEST := arm
++   endif
 +   endif
 OS_ARCH = Android
 ifndef OS_TARGET_RELEASE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Jan Holesovsky (via logerrit)]

 external/nss/ExternalProject_nss.mk |4 ++--
 external/nss/nss-android.patch.1|   19 ++-
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit a9e04c08b8b3baa943acf69e5456701dce78041c
Author: Jan Holesovsky 
AuthorDate: Fri Nov 1 10:57:21 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Dec 2 13:30:50 2019 +0100

android: Fix nss build on aarch64.

Change-Id: I51c03e13fba4619a881ade27d149722698859815
Reviewed-on: https://gerrit.libreoffice.org/81888
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 2e93d7000c3a..4d175e184da5 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -34,8 +34,8 @@ else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
-   $(if $(filter iOS,$(OS)),\
-   $(if $(filter arm64,$(CC)),USE_64=1)) \
+   $(if $(filter ANDROID,$(OS)),$(if $(filter 
AARCH64,$(CPUNAME)),USE_64=1)) \
+   $(if $(filter iOS,$(OS)),$(if $(filter 
ARM64,$(CPUNAME)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),\
$(if $(filter-out 
POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
NSS_USE_SYSTEM_SQLITE=1) \
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 40478d34ddbf..560623080c73 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -1,11 +1,12 @@
 diff -ur nss.org/nspr/build/autoconf/config.sub 
nss/nspr/build/autoconf/config.sub
 --- nss.org/nspr/build/autoconf/config.sub 2017-09-07 15:29:45.031246453 
+0200
 +++ nss/nspr/build/autoconf/config.sub 2017-09-07 15:32:13.087235423 +0200
-@@ -111,6 +111,10 @@
+@@ -111,6 +111,11 @@
  exit 1;;
  esac
  
 +if test $1 = "arm-unknown-linux-androideabi"; then echo $1; exit; fi
++if test $1 = "aarch64-unknown-linux-android"; then echo $1; exit; fi
 +if test $1 = "i686-pc-linux-android"; then echo $1; exit; fi
 +if test $1 = "x86_64-pc-linux-android"; then echo $1; exit; fi
 +
@@ -69,3 +70,19 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
  
  MODULE = nss
  MAPFILE = $(OBJDIR)/nssckbi.def
+diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk
+--- nss/nss/coreconf/arch.mk   2019-11-01 10:29:44.933245745 +0100
 nss/nss/coreconf/arch.mk   2019-11-01 10:32:04.347181076 +0100
+@@ -234,7 +234,11 @@
+ #
+ # this should be  configurable from the user
+ #
+-   OS_TEST := arm
++   ifeq ($(USE_64),1)
++  OS_TEST := aarch64
++   else
++  OS_TEST := arm
++   endif
+OS_ARCH = Android
+ifndef OS_TARGET_RELEASE
+   OS_TARGET_RELEASE := 8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Miklos Vajna (via logerrit)]

 external/nss/nss-android.patch.1 |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit 59c1beb96f93e75a67c6c00cc043498abfa16ba4
Author: Miklos Vajna 
AuthorDate: Tue Nov 26 15:21:06 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue Nov 26 18:23:14 2019 +0100

nss: fix Android build

By not building some of the test code.

The first hunk is necessary to avoid:


/home/vmiklos/git/libreoffice/master-android/external/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld:
 error: cannot find -lpthread
clang: error: linker command failed with exit code 1 (use -v to see 
invocation)
make[3]: *** [Makefile:379: abstract] Error 1
make[2]: *** [Makefile:143: build_nspr] Error 2
make[1]: *** 
[/home/vmiklos/git/libreoffice/master-android/external/nss/ExternalProject_nss.mk:35:
 
/home/vmiklos/git/libreoffice/master-android/workdir/ExternalProject/nss/build] 
Error 1
make: *** [Makefile:120: nss] Error 2

The second hunk avoids:

cd testlib; make libs
Traceback (most recent call last):
  File 
"/home/vmiklos/git/libreoffice/master-android/external/nss/nsinstall.py", line 
164, in 
sys.exit(nsinstall(sys.argv[1:]))
  File 
"/home/vmiklos/git/libreoffice/master-android/external/nss/nsinstall.py", line 
112, in nsinstall
os.makedirs(args[0])
  File "/usr/lib64/python2.7/os.py", line 157, in makedirs
mkdir(name, mode)
OSError: [Errno 17] File exists: 'out/..'
make[6]: *** [../../../../coreconf/rules.mk:392: out/../anchor.o] Error 1
make[5]: *** [../../../coreconf/rules.mk:81: libs] Error 2
make[4]: *** [../../coreconf/rules.mk:78: libs] Error 2
make[3]: *** [../coreconf/rules.mk:101: libs] Error 2
make[2]: *** [coreconf/rules.mk:101: libs] Error 2
make[1]: *** 
[/home/vmiklos/git/libreoffice/master-android/external/nss/ExternalProject_nss.mk:35:
 
/home/vmiklos/git/libreoffice/master-android/workdir/ExternalProject/nss/build] 
Error 1
make: *** [Makefile:120: nss] Error 2

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

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index f8b4cdaf3753..40478d34ddbf 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -48,3 +48,24 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
 --with-android-version=$(OS_TARGET_RELEASE) \
 --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
 --with-android-platform=$(ANDROID_SYSROOT)
+--- nss/nss/Makefile.orig  2019-11-26 14:52:15.934561202 +0100
 nss/nss/Makefile   2019-11-26 14:52:20.538559612 +0100
+@@ -140,7 +140,6 @@
+ 
+ build_nspr: $(NSPR_CONFIG_STATUS)
+   $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+-  $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests
+ 
+ install_nspr: build_nspr
+   $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
+--- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 
+0100
 nss/nss/lib/ckfw/builtins/manifest.mn  2019-11-26 15:18:29.281982387 
+0100
+@@ -5,7 +5,7 @@
+ 
+ CORE_DEPTH = ../../..
+ 
+-DIRS = testlib
++DIRS =
+ 
+ MODULE = nss
+ MAPFILE = $(OBJDIR)/nssckbi.def
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Jan-Marek Glogowski (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss.fix-freebl-add-lcc-support.patch.1 |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit b11ea5e9c37b19f0d60a4075146668954a7bf728
Author: Jan-Marek Glogowski 
AuthorDate: Fri Jul 12 15:01:41 2019 +0200
Commit: Mike Kaganski 
CommitDate: Fri Jul 12 16:29:43 2019 +0200

NSS fix lcc support patch

This hangs the build process with current MSVC cl.exe. It even
hangs when just calling "cl -? >/dev/null". Probably
a cl.exe bug to detect redirection properly?

This adds stdin redirection to /dev/null, like in configure.ac checks.

Change-Id: Ie03c3103ac68cd131dc280755621a8ce0417314f
Reviewed-on: https://gerrit.libreoffice.org/75495
Reviewed-by: Jan-Marek Glogowski 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 3079216b674e..bd2ad367c776 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -22,6 +22,7 @@ $(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.fix-freebl-add-lcc-support.patch.1 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
diff --git a/external/nss/nss.fix-freebl-add-lcc-support.patch.1 
b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
new file mode 100644
index ..3e3c06327dde
--- /dev/null
+++ b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
@@ -0,0 +1,11 @@
+--- b/nss/lib/freebl/Makefile
 a/nss/lib/freebl/Makefile
+@@ -495,7 +495,7 @@
+ ifdef USE_64
+ # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
+ # NB: CC_NAME is not defined here
+-ifneq ($(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q'),lcc)
++ifneq ($(shell $(CC) -? 2>&1 >/dev/null https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Libreoffice Gerrit user]

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 930ec0e6ab7bd5492fb4cf4a8f6860e3b728929d
Author: Julien Nabet 
AuthorDate: Tue Jan 29 18:32:54 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jan 29 20:27:38 2019 +0100

Disable NSS GTESTS also for Windows

Following 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=02623af4f5e0049ec5988df8ff6c7ff0f32f3fb1
See details here:

http://document-foundation-mail-archive.969070.n3.nabble.com/fatal-error-LNK1561-on-nss-Visual-Studio-2017-td4256601.html

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

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index ef807d503e58..211fa1d64437 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -25,6 +25,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
XCFLAGS="-arch:SSE $(SOLARINC)" \
$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
+   NSS_DISABLE_GTESTS=1 \
,nss)
 
 else # OS!=WNT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Libreoffice Gerrit user]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss.bzmozilla1238154.patch |   12 
 2 files changed, 13 insertions(+)

New commits:
commit be887356d94ad813acdf56108ad02fd5e33f803b
Author: Julien Nabet 
AuthorDate: Sat Jan 26 12:42:07 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Jan 27 22:09:22 2019 +0100

Could not determine MSC version with French UI

Fix regexp for cl.exe
This command returns some special characters preventing regexp to work.

For more details, see:

http://document-foundation-mail-archive.969070.n3.nabble.com/Could-not-determine-MSC-version-Visual-Studio-2017-td4256538.html

Change-Id: I734dcd533b0f38430d1be8852f1e4f721221e580
Reviewed-on: https://gerrit.libreoffice.org/66959
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index e20598f4ae01..8abcb867318e 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.utf8bom.patch.1) \
$(if $(filter ANDROID,$(OS)), \
external/nss/nss-android.patch.1) \
+   external/nss/nss.bzmozilla1238154.patch \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/nss.bzmozilla1238154.patch 
b/external/nss/nss.bzmozilla1238154.patch
new file mode 100644
index ..468ff810b9ca
--- /dev/null
+++ b/external/nss/nss.bzmozilla1238154.patch
@@ -0,0 +1,12 @@
+diff -ru a/nspr/configure b/nspr/configure
+--- a/a/nspr/configure 2019-01-26 12:23:06.589389910 +0100
 b/b/nspr/configure 2019-01-26 12:26:56.56693 +0100
+@@ -7127,7 +7127,7 @@
+ 
+ # Determine compiler version
+ 
+-_MSVC_VER_FILTER='s|.* 
\([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p'
++
_MSVC_VER_FILTER='s|.*[^!-~]\([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p'
+ 
+ CC_VERSION=`${CC} -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"`
+ if test -z "$CC_VERSION"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Libreoffice Gerrit user]

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02623af4f5e0049ec5988df8ff6c7ff0f32f3fb1
Author: Miklos Vajna 
AuthorDate: Thu Jan 3 21:31:14 2019 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jan 4 09:07:03 2019 +0100

nss: disable gtests

We don't run them and building them takes a while, especially with -j1.

Old time: 2m35,809s

New time: 1m12,858s

(With ccache disabled.) I.e. 47% of baseline.

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

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index a270e1f7de87..ef807d503e58 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -52,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
CC="$(CC)$(if $(filter ANDROID,$(OS)), 
-D_PR_NO_LARGE_FILES=1 -DSQLITE_DISABLE_LFS=1)" CCC="$(CXX)" \
$(if $(CROSS_COMPILING),NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
$(if $(filter ANDROID,$(OS)),OS_TARGET=Android 
OS_TARGET_RELEASE=14 ARCHFLAG="" DEFAULT_COMPILER=clang 
ANDROID_NDK=$(ANDROID_NDK_HOME) 
ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION) 
ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(SYSBASE) 
ANDROID_TOOLCHAIN=$(ANDROID_BINUTILS_PREBUILT_ROOT)) \
+   NSS_DISABLE_GTESTS=1 \
nss_build_all \
&& rm -f $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Libreoffice Gerrit user]

 external/nss/ExternalProject_nss.mk |4 
 external/nss/UnpackedTarball_nss.mk |1 
 external/nss/nss.parallel.patch |  653 
 3 files changed, 2 insertions(+), 656 deletions(-)

New commits:
commit f715d6156e9fd1d7e9cd0cc1f64954a47f1b5d2f
Author: Jan-Marek Glogowski 
AuthorDate: Tue Nov 20 16:16:03 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Tue Nov 20 16:17:09 2018 +0100

Revert "Fix NSS parallel build"

For whatever reason this now fails on Windows for multiple
users (including myself). Doesn't look like an easy fix is
possible, so this is reverted until I find some more time
to look into it (or give up on it).

This reverts commit baf0d6d65da8314d718380bb5750ccd29f3d9a08.

Change-Id: I432637131ba8ac8be614496bd6da0e157372ae94
Reviewed-on: https://gerrit.libreoffice.org/63664
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jan-Marek Glogowski 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 2de4c5710fd8..a270e1f7de87 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
XCFLAGS="-arch:SSE $(SOLARINC)" \
-   $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
+   $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,nss)
 
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
-   $(MAKE) AR="$(AR)" \
+   $(MAKE) -j1 AR="$(AR)" \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
COMMA=$(COMMA) \
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index b734e0a24d70..e20598f4ae01 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.utf8bom.patch.1) \
$(if $(filter ANDROID,$(OS)), \
external/nss/nss-android.patch.1) \
-   external/nss/nss.parallel.patch \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/nss.parallel.patch b/external/nss/nss.parallel.patch
deleted file mode 100644
index 0e7c2ee715ae..
--- a/external/nss/nss.parallel.patch
+++ /dev/null
@@ -1,653 +0,0 @@
-diff -ur a/nss/nspr/config/config.mk b/nss/nspr/config/config.mk
 a/nss/nspr/config/config.mk2018-03-05 15:50:28.0 +
-+++ b/nss/nspr/config/config.mk2018-10-16 15:43:00.444179603 +
-@@ -64,7 +64,7 @@
- endif # NO_PROFILE_GUIDED_OPTIMIZE
- 
- define MAKE_OBJDIR
--if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
-+if test ! -e $(@D); then mkdir -p $(@D); fi
- endef
- 
- LINK_DLL  = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
-diff -ur a/nss/nspr/config/Makefile.in b/nss/nspr/config/Makefile.in
 a/nss/nspr/config/Makefile.in  2018-03-05 15:50:28.0 +
-+++ b/nss/nspr/config/Makefile.in  2018-10-16 15:43:38.107971866 +
-@@ -98,7 +98,7 @@
- 
- # Redefine MAKE_OBJDIR for just this directory
- define MAKE_OBJDIR
--if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
-+if test ! -e $(@D); then mkdir -p $(@D); fi
- endef
- 
- export:: $(TARGETS)
-diff -ur a/nss/nss/cmd/lib/Makefile b/nss/nss/cmd/lib/Makefile
 a/nss/nss/cmd/lib/Makefile 2018-06-21 09:24:45.0 +
-+++ b/nss/nss/cmd/lib/Makefile 2018-10-16 18:20:46.922690884 +
-@@ -44,6 +44,5 @@
- # (7) Execute "local" rules. (OPTIONAL).  #
- ###
- 
--export:: private_export
- 
- 
-diff -ur a/nss/nss/cmd/libpkix/testutil/Makefile 
b/nss/nss/cmd/libpkix/testutil/Makefile
 a/nss/nss/cmd/libpkix/testutil/Makefile2018-06-21 09:24:45.0 
+
-+++ b/nss/nss/cmd/libpkix/testutil/Makefile2018-10-16 18:20:46.922690884 
+
-@@ -47,5 +47,4 @@
- 
- include $(PLAT_DEPTH)/platrules.mk
- 
--export:: private_export
- 
-diff -ur a/nss/nss/cmd/shlibsign/Makefile b/nss/nss/cmd/shlibsign/Makefile
 a/nss/nss/cmd/shlibsign/Makefile   2018-10-18 11:31:47.775647843 +
-+++ b/nss/nss/cmd/shlibsign/Makefile   2018-10-18 10:47:47.743324992 +
-@@ -98,5 +98,7 @@
- endif
- endif
- 
--libs install :: $(CHECKLOC)
-+libs::
-+  $(MAKE) install
-+  $(MAKE) $(CHECKLOC)
- 
-diff -ur 

[Libreoffice-commits] core.git: external/nss

[Libreoffice Gerrit user]

 external/nss/ExternalProject_nss.mk |4 
 external/nss/UnpackedTarball_nss.mk |1 
 external/nss/nss.parallel.patch |  653 
 3 files changed, 656 insertions(+), 2 deletions(-)

New commits:
commit baf0d6d65da8314d718380bb5750ccd29f3d9a08
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 18 13:40:09 2018 +
Commit: Jan-Marek Glogowski 
CommitDate: Tue Nov 20 08:57:20 2018 +0100

Fix NSS parallel build

This is just a minimal solution and obviously not fully parallel.
We still have to walk the tree twice:
1. copy all needed headers to dist (export export_private)
2. the parallel build (libs)

The fixes are:
* Add a few rm and @$(MAKE_OBJDIR) calls to various targets
* Serialize minimal steps in nss_build_all
  => Build libs of nss/lib and nss/cmd/lib before all other
  => drop the minimal all target
* Make $(SHARED_LIBRARY) depend on $(LIBRARY), otherwise dll lib
  creation on Windows builds a static lib, instead of the dll one
* Drop all "export:: private_export" rules. We run this before
  the build and duplicate targets break the header install

Change-Id: I1c35985c90d2d63990e04a0d2bb9d8ae921a2182
Reviewed-on: https://gerrit.libreoffice.org/62011
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index a270e1f7de87..2de4c5710fd8 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
XCFLAGS="-arch:SSE $(SOLARINC)" \
-   $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
+   $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,nss)
 
@@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
-   $(MAKE) -j1 AR="$(AR)" \
+   $(MAKE) AR="$(AR)" \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
COMMA=$(COMMA) \
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index e20598f4ae01..b734e0a24d70 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.utf8bom.patch.1) \
$(if $(filter ANDROID,$(OS)), \
external/nss/nss-android.patch.1) \
+   external/nss/nss.parallel.patch \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/nss.parallel.patch b/external/nss/nss.parallel.patch
new file mode 100644
index ..0e7c2ee715ae
--- /dev/null
+++ b/external/nss/nss.parallel.patch
@@ -0,0 +1,653 @@
+diff -ur a/nss/nspr/config/config.mk b/nss/nspr/config/config.mk
+--- a/nss/nspr/config/config.mk2018-03-05 15:50:28.0 +
 b/nss/nspr/config/config.mk2018-10-16 15:43:00.444179603 +
+@@ -64,7 +64,7 @@
+ endif # NO_PROFILE_GUIDED_OPTIMIZE
+ 
+ define MAKE_OBJDIR
+-if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
++if test ! -e $(@D); then mkdir -p $(@D); fi
+ endef
+ 
+ LINK_DLL  = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
+diff -ur a/nss/nspr/config/Makefile.in b/nss/nspr/config/Makefile.in
+--- a/nss/nspr/config/Makefile.in  2018-03-05 15:50:28.0 +
 b/nss/nspr/config/Makefile.in  2018-10-16 15:43:38.107971866 +
+@@ -98,7 +98,7 @@
+ 
+ # Redefine MAKE_OBJDIR for just this directory
+ define MAKE_OBJDIR
+-if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi
++if test ! -e $(@D); then mkdir -p $(@D); fi
+ endef
+ 
+ export:: $(TARGETS)
+diff -ur a/nss/nss/cmd/lib/Makefile b/nss/nss/cmd/lib/Makefile
+--- a/nss/nss/cmd/lib/Makefile 2018-06-21 09:24:45.0 +
 b/nss/nss/cmd/lib/Makefile 2018-10-16 18:20:46.922690884 +
+@@ -44,6 +44,5 @@
+ # (7) Execute "local" rules. (OPTIONAL).  #
+ ###
+ 
+-export:: private_export
+ 
+ 
+diff -ur a/nss/nss/cmd/libpkix/testutil/Makefile 
b/nss/nss/cmd/libpkix/testutil/Makefile
+--- a/nss/nss/cmd/libpkix/testutil/Makefile2018-06-21 09:24:45.0 
+
 b/nss/nss/cmd/libpkix/testutil/Makefile2018-10-16 18:20:46.922690884 
+
+@@ -47,5 +47,4 @@
+ 
+ include $(PLAT_DEPTH)/platrules.mk
+ 
+-export:: private_export
+ 

[Libreoffice-commits] core.git: external/nss

[Libreoffice Gerrit user]

 external/nss/nss-android.patch.1 |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6ab702312d424deb9cdc8ec6b594c79ef9607c1e
Author: Michael Stahl 
AuthorDate: Wed Aug 8 10:33:59 2018 +0200
Commit: Michael Stahl 
CommitDate: Wed Aug 8 13:02:51 2018 +0200

nss: remove inline patch message from nss-android.patch.1

forgot to remove this in the 3.38 upgrade

Change-Id: Idaa9fd8e8036f305ec64c4a474d904d72daef0e8
Reviewed-on: https://gerrit.libreoffice.org/58721
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index d37c70f16ace..50c549303604 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -47,4 +47,3 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile
 --with-android-version=$(OS_TARGET_RELEASE) \
 --with-android-toolchain=$(ANDROID_TOOLCHAIN) \
 --with-android-platform=$(ANDROID_SYSROOT)
-unified headers / ndk16 does have it in it's support module
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/asan.patch.1 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69e62bbebc1f4809101df0c694a930b07dbc194d
Author: Stephan Bergmann 
Date:   Mon Sep 18 11:35:23 2017 +0200

Adapt external/nss/asan.patch.1

...to a52ca01f6ae27a86cae6e82b3c5ae6601f3ea398 "nss: no rpath/origin flag 
for
Android (unused DT entry/DT_FLAGS warnings)"

Change-Id: I60e4ba1af572aa702a355e26dec58142209f8655

diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index 6acbb04d233d..7dfd6ed4e782 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -7,6 +7,6 @@ diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
  # against the libsanitizer runtime built into the main executable.
 -ZDEFS_FLAG= -Wl,-z,defs
 +ZDEFS_FLAG=
- DSO_LDOPTS  += $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) $(if $(filter-out 
$(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin '-Wl$(COMMA)-rpath$(COMMA)$$ORIGIN')
  LDFLAGS   += $(ARCHFLAG) -z noexecstack
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Christian Lohmaier]

 external/nss/ExternalProject_nss.mk |1 +
 external/nss/nss.patch  |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a52ca01f6ae27a86cae6e82b3c5ae6601f3ea398
Author: Christian Lohmaier 
Date:   Fri Sep 15 17:59:40 2017 +0200

nss: no rpath/origin flag for Android (unused DT entry/DT_FLAGS warnings)

Change-Id: I15d322f7361a26060ea37a720f85890e17630ebe
Reviewed-on: https://gerrit.libreoffice.org/42336
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 8f16c697dc1f..2b071fe8346a 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -48,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(MAKE) -j1 AR="$(AR)" \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
+   COMMA=$(COMMA) \
CC="$(CC)" CCC="$(CXX)" \
$(if $(CROSS_COMPILING),NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
$(if $(filter ANDROID,$(OS)),OS_TARGET=Android 
OS_TARGET_RELEASE=14 ARCHFLAG="" DEFAULT_COMPILER=clang 
ANDROID_NDK=$(ANDROID_NDK_HOME) 
ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION)) \
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 1eb0bf70d866..6219775c2d3c 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -5,7 +5,7 @@
  MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
  DSO_CFLAGS=-fPIC
 -DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+DSO_LDOPTS='-shared -Wl,-z,origin -Wl,-rpath,\$$ORIGIN -Wl,-soname 
-Wl,$(notdir $@)'
++DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@) $(if $(filter-out 
$(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\$$ORIGIN)'
  _OPTIMIZE_FLAGS=-O2
  _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and 
that
 # combo is not yet good at debugging 
inlined
@@ -88,7 +88,7 @@
  # against the libsanitizer runtime built into the main executable.
  ZDEFS_FLAG= -Wl,-z,defs
 -DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG))
-+DSO_LDOPTS  += $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
++DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) $(if $(filter-out 
$(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin '-Wl$(COMMA)-rpath$(COMMA)$$ORIGIN')
  LDFLAGS   += $(ARCHFLAG) -z noexecstack
  
  # On Maemo, we need to use the -rpath-link flag for even the standard system
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/clang-cl.patch.0 |   37 +
 1 file changed, 37 insertions(+)

New commits:
commit c2f081d17484d2efbc2b294f89f4cb59b1937a9c
Author: Stephan Bergmann 
Date:   Thu Sep 14 08:38:12 2017 +0200

Silence clang-cl -Wpragma-pack in external/nss

Change-Id: I08672659e7ff1e7ddf3f2185faba5aeab3fd2239

diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index 98786d49971c..684cf74d3ca6 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -72,3 +72,40 @@
  /* This magic gets the windows compiler to give us a deprecation
   * warning */
  #pragma deprecated(CKT_NSS_UNTRUSTED, CKT_NSS_MUST_VERIFY, CKT_NSS_VALID)
+
+# While MSVC uses
+#  #pragma warning(disable : 4103)
+# in the inner pkcs11p.h, clang-cl wants
+#  #pragma clang diagnostic ignored "-Wpragma-pack"
+# in the outer pkcs11t.h:
+--- nss/lib/util/pkcs11t.h
 nss/lib/util/pkcs11t.h
+@@ -72,7 +72,14 @@
+ #define CK_INVALID_HANDLE 0
+ 
+ /* pack */
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wpragma-pack"
++#endif
+ #include "pkcs11p.h"
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic pop
++#endif
+ 
+ typedef struct CK_VERSION {
+ CK_BYTE major; /* integer portion of version number */
+@@ -1795,6 +1802,13 @@
+ #include "pkcs11n.h"
+ 
+ /* undo packing */
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic push
++#pragma clang diagnostic ignored "-Wpragma-pack"
++#endif
+ #include "pkcs11u.h"
++#if defined __clang__ && defined _MSC_VER
++#pragma clang diagnostic pop
++#endif
+ 
+ #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Christian Lohmaier]

 external/nss/ExternalProject_nss.mk |   29 ++
 external/nss/UnpackedTarball_nss.mk |2 
 external/nss/nss-android.patch  |  161 
 external/nss/nss-android.patch.1|   49 ++
 4 files changed, 60 insertions(+), 181 deletions(-)

New commits:
commit 9a920bf9c96468c29505eab15f80d45e5f296597
Author: Christian Lohmaier 
Date:   Thu Sep 7 18:10:36 2017 +0200

fix nss build for android x86 and remove duplicated configure call

remove hardcoded arm flags for android, and instead of patching the
sources, rather specify the desired values on commandline to override
nss' makefile defaults where possible.
Also since the build stage runs nspr configure by itself in a dedicated
outdir, the separate configure step was removed (for all systems).

Change-Id: I586c605615cc2d45b757497395a98c53dd1beb1d
Reviewed-on: https://gerrit.libreoffice.org/42070
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 0a0e89006352..8f16c697dc1f 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -9,25 +9,14 @@
 
 $(eval $(call gb_ExternalProject_ExternalProject,nss))
 
+# nss build calls configure for nspr itself - if for some reason the configure 
step should be split out,
+# make sure to create config.status (aka run configure) in dir specified with 
OBJDIR_NAME (nspr/out)
 $(eval $(call gb_ExternalProject_register_targets,nss,\
-   configure \
build \
 ))
 
-$(call gb_ExternalProject_get_state_target,nss,configure):
-   $(call gb_ExternalProject_run,configure,\
-   $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 
LIB="$(ILIB)") \
-   $(if $(CROSS_COMPILING),\
-   NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
-   nspr/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
-   $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
-   $(if $(filter ANDROID,$(OS)),--build=$(BUILD_PLATFORM) 
--host="arm-linux-androidebi" --with-android-ndk=$(ANDROID_NDK_HOME) 
--with-android-toolchain=$(ANDROID_CLANG_TOOLCHAIN) 
--with-android-platform=$(ANDROID_PLATFORM_DIRECTORY)) \
-   $(if $(filter 
MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
-   $(if $(filter 
MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
-   ,,nss_configure.log)
-
 ifeq ($(OS),WNT)
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
@@ -39,7 +28,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject
,nss)
 
 else # OS!=WNT
-$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
+# make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so 
nss can append it's own defaults
+# OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so 
they will overrule nss makefile values
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter IOS,$(OS)),\
@@ -52,14 +43,14 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
$(if $(CROSS_COMPILING),\
$(if $(filter 
MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
$(if $(filter IOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
-   NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
+   NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
$(MAKE) -j1 AR="$(AR)" \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
-   CCC="$(CXX)" \
-   $(if 
$(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
-   $(if $(filter 

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/asan.patch.1 |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 58a84aa21694bf15dd234e5f8bac57c6ffc44b13
Author: Stephan Bergmann 
Date:   Wed Aug 30 08:43:48 2017 +0200

Update external/nss/asan.patch.1

...after c6df07f905cd9562132b06e44f90b0479b250f7a "nss: Upgrade to release
3.31.1 and update patches"

Change-Id: I0f18659ee65d9b917377ef75e94f3b9fb8ece58e

diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index 0685adb1dc4b..6acbb04d233d 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -1,12 +1,12 @@
 diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
 --- nss.org/nss/coreconf/Linux.mk  2014-05-06 04:36:01.817838877 +0200
 +++ nss/nss/coreconf/Linux.mk  2014-05-06 04:37:25.387835456 +0200
-@@ -158,7 +158,7 @@
+@@ -146,7 +146,7 @@
  # we don't use -z defs there.
  # Also, -z defs conflicts with Address Sanitizer, which emits relocations
  # against the libsanitizer runtime built into the main executable.
 -ZDEFS_FLAG= -Wl,-z,defs
 +ZDEFS_FLAG=
- ifneq ($(USE_ASAN),1)
- DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
- endif
+ DSO_LDOPTS  += $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ LDFLAGS   += $(ARCHFLAG) -z noexecstack
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Michael Stahl]

 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 
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 
Tested-by: Michael Stahl 

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..
--- 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 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 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #if defined(WIN32) || defined(WIN64)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Giuseppe Castagno]

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit da5d20562479174504c3795aa9e7ca0856883e81
Author: Giuseppe Castagno 
Date:   Thu Oct 13 11:10:00 2016 +0200

Linux: Build NSS in debug mode only in '--enable-dbgutil' mode.

With this commit, NSS debug mode is enabled only if you compile
with --enable-dbgutil using ./autogen.sh command.

Only for the Linux platform builds.

Change-Id: Ia8626f36692fd38e8b1dbd774e4bc0ccedc59072
Reviewed-on: https://gerrit.libreoffice.org/29781
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 
Reviewed-by: Michael Stahl 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 258e845..07cc472 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -67,6 +67,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject
$(if $(filter MACOSX,$(OS)),\
$(if $(filter-out 
POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
NSS_USE_SYSTEM_SQLITE=1) \
+   $(if $(filter LINUX,$(OS)),$(if 
$(ENABLE_DBGUTIL),,BUILD_OPT=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
$(if $(filter 
MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/asan.patch.1|   12 ++--
 external/nss/ubsan-alignment.patch.0 |   34 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 5ab5779bf4a16f4ee4a8d1198ffbd8f842f2edd9
Author: Stephan Bergmann 
Date:   Tue Oct 11 09:39:21 2016 +0200

external/nss: Adapt ASan/UBSan-specific patches to nss 3.27

Change-Id: Ic96a57a1f43f7aae4e0733d2e65edd843b827a54

diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index 3b64aa6..0685adb 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -1,12 +1,12 @@
 diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
 --- nss.org/nss/coreconf/Linux.mk  2014-05-06 04:36:01.817838877 +0200
 +++ nss/nss/coreconf/Linux.mk  2014-05-06 04:37:25.387835456 +0200
-@@ -145,7 +145,7 @@
- # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
- # incorrectly reports undefined references in the libraries we link with, so
+@@ -158,7 +158,7 @@
  # we don't use -z defs there.
+ # Also, -z defs conflicts with Address Sanitizer, which emits relocations
+ # against the libsanitizer runtime built into the main executable.
 -ZDEFS_FLAG= -Wl,-z,defs
 +ZDEFS_FLAG=
- DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
- LDFLAGS   += $(ARCHFLAG)
- 
+ ifneq ($(USE_ASAN),1)
+ DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ endif
diff --git a/external/nss/ubsan-alignment.patch.0 
b/external/nss/ubsan-alignment.patch.0
index 4d13ffc..651939f 100644
--- a/external/nss/ubsan-alignment.patch.0
+++ b/external/nss/ubsan-alignment.patch.0
@@ -1,13 +1,13 @@
 --- nss/lib/freebl/md5.c
 +++ nss/lib/freebl/md5.c
-@@ -443,7 +443,7 @@
-   /* Iterate over 64-byte chunks of the message. */
-   while (inputLen >= MD5_BUFFER_SIZE) {
+@@ -445,7 +445,7 @@
+ /* Iterate over 64-byte chunks of the message. */
+ while (inputLen >= MD5_BUFFER_SIZE) {
  #ifdef IS_LITTLE_ENDIAN
 -#ifdef NSS_X86_OR_X64
 +#if 0
-   /* x86 can handle arithmetic on non-word-aligned buffers */
-   wBuf = (PRUint32 *)input;
+ /* x86 can handle arithmetic on non-word-aligned buffers */
+ wBuf = (PRUint32 *)input;
  #else
 --- nss/lib/freebl/sha_fast.c
 +++ nss/lib/freebl/sha_fast.c
@@ -15,26 +15,26 @@
  #include "ssltrace.h"
  #endif
  
--static void shaCompress(volatile SHA_HW_t *X, const PRUint32 * datain);
-+static void shaCompress(volatile SHA_HW_t *X, const unsigned char * datain);
+-static void shaCompress(volatile SHA_HW_t *X, const PRUint32 *datain);
++static void shaCompress(volatile SHA_HW_t *X, const unsigned char *datain);
  
  #define W u.w
  #define B u.b
-@@ -243,7 +243,7 @@
+@@ -241,7 +241,7 @@
   * code on AMD64.
   */
- static void 
--shaCompress(volatile SHA_HW_t *X, const PRUint32 *inbuf) 
-+shaCompress(volatile SHA_HW_t *X, const unsigned char *inbuf) 
+ static void
+-shaCompress(volatile SHA_HW_t *X, const PRUint32 *inbuf)
++shaCompress(volatile SHA_HW_t *X, const unsigned char *inbuf)
  {
-   register SHA_HW_t A, B, C, D, E;
+ register SHA_HW_t A, B, C, D, E;
  
-@@ -275,7 +275,7 @@
- #define SHA_RND4(a,b,c,d,e,n) \
-   a = SHA_ROTL(b,5)+SHA_F4(c,d,e)+a+XW(n)+K3; c=SHA_ROTL(c,30) 
+@@ -277,7 +277,7 @@
+ a = SHA_ROTL(b, 5) + SHA_F4(c, d, e) + a + XW(n) + K3; \
+ c = SHA_ROTL(c, 30)
  
 -#define LOAD(n) XW(n) = SHA_HTONL(inbuf[n])
 +#define LOAD(n) XW(n) = 
(((PRUint32)inbuf[4*n])<<24)|(((PRUint32)inbuf[4*n+1])<<16)|(((PRUint32)inbuf[4*n+2])<<8)|((PRUint32)inbuf[4*n+3])
  
-   A = XH(0);
-   B = XH(1);
+ A = XH(0);
+ B = XH(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

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

New commits:
commit 87c271d4a9c373ea13bd682945c1cc8a9ac52bea
Author: Stephan Bergmann 
Date:   Mon Aug 22 15:35:11 2016 +0200

Silence -fsanitize=array-bounds in external/nss

...by making lgdbDataStr::names a "by-convention flexible array member".
Otherwise, e.g. CppunitTest_xmlsecurity_signing_test fails with "index 30 
out of
bounds for type 'unsigned char [6]'".

Change-Id: Ie5bf4199b8b49090a987143d355754a69512e309

diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
index 70d4af8..1cdf694 100644
--- a/external/nss/ubsan.patch.0
+++ b/external/nss/ubsan.patch.0
@@ -9,3 +9,32 @@
  
  if (cache->ncrls) {
  /* pick the newest CRL */
+--- nss/lib/softoken/legacydb/pk11db.c
 nss/lib/softoken/legacydb/pk11db.c
+@@ -58,7 +58,7 @@
+ unsigned char isModuleDBOnly;
+ unsigned char isCritical;
+ unsigned char reserved[4];
+-unsigned char names[6];   /* enough space for the length fields */
++unsigned char names[1];   /* +5: enough space for the length fields */
+ };
+ 
+ struct lgdbSlotDataStr {
+@@ -139,7 +139,7 @@
+   goto loser;
+ }
+ 
+-dataLen = sizeof(lgdbData) + len + len2 + len3 + sizeof(unsigned short) +
++dataLen = sizeof(lgdbData)+5 + len + len2 + len3 + sizeof(unsigned short) 
+
+count*sizeof(lgdbSlotData);
+ 
+ data->data = (unsigned char *) PORT_ZAlloc(dataLen);
+@@ -319,7 +319,7 @@
+ }
+ if ((encoded->major == LGDB_DB_EXT1_VERSION_MAJOR) &&
+   (encoded->minor >= LGDB_DB_EXT1_VERSION_MINOR)) {
+-  CHECK_SIZE( sizeof(lgdbData));
++  CHECK_SIZE( sizeof(lgdbData)+5);
+   trustOrder = LGDB_GETLONG(encoded->trustOrder);
+   cipherOrder= LGDB_GETLONG(encoded->cipherOrder);
+   isModuleDB = (encoded->isModuleDB != 0) ? PR_TRUE: PR_FALSE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/ubsan.patch.0 |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 72b621444a207405586876f015d4b32fab8cfc88
Author: Stephan Bergmann 
Date:   Mon Aug 22 15:17:06 2016 +0200

Remove noise from patch file

Change-Id: I5b09280dbd5bda1751aa44b4ef6d5e3b8d88ea2c

diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
index ccf04b9..70d4af8 100644
--- a/external/nss/ubsan.patch.0
+++ b/external/nss/ubsan.patch.0
@@ -1,6 +1,5 @@
-diff -ru nss.orig/nss/lib/certdb/crl.c nss/nss/lib/certdb/crl.c
 nss/lib/certdb/crl.c   2016-02-12 15:36:18.0 +0100
-+++ nss/lib/certdb/crl.c   2016-02-23 20:57:17.067924598 +0100
+--- nss/lib/certdb/crl.c
 nss/lib/certdb/crl.c
 @@ -1982,7 +1982,7 @@
  return SECSuccess;
  }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/UnpackedTarball_nss.mk  |1 
 external/nss/ubsan-alignment.patch.0 |   40 +++
 2 files changed, 41 insertions(+)

New commits:
commit 3e27c437709e8f1e0df78826452f29330c68ebb5
Author: Stephan Bergmann 
Date:   Mon Jul 4 15:47:08 2016 +0200

Avoid -fsanitize=alignment in external/nss

...in a way that might be a performance issue, so include the patch only
conditionally.

Change-Id: I483a77d0d199c2dee00139fdd4fa41223192289c

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 1a7ed13..e47b241 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -43,6 +43,7 @@ ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/asan.patch.1 \
+   external/nss/ubsan-alignment.patch.0 \
 ))
 endif
 endif
diff --git a/external/nss/ubsan-alignment.patch.0 
b/external/nss/ubsan-alignment.patch.0
new file mode 100644
index 000..4d13ffc
--- /dev/null
+++ b/external/nss/ubsan-alignment.patch.0
@@ -0,0 +1,40 @@
+--- nss/lib/freebl/md5.c
 nss/lib/freebl/md5.c
+@@ -443,7 +443,7 @@
+   /* Iterate over 64-byte chunks of the message. */
+   while (inputLen >= MD5_BUFFER_SIZE) {
+ #ifdef IS_LITTLE_ENDIAN
+-#ifdef NSS_X86_OR_X64
++#if 0
+   /* x86 can handle arithmetic on non-word-aligned buffers */
+   wBuf = (PRUint32 *)input;
+ #else
+--- nss/lib/freebl/sha_fast.c
 nss/lib/freebl/sha_fast.c
+@@ -16,7 +16,7 @@
+ #include "ssltrace.h"
+ #endif
+ 
+-static void shaCompress(volatile SHA_HW_t *X, const PRUint32 * datain);
++static void shaCompress(volatile SHA_HW_t *X, const unsigned char * datain);
+ 
+ #define W u.w
+ #define B u.b
+@@ -243,7 +243,7 @@
+  * code on AMD64.
+  */
+ static void 
+-shaCompress(volatile SHA_HW_t *X, const PRUint32 *inbuf) 
++shaCompress(volatile SHA_HW_t *X, const unsigned char *inbuf) 
+ {
+   register SHA_HW_t A, B, C, D, E;
+ 
+@@ -275,7 +275,7 @@
+ #define SHA_RND4(a,b,c,d,e,n) \
+   a = SHA_ROTL(b,5)+SHA_F4(c,d,e)+a+XW(n)+K3; c=SHA_ROTL(c,30) 
+ 
+-#define LOAD(n) XW(n) = SHA_HTONL(inbuf[n])
++#define LOAD(n) XW(n) = 
(((PRUint32)inbuf[4*n])<<24)|(((PRUint32)inbuf[4*n+1])<<16)|(((PRUint32)inbuf[4*n+2])<<8)|((PRUint32)inbuf[4*n+3])
+ 
+   A = XH(0);
+   B = XH(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Oliver Specht]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss.nowerror.patch |   14 ++
 2 files changed, 15 insertions(+)

New commits:
commit 3f58746ab8080b4ada243afdfbc581df39ef0390
Author: Oliver Specht 
Date:   Wed Apr 13 14:06:47 2016 +0200

switch off 'warning treated as error' in external/nss in Win32

This prevents errors from ms sdk sal_supp.h: warning '__useHeader': macro 
redefinition

Change-Id: I122bbf6171c73d77970a549353dca67dd26d0300
Reviewed-on: https://gerrit.libreoffice.org/24055
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8e5e00b..1a7ed13 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss_macosx.patch \
external/nss/nss-win32-make.patch.1 \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch \
+external/nss/nss.nowerror.patch \
external/nss/nss.vs2015.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
diff --git a/external/nss/nss.nowerror.patch b/external/nss/nss.nowerror.patch
new file mode 100644
index 000..ca5f17c
--- /dev/null
+++ b/external/nss/nss.nowerror.patch
@@ -0,0 +1,14 @@
+diff -ur nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
+--- a/nss.org/nss/coreconf/WIN32.mk2016-04-13 11:33:09.322294523 +0200
 b/nss/nss/coreconf/WIN32.mk2016-04-13 11:33:27.744323969 +0200
+@@ -126,9 +126,9 @@
+ OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \
+-D_CRT_NONSTDC_NO_WARNINGS
+ OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ ifndef NSS_ENABLE_WERROR
+-NSS_ENABLE_WERROR = 1
++NSS_ENABLE_WERROR = 0
+ endif
+ ifeq ($(NSS_ENABLE_WERROR),1)
+ OS_CFLAGS += -WX
+ endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Mark Hung]

 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss.utf8bom.patch.1|   30 ++
 2 files changed, 32 insertions(+)

New commits:
commit 7605d173988e8df19830bfe4e0d00e745f09d9a0
Author: Mark Hung 
Date:   Thu Mar 31 21:46:48 2016 +0800

Allow NSS to build under cp950 in windows.

Change-Id: I4a5ef736ad714dd3b1beb4054e2347973db70e39
Reviewed-on: https://gerrit.libreoffice.org/23704
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index a553fcf..8e5e00b 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.pdb.patch) \
 $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
 external/nss/nss-winXP-sdk.patch.1) \
+   $(if $(filter WNTMSC,$(OS)$(COM)), \
+   external/nss/nss.utf8bom.patch.1) \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/nss/nss.utf8bom.patch.1 b/external/nss/nss.utf8bom.patch.1
new file mode 100644
index 000..bc37f18
--- /dev/null
+++ b/external/nss/nss.utf8bom.patch.1
@@ -0,0 +1,30 @@
+diff -ur 
nss.org/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h
 
nss/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h
+--- 
nss.org/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h
   2016-03-31 18:26:06.763009800 +0800
 
nss/nss/external_tests/google_test/gtest/include/gtest/internal/gtest-internal.h
   2016-03-31 19:17:11.724452000 +0800
+@@ -1,4 +1,4 @@
+-// Copyright 2005, Google Inc.
++// Copyright 2005, Google Inc.
+ // All rights reserved.
+ //
+ // Redistribution and use in source and binary forms, with or without
+diff -ur nss.org/nss/lib/ckfw/builtins/certdata.perl 
nss/nss/lib/ckfw/builtins/certdata.perl
+--- nss.org/nss/lib/ckfw/builtins/certdata.perl2016-03-31 
18:26:07.890190900 +0800
 nss/nss/lib/ckfw/builtins/certdata.perl2016-03-31 19:16:16.727269600 
+0800
+@@ -110,6 +110,9 @@
+ sub doprint {
+ my $i;
+ 
++print chr(0xEF);
++print chr(0xBB);
++print chr(0xBF);
+ print <___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Michael Stahl]

 external/nss/ExternalPackage_nss.mk |   18 
 external/nss/ExternalProject_nss.mk |1 
 external/nss/UnpackedTarball_nss.mk |7 
 external/nss/nss-pem.patch  | 6376 
 4 files changed, 6402 deletions(-)

New commits:
commit 2a9e6ecc61b232be08d8b1687874289ca0fe8d43
Author: Michael Stahl 
Date:   Tue Mar 22 17:08:35 2016 +0100

nss: remove nss-pem.patch

It looks like commit 30b9c6a457de61f3c94431ecc75716f866c3379e made
this obsolete: by default, curl's configure will pick some OpenSSL
certificate database in /etc to use, which is in PEM format.

But since every distribution uses a different path in /etc for that,
it will work only on the same distribution as the build host anyway,
which makes it mostly useless in practice.

So we don't need our NSS to be able to read PEM format now.

Speaking of which, PEM support was only required for Linux builds
anyway, not for WNT/Mac builds.

Change-Id: Ib9bc6ec0b7d71c14e9a53454e6efed038072e913
Reviewed-on: https://gerrit.libreoffice.org/23435
Tested-by: Jenkins 
Reviewed-by: Giuseppe Castagno 
Reviewed-by: Michael Stahl 

diff --git a/external/nss/ExternalPackage_nss.mk 
b/external/nss/ExternalPackage_nss.mk
index c6d8953fd..20cd756 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -59,22 +59,4 @@ $(eval $(call 
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
 ))
 endif
 
-ifeq ($(SYSTEM_CURL),)
-ifeq ($(OS),IOS)
-# nothing
-else ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
-   dist/out/lib/libnsspem.dylib \
-))
-else ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
-   dist/out/lib/nsspem.dll \
-))
-else # OS!=WNT/MACOSX
-$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
-   dist/out/lib/libnsspem.so \
-))
-endif
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index bd64971..258e845 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -88,7 +88,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \
-   
$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnsspem.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 4640e54..a553fcf 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -36,13 +36,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss-winXP-sdk.patch.1) \
 ))
 
-# nss-pem is only needed for internal curl to read the NSS CA database
-ifeq ($(SYSTEM_CURL),)
-$(eval $(call gb_UnpackedTarball_add_patches,nss,\
-   external/nss/nss-pem.patch \
-))
-endif
-
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch
deleted file mode 100644
index d41809d..000
--- a/external/nss/nss-pem.patch
+++ /dev/null
@@ -1,6376 +0,0 @@
-diff --git a/a/nss/lib/ckfw/manifest.mn b/b/nss/lib/ckfw/manifest.mn
-index 20bebeb..4f10563 100644
 a/a/nss/lib/ckfw/manifest.mn
-+++ b/b/nss/lib/ckfw/manifest.mn
-@@ -5,7 +5,7 @@
- 
- CORE_DEPTH = ../..
- 
--DIRS = builtins 
-+DIRS = builtins pem
- 
- PRIVATE_EXPORTS = \
-   ck.h  \
-diff --git a/a/nss/lib/ckfw/pem/Makefile b/b/nss/lib/ckfw/pem/Makefile
-new file mode 100644
-index 000..aec3bbd
 /dev/null
-+++ b/b/nss/lib/ckfw/pem/Makefile
-@@ -0,0 +1,107 @@
-+# 
-+# * BEGIN LICENSE BLOCK *
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the 

[Libreoffice-commits] core.git: 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 09e201fcf2813152335d50588dae0c38adc88d51
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)

Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 75b1f84..4640e54 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.cygwin64.in32bit.patch) \
$(if $(filter WNTMSC,$(OS)$(COM)), \
external/nss/nss.vs2015.pdb.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: external/nss

[David Ostrovsky]

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

New commits:
commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b
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 

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: external/nss

[David Ostrovsky]

 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss.vs2015.pdb.patch   |   22 ++
 2 files changed, 24 insertions(+)

New commits:
commit 1a056fdb25bd5c682f395ff94a6e1ce5618ed55a
Author: David Ostrovsky 
Date:   Fri Mar 4 19:55:16 2016 +0100

Fix nss on MSVC 14.0 in debug mode

outdir doesn't seem to be created. Use current directory for
pdb files as the obj files are already stored in the current
directory.

Change-Id: I41dd65714d314cd374cc5de073d48f1a58b18c56
Reviewed-on: https://gerrit.libreoffice.org/22888
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 2d960b8..75b1f84 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -30,6 +30,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 $(filter WNTMSC,$(OS)$(COM)), \
+   external/nss/nss.vs2015.pdb.patch) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss.vs2015.pdb.patch 
b/external/nss/nss.vs2015.pdb.patch
new file mode 100755
index 000..dc4f463
--- /dev/null
+++ b/external/nss/nss.vs2015.pdb.patch
@@ -0,0 +1,22 @@
+diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
+--- a/nss.orig/nss/coreconf/WIN32.mk   2016-03-04 08:30:16.306639400 +0100
 b/nss/nss/coreconf/WIN32.mk2016-03-04 08:31:17.987233200 +0100
+@@ -169,15 +169,15 @@
+   DLLFLAGS   += -OUT:$@
+   ifdef MOZ_DEBUG_SYMBOLS
+   ifdef MOZ_DEBUG_FLAGS
+-  OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/
++  OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd./
+   else
+-  OPTIMIZER += -Zi -Fd$(OBJDIR)/
++  OPTIMIZER += -Zi -Fd./
+   endif
+   DLLFLAGS += -DEBUG -OPT:REF
+   LDFLAGS += -DEBUG -OPT:REF
+   endif
+ else
+-  OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
++  OPTIMIZER += -Zi -Fd./ -Od
+   NULLSTRING :=
+   SPACE  := $(NULLSTRING) # end of the line
+   USERNAME   := $(subst $(SPACE),_,$(USERNAME))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss external/python3

[Stephan Bergmann]

 0 files changed

New commits:
commit e9b0a45a682f7d18c04dafd973a0357dbf707dd0
Author: Stephan Bergmann 
Date:   Tue Dec 1 12:35:08 2015 +0100

Fix patch file attributes

Change-Id: I4f86aba24f2dad14f43effd6e0b291f8f58f1712

diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch
old mode 100755
new mode 100644
diff --git a/external/python3/python-3.5.0-tcltk.disable.patch 
b/external/python3/python-3.5.0-tcltk.disable.patch
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[David Ostrovsky]

 external/nss/UnpackedTarball_nss.mk |3 ++-
 external/nss/nss.vs2015.patch   |   12 
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit c4afb5d19342d249fae841c24575a5f9ecacdfe2
Author: David Ostrovsky 
Date:   Mon Aug 31 21:05:07 2015 +0200

Fix nss on MSVC 14.0

Change-Id: I8c2f18a509ae6686af4ede5b0daa8291d164c9fd
Reviewed-on: https://gerrit.libreoffice.org/18211
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 1b9f45d..d297ee4b 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -17,7 +17,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \
external/nss/nss-win32-make.patch.1 \
-   $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
+   $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch \
+   external/nss/nss.vs2015.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \
diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch
new file mode 100755
index 000..42a325d
--- /dev/null
+++ b/external/nss/nss.vs2015.patch
@@ -0,0 +1,12 @@
+diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
+--- foo/nss.orig/nss/coreconf/WIN32.mk 2015-06-17 20:26:43.0 +0200
 foo/nss/nss/coreconf/WIN32.mk  2015-08-31 20:40:40.146490300 +0200
+@@ -192,7 +192,7 @@
+ ifneq ($(_MSC_VER),$(_MSC_VER_6))
+ # Convert certain deadly warnings to errors (see list at end of file)
+ OS_CFLAGS += -we4002 -we4003 -we4004 -we4006 -we4009 -we4013 \
+- -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4054 -we4063 \
++ -we4015 -we4028 -we4033 -we4035 -we4045 -we4047 -we4053 -we4063 \
+  -we4064 -we4078 -we4087 -we4090 -we4098 -we4390 -we4551 -we4553 -we4715
+ 
+ ifeq ($(_MSC_VER_GE_12),1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

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

New commits:
commit 8d2ac08383f894f428da63f4653d0cbd6649e0db
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 12 08:22:22 2015 +0200

external/nss: -fsanitize=nonnull-attribute

Change-Id: Ic3a20f56250d99a347df5deaf785800a2f96e470

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
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Robert Antoni Buj i Gelonch]

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ae064ec005f157cb76fedb8ae5482f38c56704ad
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Thu Oct 23 23:18:52 2014 +0200

nss: add libnsspem.dylib to macosx-change-install-names.pl call

Change-Id: If457f9e090a4ef3a5b2b8e4f09ce0b5e3b3d04ec
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index f518bb4..17ea6f1 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -87,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnsspem.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \

$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/UnpackedTarball_nss.mk |3 ++-
 external/nss/ubsan.patch.0  |   13 +
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 83e5c3e93d9a6f306973d25f6e0426b5d0d06d07
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Aug 6 16:50:11 2014 +0200

left shift of 4276994303 by 32 places cannot be represented in type 'long'

Change-Id: Ie9ddc5a42116720e0602d7fb38360f01b71df69c

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 11839c4..0f166c9 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -22,7 +22,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \
-external/nss/nspr-build-config.patch \
+external/nss/nspr-build-config.patch \
+external/nss/ubsan.patch.0 \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
new file mode 100644
index 000..298ca40
--- /dev/null
+++ b/external/nss/ubsan.patch.0
@@ -0,0 +1,13 @@
+--- nss/lib/libpkix/pkix/util/pkix_tools.h
 nss/lib/libpkix/pkix/util/pkix_tools.h
+@@ -1458,8 +1458,8 @@
+ 
+ extern PRLogModuleInfo *pkixLog;
+ 
+-#define PKIX_MAGIC_HEADER   LL_INIT(0xFEEDC0FF, 0xEEFACADE)
+-#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00D, 0xDEADBEEF)
++#define PKIX_MAGIC_HEADER   LL_INIT(0xFEEDC0FFU, 0xEEFACADEU)
++#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00DU, 0xDEADBEEFU)
+ 
+ /* see source file for function documentation */
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss RepositoryExternal.mk ucb/source

[Cédric Bosdonnat]

 RepositoryExternal.mk |3 +++
 external/nss/ExternalPackage_nss.mk   |   19 ---
 external/nss/UnpackedTarball_nss.mk   |8 +++-
 ucb/source/ucp/cmis/cmis_content.cxx  |4 
 ucb/source/ucp/cmis/cmis_repo_content.cxx |4 
 5 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 89361fa68af9a6854dc3a07711279f27561ea8fb
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jul 16 17:02:01 2014 +0200

fdo#72277: don't build and use nsspem when building against system curl

System CURL will know how to get the CA bundle from the system openSSL.
There is no need to have internal NSS CA database support.

Change-Id: Ie5074c78f7d78b2c2f452d4d4e11c98222529883

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39ca2d85..b0747f1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2472,6 +2472,9 @@ endif # !SYSTEM_LIBPNG
 ifneq ($(SYSTEM_CURL),)
 
 define gb_LinkTarget__use_curl
+$(call gb_LinkTarget_add_defs,$(1),\
+   -DSYSTEM_CURL \
+)
 $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(CURL_CFLAGS) \
diff --git a/external/nss/ExternalPackage_nss.mk 
b/external/nss/ExternalPackage_nss.mk
index fcbca81..26f9239 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -18,7 +18,6 @@ $(eval $(call 
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/libnss3.dylib \
dist/out/lib/libnssckbi.dylib \
dist/out/lib/libnssdbm3.dylib \
-   dist/out/lib/libnsspem.dylib \
dist/out/lib/libnssutil3.dylib \
dist/out/lib/libplc4.dylib \
dist/out/lib/libplds4.dylib \
@@ -34,7 +33,6 @@ $(eval $(call 
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/nss3.dll \
dist/out/lib/nssckbi.dll \
dist/out/lib/nssdbm3.dll \
-   dist/out/lib/nsspem.dll \
dist/out/lib/nssutil3.dll \
dist/out/lib/plc4.dll \
dist/out/lib/plds4.dll \
@@ -50,7 +48,6 @@ $(eval $(call 
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/libnss3.so \
dist/out/lib/libnssckbi.so \
dist/out/lib/libnssdbm3.so \
-   dist/out/lib/libnsspem.so \
dist/out/lib/libnssutil3.so \
dist/out/lib/libplc4.so \
dist/out/lib/libplds4.so \
@@ -61,4 +58,20 @@ $(eval $(call 
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
 ))
 endif
 
+ifeq ($(SYSTEM_CURL),)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+   dist/out/lib/libnsspem.dylib \
+))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+   dist/out/lib/nsspem.dll \
+))
+else # OS!=WNT/MACOSX
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+   dist/out/lib/libnsspem.so \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index bafe3b5..11839c4 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss_macosx.patch \
external/nss/nss-linux-x86.patch.0 \
external/nss/nss-win32-make.patch.1 \
-   external/nss/nss-pem.patch \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
@@ -26,6 +25,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nspr-build-config.patch \
 ))
 
+# nss-pem is only needed for internal curl to read the NSS CA database
+ifeq ($(SYSTEM_CURL),)
+$(eval $(call gb_UnpackedTarball_add_patches,nss,\
+   external/nss/nss-pem.patch \
+))
+endif
+
 ifeq ($(COM_GCC_IS_CLANG)$(filter 
-fsanitize=address,$(CC)),TRUE-fsanitize=address)
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/asan.patch.1 \
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx 
b/ucb/source/ucp/cmis/cmis_content.cxx
index 5b81748..7cd9d3e 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -32,10 +32,12 @@
 #include com/sun/star/ucb/UnsupportedOpenModeException.hpp
 #include com/sun/star/ucb/XCommandInfo.hpp
 #include com/sun/star/ucb/XDynamicResultSet.hpp
+#ifndef SYSTEM_CURL
 #include com/sun/star/xml/crypto/XDigestContext.hpp
 #include com/sun/star/xml/crypto/XDigestContextSupplier.hpp
 #include com/sun/star/xml/crypto/DigestID.hpp
 #include com/sun/star/xml/crypto/NSSInitializer.hpp
+#endif
 
 #include comphelper/processfactory.hxx
 #include config_oauth2.h

[Libreoffice-commits] core.git: external/nss

[Cédric Bosdonnat]

 external/nss/nss-pem.patch |   21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 6602f904ac1858ef571eab5b2df733be0461e7e3
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Tue Jul 15 12:03:29 2014 +0200

fdo#72277: nss-pem fixed windows and macos build errors

Change-Id: I30b4036b6cf00dec753115bbc59990daec27ef20

diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch
index b65a04f..e24f789 100644
--- a/external/nss/nss-pem.patch
+++ b/external/nss/nss-pem.patch
@@ -182,10 +182,10 @@ index 000..621f919
 +#include nssck.api
 diff --git a/a/nss/lib/ckfw/pem/ckpem.h b/b/nss/lib/ckfw/pem/ckpem.h
 new file mode 100644
-index 000..2a47c75
+index 000..9712ccd
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/ckpem.h
-@@ -0,0 +1,265 @@
+@@ -0,0 +1,263 @@
 +#ifndef CKPEM_H
 +#define CKPEM_H
 +
@@ -345,8 +345,6 @@ index 000..2a47c75
 +NSS_EXTERN_DATA pemInternalObject nss_pem_data[];
 +NSS_EXTERN_DATA const PRUint32   nss_pem_nObjects;
 +
-+  PRBool  logged_in;
-+
 +/* our raw object data array */
 +NSS_EXTERN_DATA pemInternalObject nss_pem_data[];
 +NSS_EXTERN_DATA const PRUint32   nss_pem_nObjects;
@@ -897,10 +895,10 @@ index 000..1547bf4
 +#endif /* NSSCKBI_H */
 diff --git a/a/nss/lib/ckfw/pem/pargs.c b/b/nss/lib/ckfw/pem/pargs.c
 new file mode 100644
-index 000..f292a8b
+index 000..cff6e87
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/pargs.c
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,163 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -948,11 +946,11 @@ index 000..f292a8b
 +
 +char *pem_StrNdup(const char *instr, PRInt32 inlen)
 +{
++size_t len = inlen;
 +if (!instr) {
 +return NULL;
 +}
 +
-+size_t len = inlen;
 +if (!len) {
 +return NULL;
 +}
@@ -967,11 +965,12 @@ index 000..f292a8b
 +
 +char *pem_Strdup(const char *instr)
 +{
++size_t len;
 +if (!instr) {
 +return NULL;
 +}
 +
-+size_t len = strlen(instr);
++len = strlen(instr);
 +return pem_StrNdup(instr, len);
 +}
 +
@@ -1011,14 +1010,14 @@ index 000..f292a8b
 +pem_ParseString(const char *inputstring, const char delimiter,
 +PRInt32 * numStrings, char ***returnedstrings)
 +{
++char nextchar;
++char *instring = (char *) inputstring;
 +if (!inputstring || !delimiter || !numStrings || !returnedstrings) {
 +/* we need a string and a non-zero delimiter, as well as
 + * a valid place to return the strings and count
 + */
 +return PR_FALSE;
 +}
-+char nextchar;
-+char *instring = (char *) inputstring;
 +*numStrings = 0;
 +*returnedstrings = NULL;
 +
@@ -1050,10 +1049,10 @@ index 000..f292a8b
 +
 +PRBool pem_FreeParsedStrings(PRInt32 numStrings, char **instrings)
 +{
++PRInt32 counter;
 +if (!numStrings || !instrings) {
 +return PR_FALSE;
 +}
-+PRInt32 counter;
 +for (counter = 0; counter  numStrings; counter++) {
 +char *astring = instrings[counter];
 +if (astring) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Cédric Bosdonnat]

 external/nss/nss-pem.patch |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 85d1bd151cca1572e39019288cb2b7b35fc0bbda
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Tue Jul 15 12:26:42 2014 +0200

fdo#72277: NSS-PEM yet another build fix for MS compiler

Change-Id: I524a14cd124e69e288de5ae8464eb611989dffde

diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch
index e24f789..bc5abaf 100644
--- a/external/nss/nss-pem.patch
+++ b/external/nss/nss-pem.patch
@@ -895,10 +895,10 @@ index 000..1547bf4
 +#endif /* NSSCKBI_H */
 diff --git a/a/nss/lib/ckfw/pem/pargs.c b/b/nss/lib/ckfw/pem/pargs.c
 new file mode 100644
-index 000..cff6e87
+index 000..21291a8
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/pargs.c
-@@ -0,0 +1,163 @@
+@@ -0,0 +1,164 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -947,6 +947,7 @@ index 000..cff6e87
 +char *pem_StrNdup(const char *instr, PRInt32 inlen)
 +{
 +size_t len = inlen;
++char *buffer;
 +if (!instr) {
 +return NULL;
 +}
@@ -954,7 +955,7 @@ index 000..cff6e87
 +if (!len) {
 +return NULL;
 +}
-+char *buffer = (char *) pem_Malloc(len + 1);
++buffer = (char *) pem_Malloc(len + 1);
 +if (!buffer) {
 +return NULL;
 +}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Cédric Bosdonnat]

 external/nss/nss-pem.patch |   31 ++-
 1 file changed, 18 insertions(+), 13 deletions(-)

New commits:
commit 0058b4370070c96e1edc9dd3c80715187ad30cca
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Tue Jul 15 14:31:06 2014 +0200

fdo#72277: NSS-PEM, use PR_snprintf instead of snprintf

Change-Id: I8aeb9a787992deb784e4e4430f7e0eab57f9a598

diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch
index bc5abaf..88d60a8 100644
--- a/external/nss/nss-pem.patch
+++ b/external/nss/nss-pem.patch
@@ -1506,10 +1506,10 @@ index 000..30b1174
 +}
 diff --git a/a/nss/lib/ckfw/pem/pinst.c b/b/nss/lib/ckfw/pem/pinst.c
 new file mode 100644
-index 000..813810c
+index 000..9c98e89
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/pinst.c
-@@ -0,0 +1,766 @@
+@@ -0,0 +1,768 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -1549,6 +1549,7 @@ index 000..813810c
 +#include stdlib.h
 +#include ckpem.h
 +#include blapi.h
++#include prprf.h
 +
 +/*
 + * pinstance.c
@@ -1901,6 +1902,7 @@ index 000..813810c
 +  int objid, CK_SLOT_ID slotID, PRBool *pAdded)
 +{
 +int i;
++pemInternalObject *io;
 +
 +/* FIXME: copy-pasted from CreateObject */
 +const char *nickname = strrchr(filename, '/');
@@ -1939,7 +1941,7 @@ index 000..813810c
 +}
 +
 +/* object not found, we need to create it */
-+pemInternalObject *io = CreateObject(objClass, type, certDER, keyDER,
++io = CreateObject(objClass, type, certDER, keyDER,
 + filename, objid, slotID);
 +if (io == NULL)
 +return NULL;
@@ -1996,7 +1998,7 @@ index 000..813810c
 +char nickname[1024];
 +objid = pem_nobjs + 1;
 +
-+snprintf(nickname, 1024, %s - %d, certfile, i);
++PR_snprintf(nickname, 1024, %s - %d, certfile, i);
 +
 +o = AddObjectIfNeeded(CKO_CERTIFICATE, pemCert, objs[i], NULL,
 +   nickname, 0, slotID, NULL);
@@ -2278,10 +2280,10 @@ index 000..813810c
 +};
 diff --git a/a/nss/lib/ckfw/pem/pobject.c b/b/nss/lib/ckfw/pem/pobject.c
 new file mode 100644
-index 000..48f72d0
+index 000..a13e531
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/pobject.c
-@@ -0,0 +1,1239 @@
+@@ -0,0 +1,1240 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -2322,6 +2324,7 @@ index 000..48f72d0
 +#include ckpem.h
 +#include secasn1.h
 +#include certt.h
++#include prprf.h
 +#include pk11pub.h
 +
 +/*
@@ -3412,7 +3415,7 @@ index 000..48f72d0
 +char nickname[1024];
 +objid = pem_nobjs + 1;
 +
-+snprintf(nickname, 1024, %s - %d, filename, c);
++PR_snprintf(nickname, 1024, %s - %d, filename, c);
 +
 +if (c)
 +APPEND_LIST_ITEM(listItem);
@@ -4622,10 +4625,10 @@ index 000..70c5407
 +}
 diff --git a/a/nss/lib/ckfw/pem/pslot.c b/b/nss/lib/ckfw/pem/pslot.c
 new file mode 100644
-index 000..1a7d062
+index 000..2f9901b
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/pslot.c
-@@ -0,0 +1,182 @@
+@@ -0,0 +1,183 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -4664,6 +4667,7 @@ index 000..1a7d062
 + * * END LICENSE BLOCK * */
 +
 +#include ckpem.h
++#include prprf.h
 +
 +/*
 + * pslot.c
@@ -4690,7 +4694,7 @@ index 000..1a7d062
 +slotID = nssCKFWSlot_GetSlotID(fwSlot);
 +
 +slotid = (char *) nss_ZAlloc(arena, 256);
-+snprintf(slotid, 256, PEM Slot #%ld, slotID);
++PR_snprintf(slotid, 256, PEM Slot #%ld, slotID);
 +
 +return (NSSUTF8 *) slotid;
 +}
@@ -4810,10 +4814,10 @@ index 000..1a7d062
 +};
 diff --git a/a/nss/lib/ckfw/pem/ptoken.c b/b/nss/lib/ckfw/pem/ptoken.c
 new file mode 100644
-index 000..67b5f10
+index 000..6c35b21
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/ptoken.c
-@@ -0,0 +1,333 @@
+@@ -0,0 +1,334 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -4852,6 +4856,7 @@ index 000..67b5f10
 + * * END LICENSE BLOCK * */
 +
 +#include ckpem.h
++#include prprf.h
 +
 +/*
 + * ptoken.c
@@ -4882,7 +4887,7 @@ index 000..67b5f10
 +slotID = nssCKFWSlot_GetSlotID(fwSlot);
 +
 +tokenid = (char *) nss_ZAlloc(arena, 256);
-+snprintf(tokenid, 256, PEM Token #%ld, slotID);
++PR_snprintf(tokenid, 256, PEM Token #%ld, slotID);
 +
 +return (NSSUTF8 *) tokenid;
 +}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Cédric Bosdonnat]

 external/nss/nss-pem.patch |   89 +
 1 file changed, 82 insertions(+), 7 deletions(-)

New commits:
commit a8fd30771a019f727b07adfd82d610028f640f1e
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Tue Jul 15 15:06:52 2014 +0200

fdo#72277: NSS-PEM windows fixes.

Added missing SEC_ASN1_MKSUB for windows to build
Use PL_strcasecmp instead of strcasecmp.
Fixed remaining declaration not at begining of a block
Added missing nsspem.rc for windows

Change-Id: I144f9cf19c0efe85ad68011cf81e0466aa1ac9f5

diff --git a/external/nss/nss-pem.patch b/external/nss/nss-pem.patch
index 88d60a8..c2f34fe 100644
--- a/external/nss/nss-pem.patch
+++ b/external/nss/nss-pem.patch
@@ -893,6 +893,76 @@ index 000..1547bf4
 +#define NSS_CKPEM_FIRMWARE_VERSION_MINOR 0
 +
 +#endif /* NSSCKBI_H */
+diff --git a/a/nss/lib/ckfw/pem/nsspem.rc b/b/nss/lib/ckfw/pem/nsspem.rc
+new file mode 100644
+index 000..eb208d6
+--- /dev/null
 b/b/nss/lib/ckfw/pem/nsspem.rc
+@@ -0,0 +1,64 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++#include nsspem.h
++#include winver.h
++
++#define MY_LIBNAME nsspem
++#define MY_FILEDESCRIPTION NSS PEM support
++
++#ifdef _DEBUG
++#define MY_DEBUG_STR  (debug)
++#define MY_FILEFLAGS_1 VS_FF_DEBUG
++#else
++#define MY_DEBUG_STR 
++#define MY_FILEFLAGS_1 0x0L
++#endif
++#if NSS_BETA
++#define MY_FILEFLAGS_2 MY_FILEFLAGS_1|VS_FF_PRERELEASE
++#else
++#define MY_FILEFLAGS_2 MY_FILEFLAGS_1
++#endif
++
++#ifdef WINNT
++#define MY_FILEOS VOS_NT_WINDOWS32
++#else
++#define MY_FILEOS VOS__WINDOWS32
++#endif
++
++#define MY_INTERNAL_NAME MY_LIBNAME
++
++/
++//
++// Version-information resource
++//
++
++VS_VERSION_INFO VERSIONINFO
++ FILEVERSION 
NSS_CKPEM_LIBRARY_VERSION_MAJOR,NSS_CKPEM_LIBRARY_VERSION_MINOR,0,0
++ PRODUCTVERSION 
NSS_CKPEM_LIBRARY_VERSION_MAJOR,NSS_CKPEM_LIBRARY_VERSION_MINOR,0,0
++ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
++ FILEFLAGS MY_FILEFLAGS_2
++ FILEOS MY_FILEOS
++ FILETYPE VFT_DLL
++ FILESUBTYPE 0x0L // not used
++
++BEGIN
++BLOCK StringFileInfo
++BEGIN
++BLOCK 040904B0 // Lang=US English, CharSet=Unicode
++BEGIN
++VALUE CompanyName, Mozilla Foundation\0
++VALUE FileDescription, MY_FILEDESCRIPTION MY_DEBUG_STR \0
++VALUE FileVersion, NSS_CKPEM_LIBRARY_VERSION \0
++VALUE InternalName, MY_INTERNAL_NAME \0
++VALUE OriginalFilename, MY_INTERNAL_NAME .dll\0
++VALUE ProductName, Network Security Services\0
++VALUE ProductVersion, NSS_CKPEM_LIBRARY_VERSION \0
++END
++END
++BLOCK VarFileInfo
++BEGIN
++VALUE Translation, 0x409, 1200
++END
++END
 diff --git a/a/nss/lib/ckfw/pem/pargs.c b/b/nss/lib/ckfw/pem/pargs.c
 new file mode 100644
 index 000..21291a8
@@ -3526,10 +3596,10 @@ index 000..a13e531
 +}
 diff --git a/a/nss/lib/ckfw/pem/prsa.c b/b/nss/lib/ckfw/pem/prsa.c
 new file mode 100644
-index 000..f0e069c
+index 000..d42e9f7
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/prsa.c
-@@ -0,0 +1,699 @@
+@@ -0,0 +1,702 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -3574,6 +3644,9 @@ index 000..f0e069c
 +
 +#define SSL3_SHAMD5_HASH_SIZE  36   /* LEN_MD5 (16) + LEN_SHA1 (20) */
 +
++SEC_ASN1_MKSUB(SEC_AnyTemplate)
++SEC_ASN1_MKSUB(SECOID_AlgorithmIDTemplate)
++
 +/*
 + * prsa.c
 + *
@@ -5968,10 +6041,10 @@ index 000..1179f2a
 +#endif
 diff --git a/a/nss/lib/ckfw/pem/util.c b/b/nss/lib/ckfw/pem/util.c
 new file mode 100644
-index 000..6a7495f
+index 000..e5fb4da
 --- /dev/null
 +++ b/b/nss/lib/ckfw/pem/util.c
-@@ -0,0 +1,312 @@
+@@ -0,0 +1,314 @@
 +/* * BEGIN LICENSE BLOCK *
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 + *
@@ -6018,6 +6091,7 @@ index 000..6a7495f
 +#include prlog.h
 +#include prprf.h
 +#include plgetopt.h
++#include plstr.h
 +#include prenv.h
 +#include prnetdb.h
 +#include base.h
@@ -6141,6 +6215,7 @@ index 000..6a7495f
 +  if (strstr(asc, -BEGIN) != NULL) {
 +int key = 0;
 +  while ((asc)  ((body = strstr(asc, -BEGIN)) != NULL)) {
++  char *trailer;
 +key = 0;
 +  if ((strncmp(body, -BEGIN RSA PRIVATE KEY, 25) == 0) ||
 +  (strncmp(body, -BEGIN PRIVATE KEY, 21) == 0)) {
@@ -6162,9 +6237,9 @@ index 000..6a7495f
 +  if (body == NULL)
 +  goto loser;
 +  *body = '\0';
-+  if (!strcasecmp(c, DES-EDE3-CBC))
++  if (!PL_strcasecmp(c, DES-EDE3-CBC))
 +  *cipher = NSS_DES_EDE3_CBC;
-+ 

[Libreoffice-commits] core.git: external/nss external/openssl external/python3

[Douglas Mencken]

 external/nss/ExternalProject_nss.mk  |5 +-
 external/nss/nss_macosx.patch|   47 ++-
 external/openssl/UnpackedTarball_openssl.mk  |1 
 external/openssl/opensslosxppc.patch |   15 
 external/python3/ExternalProject_python3.mk  |3 +
 external/python3/python-3.3.0-darwin.patch.1 |2 -
 6 files changed, 55 insertions(+), 18 deletions(-)

New commits:
commit f4beadc6e28b812237e01e6f8f2c4afcf57bb4d5
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Mon Jul 7 14:18:12 2014 -0400

avoid -arch for bundled OpenSSL, Python3, and nss/nspr on OSX@PowerPC

this fixes gcc: error: unrecognized command line option '-arch'

The '-arch' option is part of Apple's extensions to GCC, and it is 
uncompatible
with vanilla GCC from FSF. Also, we're not building universal binaries.

Change-Id: I44e7c72bbb1dd4be5ac9cdbc4f210aaccea513b4
Reviewed-on: https://gerrit.libreoffice.org/10117
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index b7e07f7..cfda1ac 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -59,8 +59,9 @@ else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject_get_state_target,nss,configure) $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
-   $(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
-   $(if $(filter 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,NSS_USE_SYSTEM_SQLITE=1)) \
+   $(if $(filter MACOSX,$(OS)),\
+   $(if $(filter-out 
POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
+   $(if $(filter-out 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 853cd34..348d42b 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,6 +1,6 @@
 a/a/nss/Makefile   2008-12-03 00:24:39.0 +0100
-+++ b/b/nss/Makefile   2009-11-27 13:36:22.662753328 +0100
-@@ -104,6 +104,9 @@
+--- a/a/nss/Makefile
 b/b/nss/Makefile
+@@ -69,6 +69,9 @@
  ifeq ($(OS_TARGET),WIN95)
  NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
  endif
@@ -10,9 +10,33 @@
  ifdef USE_DEBUG_RTL
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
+--- a/a/nspr/configure.in
 b/b/nspr/configure.in
+@@ -1374,7 +1374,9 @@
+ ;;
+ esac
+ if test `echo $CC | grep -c '\-arch '` = 0; then
+-CC=$CC -arch $CPU_ARCH
++if test $CPU_ARCH != ppc; then
++CC=$CC -arch $CPU_ARCH
++fi
+ fi
+ AC_CHECK_HEADER(crt_externs.h)
+ DSO_CFLAGS=-fPIC
 --- a/a/nspr/configure
 +++ b/b/nspr/configure
-@@ -3888,7 +3889,7 @@
+@@ -3864,7 +3864,9 @@
+ ;;
+ esac
+ if test `echo $CC | grep -c '\-arch '` = 0; then
+-CC=$CC -arch $CPU_ARCH
++if test $CPU_ARCH != ppc; then
++CC=$CC -arch $CPU_ARCH
++fi
+ fi
+ ac_safe=`echo crt_externs.h | sed 'y%./+-%__p_%'`
+ echo $ac_n checking for crt_externs.h... $ac_c 16
+@@ -3900,7 +3902,7 @@
  fi
  
  DSO_CFLAGS=-fPIC
@@ -23,7 +47,7 @@
  STRIP=$STRIP -x -S
 --- a/a/nss/coreconf/Darwin.mk
 +++ b/b/nss/coreconf/Darwin.mk
-@@ -39,8 +39,12 @@
+@@ -7,8 +7,12 @@
  
  DEFAULT_COMPILER = gcc
  
@@ -38,7 +62,7 @@
  RANLIB= ranlib
  
  ifndef CPU_ARCH
-@@ -57,19 +57,25 @@
+@@ -19,11 +23,15 @@
  
  ifeq (,$(filter-out i%86,$(CPU_ARCH)))
  ifdef USE_64
@@ -54,19 +78,14 @@
  override CPU_ARCH = x86
  endif
  else
- ifeq (arm,$(CPU_ARCH))
+@@ -31,17 +39,20 @@
  # Nothing set for arm currently.
  else
  OS_REL_CFLAGS = -Dppc
-+ifeq (,$(findstring -arch ,$(CC)))
- CC  += -arch ppc
-+endif
+-CC  += -arch ppc
  endif
  endif
  
-@@ -64,12 +64,16 @@
- endif
- 
  ifneq (,$(MACOS_SDK_DIR))
 +CLANG_VERSION_FULL := $(shell $(CC) -v 21 | grep clang version | sed 
-e s/^.*clang version[  ]*// | awk '{ print $$1 }')
  GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
@@ -82,7 +101,7 @@
  # GCC = 3
  DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
  ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
-@@ -150,7 +150,7 @@
+@@ -104,7 +115,7 @@
  # May override this with different compatibility and current version numbers.
  DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
  # May override this with -bundle 

[Libreoffice-commits] core.git: external/nss

[Markus Mohrhard]

 external/nss/UnpackedTarball_nss.mk |6 ++
 external/nss/asan.patch.1   |   12 
 2 files changed, 18 insertions(+)

New commits:
commit 3c5bc3128f8ade4e52069204df2da6c00ffb3806
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue May 13 02:12:17 2014 +0200

-fsanitize=address does not like -z defs

Change-Id: Id2a5c3009b46f9f91706b433411ca9f9c3cb7e39
Reviewed-on: https://gerrit.libreoffice.org/9334
Reviewed-by: Stephan Bergmann sberg...@redhat.com
Tested-by: Stephan Bergmann sberg...@redhat.com

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 17eb436..9ac8241 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -23,4 +23,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.mingw.patch.3) \
 ))
 
+ifeq ($(COM_GCC_IS_CLANG)$(filter 
-fsanitize=address,$(CC)),TRUE-fsanitize=address)
+$(eval $(call gb_UnpackedTarball_add_patches,nss,\
+   external/nss/asan.patch.1 \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
new file mode 100644
index 000..3b64aa6
--- /dev/null
+++ b/external/nss/asan.patch.1
@@ -0,0 +1,12 @@
+diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
+--- nss.org/nss/coreconf/Linux.mk  2014-05-06 04:36:01.817838877 +0200
 nss/nss/coreconf/Linux.mk  2014-05-06 04:37:25.387835456 +0200
+@@ -145,7 +145,7 @@
+ # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
+ # incorrectly reports undefined references in the libraries we link with, so
+ # we don't use -z defs there.
+-ZDEFS_FLAG= -Wl,-z,defs
++ZDEFS_FLAG=
+ DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ LDFLAGS   += $(ARCHFLAG)
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Douglas Mencken]

 external/nss/ExternalPackage_nss.mk |1 +
 external/nss/ExternalProject_nss.mk |3 ++-
 external/nss/README |2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d2a48728617e00a91d1ad032bd11ab5bb556d15a
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Mon Feb 24 05:02:36 2014 -0500

nss: continue delivering libsqlite on Mac OS X 10.5

Change-Id: Ibfd47071c73fc5f6c48d268a1f00d7f52762d0f2
Reviewed-on: https://gerrit.libreoffice.org/8204
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/external/nss/ExternalPackage_nss.mk 
b/external/nss/ExternalPackage_nss.mk
index ea686c2..e7e9e8a 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call 
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/libsmime3.dylib \
dist/out/lib/libsoftokn3.dylib \
dist/out/lib/libssl3.dylib \
+   $(if $(filter 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),dist/out/lib/libsqlite3.dylib) \
 ))
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 3a6a2bd..5d630be 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -60,9 +60,10 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
$(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
-   NSS_USE_SYSTEM_SQLITE=1) \
+   $(if $(filter 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,NSS_USE_SYSTEM_SQLITE=1)) \
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(filter YES,$(CROSS_COMPILING)),\
+   $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
NSINSTALL=$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/external/nss/nsinstall.py) \
NSDISTMODE=copy \
$(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit 
nss_build_all \
diff --git a/external/nss/README b/external/nss/README
index 77bc817..a6392fe 100644
--- a/external/nss/README
+++ b/external/nss/README
@@ -63,7 +63,7 @@ The direct link:
 
 The system sqlite in Mac OS X versions older than 10.6 is incompatible
 with the softokn3 in nss which requires a later version of sqlite.
-Since the baseline is Mac OS X 10.6 we use
+With SDK 10.6 (and more current SDK) we use
 NSS_USE_SYSTEM_SQLITE=1
 to build using the system sqlite.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/nss

[Caolán McNamara]

 external/nss/ExternalProject_nss.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92532e9543d58b270a153c612fc34a8d7de6abee
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Feb 5 20:50:58 2014 +

quote AR, etc. for AR='callcatcher ar'

Change-Id: I8dbaeb87e65114e8db4571fe5f9c58974ff4e701

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index dc19ec4..3a6a2bd 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalProject
$(if $(filter YES,$(CROSS_COMPILING)),\
NSINSTALL=$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/external/nss/nsinstall.py) \
NSDISTMODE=copy \
-   $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit 
nss_build_all \
+   $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit 
nss_build_all \
 rm -f $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),\
 chmod u+w $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits