Accepting request 875778 from mozilla:Factory

OBS-URL: https://build.opensuse.org/request/show/875778
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=171

mozilla-nss.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sun Feb 28 12:01:32 UTC 2021 - Sasi Olin <hel@lcp.world>
+
+- Add nss-btrfs-sqlite.patch to address bmo#1690232
+
+-------------------------------------------------------------------
+Sun Feb 21 14:46:47 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- update to NSS 3.61
+  * required for Firefox 86
+  * bmo#1682071 - Fix issue with IKE Quick mode deriving incorrect key
+                  values under certain conditions.
+  * bmo#1684300 - Fix default PBE iteration count when NSS is compiled
+                  with NSS_DISABLE_DBM.
+  * bmo#1651411 - Improve constant-timeness in RSA operations.
+  * bmo#1677207 - Upgrade Google Test version to latest release.
+  * bmo#1654332 - Add aarch64-make target to nss-try.
+
 -------------------------------------------------------------------
 Sun Jan 24 09:55:03 UTC 2021 - Wolfgang Rosenauer <wr@rosenauer.org>
 

mozilla-nss.spec

@@ -17,14 +17,14 @@
 #
 
 
-%global nss_softokn_fips_version 3.60
+%global nss_softokn_fips_version 3.61
 %define NSPR_min_version 4.29
 %define nspr_ver %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
 %define nssdbdir %{_sysconfdir}/pki/nssdb
 Name:           mozilla-nss
-Version:        3.60.1
+Version:        3.61
 Release:        0
-%define underscore_version 3_60_1
+%define underscore_version 3_61
 Summary:        Network Security Services
 License:        MPL-2.0
 Group:          System/Libraries
@@ -68,6 +68,7 @@ Patch24:        nss-fips-use-strong-random-pool.patch
 Patch25:        nss-fips-detect-fips-mode-fixes.patch
 Patch26:        nss-fips-combined-hash-sign-dsa-ecdsa.patch
 Patch27:        nss-fips-aes-keywrap-post.patch
+Patch28:        nss-btrfs-sqlite.patch
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
 # aarch64 + gcc4.8 fails to build on SLE-12 due to undefined references
 BuildRequires:  gcc9-c++
@@ -223,6 +224,7 @@ cd nss
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 # additional CA certificates
 #cd security/nss/lib/ckfw/builtins
@@ -259,6 +261,7 @@ export LIBDIR=%{_libdir}
 %ifarch x86_64 s390x ppc64 ppc64le ia64 aarch64 riscv64
 export USE_64=1
 %endif
+export NSS_DISABLE_GTESTS=1
 export NSS_USE_SYSTEM_SQLITE=1
 #export SQLITE_LIB_NAME=nsssqlite3
 MAKE_FLAGS="BUILD_OPT=1"
@@ -396,6 +399,7 @@ install -m 644 %{SOURCE9} %{buildroot}%{nssdbdir}
 %postun -n libfreebl3 -p /sbin/ldconfig
 %post -n libsoftokn3 -p /sbin/ldconfig
 %postun -n libsoftokn3 -p /sbin/ldconfig
+
 %post sysinit
 /sbin/ldconfig
 # make sure the current config is enabled

nss-3.60.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d
-size 82036869

nss-3.61.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370
+size 82034245

nss-btrfs-sqlite.patch

@@ -0,0 +1,18 @@
+diff -up ./lib/softoken/sdb.c.orig ./lib/softoken/sdb.c
+--- ./lib/softoken/sdb.c.orig   2020-12-11 22:49:26.961726193 -0500
++++ ./lib/softoken/sdb.c        2020-12-11 23:01:30.739122494 -0500
+@@ -690,8 +690,14 @@ sdb_openDB(const char *name, sqlite3 **s
+         openFlags = SQLITE_OPEN_READONLY;
+     } else {
+         openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
++        /* btrfs and sqlite seem to incorrectly open readwrite.
++        * when the file is readonly explicitly reject that issue here */
++        if ((_NSSUTIL_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS)  && (_NSSUTIL_Access(name, PR_ACCESS_WRITE_OK) != PR_SUCCESS)) {
++            return SQLITE_READONLY;
++        }
+     }
+
++
+     /* Requires SQLite 3.5.0 or newer. */
+     sqlerr = sqlite3_open_v2(name, sqlDB, openFlags, NULL);
+     if (sqlerr != SQLITE_OK) {