# HG changeset patch # User Mike Sullivan # Date 1308163942 25200 # Node ID 9da68c8821e31cb075b0e140a1751eb43ee33646 # Parent e95b65443448ee49bac58037dd4adcfd157db58e 7055089 move iftop/pv to userland diff -r e95b65443448 -r 9da68c8821e3 components/iftop/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/Makefile Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,68 @@ +# +# 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) 2011, Oracle and/or its affiliates. All rights reserved. +# + +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME= iftop +COMPONENT_VERSION= 0.17 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_PROJECT_URL= http://www.ex-parrot.com/~pdw/iftop/ +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:75ce6afc8c0bf851278b0a15e66f523af90cfda9 +COMPONENT_ARCHIVE_URL= http://www.ex-parrot.com/~pdw/iftop/download/$(COMPONENT_ARCHIVE) + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../make-rules/ips.mk + +COMPONENT_PRE_CONFIGURE_ACTION = \ + ($(CLONEY) $(SOURCE_DIR) $(@D)) + +PATCH_LEVEL= 0 + +# without this we bus error on sparc. sadly I don't see any patches +# that might relate from the upstream (though maybe that's really +# "happily", as this is simpler) +studio_ALIGN.sparc.32= -xmemalign=1i + + +IFTOP_LIBDIR= /usr/gnu/lib +LDFLAGS += -L$(IFTOP_LIBDIR) -R$(IFTOP_LIBDIR) +CPPFLAGS += -I/usr/gnu/include -I/usr/include/ncurses +CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)" +CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)" +CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" + + +# common targets +build: $(BUILD_32) + +install: $(INSTALL_32) + +test: $(NO_TESTS) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk diff -r e95b65443448 -r 9da68c8821e3 components/iftop/iftop.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/iftop.license Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,357 @@ +Oracle elects to use only the GNU Lesser General Public License version +2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software +where a choice of LGPL/GPL license versions are made available with the +language indicating that LGPLv2.1/GPLv2 or any later version may be +used, or where a choice of which version of the LGPL/GPL is applied is +unspecified. Unless specifically stated otherwise, where a choice +exists between another license and either the GPL or the LGPL, Oracle +chooses the other license. + +-------------------------------------------------------------------- + +Copyright (C) 1987-2006 Free Software Foundation, Inc. +Copyright (C) 2000-2005, 2008 Tim Waugh +Copyright (C) 2001 Marko Kreen +Copyright (C) 1994 X Consortium + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -r e95b65443448 -r 9da68c8821e3 components/iftop/iftop.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/iftop.p5m Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,47 @@ +# +# 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) 2011, Oracle and/or its affiliates. All rights reserved. +# + + default mangler.man.stability uncommitted> + +set name=pkg.fmri value=pkg:/diagnostic/iftop@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="iftop - Display bandwidth usage on an interface" +set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities" +set name=info.upstream_url value=$(COMPONENT_PROJECT_URL) +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2009/018 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +license iftop.license license='GPLv2' + +dir path=usr +dir path=usr/sbin +dir path=usr/share +dir path=usr/share/man +dir path=usr/share/man/man8 +file path=usr/sbin/iftop +file path=usr/share/man/man8/iftop.8 + +legacy pkg=SUNWiftop \ + desc="iftop - Display bandwidth usage on an interface (0.17)" \ + name="iftop - Display bandwidth usage on an interface" diff -r e95b65443448 -r 9da68c8821e3 components/iftop/patches/01.configure.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/patches/01.configure.patch Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,11 @@ +--- configure.orig Fri Dec 5 14:15:32 2008 ++++ configure Fri Dec 5 11:19:39 2008 +@@ -5613,7 +5613,7 @@ + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: 7 args" >&5 + echo "${ECHO_T}7 args" >&6 +- ghba_args=8 ++ ghba_args=7 + + cat >>confdefs.h <<\_ACEOF + #define GETHOSTBYADDR_R_RETURNS_HOSTENT_P 1 diff -r e95b65443448 -r 9da68c8821e3 components/iftop/patches/02.iftop.8.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/patches/02.iftop.8.patch Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,32 @@ +--- iftop.8.orig Tue Feb 10 14:00:54 2009 ++++ iftop.8 Tue Mar 3 14:18:22 2009 +@@ -21,6 +21,15 @@ + traffic on the \fIinterface\fP; see \fBpcap\fP(3) for more information, but on + most systems this means that it must be run as root. + ++Solaris version of \fBiftop\fP support Solaris features like zone and vanity ++naming. For example, you can specify the name of a renamed interface generated ++by \fBdladm\fP(1M) for \fBiftop\fP. Additionally \fBiftop\fP can also be ++executed in exclusive IP stack zones, for it only use IP interfaces, the ++function and usage of \fBiftop\fP in exclusive IP stack zones are the same as ++it in global zone. As the isolation feature of Solaris zones, you can not see ++the network traffic of a non-global zone from global zone or other non-global ++zones by \fBiftop\fP. ++ + By default, \fBiftop\fP will look up the hostnames associated with addresses it + finds in packets. This can cause substantial traffic of itself, and may result + in a confusing display. You may wish to suppress display of DNS traffic by +@@ -286,6 +295,13 @@ + \fB~/.iftoprc\fP + Configuration file for iftop. + ++.SH BUGS ++This program does not have IPv6 support yet, this is an architectural bug that ++will be fixed. ++ ++For Solaris version of iftop, it can not be executed properly in shared IP ++stack zones, this is a limitation bug of this program. ++ + .SH SEE ALSO + .BR tcpdump (8), + .BR pcap (3), diff -r e95b65443448 -r 9da68c8821e3 components/iftop/patches/03.ui.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/patches/03.ui.c.patch Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,11 @@ +--- ui.c.orig Fri Dec 5 14:04:54 2008 ++++ ui.c Fri Dec 5 11:20:53 2008 +@@ -6,7 +6,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include diff -r e95b65443448 -r 9da68c8821e3 components/iftop/patches/04.Makefile.am.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/patches/04.Makefile.am.patch Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,18 @@ +--- Makefile.am.orig Tue Feb 10 13:53:43 2009 ++++ Makefile.am Fri Jan 16 12:42:53 2009 +@@ -15,13 +15,13 @@ + iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \ + options.c resolver.c screenfilter.c serv_hash.c \ + sorted_list.c threadprof.c ui.c util.c \ +- addrs_ioctl.c addrs_dlpi.c dlcommon.c \ ++ addrs_ioctl.c addrs_dlpi.c \ + stringmap.c cfgfile.c vector.c + + noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \ + integers.h ip.h llc.h ns_hash.h options.h resolver.h \ + screenfilter.h serv_hash.h sll.h sorted_list.h tcp.h \ +- threadprof.h token.h ui.h dlcommon.h stringmap.h \ ++ threadprof.h token.h ui.h stringmap.h \ + vector.h cfgfile.h ppp.h + + man_MANS = iftop.8 diff -r e95b65443448 -r 9da68c8821e3 components/iftop/patches/05.Makefile.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/patches/05.Makefile.in.patch Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,46 @@ +--- Makefile.in.orig Tue Feb 10 13:54:06 2009 ++++ Makefile.in Fri Jan 16 12:42:53 2009 +@@ -99,7 +99,7 @@ + iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \ + options.c resolver.c screenfilter.c serv_hash.c \ + sorted_list.c threadprof.c ui.c util.c \ +- addrs_ioctl.c addrs_dlpi.c dlcommon.c \ ++ addrs_ioctl.c addrs_dlpi.c \ + stringmap.c cfgfile.c vector.c + + +@@ -106,7 +106,7 @@ + noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \ + integers.h ip.h llc.h ns_hash.h options.h resolver.h \ + screenfilter.h serv_hash.h sll.h sorted_list.h tcp.h \ +- threadprof.h token.h ui.h dlcommon.h stringmap.h \ ++ threadprof.h token.h ui.h stringmap.h \ + vector.h cfgfile.h ppp.h + + +@@ -134,7 +134,7 @@ + resolver.$(OBJEXT) screenfilter.$(OBJEXT) serv_hash.$(OBJEXT) \ + sorted_list.$(OBJEXT) threadprof.$(OBJEXT) ui.$(OBJEXT) \ + util.$(OBJEXT) addrs_ioctl.$(OBJEXT) addrs_dlpi.$(OBJEXT) \ +- dlcommon.$(OBJEXT) stringmap.$(OBJEXT) cfgfile.$(OBJEXT) \ ++ stringmap.$(OBJEXT) cfgfile.$(OBJEXT) \ + vector.$(OBJEXT) + iftop_OBJECTS = $(am_iftop_OBJECTS) + iftop_LDADD = $(LDADD) +@@ -151,7 +151,7 @@ + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/addr_hash.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/addrs_dlpi.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/addrs_ioctl.Po ./$(DEPDIR)/cfgfile.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/dlcommon.Po ./$(DEPDIR)/edline.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/edline.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/hash.Po ./$(DEPDIR)/iftop.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/ns_hash.Po ./$(DEPDIR)/options.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/resolver.Po ./$(DEPDIR)/screenfilter.Po \ +@@ -257,7 +257,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addrs_dlpi.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addrs_ioctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfgfile.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlcommon.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edline.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iftop.Po@am__quote@ diff -r e95b65443448 -r 9da68c8821e3 components/iftop/patches/06.addrs_dlpi.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/iftop/patches/06.addrs_dlpi.c.patch Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,138 @@ +--- addrs_dlpi.c.orig Tue Feb 10 13:55:04 2009 ++++ addrs_dlpi.c Fri Jan 16 12:42:53 2009 +@@ -24,11 +24,8 @@ + #include + #include + #include +-#include + #include + +-#include "dlcommon.h" +- + extern char *split_dname(char *device, int *unitp); + extern char *strncpy2(char *dest, char *src, int n); + extern char *strncat2(char *dest, char *src, int n); +@@ -56,123 +53,8 @@ + int got_ip_addr = 0; + + int fd; +- long buf[MAXDLBUF]; /* long aligned */ +- union DL_primitives *dlp; +- +- char *cp; +- int unit_num = 0; +- int sap = 0; +- +- char *devname = NULL; +- char *devname2 = NULL; +- char fulldevpath[256]; +- + struct ifreq ifr = {}; + +- /* -- */ +- +- memset(if_hw_addr, 0, 6); +- +- // we want to be able to process either a fully qualified /dev/ge0 +- // type interface definition, or just ge0. +- +- if (strncmp(interface, "/dev/", strlen("/dev/")) == 0) { +- devname = interface + strlen("/dev/"); +- } else { +- devname = interface; +- } +- +- strncpy2(fulldevpath, "/dev/", sizeof(fulldevpath)-1); +- cp = strncat2(fulldevpath, interface, sizeof(fulldevpath)); +- +- if (strlen(cp) != 0) { +- fprintf(stderr, "device name buffer overflow %s\n", fulldevpath); +- return -1; +- } +- +- fprintf(stderr,"interface: %s\n", devname); +- +- // on Solaris, even though we are wanting to talk to ethernet device +- // ge0, we have to open /dev/ge, then bind to unit 0. Dupe our +- // full path, then identify and cut off the unit number +- +- devname2 = strdup(fulldevpath); +- +- cp = split_dname(devname2, &unit_num); +- +- if (cp == NULL) { +- free(devname2); +- goto get_ip_address; +- } else { +- *cp = '\0'; /* null terminate devname2 right before numeric extension */ +- } +- +- // devname2 should now be something akin to /dev/ge. Try to open +- // it, and if it fails, fall back to the full /dev/ge0. +- +- if ((fd = open(devname2, O_RDWR)) < 0) { +- if (errno != ENOENT) { +- fprintf(stderr, "Couldn't open %s\n", devname2); +- free(devname2); +- goto get_ip_address; +- } else { +- if ((fd = open(fulldevpath, O_RDWR)) < 0) { +- fprintf(stderr, "Couldn't open %s\n", fulldevpath); +- free(devname2); +- goto get_ip_address; +- } +- } +- } +- +- free(devname2); +- devname2 = NULL; +- +- /* Use the dlcommon functions to get access to the DLPI information for this +- * interface. All of these functions exit() out on failure +- */ +- +- dlp = (union DL_primitives*) buf; +- +- /* +- * DLPI attach to our low-level device +- */ +- +- dlattachreq(fd, unit_num); +- dlokack(fd, buf); +- +- /* +- * DLPI bind +- */ +- +- dlbindreq(fd, sap, 0, DL_CLDLS, 0, 0); +- dlbindack(fd, buf); +- +- /* +- * DLPI DL_INFO_REQ +- */ +- +- dlinforeq(fd); +- dlinfoack(fd, buf); +- +- /* +- printdlprim(dlp); // uncomment this to dump out info from DLPI +- */ +- +- if (dlp->info_ack.dl_addr_length + dlp->info_ack.dl_sap_length == 6) { +- memcpy(if_hw_addr, +- OFFADDR(dlp, dlp->info_ack.dl_addr_offset), +- dlp->info_ack.dl_addr_length); +- got_hw_addr = 1; +- } else { +- fprintf(stderr, "Error, bad length for hardware interface %s -- %d\n", +- interface, +- dlp->info_ack.dl_addr_length); +- } +- +- close(fd); +- +- get_ip_address: +- + /* Get the IP address of the interface */ + + #ifdef SIOCGIFADDR diff -r e95b65443448 -r 9da68c8821e3 components/meta-packages/history/SUNWiftop.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWiftop.p5m Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,29 @@ +# +# 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) 2011, Oracle and/or its affiliates. All rights reserved. +# + +set name=pkg.fmri value=pkg:/SUNWiftop@0.17,5.11-0.133 +set name=pkg.renamed value=true + +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +depend fmri=diagnostic/iftop@0.17-0.133 type=require diff -r e95b65443448 -r 9da68c8821e3 components/meta-packages/history/SUNWpipe-viewer.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/SUNWpipe-viewer.p5m Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,29 @@ +# +# 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) 2011, Oracle and/or its affiliates. All rights reserved. +# + +set name=pkg.fmri value=pkg:/SUNWpipe-viewer@1.1.4,5.11-0.133 +set name=pkg.renamed value=true + +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +depend fmri=shell/pipe-viewer@1.1.4-0.133 type=require diff -r e95b65443448 -r 9da68c8821e3 components/pv/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pv/Makefile Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,59 @@ +# +# 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) 2011, Oracle and/or its affiliates. All rights reserved. +# + +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME= pv +COMPONENT_VERSION= 1.1.4 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_PROJECT_URL= http://www.ivarch.com/programs/pv.shtml +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:2d84e212b543509b675351809d1e0257e679c5fa +COMPONENT_ARCHIVE_URL= http://pipeviewer.googlecode.com/files/$(COMPONENT_ARCHIVE) + +include ../../make-rules/prep.mk +include ../../make-rules/configure.mk +include ../../make-rules/ips.mk + +COMPONENT_PRE_CONFIGURE_ACTION = \ + ($(CLONEY) $(SOURCE_DIR) $(@D)) + +PATCH_LEVEL= 0 + +PKG_PROTO_DIRS += $(BUILD_DIR_32) + +CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" + + +# common targets +build: $(BUILD_32) + +install: $(INSTALL_32) + +test: $(NO_TESTS) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk diff -r e95b65443448 -r 9da68c8821e3 components/pv/pv.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pv/pv.license Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,172 @@ +-------------------------------------------------------------------- +This package is free software, and is being distributed under the terms +of the Artistic License 2.0. + +--------------------------------------------------------------------- + +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. + +---------------------------------------------------------- diff -r e95b65443448 -r 9da68c8821e3 components/pv/pv.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pv/pv.p5m Wed Jun 15 11:52:22 2011 -0700 @@ -0,0 +1,60 @@ +# +# 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) 2011, Oracle and/or its affiliates. All rights reserved. +# + + default mangler.man.stability uncommitted> + +set name=pkg.fmri value=pkg:/shell/pipe-viewer@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="Pipe Viewer" +set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities" +set name=info.upstream_url value=$(COMPONENT_PROJECT_URL) +set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2009/350 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +license pv.license license='Artistic' + +dir path=usr +dir path=usr/bin +dir path=usr/share +dir path=usr/share/locale +dir path=usr/share/locale/de +dir path=usr/share/locale/de/LC_MESSAGES +dir path=usr/share/locale/fr +dir path=usr/share/locale/fr/LC_MESSAGES +dir path=usr/share/locale/pl +dir path=usr/share/locale/pl/LC_MESSAGES +dir path=usr/share/locale/pt +dir path=usr/share/locale/pt/LC_MESSAGES +dir path=usr/share/man +dir path=usr/share/man/man1 +file path=usr/bin/pv +file path=usr/share/locale/de/LC_MESSAGES/pv.mo +file path=usr/share/locale/fr/LC_MESSAGES/pv.mo +file path=usr/share/locale/pl/LC_MESSAGES/pv.mo +file path=usr/share/locale/pt/LC_MESSAGES/pv.mo +file doc/quickref.1 path=usr/share/man/man1/pv.1 + +legacy pkg=SUNWpipe-viewer \ + desc="pipeline monitoring tool (1.1.4)" \ + name="Pipe Viewer"