bump nss from 3.15.3 to 3.16.5

Reviewed-on: https://gerrit.libreoffice.org/11700
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

Conflicts:
	external/nss/ExternalProject_nss.mk
	external/nss/nspr-build-config.patch
	external/nss/nss_macosx.patch

(cherry picked from commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1)
Reviewed-on: https://gerrit.libreoffice.org/11898
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Conflicts:
	download.lst
	external/nss/nss-linux-x86.patch.0
	external/nss/nss-pem.patch

Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e

1 files changed, 65 insertions, 68 deletions

diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index c83ae5758e7a..da9aacb10e84 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -1,16 +1,7 @@
---- a/a/nspr/configure	2010-08-18 07:23:01.000000000 -0500
-+++ b/b/nspr/configure	2010-08-18 07:33:11.000000000 -0500
-@@ -2973,7 +2973,8 @@
- #define SYSV 1
- EOF
- 
--    DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
-+    MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
-+    DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
-     ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
- echo "configure:3477: checking for sys/atomic_op.h" >&5
-@@ -3102,7 +3103,6 @@
+diff -ru a/nspr/configure b/nspr/configure
+--- a/a/nspr/configure	2014-09-29 16:47:42.984012225 +0100
++++ b/b/nspr/configure	2014-09-29 16:50:33.907375937 +0100
+@@ -6369,7 +6369,6 @@
          AIX_LINK_OPTS='-brtl -bnso -berok'
          ;;
      esac
@@ -18,9 +9,10 @@
      AIX_WRAP='$(DIST)/lib/aixwrap.o'
      AIX_TMP='./_aix_tmp.o'
      if test -n "$USE_64"; then
---- a/a/nspr/configure.in	2010-08-18 07:23:01.000000000 -0500
-+++ b/b/nspr/configure.in	2010-08-18 07:32:36.000000000 -0500
-@@ -831,7 +831,8 @@
+diff -ru a/nspr/configure.in b/nspr/configure.in
+--- a/a/nspr/configure.in	2014-09-29 16:46:35.257394860 +0100
++++ b/b/nspr/configure.in	2014-09-29 16:50:33.908375942 +0100
+@@ -1229,7 +1229,8 @@
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(AIX)
      AC_DEFINE(SYSV)
@@ -30,7 +22,7 @@
      AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
      case "${target_os}" in
      aix3.2*)
-@@ -871,10 +872,9 @@
+@@ -1269,10 +1270,9 @@
          AC_DEFINE(HAVE_SOCKLEN_T)
          AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
          USE_IPV6=1
@@ -42,9 +34,10 @@
      AIX_WRAP='$(DIST)/lib/aixwrap.o'
      AIX_TMP='./_aix_tmp.o'
      if test -n "$USE_64"; then
---- a/a/nspr/pr/src/Makefile.in	2010-08-18 07:23:04.000000000 -0500
-+++ b/b/nspr/pr/src/Makefile.in	2010-08-18 07:24:49.000000000 -0500
-@@ -110,7 +110,6 @@
+diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
+--- a/a/nspr/pr/src/Makefile.in	2014-09-29 16:46:35.281395079 +0100
++++ b/b/nspr/pr/src/Makefile.in	2014-09-29 16:50:33.909375948 +0100
+@@ -74,7 +74,6 @@
  endif
  
  ifeq ($(OS_ARCH),AIX)
@@ -52,9 +45,58 @@
  OS_LIBS		= -lodm -lcfg
  ifeq ($(CLASSIC_NSPR),1)
  ifeq ($(OS_RELEASE),4.1)
