Import of pkgsrc-2014Q1
This commit is contained in:
+3
-3
@@ -1,7 +1,7 @@
|
||||
# $NetBSD: Makefile,v 1.110 2013/06/04 22:16:55 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.113 2013/09/04 12:31:26 obache Exp $
|
||||
|
||||
DISTNAME= mrtg-2.17.2
|
||||
PKGREVISION= 7
|
||||
DISTNAME= mrtg-2.17.4
|
||||
PKGREVISION= 2
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
|
||||
http://oss.oetiker.ch/mrtg/pub/old/
|
||||
|
||||
+5
-5
@@ -1,9 +1,9 @@
|
||||
$NetBSD: distinfo,v 1.31 2011/08/06 11:52:16 tron Exp $
|
||||
$NetBSD: distinfo,v 1.33 2013/08/03 17:05:17 tron Exp $
|
||||
|
||||
SHA1 (mrtg-2.17.2.tar.gz) = dc591cc92ee664d4049333c19becc6a88e162008
|
||||
RMD160 (mrtg-2.17.2.tar.gz) = 8159376e1682bcabf41b73a3f7ede5a302216115
|
||||
Size (mrtg-2.17.2.tar.gz) = 1095721 bytes
|
||||
SHA1 (mrtg-2.17.4.tar.gz) = 5ae0e659001c613b847237a6b223b26cb7a8ab0f
|
||||
RMD160 (mrtg-2.17.4.tar.gz) = cea76ad3685375770520ebbccd0ad4b6adafff1f
|
||||
Size (mrtg-2.17.4.tar.gz) = 1096879 bytes
|
||||
SHA1 (patch-aa) = 2874cd59371db10fbc4ff6c29e3a917a4b8eec55
|
||||
SHA1 (patch-ab) = bf367e6c43030a9cb64a88336b66932d7e05025c
|
||||
SHA1 (patch-ac) = 24ae08714f896ca0f1724454b8ad47c32412c018
|
||||
SHA1 (patch-ae) = 7ba301b01d575f4ff18f082c9f3baaaa2c6e8332
|
||||
SHA1 (patch-lib__mrtg2__SNMP_Session.pm) = ab19dfdab6951a1b375bf2433f794293ed191bf4
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
$NetBSD: patch-ae,v 1.6 2011/08/06 11:52:16 tron Exp $
|
||||
|
||||
Fix two problems:
|
||||
1.) Avoid negative request ids (default_avoid_negative_request_ids=1) as
|
||||
this might cause problems with some devices. Solution provided by
|
||||
Tobias Oetiker in a private mail.
|
||||
2.) Avoid redefinition of "SNMP_Session::pack_sockaddr_in6".
|
||||
|
||||
--- lib/mrtg2/SNMP_Session.pm.orig 2011-02-20 22:33:38.000000000 +0000
|
||||
+++ lib/mrtg2/SNMP_Session.pm 2011-08-06 12:38:35.000000000 +0100
|
||||
@@ -111,7 +111,7 @@
|
||||
### some agents erroneously encode the response ID as an unsigned,
|
||||
### which prevents this code from matching such responses to requests.
|
||||
###
|
||||
-$SNMP_Session::default_avoid_negative_request_ids = 0;
|
||||
+$SNMP_Session::default_avoid_negative_request_ids = 1;
|
||||
|
||||
### Default value for "use_16bit_request_ids".
|
||||
###
|
||||
@@ -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));
|
||||
+ Socket6->import(qw(inet_pton getaddrinfo));
|
||||
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
|
||||
$SNMP_Session::ipv6available = 1;
|
||||
}
|
||||
@@ -601,7 +601,7 @@
|
||||
BEGIN {
|
||||
if($SNMP_Session::ipv6available) {
|
||||
import IO::Socket::INET6;
|
||||
- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
|
||||
+ Socket6->import(qw(inet_pton getaddrinfo));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
$NetBSD: patch-lib__mrtg2__SNMP_Session.pm,v 1.1 2013/08/03 17:05:17 tron Exp $
|
||||
|
||||
Fix run-time warnings under Perl 5.16 and newer caused by the IPv6 support
|
||||
in the "Socket" module.
|
||||
|
||||
--- lib/mrtg2/SNMP_Session.pm.orig 2012-01-12 10:29:00.000000000 +0000
|
||||
+++ lib/mrtg2/SNMP_Session.pm 2013-08-03 17:56:14.000000000 +0100
|
||||
@@ -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(inet_pton getaddrinfo));
|
||||
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
|
||||
$SNMP_Session::ipv6available = 1;
|
||||
}
|
||||
@@ -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(inet_pton getaddrinfo));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user