rpms/mrtg/devel mrtg-2.15.1-Socket6-fix.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 mrtg.spec, 1.42, 1.43 sources, 1.17, 1.18
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Fri Apr 18 11:48:45 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/mrtg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6433
Modified Files:
.cvsignore mrtg.spec sources
Added Files:
mrtg-2.15.1-Socket6-fix.patch
Log Message:
fix perl noise (bz 438931, 442884)
mrtg-2.15.1-Socket6-fix.patch:
--- NEW FILE mrtg-2.15.1-Socket6-fix.patch ---
diff -up mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm.BAD mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm
--- mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm.BAD 2008-04-18 07:25:55.000000000 -0400
+++ mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm 2008-04-18 07:26:30.000000000 -0400
@@ -138,7 +138,7 @@ BEGIN {
if (eval {local $SIG{__DIE__};require Socket6;} &&
eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
- import Socket6;
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton));
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
$SNMP_Session::ipv6available = 1;
}
@@ -592,7 +592,7 @@ use Carp;
BEGIN {
if($SNMP_Session::ipv6available) {
import IO::Socket::INET6;
- import Socket6;
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton));
}
}
diff -up mrtg-2.16.1/bin/mrtg.orig mrtg-2.16.1/bin/mrtg
--- mrtg-2.16.1/bin/mrtg.orig 2008-04-18 07:28:19.000000000 -0400
+++ mrtg-2.16.1/bin/mrtg 2008-04-18 07:29:33.000000000 -0400
@@ -97,8 +97,8 @@ use locales_mrtg "0.07";
# necessary for dead host detection (for IPv6 name lookups).
BEGIN {
if (eval {local $SIG{__DIE__};require Socket6;}) {
- import Socket;
- import Socket6
+ use Socket();
+ import Socket6;
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mrtg/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 12 Feb 2007 11:06:39 -0000 1.17
+++ .cvsignore 18 Apr 2008 11:48:06 -0000 1.18
@@ -1,2 +1,4 @@
mrtg-2.15.1.tar.gz
mrtg-2.15.1.tar.gz.md5.gpg
+mrtg-2.16.1.tar.gz
+mrtg-2.16.1.tar.gz.md5.gpg
Index: mrtg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mrtg.spec 11 Feb 2008 14:10:43 -0000 1.42
+++ mrtg.spec 18 Apr 2008 11:48:06 -0000 1.43
@@ -5,8 +5,8 @@
Summary: Multi Router Traffic Grapher
Name: mrtg
-Version: 2.15.1
-Release: 8%{?dist}
+Version: 2.16.1
+Release: 1%{?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.gpg
@@ -17,6 +17,7 @@
Source6: filter-provides-mrtg.sh
Patch0: mrtg-2.15.0-lib64.patch
Patch1: mrtg-2.10.5-norpath.patch
+Patch2: mrtg-2.15.1-Socket6-fix.patch
License: GPL+
Group: Applications/Internet
PreReq: vixie-cron
@@ -38,6 +39,7 @@
%setup -q
%patch0 -p1 -b .lib64
%patch1 -p1
+%patch2 -p1
for i in doc/mrtg-forum.1 doc/mrtg-squid.1; do
iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -117,6 +119,10 @@
%dir %{_localstatedir}/lock/mrtg
%changelog
+* Fri Apr 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.16.1-1
+- Update to 2.16.1
+- fix perl noise (bz 438931, 442884)
+
* Mon Feb 11 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.15.1-8
- Fix Buildroot
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mrtg/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 12 Feb 2007 11:06:39 -0000 1.17
+++ sources 18 Apr 2008 11:48:06 -0000 1.18
@@ -1,2 +1,2 @@
-32f5c62c0b6fc9b2f9cb00fe3098811d mrtg-2.15.1.tar.gz
-1d5ae5bb89eb9a59220daec084bbdab1 mrtg-2.15.1.tar.gz.md5.gpg
+8c373b9b508a73cb17bccad13db46e46 mrtg-2.16.1.tar.gz
+91711e1de7d304bba986d73df7f10075 mrtg-2.16.1.tar.gz.md5.gpg
More information about the fedora-extras-commits
mailing list