---- a/a/nss/coreconf/AIX.mk	2010-08-18 07:23:06.000000000 -0500
-+++ b/b/nss/coreconf/AIX.mk	2010-08-18 07:26:26.000000000 -0500
-@@ -62,35 +62,30 @@
+diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
+--- a/a/nss/cmd/platlibs.mk	2014-09-29 16:47:42.987012253 +0100
++++ b/b/nss/cmd/platlibs.mk	2014-09-29 16:50:33.910375955 +0100
+@@ -134,7 +134,7 @@
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH), AIX) 
+-EXTRA_SHARED_LIBS += -brtl 
++EXTRA_SHARED_LIBS += -Wl,-brtl 
+ endif
+ 
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+@@ -180,7 +180,7 @@
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH), AIX) 
+-EXTRA_SHARED_LIBS += -brtl 
++EXTRA_SHARED_LIBS += -Wl,-brtl 
+ endif
+ 
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+diff -ru a/nss/cmd/shlibsign/Makefile b/nss/cmd/shlibsign/Makefile
+--- a/a/nss/cmd/shlibsign/Makefile	2014-09-29 16:46:35.139393785 +0100
++++ b/b/nss/cmd/shlibsign/Makefile	2014-09-29 16:50:33.910375955 +0100
+@@ -43,6 +43,9 @@
+ 
+ endif
+ 
++ifeq ($(OS), AIX)
++EXTRA_SHARED_LIBS += -lpthreads
++endif
+ 
+ # sign any and all shared libraries that contain the word freebl
+ ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
+diff -ru a/nss/cmd/shlibsign/mangle/Makefile b/nss/cmd/shlibsign/mangle/Makefile
+--- a/a/nss/cmd/shlibsign/mangle/Makefile	2014-09-29 16:46:35.139393785 +0100
++++ b/b/nss/cmd/shlibsign/mangle/Makefile	2014-09-29 16:50:33.910375955 +0100
+@@ -43,7 +43,9 @@
+ 
+ endif
+ 
+-
++ifeq ($(OS), AIX)
++EXTRA_SHARED_LIBS += -lpthreads
++endif
+ 
+ #######################################################################
+ # (5) Execute "global" rules. (OPTIONAL)                              #
+diff -ru a/nss/coreconf/AIX.mk b/nss/coreconf/AIX.mk
+--- a/a/nss/coreconf/AIX.mk	2014-09-29 16:46:35.040392883 +0100
++++ b/b/nss/coreconf/AIX.mk	2014-09-29 16:50:33.909375948 +0100
+@@ -30,35 +30,30 @@
  
  DEFAULT_COMPILER = xlc_r
  
@@ -96,48 +138,3 @@
  ifeq ($(USE_64), 1)
  	OS_CFLAGS	+= -DAIX_64BIT
  	OBJECT_MODE=64
---- a/a/nss/cmd/platlibs.mk	2010-08-18 07:23:18.000000000 -0500
-+++ b/b/nss/cmd/platlibs.mk	2010-08-18 07:26:48.000000000 -0500
-@@ -136,7 +136,7 @@
- 	$(NULL)
- 
- ifeq ($(OS_ARCH), AIX) 
--EXTRA_SHARED_LIBS += -brtl 
-+EXTRA_SHARED_LIBS += -Wl,-brtl 
- endif
- 
- # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
-@@ -186,7 +186,7 @@
- 	$(NULL)
- 
- ifeq ($(OS_ARCH), AIX) 
--EXTRA_SHARED_LIBS += -brtl 
-+EXTRA_SHARED_LIBS += -Wl,-brtl 
- endif
- 
- # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
---- a/a/nss/cmd/shlibsign/mangle/Makefile	2010-08-18 07:23:20.000000000 -0500
-+++ b/b/nss/cmd/shlibsign/mangle/Makefile	2010-08-18 07:42:44.000000000 -0500
-@@ -75,7 +75,9 @@
- 
- endif
- 
--
-+ifeq ($(OS), AIX)
-+EXTRA_SHARED_LIBS += -lpthreads
-+endif
- 
- #######################################################################
- # (5) Execute "global" rules. (OPTIONAL)                              #
---- a/a/nss/cmd/shlibsign/Makefile	2010-08-18 08:00:17.000000000 -0500
-+++ b/b/nss/cmd/shlibsign/Makefile	2010-08-18 07:55:55.000000000 -0500
-@@ -45,6 +45,9 @@
- 
- endif
- 
-+ifeq ($(OS), AIX)
-+EXTRA_SHARED_LIBS += -lpthreads
-+endif
- 
- # sign any and all shared libraries that contain the word freebl
- ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)