diff --git a/ppp-2.4.5-man.patch b/ppp-2.4.5-man.patch new file mode 100644 index 0000000..9ad4f2e --- /dev/null +++ b/ppp-2.4.5-man.patch @@ -0,0 +1,94 @@ +--- ppp-2.4.5/chat/chat.8.man 2010-12-16 10:20:08.000000000 +0000 ++++ ppp-2.4.5/chat/chat.8 2010-12-19 16:40:31.000000000 +0000 +@@ -50,7 +50,7 @@ + to \fIstderr\fR. + .TP + .B \-E +-Enables environment variable substituion within chat scripts using the ++Enables environment variable substitution within chat scripts using the + standard \fI$xxx\fR syntax. + .TP + .B \-v +@@ -77,7 +77,7 @@ + error messages from being sent to the SYSLOG. + .TP + .B \-T \fI +-Pass in an arbitary string, usually a phone number, that will be ++Pass in an arbitrary string, usually a phone number, that will be + substituted for the \\T substitution metacharacter in a send string. + .TP + .B \-U \fI +@@ -204,7 +204,7 @@ + .LP + \fBSAY\fR strings must be enclosed in single or double quotes. If + carriage return and line feed are needed in the string to be output, +-you must explicitely add them to your string. ++you must explicitly add them to your string. + .LP + The SAY strings could be used to give progress messages in sections of + the script where you want to have 'ECHO OFF' but still let the user +@@ -457,7 +457,7 @@ + Environment variables are available within chat scripts, if the \fI\-E\fR + option was specified in the command line. The metacharacter \fI$\fR is used + to introduce the name of the environment variable to substitute. If the +-substition fails, because the requested environment variable is not set, ++substitution fails, because the requested environment variable is not set, + \fInothing\fR is replaced for the variable. + .SH TERMINATION CODES + The \fIchat\fR program will terminate with the following completion +--- ppp-2.4.5/pppd/pppd.8.man 2010-12-16 10:20:10.000000000 +0000 ++++ ppp-2.4.5/pppd/pppd.8 2010-12-21 23:26:50.000000000 +0000 +@@ -195,7 +195,7 @@ + .TP + .B ipv6 \fI\fR,\fI + Set the local and/or remote 64-bit interface identifier. Either one may be +-omitted. The identifier must be specified in standard ascii notation of ++omitted. The identifier must be specified in standard ASCII notation of + IPv6 addresses (e.g. ::dead:beef). If the + \fIipv6cp\-use\-ipaddr\fR + option is given, the local identifier is the local IPv4 address (see above). +@@ -328,7 +328,7 @@ + The \fIdemand\fR option implies the \fIpersist\fR option. If this + behaviour is not desired, use the \fInopersist\fR option after the + \fIdemand\fR option. The \fIidle\fR and \fIholdoff\fR +-options are also useful in conjuction with the \fIdemand\fR option. ++options are also useful in conjunction with the \fIdemand\fR option. + .TP + .B domain \fId + Append the domain name \fId\fR to the local host name for authentication +@@ -515,7 +515,7 @@ + send before it rejects the options. The default value is 3. + .TP + .B ipxcp\-max\-terminate \fIn +-Set the maximum nuber of IPXCP terminate request frames before the ++Set the maximum number of IPXCP terminate request frames before the + local system considers that the peer is not listening to them. The + default value is 3. + .TP +@@ -907,7 +907,7 @@ + device. The \fIscript\fR will be run in a child process with the + pseudo-tty master as its standard input and output. An explicit + device name may not be given if this option is used. (Note: if the +-\fIrecord\fR option is used in conjuction with the \fIpty\fR option, ++\fIrecord\fR option is used in conjunction with the \fIpty\fR option, + the child process will have pipes on its standard input and output.) + .TP + .B receive\-all +@@ -1015,7 +1015,7 @@ + .TP + .B srp\-use\-pseudonym + When operating as an EAP SRP\-SHA1 client, attempt to use the pseudonym +-stored in ~/.ppp_psuedonym first as the identity, and save in this ++stored in ~/.ppp_pseudonym first as the identity, and save in this + file any pseudonym offered by the peer during authentication. + .TP + .B sync +@@ -1885,7 +1885,7 @@ + prior written permission. + .LP + 4. Redistributions of any form whatsoever must retain the following +- acknowledgments: ++ acknowledgements: + .br + "This product includes software developed by Computing Services + at Carnegie Mellon University (http://www.cmu.edu/computing/)." diff --git a/ppp.spec b/ppp.spec index db1d755..8cfb1ac 100644 --- a/ppp.spec +++ b/ppp.spec @@ -1,7 +1,7 @@ Summary: The Point-to-Point Protocol daemon Name: ppp Version: 2.4.5 -Release: 16%{?dist} +Release: 17%{?dist} License: BSD and LGPLv2+ and GPLv2+ and Public Domain Group: System Environment/Daemons URL: http://www.samba.org/ppp @@ -29,6 +29,7 @@ Patch25: ppp-2.4.5-var_run_ppp.patch Patch26: ppp-2.4.5-manpg.patch Patch27: ppp-2.4.5-eaptls-mppe-0.99.patch Patch28: ppp-2.4.5-ppp_resolv.patch +Patch29: ppp-2.4.5-man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, libpcap-devel, openssl-devel @@ -73,6 +74,7 @@ This package contains the header files for building plugins for ppp. %patch26 -p1 -b .manpg %patch27 -p1 -b .eaptls %patch28 -p1 -b .ppp_resolv +%patch29 -p1 -b .man rm -f scripts/*.local rm -f scripts/*.change_resolv_conf @@ -147,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT %doc PLUGINS %changelog +* Mon Apr 04 2011 Jiri Skala - 2.4.5-17 +- fixes #664282 and #664868 - man page fixes + * Wed Feb 09 2011 Fedora Release Engineering - 2.4.5-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild