Attachment 623802 Details for Bug 863285 – Changes to rebase to 3.14 - based on private branch work

[patch] Changes to rebase to 3.14 - based on private branch work

rebase-nss-util-to-3.14.patch (text/plain), 4.22 KB, created by Elio Maldonado Batiz on 2012-10-08 23:42:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-10-08 23:42:50 UTC

Size: 4.22 KB

patch

obsolete

>diff --git a/nss-nolocalsql.patch b/nss-nolocalsql.patch
>deleted file mode 100644
>index 3a8e7a8..0000000
>--- a/nss-nolocalsql.patch
>+++ /dev/null
>@@ -1,20 +0,0 @@
>-diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
>---- ./mozilla/security/nss/lib/Makefile.nolocalsql	2010-02-27 16:40:25.891777537 -0800
>-+++ ./mozilla/security/nss/lib/Makefile	2010-02-27 16:41:59.175902327 -0800
>-@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB
>- ZLIB_SRCDIR = zlib  # Add the zlib directory to DIRS.
>- endif
>- 
>--ifndef MOZILLA_CLIENT
>--ifndef NSS_USE_SYSTEM_SQLITE
>--SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
>--endif
>--endif
>-+#ifndef MOZILLA_CLIENT
>-+#ifndef NSS_USE_SYSTEM_SQLITE
>-+#SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
>-+#endif
>-+#endif
>- 
>- ifndef MOZILLA_CLIENT
>- ifeq ($(OS_ARCH),Linux)
>diff --git a/nss-util.spec b/nss-util.spec
>index 5b78f5f..db97d5f 100644
>--- a/nss-util.spec
>+++ b/nss-util.spec
>@@ -1,9 +1,9 @@
>-%global nspr_version 4.9.1
>+%global nspr_version 4.9.3
> 
> Summary:          Network Security Services Utilities Library
> Name:             nss-util
>-Version:          3.13.5
>-Release:          2%{?dist}
>+Version:          3.14
>+Release:          0.1%{?dist}.beta1.1
> License:          MPLv1.1 or GPLv2+ or LGPLv2+
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -33,6 +33,10 @@ Source3:          nss-util-config.in
> 
> Patch1:           add-relro-linker-option.patch
> 
>+# This patch has been applied upstream
>+# TODO: Remove it when we update to NSS_3_14_RTM
>+Patch2:           utilmod_no_softoken_headers.patch
>+
> %description
> Utilities for Network Security Services and the Softoken module
> 
>@@ -54,6 +58,8 @@ Header and library files for doing development with Network Security Services.
> %setup -q
> 
> %patch1 -p0 -b .relro
>+# TODO: remove when we update to NSS_3_14_RTM
>+%patch2 -p0 -b .nosoftokenheaders
> 
> 
> %build
>@@ -141,6 +147,14 @@ do
>   %{__install} -p -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
> done
> 
>+# Prevent nss-util-devel from conflicting with nss-softoken-devel due to hasht.h.
>+# Preserve the hasht.h installed by the curent FIPS validated nss-softokn-devel.
>+# Using a loop in case we need to do it for others.
>+for file in mozilla/dist/public/nss/hasht.h
>+do
>+  %{__rm} mozilla/dist/public/nss/hasht.h
>+done
>+
> # Copy the include files we want
> # The util headers, the rest come from softokn and nss
> for file in mozilla/dist/public/nss/*.h
>@@ -175,6 +189,8 @@ done
> # mozilla/security/nss/lib/util/manifest.mk
> %{_includedir}/nss3/base64.h
> %{_includedir}/nss3/ciferfam.h
>+# preserve the hasht.h from nss-softokn-devel
>+#%{_includedir}/nss3/hasht.h
> %{_includedir}/nss3/nssb64.h
> %{_includedir}/nss3/nssb64t.h
> %{_includedir}/nss3/nsslocks.h
>@@ -202,9 +218,19 @@ done
> %{_includedir}/nss3/secoid.h
> %{_includedir}/nss3/secoidt.h
> %{_includedir}/nss3/secport.h
>+%{_includedir}/nss3/utilmodt.h
>+%{_includedir}/nss3/utilpars.h
>+%{_includedir}/nss3/utilparst.h
> %{_includedir}/nss3/utilrename.h
> 
> %changelog
>+* Sun Oct 07 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-0.1.beta1.1
>+- Update to NSS_3_14_BETA1
>+- Add temporary patch so utilmod doesn't include any headers from softoken
>+- Keep the hasht.h from current nss-softokn-devel
>+- Built for the private-rebase-to-3.14-rhel-6.4 branch only
>+- until NSS_3_14_RTM is available and we can rebase to it
>+
> * Thu Jun 21 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-2
> - Resolves: rhbz#833480 - revert unwanted change to nss-util.pc.in
> 
>diff --git a/sources b/sources
>index 60cc853..b9aa721 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-b4241737996ac0f4c95d31f294f878cf  nss-util-3.13.5.tar.bz2
>+3f84da5b0e414824fd364b08d662168e  nss-util-3.14.tar.bz2
>diff --git a/utilmod_no_softoken_headers.patch b/utilmod_no_softoken_headers.patch
>new file mode 100644
>index 0000000..4afb24b
>--- /dev/null
>+++ b/utilmod_no_softoken_headers.patch
>@@ -0,0 +1,10 @@
>+Index: ./mozilla/security/nss/lib/util/utilmod.c
>+===================================================================
>+RCS file: /cvsroot/mozilla/security/nss/lib/util/utilmod.c,v
>+retrieving revision 1.4
>+diff -r1.4 utilmod.c
>+21c21,22
>+< #include "lgglue.h"
>+---
>+> #include "pkcs11t.h"
>+> #include "secitem.h"

Flags:

rrelyea: review+

Actions: View | Diff

Attachments on bug 863285: 623802