commit 2c9927ae499e1b1aea2ff8a0615d0740a5d993d1
Author: Jacek Konieczny <[email protected]>
Date: Thu Sep 19 21:27:08 2013 +0200
fix Socket6 import conflict messages
The cron job would spit out:
Subroutine main::pack_sockaddr_in6 redefined at
/usr/share/perl5/5.18.1/Exporter.pm line 66. at /usr/bin/mrtg line 101.
Subroutine main::unpack_sockaddr_in6 redefined at
/usr/share/perl5/5.18.1/Exporter.pm line 66. at /usr/bin/mrtg line 101.
Subroutine main::sockaddr_in6 redefined at
/usr/share/perl5/5.18.1/Exporter.pm line 66. at /usr/bin/mrtg line 101.
with current Th Perl.
The mrtg-Socket6_conflicts.patch fixes that.
A similar patch to perl-SNMP_Session fixes more of those messages.
Release: 7
mrtg-Socket6_conflicts.patch | 12 ++++++++++++
mrtg.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/mrtg.spec b/mrtg.spec
index 10a8d93..0cb5811 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -13,7 +13,7 @@ Summary(pt_BR.UTF-8): Ferramenta para fazer gráficos do uso
da rede
Summary(ru.UTF-8): MRTG - программа изображения граффиков, изображающих
траффик на множестве роутеров
Name: mrtg
Version: 2.17.0
-Release: 6
+Release: 7
License: GPL
Group: Applications/Networking
Source0: http://oss.oetiker.ch/mrtg/pub/%{name}-%{version}.tar.gz
@@ -26,6 +26,7 @@ Source5: %{name}.cron
Source6: %{name}-indexmaker.cron
Source7: %{name}.tmpfiles
Patch0: %{name}.path.patch
+Patch1: %{name}-Socket6_conflicts.patch
URL: http://oss.oetiker.ch/mrtg/
BuildRequires: autoconf
BuildRequires: automake
@@ -98,6 +99,7 @@ Pliki pozwalające uruchamiać mrtg z poziomu rc-scripts.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
rm -rf lib/mrtg2/Pod
%build
diff --git a/mrtg-Socket6_conflicts.patch b/mrtg-Socket6_conflicts.patch
new file mode 100644
index 0000000..091d750
--- /dev/null
+++ b/mrtg-Socket6_conflicts.patch
@@ -0,0 +1,12 @@
+diff -dur mrtg-2.17.0.orig/bin/mrtg mrtg-2.17.0/bin/mrtg
+--- mrtg-2.17.0.orig/bin/mrtg 2010-12-15 09:15:24.000000000 +0100
++++ mrtg-2.17.0/bin/mrtg 2013-09-19 20:55:48.281448201 +0200
+@@ -98,7 +98,7 @@
+ BEGIN {
+ if (eval {local $SIG{__DIE__};require Socket6;}) {
+ import Socket;
+- import Socket6
++ Socket6->import(qw(inet_pton getaddrinfo));
+ }
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mrtg.git/commitdiff/2c9927ae499e1b1aea2ff8a0615d0740a5d993d1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
