rpms/mrtg
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix mrtg-traffic-sum incorrectly ignores 'man' option

Browse Source
This commit is contained in:
Vitezslav Crhonek 2018-10-18 13:45:37 +02:00
parent 35d7797333
commit fba333614a
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mrtg-2.17.7-traffic-sum-man-option.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up mrtg-2.17.7/bin/mrtg-traffic-sum.orig mrtg-2.17.7/bin/mrtg-traffic-sum
--- mrtg-2.17.7/bin/mrtg-traffic-sum.orig 2018-10-18 12:21:12.616589922 +0200
+++ mrtg-2.17.7/bin/mrtg-traffic-sum 2018-10-18 12:23:10.852648709 +0200
@@ -58,7 +58,7 @@ sub mailout($$);
sub main()
{
# parse options
- GetOptions(\%opt, 'min=i','help|h', 'catch=s', 'email=s','version','range=s','units=s') or exit(1);
+ GetOptions(\%opt, 'min=i','help|h', 'catch=s', 'email=s','version','range=s','units=s','man') or exit(1);
if($opt{help}) { pod2usage(1) }
if($opt{man}) { pod2usage(-exitstatus => 0, -verbose => 2) }
if($opt{version}) { print "mrtg-traffic-sum $Revision\n"; exit(0) }

9
mrtg.spec
View File

@ -6,7 +6,7 @@
Summary: Multi Router Traffic Grapher Summary: Multi Router Traffic Grapher
Name: mrtg Name: mrtg
Version: 2.17.7 Version: 2.17.7
Release: 1%{?dist} Release: 2%{?dist}
URL: http://oss.oetiker.ch/mrtg/ URL: http://oss.oetiker.ch/mrtg/
Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5
@ -28,6 +28,8 @@ Patch0: mrtg-2.15.0-lib64.patch
Patch1: mrtg-2.17.2-socket6-fix.patch Patch1: mrtg-2.17.2-socket6-fix.patch
# Patch2: some devices return 2**32-2 on ifSpeed (e. g. IBM FibreChannel switches) # Patch2: some devices return 2**32-2 on ifSpeed (e. g. IBM FibreChannel switches)
Patch2: mrtg-2.17.4-cfgmaker-ifhighspeed.patch Patch2: mrtg-2.17.4-cfgmaker-ifhighspeed.patch
# Patch3: fixes 'man' option in mrtg-traffic-sum, see rhbz#1612188
Patch3: mrtg-2.17.7-traffic-sum-man-option.patch
License: GPLv2+ License: GPLv2+
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
@ -52,6 +54,7 @@ images which provide a LIVE visual representation of this traffic.
%patch0 -p1 -b .lib64 %patch0 -p1 -b .lib64
%patch1 -p1 -b .socket6 %patch1 -p1 -b .socket6
%patch2 -p1 -b .ifhighspeed %patch2 -p1 -b .ifhighspeed
%patch3 -p1 -b .traffic-sum-man-option
for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do
iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@ -138,6 +141,10 @@ fi
%{_unitdir}/mrtg.timer %{_unitdir}/mrtg.timer
%changelog %changelog
* Thu Oct 18 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-2
- Fix mrtg-traffic-sum incorrectly ignores 'man' option
Resolves: #1612188
* Thu Aug 09 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-1 * Thu Aug 09 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-1
- Use %%license - Use %%license
- Update to mrtg-2.17.7 - Update to mrtg-2.17.7