Overview
Request 949890 superseded
- Readd rebased mrtg-switches.patch
- Drop the icons in iconsdir, because with mrtg-icons_path.patch
mrtg looks at /usr/share/apache2/icons instead /srv/www/icons
- Run spec-cleaner and some more spec file clean ups
- Rebase mrtg-cfgmaker-ifhighspeed.patch, mrtg-icons_path.patch,
mrtg-ifHiSpeed-SG10G.patch and mrtg-lib64hack.patch
- Drop mrtg-switches.patch
- Drop mrtg-traffic-sum.1 and rateup.1, now included upstream
- Remove obsolete suse version check for fdupes
- Update to 2.17.10
* add missing mrtglib.3 to release archive
- Update to 2.17.9
* add pid to lockfile and check if the pid is still running when
trying to lock remove the stale lockfile otherwhise ...
* add contrib/mrtg-ipacc
* add mikrotik vendor to cfgmaker
* add Huawei and Eltex vendors to cfgmaker
* remove unused variables from rateup.c
* stop ignoring return value of function fgets
* fix signedness of time_t
* fix left shift of negative value
* avoid to include global options by default
* add absent mrtg-startup-script and remove extra blank spaces
from contrib/00INDEX
* add example of systemd and init scripts from Debian
(contrib/debian-systemd/)
* add examples for WorkDir in Linux in cfgmaker
* add a trivial CI test for GitHub
* add manpage for rateup
* create directories /run/mrtg/, /var/lib/mrtg/, /var/lock/mrtg/
and /var/log/mrtg/ automatically if they not exist when
using --fhs option
* fix a warning about datarootdir in Makefile.in
* fix some spelling errors in manuals and executables
* fix some uncommented lines breaking
contrib/accesslistmon/examplescript
* fix translation files for some languages (Brazilian, Catalan,
French, German, Portuguese and Spanish)
* fix whatis in manpage mrtg-squid.pod
* modernize configure.in, removing warnings
* remove an orphan symlink (mrtg-mailer.pod)
* remove files generated by the build process and forgotten
when cleaning
* remove non-free files in contrib/ (nt-service and cisco_tftp)
* remove some extra blank spaces in EOL in changelog
* rename mrtglib.1 to mrtglib.3
* update GPL-2 text in src/contrib/TTrafic to break very long
lines and fix a wrong address for FSF
* update src/bin/mrtg and its manpage to use FHS version 3.0
in --fhs option
* make ifref default to name to cfgmaker
* fix wrong line break that stop the execution in
contrib/iptables-accounting
* add new contrib: exim-stats
* fix a comment error causing doesn't chdir to workdir in
src/contrib/mrtgindex.cgi/mrtgindx.cgi
* use gawk because mawk doesn't have strftime
- Update to 2.17.8
* add missing optional textcolor property in mrtg.cfg
* automatic value for textcolor (if null) with good contrast for
every Background property value (default black text on white
background)
* fix mrtg-traffic-sum incorrectly ignores '--man' option
* add support for Alcatel and Datacom to cfgmaker
* Fix small typo
- Created by Kieltux
- In state superseded
-
Package maintainer:
dlovasko
- Supersedes 948257
- Superseded by 953035
Why do you drop mrtg-switches.patch ? Are the changes upstream - or will we loose support for the mentioned switches?
Because the mrtg-switches.patch is unclear to me: https://build.opensuse.org/package/view_file/server:monitoring/mrtg/mrtg-switches.patch?expand=1
- } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:hp|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta|dcn|brocade)/i) {
- } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:hp|juniper|dlink|wwp|foundry|dellLan|force10|3com|extremenetworks|openBSD|arista|enterasys|zyxel|vyatta|dcn|brocade|nortel|avaya|cisco)/i) {
push @Variables, "ifAlias";
}
@@ -996,6 +996,7 @@ sub DeviceInfo ($$$) {
'1.3.6.1.4.1.890.' => 'zyxel',
'1.3.6.1.4.1.2272.30' => 'nortel',
'1.3.6.1.4.1.6339' => 'DCN',
+ '1.3.6.1.4.1.45.' => 'avaya',
The patch adds nortel, avaya and cisco as router/switch, but only add deviceinfo for avaya.
'1.3.6.1.4.1.45.' => 'avaya'
Upstream added datacom, alcatel, mikrotik, huawei and eltex - all with a DeviceInfo.
Is 1.3.6.1.4.1.45 correct for avaya, nortel and cisco?
If so, I would rebase mrtg-switches.patch.
Thank you.
Request History
Kieltux created request
- Readd rebased mrtg-switches.patch
- Drop the icons in iconsdir, because with mrtg-icons_path.patch
mrtg looks at /usr/share/apache2/icons instead /srv/www/icons
- Run spec-cleaner and some more spec file clean ups
- Rebase mrtg-cfgmaker-ifhighspeed.patch, mrtg-icons_path.patch,
mrtg-ifHiSpeed-SG10G.patch and mrtg-lib64hack.patch
- Drop mrtg-switches.patch
- Drop mrtg-traffic-sum.1 and rateup.1, now included upstream
- Remove obsolete suse version check for fdupes
- Update to 2.17.10
* add missing mrtglib.3 to release archive
- Update to 2.17.9
* add pid to lockfile and check if the pid is still running when
trying to lock remove the stale lockfile otherwhise ...
* add contrib/mrtg-ipacc
* add mikrotik vendor to cfgmaker
* add Huawei and Eltex vendors to cfgmaker
* remove unused variables from rateup.c
* stop ignoring return value of function fgets
* fix signedness of time_t
* fix left shift of negative value
* avoid to include global options by default
* add absent mrtg-startup-script and remove extra blank spaces
from contrib/00INDEX
* add example of systemd and init scripts from Debian
(contrib/debian-systemd/)
* add examples for WorkDir in Linux in cfgmaker
* add a trivial CI test for GitHub
* add manpage for rateup
* create directories /run/mrtg/, /var/lib/mrtg/, /var/lock/mrtg/
and /var/log/mrtg/ automatically if they not exist when
using --fhs option
* fix a warning about datarootdir in Makefile.in
* fix some spelling errors in manuals and executables
* fix some uncommented lines breaking
contrib/accesslistmon/examplescript
* fix translation files for some languages (Brazilian, Catalan,
French, German, Portuguese and Spanish)
* fix whatis in manpage mrtg-squid.pod
* modernize configure.in, removing warnings
* remove an orphan symlink (mrtg-mailer.pod)
* remove files generated by the build process and forgotten
when cleaning
* remove non-free files in contrib/ (nt-service and cisco_tftp)
* remove some extra blank spaces in EOL in changelog
* rename mrtglib.1 to mrtglib.3
* update GPL-2 text in src/contrib/TTrafic to break very long
lines and fix a wrong address for FSF
* update src/bin/mrtg and its manpage to use FHS version 3.0
in --fhs option
* make ifref default to name to cfgmaker
* fix wrong line break that stop the execution in
contrib/iptables-accounting
* add new contrib: exim-stats
* fix a comment error causing doesn't chdir to workdir in
src/contrib/mrtgindex.cgi/mrtgindx.cgi
* use gawk because mawk doesn't have strftime
- Update to 2.17.8
* add missing optional textcolor property in mrtg.cfg
* automatic value for textcolor (if null) with good contrast for
every Background property value (default black text on white
background)
* fix mrtg-traffic-sum incorrectly ignores '--man' option
* add support for Alcatel and Datacom to cfgmaker
* Fix small typo
@dlovasko: review reminder