- update opencryptoki man page (#1001729)

This commit is contained in:
Dan Horák 2013-11-19 15:20:03 +01:00
parent 9a8778934d
commit 484374c081
2 changed files with 45 additions and 1 deletions

View File

@ -0,0 +1,37 @@
commit b50eb39e3cf8ccfdb735fbddfcdae10bdb70e1c4
Author: Joy Latten <jmlatten@linux.vnet.ibm.com>
Date: Wed Sep 4 16:12:38 2013 -0500
Update the opencryptoki(7) man page and remove reference to
pkcs11_startup and pk_config_data.
Signed-off-by: Joy Latten <jmlatten@linux.vnet.ibm.com>
diff --git a/man/man7/opencryptoki.7.in b/man/man7/opencryptoki.7.in
index 5030bd2..bf5a65e 100644
--- a/man/man7/opencryptoki.7.in
+++ b/man/man7/opencryptoki.7.in
@@ -9,11 +9,9 @@ tokens, which may be implemented via software or hardware. The PKCS#11
specification has been released by RSA Labs. More information on PKCS#11
can be found on the RSA labs website: http://www.rsa.com/rsalabs.
-To use openCryptoki, first run \fIpkcs11_startup\fP to initialize the
-contents of the pk_config_data file. Then run the \fIpkcsslotd\fP daemon. At
-this point, openCryptoki is ready to start receiving PKCS#11 requests
-from user applications. If openCryptoki is included by your distro, its
-likely that pkcs11_startup is run automatically by an init script.
+To use openCryptoki, run the \fIpkcsslotd\fP daemon. The daemon will
+read the \fIopencryptoki.conf\fP file to collect information about the
+tokens and their slots.
Use the \fIpkcsconf\fP utility to further configure openCryptoki once the
daemon is running.
@@ -33,7 +31,5 @@ privileges of other openCryptoki users.
.TP
\fBpkcsconf\fP(1),
.TP
-\fBpk_config_data\fP(5),
-.TP
-\fBpkcs11_startup\fP(1).
+\fBopencryptoki.conf\fP(5).
.PD

View File

@ -3,7 +3,7 @@
Name: opencryptoki
Summary: Implementation of the PKCS#11 (Cryptoki) specification v2.11
Version: 3.0
Release: 4%{?dist}
Release: 5%{?dist}
License: CPL
Group: System Environment/Base
URL: http://sourceforge.net/projects/opencryptoki
@ -17,6 +17,9 @@ Patch1: %{name}-3.0-pkcsconf-man.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=995002
# http://sourceforge.net/mailarchive/message.php?msg_id=31321105
Patch2: %{name}-3.0-unit.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1001729
# http://sourceforge.net/p/opencryptoki/opencryptoki/ci/b50eb39e3cf8ccfdb735fbddfcdae10bdb70e1c4/
Patch3: opencryptoki-3.0-opencryptoki-man.patch
Requires(pre): shadow-utils coreutils sed
BuildRequires: openssl-devel
BuildRequires: trousers-devel
@ -159,6 +162,7 @@ cryptographic hardware such as IBM 4764 or 4765 that uses the
%patch0 -p1 -b .group
%patch1 -p1 -b .pkcsconf-man
%patch2 -p1 -b .unit
%patch3 -p1 -b .opencryptoki-man
# Upstream tarball has unnecessary executable perms set on the sources
find . -name '*.[ch]' -print0 | xargs -0 chmod -x
@ -289,6 +293,9 @@ exit 0
%changelog
* Tue Nov 19 2013 Dan Horák <dan[at]danny.cz> - 3.0-5
- update opencryptoki man page (#1001729)
* Fri Aug 23 2013 Dan Horák <dan[at]danny.cz> - 3.0-4
- update unit file (#995002)