- updated for 3.12.4

Changed files:
    nss-Makefile.patch -> 1.14

diff --git a/nss-Makefile.patch b/nss-Makefile.patch
index 1b73407a10fbaea95f26a56e8afb36572f91a53b..9bdec612d658baaab64779c6918a4cf3bd29c5c3 100644 (file)
--- a/nss-Makefile.patch
+++ b/nss-Makefile.patch
@@ -22,42 +22,41 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
      endif
      ifndef SHARED_LIBRARY
        SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
---- nss-3.12/mozilla/security/nss/cmd/platlibs.mk.orig 2008-02-25 22:32:33.000000000 +0100
-+++ nss-3.12/mozilla/security/nss/cmd/platlibs.mk      2008-06-18 23:02:57.118830492 +0200
-@@ -50,14 +50,6 @@
+--- nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk.orig       2009-08-28 22:37:12.708606747 +0200
++++ nss-3.12.4/mozilla/security/nss/cmd/platlibs.mk    2009-08-28 22:39:19.888606747 +0200
+@@ -50,22 +50,6 @@
  endif
  endif
  
 -ifeq ($(OS_ARCH), Linux)
+-ifeq ($(BUILD_SUN_PKG), 1)
+-ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
+-else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
+-endif
+-else
 -ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
 -else
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
 -endif
 -endif
+-endif
 -
  ifeq ($(OS_ARCH), HP-UX) 
  ifeq ($(OS_TEST), ia64)
  EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib'
-@@ -137,13 +129,13 @@
+@@ -144,7 +128,7 @@
  else
  
  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
--CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
-+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
- ifdef MOZILLA_SECURITY_BUILD
-       CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
- endif
- ifdef MOZILLA_BSAFE_BUILD
-       CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
--      CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
-+      CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
- endif
+-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
++CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  
  PKIXLIB = \
---- nss/mozilla/security/nss/cmd/platlibs.mk~  2009-05-10 22:23:08.330366552 +0200
-+++ nss/mozilla/security/nss/cmd/platlibs.mk   2009-05-10 22:26:38.034387811 +0200
-@@ -159,29 +159,29 @@
+       $(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
+@@ -161,29 +145,29 @@
        $(DIST)/lib/$(LIB_PREFIX)pkixcertsel.$(LIB_SUFFIX)
  
  EXTRA_LIBS += \
@@ -98,47 +97,36 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
        $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
        $(NULL)
  
-diff -Nur nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk nss-3.11/mozilla/security/nss/lib/softoken/config.mk
---- nss-3.11.orig/mozilla/security/nss/lib/softoken/config.mk  2005-10-19 02:03:31.000000000 +0100
-+++ nss-3.11/mozilla/security/nss/lib/softoken/config.mk       2006-01-26 15:13:55.000000000 +0000
+--- nss-3.12.4/mozilla/security/nss/lib/ssl/config.mk.orig     2009-06-11 02:55:52.000000000 +0200
++++ nss-3.12.4/mozilla/security/nss/lib/ssl/config.mk  2009-08-28 22:40:25.676607585 +0200
+@@ -83,7 +83,7 @@
+ else
+ 
+ # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
+-CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
++CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
+ 
+ EXTRA_LIBS += \
+       $(CRYPTOLIB) \
+--- nss-3.12.4/mozilla/security/nss/lib/softoken/legacydb/config.mk.orig       2009-06-11 02:55:49.000000000 +0200
++++ nss-3.12.4/mozilla/security/nss/lib/softoken/legacydb/config.mk    2009-08-28 22:40:40.392606747 +0200
 @@ -36,7 +36,7 @@
  # ***** END LICENSE BLOCK *****
  
  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
- CRYPTODIR=../freebl
- ifdef MOZILLA_SECURITY_BUILD
-       CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
-diff -Nur nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk nss-3.11/mozilla/security/nss/lib/ssl/config.mk
---- nss-3.11.orig/mozilla/security/nss/lib/ssl/config.mk       2005-10-19 02:04:16.000000000 +0100
-+++ nss-3.11/mozilla/security/nss/lib/ssl/config.mk    2006-01-26 15:13:55.000000000 +0000
-@@ -67,7 +67,7 @@
- endif # NS_USE_GCC
  
- # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
--CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
-+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
- CRYPTODIR=../freebl
- ifdef MOZILLA_SECURITY_BUILD
-       CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
-@@ -81,7 +81,7 @@
- else
+ EXTRA_LIBS += $(CRYPTOLIB) 
  
- # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
--CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
-+CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
- CRYPTODIR=../freebl
- ifdef MOZILLA_SECURITY_BUILD
-       CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
---- nss-3.12/mozilla/security/nss/lib/softoken/legacydb/config.mk.orig 2008-02-25 19:55:40.000000000 +0100
-+++ nss-3.12/mozilla/security/nss/lib/softoken/legacydb/config.mk      2008-06-18 22:36:58.538010357 +0200
+--- nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk.orig        2009-06-11 02:55:48.000000000 +0200
++++ nss-3.12.4/mozilla/security/nss/lib/softoken/config.mk     2009-08-28 22:39:36.436608423 +0200
 @@ -36,7 +36,7 @@
  # ***** END LICENSE BLOCK *****
  
  # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 -CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 +CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
- CRYPTODIR=../freebl
- ifdef MOZILLA_SECURITY_BUILD
-       CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
+ 
+ EXTRA_LIBS += \
+       $(CRYPTOLIB) \