Updated to 3.32

This commit is contained in:
Алзим 2017-08-11 21:33:08 +03:00
parent e63516228c
commit 0a66702cf6
2 changed files with 32 additions and 44 deletions

View file

@ -3,5 +3,5 @@ sources:
blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5 blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5
blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50 blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50
certificadoACRaiz.crt: 8efdcabc93e61e925d4d1ded181a4320a467a139 certificadoACRaiz.crt: 8efdcabc93e61e925d4d1ded181a4320a467a139
nss-3.30.2.tar.gz: e8ceea087e2ab2d53ffe156d8641007abad2b13f nss-3.32.tar.gz: 5951fc4c8f98395fea7b6ae9332e7795d40be865
verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5 verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5

View file

@ -8,8 +8,6 @@
%define sdevname %mklibname -d -s %{name} %define sdevname %mklibname -d -s %{name}
%define _disable_lto 1 %define _disable_lto 1
%define nspr_version 4.10
# this seems fragile, so require the exact version or later (#58754) # 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 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) %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 Summary: Netscape Security Services
Name: nss Name: nss
Epoch: 2 Version: 3.32
Version: 3.30.2
Release: 1 Release: 1
Epoch: 2
Group: System/Libraries Group: System/Libraries
License: MPL or GPLv2+ or LGPLv2+ License: MPL or GPLv2+ or LGPLv2+
Url: http://www.mozilla.org/projects/security/pki/nss/index.html 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 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 Source2: nss.pc.in
Source3: nss-config.in Source3: nss-config.in
Source4: blank-cert8.db Source4: blank-cert8.db
@ -43,7 +40,6 @@ Source8: verisign-class-3-secure-server-ca.der
# verified in person with a government official # verified in person with a government official
Source9: http://www.icpbrasil.gov.br/certificadoACRaiz.crt Source9: http://www.icpbrasil.gov.br/certificadoACRaiz.crt
Patch0: nss-no-rpath.patch Patch0: nss-no-rpath.patch
Patch1: nss-fixrandom.patch
Patch2: renegotiate-transitional.patch Patch2: renegotiate-transitional.patch
# (tpg) be carefull with last nspr4-4.10 because prtypes.h was moved to include/nspr4/ # (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 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 %setup -q
#% apply_patches #% apply_patches
%patch0 -p0 %patch0 -p0
%patch1 -p0
%patch2 -p0 -b .transitional %patch2 -p0 -b .transitional
%patch4 -p1 %patch4 -p1
@ -281,8 +276,8 @@ export NSS_DISABLE_GTESTS=1
%if %{build_empty} %if %{build_empty}
# (oe) the "trust no one" scenario, it goes like: # (oe) the "trust no one" scenario, it goes like:
# 1. mv /%{_lib}/libnssckbi.so /%{_lib}/libnssckbi.so.BAK # 1. mv /%%{_lib}/libnssckbi.so /%%{_lib}/libnssckbi.so.BAK
# 2. mv /%{_lib}/libnssckbi_empty.so /%{_lib}/libnssckbi.so # 2. mv /%%{_lib}/libnssckbi_empty.so /%%{_lib}/libnssckbi.so
# 3. restart ff/tb # 3. restart ff/tb
# it has to be done manually for now, but at least we have a way for # it has to be done manually for now, but at least we have a way for
# users to quickly mitigate future problems, or whatever :-) # users to quickly mitigate future problems, or whatever :-)
@ -302,13 +297,6 @@ export USE_64=1
unset USE_64 || : unset USE_64 || :
%endif %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/coreconf
%make -j1 -C ./nss/lib/dbm %make -j1 -C ./nss/lib/dbm
%make -j1 -C ./nss %make -j1 -C ./nss