svn commit: r306753 - in head/net-mgmt/mrtg: . files
Chris Rees
crees at FreeBSD.org
Wed Oct 31 17:46:53 UTC 2012
Author: crees
Date: Wed Oct 31 17:46:52 2012
New Revision: 306753
URL: http://svn.freebsd.org/changeset/ports/306753
Log:
Fix several warnings;
Subroutine SNMP_Session::pack_sockaddr_in6 redefined at /usr/local/lib/perl5/5.14.2/Exporter.pm line 67.
at /usr/local/lib/perl5/site_perl/5.14.2/SNMP_Session.pm line 149
PR: ports/166777
Submitted by: Alexey V. Panfilov <ports at subnets.ru> (maintainer)
Feature safe: yes
Added:
head/net-mgmt/mrtg/files/patch-lib-mrtg2-SNMP_Session-pm (contents, props changed)
Modified:
head/net-mgmt/mrtg/Makefile
Modified: head/net-mgmt/mrtg/Makefile
==============================================================================
--- head/net-mgmt/mrtg/Makefile Wed Oct 31 17:05:47 2012 (r306752)
+++ head/net-mgmt/mrtg/Makefile Wed Oct 31 17:46:52 2012 (r306753)
@@ -3,7 +3,7 @@
PORTNAME= mrtg
PORTVERSION= 2.17.4
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= net-mgmt ipv6
MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
Added: head/net-mgmt/mrtg/files/patch-lib-mrtg2-SNMP_Session-pm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/mrtg/files/patch-lib-mrtg2-SNMP_Session-pm Wed Oct 31 17:46:52 2012 (r306753)
@@ -0,0 +1,58 @@
+--- lib/mrtg2/SNMP_Session.pm.orig 2012-10-31 17:43:06.558051879 +0000
++++ lib/mrtg2/SNMP_Session.pm 2012-10-31 17:43:35.270071536 +0000
+@@ -146,7 +146,7 @@
+
+ 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 unpack_sockaddr_in6));
++ 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;
+ }
+@@ -545,7 +545,7 @@
+ # complaining about AF_INET6 when Socket6 is not available
+
+ if( (defined $ipv6_addr_len) && (length $addr == $ipv6_addr_len)) {
+- ($port,$addrunpack) = unpack_sockaddr_in6 ($addr);
++ ($port,$addrunpack) = Socket6::unpack_sockaddr_in6 ($addr);
+ $addrstr = inet_ntop (AF_INET6(), $addrunpack);
+ } else {
+ ($port,$addrunpack) = unpack_sockaddr_in ($addr);
+@@ -601,7 +601,7 @@
+ BEGIN {
+ if($SNMP_Session::ipv6available) {
+ import IO::Socket::INET6;
+- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6));
++ Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
+ }
+ }
+
+@@ -820,8 +820,8 @@
+ ($p2,$a2) = unpack_sockaddr_in ($sa2);
+ } elsif($this->{'sockfamily'} == AF_INET6()) {
+ # IPv6 addresses
+- ($p1,$a1) = unpack_sockaddr_in6 ($sa1);
+- ($p2,$a2) = unpack_sockaddr_in6 ($sa2);
++ ($p1,$a1) = Socket6::unpack_sockaddr_in6 ($sa1);
++ ($p2,$a2) = Socket6::unpack_sockaddr_in6 ($sa2);
+ } else {
+ return 0;
+ }
+@@ -894,7 +894,7 @@
+ return undef unless $remote_addr;
+
+ if( (defined $ipv6_addr_len) && (length $remote_addr == $ipv6_addr_len)) {
+- ($port,$iaddr) = unpack_sockaddr_in6($remote_addr);
++ ($port,$iaddr) = Socket6::unpack_sockaddr_in6($remote_addr);
+ } else {
+ ($port,$iaddr) = unpack_sockaddr_in($remote_addr);
+ }
+@@ -943,7 +943,7 @@
+ return undef unless $remote_addr;
+
+ if( (defined $ipv6_addr_len) && (length $remote_addr == $ipv6_addr_len)) {
+- ($port,$iaddr) = unpack_sockaddr_in6($remote_addr);
++ ($port,$iaddr) = Socket6::unpack_sockaddr_in6($remote_addr);
+ } else {
+ ($port,$iaddr) = unpack_sockaddr_in($remote_addr);
+ }
More information about the svn-ports-all
mailing list