Attachment 908713 Details for Bug 1002205 – spec file changes in patch format

[patch] spec file changes in patch format

specfile.patch (text/plain), 3.49 KB, created by Elio Maldonado Batiz on 2014-06-13 22:40:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-06-13 22:40:22 UTC

Size: 3.49 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index bda660d..392b08d 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -16,7 +16,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.16.1
>-Release:          5%{?dist}
>+Release:          6%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -50,7 +50,7 @@ Source7:          blank-key4.db
> Source8:          system-pkcs11.txt
> Source9:          setup-nsssysinit.sh
> Source10:         PayPalEE.cert
>-Source12:         %{name}-pem-20130405.tar.bz2
>+Source12:         %{name}-pem-20140125.tar.bz2
> Source17:         TestCA.ca.cert
> Source18:         TestUser50.cert
> Source19:         TestUser51.cert
>@@ -68,8 +68,6 @@ Patch29:          nss-ssl-cbc-random-iv-off-by-default.patch
> # TODO: Remove this patch when the ocsp test are fixed
> 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
> # 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
>@@ -84,21 +82,12 @@ Patch49:          nss-skip-bltest-and-fipstest.patch
> # headers are older. Such is the case when starting an update with API changes or even private export changes.
> # Once the buildroot aha been bootstrapped the patch may be removed but it doesn't hurt to keep it.
> Patch50:          iquote.patch
>-#
>-# Upstream: https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=d0a744d6
>-# Upstream: https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=6822e94e
>-# Upstream: https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=570c5a03
>-#
>-# Concatenation of the above three patches
>-Patch51: Bug-702083-dont-require-unique-file-basenames.patch
> # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=921684
> Patch60: Bug-961659-dont-hold-issuer-cert-handles-in-crl-cache.patch
> # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=943144
> Patch62: nss-fix-deadlock-squash.patch
> # Disable hw gcm on RHEL5-based build environments where older OS lacks support
> Patch63: disable_hw_gcm.patch
>-Patch59: 0001-RHBZ-895339.patch
>-Patch64: 0001-pinst-make-derEncodingsMatch-work-with-encrypted-key.patch
> 
> # Local patch to deal with current older version of softoken/freebl
> Patch69: define-uint32.patch
>@@ -192,19 +181,13 @@ low level services.
> %patch29 -p0 -b .cbcrandomivoff
> %patch40 -p0 -b .noocsptest
> %patch41 -p0 -b .md5okay
>-%patch44 -p0 -b .syncupwithupstream
>-# activate when approved
>-%patch45 -p0 -b .notrash
> %patch47 -p0 -b .templates
> %patch48 -p0 -b .crypto
> %patch49 -p0 -b .skipthem
> %patch50 -p0 -b .iquote
>-%patch51 -p1 -b .702083
> %patch60 -p0 -b .961659
> %patch62 -p1 -b .deadlock
> #%patch63 -p0 -b .hw_comp
>-%patch59 -p3 -b .895339
>-%patch64 -p1 -b .895339
> %patch69 -p0 -b .uint32
> %patch70 -p0 -b .cleanup
> 
>@@ -731,6 +714,10 @@ fi
> 
> 
> %changelog
>+* Fri Jun 13 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-6
>+- Update pem sources to the same ones used on rhel-7
>+- Remove no longer needed patches on account of this update
>+
> * Tue Jun 10 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-5
> - Move removal of directories to the end of the %%prep section
> - Resolves: Bug 689919 - build without any softoken or util sources in the tree

Flags:

rrelyea: review+

Actions: View | Diff

Attachments on bug 1002205: 908712 | 908713