Fix errors in the man pages

- Resolves: rhbz#984106 - Add missing option descriptions to man pages for {cert|cms|crl}util
- Resolves: rhbz#982856 - Fix path to script in man page for nss-sysinit

manpages-fixes.patch

@@ -0,0 +1,209 @@
+diff --git a/doc/certutil.xml b/doc/certutil.xml
+--- a/doc/certutil.xml
++++ b/doc/certutil.xml
+@@ -634,16 +634,37 @@ of the attribute codes:
+       </varlistentry>
+ 
+       <varlistentry>
+         <term>--extSKID</term>
+         <listitem><para>Add the Subject Key ID extension to the certificate. X.509 certificate extensions are described in RFC 5280.</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry>
++        <term>--extNC</term>
++        <listitem><para>Add a Name Constraint extension to the certificate. X.509 certificate extensions are described in RFC 5280.</para></listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>--keyAttrFlags attrflags</term>
++        <listitem><para>
++PKCS #11 key Attributes. Comma separated list of key attribute flags, selected from the following list of choices: {token | session} {public | private} {sensitive | insensitive} {modifiable | unmodifiable} {extractable | unextractable}</para></listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>--keyFlagsOn opflags</term>
++        <term>--keyFlagsOff opflags</term>
++        <listitem><para>
++PKCS #11 key Operation Flags.
++Comma separated list of one or more of the following:
++{token | session} {public | private} {sensitive | insensitive} {modifiable | unmodifiable} {extractable | unextractable}
++          </para></listitem>
++      </varlistentry>
++
++      <varlistentry>
+         <term>--source-dir certdir</term>
+         <listitem><para>Identify the certificate database directory to upgrade.</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+         <term>--source-prefix certdir</term>
+         <listitem><para>Give the prefix of the certificate and key databases to upgrade.</para></listitem>
+       </varlistentry>
+@@ -795,17 +816,17 @@ JyBVgFqDXRYSyTBNw1DrxUU/3GvWA/ngjAwHEv0C
+ XRzPORlC2WY3gkk7vmlsLvYpyecNazAi/NAwVnU/66HOsaoVFWE+gBQo99UrN2yk
+ 0BiK/GMFlLm5dXQROgA9ZKKyFdI0LIXtf6SbAgMBAAGjMzAxMBEGCWCGSAGG+EIB
+ AQQEAwIHADAMBgNVHRMEBTADAQH/MA4GA1UdDwEB/wQEAwICBDANBgkqhkiG9w0B
+ AQUFAAOBgQA6chkzkACN281d1jKMrc+RHG2UMaQyxiteaLVZO+Ro1nnRUvseDf09
+ XKYFwPMJjWCihVku6bw/ihZfuMHhxK22Nue6inNQ6eDu7WmrqL8z3iUrQwxs+WiF
+ ob2rb8XRVVJkzXdXxlk4uo3UtNvw8sAz7sWD71qxKaIHU5q49zijfg==
+ -----END CERTIFICATE-----
+ </programlisting>
+-<pa>For a humam-readable display</para>
++<para>For a human-readable display</para>
+ <programlisting>$ certutil -L -d sql:$HOME/nssdb -n my-ca-cert
+ Certificate:
+     Data:
+         Version: 3 (0x2)
+         Serial Number: 3650 (0xe42)
+         Signature Algorithm: PKCS #1 SHA-1 With RSA Encryption
+         Issuer: "CN=Example CA"
+         Validity:
+diff --git a/doc/cmsutil.xml b/doc/cmsutil.xml
+--- a/doc/cmsutil.xml
++++ b/doc/cmsutil.xml
+@@ -84,19 +84,26 @@ The options and arguments for the cmsuti
+       <varlistentry>
+         <term>-S </term>
+         <listitem><para>Sign a message.</para></listitem>
+       </varlistentry>
+ 
+     </variablelist>
+ 
+ 	<para><command>Arguments</command></para>
+-	<para>Option arguments modify an action and are lowercase.</para>
++	<para>Option arguments modify an action.</para>
+ 	<variablelist>
+       <varlistentry>
++        <term>-b </term>
++        <listitem>
++          <para>Decode a batch of files named in infile.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
+         <term>-c content </term>
+         <listitem>
+           <para>Use this detached content (decode only).</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+         <term>-d dbdir</term>
+@@ -108,37 +115,58 @@ The options and arguments for the cmsuti
+       <varlistentry>
+         <term>-e envfile</term>
+         <listitem>
+           <para>Specify a file containing an enveloped message for a set of recipients to which you would like to send an encrypted message. If this is the first encrypted message for that set of recipients, a new enveloped message will be created that you can then use for future messages (encrypt only).</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
++        <term>-f pwfile</term>
++        <listitem>
++          <para>Use password file to set password on all PKCS#11 tokens.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
+         <term>-G</term>
+         <listitem>
+           <para>Include a signing time attribute (sign only).</para>
+         </listitem>
+       </varlistentry>
+-	
++
++      <varlistentry>
++        <term>-H hash</term>
++        <listitem>
++          <para>Use specified hash algorithm (default:SHA1).</para>
++        </listitem>
++      </varlistentry>
++
+       <varlistentry>
+         <term>-h num</term>
+         <listitem>
+           <para>Generate email headers with info about CMS message (decode only).</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+         <term>-i infile</term>
+         <listitem>
+           <para>Use infile as a source of data (default is stdin).</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
++        <term>-k</term>
++        <listitem>
++          <para>Keep decoded encryption certs in permanent cert db.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
+         <term>-N nickname</term>
+         <listitem>
+           <para>Specify nickname of certificate to sign with (sign only).</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+         <term>-n </term>
+@@ -188,16 +216,23 @@ For certificates-only message, list of c
+       <varlistentry>
+         <term>-u certusage</term>
+         <listitem>
+           <para>Set type of cert usage (default is certUsageEmailSigner).</para>
+         </listitem>
+       </varlistentry>
+ 
+       <varlistentry>
++        <term>-v</term>
++        <listitem>
++          <para>Print debugging information.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
+         <term>-Y ekprefnick</term>
+         <listitem>
+           <para>Specify an encryption key preference by nickname.</para>
+         </listitem>
+       </varlistentry>
+ 
+     </variablelist>
+ 
+diff --git a/doc/crlutil.xml b/doc/crlutil.xml
+--- a/doc/crlutil.xml
++++ b/doc/crlutil.xml
+@@ -261,16 +261,30 @@ Specify type of CRL. possible types are:
+         <term>-u url </term>
+         <listitem>
+           <para>
+ Specify the url.
+           </para>
+         </listitem>
+       </varlistentry>
+ 
++      <varlistentry>
++        <term>-w pwd-string</term>
++        <listitem>
++          <para>Provide db password in command line.</para>
++        </listitem>
++      </varlistentry>
++
++      <varlistentry>
++        <term>-Z algorithm</term>
++        <listitem>
++          <para>Specify the hash algorithm to use for signing the CRL.</para>
++        </listitem>
++      </varlistentry>
++
+     </variablelist>
+   </refsection>
+ 
+   <refsection id="syntax">
+     <title>CRL Generation script syntax</title>
+     <para>CRL generation script file has the following syntax:</para>
+     <para>
+     * Line with comments should have # as a first symbol of a line</para>

