Reverting to the last stable tag nss-3_12_3_99_3-7_1_fc12

This commit is contained in:
Elio Maldonado 2009-08-20 18:28:37 +00:00
parent f1329e78eb
commit 47b4b2b7f6
2 changed files with 116 additions and 84 deletions

View File

@ -7,7 +7,5 @@ Name: NSS
Description: Network Security Services Description: Network Security Services
Version: %NSS_VERSION% Version: %NSS_VERSION%
Requires: nspr >= %NSPR_VERSION% Requires: nspr >= %NSPR_VERSION%
Requires: nss-util >= %NSSUTIL_VERSION% Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
Requires: nss-softokn >= %SOFTOKEN_VERSION%
Libs: -lssl3 -lsmime3 -lnss3
Cflags: -I${includedir} Cflags: -I${includedir}

196
nss.spec
View File

@ -1,25 +1,27 @@
%global nspr_version 4.8 %global nspr_version 4.7
# Eventually we will have 3.12.4
# for now we test with 3.12.3.99.3
%global nss_softokn_version 3.12.3.99.3
%global nss_util_version 3.12.3.99.3
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
# Produce .chk files for the final stripped binaries
%define __spec_install_post \
%{?__debug_package:%{__debug_install_post}} \
%{__arch_install_post} \
%{__os_install_post} \
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libsoftokn3.so \
$RPM_BUILD_ROOT/%{unsupported_tools_directory}/shlibsign -i $RPM_BUILD_ROOT/%{_lib}/libfreebl3.so \
%{nil}
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.12.3.99.3 Version: 3.12.3.99.3
Release: 8%{?dist} Release: 7.1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: nspr >= %{nspr_version} Requires: nspr >= %{nspr_version}
Requires: nss-softokn%{_isa} >= %{nss_softokn_version} Requires: nss-softokn-freebl%{_isa} >= %{version}
Requires: nss-util >= %{nss_util_version}
Requires: sqlite Requires: sqlite
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-softokn-devel >= %{nss_softokn_version}
BuildRequires: nss-util-devel >= %{nss_util_version}
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -34,12 +36,15 @@ Source2: nss-config.in
Source3: blank-cert8.db Source3: blank-cert8.db
Source4: blank-key3.db Source4: blank-key3.db
Source5: blank-secmod.db Source5: blank-secmod.db
Source6: %{name}-pem-20090622.tar.bz2 Source8: nss-prelink.conf
Source7: PayPalEE.cert Source12: %{name}-pem-20090622.tar.bz2
Source8: PayPalICA.cert Source13: PayPalEE.cert
Source14: PayPalICA.cert
Patch1: nss-no-rpath.patch Patch1: nss-no-rpath.patch
Patch2: nss-enable-pem.patch Patch2: nss-nolocalsql.patch
Patch6: nss-enable-pem.patch
Patch7: nss-stubs-bug502133.patch
%description %description
Network Security Services (NSS) is a set of libraries designed to Network Security Services (NSS) is a set of libraries designed to
@ -48,6 +53,21 @@ server applications. Applications built with NSS can support SSL v2
and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
v3 certificates, and other security standards. v3 certificates, and other security standards.
%package softokn-freebl
Summary: Freebl library for the Network Security Services
Group: System Environment/Base
Conflicts: nss < 3.12.2.99.3-5
%description softokn-freebl
Network Security Services (NSS) is a set of libraries designed to
support cross-platform development of security-enabled client and
server applications. Applications built with NSS can support SSL v2
and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
v3 certificates, and other security standards.
Install the nss-softokn-freebl package if you need the freebl
library.
%package tools %package tools
Summary: Tools for the Network Security Services Summary: Tools for the Network Security Services
@ -71,8 +91,6 @@ Summary: Development libraries for Network Security Services
Group: Development/Libraries Group: Development/Libraries
Requires: nss = %{version}-%{release} Requires: nss = %{version}-%{release}
Requires: nspr-devel >= %{nspr_version} Requires: nspr-devel >= %{nspr_version}
Requires: nss-softokn-devel >= %{nss_softkn_version}
Requires: nss-util-devel >= %{nss_util_version}
Requires: pkgconfig Requires: pkgconfig
%description devel %description devel
@ -91,14 +109,16 @@ low level services.
%prep %prep
%setup -q %setup -q
%setup -q -T -D -n %{name}-%{version} -a 6 %setup -q -T -D -n %{name}-%{version} -a 12
%patch1 -p0 %patch1 -p0
%patch2 -p0 -b .libpem %patch2 -p0
%patch6 -p0 -b .libpem
%patch7 -p0 -b .502133
# need newer certs to make test suite work #need newer certs to make test suite work
# remove once we update to NSS 3.12.4 #remove once we update to NSS 3.12.4
cp %{SOURCE7} %{SOURCE8} mozilla/security/nss/tests/libpkix/certs cp %{SOURCE13} %{SOURCE14} mozilla/security/nss/tests/libpkix/certs
%build %build
@ -114,6 +134,8 @@ export BUILD_OPT
XCFLAGS=$RPM_OPT_FLAGS XCFLAGS=$RPM_OPT_FLAGS
export XCFLAGS export XCFLAGS
#export NSPR_INCLUDE_DIR=`nspr-config --includedir`
#export NSPR_LIB_DIR=`nspr-config --libdir`
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@ -127,25 +149,14 @@ NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
export NSPR_INCLUDE_DIR export NSPR_INCLUDE_DIR
export NSPR_LIB_DIR export NSPR_LIB_DIR
NSS_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss | sed 's/-I//'`
NSS_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nss | sed 's/-L//'`
export NSS_INCLUDE_DIR
export NSS_LIB_DIR
%ifarch x86_64 ppc64 ia64 s390x sparc64 %ifarch x86_64 ppc64 ia64 s390x sparc64
USE_64=1 USE_64=1
export USE_64 export USE_64
%endif %endif
# # NSS_ENABLE_ECC=1
# Though we only ship the nss proper libraries, no # export NSS_ENABLE_ECC
# softoken nor util, we actually compile everything
# as we are using the entire source tree. It is a bit
# a waste but this is the only way we can find the
# private exports from util. Let's keep it simple
# for now.
#
%{__make} -C ./mozilla/security/coreconf %{__make} -C ./mozilla/security/coreconf
%{__make} -C ./mozilla/security/dbm %{__make} -C ./mozilla/security/dbm
%{__make} -C ./mozilla/security/nss %{__make} -C ./mozilla/security/nss
@ -168,7 +179,6 @@ export NSS_VMAJOR
export NSS_VMINOR export NSS_VMINOR
export NSS_VPATCH export NSS_VPATCH
%{__mkdir_p} ./mozilla/dist/pkgconfig
%{__cat} %{SOURCE2} | sed -e "s,@libdir@,%{_libdir},g" \ %{__cat} %{SOURCE2} | sed -e "s,@libdir@,%{_libdir},g" \
-e "s,@prefix@,%{_prefix},g" \ -e "s,@prefix@,%{_prefix},g" \
-e "s,@exec_prefix@,%{_prefix},g" \ -e "s,@exec_prefix@,%{_prefix},g" \
@ -218,13 +228,7 @@ killall $RANDSERV || :
rm -rf ./mozilla/tests_results rm -rf ./mozilla/tests_results
cd ./mozilla/security/nss/tests/ cd ./mozilla/security/nss/tests/
# all.sh is the test suite script # all.sh is the test suite script
HOST=localhost DOMSUF=localdomain PORT=$MYRAND ./all.sh
%define all_tests "cipher libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
%define nossl_tests "cipher libpkix cert dbtests tools fips sdr crmf smime ocsp merge pkits chains"
%define cipher_suite "cipher"
%define fips_suite "fips"
HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_TESTS=%{all_tests} ./all.sh
cd ../../../../ cd ../../../../
killall $RANDSERV || : killall $RANDSERV || :
@ -250,68 +254,49 @@ echo "test suite completed"
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
# Copy the binary libraries we want # Copy the binary libraries we want
for file in libnss3.so \ for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
libssl3.so libsmime3.so libnssckbi.so libnsspem.so libssl3.so libsmime3.so libnssckbi.so libnsspem.so libnssdbm3.so
do do
%{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib} %{__install} -m 755 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_lib}
ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done done
# Make sure chk files can be found in both places
for file in libsoftokn3.chk libfreebl3.chk
do
ln -s ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done
# Install the empty NSS db files # Install the empty NSS db files
%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb %{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb
%{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db %{__install} -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/cert8.db
%{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db %{__install} -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/key3.db
%{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db %{__install} -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/pki/nssdb/secmod.db
%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
%{__install} -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
# Copy the development libraries we want # Copy the development libraries we want
for file in libcrmf.a libnssb.a libnssckfw.a for file in libcrmf.a libnssb.a libnssckfw.a
do do
%{__install} -p -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir} %{__install} -m 644 mozilla/dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
done done
# Copy the binaries we want # Copy the binaries we want
for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap
do do
%{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir} %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
done done
# Copy the binaries we ship as unsupported # Copy the binaries we ship as unsupported
for file in atob btoa derdump ocspclnt pp selfserv strsclnt symkeyutil tstclnt vfyserv vfychain for file in atob btoa derdump ocspclnt pp selfserv shlibsign strsclnt symkeyutil tstclnt vfyserv vfychain
do do
%{__install} -p -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory} %{__install} -m 755 mozilla/dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{unsupported_tools_directory}
done
# Before installing public headers romove the ones that nss-util-devel
# and nss-softokn-devel have already installed
# query the installed devel packages
util_includes=`rpm -ql nss-util-devel | grep "%{_includedir}/nss3/"`
softokn_includes=`rpm -ql nss-softokn-devel | grep "%{_includedir}/nss3/"`
# make a more convenient list
uslist=
for f in ${util_includes}; do
bn=`basename ${f}`
uslist+="${bn} "
done
for f in ${softokn_includes}; do
bn=`basename ${f}`
uslist+="${bn} "
done
# remove the headers we don't need
for file in ${uslist}; do
if [ -f mozilla/dist/public/nss/${file} ]
then
rm mozilla/dist/public/nss/${file}
fi
done done
# Copy the include files we want # Copy the include files we want
for file in mozilla/dist/public/nss/*.h for file in mozilla/dist/public/nss/*.h
do do
%{__install} -p -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3 %{__install} -m 644 $file $RPM_BUILD_ROOT/%{_includedir}/nss3
done done
# Copy the package configuration files # Copy the package configuration files
@ -333,17 +318,28 @@ done
%files %files
%defattr(-,root,root) %defattr(-,root,root)
/%{_lib}/libnss3.so /%{_lib}/libnss3.so
/%{_lib}/libnssutil3.so
/%{_lib}/libnssdbm3.so
/%{_lib}/libssl3.so /%{_lib}/libssl3.so
/%{_lib}/libsmime3.so /%{_lib}/libsmime3.so
/%{_lib}/libsoftokn3.so
/%{_lib}/libsoftokn3.chk
/%{_lib}/libnssckbi.so /%{_lib}/libnssckbi.so
/%{_lib}/libnsspem.so /%{_lib}/libnsspem.so
%{unsupported_tools_directory}/shlibsign
%dir %{_libdir}/nss %dir %{_libdir}/nss
%dir %{unsupported_tools_directory} %dir %{unsupported_tools_directory}
%dir %{_sysconfdir}/pki/nssdb %dir %{_sysconfdir}/pki/nssdb
%config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db %config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db %config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db %config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
%dir %{_sysconfdir}/prelink.conf.d
%{_sysconfdir}/prelink.conf.d/nss-prelink.conf
%files softokn-freebl
%defattr(-,root,root)
/%{_lib}/libfreebl3.so
/%{_lib}/libfreebl3.chk
%files tools %files tools
%defattr(-,root,root) %defattr(-,root,root)
@ -371,20 +367,27 @@ done
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libnss3.so %{_libdir}/libnss3.so
%{_libdir}/libnssutil3.so
%{_libdir}/libnssdbm3.so
%{_libdir}/libssl3.so %{_libdir}/libssl3.so
%{_libdir}/libsmime3.so %{_libdir}/libsmime3.so
%{_libdir}/libsoftokn3.so
%{_libdir}/libsoftokn3.chk
%{_libdir}/libnssckbi.so %{_libdir}/libnssckbi.so
%{_libdir}/libnsspem.so %{_libdir}/libnsspem.so
%{_libdir}/libfreebl3.so
%{_libdir}/libfreebl3.chk
%{_libdir}/libcrmf.a %{_libdir}/libcrmf.a
%{_libdir}/pkgconfig/nss.pc %{_libdir}/pkgconfig/nss.pc
%{_bindir}/nss-config %{_bindir}/nss-config
# shared with nss-util and nss-softokn
%dir %{_includedir}/nss3 %dir %{_includedir}/nss3
%{_includedir}/nss3/base64.h
%{_includedir}/nss3/blapit.h
%{_includedir}/nss3/cert.h %{_includedir}/nss3/cert.h
%{_includedir}/nss3/certdb.h %{_includedir}/nss3/certdb.h
%{_includedir}/nss3/certt.h %{_includedir}/nss3/certt.h
%{_includedir}/nss3/ciferfam.h
%{_includedir}/nss3/cmmf.h %{_includedir}/nss3/cmmf.h
%{_includedir}/nss3/cmmft.h %{_includedir}/nss3/cmmft.h
%{_includedir}/nss3/cms.h %{_includedir}/nss3/cms.h
@ -394,6 +397,8 @@ done
%{_includedir}/nss3/crmft.h %{_includedir}/nss3/crmft.h
%{_includedir}/nss3/cryptohi.h %{_includedir}/nss3/cryptohi.h
%{_includedir}/nss3/cryptoht.h %{_includedir}/nss3/cryptoht.h
%{_includedir}/nss3/ecl-exp.h
%{_includedir}/nss3/hasht.h
%{_includedir}/nss3/jar-ds.h %{_includedir}/nss3/jar-ds.h
%{_includedir}/nss3/jar.h %{_includedir}/nss3/jar.h
%{_includedir}/nss3/jarfile.h %{_includedir}/nss3/jarfile.h
@ -402,8 +407,17 @@ done
%{_includedir}/nss3/keyt.h %{_includedir}/nss3/keyt.h
%{_includedir}/nss3/keythi.h %{_includedir}/nss3/keythi.h
%{_includedir}/nss3/nss.h %{_includedir}/nss3/nss.h
%{_includedir}/nss3/nssb64.h
%{_includedir}/nss3/nssb64t.h
%{_includedir}/nss3/nssckbi.h %{_includedir}/nss3/nssckbi.h
%{_includedir}/nss3/nssilckt.h
%{_includedir}/nss3/nssilock.h
%{_includedir}/nss3/nsslocks.h
%{_includedir}/nss3/nsslowhash.h
%{_includedir}/nss3/nsspem.h %{_includedir}/nss3/nsspem.h
%{_includedir}/nss3/nssrwlk.h
%{_includedir}/nss3/nssrwlkt.h
%{_includedir}/nss3/nssutil.h
%{_includedir}/nss3/ocsp.h %{_includedir}/nss3/ocsp.h
%{_includedir}/nss3/ocspt.h %{_includedir}/nss3/ocspt.h
%{_includedir}/nss3/p12.h %{_includedir}/nss3/p12.h
@ -414,19 +428,42 @@ done
%{_includedir}/nss3/pk11priv.h %{_includedir}/nss3/pk11priv.h
%{_includedir}/nss3/pk11pub.h %{_includedir}/nss3/pk11pub.h
%{_includedir}/nss3/pk11sdr.h %{_includedir}/nss3/pk11sdr.h
%{_includedir}/nss3/pkcs11.h
%{_includedir}/nss3/pkcs11f.h
%{_includedir}/nss3/pkcs11n.h
%{_includedir}/nss3/pkcs11p.h
%{_includedir}/nss3/pkcs11t.h
%{_includedir}/nss3/pkcs11u.h
%{_includedir}/nss3/pkcs12.h %{_includedir}/nss3/pkcs12.h
%{_includedir}/nss3/pkcs12t.h %{_includedir}/nss3/pkcs12t.h
%{_includedir}/nss3/pkcs7t.h %{_includedir}/nss3/pkcs7t.h
%{_includedir}/nss3/portreg.h
%{_includedir}/nss3/preenc.h %{_includedir}/nss3/preenc.h
%{_includedir}/nss3/secasn1.h
%{_includedir}/nss3/secasn1t.h
%{_includedir}/nss3/seccomon.h
%{_includedir}/nss3/secder.h
%{_includedir}/nss3/secdert.h
%{_includedir}/nss3/secdig.h
%{_includedir}/nss3/secdigt.h
%{_includedir}/nss3/secerr.h
%{_includedir}/nss3/sechash.h
%{_includedir}/nss3/secitem.h
%{_includedir}/nss3/secmime.h %{_includedir}/nss3/secmime.h
%{_includedir}/nss3/secmod.h %{_includedir}/nss3/secmod.h
%{_includedir}/nss3/secmodt.h
%{_includedir}/nss3/secoid.h
%{_includedir}/nss3/secoidt.h
%{_includedir}/nss3/secpkcs5.h %{_includedir}/nss3/secpkcs5.h
%{_includedir}/nss3/secpkcs7.h %{_includedir}/nss3/secpkcs7.h
%{_includedir}/nss3/secport.h
%{_includedir}/nss3/shsign.h
%{_includedir}/nss3/smime.h %{_includedir}/nss3/smime.h
%{_includedir}/nss3/ssl.h %{_includedir}/nss3/ssl.h
%{_includedir}/nss3/sslerr.h %{_includedir}/nss3/sslerr.h
%{_includedir}/nss3/sslproto.h %{_includedir}/nss3/sslproto.h
%{_includedir}/nss3/sslt.h %{_includedir}/nss3/sslt.h
%{_includedir}/nss3/utilrename.h
%files pkcs11-devel %files pkcs11-devel
@ -446,9 +483,6 @@ done
%changelog %changelog
* Tue Aug 19 2009 Elio Maldonado <emaldona@redhat.com> - 3.12.3.99.3-8
- Split off nss-softokn and nss-util as their own packages (508479)
* Sat Aug 06 2009 Elio Maldonado <emaldona@redhat.com> - 3.12.3.99.3-7.1 * Sat Aug 06 2009 Elio Maldonado <emaldona@redhat.com> - 3.12.3.99.3-7.1
- Fix spec file problems uncovered by Fedora_12_Mass_Rebuild - Fix spec file problems uncovered by Fedora_12_Mass_Rebuild