diff --git a/ppp-2.4.8-man-fix.patch b/ppp-2.4.8-man-fix.patch new file mode 100644 index 0000000..4ecf1f5 --- /dev/null +++ b/ppp-2.4.8-man-fix.patch @@ -0,0 +1,46 @@ +diff --git a/pppdump/pppdump.8 b/pppdump/pppdump.8 +index 4072e68..1116b85 100644 +--- a/pppdump/pppdump.8 ++++ b/pppdump/pppdump.8 +@@ -13,6 +13,8 @@ pppdump \- convert PPP record file to readable format + ]] [ + .B \-r + ] [ ++.B \-a ++] [ + .B \-m \fImru + ] [ + .I file \fR... +@@ -54,6 +56,9 @@ Reverses the direction indicators, so that `sent' is printed for + bytes or packets received, and `rcvd' is printed for bytes or packets + sent. + .TP ++.B \-a ++Prints absolute times. ++.TP + .B \-m \fImru + Use \fImru\fR as the MRU (maximum receive unit) for both directions of + the link when checking for over-length PPP packets (with the \fB\-p\fR +diff --git a/pppstats/pppstats.8 b/pppstats/pppstats.8 +index 4ac101e..cabf4d7 100644 +--- a/pppstats/pppstats.8 ++++ b/pppstats/pppstats.8 +@@ -7,6 +7,8 @@ pppstats \- print PPP statistics + [ + .B \-a + ] [ ++.B \-d ++] [ + .B \-v + ] [ + .B \-r +@@ -41,6 +43,9 @@ reports show statistics for the time since the link was initiated. + Without this option, the second and subsequent reports show statistics + for the time since the last report. + .TP ++.B \-d ++Show data rate (kB/s) instead of bytes. ++.TP + .B \-c \fIcount + Repeat the display + .I count diff --git a/ppp.spec b/ppp.spec index 42eb0e7..51e577f 100644 --- a/ppp.spec +++ b/ppp.spec @@ -2,7 +2,7 @@ Name: ppp Version: 2.4.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Point-to-Point Protocol daemon License: BSD and LGPLv2+ and GPLv2+ and Public Domain URL: http://www.samba.org/ppp @@ -50,6 +50,8 @@ Patch0025: ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patc Patch0026: ppp-2.4.8-eaptls-mppe-1.300.patch Patch0032: ppp-2.4.8-CVE-2020-8597.patch +# rhbz#1612918, https://github.com/paulusmack/ppp/pull/149 +Patch0033: ppp-2.4.8-man-fix.patch BuildRequires: gcc BuildRequires: pam-devel, libpcap-devel, systemd, systemd-devel, glib2-devel @@ -184,6 +186,9 @@ mkdir -p %{buildroot}%{_rundir}/lock/ppp %doc PLUGINS %changelog +* Thu May 21 2020 Jaroslav Škarvada - 2.4.8-6 +- Added missing options to man pages + * Tue Apr 7 2020 Jaroslav Škarvada - 2.4.8-5 - Updated EAP-TLS patch to v1.300