From 0cfcf20305ba520846fd30ed45f8b48a92cf6624 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 13 Dec 2010 14:43:25 +0100 Subject: [PATCH] Resurrect part of the previous patch lost by mistake --- mrtg-2.16.4-Socket6-fix.patch | 13 ++++++++++++- mrtg.spec | 5 ++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/mrtg-2.16.4-Socket6-fix.patch b/mrtg-2.16.4-Socket6-fix.patch index 35833e1..e7a2369 100644 --- a/mrtg-2.16.4-Socket6-fix.patch +++ b/mrtg-2.16.4-Socket6-fix.patch @@ -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;} && diff --git a/mrtg.spec b/mrtg.spec index 11778a6..cc3ddc5 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -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 - 2.16.4-4 +- Resurrect part of the previous patch lost by mistake + * Mon Dec 13 2010 Vitezslav Crhonek - 2.16.4-3 - Import also getaddrinfo in SNMP_Session.pm Resolves: #662116