From 45e4f546c2dfb3d6d232ca55d49b007a56d3cb44 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Mon, 21 May 2018 20:57:13 +0200 Subject: [PATCH] regenerated built files (gengetopt/help2man) includes an explicit locale for help2man to recognize umlauts. partially fixes https://github.com/OpenSC/OpenSC/issues/1365 --- src/tools/Makefile.am | 6 ++++++ src/tools/egk-tool-cmdline.c | 4 ++-- src/tools/egk-tool-cmdline.h | 4 ++-- src/tools/egk-tool.1 | 8 ++++---- src/tools/npa-tool-cmdline.c | 2 +- src/tools/npa-tool-cmdline.h | 8 ++++---- src/tools/npa-tool.1 | 10 +++++----- src/tools/opensc-asn1-cmdline.c | 4 ++-- src/tools/opensc-asn1.1 | 8 ++++---- src/tools/opensc-notify-cmdline.c | 4 +++- src/tools/opensc-notify.1 | 8 ++++---- 11 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index 7e37f107..d83a7b56 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -19,6 +19,8 @@ do_subst = $(SED) \ -e 's,[@]VDFORMAT[@],$(VDFORMAT),g' \ -e 's,[@]X509DIR[@],$(X509DIR),g' +HELP2MAN_LOCALE ?= C.UTF-8 + EGK_TOOL_BUILT_SOURCES = egk-tool-cmdline.h egk-tool-cmdline.c NPA_TOOL_BUILT_SOURCES = npa-tool-cmdline.h npa-tool-cmdline.c OPENSC_NOTIFY_BUILT_SOURCES = opensc-notify-cmdline.h opensc-notify-cmdline.c @@ -109,6 +111,7 @@ npa-tool.1: $(HELP2MAN) \ --output=$@ \ --no-info \ + --locale=$(HELP2MAN_LOCALE) \ --source='$(PACKAGE_STRING)' \ $(builddir)/npa-tool$(EXEEXT) @@ -136,6 +139,7 @@ opensc-notify.1: $(HELP2MAN) \ --output=$@ \ --no-info \ + --locale=$(HELP2MAN_LOCALE) \ --source='$(PACKAGE_STRING)' \ $(builddir)/opensc-notify$(EXEEXT) @@ -163,6 +167,7 @@ egk-tool.1: $(HELP2MAN) \ --output=$@ \ --no-info \ + --locale=$(HELP2MAN_LOCALE) \ --source='$(PACKAGE_STRING)' \ $(builddir)/egk-tool$(EXEEXT) @@ -187,6 +192,7 @@ opensc-asn1.1: $(HELP2MAN) \ --output=$@ \ --no-info \ + --locale=$(HELP2MAN_LOCALE) \ --source='$(PACKAGE_STRING)' \ $(builddir)/opensc-asn1$(EXEEXT) diff --git a/src/tools/egk-tool-cmdline.c b/src/tools/egk-tool-cmdline.c index 9fc4e4bc..1ae79678 100644 --- a/src/tools/egk-tool-cmdline.c +++ b/src/tools/egk-tool-cmdline.c @@ -1,7 +1,7 @@ /* File autogenerated by gengetopt version 2.22.6 generated with the following command: - /usr/local/bin/gengetopt --include-getopt --file-name=egk-tool-cmdline --output-dir=. + /usr/bin/gengetopt --include-getopt --file-name=egk-tool-cmdline --output-dir=. The developers of gengetopt consider the fixed text that goes in all gengetopt output files to be in the public domain: @@ -42,7 +42,7 @@ const char *gengetopt_args_info_help[] = { " --vd Show 'Allgemeine Versicherungsdaten' (XML) (default=off)", " --gvd Show 'Geschützte Versicherungsdaten' (XML) (default=off)", " --vsd-status Show 'Versichertenstammdaten-Status' (default=off)", - "\nReport bugs to opensc-devel@lists.sourceforge.net\n\nWritten by Frank Morgner ", + "\nReport bugs to https://github.com/OpenSC/OpenSC/issues\n\nWritten by Frank Morgner ", 0 }; diff --git a/src/tools/egk-tool-cmdline.h b/src/tools/egk-tool-cmdline.h index b561e653..4b891264 100644 --- a/src/tools/egk-tool-cmdline.h +++ b/src/tools/egk-tool-cmdline.h @@ -42,8 +42,8 @@ struct gengetopt_args_info int reader_arg; /**< @brief Number of the PC/SC reader to use (-1 for autodetect) (default='-1'). */ char * reader_orig; /**< @brief Number of the PC/SC reader to use (-1 for autodetect) original value given at command line. */ const char *reader_help; /**< @brief Number of the PC/SC reader to use (-1 for autodetect) help description. */ - unsigned int verbose_min; /**< @brief Use (several times) to be more verbose's minimum occurrences */ - unsigned int verbose_max; /**< @brief Use (several times) to be more verbose's maximum occurrences */ + unsigned int verbose_min; /**< @brief Use (several times) to be more verbose's minimum occurreces */ + unsigned int verbose_max; /**< @brief Use (several times) to be more verbose's maximum occurreces */ const char *verbose_help; /**< @brief Use (several times) to be more verbose help description. */ int pd_flag; /**< @brief Show 'Persönliche Versicherungsdaten' (XML) (default=off). */ const char *pd_help; /**< @brief Show 'Persönliche Versicherungsdaten' (XML) help description. */ diff --git a/src/tools/egk-tool.1 b/src/tools/egk-tool.1 index f88a4bfe..1718093a 100644 --- a/src/tools/egk-tool.1 +++ b/src/tools/egk-tool.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH EGK-TOOL "1" "Oktober 2017" "OpenSC 0.17.0" "User Commands" +.TH EGK-TOOL "1" "May 2018" "OpenSC 0.18.0" "User Commands" .SH NAME -egk-tool \- manual page for egk-tool 0.17.0 +egk-tool \- manual page for egk-tool 0.18.0 .SH SYNOPSIS .B egk-tool [\fI\,OPTIONS\/\fR]... .SH DESCRIPTION -egk\-tool 0.17.0 +egk\-tool 0.18.0 .TP \fB\-h\fR, \fB\-\-help\fR Print help and exit @@ -36,4 +36,4 @@ Show 'Versichertenstammdaten\-Status' (default=off) .SH AUTHOR Written by Frank Morgner .SH "REPORTING BUGS" -Report bugs to opensc\-devel@lists.sourceforge.net +Report bugs to https://github.com/OpenSC/OpenSC/issues diff --git a/src/tools/npa-tool-cmdline.c b/src/tools/npa-tool-cmdline.c index a269c37b..117c6cb1 100644 --- a/src/tools/npa-tool-cmdline.c +++ b/src/tools/npa-tool-cmdline.c @@ -93,7 +93,7 @@ const char *gengetopt_args_info_help[] = { " -t, --translate=FILENAME File with APDUs of HEX_STRINGs to send through\n the secure channel (default=`stdin')", " --tr-03110v201 Force compliance to BSI TR-03110 version 2.01\n (default=off)", " --disable-all-checks Disable all checking of fly-by-data\n (default=off)", - "\nReport bugs to opensc-devel@lists.sourceforge.net\n\nWritten by Frank Morgner ", + "\nReport bugs to https://github.com/OpenSC/OpenSC/issues\n\nWritten by Frank Morgner ", 0 }; diff --git a/src/tools/npa-tool-cmdline.h b/src/tools/npa-tool-cmdline.h index 4db3d937..8c78362a 100644 --- a/src/tools/npa-tool-cmdline.h +++ b/src/tools/npa-tool-cmdline.h @@ -42,8 +42,8 @@ struct gengetopt_args_info int reader_arg; /**< @brief Number of the PC/SC reader to use (-1 for autodetect) (default='-1'). */ char * reader_orig; /**< @brief Number of the PC/SC reader to use (-1 for autodetect) original value given at command line. */ const char *reader_help; /**< @brief Number of the PC/SC reader to use (-1 for autodetect) help description. */ - unsigned int verbose_min; /**< @brief Use (several times) to be more verbose's minimum occurrences */ - unsigned int verbose_max; /**< @brief Use (several times) to be more verbose's maximum occurrences */ + unsigned int verbose_min; /**< @brief Use (several times) to be more verbose's minimum occurreces */ + unsigned int verbose_max; /**< @brief Use (several times) to be more verbose's maximum occurreces */ const char *verbose_help; /**< @brief Use (several times) to be more verbose help description. */ char * pin_arg; /**< @brief Run PACE with (transport) eID-PIN. */ char * pin_orig; /**< @brief Run PACE with (transport) eID-PIN original value given at command line. */ @@ -68,8 +68,8 @@ struct gengetopt_args_info const char *unblock_help; /**< @brief Unblock PIN (uses PUK to activate three more retries) help description. */ char ** cv_certificate_arg; /**< @brief Card Verifiable Certificate to create a certificate chain. Can be used multiple times (order is important).. */ char ** cv_certificate_orig; /**< @brief Card Verifiable Certificate to create a certificate chain. Can be used multiple times (order is important). original value given at command line. */ - unsigned int cv_certificate_min; /**< @brief Card Verifiable Certificate to create a certificate chain. Can be used multiple times (order is important).'s minimum occurrences */ - unsigned int cv_certificate_max; /**< @brief Card Verifiable Certificate to create a certificate chain. Can be used multiple times (order is important).'s maximum occurrences */ + unsigned int cv_certificate_min; /**< @brief Card Verifiable Certificate to create a certificate chain. Can be used multiple times (order is important).'s minimum occurreces */ + unsigned int cv_certificate_max; /**< @brief Card Verifiable Certificate to create a certificate chain. Can be used multiple times (order is important).'s maximum occurreces */ const char *cv_certificate_help; /**< @brief Card Verifiable Certificate to create a certificate chain. Can be used multiple times (order is important). help description. */ char * cert_desc_arg; /**< @brief Certificate description to show for Terminal Authentication. */ char * cert_desc_orig; /**< @brief Certificate description to show for Terminal Authentication original value given at command line. */ diff --git a/src/tools/npa-tool.1 b/src/tools/npa-tool.1 index 896d5abb..a9704ab2 100644 --- a/src/tools/npa-tool.1 +++ b/src/tools/npa-tool.1 @@ -1,12 +1,12 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.4. -.TH NPA-TOOL "1" "July 2016" "OpenSC 0.16.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH NPA-TOOL "1" "May 2018" "OpenSC 0.18.0" "User Commands" .SH NAME -npa-tool \- manual page for npa-tool 0.16.0 +npa-tool \- manual page for npa-tool 0.18.0 .SH SYNOPSIS .B npa-tool [\fI\,OPTIONS\/\fR]... .SH DESCRIPTION -npa\-tool 0.16.0 +npa\-tool 0.18.0 .TP \fB\-h\fR, \fB\-\-help\fR Print help and exit @@ -202,4 +202,4 @@ Disable all checking of fly\-by\-data .SH AUTHOR Written by Frank Morgner .SH "REPORTING BUGS" -Report bugs to opensc\-devel@lists.sourceforge.net +Report bugs to https://github.com/OpenSC/OpenSC/issues diff --git a/src/tools/opensc-asn1-cmdline.c b/src/tools/opensc-asn1-cmdline.c index 0f3b0f68..cafbcd55 100644 --- a/src/tools/opensc-asn1-cmdline.c +++ b/src/tools/opensc-asn1-cmdline.c @@ -1,7 +1,7 @@ /* File autogenerated by gengetopt version 2.22.6 generated with the following command: - /usr/local/bin/gengetopt --include-getopt --file-name=opensc-asn1-cmdline --output-dir=. --unamed-opts + /usr/bin/gengetopt --include-getopt --file-name=opensc-asn1-cmdline --output-dir=. --unamed-opts The developers of gengetopt consider the fixed text that goes in all gengetopt output files to be in the public domain: @@ -35,7 +35,7 @@ const char *gengetopt_args_info_description = "Parse ASN.1 data."; const char *gengetopt_args_info_help[] = { " -h, --help Print help and exit", " -V, --version Print version and exit", - "\nReport bugs to opensc-devel@lists.sourceforge.net\n\nWritten by Frank Morgner ", + "\nReport bugs to https://github.com/OpenSC/OpenSC/issues\n\nWritten by Frank Morgner ", 0 }; diff --git a/src/tools/opensc-asn1.1 b/src/tools/opensc-asn1.1 index e56762fc..a12f6f8a 100644 --- a/src/tools/opensc-asn1.1 +++ b/src/tools/opensc-asn1.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH OPENSC-ASN1 "1" "November 2017" "OpenSC 0.17.0" "User Commands" +.TH OPENSC-ASN1 "1" "May 2018" "OpenSC 0.18.0" "User Commands" .SH NAME -opensc-asn1 \- manual page for opensc-asn1 0.17.0 +opensc-asn1 \- manual page for opensc-asn1 0.18.0 .SH SYNOPSIS .B opensc-asn1 [\fI\,OPTIONS\/\fR]... [\fI\,FILES\/\fR]... .SH DESCRIPTION -opensc\-asn1 0.17.0 +opensc\-asn1 0.18.0 .PP Parse ASN.1 data. .TP @@ -18,4 +18,4 @@ Print version and exit .SH AUTHOR Written by Frank Morgner .SH "REPORTING BUGS" -Report bugs to opensc\-devel@lists.sourceforge.net +Report bugs to https://github.com/OpenSC/OpenSC/issues diff --git a/src/tools/opensc-notify-cmdline.c b/src/tools/opensc-notify-cmdline.c index 81c4b993..1f875134 100644 --- a/src/tools/opensc-notify-cmdline.c +++ b/src/tools/opensc-notify-cmdline.c @@ -43,7 +43,7 @@ const char *gengetopt_args_info_help[] = { " -R, --notify-card-removed See notify_card_inserted in opensc.conf\n (default=off)", " -G, --notify-pin-good See notify_pin_good in opensc.conf (default=off)", " -B, --notify-pin-bad See notify_pin_bad in opensc.conf (default=off)", - "\nReport bugs to opensc-devel@lists.sourceforge.net\n\nWritten by Frank Morgner ", + "\nReport bugs to https://github.com/OpenSC/OpenSC/issues\n\nWritten by Frank Morgner ", 0 }; @@ -1072,6 +1072,7 @@ cmdline_parser_internal ( int override; int initialize; + int check_required; int check_ambiguity; char *optarg; @@ -1083,6 +1084,7 @@ cmdline_parser_internal ( override = params->override; initialize = params->initialize; + check_required = params->check_required; check_ambiguity = params->check_ambiguity; if (initialize) diff --git a/src/tools/opensc-notify.1 b/src/tools/opensc-notify.1 index 3dce58c3..7628c030 100644 --- a/src/tools/opensc-notify.1 +++ b/src/tools/opensc-notify.1 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH OPENSC-NOTIFY "1" "Oktober 2017" "OpenSC 0.17.0" "User Commands" +.TH OPENSC-NOTIFY "1" "May 2018" "OpenSC 0.18.0" "User Commands" .SH NAME -opensc-notify \- manual page for opensc-notify 0.17.0 +opensc-notify \- manual page for opensc-notify 0.18.0 .SH SYNOPSIS .B opensc-notify [\fI\,OPTIONS\/\fR]... .SH DESCRIPTION -opensc\-notify 0.17.0 +opensc\-notify 0.18.0 .PP If no arguments are given, monitor smart card events and send the appropriate notification. @@ -42,4 +42,4 @@ See notify_pin_bad in opensc.conf (default=off) .SH AUTHOR Written by Frank Morgner .SH "REPORTING BUGS" -Report bugs to opensc\-devel@lists.sourceforge.net +Report bugs to https://github.com/OpenSC/OpenSC/issues