[mrtg] Update to mrtg-2.17.3
vcrhonek
vcrhonek at fedoraproject.org
Wed Dec 7 13:32:27 UTC 2011
commit bebe1c7cec7b503838c89938031cbc308f95835d
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Wed Dec 7 14:32:15 2011 +0100
Update to mrtg-2.17.3
.gitignore | 2 ++
mrtg-2.16.4-Socket6-fix.patch | 32 --------------------------------
mrtg-2.17.2-socket6-fix.patch | 22 +++++++++++++++++-----
mrtg.spec | 7 +++++--
sources | 4 ++--
5 files changed, 26 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f35275a..069f5c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ mrtg-2.16.3.tar.gz.md5.gpg
/mrtg-2.17.0.tar.gz.md5
/mrtg-2.17.2.tar.gz
/mrtg-2.17.2.tar.gz.md5
+/mrtg-2.17.3.tar.gz
+/mrtg-2.17.3.tar.gz.md5
diff --git a/mrtg-2.17.2-socket6-fix.patch b/mrtg-2.17.2-socket6-fix.patch
index 5fd28a2..8c421f7 100644
--- a/mrtg-2.17.2-socket6-fix.patch
+++ b/mrtg-2.17.2-socket6-fix.patch
@@ -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
---- mrtg-2.17.2/lib/mrtg2/SNMP_Session.pm.socket6 2011-02-20 23:33:38.000000000 +0100
-+++ mrtg-2.17.2/lib/mrtg2/SNMP_Session.pm 2011-10-02 13:04:28.512019418 +0200
+diff -up mrtg-2.17.3/bin/mrtg.orig mrtg-2.17.3/bin/mrtg
+--- mrtg-2.17.3/bin/mrtg.orig 2011-12-07 14:24:11.926747910 +0100
++++ 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 {
if (eval {local $SIG{__DIE__};require Socket6;} &&
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));
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::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 {
if($SNMP_Session::ipv6available) {
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));
}
}
diff --git a/mrtg.spec b/mrtg.spec
index 375edbd..c221e25 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -5,8 +5,8 @@
Summary: Multi Router Traffic Grapher
Name: mrtg
-Version: 2.17.2
-Release: 6%{?dist}
+Version: 2.17.3
+Release: 1%{?dist}
URL: http://oss.oetiker.ch/mrtg/
Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5
@@ -136,6 +136,9 @@ fi
%{_unitdir}/mrtg.timer
%changelog
+* Wed Dec 07 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.17.3-1
+- Update to mrtg-2.17.3
+
* Mon Oct 31 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.17.2-6
- Remove contribution useful on Windows only from documentation
Resolves: #749426
diff --git a/sources b/sources
index cc198b9..5cdb443 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f4c251ef883da2509188711eff4577ad mrtg-2.17.2.tar.gz
-8dd39ae249661d3678200efd4a87c88c mrtg-2.17.2.tar.gz.md5
+c803f671d04367ee719039ea71fb5b37 mrtg-2.17.3.tar.gz
+9a5ef587c6369f9c794e3fd35f7a54ab mrtg-2.17.3.tar.gz.md5
More information about the scm-commits
mailing list