--- old/usr/src/cmd/Makefile 2009年 7月 3日 五 18:45:25 +++ new/usr/src/cmd/Makefile 2009年 7月 3日 五 18:45:21 @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)Makefile 1.168 09/06/30 SMI" +# ident "@(#)Makefile 1.169 09/07/02 SMI" # # @@ -83,6 +83,7 @@ emacs \ epydoc \ erlang \ + ettcp \ expect \ fetchmail \ foomatic-db \ --- /dev/null 2009年 7月 3日 五 18:45:26 +++ new/usr/src/cmd/ettcp/METADATA 2009年 7月 3日 五 18:45:26 @@ -0,0 +1,11 @@ +NAME: ettcp +VERSION: 1.0 +DESCRIPTION: tool for measuring maximum TCP and UDP bandwidth performance +LICENSE: OTHER +PACKAGE: SUNWettcp +PROJECT_URL: http://sourceforge.net/projects/ettcp/ +SOURCE_DOWNLOAD: http://downloads.sourceforge.net/ettcp/ettcp-1.0.tar.gz +SUPPORT: Community +BUGTRAQ: solaris/utility/ettcp +OSR: 12282 +COMMENTS: --- /dev/null 2009年 7月 3日 五 18:45:27 +++ new/usr/src/cmd/ettcp/Makefile.sfw 2009年 7月 3日 五 18:45:26 @@ -0,0 +1,48 @@ +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)Makefile.sfw 1.2 09/07/03 SMI" +# + +VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh) +TARBALL = $(VER).tar.gz + +include ../Makefile.cmd + +all: $(VER)/config.status + (cd $(VER); env - CC="$(GCC)" $(CCSMAKE) ettcp) + +install: all + PKGDIR=$(VER) $(SHELL) ./install-sfw + +$(VER)/config.status: $(TARBALL) + /usr/bin/gzip -dc $(TARBALL) | $(TAR) xopf - + (cd $(VER); $(GPATCH) -p0 < ../ettcp.Makefile.patch) + +clean: + -rm -rf $(VER) + +include ../Makefile.targ + 二进制文件 /tmp/dN.aOMD 和 new/usr/src/cmd/ettcp/ettcp-1.0.tar.gz 不同 --- /dev/null 2009年 7月 3日 五 18:45:28 +++ new/usr/src/cmd/ettcp/ettcp.Makefile.patch 2009年 7月 3日 五 18:45:27 @@ -0,0 +1,92 @@ +*** Makefile 2009年 7月 3日 五 14:45:24 +--- Makefile.new 2009年 7月 3日 五 14:43:23 +*************** +*** 1,73 **** + +! MODULENAME=ettcp +! MAJORVERSION=1 +! MINORVERSION=0 +! TARDIR=$(MODULENAME)-$(MAJORVERSION).$(MINORVERSION) +! TARFILE=$(TARDIR).tar.gz +! MACHINE=i686 +! RPMSTAGE=rpm/SOURCES/$(TARFILE) +! RPMDIRS=rpmdir + +- ifndef RPM_INSTALL_DIR +- RPM_INSTALL_DIR = /usr/local/bin +- endif +- +- ifndef RPM_MAN_DIR +- RPM_MAN_DIR = /usr/share/man +- endif +- +- ifndef RPM_ETC_DIR +- RPM_ETC_DIR = /etc +- endif +- +- all: suck blow ettcp +- + suck: suck.c +! gcc -o suck suck.c + ettcp: ettcp.c +! gcc -o ettcp ettcp.c + blow: blow.c +! gcc -o blow blow.c + +- install: all +- install -m755 ettcp $(RPM_INSTALL_DIR) +- install -m755 speedfrom $(RPM_INSTALL_DIR) +- install -m755 speedto $(RPM_INSTALL_DIR) +- install -m755 suck $(RPM_INSTALL_DIR) +- install -m755 blow $(RPM_INSTALL_DIR) +- install -m644 blow.1 $(RPM_MAN_DIR)/man1 +- install -m644 suck.1 $(RPM_MAN_DIR)/man1 +- install -m644 speedfrom.1 $(RPM_MAN_DIR)/man1 +- install -m644 speedto.1 $(RPM_MAN_DIR)/man1 +- install -m644 ettcp.1 $(RPM_MAN_DIR)/man1 +- install -m644 xinetd.d/suck $(RPM_ETC_DIR)/xinetd.d +- install -m644 xinetd.d/blow $(RPM_ETC_DIR)/xinetd.d +- + clean: +! rm -f ettcp suck blow $(TARFILE) +! rm -rf $(RPMDIRS) $(TARDIR) +! rm -f *~ +! +! tarfile: $(TARFILE) +! +! $(TARFILE): ettcp.c suck.c blow.c xinetd.d speedfrom speedto *.1 README TODO Makefile ettcp.spec +! rm -rf $@ $(TARDIR) +! mkdir $(TARDIR) +! cp -a $^ $(TARDIR) +! tar zcvf $@ $(TARDIR) +! +! rpm: $(RPMSTAGE) +! rpm --define "_topdir $(CURDIR)/$(RPMDIRS)" -ba ettcp.spec +! +! $(RPMSTAGE): $(RPMDIRS) $(TARFILE) +! cp $(TARFILE) $(RPMDIRS)/SOURCES/$(TARFILE) +! +! $(RPMDIRS): +! mkdir $(RPMDIRS) +! mkdir $(RPMDIRS)/BUILD +! mkdir $(RPMDIRS)/RPMS +! mkdir $(RPMDIRS)/RPMS/$(MACHINE) +! mkdir $(RPMDIRS)/SOURCES +! mkdir $(RPMDIRS)/SPECS +! mkdir $(RPMDIRS)/SRPMS +! +--- 1,14 ---- ++ #MODULENAME=ettcp ++ LOCAL_LIBRARIES = -lnsl -lsocket -lthread + +! all: ettcp suck blow + + suck: suck.c +! $(CC) -o suck suck.c $(LOCAL_LIBRARIES) + ettcp: ettcp.c +! $(CC) -o ettcp ettcp.c $(LOCAL_LIBRARIES) + blow: blow.c +! $(CC) -o blow blow.c $(LOCAL_LIBRARIES) + + clean: +! rm -f ettcp suck blow --- /dev/null 2009年 7月 3日 五 18:45:28 +++ new/usr/src/cmd/ettcp/install-sfw 2009年 7月 3日 五 18:45:28 @@ -0,0 +1,47 @@ +#! /usr/bin/ksh93 +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)install-sfw 1.1 09/06/29 SMI" +# + +set -o errexit + +# Define directories +PREFIX=${ROOT}/usr +BINDIR=${PREFIX}/bin +MAN1DIR=${PREFIX}/share/man/man1 + +#Include common scripts +source ${SRC}/tools/install.subr + +# stability +MANSCRIPT=sunman-stability + +_install E ${PKGDIR}/ettcp ${BINDIR}/ettcp 555 +_install M ${PKGDIR}/ettcp.1 ${MAN1DIR}/ettcp.1 444 + +exit 0 + --- /dev/null 2009年 7月 3日 五 18:45:28 +++ new/usr/src/cmd/ettcp/sunman-stability 2009年 7月 3日 五 18:45:28 @@ -0,0 +1,28 @@ +1i\ +'\\" t\ +\.\\"\ +\.\\" Modified for Solaris to to add the Solaris stability classification,\ +\.\\" and to add a note about source availability.\ +\.\\"\ +$a\ +\.\\" Begin Sun update\ +.SH ATTRIBUTES\ +See\ +.BR attributes (5)\ +for descriptions of the following attributes:\ +.sp\ +.TS\ +box;\ +cbp-1 | cbp-1\ +l | l .\ +ATTRIBUTE TYPE ATTRIBUTE VALUE\ +=\ +Availability SUNWettcp \ +=\ +Interface Stability Uncommitted \ +.TE \ +.PP\ +.SH NOTES\ +Source for ettcp is available on http://opensolaris.org.\ +\.\\" End Sun update + --- old/usr/src/pkgdefs/Makefile 2009年 7月 3日 五 18:45:31 +++ new/usr/src/pkgdefs/Makefile 2009年 7月 3日 五 18:45:29 @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)Makefile 1.246 09/06/30 SMI" +# ident "@(#)Makefile 1.247 09/07/02 SMI" # # @@ -113,6 +113,7 @@ SUNWerlang \ SUNWerlang-doc \ SUNWepydoc \ + SUNWettcp \ SUNWexpect \ SUNWfcgi \ SUNWfcgi-doc \ --- /dev/null 2009年 7月 3日 五 18:45:31 +++ new/usr/src/pkgdefs/SUNWettcp/Makefile 2009年 7月 3日 五 18:45:31 @@ -0,0 +1,39 @@ +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)Makefile 1.2 09/07/03 SMI" +# + +include ../Makefile.com + +DATAFILES = depend + +.KEEP_STATE: + +all: $(FILES) +install: all pkg + +include ../Makefile.targ + --- /dev/null 2009年 7月 3日 五 18:45:32 +++ new/usr/src/pkgdefs/SUNWettcp/copyright 2009年 7月 3日 五 18:45:32 @@ -0,0 +1,11 @@ +ettcp license +-------------------------------------------------------------------------- +Copyright (C) 1984 T.C. Slattery, USNA +Copyright (C) 1985 Mike Muuss and Terry Slattery +Copyright (C) 1989 Silicon Graphics, Inc. +Copyright (C) 1989 Steve Miller of the University of Maryland, College Park +Copyright (C) 1991 Silicon Graphics, Inc. +Copyright (C) 2002 David Boreham + +Distribution Status - + Public Domain. Distribution Unlimited. --- /dev/null 2009年 7月 3日 五 18:45:32 +++ new/usr/src/pkgdefs/SUNWettcp/pkginfo.tmpl 2009年 7月 3日 五 18:45:32 @@ -0,0 +1,54 @@ +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)pkginfo.tmpl 1.1 09/06/29 SMI" +# + +# +# +# This required package information file describes characteristics of the +# package, such as package abbreviation, full package name, package version, +# and package architecture. +# +PKG="SUNWettcp" +NAME="ettcp - tool for measuring maximum TCP and UDP bandwidth performance" +ARCH="ISA" +VERSION="SFWVERS,REV=0.0.0" +SUNW_PRODNAME="SunOS" +SUNW_PRODVERS="RELEASE/VERSION" +SUNW_PKGTYPE="usr" +MAXINST="1000" +CATEGORY="system" +DESC="ettcp - tool for measuring maximum TCP and UDP bandwidth performance (1.0)" +VENDOR="Sun Microsystems, Inc." +HOTLINE="Please contact your local service provider" +EMAIL="" +CLASSES="none" +BASEDIR=/ +SUNW_PKGVERS="1.0" +SUNW_PKG_ALLZONES="false" +SUNW_PKG_HOLLOW="false" +SUNW_PKG_THISZONE="false" + --- /dev/null 2009年 7月 3日 五 18:45:33 +++ new/usr/src/pkgdefs/SUNWettcp/prototype_com 2009年 7月 3日 五 18:45:33 @@ -0,0 +1,56 @@ +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)prototype_com 1.1 09/06/29 SMI" +# + +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search # where to find pkg objects +#!include # include another 'prototype' file +#!default # default used if not specified on entry +#!= # puts parameter in pkg environment + +# packaging files +i pkginfo +i copyright +i depend +# source locations relative to the prototype file +# +# SUNWettcp +# + +d none usr 755 root sys +d none usr/bin 755 root bin +f none usr/bin/ettcp 555 root bin + +d none usr/share 755 root sys +d none usr/share/man 755 root bin +d none usr/share/man/man1 755 root bin +f none usr/share/man/man1/ettcp.1 444 root bin + --- /dev/null 2009年 7月 3日 五 18:45:33 +++ new/usr/src/pkgdefs/SUNWettcp/prototype_i386 2009年 7月 3日 五 18:45:33 @@ -0,0 +1,54 @@ +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)prototype_i386 1.1 09/06/29 SMI" +# + +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search # where to find pkg objects +#!include # include another 'prototype' file +#!default # default used if not specified on entry +#!= # puts parameter in pkg environment + +# +# Include ISA independent files (prototype_com) +# +!include prototype_com +# +# +# +# List files which are I386 specific here +# +# source locations relative to the prototype file +# +# +# SUNWettcp +# +# + --- /dev/null 2009年 7月 3日 五 18:45:34 +++ new/usr/src/pkgdefs/SUNWettcp/prototype_sparc 2009年 7月 3日 五 18:45:33 @@ -0,0 +1,54 @@ +# +# 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 2009 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)prototype_sparc 1.1 09/07/02 SMI" +# + +# This required package information file contains a list of package contents. +# The 'pkgmk' command uses this file to identify the contents of a package +# and their location on the development machine when building the package. +# Can be created via a text editor or through use of the 'pkgproto' command. + +#!search # where to find pkg objects +#!include # include another 'prototype' file +#!default # default used if not specified on entry +#!= # puts parameter in pkg environment + +# +# Include ISA independent files (prototype_com) +# +!include prototype_com +# +# +# +# List files which are SPARC specific here +# +# source locations relative to the prototype file +# +# +# SUNWettcp +# +# +