From e5cfc720bdf6bcc1ace1a0448864463ac3fa6268 Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Fri, 14 Sep 2018 12:39:20 +0300 Subject: [PATCH] Fix a few minor manpage issues --- ...dius-Add-missing-option-descriptions.patch | 97 +++++++++++++++++++ freeradius-man-Fix-some-typos.patch | 94 ++++++++++++++++++ freeradius.spec | 8 +- 3 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 freeradius-Add-missing-option-descriptions.patch create mode 100644 freeradius-man-Fix-some-typos.patch diff --git a/freeradius-Add-missing-option-descriptions.patch b/freeradius-Add-missing-option-descriptions.patch new file mode 100644 index 0000000..4138b4f --- /dev/null +++ b/freeradius-Add-missing-option-descriptions.patch @@ -0,0 +1,97 @@ +From afb196b29606aafb5030e8c7ea414a4bd494cbc0 Mon Sep 17 00:00:00 2001 +From: Nikolai Kondrashov +Date: Fri, 14 Sep 2018 12:20:11 +0300 +Subject: [PATCH] man: Add missing option descriptions + +--- + man/man8/raddebug.8 | 4 ++++ + man/man8/radiusd.8 | 7 +++++++ + man/man8/radmin.8 | 4 ++++ + 3 files changed, 15 insertions(+) + +diff --git a/man/man8/raddebug.8 b/man/man8/raddebug.8 +index 66e80e64fa..6e27e2453c 100644 +--- a/man/man8/raddebug.8 ++++ b/man/man8/raddebug.8 +@@ -7,6 +7,8 @@ raddebug - Display debugging output from a running server. + .IR condition ] + .RB [ \-d + .IR config_directory ] ++.RB [ \-D ++.IR dictionary_directory ] + .RB [ \-n + .IR name ] + .RB [ \-i +@@ -73,6 +75,8 @@ option is equivalent to using: + .IP "\-d \fIconfig directory\fP" + The radius configuration directory, usually /etc/raddb. See the + \fIradmin\fP manual page for more description of this option. ++.IP "\-D \fIdictionary directory\fP" ++Set main dictionary directory. Defaults to \fI/usr/share/freeradius\fP. + .IP "\-n \fImname\fP" + Read \fIraddb/name.conf\fP instead of \fIraddb/radiusd.conf\fP. + .IP \-I\ \fIipv6-address\fP +diff --git a/man/man8/radiusd.8 b/man/man8/radiusd.8 +index c825f22d0d..98aef5e1be 100644 +--- a/man/man8/radiusd.8 ++++ b/man/man8/radiusd.8 +@@ -6,6 +6,8 @@ radiusd - Authentication, Authorization and Accounting server + .RB [ \-C ] + .RB [ \-d + .IR config_directory ] ++.RB [ \-D ++.IR dictionary_directory ] + .RB [ \-f ] + .RB [ \-h ] + .RB [ \-i +@@ -17,6 +19,7 @@ radiusd - Authentication, Authorization and Accounting server + .IR name ] + .RB [ \-p + .IR port ] ++.RB [ \-P ] + .RB [ \-s ] + .RB [ \-t ] + .RB [ \-v ] +@@ -55,6 +58,8 @@ configuration, and which modules are skipped, and therefore not checked. + .IP "\-d \fIconfig directory\fP" + Defaults to \fI/etc/raddb\fP. \fBRadiusd\fP looks here for its configuration + files such as the \fIdictionary\fP and the \fIusers\fP files. ++.IP "\-D \fIdictionary directory\fP" ++Set main dictionary directory. Defaults to \fI/usr/share/freeradius\fP. + .IP \-f + Do not fork, stay running as a foreground process. + .IP \-h +@@ -84,6 +89,8 @@ When this command-line option is given, all "listen" sections in + \fIradiusd.conf\fP are ignored. + + This option MUST be used in conjunction with "-i". ++.IP "\-P ++Always write out PID, even with -f. + .IP \-s + Run in "single server" mode. The server normally runs with multiple + threads and/or processes, which can lower its response time to +diff --git a/man/man8/radmin.8 b/man/man8/radmin.8 +index 5ecc963d81..5bf661fa71 100644 +--- a/man/man8/radmin.8 ++++ b/man/man8/radmin.8 +@@ -5,6 +5,8 @@ radmin - FreeRADIUS Administration tool + .B radmin + .RB [ \-d + .IR config_directory ] ++.RB [ \-D ++.IR dictionary_directory ] + .RB [ \-e + .IR command ] + .RB [ \-E ] +@@ -34,6 +36,8 @@ The following command-line options are accepted by the program. + Defaults to \fI/etc/raddb\fP. \fBradmin\fP looks here for the server + configuration files to find the "listen" section that defines the + control socket filename. ++.IP "\-D \fIdictionary directory\fP" ++Set main dictionary directory. Defaults to \fI/usr/share/freeradius\fP. + .IP "\-e \fIcommand\fP" + Run \fIcommand\fP and exit. + .IP \-E +-- +2.18.0 + diff --git a/freeradius-man-Fix-some-typos.patch b/freeradius-man-Fix-some-typos.patch new file mode 100644 index 0000000..26d84de --- /dev/null +++ b/freeradius-man-Fix-some-typos.patch @@ -0,0 +1,94 @@ +From 285f6f1891e8e8acfeb7281136efdae50dbfbe78 Mon Sep 17 00:00:00 2001 +From: Nikolai Kondrashov +Date: Fri, 14 Sep 2018 11:53:28 +0300 +Subject: [PATCH] man: Fix some typos + +--- + man/man5/radrelay.conf.5 | 2 +- + man/man5/rlm_files.5 | 2 +- + man/man5/unlang.5 | 8 ++++---- + man/man8/radrelay.8 | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/man/man5/radrelay.conf.5 b/man/man5/radrelay.conf.5 +index 5fb38bfc4e..e3e665024b 100644 +--- a/man/man5/radrelay.conf.5 ++++ b/man/man5/radrelay.conf.5 +@@ -26,7 +26,7 @@ Many sites run multiple radius servers; at least one primary and one + backup server. When the primary goes down, most NASes detect that and + switch to the backup server. + +-That will cause your accounting packets to go the the backup server - ++That will cause your accounting packets to go to the backup server - + and some NASes don't even switch back to the primary server when it + comes back up. + +diff --git a/man/man5/rlm_files.5 b/man/man5/rlm_files.5 +index bfee5030ff..52f4734ae3 100644 +--- a/man/man5/rlm_files.5 ++++ b/man/man5/rlm_files.5 +@@ -48,7 +48,7 @@ This configuration entry enables you to have configurations that + perform per-group checks, and return per-group attributes, where the + group membership is dynamically defined by a previous module. It also + lets you do things like key off of attributes in the reply, and +-express policies like like "when I send replies containing attribute ++express policies like "when I send replies containing attribute + FOO with value BAR, do more checks, and maybe send additional + attributes". + .SH CONFIGURATION +diff --git a/man/man5/unlang.5 b/man/man5/unlang.5 +index 76db8f2d1c..12fe7855b2 100644 +--- a/man/man5/unlang.5 ++++ b/man/man5/unlang.5 +@@ -36,7 +36,7 @@ the pre-defined keywords here. + + Subject to a few limitations described below, any keyword can appear + in any context. The language consists of a series of entries, each +-one one line. Each entry begins with a keyword. Entries are ++one line. Each entry begins with a keyword. Entries are + organized into lists. Processing of the language is line by line, + from the start of the list to the end. Actions are executed + per-keyword. +@@ -131,7 +131,7 @@ expanded as described in the DATA TYPES section, below. The match is + then performed on the string returned from the expansion. If the + argument is an attribute reference (e.g. &User-Name), then the match + is performed on the value of that attribute. Otherwise, the argument +-is taken to be a literal string, and and matching is done via simple ++is taken to be a literal string, and matching is done via simple + comparison. + + No statement other than "case" can appear in a "switch" block. +@@ -155,7 +155,7 @@ expanded as described in the DATA TYPES section, below. The match is + then performed on the string returned from the expansion. If the + argument is an attribute reference (e.g. &User-Name), then the match + is performed on the value of that attribute. Otherwise, the argument +-is taken to be a literal string, and and matching is done via simple ++is taken to be a literal string, and matching is done via simple + comparison. + + .DS +@@ -799,7 +799,7 @@ regular expression. If no attribute matches, nothing else is done. + The value can be an attribute reference, or an attribute-specific + string. + +-When the value is an an attribute reference, it must take the form of ++When the value is an attribute reference, it must take the form of + "&Attribute-Name". The leading "&" signifies that the value is a + reference. The "Attribute-Name" is an attribute name, such as + "User-Name" or "request:User-Name". When an attribute reference is +diff --git a/man/man8/radrelay.8 b/man/man8/radrelay.8 +index fdba6995d5..99e65732a2 100644 +--- a/man/man8/radrelay.8 ++++ b/man/man8/radrelay.8 +@@ -13,7 +13,7 @@ Many sites run multiple radius servers; at least one primary and one + backup server. When the primary goes down, most NASes detect that and + switch to the backup server. + +-That will cause your accounting packets to go the the backup server - ++That will cause your accounting packets to go to the backup server - + and some NASes don't even switch back to the primary server when it + comes back up. + +-- +2.18.0 + diff --git a/freeradius.spec b/freeradius.spec index 35b423e..78b8881 100644 --- a/freeradius.spec +++ b/freeradius.spec @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server Name: freeradius Version: 3.0.15 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -23,6 +23,8 @@ Source104: freeradius-tmpfiles.conf Patch1: freeradius-Adjust-configuration-to-fit-Red-Hat-specifics.patch Patch2: freeradius-Use-system-crypto-policy-by-default.patch +Patch3: freeradius-man-Fix-some-typos.patch +Patch4: freeradius-Add-missing-option-descriptions.patch %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -804,6 +806,10 @@ exit 0 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest %changelog +* Fri Sep 14 2018 Nikolai Kondrashov - 3.0.15-17 +- Fix a few minor manpage issues. + Resolves: Bug#1611286 Man page scan results for freeradius + * Fri Sep 07 2018 Nikolai Kondrashov - 3.0.15-16 - Add make to BuildRequires and Requires(post) to fix build and certificate generation on install.