Attachment 643203 Details for Bug 689918 – Changes to the spec file in patch form

[patch] Changes to the spec file in patch form

nss.spec.changes.txt (text/plain), 9.09 KB, created by Elio Maldonado Batiz on 2012-11-12 04:30:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2012-11-12 04:30:50 UTC

Size: 9.09 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index 3d02f85..93105b3 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -7,7 +7,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.14
>-Release:          9%{?dist}
>+Release:          9.1%{?dist}.nosoftoken.5
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -41,6 +41,7 @@ Source0:          %{name}-%{version}-stripped.tar.bz2
> # to produce ${name}-${version}-stripped.tar.bz2
> # for uploading to the lookaside cache.
> Source100:        mozilla-crypto-strip.sh
>+Source101:        copy-softoken-libs.sh
> 
> Source1:          nss.pc.in
> Source2:          nss-config.in
>@@ -72,6 +73,11 @@ Patch40:          nss-3.14.0.0-disble-ocsp-test.patch
> # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=357025
> Patch41:          Bug-872124-fix-pk11wrap-locking.patch
> 
>+# TODO: Submit upstream bug and add its URL here
>+Patch46:          seckey-dont-include-ec.h.patch
>+# TODO: Submit upstream bug and add its URL here
>+Patch47:          Bug-689918-build-without-softoken.patch
>+
> %description
> Network Security Services (NSS) is a set of libraries designed to
> support cross-platform development of security-enabled client and
>@@ -155,6 +161,58 @@ low level services.
> %patch39 -p1 -b .nobypass
> %patch40 -p1 -b .noocsptest
> %patch41 -p0 -b .872124
>+%patch46 -p0 -b .dontinclude
>+%patch47 -p0 -b .689918
>+
>+#########################################################
>+# Higher-level libraries and test tools need access to
>+# module-private headers from util, freebl, and softoken
>+#########################################################
>+# --- libraries ---
>+#  1. lib/pk11wrap/sysinit use the pkcs11 parser "header"
>+#    i)  Parser moved to utils on 3.14 but may not work
>+#    ii) Made ec.h public but the other headers are more problematic
>+#  2. lib/pk11wrap/dev3hack.c includes pk11init.h
>+#  3. lib/pk11wrap/pk11akey.c uses pk11init.h
>+#  4. lib/pk11wrap/pk11util.c uses pk11init.h
>+#  5. lib/cryptohi/seckey.c uses ec.h
>+#  6. lib/ckfw/pem/anchor.c uses softoken.h
>+#  7. lib/ckfw/pem/ckpem.h uses lowkeyti.h via softoknt.h:
>+#  8. lib/nssysinit.c includes pk11pars.h and so needs pk11init.h
>+#  9. lib/base/arena.c indirectly includes nssilock.h from util
>+#     and nssilock.h in turn includes utilrename.h and nssilckt.h
>+# 10. lib/nss/utilwrap.c includes templates.c from util
>+#  --- tools ---
>+# 11. cmd/pk11util/pk11util.c uses pk11init.h
>+#
>+################################################################
>+# Until these are fixed upstream we must copy headers locally
>+# libraries:
>+# Attach Patch49 to an upstream bug asking that seckey.c not include ec.h
>+# nssysinit.c needs pkcs11ni.h
>+%{__cp} ./mozilla/security/nss/lib/softoken/pkcs11ni.h ./mozilla/security/nss/lib/pk11wrap/
>+# This is understandable
>+%{__cp} ./mozilla/security/nss/lib/util/templates.c ./mozilla/security/nss/lib/nss
>+# FIXME: Find a way for pem to stop using freebl directly as part of the
>+# submission to get pem accepted into nss proper
>+# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=402712
>+pemNeeds="softoken lowkeyti softoknt"
>+for file in ${pemNeeds}; do
>+    %{__cp} ./mozilla/security/nss/lib/softoken/${file}.h ./mozilla/security/nss/lib/ckfw/pem/
>+done
>+# The rsaperf unit test for freebl needs them. Splitting rsaperf into high and low tests
>+# is difficult because even the low level part relies on PK11_ wrapper calls.
>+%{__cp} ./mozilla/security/nss/lib/softoken/lowkeyi.h ./mozilla/security/nss/cmd/rsaperf
>+%{__cp} ./mozilla/security/nss/lib/softoken/lowkeyti.h ./mozilla/security/nss/cmd/rsaperf
>+
>+# Script to copy the system nss-softkn system libraries and their .chk files to the build tree
>+%{__cp} %{SOURCE101} ./mozilla/security/nss
>+
>+######## Remove freebl, softoken and util from the source tree
>+%{__rm} -rf ./mozilla/security/nss/lib/freebl
>+%{__rm} -rf ./mozilla/security/nss/lib/softoken
>+%{__rm} -rf ./mozilla/security/nss/lib/util
>+
> 
> %build
> 
>@@ -188,10 +246,22 @@ NSPR_LIB_DIR=%{_libdir}
> export NSPR_INCLUDE_DIR
> export NSPR_LIB_DIR
> 
>+export NSSUTIL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
>+export NSSUTIL_LIB_DIR=%{_libdir}
>+
> export FREEBL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-softokn | sed 's/-I//'`
> export FREEBL_LIB_DIR=%{_libdir}
> export USE_SYSTEM_FREEBL=1
> 
>+export FREEBL_LIBS=`/usr/bin/pkg-config --libs nss-softokn`
>+
>+# This one so that ssl links statically
>+export SOFTOKEN_LIB_DIR=%{_libdir}
>+# use the system ones
>+export USE_SYSTEM_NSSUTIL=1
>+export USE_SYSTEM_FREEBL=1
>+export USE_SYSTEM_SOFTOKEN=1
>+
> NSS_USE_SYSTEM_SQLITE=1
> export NSS_USE_SYSTEM_SQLITE
> 
>@@ -200,23 +270,11 @@ USE_64=1
> export USE_64
> %endif
> 
>-##### phase 1: build freebl/softokn shared libraries
>-# there no ecc in freebl
>-unset NSS_ENABLE_ECC
>-# Compile softoken plus needed support
>-%{__make} -C ./mozilla/security/coreconf
>-%{__make} -C ./mozilla/security/dbm
>-
>-%{__make} -C ./mozilla/security/nss/lib/util export
>-%{__make} -C ./mozilla/security/nss/lib/freebl export
>-%{__make} -C ./mozilla/security/nss/lib/softoken export
>+##### phase 1: disable fips powerup self tests which are
>+# only available with an nss-softokn build
>+unset SFTK_FIPS_POWERUP_SELFTEST_AVAILABLE
> 
>-%{__make} -C ./mozilla/security/nss/lib/util
>-%{__make} -C ./mozilla/security/nss/lib/freebl
>-%{__make} -C ./mozilla/security/nss/lib/softoken
>-
>-# stash away the bltest and fipstest to build them last
>-tar cf build_these_later.tar ./mozilla/security/nss/cmd/bltest ./mozilla/security/nss/cmd/fipstest
>+# these tests were built and run as part of the nss-softokn build
> rm -rf ./mozilla/security/nss/cmd/bltest
> rm -rf ./mozilla/security/nss/cmd/fipstest
> 
>@@ -236,11 +294,11 @@ export NSS_ECC_MORE_THAN_SUITE_B
> %{__make} -C ./mozilla/security/dbm
> %{__make} -C ./mozilla/security/nss
> 
>-##### phase 3: build bltest and fipstest
>-tar xf build_these_later.tar
>-unset NSS_ENABLE_ECC; %{__make} -C ./mozilla/security/nss/cmd/bltest
>-unset NSS_ENABLE_ECC; %{__make} -C ./mozilla/security/nss/cmd/fipstest
>-%{__rm} -f build_these_later.tar
>+######## Copy the nss-softokn libraries into the build tree
>+# With a makefile target the destination directory is known
>+pushd ./mozilla/security/nss
>+%{__make} copy_softoken_libs
>+popd
> 
> # Set up our package file
> # The nspr_version and nss_{util|softokn}_version globals used
>@@ -419,49 +477,6 @@ done
> # Copy the pkcs #11 configuration script
> %{__install} -p -m 755 ./mozilla/dist/pkgconfig/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh
> 
>-#remove the nss-util-devel headers
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/ciferfam.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64t.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslocks.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilock.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilckt.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlk.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlkt.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssutil.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11f.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11n.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11p.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11t.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11u.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/portreg.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1t.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/seccomon.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secder.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secdert.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secdig.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secdigt.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secerr.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secitem.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secoid.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secoidt.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secport.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilmodt.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilpars.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilparst.h
>-
>-#remove headers shipped nss-softokn-devel and nss-softokn-freebl-devel
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/alghmac.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/blapit.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/ecl-exp.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/hasht.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/shsign.h
>-rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
>-
> %clean
> %{__rm} -rf $RPM_BUILD_ROOT
> 
>@@ -590,6 +605,9 @@ rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
> 
> 
> %changelog
>+* Sun Nov 11 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-9.1.nosoftoken.4
>+- Resolves: Bug 689918 - Build without softoken or util sources in the tree
>+
> * Sat Nov 10 2012 Elio Maldonado <emaldona@redhat.com> - 3.14-9
> - Disable bypass code at build time and return failure on attempts to enable at runtime
> - Bug 806588 - Disable SSL PKCS #11 bypass at build time

Actions: View | Diff

Attachments on bug 689918: 552424 | 552425 | 552428 | 552434 | 552436 | 552443 | 561692 | 561694 | 561696 | 561697 | 561698 | 561699 | 561700 | 572565 | 574101 | 584429 | 643175 | 643180 | 643202 | 643203 | 643660 | 643794 | 643807 | 669709 | 669710 | 669711 | 669712 | 669713 | 762643 | 762645 | 762646