Resurrect part of the previous patch lost by mistake
This commit is contained in:
parent
0365863792
commit
0cfcf20305
@ -1,6 +1,17 @@
|
||||
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 12:43:09.681833736 +0100
|
||||
+++ 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;} &&
|
||||
|
@ -6,7 +6,7 @@
|
||||
Summary: Multi Router Traffic Grapher
|
||||
Name: mrtg
|
||||
Version: 2.16.4
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?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
|
||||
@ -121,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir %{_localstatedir}/lock/mrtg
|
||||
|
||||
%changelog
|
||||
* Mon Dec 13 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.16.4-4
|
||||
- Resurrect part of the previous patch lost by mistake
|
||||
|
||||
* Mon Dec 13 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.16.4-3
|
||||
- Import also getaddrinfo in SNMP_Session.pm
|
||||
Resolves: #662116
|
||||
|
Loading…
Reference in New Issue
Block a user