--- old/usr/src/cmd/Makefile 2009年 7月 3日 五 18:41:20 +++ new/usr/src/cmd/Makefile 2009年 7月 3日 五 18:41:20 @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)Makefile 1.166 09/06/29 SMI" +# ident "@(#)Makefile 1.169 09/07/02 SMI" # # @@ -57,9 +57,11 @@ awstats \ bash \ bcc \ + beanshell \ bind \ bison \ bonnieplus \ + bvi \ bwm-ng \ bzip2 \ cimserver \ @@ -95,7 +97,7 @@ gawk \ gdb \ gettext \ - grails \ + grails \ gpatch \ ggrep \ ghostscript \ @@ -172,6 +174,7 @@ procmail \ psutils \ pycups \ + pylint \ pwgen \ quagga \ quilt \ 没有遇到差别 --- old/usr/src/cmd/ettcp/Makefile.sfw 2009年 7月 3日 五 18:41:20 +++ new/usr/src/cmd/ettcp/Makefile.sfw 2009年 7月 3日 五 18:41:20 @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)Makefile.sfw 1.1 09/06/29 SMI" +# ident "@(#)Makefile.sfw 1.2 09/07/03 SMI" # VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh) @@ -31,17 +31,15 @@ include ../Makefile.cmd -CONFIGURE_OPTIONS += PTHREAD_CFLAGS=-pthreads -CONFIGURE_OPTIONS += CC=$(CC) - all: $(VER)/config.status - (cd $(VER); env - CC="$(GCC)" $(CCSMAKE) all) + (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 - + /usr/bin/gzip -dc $(TARBALL) | $(TAR) xopf - + (cd $(VER); $(GPATCH) -p0 < ../ettcp.Makefile.patch) clean: -rm -rf $(VER) 二进制文件 old/usr/src/cmd/ettcp/ettcp-1.0.tar.gz 和 new/usr/src/cmd/ettcp/ettcp-1.0.tar.gz 不同 --- /dev/null 2009年 7月 3日 五 18:41:21 +++ new/usr/src/cmd/ettcp/ettcp.Makefile.patch 2009年 7月 3日 五 18:41:21 @@ -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 没有遇到差别 没有遇到差别 --- old/usr/src/pkgdefs/Makefile 2009年 7月 3日 五 18:41:22 +++ new/usr/src/pkgdefs/Makefile 2009年 7月 3日 五 18:41:22 @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)Makefile 1.241 09/06/25 SMI" +# ident "@(#)Makefile 1.247 09/07/02 SMI" # # @@ -40,6 +40,7 @@ SUNW0sfw \ SUNWa2psr \ SUNWa2psu \ + SUNWaalib \ SUNWaconf \ SUNWactivation \ SUNWaget \ @@ -80,9 +81,11 @@ SUNWawstats \ SUNWbash \ SUNWbcc \ + SUNWbeanshell \ SUNWbinutils \ SUNWbison \ SUNWbonnieplus \ + SUNWbvi \ SUNWbwm-ng \ SUNWbzip \ SUNWcglib \ @@ -90,6 +93,7 @@ SUNWcimserveru \ SUNWclisp \ SUNWcmake \ + SUNWcommons-collections \ SUNWconflict \ SUNWconmanr \ SUNWconmanu \ @@ -163,7 +167,7 @@ SUNWgnu-readline \ SUNWgnu-which \ SUNWgocr \ - SUNWgrails \ + SUNWgrails \ SUNWgsed \ SUNWgsfot \ SUNWgsfst \ @@ -215,6 +219,7 @@ SUNWlibnet \ SUNWlibopenusb \ SUNWlibpcap \ + SUNWlibosip2 \ SUNWlibrsync \ SUNWlibsigsegv \ SUNWlibsndfile \ @@ -336,6 +341,7 @@ SUNWpsutils \ SUNWpull-parser \ SUNWpycups \ + SUNWpylint \ SUNWpython-pyopenssl \ SUNWpython26-pyopenssl \ SUNWpwgen \ --- old/usr/src/pkgdefs/SUNWettcp/Makefile 2009年 7月 3日 五 18:41:22 +++ new/usr/src/pkgdefs/SUNWettcp/Makefile 2009年 7月 3日 五 18:41:22 @@ -23,11 +23,13 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)Makefile 1.1 09/06/29 SMI" +# ident "@(#)Makefile 1.2 09/07/03 SMI" # include ../Makefile.com +DATAFILES = depend + .KEEP_STATE: all: $(FILES) --- old/usr/src/pkgdefs/SUNWettcp/copyright 2009年 7月 3日 五 18:41:22 +++ new/usr/src/pkgdefs/SUNWettcp/copyright 2009年 7月 3日 五 18:41:22 @@ -1,38 +1,11 @@ ettcp license -------------------------------------------------------------------------- -Test TCP connection. Makes a connection on port 5001 -and transfers fabricated buffers or data copied from stdin. +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 -Usable on 4.2, 4.3, and 4.1a systems by defining one of -BSD42 BSD43 (BSD41a) -Machines using System V with BSD sockets should define SYSV. - -Modified for operation under 4.2BSD, 18 Dec 84 - T.C. Slattery, USNA -Minor improvements, Mike Muuss and Terry Slattery, 16-Oct-85. -Modified in 1989 at Silicon Graphics, Inc. - catch SIGPIPE to be able to print stats when receiver has died - for tcp, don't look for sentinel during reads to allow small transfers - increased default buffer size to 8K, nbuf to 2K to transfer 16MB - moved default port to 5001, beyond IPPORT_USERRESERVED - make sinkmode default because it is more popular, - -s now means don't sink/source - count number of read/write system calls to see effects of - blocking from full socket buffers - for tcp, -D option turns off buffered writes (sets TCP_NODELAY sockopt) - buffer alignment options, -A and -O - print stats in a format that's a bit easier to use with grep & awk - for SYSV, mimic BSD routines to use most of the existing timing code -Modified by Steve Miller of the University of Maryland, College Park - -b sets the socket buffer size (SO_SNDBUF/SO_RCVBUF) -Modified Sept. 1989 at Silicon Graphics, Inc. - restored -s sense at request of tcs@brl -Modified Oct. 1991 at Silicon Graphics, Inc. - use getopt(3) for option processing, add -f and -T options. - SGI IRIX 3.3 and 4.0 releases don't need #define SYSV. - -Modified by David Boreham -to support call back mode - Distribution Status - Public Domain. Distribution Unlimited. 没有遇到差别 没有遇到差别 没有遇到差别 --- old/usr/src/pkgdefs/SUNWettcp/prototype_sparc 2009年 7月 3日 五 18:41:24 +++ new/usr/src/pkgdefs/SUNWettcp/prototype_sparc 2009年 7月 3日 五 18:41:24 @@ -23,7 +23,7 @@ # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "@(#)prototype_sparc 1.1 09/06/29 SMI" +# ident "@(#)prototype_sparc 1.1 09/07/02 SMI" # # This required package information file contains a list of package contents. @@ -43,7 +43,7 @@ # # # -# List files which are I386 specific here +# List files which are SPARC specific here # # source locations relative to the prototype file #