- updated to 3.14

- updated Makefile patch

diff --git a/nss-Makefile.patch b/nss-Makefile.patch
index 7c1cc6b4c6cacb570f5698ad0f38352eea6bb900..6e798c45f223cf636e45f0ae70715d808e9c295c 100644 (file)
--- a/nss-Makefile.patch
+++ b/nss-Makefile.patch
@@ -24,29 +24,6 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
        SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
 --- 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'
 @@ -144,7 +128,7 @@
  else
  
@@ -97,12 +74,12 @@ diff -Nur nss-3.11.orig/mozilla/security/coreconf/ruleset.mk nss-3.11/mozilla/se
        $(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
        $(NULL)
  
---- 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 @@
- DEFINES += -DNSS_SURVIVE_DOUBLE_BYPASS_FAILURE
- endif
- 
+--- nss-3.14/mozilla/security/nss/lib/ssl/config.mk.orig       2012-10-22 19:40:03.822256886 +0200
++++ nss-3.14/mozilla/security/nss/lib/ssl/config.mk    2012-10-22 20:42:30.725432977 +0200
+@@ -14,7 +14,7 @@
+ ifdef NSS_NO_PKCS11_BYPASS
+ DEFINES += -DNO_PKCS11_BYPASS
+ else
 -CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
 +CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl3.$(LIB_SUFFIX)
  

diff --git a/nss.spec b/nss.spec
index bbb76ab4e63d2442c6e0701325ecbe63cf97d985..310b94e3198dec942661965cff2dec79f5749960 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -2,7 +2,7 @@
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.13.6
+Version:       3.14
 Release:       1
 Epoch:         1
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -13,7 +13,7 @@ Group:                Libraries
 # :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot mozilla/security/nss -r NSS_3_9_4_RTM
 #Source0:      %{name}-%{version}.tar.bz2
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: 15ea0e3b63cd0d18b5b75619afc46c3e
+# Source0-md5: 3918d5f9eb2996271cf62d52f084fd45
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der