$ git diff --patch-with-stat --summary 895b11ec50542dad48acc297a3775adfcb9f5111..28c00dd42ce5d5294d8d98da0adeba9a826b4444
.abf.yml | 2 +-
.onedev-buildspec.yml | 4 ++++
nss.spec | 11 +++++------
3 files changed, 10 insertions(+), 7 deletions(-)
create mode 100644 .onedev-buildspec.yml
diff --git a/.abf.yml b/.abf.yml
index 934fe01..c4a8073 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.104.tar.gz: e1d60c0097b89fc94d6e490127ad36452880968e
verisign-class-3-secure-server-ca.der: 188590e94878478e33b6194e59fbbb28ff0888d5
+ nss-3.126.tar.gz: 9dc32135a2e75c8881543bc3cbd67e823407d947
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
new file mode 100644
index 0000000..b95f83a
--- /dev/null
+++ b/.onedev-buildspec.yml
@@ -0,0 +1,4 @@
+version: 40
+imports:
+- projectPath: OpenMandriva/Packages
+ revision: mirroring
diff --git a/nss.spec b/nss.spec
index e2861ec..9e5f3ec 100644
--- a/nss.spec
+++ b/nss.spec
@@ -22,11 +22,11 @@
Summary: Network Security Services
Name: nss
Epoch: 1
-Version: 3.104
+Version: 3.126
Release: 1
Group: System/Libraries
License: MPL or GPLv2+ or LGPLv2+
-Url: http://www.mozilla.org/projects/security/pki/nss/index.html
+Url: https://www.mozilla.org/projects/security/pki/nss/index.html
Source0: https://ftp.mozilla.org/pub/security/nss/releases/NSS_%{url_ver}_RTM/src/nss-%{version}.tar.gz
# pkgconfig file templates and other extras from Fedora
Source1: https://src.fedoraproject.org/rpms/nss/raw/master/f/nss-util.pc.in
@@ -64,6 +64,7 @@ Patch8: https://src.fedoraproject.org/rpms/nss/raw/master/f/nss-skip-util-gtest
# Our own
BuildRequires: rootcerts >= 1:20120218.00
+BuildRequires: make
BuildRequires: zip
BuildRequires: pkgconfig(nspr) >= 4.34.0
BuildRequires: pkgconfig(sqlite3)
@@ -303,7 +304,7 @@ cp -aL bin/* %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_includedir}/nss
-cp -aL lib/libcrmf.a lib/libnss.a lib/libnssb.a lib/libnssckfw.a lib/libnssutil.a lib/libsmime.a lib/libssl.a %{buildroot}%{_libdir}
+cp -aL lib/libnss.a lib/libnssb.a 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 libnssdbm3.so; do
@@ -530,8 +531,6 @@ end
%attr(0755,root,root) %{_bindir}/baddbdir
%attr(0755,root,root) %{_bindir}/bltest
%attr(0755,root,root) %{_bindir}/btoa
-%attr(0755,root,root) %{_bindir}/conflict
-%attr(0755,root,root) %{_bindir}/crmftest
%attr(0755,root,root) %{_bindir}/dbtool
%attr(0755,root,root) %{_bindir}/dertimetest
%attr(0755,root,root) %{_bindir}/digest
@@ -545,6 +544,7 @@ end
%attr(0755,root,root) %{_bindir}/mangle
%attr(0755,root,root) %{_bindir}/multinit
%attr(0755,root,root) %{_bindir}/nonspr10
+%attr(0755,root,root) %{_bindir}/nssdefaults
%attr(0755,root,root) %{_bindir}/ocspresp
%attr(0755,root,root) %{_bindir}/oidcalc
%attr(0755,root,root) %{_bindir}/pk11ectest
@@ -598,7 +598,6 @@ end
%{_libdir}/libfreebl%{major}.chk
%files -n %{sdevname}
-%{_libdir}/libcrmf.a
%{_libdir}/libnss.a
%{_libdir}/libnssutil.a
%{_libdir}/libnssb.a