mirror of
https://abf.rosa.ru/djam/nss.git
synced 2025-02-23 16:32:48 +00:00
Updated to 3.32
This commit is contained in:
Алзим
parent
e63516228c
commit
0a66702cf6
2 changed files with 32 additions and 44 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -3,5 +3,5 @@ sources:
|
|||
blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5
|
||||
blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50
|
||||
certificadoACRaiz.crt: 8efdcabc93e61e925d4d1ded181a4320a467a139
|
||||
nss-3.30.2.tar.gz: e8ceea087e2ab2d53ffe156d8641007abad2b13f
|
||||
nss-3.32.tar.gz: 5951fc4c8f98395fea7b6ae9332e7795d40be865
|
||||
verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5
|
||||
|
|
|
|||
74
nss.spec
74
nss.spec
|
|
@ -8,8 +8,6 @@
|
|||
%define sdevname %mklibname -d -s %{name}
|
||||
%define _disable_lto 1
|
||||
|
||||
%define nspr_version 4.10
|
||||
|
||||
# this seems fragile, so require the exact version or later (#58754)
|
||||
%define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0)
|
||||
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null || echo 0)
|
||||
|
|
@ -20,14 +18,13 @@
|
|||
|
||||
Summary: Netscape Security Services
|
||||
Name: nss
|
||||
Epoch: 2
|
||||
Version: 3.30.2
|
||||
Version: 3.32
|
||||
Release: 1
|
||||
Epoch: 2
|
||||
Group: System/Libraries
|
||||
License: MPL or GPLv2+ or LGPLv2+
|
||||
Url: http://www.mozilla.org/projects/security/pki/nss/index.html
|
||||
Source0: http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{url_ver}_RTM/src/nss-%{version}.tar.gz
|
||||
#Source1: http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{url_ver}_RTM/src/nss-%{version}.tar.gz.asc
|
||||
Source2: nss.pc.in
|
||||
Source3: nss-config.in
|
||||
Source4: blank-cert8.db
|
||||
|
|
@ -43,7 +40,6 @@ Source8: verisign-class-3-secure-server-ca.der
|
|||
# verified in person with a government official
|
||||
Source9: http://www.icpbrasil.gov.br/certificadoACRaiz.crt
|
||||
Patch0: nss-no-rpath.patch
|
||||
Patch1: nss-fixrandom.patch
|
||||
Patch2: renegotiate-transitional.patch
|
||||
# (tpg) be carefull with last nspr4-4.10 because prtypes.h was moved to include/nspr4/
|
||||
Patch4: nss-3.15.1-correct-path-to-prtypes.h.patch
|
||||
|
|
@ -242,7 +238,6 @@ Static libraries for doing development with Network Security Services.
|
|||
%setup -q
|
||||
#% apply_patches
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0 -b .transitional
|
||||
%patch4 -p1
|
||||
|
||||
|
|
@ -281,8 +276,8 @@ export NSS_DISABLE_GTESTS=1
|
|||
|
||||
%if %{build_empty}
|
||||
# (oe) the "trust no one" scenario, it goes like:
|
||||
# 1. mv /%{_lib}/libnssckbi.so /%{_lib}/libnssckbi.so.BAK
|
||||
# 2. mv /%{_lib}/libnssckbi_empty.so /%{_lib}/libnssckbi.so
|
||||
# 1. mv /%%{_lib}/libnssckbi.so /%%{_lib}/libnssckbi.so.BAK
|
||||
# 2. mv /%%{_lib}/libnssckbi_empty.so /%%{_lib}/libnssckbi.so
|
||||
# 3. restart ff/tb
|
||||
# it has to be done manually for now, but at least we have a way for
|
||||
# users to quickly mitigate future problems, or whatever :-)
|
||||
|
|
@ -302,13 +297,6 @@ export USE_64=1
|
|||
unset USE_64 || :
|
||||
%endif
|
||||
|
||||
# Parallel is broken as of 3.11.4 :(
|
||||
#make -j1 -C ./nss/coreconf ./nss/lib/dbm ./nss \
|
||||
# TARGETCC="$TARGETCC" \
|
||||
# TARGETCCC="$TARGETCCC" \
|
||||
# TARGETRANLIB="$TARGETRANLIB" \
|
||||
# AR="%__ar cr \"\$@\"" \
|
||||
#buildflags="TARGETCC='$TARGETCC' TARGETCCC='$TARGETCCC' TARGETRANLIB='$TARGETRANLIB' AR='%__ar"
|
||||
%make -j1 -C ./nss/coreconf
|
||||
%make -j1 -C ./nss/lib/dbm
|
||||
%make -j1 -C ./nss
|
||||
|
|
@ -324,7 +312,7 @@ cp -p nss/lib/ckfw/builtins/Linux*/libnssckbi.so libnssckbi_empty.so
|
|||
# a buildrequires for nss
|
||||
ADDBUILTIN=`%{_bindir}/find . -type f -name addbuiltin`
|
||||
if [ -z "$ADDBUILTIN" ]; then
|
||||
exit 1
|
||||
exit 1
|
||||
fi
|
||||
ADDBUILTIN="$PWD/$ADDBUILTIN"
|
||||
OLD="$LD_LIBRARY_PATH"
|
||||
|
|
@ -367,39 +355,39 @@ mkdir -p %{buildroot}%{_includedir}/nss
|
|||
cp -aL ../public/nss/* %{buildroot}%{_includedir}/nss
|
||||
|
||||
cp -aL lib/libcrmf.a \
|
||||
lib/libnss.a \
|
||||
lib/libnssb.a \
|
||||
lib/libnssckbi.so \
|
||||
lib/libnssckfw.a \
|
||||
lib/libnssutil.a \
|
||||
lib/libsmime.a \
|
||||
lib/libssl.a \
|
||||
%{buildroot}%{_libdir}
|
||||
lib/libnss.a \
|
||||
lib/libnssb.a \
|
||||
lib/libnssckbi.so \
|
||||
lib/libnssckfw.a \
|
||||
lib/libnssutil.a \
|
||||
lib/libsmime.a \
|
||||
lib/libssl.a \
|
||||
%{buildroot}%{_libdir}
|
||||
|
||||
# Copy the binary libraries we want
|
||||
for file in libsoftokn3.so libfreebl3.so libfreeblpriv3.so libnss3.so libnssutil3.so \
|
||||
libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
|
||||
libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
|
||||
do
|
||||
install -m 755 lib/$file %{buildroot}/%{_lib}
|
||||
ln -sf ../../%{_lib}/$file %{buildroot}%{_libdir}/$file
|
||||
install -m 755 lib/$file %{buildroot}/%{_lib}
|
||||
ln -sf ../../%{_lib}/$file %{buildroot}%{_libdir}/$file
|
||||
done
|
||||
|
||||
# These ghost files will be generated in the post step
|
||||
# Make sure chk files can be found in both places
|
||||
for file in libsoftokn3.chk libfreebl3.chk
|
||||
do
|
||||
touch %{buildroot}/%{_lib}/$file
|
||||
ln -s ../../%{_lib}/$file %{buildroot}%{_libdir}/$file
|
||||
touch %{buildroot}/%{_lib}/$file
|
||||
ln -s ../../%{_lib}/$file %{buildroot}%{_libdir}/$file
|
||||
done
|
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
||||
cat %{SOURCE2} | sed -e "s,%%libdir%%,%{_libdir},g" \
|
||||
-e "s,%%prefix%%,%{_prefix},g" \
|
||||
-e "s,%%exec_prefix%%,%{_prefix},g" \
|
||||
-e "s,%%includedir%%,%{_includedir}/nss,g" \
|
||||
-e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
|
||||
-e "s,%%NSS_VERSION%%,%{version},g" > \
|
||||
%{buildroot}%{_libdir}/pkgconfig/nss.pc
|
||||
-e "s,%%prefix%%,%{_prefix},g" \
|
||||
-e "s,%%exec_prefix%%,%{_prefix},g" \
|
||||
-e "s,%%includedir%%,%{_includedir}/nss,g" \
|
||||
-e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
|
||||
-e "s,%%NSS_VERSION%%,%{version},g" > \
|
||||
%{buildroot}%{_libdir}/pkgconfig/nss.pc
|
||||
%endif
|
||||
|
||||
popd
|
||||
|
|
@ -411,13 +399,13 @@ export NSS_VPATCH=`echo %{version} | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/
|
|||
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
cat %{SOURCE3} | sed -e "s,@libdir@,%{_libdir},g" \
|
||||
-e "s,@prefix@,%{_prefix},g" \
|
||||
-e "s,@exec_prefix@,%{_prefix},g" \
|
||||
-e "s,@includedir@,%{_includedir}/nss%{major},g" \
|
||||
-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
|
||||
-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
|
||||
-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
|
||||
> %{buildroot}/%{_bindir}/nss-config
|
||||
-e "s,@prefix@,%{_prefix},g" \
|
||||
-e "s,@exec_prefix@,%{_prefix},g" \
|
||||
-e "s,@includedir@,%{_includedir}/nss%{major},g" \
|
||||
-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
|
||||
-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
|
||||
-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
|
||||
> %{buildroot}/%{_bindir}/nss-config
|
||||
%endif
|
||||
|
||||
pushd nss/cmd/smimetools
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue