Compare commits

...

No commits in common. "c8s" and "c9s" have entirely different histories.
c8s ... c9s

4 changed files with 71 additions and 7 deletions

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

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) }

View File

@ -17,7 +17,6 @@
[Unit] [Unit]
Description=Multi-router Traffic Grapher Description=Multi-router Traffic Grapher
After=syslog.target
[Service] [Service]
Environment=LANG=C Environment=LANG=C
@ -30,7 +29,6 @@ ExecStart=/usr/bin/mrtg /etc/mrtg/mrtg.cfg --lock-file /var/lock/mrtg/mrtg_l --c
# - RunAsDaemon: no; (periodic invocation) : # - RunAsDaemon: no; (periodic invocation) :
#Type=oneshot #Type=oneshot
Type=simple Type=simple
StandardOutput=syslog
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

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: 11%{?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,16 +28,19 @@ 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+
Group: Applications/Internet
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
Requires(postun): systemd-units Requires(postun): systemd-units
Requires: perl-Socket6 perl-IO-Socket-INET6 Requires: perl-Socket6 perl-IO-Socket-INET6 perl-locale
Requires: gd Requires: gd
BuildRequires: make
BuildRequires: gd-devel, libpng-devel BuildRequires: gd-devel, libpng-devel
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: systemd-units BuildRequires: systemd-units
BuildRequires: gcc
%global __find_requires %{SOURCE3} %global __find_requires %{SOURCE3}
%global __find_provides %{SOURCE6} %global __find_provides %{SOURCE6}
@ -52,6 +55,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,10 +142,54 @@ fi
%{_unitdir}/mrtg.timer %{_unitdir}/mrtg.timer
%changelog %changelog
* Mon Aug 13 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-1 * Mon Feb 05 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-11
- Remove obsolete syslog references from service file
Resolves: RHEL-19644
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.17.7-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.17.7-9
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 09 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.7-7
- Add Requires perl-locale
Resolves: #1895580
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* 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
- Use %%license - Use %%license
- Update to mrtg-2.17.7 - Update to mrtg-2.17.7
Resolves: #1615340 Resolves: #1600933
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.4-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 22 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.4-23
- Add BuildRequires gcc
- Remove Group tag
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.4-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.4-21 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.4-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild