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

Update to mrtg-2.17.3

Browse Source
This commit is contained in:
Vitezslav Crhonek 2011-12-07 14:32:15 +01:00
parent 4c86448673
commit bebe1c7cec
5 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -6,3 +6,5 @@ mrtg-2.16.3.tar.gz.md5.gpg
/mrtg-2.17.0.tar.gz.md5 /mrtg-2.17.0.tar.gz.md5
/mrtg-2.17.2.tar.gz /mrtg-2.17.2.tar.gz
/mrtg-2.17.2.tar.gz.md5 /mrtg-2.17.2.tar.gz.md5
/mrtg-2.17.3.tar.gz
/mrtg-2.17.3.tar.gz.md5

32
mrtg-2.16.4-Socket6-fix.patch
View File

@ -1,32 +0,0 @@
diff -up mrtg-2.16.4/bin/mrtg.orig mrtg-2.16.4/bin/mrtg
--- mrtg-2.16.4/bin/mrtg.orig 2010-12-13 14:26:25.000000000 +0100
+++ mrtg-2.16.4/bin/mrtg 2010-12-13 14:31:30.168311050 +0100
@@ -98,6 +98,7 @@ use locales_mrtg "0.07";
BEGIN {
if (eval {local $SIG{__DIE__};require Socket6;}) {
import Socket;
+ use Socket();
import Socket6
}
}
diff -up mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm
--- mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.orig 2010-05-17 15:59:20.000000000 +0200
+++ mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm 2010-12-13 14:26:25.366152933 +0100
@@ -146,7 +146,7 @@ BEGIN {
if (eval {local $SIG{__DIE__};require Socket6;} &&
eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
- import Socket6;
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
$SNMP_Session::ipv6available = 1;
}
@@ -601,7 +601,7 @@ use Carp;
BEGIN {
if($SNMP_Session::ipv6available) {
import IO::Socket::INET6;
- import Socket6;
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
}
}

22
mrtg-2.17.2-socket6-fix.patch
View File

@ -1,11 +1,23 @@
diff -up mrtg-2.17.2/lib/mrtg2/SNMP_Session.pm.socket6 mrtg-2.17.2/lib/mrtg2/SNMP_Session.pm diff -up mrtg-2.17.3/bin/mrtg.orig mrtg-2.17.3/bin/mrtg
--- mrtg-2.17.2/lib/mrtg2/SNMP_Session.pm.socket6 2011-02-20 23:33:38.000000000 +0100 --- mrtg-2.17.3/bin/mrtg.orig 2011-12-07 14:24:11.926747910 +0100
+++ mrtg-2.17.2/lib/mrtg2/SNMP_Session.pm 2011-10-02 13:04:28.512019418 +0200 +++ mrtg-2.17.3/bin/mrtg 2011-12-07 14:25:33.522162313 +0100
@@ -300,7 +300,7 @@ sub main {
if ($cfg{enableipv6} eq 'yes') {
if ( eval {local $SIG{__DIE__};require Socket; require Socket6; require IO::Socket::INET6;}) {
import Socket;
- import Socket6;
+ Socket6->import(qw(inet_pton getaddrinfo));
debug('base', "IPv6 libraries found, IPv6 enabled.");
} else {
warn "$NOW: WARNING: IPv6 libraries not found, IPv6 disabled.\n";
diff -up mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm
--- mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm.orig 2011-12-07 14:25:45.606223538 +0100
+++ mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm 2011-12-07 14:27:21.593713162 +0100
@@ -146,7 +146,7 @@ BEGIN { @@ -146,7 +146,7 @@ BEGIN {
if (eval {local $SIG{__DIE__};require Socket6;} && if (eval {local $SIG{__DIE__};require Socket6;} &&
eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) { eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo)); - Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6));
+ Socket6->import(qw(inet_pton getaddrinfo)); + Socket6->import(qw(inet_pton getaddrinfo));
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
$SNMP_Session::ipv6available = 1; $SNMP_Session::ipv6available = 1;
@ -14,7 +26,7 @@ diff -up mrtg-2.17.2/lib/mrtg2/SNMP_Session.pm.socket6 mrtg-2.17.2/lib/mrtg2/SNM
BEGIN { BEGIN {
if($SNMP_Session::ipv6available) { if($SNMP_Session::ipv6available) {
import IO::Socket::INET6; import IO::Socket::INET6;
- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo)); - Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6));
+ Socket6->import(qw(inet_pton getaddrinfo)); + Socket6->import(qw(inet_pton getaddrinfo));
} }
} }

7
mrtg.spec
View File

@ -5,8 +5,8 @@
Summary: Multi Router Traffic Grapher Summary: Multi Router Traffic Grapher
Name: mrtg Name: mrtg
Version: 2.17.2 Version: 2.17.3
Release: 6%{?dist} Release: 1%{?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
@ -136,6 +136,9 @@ fi
%{_unitdir}/mrtg.timer %{_unitdir}/mrtg.timer
%changelog %changelog
* Wed Dec 07 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.3-1
- Update to mrtg-2.17.3
* Mon Oct 31 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.2-6 * Mon Oct 31 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.2-6
- Remove contribution useful on Windows only from documentation - Remove contribution useful on Windows only from documentation
Resolves: #749426 Resolves: #749426

4
sources
View File

@ -1,2 +1,2 @@
f4c251ef883da2509188711eff4577ad mrtg-2.17.2.tar.gz c803f671d04367ee719039ea71fb5b37 mrtg-2.17.3.tar.gz
8dd39ae249661d3678200efd4a87c88c mrtg-2.17.2.tar.gz.md5 9a5ef587c6369f9c794e3fd35f7a54ab mrtg-2.17.3.tar.gz.md5