On Wed, 2011-01-26 at 00:06 +0100, Diego Elio Pettenò wrote: > Don't use subdirectories to generated them, and install them on the > top-level Makefile.am.
Um, why? Kent > --- > .gitignore | 10 ++++---- > Makefile.am | 7 +++++- > configure.in | 15 ++++-------- > man/Makefile.am | 2 - > man/man1/Makefile.am | 2 - > man/man1/pkcs11_startup.1.in | 20 ---------------- > man/man1/pkcsconf.1.in | 52 > ------------------------------------------ > man/man5/Makefile.am | 2 - > man/man5/pk_config_data.5.in | 19 --------------- > man/man7/Makefile.am | 2 - > man/man7/opencryptoki.7.in | 31 ------------------------- > man/man8/Makefile.am | 2 - > man/man8/pkcsslotd.8.in | 36 ----------------------------- > man/opencryptoki.7.in | 31 +++++++++++++++++++++++++ > man/pk_config_data.5.in | 19 +++++++++++++++ > man/pkcs11_startup.1.in | 20 ++++++++++++++++ > man/pkcsconf.1.in | 52 > ++++++++++++++++++++++++++++++++++++++++++ > man/pkcsslotd.8.in | 36 +++++++++++++++++++++++++++++ > 18 files changed, 174 insertions(+), 184 deletions(-) > delete mode 100644 man/Makefile.am > delete mode 100644 man/man1/Makefile.am > delete mode 100644 man/man1/pkcs11_startup.1.in > delete mode 100644 man/man1/pkcsconf.1.in > delete mode 100644 man/man5/Makefile.am > delete mode 100644 man/man5/pk_config_data.5.in > delete mode 100644 man/man7/Makefile.am > delete mode 100644 man/man7/opencryptoki.7.in > delete mode 100644 man/man8/Makefile.am > delete mode 100644 man/man8/pkcsslotd.8.in > create mode 100644 man/opencryptoki.7.in > create mode 100644 man/pk_config_data.5.in > create mode 100644 man/pkcs11_startup.1.in > create mode 100644 man/pkcsconf.1.in > create mode 100644 man/pkcsslotd.8.in > > diff --git a/.gitignore b/.gitignore > index 104c711..ed42ae3 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -15,11 +15,11 @@ > /install-sh > /libtool > /ltmain.sh > -/man/man1/pkcs11_startup.1 > -/man/man1/pkcsconf.1 > -/man/man5/pk_config_data.5 > -/man/man7/opencryptoki.7 > -/man/man8/pkcsslotd.8 > +/man/pkcs11_startup.1 > +/man/pkcsconf.1 > +/man/pk_config_data.5 > +/man/opencryptoki.7 > +/man/pkcsslotd.8 > /misc/pkcsslotd > /missing > /usr/sbin/pkcs11_startup/pkcs11_startup > diff --git a/Makefile.am b/Makefile.am > index c243960..03de905 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -60,4 +60,9 @@ endif > > endif > > -SUBDIRS = $(LIBDIRS) $(DAEMONDIRS) man $(MISCDIR) $(TESTDIR) > +SUBDIRS = $(LIBDIRS) $(DAEMONDIRS) $(MISCDIR) $(TESTDIR) > + > +man1_MANS = man/pkcsconf.1 man/pkcs11_startup.1 > +man5_MANS = man/pk_config_data.5 > +man7_MANS = man/opencryptoki.7 > +man8_MANS = man/pkcsslotd.8 > diff --git a/configure.in b/configure.in > index 8c9ec6b..3b6f31a 100644 > --- a/configure.in > +++ b/configure.in > @@ -650,16 +650,11 @@ AC_CONFIG_FILES([Makefile > testcases/tok_obj/Makefile \ > testcases/v2.11/Makefile \ > testcases/login/Makefile \ > - man/Makefile \ > - man/man1/Makefile \ > - man/man1/pkcsconf.1 \ > - man/man1/pkcs11_startup.1 \ > - man/man5/Makefile \ > - man/man5/pk_config_data.5 \ > - man/man7/Makefile \ > - man/man7/opencryptoki.7 \ > - man/man8/Makefile \ > - man/man8/pkcsslotd.8]) > + man/pkcsconf.1 \ > + man/pkcs11_startup.1 \ > + man/pk_config_data.5 \ > + man/opencryptoki.7 \ > + man/pkcsslotd.8]) > AC_OUTPUT > > echo "Enabled features:" > diff --git a/man/Makefile.am b/man/Makefile.am > deleted file mode 100644 > index 1836424..0000000 > --- a/man/Makefile.am > +++ /dev/null > @@ -1,2 +0,0 @@ > -SUBDIRS = man1 man5 man7 man8 > - > diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am > deleted file mode 100644 > index 8f0e5ee..0000000 > --- a/man/man1/Makefile.am > +++ /dev/null > @@ -1,2 +0,0 @@ > -man1_MANS=pkcs11_startup.1 pkcsconf.1 > -EXTRA_DIST = $(man1_MANS) > diff --git a/man/man1/pkcs11_startup.1.in b/man/man1/pkcs11_startup.1.in > deleted file mode 100644 > index 8f37e9b..0000000 > --- a/man/man1/pkcs11_startup.1.in > +++ /dev/null > @@ -1,20 +0,0 @@ > -.TH PKCS11_STARTUP 1 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > -.SH NAME > -pkcs11_startup > - > -.SH DESCRIPTION > -Script that detects available tokens from installed shared object > -libraries and writes corresponding records to the pk_config_data > -file. The pkcsslotd daemon later uses this information when > -initializing the tokens. The script should be run each time a > -new token has been installed or uninstalled. > - > -.SH "SEE ALSO" > -.PD 0 > -.TP > -\fBopencryptoki\fP(7), > -.TP > -\fBpkcsslotd\fP(8), > -.TP > -\fBpk_config_data\fP(5). > -.PD > diff --git a/man/man1/pkcsconf.1.in b/man/man1/pkcsconf.1.in > deleted file mode 100644 > index 6f5540a..0000000 > --- a/man/man1/pkcsconf.1.in > +++ /dev/null > @@ -1,52 +0,0 @@ > -.TH PKCSCONF 1 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > -.SH NAME > -pkcsconf > - > -.SH SYNOPSIS > -\fBpkcsconf\fP > -[\fB-itsmMIupPh\fP] > -[\fB-c\fP \fIslotnumber\fP \fB-U\fP \fIuserPIN\fP > -\fB-S\fP \fISOPin\fP \fB-n\fP \fInewpin\fP] > - > -.SH DESCRIPTION > -The \fBpkcsconf\fP utility displays and configures the state of the > -pkcsslotd daemon and the tokens managed by the daemon. > - > -.SH "COMMAND SUMMARY" > -.IP "\fB-i\fP" 10 > -display PKCS11 info > -.IP "\fB-t\fP" 10 > -display token info > -.IP "\fB-s\fP" 10 > -display slot info > -.IP "\fB-m\fP" 10 > -display mechanism list > -.IP "\fB-I\fP" 10 > -initialize token > -.IP "\fB-u\fP" 10 > -initialize user PIN > -.IP "\fB-p\fP" 10 > -set the user PIN > -.IP "\fB-P\fP" 10 > -set the SO PIN > -.IP "\fB-c\fP \fISLOT\fP" 10 > -specify the token slot for the operation > -.IP "\fB-U\fP \fIUSERPIN\fP" 10 > -the current user pin (for use when changing the user pin; -u and -p options); > -if not specified, user will be prompted > -.IP "\fB-S\fP \fISOPIN\fP" 10 > -the current Security Officer (SO) pin (for use when changing the SO pin; > --P option); if not specified, user will be prompted > -.IP "\fB-n\fP \fINEWPIN\fP" 10 > -the new pin (for use when changing either the user pin or the SO pin; -u, -p > -and -P options); if not specified, user will be prompted > -.IP "\fB-h\fP" 10 > -show usage information > - > -.SH SEE ALSO > -.PD 0 > -.TP > -\fBopencryptoki\fP(7), > -.TP > -\fBpkcsslotd\fP(8). > -.PD > diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am > deleted file mode 100644 > index 6ab130f..0000000 > --- a/man/man5/Makefile.am > +++ /dev/null > @@ -1,2 +0,0 @@ > -man5_MANS=pk_config_data.5 > -EXTRA_DIST = $(man5_MANS) > diff --git a/man/man5/pk_config_data.5.in b/man/man5/pk_config_data.5.in > deleted file mode 100644 > index 5c0c096..0000000 > --- a/man/man5/pk_config_data.5.in > +++ /dev/null > @@ -1,19 +0,0 @@ > -.TH PK_CONFIG_DATA 5 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > -.SH NAME > -pk_config_data \- Configuration file for pkcsslotd. > - > -.SH DESCRIPTION > -This file contains records corresponding to available openCryptoki > -tokens. At startup, the pkcsslotd daemon parses this file to determine > -which tokens are available for use. The file should not be manually > -edited and will be overwritten each time pkcs11_startup is run. > - > -.SH "SEE ALSO" > -.PD 0 > -.TP > -\fBopencryptoki\fP(7), > -.TP > -\fBpkcsslotd\fP(8), > -.TP > -\fBpkcs11_startup\fP(1). > -.PD > diff --git a/man/man7/Makefile.am b/man/man7/Makefile.am > deleted file mode 100644 > index 30d9e09..0000000 > --- a/man/man7/Makefile.am > +++ /dev/null > @@ -1,2 +0,0 @@ > -man7_MANS=opencryptoki.7 > -EXTRA_DIST = $(man7_MANS) > diff --git a/man/man7/opencryptoki.7.in b/man/man7/opencryptoki.7.in > deleted file mode 100644 > index 659a979..0000000 > --- a/man/man7/opencryptoki.7.in > +++ /dev/null > @@ -1,31 +0,0 @@ > -.TH OPENCRYPTOKI 7 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > -.SH NAME > -openCryptoki \- A PKCS#11 implementation. > - > -.SH DESCRIPTION > -\fBopenCryptoki\fP is an implementation of the PKCS#11 API standard. It > -provides an interface to the functions of underlying cryptographic > -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. > - > -Use the \fIpkcsconf\fP utility to further configure openCryptoki once the > -daemon is running. > - > -.SH "SEE ALSO" > -.PD 0 > -.TP > -\fBpkcsslotd\fP(8), > -.TP > -\fBpkcsconf\fP(1), > -.TP > -\fBpk_config_data\fP(5), > -.TP > -\fBpkcs11_startup\fP(1). > -.PD > diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am > deleted file mode 100644 > index 55a792d..0000000 > --- a/man/man8/Makefile.am > +++ /dev/null > @@ -1,2 +0,0 @@ > -man8_MANS=pkcsslotd.8 > -EXTRA_DIST = $(man8_MANS) > diff --git a/man/man8/pkcsslotd.8.in b/man/man8/pkcsslotd.8.in > deleted file mode 100644 > index 021a784..0000000 > --- a/man/man8/pkcsslotd.8.in > +++ /dev/null > @@ -1,36 +0,0 @@ > -.TH PKCSSLOTD 8 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > -.SH NAME > -pkcsslotd - shared memory manager for opencryptoki > - > -.SH DESCRIPTION > -The \fBpkcsslotd\fP daemon manages PKCS#11 objects between > -PKCS#11-enabled applications. When 2 or more processes are accessing > -the same cryptographic token, the daemon is notified and updates > -each application when the token's objects change. > - > -.SH NOTES > -Only one instance of the pkcsslotd daemon should be running on any > -given host. If a prior instance of pkcsslotd did not shut down > -cleanly, then it may leave an allocated shared memory segment on > -the system. The allocated memory segment can be identified by its > -key and can be safely removed once the daemon is stopped with the > -ipcrm command, such as: > - > -\fIipcrm -M 0x6202AB38\fP > - > -In order to prevent a denial of service against the daemon, the > -shared memory segment is created with group ownership by the > -"pkcs11" group. Any application that requires access to a pkcs11 > -token must be run by a user who's a member of the "pkcs11" group. > - > -.SH "SEE ALSO" > -.PD 0 > -.TP > -\fBopencryptoki\fP(7), > -.TP > -\fBpkcsconf\fP(1), > -.TP > -\fBpk_config_data\fP(5), > -.TP > -\fBpkcs11_startup\fP(1). > -.PD > diff --git a/man/opencryptoki.7.in b/man/opencryptoki.7.in > new file mode 100644 > index 0000000..659a979 > --- /dev/null > +++ b/man/opencryptoki.7.in > @@ -0,0 +1,31 @@ > +.TH OPENCRYPTOKI 7 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > +.SH NAME > +openCryptoki \- A PKCS#11 implementation. > + > +.SH DESCRIPTION > +\fBopenCryptoki\fP is an implementation of the PKCS#11 API standard. It > +provides an interface to the functions of underlying cryptographic > +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. > + > +Use the \fIpkcsconf\fP utility to further configure openCryptoki once the > +daemon is running. > + > +.SH "SEE ALSO" > +.PD 0 > +.TP > +\fBpkcsslotd\fP(8), > +.TP > +\fBpkcsconf\fP(1), > +.TP > +\fBpk_config_data\fP(5), > +.TP > +\fBpkcs11_startup\fP(1). > +.PD > diff --git a/man/pk_config_data.5.in b/man/pk_config_data.5.in > new file mode 100644 > index 0000000..5c0c096 > --- /dev/null > +++ b/man/pk_config_data.5.in > @@ -0,0 +1,19 @@ > +.TH PK_CONFIG_DATA 5 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > +.SH NAME > +pk_config_data \- Configuration file for pkcsslotd. > + > +.SH DESCRIPTION > +This file contains records corresponding to available openCryptoki > +tokens. At startup, the pkcsslotd daemon parses this file to determine > +which tokens are available for use. The file should not be manually > +edited and will be overwritten each time pkcs11_startup is run. > + > +.SH "SEE ALSO" > +.PD 0 > +.TP > +\fBopencryptoki\fP(7), > +.TP > +\fBpkcsslotd\fP(8), > +.TP > +\fBpkcs11_startup\fP(1). > +.PD > diff --git a/man/pkcs11_startup.1.in b/man/pkcs11_startup.1.in > new file mode 100644 > index 0000000..8f37e9b > --- /dev/null > +++ b/man/pkcs11_startup.1.in > @@ -0,0 +1,20 @@ > +.TH PKCS11_STARTUP 1 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > +.SH NAME > +pkcs11_startup > + > +.SH DESCRIPTION > +Script that detects available tokens from installed shared object > +libraries and writes corresponding records to the pk_config_data > +file. The pkcsslotd daemon later uses this information when > +initializing the tokens. The script should be run each time a > +new token has been installed or uninstalled. > + > +.SH "SEE ALSO" > +.PD 0 > +.TP > +\fBopencryptoki\fP(7), > +.TP > +\fBpkcsslotd\fP(8), > +.TP > +\fBpk_config_data\fP(5). > +.PD > diff --git a/man/pkcsconf.1.in b/man/pkcsconf.1.in > new file mode 100644 > index 0000000..6f5540a > --- /dev/null > +++ b/man/pkcsconf.1.in > @@ -0,0 +1,52 @@ > +.TH PKCSCONF 1 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > +.SH NAME > +pkcsconf > + > +.SH SYNOPSIS > +\fBpkcsconf\fP > +[\fB-itsmMIupPh\fP] > +[\fB-c\fP \fIslotnumber\fP \fB-U\fP \fIuserPIN\fP > +\fB-S\fP \fISOPin\fP \fB-n\fP \fInewpin\fP] > + > +.SH DESCRIPTION > +The \fBpkcsconf\fP utility displays and configures the state of the > +pkcsslotd daemon and the tokens managed by the daemon. > + > +.SH "COMMAND SUMMARY" > +.IP "\fB-i\fP" 10 > +display PKCS11 info > +.IP "\fB-t\fP" 10 > +display token info > +.IP "\fB-s\fP" 10 > +display slot info > +.IP "\fB-m\fP" 10 > +display mechanism list > +.IP "\fB-I\fP" 10 > +initialize token > +.IP "\fB-u\fP" 10 > +initialize user PIN > +.IP "\fB-p\fP" 10 > +set the user PIN > +.IP "\fB-P\fP" 10 > +set the SO PIN > +.IP "\fB-c\fP \fISLOT\fP" 10 > +specify the token slot for the operation > +.IP "\fB-U\fP \fIUSERPIN\fP" 10 > +the current user pin (for use when changing the user pin; -u and -p options); > +if not specified, user will be prompted > +.IP "\fB-S\fP \fISOPIN\fP" 10 > +the current Security Officer (SO) pin (for use when changing the SO pin; > +-P option); if not specified, user will be prompted > +.IP "\fB-n\fP \fINEWPIN\fP" 10 > +the new pin (for use when changing either the user pin or the SO pin; -u, -p > +and -P options); if not specified, user will be prompted > +.IP "\fB-h\fP" 10 > +show usage information > + > +.SH SEE ALSO > +.PD 0 > +.TP > +\fBopencryptoki\fP(7), > +.TP > +\fBpkcsslotd\fP(8). > +.PD > diff --git a/man/pkcsslotd.8.in b/man/pkcsslotd.8.in > new file mode 100644 > index 0000000..021a784 > --- /dev/null > +++ b/man/pkcsslotd.8.in > @@ -0,0 +1,36 @@ > +.TH PKCSSLOTD 8 "May 2007" "@PACKAGE_VERSION@" "openCryptoki" > +.SH NAME > +pkcsslotd - shared memory manager for opencryptoki > + > +.SH DESCRIPTION > +The \fBpkcsslotd\fP daemon manages PKCS#11 objects between > +PKCS#11-enabled applications. When 2 or more processes are accessing > +the same cryptographic token, the daemon is notified and updates > +each application when the token's objects change. > + > +.SH NOTES > +Only one instance of the pkcsslotd daemon should be running on any > +given host. If a prior instance of pkcsslotd did not shut down > +cleanly, then it may leave an allocated shared memory segment on > +the system. The allocated memory segment can be identified by its > +key and can be safely removed once the daemon is stopped with the > +ipcrm command, such as: > + > +\fIipcrm -M 0x6202AB38\fP > + > +In order to prevent a denial of service against the daemon, the > +shared memory segment is created with group ownership by the > +"pkcs11" group. Any application that requires access to a pkcs11 > +token must be run by a user who's a member of the "pkcs11" group. > + > +.SH "SEE ALSO" > +.PD 0 > +.TP > +\fBopencryptoki\fP(7), > +.TP > +\fBpkcsconf\fP(1), > +.TP > +\fBpk_config_data\fP(5), > +.TP > +\fBpkcs11_startup\fP(1). > +.PD ------------------------------------------------------------------------------ Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d _______________________________________________ Opencryptoki-tech mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opencryptoki-tech