nss.spec

@@ -20,7 +20,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.15.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -104,6 +104,8 @@ Patch48:          nss-versus-softoken-tests.patch
 # TODO remove when we switch to building nss without softoken
 Patch49:          nss-skip-bltest-and-fipstest.patch
 Patch50:          iquote.patch
+# Upstream: https://bugzilla.mozilla.org/show_bug_cgi?id=836477
+Patch51:          manpages-fixes.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -198,6 +200,9 @@ low level services.
 %patch48 -p0 -b .crypto
 %patch49 -p0 -b .skipthem
 %patch50 -p0 -b .iquote
+pushd nss
+%patch51 -p1 -b .948495
+popd
 
 #########################################################
 # Higher-level libraries and test tools need access to
@@ -467,6 +472,7 @@ echo "test suite completed"
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
 
 touch $RPM_BUILD_ROOT%{_libdir}/libnssckbi.so
 %{__install} -p -m 755 dist/*.OBJ/lib/libnssckbi.so $RPM_BUILD_ROOT/%{_libdir}/nss/libnssckbi.so
@@ -527,7 +533,7 @@ done
 for f in nss-config setup-nsssysinit; do 
    install -c -m 644 ${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
 done
-# Copy the man pages the nss tools
+# Copy the man pages for the nss tools
 for f in "%{allTools}"; do 
    install -c -m 644 ${f}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${f}.1
 done
@@ -723,6 +729,11 @@ fi
 
 
 %changelog
+* Fri Jul 19 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-2
+- Fix errors in the man pages
+- Resolves: rhbz#984106 - Add missing option descriptions to man pages for {cert|cms|crl}util
+- Resolves: rhbz#982856 - Fix path to script in man page for nss-sysinit
+
 * Tue Jul 02 2013 Elio Maldonado <emaldona@redhat.com> - 3.15.1-1
 - Update to NSS_3_15_1_RTM
 - Enable the iquote.patch to access newly introduced types

setup-nsssysinit.xml

@@ -95,7 +95,7 @@
 
   <refsection id="authors">
     <title>Authors</title>
-    <para>The nss liraries 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 &lt;emaldona@redhat.com>.</para>
   </refsection>