- up to 3.17.1 (fixes CVE-2014-1568)

- drop hasht-dont-include-prtypes patch which causes build failure due
  to missing PRBool type (patch glibc instead to include all required
  include dirs)

diff --git a/hasht-dont-include-prtypes.patch b/hasht-dont-include-prtypes.patch
deleted file mode 100644 (file)
index 46efefb..0000000
--- a/hasht-dont-include-prtypes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ./nss/lib/util/hasht.h.prtypes ./nss/lib/util/hasht.h
---- ./nss/lib/util/hasht.h.prtypes     2013-04-19 09:56:51.656957336 -0700
-+++ ./nss/lib/util/hasht.h     2013-04-19 09:57:19.841115823 -0700
-@@ -6,7 +6,6 @@
- #ifndef _HASHT_H_
- #define _HASHT_H_
- 
--#include "prtypes.h"
- 
- /* Opaque objects */
- typedef struct SECHashObjectStr SECHashObject;

diff --git a/nss.spec b/nss.spec
index c52707334619459ae975866ef148e029730d2843..a5c74395de78cfd9e113004bc0fdd407f97a02a3 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -3,19 +3,18 @@
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.17
+Version:       3.17.1
 Release:       1
 Epoch:         1
 License:       MPL v2.0
 Group:         Libraries
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: 081dd99afa12af589c09e2d7cb5f5c6d
+# Source0-md5: 4bac61d6db9312e20e70b812a17c74ea
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
 Source3:       http://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Patch0:                %{name}-Makefile.patch
-Patch1:                hasht-dont-include-prtypes.patch
 URL:           http://www.mozilla.org/projects/security/pki/nss/
 BuildRequires: nspr-devel >= %{nspr_ver}
 BuildRequires: nss-tools
@@ -97,7 +96,6 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %if 0%{!?debug:1}
 # strip before signing