Merge branch 'master' into 'master'

Update to 3.16.6 and split libnssckbi into a separate package

p11-kit implements nss support by replacing the libnssckbi library. This is easier to do if we keep it in a separate package.

This also contains a minor version bump, with no risk.

See merge request !3

nss.spec

@@ -3,14 +3,15 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.16.5
+Version:          3.16.6
 Release:          1
 License:          MPLv2
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System/Libraries
 Requires:         nspr >= %{nspr_version}
 Requires:         nss-softokn-freebl%{_isa} >= %{version}
 Requires:         nss-system-init
+Requires:         nss-ckbi
 BuildRequires:    nspr-devel >= %{nspr_version}
 BuildRequires:    sqlite-devel
 BuildRequires:    zlib-devel
@@ -44,6 +45,16 @@ server applications. Applications built with NSS can support SSL v2
 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509
 v3 certificates, and other security standards.
 
+%package ckbi
+Summary:          CA trust library for Network Security Services
+Group:            System/Base
+Requires:         nss = %{version}-%{release}
+
+%description ckbi
+The nss-ckbi package provides CA trust store functionality to NSS.
+This package is separated to allow replacing this library with
+another compatible implementation.
+
 %package softokn-freebl
 Summary:          Freebl library for the Network Security Services
 Group:            System/Base
@@ -275,7 +286,6 @@ done
 %{_libdir}/libsmime3.so
 %{_libdir}/libsoftokn3.so
 %{_libdir}/libsoftokn3.chk
-%{_libdir}/libnssckbi.so
 %{_libdir}/libnsspem.so
 %{unsupported_tools_directory}/shlibsign
 %dir %{_libdir}/nss
@@ -287,6 +297,9 @@ done
 %dir %{_sysconfdir}/prelink.conf.d
 %config %{_sysconfdir}/prelink.conf.d/nss-prelink.conf
 
+%files ckbi
+%defattr(-,root,root,-)
+%{_libdir}/libnssckbi.so
 
 %files sysinit
 %defattr(-,root,root,-)