Skip to content

Commit

Permalink
Update to 3.16.4:
Browse files Browse the repository at this point in the history
Fixes CVE-2014-1544, CVE-2014-1491,  CVE-2014-1490, CVE-2013-5605,
CVE-2013-1739, CVE-2013-1741, CVE-2013-0791.

Updated nss-pem to nss-pem-20140125.

Removed bug-658222-false-start.patch, nss-3.12.8-char.patch and
0001-sync-up-with-upstream-softokn-changes.patch

Removed mozilla-crypto-strip.sh as EC is enabled in openssl-1.0.1i.

Updated the license in spec to MPLv2.

Signed-off-by: Pasi Sjöholm <pasi.sjoholm@jollamobile.com>
  • Loading branch information
Pasi Sjöholm committed Aug 19, 2014
1 parent 13d5174 commit 7c41e9c
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 1,139 deletions.
406 changes: 0 additions & 406 deletions 0001-sync-up-with-upstream-softokn-changes.patch

This file was deleted.

572 changes: 0 additions & 572 deletions bug-658222-false-start.patch

This file was deleted.

129 changes: 0 additions & 129 deletions mozilla-crypto-strip.sh

This file was deleted.

11 changes: 0 additions & 11 deletions nss-3.12.8-char.patch

This file was deleted.

Binary file removed nss-3.15.1-stripped.tar.bz2
Binary file not shown.
Binary file added nss-3.16.4.tar.gz
Binary file not shown.
Binary file removed nss-pem-20120811.tar.bz2
Binary file not shown.
Binary file added nss-pem-20140125.tar.bz2
Binary file not shown.
10 changes: 10 additions & 0 deletions nss.changes
@@ -1,3 +1,13 @@
* Tue Aug 19 2014 Pasi Sjöholm <pasi.sjoholm@jollamobile.com> - 3.16.4
- Update to 3.16.4
- Fixes CVE-2014-1544, CVE-2014-1491, CVE-2014-1490, CVE-2013-5605,
CVE-2013-1739, CVE-2013-1741, CVE-2013-0791.
- Updated nss-pem to nss-pem-20140125.
- Removed bug-658222-false-start.patch, nss-3.12.8-char.patch and
0001-sync-up-with-upstream-softokn-changes.patch.
- Removed mozilla-crypto-strip.sh as EC is enabled in openssl-1.0.1i.
- Updated the license in spec to MPLv2.

* Tue Jul 23 2013 Dmitry Rozhkov <dmitry.rozhkov@jollamobile.com> - 3.15.1
- Update to 3.15.1
- Dropped add_SEC_PKCS7VerifyDetachedSignatureAtTime_842856.patch as it's
Expand Down
25 changes: 4 additions & 21 deletions nss.spec
Expand Up @@ -3,9 +3,9 @@

Summary: Network Security Services
Name: nss
Version: 3.15.1
Version: 3.16.4
Release: 1
License: MPLv1.1 or GPLv2+ or LGPLv2+
License: MPLv2
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System/Libraries
Requires: nspr >= %{nspr_version}
Expand All @@ -17,18 +17,7 @@ BuildRequires: zlib-devel
BuildRequires: pkgconfig
BuildRequires: gawk

Source0: %{name}-%{version}-stripped.tar.bz2
# The stripped tar ball is a subset of the upstream sources with
# patent-encumbered cryptographic algorithms removed.
# Use this script to remove them and create the stripped archive.
# 1. Download the sources nss-{version}.tar.gz found within
# http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/
# in a subdirectory named NSS_${major}_${minor}_${maint}_RTM/src
# 2. In the download directory execute
# ./mozilla-crypto-strip.sh ${name}-${version}.tar.gz
# to produce ${name}-${version}-stripped.tar.bz2
# for uploading to the lookaside cache.
Source100: mozilla-crypto-strip.sh
Source0: %{name}-%{version}.tar.gz

Source1: nss.pc.in
Source2: nss-config.in
Expand All @@ -40,16 +29,13 @@ Source7: blank-key4.db
Source8: system-pkcs11.txt
Source9: setup-nsssysinit.sh
Source11: nss-prelink.conf
Source12: %{name}-pem-20120811.tar.bz2
Source12: %{name}-pem-20140125.tar.bz2

Patch1: nss-no-rpath.patch
Patch2: nss-nolocalsql.patch
Patch3: nss-3.12.8-char.patch
Patch6: nss-enable-pem.patch
Patch8: nss-sysinit-userdb-first.patch
Patch9: nss-3.13.3-notimestamps.patch
Patch10: 0001-sync-up-with-upstream-softokn-changes.patch
Patch11: bug-658222-false-start.patch

%description
Network Security Services (NSS) is a set of libraries designed to
Expand Down Expand Up @@ -131,12 +117,9 @@ low level services.

%patch1 -p0
%patch2 -p0
%patch3 -p1
%patch6 -p0 -b .libpem
%patch8 -p0 -b .rh603313
%patch9 -p1 -b .timestamping
%patch10 -p1 -b .softokn
%patch11 -p1

%build

Expand Down

0 comments on commit 7c41e9c

Please sign in to comment.