Attachment 888123 Details for Bug 689919 – specfile changes to build without softoken - in patch format

[patch] specfile changes to build without softoken - in patch format

specfilechanges.patch (text/plain), 10.41 KB, created by Elio Maldonado Batiz on 2014-04-21 15:48:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-04-21 15:48:51 UTC

Size: 10.41 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index 71e1903..98629d6 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -16,7 +16,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.15.3
>-Release:          10%{?dist}
>+Release:          11%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -112,11 +112,10 @@ Patch64: 0001-pinst-make-derEncodingsMatch-work-with-encrypted-key.patch
> Patch65: add-missing-option-descriptions.patch
> # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=977869
> Patch66: nss-ecc-list-3.15.3.patch
>-# Remove this patch once start building nss without softoken or
>-# util sources in the tree as was requested in bug-689918
>-Patch67: nss-util-ecc-list-3.15.3.patch
> # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=977673
>-Patch68:          dont-disable-internal-module.patch
>+Patch68: dont-disable-internal-module.patch
>+# Local patch to deal with current older version of softoken/freebl
>+Patch69: define-uint32.patch
> 
> %description
> Network Security Services (NSS) is a set of libraries designed to
>@@ -205,8 +204,7 @@ low level services.
> # activate when approved
> #%patch45 -p0 -b .notrash
> %patch46 -p0 -b .skipoutbound
>-# enable when bug 688919 is approved
>-#%patch47 -p0 -b .templates
>+%patch47 -p0 -b .templates
> %patch48 -p0 -b .crypto
> %patch49 -p0 -b .skipthem
> %patch50 -p0 -b .iquote
>@@ -222,8 +220,25 @@ popd
> %patch64 -p1 -b .895339
> %patch65 -p1 -b .606022
> %patch66 -p0 -b .ecc-lists
>-%patch67 -p0 -b .ecc-lists
> %patch68 -p0 -b .1059176
>+%patch69 -p0 -b .uint32
>+
>+#########################################################
>+# Higher-level libraries and test tools need access to
>+# module-private headers from util, freebl, and softoken
>+# until fixed upstream we must copy some headers locally
>+#########################################################
>+
>+pemNeedsFromSoftoken="lowkeyi lowkeyti softoken softoknt"
>+for file in ${pemNeedsFromSoftoken}; do
>+    %{__cp} ./nss/lib/softoken/${file}.h ./nss/lib/ckfw/pem/
>+done
>+
>+# Copying these header util the upstream bug is accepted
>+# Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=820207
>+%{__cp} ./nss/lib/softoken/lowkeyi.h ./nss/cmd/rsaperf
>+%{__cp} ./nss/lib/softoken/lowkeyti.h ./nss/cmd/rsaperf
>+
> 
> %build
> 
>@@ -257,6 +272,9 @@ 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
>@@ -266,6 +284,16 @@ export NSS_USE_SYSTEM_FREEBL=1
> # prevents running the sha224 portion of the powerup selftest when testing
> export NO_SHA224_AVAILABLE=1
> 
>+export FREEBL_LIBS=`/usr/bin/pkg-config --libs nss-softokn`
>+
>+export SOFTOKEN_LIB_DIR=%{_libdir}
>+# use the system ones
>+export USE_SYSTEM_NSSUTIL=1
>+export USE_SYSTEM_SOFTOKEN=1
>+
>+# tell the upstream build system what we are doing
>+export NSS_BUILD_WITHOUT_SOFTOKEN=1
>+
> NSS_USE_SYSTEM_SQLITE=1
> export NSS_USE_SYSTEM_SQLITE
> 
>@@ -284,12 +312,23 @@ export NSS_ENABLE_ECC
> NSS_DISABLE_HW_GCM=1
> export NSS_DISABLE_HW_GCM
> 
>+##### phase 1: remove util/freebl/softoken and low level tools
>+######## Remove freebl, softoken and util
>+%{__rm} -rf ./mozilla/security/nss/lib/freebl
>+%{__rm} -rf ./mozilla/security/nss/lib/softoken
>+%{__rm} -rf ./mozilla/security/nss/lib/util
> ######## Remove nss-softokn test tools as we already ran
> # the cipher test suite as part of the nss-softokn build
> %{__rm} -rf ./mozilla/security/nss/cmd/bltest
> %{__rm} -rf ./mozilla/security/nss/cmd/fipstest
> %{__rm} -rf ./mozilla/security/nss/cmd/rsaperf_low
> 
>+##### phase 2: build the rest of nss
>+NSS_ENABLE_ECC=1
>+export NSS_ENABLE_ECC
>+NSS_ECC_MORE_THAN_SUITE_B=1
>+export NSS_ECC_MORE_THAN_SUITE_B
>+
> export NSS_BLTEST_NOT_AVAILABLE=1
> %{__make} -C ./nss/coreconf
> %{__make} -C ./nss/lib/dbm
>@@ -341,6 +380,8 @@ chmod 755 ./dist/pkgconfig/nss-config
> %{__cat} %{SOURCE9} > ./dist/pkgconfig/setup-nsssysinit.sh
> chmod 755 ./dist/pkgconfig/setup-nsssysinit.sh
> 
>+%{__cp} ./nss/lib/ckfw/nssck.api ./dist/private/nss/
>+
> %check
> if [ ${DISABLETEST:-0} -eq 1 ]; then
>   echo "testing disabled"
>@@ -364,6 +405,9 @@ export NSS_ENABLE_ECC
> 
> export NSS_BLTEST_NOT_AVAILABLE=1
> 
>+# needed for the fips manging test
>+export SOFTOKEN_LIB_DIR=%{_libdir}
>+
> # On RHEL-5.x based build machines the kernel lacks support for hardware GCM
> export NSS_DISABLE_HW_GCM=1
> 
>@@ -405,7 +449,7 @@ find ./nss/tests -type f |\
> killall $RANDSERV || :
> 
> rm -rf ./tests_results
>-cd ./nss/tests/
>+pushd ./nss/tests/
> # all.sh is the test suite script
> 
> #  don't need to run all the tests when testing packaging
>@@ -421,24 +465,33 @@ cd ./nss/tests/
> 
> HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
> 
>-cd ../../
>+popd
> 
> # Normally, the grep exit status is 0 if selected lines are found and 1 otherwise,
>-# Grep exits with status of 2 if an error ocurred. 
>+# Grep exits with status greater than 1 if an error ocurred. 
> # If there are test failures we expect TEST_FAILURES > 0 and GREP_EXIT_STATUS = 0, 
> # With no test failures we expect TEST_FAILURES = 0 and GREP_EXIT_STATUS = 1, whereas 
>-# GREP_EXIT_STATUS = 2  would indicate an error in grep such as failure to find the log file.
>+# GREP_EXIT_STATUS > 1 would indicate an error in grep such as failure to find the log file.
> killall $RANDSERV || :
>+
> TEST_FAILURES=$(grep -c FAILED ./tests_results/security/localhost.1/output.log) || GREP_EXIT_STATUS=$?
>-if [ ${GREP_EXIT_STATUS:-0} -eq 2 ]; then
>-  echo "error: grep failed with exit code: $GREP_EXIT_STATUS"
>-  exit 1
>+if [ ${GREP_EXIT_STATUS:-0} -eq 1 ]; then
>+  echo "okay: test suite detected no failures"
> else
>-  if [ ${TEST_FAILURES:-0} -ne 0 ]; then
>-    echo "error: test suite had ${TEST_FAILURES} test failure(s)"
>+  if [ ${GREP_EXIT_STATUS:-0} -eq 0 ]; then
>+    # while a situation in which grep return status is 0 and it doesn't output
>+    # anything shouldn't happen, set the default to something that is
>+    # obviously wrong (-1)
>+    echo "error: test suite had ${TEST_FAILURES:--1} test failure(s)"
>     exit 1
>   else
>-    echo "okay: test suite had ${TEST_FAILURES} test failure(s)"
>+    if [ ${GREP_EXIT_STATUS:-0} -eq 2 ]; then
>+      echo "error: grep has not found log file"
>+      exit 1
>+    else
>+      echo "error: grep failed with exit code: ${GREP_EXIT_STATUS}"
>+      exit 1
>+    fi
>   fi
> fi
> echo "test suite completed"
>@@ -451,6 +504,7 @@ echo "test suite completed"
> # There is no make install target so we'll do it ourselves.
> 
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3
>+%{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/nss3/templates
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
> %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}
> %{__mkdir_p} $RPM_BUILD_ROOT/%{unsupported_tools_directory}
>@@ -502,6 +556,12 @@ do
>   %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
> done
> 
>+# Copy the template files we want
>+for file in dist/private/nss/nssck.api
>+do
>+  %{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3/templates
>+done
>+
> # Copy the package configuration files
> %{__install} -p -m 644 ./dist/pkgconfig/nss.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nss.pc
> %{__install} -p -m 755 ./dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
>@@ -513,48 +573,6 @@ for f in "%{allTools}"; do
>    install -c -m 644 ./dist/doc/nroff/${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
> done
> 
>-#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 header shipped by 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
>@@ -721,11 +739,17 @@ fi
> %{_includedir}/nss3/nssckg.h
> %{_includedir}/nss3/nssckmdt.h
> %{_includedir}/nss3/nssckt.h
>+%{_includedir}/nss3/templates/nssck.api
> %{_libdir}/libnssb.a
> %{_libdir}/libnssckfw.a
> 
> 
> %changelog
>+* 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
>+- Add define-uint32.patch to deal with using older version of nss-softokn
>+- Fix suboptimal test failure detection shell code in the %check section
>+
> * Thu Apr 10 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.3-10
> - Prevent users from disabling the internal crypto module
> - Resolves: Bug 1059176 - nss segfaults with opencryptoki module

Actions: View | Diff

Attachments on bug 689919: 520484 | 520485 | 520486 | 520488 | 520489 | 888122 | 888123 | 907311