kengert pushed to nss-softokn (f21). "Update to NSS 3.19"

[notifications at fedoraproject.org]

From b09da94b750786b97a5c2d38204327f1c431193a Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie at redhat.com>
Date: Tue, 19 May 2015 21:04:34 +0200
Subject: Update to NSS 3.19


diff --git a/.gitignore b/.gitignore
index cfb2084..8c763bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.18.0.tar.gz
+/nss-softokn-3.19.0.tar.gz
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 30d63cb..8059bed 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
 %global nspr_version 4.10.8
 %global nss_name nss
-%global nss_util_version 3.18.0
+%global nss_util_version 3.19.0
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -24,8 +24,10 @@
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
-Version:          3.18.0
-Release:          1%{?dist}
+Version:          3.19.0
+# for Rawhide, please always use release >= 2
+# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
+Release:          1.0%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -121,7 +123,7 @@ Header and library files for doing development with Network Security Services.
 %setup -q
 
 %patch1 -p0 -b .softokenonly
-%patch8 -p0 -b .crypto
+%patch8 -p0 -b .minimal-deps
 # activate if needed when doing a major update with new apis
 %patch10 -p0 -b .iquote
 %patch97 -p0 -b .add_encrypt_derive
@@ -397,6 +399,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue May 19 2015 Kai Engert <kaie at redhat.com> - 3.19.0-1.0
+- Update to NSS 3.19
+
 * Thu Mar 19 2015 Elio Maldonado <emaldona at redhat.com> - 3.18.0-1
 - Update to nss-3.18.0
 
diff --git a/softoken-minimal-test-dependencies.patch b/softoken-minimal-test-dependencies.patch
index 7de4a5c..059d422 100644
--- a/softoken-minimal-test-dependencies.patch
+++ b/softoken-minimal-test-dependencies.patch
@@ -1,6 +1,6 @@
-diff -up nss/cmd/manifest.mn.crypto nss/cmd/manifest.mn
---- nss/cmd/manifest.mn.crypto	2013-05-28 14:43:24.000000000 -0700
-+++ nss/cmd/manifest.mn	2013-05-29 20:04:30.060145083 -0700
+diff -up nss/cmd/manifest.mn.minimal-deps nss/cmd/manifest.mn
+--- nss/cmd/manifest.mn.minimal-deps	2015-04-30 22:00:23.000000000 +0200
++++ nss/cmd/manifest.mn	2015-05-19 20:20:09.105423573 +0200
 @@ -9,54 +9,10 @@ DEPTH	= ..
  REQUIRES = nss nspr libdbm
  
@@ -56,9 +56,9 @@ diff -up nss/cmd/manifest.mn.crypto nss/cmd/manifest.mn
   $(NULL)
  
  TEMPORARILY_DONT_BUILD = \
-diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
---- nss/cmd/platlibs.mk.crypto	2013-05-28 14:43:24.000000000 -0700
-+++ nss/cmd/platlibs.mk	2013-05-29 20:04:30.061145091 -0700
+diff -up nss/cmd/platlibs.mk.minimal-deps nss/cmd/platlibs.mk
+--- nss/cmd/platlibs.mk.minimal-deps	2015-04-30 22:00:23.000000000 +0200
++++ nss/cmd/platlibs.mk	2015-05-19 20:21:49.438299883 +0200
 @@ -51,42 +51,13 @@ EXTRA_SHARED_LIBS += \
  	$(NULL)
  endif
@@ -99,8 +99,8 @@ diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
 -	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 -	$(PKIXLIB) \
 -	$(DBMLIB) \
- 	$(DIST)/lib/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \
- 	$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
+ 	$(SQLITE_LIB_DIR)/$(LIB_PREFIX)$(SQLITE_LIB_NAME).$(LIB_SUFFIX) \
+ 	$(NSSUTIL_LIB_DIR)/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 @@ -102,30 +73,9 @@ EXTRA_LIBS += \
  else
@@ -133,17 +133,17 @@ diff -up nss/cmd/platlibs.mk.crypto nss/cmd/platlibs.mk
  	$(NULL)
  
  ifeq ($(OS_ARCH), AIX) 
-@@ -158,9 +108,6 @@ ifeq ($(OS_ARCH), WINNT)
+@@ -154,9 +104,6 @@ ifeq ($(OS_ARCH), WINNT)
  EXTRA_LIBS += \
  	$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
- 	$(DIST)/lib/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \
+ 	$(NSSUTIL_LIB_DIR)/$(IMPORT_LIB_PREFIX)nssutil3$(IMPORT_LIB_SUFFIX) \
 -	$(DIST)/lib/$(IMPORT_LIB_PREFIX)smime3$(IMPORT_LIB_SUFFIX) \
 -	$(DIST)/lib/$(IMPORT_LIB_PREFIX)ssl3$(IMPORT_LIB_SUFFIX) \
 -	$(DIST)/lib/$(IMPORT_LIB_PREFIX)nss3$(IMPORT_LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
  	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
-@@ -186,9 +133,6 @@ endif
+@@ -182,9 +129,6 @@ endif
  # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
  EXTRA_SHARED_LIBS += \
  	-L$(DIST)/lib \
diff --git a/sources b/sources
index 47fedd2..4e4296d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ba94f48898a206c96023bc773435bce  nss-softokn-3.18.0.tar.gz
+2cd63a41e2922e2677219d12e9dbaa44  nss-softokn-3.19.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nss-softokn.git/commit/?h=f21&id=b09da94b750786b97a5c2d38204327f1c431193a