From b2731e8eb210b3c9b2290d0650811a404ae209d3 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Thu, 21 May 2020 17:39:27 +0000 Subject: [PATCH 1/2] version autoupdate [3.52.1] --- .abf.yml | 2 +- nss.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.abf.yml b/.abf.yml index 42ac331..96c36e3 100644 --- a/.abf.yml +++ b/.abf.yml @@ -3,5 +3,5 @@ sources: blank-cert8.db: d272a7b58364862613d44261c5744f7a336bf177 blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5 blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50 - nss-3.52.tar.gz: 4ff9fcff59fab1c4b0f00d3f3ac6015d0253d242 + nss-3.52.1.tar.gz: 15c56e41102a788cebc1df3cf46ca08b71ac0942 verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5 diff --git a/nss.spec b/nss.spec index 6be431b..8469e0c 100644 --- a/nss.spec +++ b/nss.spec @@ -18,7 +18,7 @@ Summary: Network Security Services Name: nss -Version: 3.52 +Version: 3.52.1 Release: 1 Epoch: 2 Group: System/Libraries From f82ecf45fe4e57ccb5fb2e596469fd54371d5443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Tue, 9 Jun 2020 02:39:30 +0300 Subject: [PATCH 2/2] Updated to 3.53 --- .abf.yml | 2 +- nss.spec | 33 +++++---------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/.abf.yml b/.abf.yml index 96c36e3..9ea1fc5 100644 --- a/.abf.yml +++ b/.abf.yml @@ -3,5 +3,5 @@ sources: blank-cert8.db: d272a7b58364862613d44261c5744f7a336bf177 blank-key3.db: 7f78b5bcecdb5005e7b803604b2ec9d1a9df2fb5 blank-secmod.db: bd748cf6e1465a1bbe6e751b72ffc0076aff0b50 - nss-3.52.1.tar.gz: 15c56e41102a788cebc1df3cf46ca08b71ac0942 + nss-3.53.tar.gz: 5631fd7a50ec5991052a9fa15fe775c34c8969e7 verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5 diff --git a/nss.spec b/nss.spec index 8469e0c..db5e7dc 100644 --- a/nss.spec +++ b/nss.spec @@ -18,7 +18,7 @@ Summary: Network Security Services Name: nss -Version: 3.52.1 +Version: 3.53 Release: 1 Epoch: 2 Group: System/Libraries @@ -154,15 +154,11 @@ Summary: Network Security Services (NSS) Group: System/Libraries %description -n %{libname} -This package contains the shared libraries libnss3, libnssckbi, libnssdbm3, +This package contains the shared libraries libnss3, libnssdbm3, libnssutil3, libsmime3, and libssl3. %files -n %{libname} /%{_lib}/libnss%{major}.so -/%{_lib}/libnssckbi.so -%if %{build_empty} -/%{_lib}/libnssckbi_empty.so -%endif /%{_lib}/libnssutil%{major}.so /%{_lib}/libnssdbm%{major}.so /%{_lib}/libsmime%{major}.so @@ -289,13 +285,6 @@ export NSS_ENABLE_ECC=1 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 -# 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 :-) - pushd nss/lib/ckfw/builtins perl ./certdata.perl < %{SOURCE7} popd @@ -311,14 +300,8 @@ export USE_64=1 unset USE_64 || : %endif -%make -j1 -C ./nss/coreconf -%make -j1 -C ./nss/lib/dbm -%make -j1 -C ./nss - -%if %{build_empty} -# tuck away the empty libnssckbi.so library -cp -p nss/lib/ckfw/builtins/Linux*/libnssckbi.so libnssckbi_empty.so -%endif +%make -j1 -C ./nss all +%make -j1 -C ./nss latest # install new Verisign intermediate certificate # http://qa.mandriva.com/show_bug.cgi?id=29612 @@ -371,7 +354,6 @@ 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 \ @@ -380,7 +362,7 @@ cp -aL lib/libcrmf.a \ # 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 libnssdbm3.so do install -m 755 lib/$file %{buildroot}/%{_lib} ln -sf ../../%{_lib}/$file %{buildroot}%{_libdir}/$file @@ -462,8 +444,3 @@ install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/pki/nssdb/key3.db install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pki/nssdb/secmod.db %{_bindir}/find docs -type f | %{_bindir}/xargs -t perl -pi -e 's/\r$//g' - -%if %{build_empty} -# install the empty libnssckbi.so library (use alternatives?) -install -m0755 libnssckbi_empty.so %{buildroot}/%{_lib}/libnssckbi_empty.so -%endif