22369771 Move MRTG to Userland
authorVladimir Marek <Vladimir.Marek@oracle.com>
Thu, 17 Dec 2015 01:32:45 -0800
changeset 5239 a4bfde1dd226
parent 5238 ac8017f29145
child 5240 6c0884f75bd9
22369771 Move MRTG to Userland
components/mrtg/Makefile
components/mrtg/Solaris/mrtg-traffic-sum.1
components/mrtg/Solaris/rateup.1
components/mrtg/mrtg.license
components/mrtg/mrtg.p5m
components/mrtg/patches/mrtg-2.16.2-cfgmaker-ifhighspeed.patch
components/mrtg/patches/mrtg-2.16.2-kMG.patch
components/mrtg/patches/mrtg-2.16.4-Socket6-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/Makefile	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,67 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		mrtg
+COMPONENT_VERSION=	2.16.2
+COMPONENT_PROJECT_URL=	http://oss.oetiker.ch/mrtg
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+	sha256:ce9ec97bb6c8f94a8d8bb2d3cfa7e72b73754ed7a1081e7aca1c8cece5ce3385
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/pub/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	utility/mrtg
+
+TPNO=			9225
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure-64.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+CONFIGURE_OPTIONS += --with-gd-inc=/usr/include/gd2
+CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS) -I$(BUILD_DIR_64)/bin"
+CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS) $(CC_BITS)"
+
+CONFIGURE_BINDIR.64 = $(USRBINDIR)
+CONFIGURE_LIBDIR.64 = $(USRLIBDIR)
+
+# Build process expects a bin directory in compilation area.
+COMPONENT_PRE_BUILD_ACTION=(cd $(@D) ; mkdir -p bin)
+
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
+
+configure:	$(CONFIGURE_64)
+
+build:		$(BUILD_64)
+
+install:	$(INSTALL_64)
+
+test:		$(NO_TESTS)
+
+system-test:	$(SYSTEM_TESTS_NOT_IMPLEMENTED)
+
+REQUIRED_PACKAGES += library/gd
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/Solaris/mrtg-traffic-sum.1	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,80 @@
+'\" te
+.\"
+.\" CDDL HEADER START
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
+.\" CDDL HEADER END
+.\"
+.\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+.\" Use is subject to license terms.
+.\"
+.\" ident	"@(#)mrtg-traffic-sum.1	1.2	10/03/16 SMI"
+.\"
+.\" Copyright (c) 1996-2001 Tobias Oetiker and all the Contributers to MRTG.  All rights reserved.
+.\"
+.TH mrtg-traffic-sum 1 "9 Jan 2009" "SunOS 5.11" "User Commands"
+.SH NAME
+mrtg-traffic-sum \- Builds monthly traffic summary
+.SH SYNOPSIS
+\fBmrtg-traffic-sum [options...] config-file\fR 
+.sp
+-h, --help      display this help and exit
+.br
+--version       output version information and exit
+.br
+--catch=regexp  filter out things that match this in PageTop
+.br
+--email=address email the result
+.br
+--min=gigabytes minimal number of gigabites required
+.SH DESCRIPTION
+.sp
+The mrtg-traffic-sum goes through the mrtg logs for the targets in the the config file specified and builds the traffic total for the last month in Giga Bytes. (Note in communications Giga is 10^9).
+.sp
+The result of this analysis can be sent via email to an address of your choice using the --email option.
+.sp
+With the --catch option you can specify a regular expression which will be matched against the contents of the PageTop settings. The regular expression should return a value into $1 and possibly into $2. This will then be used as description for the appropriate traffic sum. By default the catch is set to:
+.sp
+(?:description|port name):</td>\s*<td>\s*([^< ]*?[^<]*?)\s*</td
+.sp
+By default only traffic which is over 500 gigabytes gets reported. Use the --min switch to change this number.
+.SH AUTHOR
+.sp
+Tobias Oetiker <[email protected]>
+.SH ATTRIBUTES
+.sp
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i) 
+lw(2.75i) |lw(2.75i) 
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitydiagnostic/mrtg
+_
+Interface StabilityUncommitted
+_
+StandardSee \fBstandards\fR(5).
+.TE
+
+.SH SEE ALSO
+.sp
+\fBmrtg\fR(1), \fBmrtg-reference\fR(1), \fBmrtg-logfile\fR(1), \fBcfgmaker\fR(1), \fBindexmaker\fR(1), \fBrateup\fR(1)
+.SH NOTES
+Source for mrtg-traffic-sum is available on http://opensolaris.org.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/Solaris/rateup.1	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,86 @@
+'\" te
+.\"
+.\" CDDL HEADER START
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
+.\" CDDL HEADER END
+.\"
+.\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+.\" Use is subject to license terms.
+.\"
+.\" ident	"@(#)rateup.1	1.2	10/03/16 SMI"
+.\"
+.\" Copyright (c) 1996-2001 Tobias Oetiker and all the Contributers to MRTG.  All rights reserved.
+.\"
+.TH rateup 1 "9 Jan 2009" "SunOS 5.11" "User Commands"
+.SH NAME
+rateup \- Create graphic image files for MRTG
+.SH SYNOPSIS
+.B "rateup -f <parameter file>"
+.br
+.B "rateup directory basename [sampletime] [t sampletime]"
+.br
+.B "      [-(t)ransparent] [-(b)order]" 
+.br
+.B "      [u|a|g|h|m in out abs_max]" 
+.br
+.B "      [i/p file maxvi maxvo maxx maxy growright step bits]"
+.br
+.SH DESCRIPTION
+.sp
+rateup is a fast add-on to the great MRTG Traffic monitor. It makes 
+the database file updates much faster, and creates the graphic image
+files, ready for processing by PPMTOGIF.  It also reduces memory
+requirements by a factor of 10, and increases the speed of updates
+by a factor of at least 10.  This makes it feasible to run mrtg
+every 5 minutes.
+.sp
+rateup attempts to compensate for missed updates by repeating the last
+sample, and also tries to catch bad update times.  The .log file stores
+real history every five minutes for 31 hours, then 'compresses' the
+history into 30 minute samples for a week, then 2-hour samples for
+31 days, then daily samples for two years.  This ensures that the
+log files don't grow in size.
+.sp
+The log files are a slightly different format, but convert.perl
+will fix that for you.
+.SH AUTHOR
+.sp
+Dave Rand <[email protected]>, Alexandre Steinberg <[email protected]>
+.SH ATTRIBUTES
+.sp
+See \fBattributes\fR(5) for descriptions of the following attributes:
+.sp
+.TS
+tab() box;
+cw(2.75i) |cw(2.75i) 
+lw(2.75i) |lw(2.75i) 
+.
+ATTRIBUTE TYPEATTRIBUTE VALUE
+_
+Availabilitydiagnostic/mrtg
+_
+Interface StabilityUncommitted
+_
+StandardSee \fBstandards\fR(5).
+.TE
+
+.SH SEE ALSO
+.sp
+\fBmrtg\fR(1), \fBmrtg-reference\fR(1), \fBmrtg-logfile\fR(1), \fBmrtg-traffic-sum\fR(1), \fBcfgmaker\fR(1), \fBindexmaker\fR(1)
+.SH NOTES
+Source for rateup is available on http://opensolaris.org.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/mrtg.license	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,442 @@
+GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+------------------------------------------------------------------------------------------------------------
+The Artistic License
+Preamble
+The intent of this document is to state the conditions under which a Package may be copied, such that the Copyright Holder maintains some semblance of artistic control over the development of the package, while giving the users of the package the right to use and distribute the Package in a more-or-less customary fashion, plus the right to make reasonable modifications.
+Definitions:
+"Package" refers to the collection of files distributed by the Copyright Holder, and derivatives of that collection of files created through textual modification. 
+"Standard Version" refers to such a Package if it has not been modified, or has been modified in accordance with the wishes of the Copyright Holder. 
+"Copyright Holder" is whoever is named in the copyright or copyrights for the package. 
+"You" is you, if you're thinking about copying or distributing this Package. 
+"Reasonable copying fee" is whatever you can justify on the basis of media cost, duplication charges, time of people involved, and so on. (You will not be required to justify it to the Copyright Holder, but only to the computing community at large as a market that must bear the fee.) 
+"Freely Available" means that no fee is charged for the item itself, though there may be fees involved in handling the item. It also means that recipients of the item may redistribute it under the same conditions they received it. 
+1. You may make and give away verbatim copies of the source form of the Standard Version of this Package without restriction, provided that you duplicate all of the original copyright notices and associated disclaimers.
+2. You may apply bug fixes, portability fixes and other modifications derived from the Public Domain or from the Copyright Holder. A Package modified in such a way shall still be considered the Standard Version.
+3. You may otherwise modify your copy of this Package in any way, provided that you insert a prominent notice in each changed file stating how and when you changed that file, and provided that you do at least ONE of the following:
+a) place your modifications in the Public Domain or otherwise make them Freely Available, such as by posting said modifications to Usenet or an equivalent medium, or placing the modifications on a major archive site such as ftp.uu.net, or by allowing the Copyright Holder to include your modifications in the Standard Version of the Package.
+b) use the modified Package only within your corporation or organization.
+c) rename any non-standard executables so the names do not conflict with standard executables, which must also be provided, and provide a separate manual page for each non-standard executable that clearly documents how it differs from the Standard Version.
+d) make other distribution arrangements with the Copyright Holder.
+4. You may distribute the programs of this Package in object code or executable form, provided that you do at least ONE of the following:
+a) distribute a Standard Version of the executables and library files, together with instructions (in the manual page or equivalent) on where to get the Standard Version.
+b) accompany the distribution with the machine-readable source of the Package with your modifications.
+c) accompany any non-standard executables with their corresponding Standard Version executables, giving the non-standard executables non-standard names, and clearly documenting the differences in manual pages (or equivalent), together with instructions on where to get the Standard Version.
+d) make other distribution arrangements with the Copyright Holder.
+5. You may charge a reasonable copying fee for any distribution of this Package. You may charge any fee you choose for support of this Package. You may not charge a fee for this Package itself. However, you may distribute this Package in aggregate with other (possibly commercial) programs as part of a larger (possibly commercial) software distribution provided that you do not advertise this Package as a product of your own.
+6. The scripts and library files supplied as input to or produced as output from the programs of this Package do not automatically fall under the copyright of this Package, but belong to whomever generated them, and may be sold commercially, and may be aggregated with this Package.
+7. C or perl subroutines supplied by you and linked into this Package shall not be considered part of this Package.
+8. The name of the Copyright Holder may not be used to endorse or promote products derived from this software without specific prior written permission.
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+The End
+
+------------------------------------------------------------------------------------------------------------
+Artistic License 2.0
+Copyright (c) 2000-2006, The Perl Foundation.
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+Preamble
+This license establishes the terms under which a given free software Package may be copied, modified, distributed, and/or redistributed. The intent is that the Copyright Holder maintains some artistic control over the development of that Package while still keeping the Package available as open source and free software.
+You are always permitted to make arrangements wholly outside of this license directly with the Copyright Holder of a given Package. If the terms of this license do not permit the full use that you propose to make of the Package, you should contact the Copyright Holder and seek a different licensing arrangement.
+Definitions
+"Copyright Holder" means the individual(s) or organization(s) named in the copyright notice for the entire Package.
+"Contributor" means any party that has contributed code or other material to the Package, in accordance with the Copyright Holder's procedures.
+"You" and "your" means any person who would like to copy, distribute, or modify the Package.
+"Package" means the collection of files distributed by the Copyright Holder, and derivatives of that collection and/or of those files. A given Package may consist of either the Standard Version, or a Modified Version.
+"Distribute" means providing a copy of the Package or making it accessible to anyone else, or in the case of a company or organization, to others outside of your company or organization.
+"Distributor Fee" means any fee that you charge for Distributing this Package or providing support for this Package to another party. It does not mean licensing fees.
+"Standard Version" refers to the Package if it has not been modified, or has been modified only in ways explicitly requested by the Copyright Holder.
+"Modified Version" means the Package, if it has been changed, and such changes were not explicitly requested by the Copyright Holder.
+"Original License" means this Artistic License as Distributed with the Standard Version of the Package, in its current version or as it may be modified by The Perl Foundation in the future.
+"Source" form means the source code, documentation source, and configuration files for the Package.
+"Compiled" form means the compiled bytecode, object code, binary, or any other form resulting from mechanical transformation or translation of the Source form.
+Permission for Use and Modification Without Distribution
+(1) You are permitted to use the Standard Version and create and use Modified Versions for any purpose without restriction, provided that you do not Distribute the Modified Version.
+Permissions for Redistribution of the Standard Version
+(2) You may Distribute verbatim copies of the Source form of the Standard Version of this Package in any medium without restriction, either gratis or for a Distributor Fee, provided that you duplicate all of the original copyright notices and associated disclaimers. At your discretion, such verbatim copies may or may not include a Compiled form of the Package.
+(3) You may apply any bug fixes, portability changes, and other modifications made available from the Copyright Holder. The resulting Package will still be considered the Standard Version, and as such will be subject to the Original License.
+Distribution of Modified Versions of the Package as Source
+(4) You may Distribute your Modified Version as Source (either gratis or for a Distributor Fee, and with or without a Compiled form of the Modified Version) provided that you clearly document how it differs from the Standard Version, including, but not limited to, documenting any non-standard features, executables, or modules, and provided that you do at least ONE of the following:
+(a) make the Modified Version available to the Copyright Holder of the Standard Version, under the Original License, so that the Copyright Holder may include your modifications in the Standard Version.
+(b) ensure that installation of your Modified Version does not prevent the user installing or running the Standard Version. In addition, the Modified Version must bear a name that is different from the name of the Standard Version.
+(c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified Version available to others under
+(i) the Original License or
+(ii) a license that permits the licensee to freely copy, modify and redistribute the Modified Version using the same licensing terms that apply to the copy that the licensee received, and requires that the Source form of the Modified Version, and of any works derived from it, be made freely available in that license fees are prohibited but Distributor Fees are allowed.
+Distribution of Compiled Forms of the Standard Version or Modified Versions without the Source
+(5) You may Distribute Compiled forms of the Standard Version without the Source, provided that you include complete instructions on how to get the Source of the Standard Version. Such instructions must be valid at the time of your distribution. If these instructions, at any time while you are carrying out such distribution, become invalid, you must provide new instructions on demand or cease further distribution. If you provide valid instructions or cease distribution within thirty days after you become aware that the instructions are invalid, then you do not forfeit any of your rights under this license.
+(6) You may Distribute a Modified Version in Compiled form without the Source, provided that you comply with Section 4 with respect to the Source of the Modified Version.
+Aggregating or Linking the Package
+(7) You may aggregate the Package (either the Standard Version or Modified Version) with other packages and Distribute the resulting aggregation provided that you do not charge a licensing fee for the Package. Distributor Fees are permitted, and licensing fees for other components in the aggregation are permitted. The terms of this license apply to the use and Distribution of the Standard or Modified Versions as included in the aggregation.
+(8) You are permitted to link Modified and Standard Versions with other works, to embed the Package in a larger work of your own, or to build stand-alone binary or bytecode versions of applications that include the Package, and Distribute the result without restriction, provided the result does not expose a direct interface to the Package.
+Items That are Not Considered Part of a Modified Version
+(9) Works (including, but not limited to, modules and scripts) that merely extend or make use of the Package, do not, by themselves, cause the Package to be a Modified Version. In addition, such works are not considered parts of the Package itself, and are not subject to the terms of this license.
+General Provisions
+(10) Any use, modification, and distribution of the Standard or Modified Versions is governed by this Artistic License. By using, modifying or distributing the Package, you accept this license. Do not use, modify, or distribute the Package, if you do not accept this license.
+(11) If your Modified Version has been derived from a Modified Version made by someone other than you, you are nevertheless required to ensure that your Modified Version complies with the requirements of this license.
+(12) This license does not grant you the right to use any trademark, service mark, tradename, or logo of the Copyright Holder.
+(13) This license includes the non-exclusive, worldwide, free-of-charge patent license to make, have made, use, offer to sell, sell, import and otherwise transfer the Package with respect to any patent claims licensable by the Copyright Holder that are necessarily infringed by the Package. If you institute patent litigation (including a cross-claim or counterclaim) against any party alleging that the Package constitutes direct or contributory patent infringement, then this Artistic License to you shall terminate on the date that such litigation is filed.
+(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------------------------------------------
+
+COPYRIGHTS:
+=========== 
+
+ MRTG - The Multi Router Traffic Grapher. A tool to visualise network
+ traffic via a WebPage.
+
+ Copyright (c) 1996-2001 Tobias Oetiker and all the Contributers to MRTG
+ All rights reserved.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc., 675
+ Mass Ave, Cambridge, MA 02139, USA. 
+
+--------------------------------------------------------- 
+BER.pm:
+### Copyright (c) 1995-2008, Simon Leinen. 
+### 
+### This program is free software; you can redistribute it under the 
+### "Artistic License 2.0" included in this distribution 
+### (file "Artistic"). 
+
+--------------------------------------------------------- 
+
+Net_SNMP_util.pm:
+### Copyright (c) 2005-2007 Mike Mitchell. 
+### 
+### This program is free software; you can redistribute it under the 
+### "Artistic License" included in this distribution (file "Artistic"). 
+
+--------------------------------------------------------- 
+
+SNMP_Session.pm 
+### Copyright (c) 1995-2008, Simon Leinen.
+###
+### This program is free software; you can redistribute it under the
+### "Artistic License 2.0" included in this distribution
+### (file "Artistic").
+
+--------------------------------------------------------- 
+
+SNMP_util.pm 
+### Copyright (c) 1998-2010, Mike Mitchell.
+###
+### This program is free software; you can redistribute it under the
+### "Artistic License 2.0" included in this distribution
+### (file "Artistic").
+
+--------------------------------------------------------- 
+
+InputObjects.pm:
+# Copyright (C) 1996-2000 by Bradford Appleton. All rights reserved. 
+
+--------------------------------------------------------- 
+
+PlainText.pm:
+# Copyright 1999-2000 by Russ Allbery <[email protected]> 
+
+--------------------------------------------------------- 
+
+Parser.pm:
+# Copyright (C) 1996-2000 by Bradford Appleton. All rights reserved.
+
+--------------------------------------------------------- 
+
+Select.pm:
+# Copyright (C) 1996-2000 by Bradford Appleton. All rights reserved.
+
+--------------------------------------------------------- 
+
+Usage.pm:
+# Copyright (C) 1996-2000 by Bradford Appleton. All rights reserved.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/mrtg.p5m	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,129 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/diagnostic/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Multi Router Traffic Grapher"
+set name=pkg.description \
+    value="The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic load on network-links. MRTG generates HTML pages containing PNG images which provide a LIVE visual representation of this traffic."
+set name=com.oracle.info.description value=MRTG
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/120
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/cfgmaker
+file path=usr/bin/indexmaker
+file path=usr/bin/mrtg
+file path=usr/bin/mrtg-traffic-sum
+file path=usr/bin/rateup
+file path=usr/lib/mrtg2/BER.pm
+file path=usr/lib/mrtg2/MRTG_lib.pm
+file path=usr/lib/mrtg2/Net_SNMP_util.pm
+file path=usr/lib/mrtg2/Pod/InputObjects.pm
+file path=usr/lib/mrtg2/Pod/Parser.pm
+file path=usr/lib/mrtg2/Pod/PlainText.pm
+file path=usr/lib/mrtg2/Pod/Select.pm
+file path=usr/lib/mrtg2/Pod/Usage.pm
+file path=usr/lib/mrtg2/SNMP_Session.pm
+file path=usr/lib/mrtg2/SNMP_util.pm
+file path=usr/lib/mrtg2/locales_mrtg.pm
+file path=usr/share/doc/mrtg2/CHANGES
+file path=usr/share/doc/mrtg2/COPYING
+file path=usr/share/doc/mrtg2/COPYRIGHT
+file path=usr/share/doc/mrtg2/README
+file path=usr/share/doc/mrtg2/THANKS
+file path=usr/share/doc/mrtg2/cfgmaker.pod
+file path=usr/share/doc/mrtg2/cfgmaker.txt
+file path=usr/share/doc/mrtg2/indexmaker.pod
+file path=usr/share/doc/mrtg2/indexmaker.txt
+file path=usr/share/doc/mrtg2/mrtg-contrib.pod
+file path=usr/share/doc/mrtg2/mrtg-contrib.txt
+file path=usr/share/doc/mrtg2/mrtg-faq.pod
+file path=usr/share/doc/mrtg2/mrtg-faq.txt
+file path=usr/share/doc/mrtg2/mrtg-forum.pod
+file path=usr/share/doc/mrtg2/mrtg-forum.txt
+file path=usr/share/doc/mrtg2/mrtg-ipv6.pod
+file path=usr/share/doc/mrtg2/mrtg-ipv6.txt
+file path=usr/share/doc/mrtg2/mrtg-l.png
+file path=usr/share/doc/mrtg2/mrtg-logfile.pod
+file path=usr/share/doc/mrtg2/mrtg-logfile.txt
+file path=usr/share/doc/mrtg2/mrtg-m.png
+file path=usr/share/doc/mrtg2/mrtg-mibhelp.pod
+file path=usr/share/doc/mrtg2/mrtg-mibhelp.txt
+file path=usr/share/doc/mrtg2/mrtg-nt-guide.pod
+file path=usr/share/doc/mrtg2/mrtg-nt-guide.txt
+file path=usr/share/doc/mrtg2/mrtg-nw-guide.pod
+file path=usr/share/doc/mrtg2/mrtg-nw-guide.txt
+file path=usr/share/doc/mrtg2/mrtg-r.png
+file path=usr/share/doc/mrtg2/mrtg-reference.pod
+file path=usr/share/doc/mrtg2/mrtg-reference.txt
+file path=usr/share/doc/mrtg2/mrtg-rrd.pod
+file path=usr/share/doc/mrtg2/mrtg-rrd.txt
+file path=usr/share/doc/mrtg2/mrtg-squid.pod
+file path=usr/share/doc/mrtg2/mrtg-squid.txt
+file path=usr/share/doc/mrtg2/mrtg-ti.png
+file path=usr/share/doc/mrtg2/mrtg-unix-guide.pod
+file path=usr/share/doc/mrtg2/mrtg-unix-guide.txt
+file path=usr/share/doc/mrtg2/mrtg-webserver.pod
+file path=usr/share/doc/mrtg2/mrtg-webserver.txt
+file path=usr/share/doc/mrtg2/mrtg.pod
+file path=usr/share/doc/mrtg2/mrtg.txt
+file path=usr/share/doc/mrtg2/mrtglib.pod
+file path=usr/share/doc/mrtg2/mrtglib.txt
+file path=usr/share/man/man1/cfgmaker.1
+file path=usr/share/man/man1/indexmaker.1
+file path=usr/share/man/man1/mrtg-contrib.1
+file path=usr/share/man/man1/mrtg-faq.1
+file path=usr/share/man/man1/mrtg-forum.1
+file path=usr/share/man/man1/mrtg-ipv6.1
+file path=usr/share/man/man1/mrtg-logfile.1
+file path=usr/share/man/man1/mrtg-mibhelp.1
+file path=usr/share/man/man1/mrtg-nt-guide.1
+file path=usr/share/man/man1/mrtg-nw-guide.1
+file path=usr/share/man/man1/mrtg-reference.1
+file path=usr/share/man/man1/mrtg-rrd.1
+file path=usr/share/man/man1/mrtg-squid.1
+file Solaris/mrtg-traffic-sum.1 path=usr/share/man/man1/mrtg-traffic-sum.1
+file path=usr/share/man/man1/mrtg-unix-guide.1
+file path=usr/share/man/man1/mrtg-webserver.1
+file path=usr/share/man/man1/mrtg.1
+file path=usr/share/man/man1/mrtglib.1
+file Solaris/rateup.1 path=usr/share/man/man1/rateup.1
+file images/favicon.ico path=usr/share/mrtg2/icons/favicon.ico
+file path=usr/share/mrtg2/icons/mrtg-l.gif
+file path=usr/share/mrtg2/icons/mrtg-l.png
+file path=usr/share/mrtg2/icons/mrtg-m.gif
+file path=usr/share/mrtg2/icons/mrtg-m.png
+file path=usr/share/mrtg2/icons/mrtg-r.gif
+file path=usr/share/mrtg2/icons/mrtg-r.png
+file path=usr/share/mrtg2/icons/mrtg-ti.gif
+file path=usr/share/mrtg2/icons/mrtg-ti.png
+legacy pkg=SUNWmrtg desc="mrtg - The Multi Router Traffic Grapher (2.16.2)" \
+    name="mrtg - The Multi Router Traffic Grapher"
+license mrtg.license license="GPLv2+, Artistic"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/patches/mrtg-2.16.2-cfgmaker-ifhighspeed.patch	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,15 @@
+Upstream patches:
+https://bugzilla.redhat.com/show_bug.cgi?id=836197
+
+diff -up mrtg-2.16.2/bin/cfgmaker.orig mrtg-2.16.2/bin/cfgmaker
+--- mrtg-2.16.2/bin/cfgmaker.orig	2012-10-03 10:55:34.175356756 +0200
++++ mrtg-2.16.2/bin/cfgmaker	2012-10-03 10:56:20.213543149 +0200
[email protected]@ -220,7 +220,7 @@ sub InterfaceInfo($$$$$) {
+ #            maximum value (4,294,967,295) and ifHighSpeed must be used
+ #            to report the interace's speed.  For a sub-layer which has
+ #            no concept of bandwidth, this object should be zero."
+-            if ( (not defined $value) || ($value == 2**32-1)) {
++            if ( (not defined $value) || ($value == 2**32-1) || ($value == 2**32-2)) {
+                 ($if, $value) = split /:/, $ifHighSpeed[$i], 2;
+ 	        $value = $value * 1000000;  # highSpeed = contador * 10^6
+                 #debug('base',"Speed: $if - $value");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/patches/mrtg-2.16.2-kMG.patch	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,39 @@
+Upstream patches:
+https://bugzilla.redhat.com/show_bug.cgi?id=707188
+http://oss.oetiker.ch/mrtg-trac/changeset/359/trunk/src/src/rateup.c
+
+diff -up mrtg-2.16.2/src/rateup.c.orig mrtg-2.16.2/src/rateup.c
+--- mrtg-2.16.2/src/rateup.c.orig	2008-05-16 16:45:41.000000000 +0200
++++ mrtg-2.16.2/src/rateup.c	2012-10-01 13:22:28.064000017 +0200
[email protected]@ -481,12 +481,20 @@ image (file, maxvi, maxvo, maxx, maxy, x
+         {
+           short_si_out = kMG;
+           kMGnumber = 0;
+-	  short_si[0] = kMG;
+           while ((short_si_out = strchr (short_si_out, ',')) != NULL)
+ 	    {
++	      short_si_out++;
++	      kMGnumber++;
++	    }
++	  short_si = calloc(kMGnumber + 1, sizeof(*short_si));
++	  short_si_out = kMG; 
++	  for (kMGnumber = 0; ; kMGnumber++)
++	    {
++	      short_si[kMGnumber] = short_si_out;
++	      short_si_out = strchr(short_si_out, ',');
++	      if (short_si_out == NULL) break;
+ 	      short_si_out[0] = '\0';
+ 	      short_si_out++;
+-              short_si[++kMGnumber] = short_si_out;
+ 	    }
+         }
+      }
[email protected]@ -1145,6 +1153,8 @@ image (file, maxvi, maxvo, maxx, maxy, x
+   gdImageDestroy (brush_outp);
+   free (lhist);
+   free (graph_label);
++  if (kMG)
++    free(short_si);
+ 
+ }
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mrtg/patches/mrtg-2.16.4-Socket6-fix.patch	Thu Dec 17 01:32:45 2015 -0800
@@ -0,0 +1,35 @@
+Upstream patch:
+https://bugzilla.redhat.com/show_bug.cgi?id=706519
+
+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
[email protected]@ -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 14:26:25.366152933 +0100
[email protected]@ -146,7 +146,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 getaddrinfo));
+ 	$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
+ 	$SNMP_Session::ipv6available = 1;
+     }
[email protected]@ -601,7 +601,7 @@ use Carp;
+ BEGIN {
+     if($SNMP_Session::ipv6available) {
+ 	import IO::Socket::INET6;
+-	import Socket6;
++	Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
+     }
+ }
+