7 files changed, 43 insertions, 33 deletions
diff --git a/security/nss/files/extra-bug835050 b/security/nss/files/extra-bug835050
new file mode 100644
index 000000000000..a9ccd0a0c0d1
--- /dev/null
+++ b/security/nss/files/extra-bug835050
@@ -0,0 +1,10 @@
+--- lib/freebl/Makefile~
++++ lib/freebl/Makefile
+@@ -659,7 +659,5 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(
+ # symbolic names to registers, for example,
+ #     .set  Htbl, %rdi
+ # So we can't use Clang's integrated assembler with intel-gcm.s.
+-ifneq (,$(findstring clang,$(AS)))
+ $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as
+ endif
+-endif
diff --git a/security/nss/files/nss-config.in b/security/nss/files/nss-config.in
index 4e7f19737940..eba0fa7f528c 100644
--- a/security/nss/files/nss-config.in
+++ b/security/nss/files/nss-config.in
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-prefix=@prefix@
-
-major_version=@MAJOR@
-minor_version=@MINOR@
-patch_version=@PATCH@
+prefix=%%PREFIX%%
 
 usage()
 {
@@ -68,7 +64,7 @@ while test $# -gt 0; do
       echo_libdir=yes
       ;;
     --version)
-      echo ${major_version}.${minor_version}.${patch_version}
+      echo %%PORTVERSION%%
       ;;
     --cflags)
       echo_cflags=yes
@@ -97,13 +93,13 @@ done
 
 # Set variables that may be dependent upon other variables
 if test -z "$exec_prefix"; then
-    exec_prefix=@exec_prefix@
+    exec_prefix=$prefix
 fi
 if test -z "$includedir"; then
-    includedir=@includedir@
+    includedir=$prefix/include/nss
 fi
 if test -z "$libdir"; then
-    libdir=@libdir@
+    libdir=$prefix/lib/nss
 fi
 
 if test "$echo_prefix" = "yes"; then
@@ -129,16 +125,16 @@ fi
 if test "$echo_libs" = "yes"; then
       libdirs="-L$libdir"
       if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
+	libdirs="$libdirs -lssl%%MAJOR_VERSION%%"
       fi
       if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
+	libdirs="$libdirs -lsmime%%MAJOR_VERSION%%"
       fi
       if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
+	libdirs="$libdirs -lnss%%MAJOR_VERSION%%"
       fi
       if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
+	libdirs="$libdirs -lnssutil%%MAJOR_VERSION%%"
       fi
       echo $libdirs
 fi      
diff --git a/security/nss/files/nss.pc.in b/security/nss/files/nss.pc.in
index 3aca32ee3208..12df4b7d05fd 100644
--- a/security/nss/files/nss.pc.in
+++ b/security/nss/files/nss.pc.in
@@ -1,11 +1,11 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@PREFIX@/lib/nss
-includedir=@PREFIX@/include
+prefix=%%PREFIX%%
+exec_prefix=%%PREFIX%%
+libdir=%%PREFIX%%/lib/nss
+includedir=%%PREFIX%%/include
 
 Name: NSS
 Description: Mozilla Network Security Services
-Version: @PORTVERSION@
+Version: %%PORTVERSION%%
 Requires: nspr
 Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lnssutil3
 Cflags: -I${includedir}/nss -I${includedir}/nss/nss
diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk
index 2b8c57181be8..c215c366f0af 100644
--- a/security/nss/files/patch-..::coreconf::FreeBSD.mk
+++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk
@@ -27,7 +27,7 @@
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
  
-@@ -65,20 +80,18 @@
+@@ -65,20 +80,20 @@
  USE_PTHREADS		= 1
  DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
  OS_LIBS			+= -pthread
@@ -38,7 +38,9 @@
  ARCH			= freebsd
  
 -MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
++ifndef MOZILLA_CLIENT
 +DLL_SUFFIX		= so.1
++endif
  
 -ifeq ($(MOZ_OBJFORMAT),elf)
 -DLL_SUFFIX		= so
diff --git a/security/nss/files/patch-..::coreconf::rules.mk b/security/nss/files/patch-..::coreconf::rules.mk
index 707f69da83ea..7b2adc31a707 100644
--- a/security/nss/files/patch-..::coreconf::rules.mk
+++ b/security/nss/files/patch-..::coreconf::rules.mk
@@ -1,10 +1,12 @@
 --- ../coreconf/rules.mk.orig	Sat Jan  6 00:48:54 2007
 +++ ../coreconf/rules.mk	Fri Mar 23 10:15:46 2007
-@@ -114,6 +114,7 @@
+@@ -114,6 +114,9 @@
  endif
  ifdef SHARED_LIBRARY
  	$(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR)
++ifndef MOZILLA_CLIENT
 +	ln -sf $(notdir $(SHARED_LIBRARY)) $(SOURCE_LIB_DIR)/$(notdir $(SHARED_LIBRARY:.so.1=.so))
++endif
  ifdef MOZ_DEBUG_SYMBOLS
  ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
  	$(INSTALL) -m 644 $(SHARED_LIBRARY:$(DLL_SUFFIX)=pdb) $(SOURCE_LIB_DIR)
diff --git a/security/nss/files/patch-lib_softoken_manifest.mn b/security/nss/files/patch-lib_softoken_manifest.mn
deleted file mode 100644
index 402e89a80507..000000000000
--- a/security/nss/files/patch-lib_softoken_manifest.mn
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/softoken/manifest.mn.orig	2010-07-30 04:33:26.000000000 +0200
-+++ lib/softoken/manifest.mn	2010-10-17 12:01:04.000000000 +0200
-@@ -47,9 +47,7 @@
- 
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
- 
--ifdef SQLITE_INCLUDE_DIR
--INCLUDES += -I$(SQLITE_INCLUDE_DIR)
--endif
-+INCLUDES += -I$(LOCALBASE)/include
- 
- EXPORTS = \
- 	secmodt.h \
diff --git a/security/nss/files/patch-pr175656 b/security/nss/files/patch-pr175656
new file mode 100644
index 000000000000..1f1bd51b838e
--- /dev/null
+++ b/security/nss/files/patch-pr175656
@@ -0,0 +1,13 @@
+--- lib/softoken/sdb.c~
++++ lib/softoken/sdb.c
+@@ -38,6 +38,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef SQLITE_FCNTL_TEMPFILENAME
++#define SQLITE_FCNTL_TEMPFILENAME 16
++#endif
++
+ #ifdef SQLITE_UNSAFE_THREADS
+ #include "prlock.h"
+ /*