Attachment 898716 Details for Bug 1099619 – spec file changes for rebase to 3.16.1

[patch] spec file changes for rebase to 3.16.1

specfile_changes.patch (text/plain), 3.74 KB, created by Elio Maldonado Batiz on 2014-05-23 15:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-05-23 15:50:03 UTC

Size: 3.74 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index d1ac9bc..55c33bd 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -1,5 +1,5 @@
>-%global nspr_version 4.10.2
>-%global nss_util_version 3.15.3
>+%global nspr_version 4.10.5
>+%global nss_util_version 3.16.1
> %global nss_softokn_fips_version 3.14.3
> %global nss_softokn_version 3.14.3
> %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
>@@ -15,8 +15,8 @@
> 
> Summary:          Network Security Services
> Name:             nss
>-Version:          3.15.3
>-Release:          12%{?dist}
>+Version:          3.16.1
>+Release:          1%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -71,9 +71,6 @@ Patch40:          nss-3.14.0.0-disble-ocsp-test.patch
> Patch41:          p-disable-md5-590364-reversed.patch
> Patch44:          0001-sync-up-with-upstream-softokn-changes.patch
> Patch45:          Bug-896651-pem-dont-trash-keys-on-failed-login.patch
>-# The ocsp stapling tests currently require access to the
>-# kuix.de test server but koji forbids outbount connections
>-Patch46:          disable-ocsp-stapling-tests.patch
> # Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
> # will be needed when we try to build nss as requested on rhbz#689919
> Patch47:          utilwrap-include-templates.patch
>@@ -107,13 +104,6 @@ Patch58: revoking-trust-in-one-anssi-certificate.patch
> Patch59: 0001-RHBZ-895339.patch
> Patch64: 0001-pinst-make-derEncodingsMatch-work-with-encrypted-key.patch
> 
>-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=932001
>-# Remove this patch whwn we update to nss-3.15.4 or higher
>-Patch65: add-missing-option-descriptions.patch
>-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=977869
>-Patch66: nss-ecc-list-3.15.3.patch
>-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=977673
>-Patch68: dont-disable-internal-module.patch
> # Local patch to deal with current older version of softoken/freebl
> Patch69: define-uint32.patch
> # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1007126
>@@ -206,27 +196,20 @@ low level services.
> %patch29 -p0 -b .cbcrandomivoff
> %patch40 -p0 -b .noocsptest
> %patch41 -p0 -b .md5okay
>-%patch44 -p1 -b .syncupwithupstream
>+%patch44 -p0 -b .syncupwithupstream
> # activate when approved
> #%patch45 -p0 -b .notrash
>-%patch46 -p0 -b .skipoutbound
> %patch47 -p0 -b .templates
> %patch48 -p0 -b .crypto
> %patch49 -p0 -b .skipthem
> %patch50 -p0 -b .iquote
> %patch51 -p1 -b .702083
> %patch60 -p0 -b .961659
>-%patch61 -p1 -b .990631
>+#%patch61 -p1 -b .990631
> %patch62 -p1 -b .deadlock
>-%patch63 -p0 -b .hw_comp
>-pushd nss
>-%patch58 -p1 -b .1042686
>-popd
>+#%patch63 -p0 -b .hw_comp
> %patch59 -p3 -b .895339
> %patch64 -p1 -b .895339
>-%patch65 -p1 -b .606022
>-%patch66 -p0 -b .ecc-lists
>-%patch68 -p0 -b .1059176
> %patch69 -p0 -b .uint32
> %patch70 -p0 -b .cleanup
> 
>@@ -345,8 +328,6 @@ unset NSS_BLTEST_NOT_AVAILABLE
> # build the man pages clean
> pushd ./nss
> %{__make} clean_docs build_docs
>-# workaround until bug 1096478 is resolved
>-patch -b ./doc/nroff/certutil.1 $RPM_SOURCE_DIR/indentation.patch
> popd
> 
> # and copy them to the dist directory for %%install to find them
>@@ -754,10 +735,9 @@ fi
> 
> 
> %changelog
>-* Wed May 21 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.3-12
>-- Apply man pages fixes requested on Bug 606022
>-- Using temporary workaround until bug 1096478 is approved and fixed
>-- Resolves: Bug 606022 - nss security tools lack man pages
>+* Thu May 22 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-1
>+- Update to nss-3.16.1
>+- Resolves: Bug 1099619 - Rebase nss in RHEL 6.6 to NSS 3.16.1
> 
> * Mon Apr 21 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.3-11
> - Resolves: Bug 689919 - build without any softoken or util sources in the tree

Flags:

rrelyea: review+

Actions: View | Diff

Attachments on bug 1099619: 898508 | 898509 | 898716 | 903189 | 913569 | 928882 | 928886 | 928887