Merge branch 'jb36034' into 'master'

[build] Revert previous change as NSS is no longer in the critical build path. JB#36034

See merge request mer-core/nss!11

nss-nolocalsql.patch

@@ -0,0 +1,34 @@
+--- nss/lib/Makefile	2010/11/16 13:55:53	1.1
++++ nss/lib/Makefile	2010/11/16 13:57:29
+@@ -62,11 +62,11 @@
+ ZLIB_SRCDIR = zlib  # Add the zlib directory to DIRS.
+ endif
+
+-ifndef MOZILLA_CLIENT
+-ifndef NSS_USE_SYSTEM_SQLITE
+-SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
+-endif
+-endif
++#ifndef MOZILLA_CLIENT
++#ifndef NSS_USE_SYSTEM_SQLITE
++#SQLITE_SRCDIR = sqlite  # Add the sqlite directory to DIRS.
++#endif
++#endif
+
+ ifndef MOZILLA_CLIENT
+ ifeq ($(OS_ARCH),Linux)
+--- nss/lib/softoken/manifest.mn	2010/11/16 13:56:14	1.1
++++ nss/lib/softoken/manifest.mn	2010/11/16 13:58:24
+@@ -47,9 +47,9 @@
+
+ DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
+
+-ifdef SQLITE_INCLUDE_DIR
+-INCLUDES += -I$(SQLITE_INCLUDE_DIR)
+-endif
++#ifdef SQLITE_INCLUDE_DIR
++#INCLUDES += -I$(SQLITE_INCLUDE_DIR)
++#endif
+
+ EXPORTS = \
+ 	secmodt.h \

nss.changes

@@ -1,3 +1,6 @@
+* Tue Mar 12 2019 Andrew Branson <andrew.branson@jollamobile.com> - 3.39-8
+- Revert previous change as NSS is no longer in the critical build path. JB#36034
+
 * Thu Mar 07 2019 Andrew Branson <andrew.branson@jollamobile.com> - 3.39-7
 - [build] Switch to internal sqlite for NSS, to avoid build problems. JB#36034
 

nss.spec

@@ -17,14 +17,15 @@ rpm.define(string.format("nss_archive_version %s",
 Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version}
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-system-init
 Requires:         p11-kit-trust
 BuildRequires:    nspr-devel >= %{nspr_version}
+BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
 BuildRequires:    pkgconfig
 BuildRequires:    gawk
@@ -49,6 +50,7 @@ Source14:         nss-pem-1.0.4.tar.xz
 Source15:         nss-pem.cmake
 Source16:         nss-prelink.conf
 
+Patch1:           nss-nolocalsql.patch
 Patch2:           add-relro-linker-option.patch
 Patch3:           renegotiate-transitional.patch
 Patch8:           nss-sysinit-userdb-first.patch
@@ -71,7 +73,6 @@ Patch50:          iquote.patch
 # Local patch for TLS_ECDHE_{ECDSA|RSA}_WITH_3DES_EDE_CBC_SHA ciphers
 Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
 Patch62: nss-skip-util-gtest.patch
-Patch63: Rename-sqlite-library-to-avoid-clashing-with-system.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -168,6 +169,7 @@ PEM file reader for Network Security Services (NSS), implemented as a PKCS#11 mo
 %setup -q -n %{name}-%{nss_archive_version}
 %setup -q -T -D -n %{name}-%{nss_archive_version} -a 14
 
+%patch1 -p0 -b .nolocalsql
 %patch2 -p0 -b .relro
 %patch3 -p0 -b .transitional
 %patch8 -p0 -b .userdbfirst
@@ -178,7 +180,6 @@ PEM file reader for Network Security Services (NSS), implemented as a PKCS#11 mo
 pushd nss
 %patch62 -p1 -b .skip_util_gtest
 popd
-%patch63 -p1 -b .rename_sqlite3
 
 %build
 
@@ -225,6 +226,9 @@ export NSPR_LIB_DIR
 export NSSUTIL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-util | sed 's/-I//'`
 export NSSUTIL_LIB_DIR=%{_libdir}
 
+NSS_USE_SYSTEM_SQLITE=1
+export NSS_USE_SYSTEM_SQLITE
+
 export NSS_ALLOW_SSLKEYLOGFILE=1
 
 export NSS_DISABLE_GTESTS=1
@@ -494,7 +498,7 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/doc/nss-tools
 
 # Copy the binary libraries we want
-for file in libnss3.so libnsssysinit.so libsmime3.so libssl3.so libsoftokn3.so libsoftokn3.chk libnssdbm3.so libnssdbm3.chk libfreebl3.so libfreebl3.chk libfreeblpriv3.so libfreeblpriv3.chk libnsssqlite3.so libnssutil3.so
+for file in libnss3.so libnsssysinit.so libsmime3.so libssl3.so libsoftokn3.so libsoftokn3.chk libnssdbm3.so libnssdbm3.chk libfreebl3.so libfreebl3.chk libfreeblpriv3.so libfreeblpriv3.chk libnssutil3.so
 do
   %{__install} -p -m 755 dist/*.OBJ/lib/$file $RPM_BUILD_ROOT/%{_libdir}
 done
@@ -597,7 +601,6 @@ ln -s -f setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit
 %{_libdir}/libfreebl3.chk
 %{_libdir}/libfreeblpriv3.so
 %{_libdir}/libfreeblpriv3.chk
-%{_libdir}/libnsssqlite3.so
 %dir %{_sysconfdir}/pki/nssdb
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert8.db
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key3.db