From b41b0bb455621617ad16be09100872801fad4f58 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Wed, 31 Jul 2013 18:23:59 +0200 Subject: [PATCH] RH man page scan (#948523) --- psacct-6.6.1-RH-man-page-scan.patch | 197 ++++++++++++++++++++++++++++ psacct.spec | 7 +- 2 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 psacct-6.6.1-RH-man-page-scan.patch diff --git a/psacct-6.6.1-RH-man-page-scan.patch b/psacct-6.6.1-RH-man-page-scan.patch new file mode 100644 index 0000000..d8ccc32 --- /dev/null +++ b/psacct-6.6.1-RH-man-page-scan.patch @@ -0,0 +1,197 @@ +diff -Naur acct-6.6.1.orig/ac.c acct-6.6.1/ac.c +--- acct-6.6.1.orig/ac.c 2011-03-16 23:50:13.000000000 +0100 ++++ acct-6.6.1/ac.c 2013-07-31 16:44:17.859142249 +0200 +@@ -343,12 +343,29 @@ + + void give_usage(void) + { +- (void)printf("\ +- Usage: %s [-dhpVy] [-f ] [people] ...\n\ +- [--daily-totals] [--individual-totals] [--file ]\n\ +- [--complain] [--reboots] [--supplants] [--timewarps] [--print-year]\n\ +- [--compatibility] [--print-zeros] [--debug] [--tw-leniency ]\n\ +- [--tw-suspicious ] [--version] [--help]\n", program_name); ++ (void)printf( ++ "\n" ++ "Usage: %s [OPTION] ...\n" ++ "\n" ++ "OPTIONS:\n" ++ " -d, --daily-totals Print totals for each day\n" ++ " -p, --individual-totals Print time totals for each user\n" ++ " -f, --file Read from \n" ++ " --complain Print errors for whatever problem\n" ++ " --reboots Count the time between login and reboot\n" ++ " --supplants Count the time between logins on the terminal\n" ++ " --timewarps Count the time between login and time warp\n" ++ " --compatibility Shortcut for --reboots --supplants --timewarps\n" ++ " -a, --all-days Do not skip days without login activity\n" ++ " --tw-leniency Set the time warp leniency in seconds\n" ++ " --tw-suspicious Set the time warp suspicious in seconds\n" ++ " --print-year Print year when displaying dates\n" ++ " --print-zeros Don't suppress zeros in category totals\n" ++ " --debug Print verbose internal information\n" ++ " -V, --version Show version and exit\n" ++ " -h, --help Show help and exit\n" ++ , program_name); ++ + print_wtmp_file_location(); + } + +diff -Naur acct-6.6.1.orig/dump-acct.c acct-6.6.1/dump-acct.c +--- acct-6.6.1.orig/dump-acct.c 2011-03-16 23:50:13.000000000 +0100 ++++ acct-6.6.1/dump-acct.c 2013-07-31 17:45:03.075476755 +0200 +@@ -52,6 +52,7 @@ + #ifdef LINUX_MULTIFORMAT +- printf (" [--format ] [--byteswap]\n"); ++ printf (" [--format ] [--byteswap]\n"); + #endif ++ printf (" [--ahz ]\n"); + print_acct_file_location (); + } + +diff -Naur acct-6.6.1.orig/dump-acct.8 acct-6.6.1/dump-acct.8 +--- acct-6.6.1.orig/dump-acct.8 2013-07-31 15:44:16.000000000 +0200 ++++ acct-6.6.1/dump-acct.8 2013-07-31 17:48:53.348679419 +0200 +@@ -7,7 +7,9 @@ + + .SH SYNOPSYS + \fBdump-acct\fR [\fB-hrR\fR] [\fB-n\fR <\fIrecs\fR>] <\fBfiles\fR> +- [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] [\fB--help\fR] ++ [\fB--num\fR <\fIrecs\fR>] [\fB--raw\fR] [\fB--reverse\fR] ++ [\fB--byte-swap\fR] [\fB--format\fR] ++ [\fB--ahz\fR <\fIfreq\fR>] [\fB--help\fR] + + .SH DESCRIPTION + The dump-acct command transforms the output \fBfile\fR from the +@@ -31,6 +33,15 @@ + .TP + .B -n, --num NUMRECS + Display only the first NUMRECS number of records. ++.TP ++.B --ahz FREQ ++Set the AHZ (platform dependent frequency in Hertz) to FREQ. ++.TP ++.B --byteswap ++Swap the bytes (relative to your system's native byte order) in --raw output. ++.TP ++.B --format ++Set output format with --raw option. + + .SH SEE ALSO + accton (8), lastcomm (1) +diff -Naur acct-6.6.1.orig/lastcomm.c acct-6.6.1/lastcomm.c +--- acct-6.6.1.orig/lastcomm.c 2011-03-16 23:50:13.000000000 +0100 ++++ acct-6.6.1/lastcomm.c 2013-07-31 18:01:57.772529043 +0200 +@@ -304,7 +304,7 @@ + #ifdef HAVE_PAGING + "[--show-paging] " + #endif +- "[--version] [--help]\n", program_name); ++ "[--ahz ] [--version] [--help]\n", program_name); + print_acct_file_location (); + } + +diff -Naur acct-6.6.1.orig/lastcomm.1 acct-6.6.1/lastcomm.1 +--- acct-6.6.1.orig/lastcomm.1 2013-07-31 15:44:16.000000000 +0200 ++++ acct-6.6.1/lastcomm.1 2013-07-31 17:08:33.442122085 +0200 +@@ -18,54 +18,7 @@ + .I terminal-name ... + ] + .br +-[ +-.B \-\-strict-match +-] +-.br +-[ +-.B \-\-forwards +-] +-.br +-[ +-.BI \-f " filename" +-| +-.BI \-\-file " filename" +-] +-[ +-.BI \-\-ahz " hz" +-] +-.br +-[ +-.B \-\-user +-.I name +-] +-[ +-.B \-\-command +-.I name +-] +-[ +-.B \-\-tty +-.I name +-] +-.br +-[ +-.B \p +-| +-.B \-\-show_paging +-] +-[ +-.B \-\-debug +-] +-[ +-.B \-V +-| +-.B \-\-version +-] +-[ +-.B \-h +-| +-.B \-\-help +-] ++[ OPTION ... ] + .ad b + .hy 1 + .SH DESCRIPTION +@@ -115,10 +68,13 @@ + .SH OPTIONS + .PD 0 + .TP +-.B \-\-strict-match ++.B \-\-strict\-match + Print only entries that match *all* of the arguments on the command + line. + .TP ++.B \-\-print\-controls ++Print control characters. ++.TP + .BI \-\-user " name" + List records for user with + .I name. +diff -Naur acct-6.6.1.orig/sa.8 acct-6.6.1/sa.8 +--- acct-6.6.1.orig/sa.8 2013-07-31 15:44:16.000000000 +0200 ++++ acct-6.6.1/sa.8 2013-07-31 17:19:06.325431034 +0200 +@@ -43,7 +43,7 @@ + [ + .B \-i + | +-.B \-\-dont-read-summary-file ++.B \-\-dont-read-summary-files + ] + .br + [ +@@ -282,7 +282,7 @@ + When using the `\-\-threshold' option, assume that all answers to + interactive queries will be affirmative. + .TP +-.B \-i, \-\-dont-read-summary-file ++.B \-i, \-\-dont-read-summary-files + Don't read the information in the system's default + .I savacct + file. +@@ -386,7 +386,7 @@ + .I SAVACCT + file. + .TP +-.BI \-\-other-file " filename" ++.BI \-\-other-acct-file " filename" + Read from the file + .I filename + instead of the system's default diff --git a/psacct.spec b/psacct.spec index 48ea43f..0a64f6c 100644 --- a/psacct.spec +++ b/psacct.spec @@ -4,7 +4,7 @@ Summary: Utilities for monitoring process activities Name: psacct Version: 6.6.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Group: Applications/System URL: ftp://ftp.gnu.org/pub/gnu/acct/ @@ -16,6 +16,7 @@ Patch1: psacct-6.3.2-lastcomm_man.patch Patch2: acct-6.3.2-sa_manpage.patch Patch3: psacct-6.3.2-man-pages.patch Patch4: psacct-6.6.1-unnumberedsubsubsec.patch +Patch5: psacct-6.6.1-RH-man-page-scan.patch Conflicts: filesystem < 3 Conflicts: systemd < 39-1 @@ -47,6 +48,7 @@ commands. %patch2 -p1 -b .pct %patch3 -p1 -b .new %patch4 -p1 -b .subsubsec +%patch5 -p1 -b .rh-man-scan # fixing 'gets' undeclared sed -i 's|.*(gets,.*||g' lib/stdio.in.h @@ -140,6 +142,9 @@ fi %{_infodir}/accounting.info.gz %changelog +* Wed Jul 31 2013 Jaromir Capik - 6.6.1-4 +- RH man page scan (#948523) + * Mon Jun 17 2013 Jaromir Capik - 6.6.1-3 - Service fails to start if accounting file already exists (#974716)