Selective merge from master
- Resolves: rhbz#996639 - Minor bugs in nss man pages - Fix some typos and improve description and see also sections
This commit is contained in:
Elio Maldonado
parent
547efdc318
commit
d57847c0d6
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
<refnamediv>
|
||||
<refname>cert9.db</refname>
|
||||
<refpurpose>Legacy NSS certificate database</refpurpose>
|
||||
<refpurpose>NSS certificate database</refpurpose>
|
||||
</refnamediv>
|
||||
|
||||
<refsection id="description">
|
||||
<title>Description</title>
|
||||
<para><emphasis>cert9.db</emphasis> is an NSS certificate database.</para>
|
||||
<para>This certificate database is the sqlite-based shared databse with support for concurrent access.
|
||||
<para>This certificate database is the sqlite-based shared database with support for concurrent access.
|
||||
</para>
|
||||
</refsection>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
<refnamediv>
|
||||
<refname>key4.db</refname>
|
||||
<refpurpose>Legacy NSS certificate database</refpurpose>
|
||||
<refpurpose>NSS certificate database</refpurpose>
|
||||
</refnamediv>
|
||||
|
||||
<refsection id="description">
|
||||
|
|
|
|||
37
nss.spec
37
nss.spec
|
|
@ -20,7 +20,7 @@
|
|||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: 3.15.1
|
||||
Release: 3%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: MPLv2.0
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -95,7 +95,7 @@ Patch25: nsspem-use-system-freebl.patch
|
|||
# This patch is currently meant for stable branches
|
||||
Patch29: nss-ssl-cbc-random-iv-off-by-default.patch
|
||||
# Prevent users from trying to enable ssl pkcs11 bypass
|
||||
Patch39: nss-ssl-enforce-no-pkcs11-bypass.path
|
||||
# Patch39: nss-ssl-enforce-no-pkcs11-bypass.path
|
||||
# TODO: Remove this patch when the ocsp test are fixed
|
||||
Patch40: nss-3.14.0.0-disble-ocsp-test.patch
|
||||
Patch44: 0001-sync-up-with-upstream-softokn-changes.patch
|
||||
|
|
@ -197,7 +197,7 @@ low level services.
|
|||
%patch25 -p0 -b .systemfreebl
|
||||
# activate for stable and beta branches
|
||||
%patch29 -p0 -b .cbcrandomivoff
|
||||
#%patch39 -p0 -b .nobypass
|
||||
# %%patch39 -p0 -b .nobypass
|
||||
%patch40 -p0 -b .noocsptest
|
||||
%patch44 -p1 -b .syncupwithupstream
|
||||
%patch45 -p0 -b .notrash
|
||||
|
|
@ -601,17 +601,17 @@ fi
|
|||
/sbin/ldconfig
|
||||
|
||||
%posttrans
|
||||
# An earlier version of this package had an incorrect %postun script (3.14.3-9).
|
||||
# (The incorrect %postun always called "update-alternatives --remove",
|
||||
# An earlier version of this package had an incorrect %%postun script (3.14.3-9).
|
||||
# (The incorrect %%postun always called "update-alternatives --remove",
|
||||
# because it incorrectly assumed that test -f returns false for symbolic links.)
|
||||
# The only possible remedy to fix the mistake that "always removes on upgrade"
|
||||
# made by the older %postun script, is to repair it in %posttrans of the new package.
|
||||
# made by the older %%postun script, is to repair it in %%posttrans of the new package.
|
||||
# Strategy:
|
||||
# %posttrans is never called when uninstalling.
|
||||
# %posttrans is only called when installing or upgrading a package.
|
||||
# Because %posttrans is the very last action of a package install,
|
||||
# %{_libdir}/libnssckbi.so must exist.
|
||||
# If it does not, it's the result of the incorrect removal from a broken %postun.
|
||||
# %%posttrans is never called when uninstalling.
|
||||
# %%posttrans is only called when installing or upgrading a package.
|
||||
# Because %%posttrans is the very last action of a package install,
|
||||
# %%{_libdir}/libnssckbi.so must exist.
|
||||
# If it does not, it's the result of the incorrect removal from a broken %%postun.
|
||||
# In this case, we repeat installation of the alternatives link.
|
||||
if ! test -e %{_libdir}/libnssckbi.so; then
|
||||
%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \
|
||||
|
|
@ -669,7 +669,7 @@ fi
|
|||
%{unsupported_tools_directory}/tstclnt
|
||||
%{unsupported_tools_directory}/vfyserv
|
||||
%{unsupported_tools_directory}/vfychain
|
||||
# instead of %{_mandir}/man*/* let's list them explicitely
|
||||
# instead of %%{_mandir}/man*/* let's list them explicitely
|
||||
# supported tools
|
||||
%attr(0644,root,root) %doc /usr/share/man/man1/certutil.1.gz
|
||||
%attr(0644,root,root) %doc /usr/share/man/man1/cmsutil.1.gz
|
||||
|
|
@ -760,6 +760,17 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 19 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-5
|
||||
- Resolves: rhbz#996639 - Minor bugs in nss man pages
|
||||
- Fix some typos and improve description and see also sections
|
||||
|
||||
* Sun Aug 11 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-4
|
||||
- Cleanup spec file to address most rpmlint errors and warnings
|
||||
- Using double percent symbols to fix macro-in-comment warnings
|
||||
- Ignore unversioned-explicit-provides nss-system-init per spec comments
|
||||
- Ignore invalid-url Source0 as it comes from the git lookaside cache
|
||||
- Ignore invalid-url Source12 as it comes from the git lookaside cache
|
||||
|
||||
* Fri Aug 02 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-3
|
||||
- Add man page for pkcs11.txt configuration file and cert and key databases
|
||||
- Resolves: rhbz#985114 - Provide man pages for the nss configuration files
|
||||
|
|
@ -1121,7 +1132,7 @@ fi
|
|||
- Move triggerpostun -n nss-sysinit script ahead of the other ones (#639248)
|
||||
|
||||
* Tue Oct 05 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-4
|
||||
- Fix invalid %postun scriptlet (#639248)
|
||||
- Fix invalid %%postun scriptlet (#639248)
|
||||
|
||||
* Wed Sep 29 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-3
|
||||
- Replace posttrans sysinit scriptlet with a triggerpostun one (#636787)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,11 @@
|
|||
<refsection id="description">
|
||||
<title>Description</title>
|
||||
<para><emphasis>secmod.db</emphasis> is an NSS security modules database.</para>
|
||||
<para>This is a BerkeyDB legacy database format. The recommende way of tracking security modules is the pkcs11.txt configuration file used in conjunction thew shared database format certificate and key dtabases.
|
||||
<para>The security modules database is used to keep track of the NSS security modules. The NSS security modules export their services via the PKCS #11 API which NSS uses as its Services Provider Interface.
|
||||
</para>
|
||||
<para>The command line utility <emphasis>modutil</emphasis> is used for managing PKCS #11 module information both within secmod.db files and within hardware tokens.
|
||||
</para>
|
||||
<para>For new applications the recommended way of tracking security modules is via the pkcs11.txt configuration file used in conjunction the new sqlite-based shared database format for certificate and key databases.
|
||||
</para>
|
||||
</refsection>
|
||||
|
||||
|
|
@ -38,12 +42,12 @@
|
|||
|
||||
<refsection>
|
||||
<title>See also</title>
|
||||
<para>cert9.db(5), key4.db(5), pkcs11.txt(5), </para>
|
||||
<para>modutil(1), cert8.db(5), cert9.db(5), key3.db(5), key4.db(5), pkcs11.txt(5)</para>
|
||||
</refsection>
|
||||
|
||||
<refsection id="authors">
|
||||
<title>Authors</title>
|
||||
<para>The nss libraries were written and maintained by developers with Netscape, Red Hat, Sun, Oracle, Mozilla, and Google.</para>
|
||||
<para>The nss libraries were written and maintained by developers with Netscape, Red Hat, Sun, Oracle, Mozilla, and Google.</para>
|
||||
<para>Authors: Elio Maldonado <emaldona@redhat.com>.</para>
|
||||
</refsection>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue