Date: Sat, 7 Oct 2006 21:40:44 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107457 for review Message-ID: <200610072140.k97Leid2064135@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107457 Change 107457 by jb@jb_freebsd7 on 2006/10/07 21:40:24 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#25 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#13 integrate .. //depot/projects/dtrace/ports/MOVED#20 integrate .. //depot/projects/dtrace/ports/Mk/bsd.database.mk#4 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#9 integrate .. //depot/projects/dtrace/ports/Mk/bsd.tcl.mk#2 integrate .. //depot/projects/dtrace/ports/UPDATING#14 integrate .. //depot/projects/dtrace/src/Makefile.inc1#19 integrate .. //depot/projects/dtrace/src/bin/cp/utils.c#5 integrate .. //depot/projects/dtrace/src/bin/sh/jobs.c#3 integrate .. //depot/projects/dtrace/src/bin/sh/jobs.h#3 integrate .. //depot/projects/dtrace/src/bin/sh/main.c#3 integrate .. //depot/projects/dtrace/src/bin/sh/sh.1#6 integrate .. //depot/projects/dtrace/src/etc/network.subr#7 integrate .. //depot/projects/dtrace/src/etc/rc.d/Makefile#8 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#1 branch .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#12 integrate .. //depot/projects/dtrace/src/lib/libc/sys/aio_return.2#3 integrate .. //depot/projects/dtrace/src/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/dtrace/src/secure/usr.bin/sftp/Makefile#4 integrate .. //depot/projects/dtrace/src/share/man/man4/aue.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/kue.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/ural.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/uscanner.4#5 integrate .. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/dtrace/src/share/timedef/da_DK.ISO8859-1.src#3 integrate .. //depot/projects/dtrace/src/share/timedef/da_DK.UTF-8.src#3 integrate .. //depot/projects/dtrace/src/sys/boot/i386/pxeldr/pxeboot.8#3 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/dtrace/www/en/cgi/Makefile#4 integrate .. //depot/projects/dtrace/www/en/cgi/dosendpr.cgi#2 integrate .. //depot/projects/dtrace/www/en/cgi/html.pl#2 delete .. //depot/projects/dtrace/www/en/docs/books.sgml#5 integrate .. //depot/projects/dtrace/www/en/donations/donors.sgml#13 integrate .. //depot/projects/dtrace/www/en/projects/c99/index.sgml#4 integrate .. //depot/projects/dtrace/www/en/releases/4.11R/errata.html#5 integrate .. //depot/projects/dtrace/www/en/releases/5.5R/errata.html#6 integrate .. //depot/projects/dtrace/www/en/releases/6.1R/errata.html#7 integrate .. //depot/projects/dtrace/www/en/send-pr.sgml#3 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.757 2006/10/06 19:18:17 novel Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.759 2006/10/07 20:55:22 pav Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -6185,8 +6185,8 @@ <title>Using wxWidgets</title> <para>If your port uses <application>wxWidgets</application> - cross-platform toolkit, define <literal>USE_WX=yes</literal>. - A specific version can be requested by setting + cross-platform toolkit, define <literal>USE_WX</literal>. + A specific version must be requested by setting <literal>USE_WX=2.6</literal>. Ranges (<literal>2.4-2.6</literal>) and partial ranges (<literal>-2.4</literal>, <literal>2.6+</literal>) are also possible.</para> @@ -6248,8 +6248,8 @@ are <literal>absolute</literal> resulting in <literal>--with-wx-config=${WX_CONFIG}</literal>, and <literal>relative</literal> resulting in - <literal>--with-wx=${X11BASE}</literal> being added to configure - script arguments.</para> + <literal>--with-wx=${X11BASE} --with-wx-config=${WX_CONFIG}</literal> + being added to configure script arguments.</para> <para>Define <literal>WX_UNICODE=yes</literal> if your port needs the Unicode version of the wxWidgets libraries.</para> @@ -10222,6 +10222,27 @@ special need.</para> </sect1> + <sect1 id="dads-rerolling-distfiles"> + <title>Rerolling distfiles</title> + + <para>Sometimes the authors of software change the content of + released distfiles without changing the file's name. You have + to verify that the changes are official and have been performed + by the author. It has happened in the past that the distfile + was silently altered on the download servers with the intent + to cause harm or compromise end user security.</para> + + <para>Put the old distfile aside, download the new one, unpack + them and compare the content with &man.diff.1;. If you see + nothing suspicious, you can update <filename>distinfo</filename>. + Be sure to summarize the differences in your PR or commit log, + so that other people know that you have taken care to ensure + that nothing bad has happened.</para> + + <para>You might also want to contact the authors of the software + and confirm the changes with them.</para> + </sect1> + <sect1 id="dads-workarounds"> <title>Necessary workarounds</title> ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#13 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.399 2006/10/01 13:11:22 joel Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.400 2006/10/07 14:37:57 bmah Exp $ --> <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//"> @@ -3495,6 +3495,7 @@ <!ENTITY man.ng.rfc1490.4 "<citerefentry/<refentrytitle/ng_rfc1490/<manvolnum/4//"> <!ENTITY man.ng.socket.4 "<citerefentry/<refentrytitle/ng_socket/<manvolnum/4//"> <!ENTITY man.ng.sppp.4 "<citerefentry/<refentrytitle/ng_sppp/<manvolnum/4//"> +<!ENTITY man.ng.tag.4 "<citerefentry/<refentrytitle/ng_tag/<manvolnum/4//"> <!ENTITY man.ng.tcpmss.4 "<citerefentry/<refentrytitle/ng_tcpmss/<manvolnum/4//"> <!ENTITY man.ng.tee.4 "<citerefentry/<refentrytitle/ng_tee/<manvolnum/4//"> <!ENTITY man.ng.tty.4 "<citerefentry/<refentrytitle/ng_tty/<manvolnum/4//"> ==== //depot/projects/dtrace/ports/MOVED#20 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1151 2006/10/06 20:48:15 joerg Exp $ +# $FreeBSD: ports/MOVED,v 1.1155 2006/10/07 20:10:33 alepulver Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2197,7 +2197,6 @@ audio/musicbrainz||2006-03-15|Remove expired port graphics/quickpics||2006-03-15|Remove expired port graphics/threeDS||2006-03-15|Remove expired port -graphics/vid||2006-03-15|Remove expired port graphics/smoke||2006-03-15|Remove expired port misc/globus2||2006-03-15|Remove expired port sysutils/prune||2006-03-15|Remove expired port @@ -2485,3 +2484,6 @@ math/ufspase|math/suitespase|2006-10-05|portname has been changed devel/avr-gcc|devel/avr-gcc-3|2006-10-05|retire AVR-GCC 3.x devel/avr-gcc-devel|devel/avr-gcc|2006-10-06|make AVR-GCC 4.x the default version +astro/gdesklets-goodweather||2006-10-07|Expired: no longer downloadable +deskutils/goats||2006-10-07|Expired: no longer downloadable +net-mgmt/arpwatch-devel|net-mgmt/arpwatch|2006-10-07|Devel port no longer needed ==== //depot/projects/dtrace/ports/Mk/bsd.database.mk#4 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.database.mk,v 1.15 2006/09/30 19:25:45 linimon Exp $ +# $FreeBSD: ports/Mk/bsd.database.mk,v 1.16 2006/10/07 10:22:24 miwi Exp $ # .if defined(_POSTMKINCLUDED) && !defined(Database_Post_Include) @@ -51,33 +51,38 @@ # - Detected PostgreSQL version. ## # USE_BDB - Add Berkeley DB library dependency. -# If no version is given (by the maintainer via the port or -# by the user via defined variable), try to find the -# currently installed version. Fall back to default if -# necessary (db41+). -# INVALID_BDB_VER - This variable can be defined when the port doesn't -# support one or more versions of Berkeley DB. -# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always -# build this port with (overrides WITH_BDB_VER). -# WITH_BDB_VER - User defined global variable to set Berkeley DB version -# <UNIQUENAME>_WITH_BDB_VER - User defined port specific variable to set -# Berkeley DB version -# WITH_BDB_HIGHEST - Use the highest installed version of Berkeley DB -# BDB_LIB_NAME - This variable is automatically set to the name of the -# Berkeley DB library (default: db41) -# BDB_LIB_CXX_NAME - This variable is automatically set to the name of the -# Berkeley DB c++ library (default: db41_cxx) -# BDB_INCLUDE_DIR - This variable is automatically set to the location of -# the Berkeley DB include directory. -# (default: ${LOCALBASE}/include/db41) -# BDB_LIB_DIR - This variable is automatically set to the location of -# the Berkeley DB library directory. +# If no version is given (by the maintainer via the port or +# by the user via defined variable), try to find the +# currently installed version. Fall back to default if +# necessary (db41+). +# INVALID_BDB_VER +# - This variable can be defined when the port doesn't +# support one or more versions of Berkeley DB. +# WANT_BDB_VER - Maintainer can set a version of Berkeley DB to always +# build this port with (overrides WITH_BDB_VER). +# WITH_BDB_VER - User defined global variable to set Berkeley DB version +# <UNIQUENAME>_WITH_BDB_VER +# - User defined port specific variable to set +# Berkeley DB version +# WITH_BDB_HIGHEST +# - Use the highest installed version of Berkeley DB +# BDB_LIB_NAME - This variable is automatically set to the name of the +# Berkeley DB library (default: db41) +# BDB_LIB_CXX_NAME +# - This variable is automatically set to the name of the +# Berkeley DB c++ library (default: db41_cxx) +# BDB_INCLUDE_DIR +# - This variable is automatically set to the location of +# the Berkeley DB include directory. +# (default: ${LOCALBASE}/include/db41) +# BDB_LIB_DIR - This variable is automatically set to the location of +# the Berkeley DB library directory. # BDB_VER - Detected Berkeley DB version. ## # USE_SQLITE - Add dependency on sqlite library. Valid values are: # 3 and 2. If version is not specified directly then # sqlite3 is used (if USE_SQLITE= yes). -# SQLITE_VER - Detected sqlite version. +# SQLITE_VER - Detected sqlite version. ## # USE_FIREBIRD - Add dependency on Firebird library. Valid values are: # 2 and 1. If no version is given by the maintainer (if @@ -85,7 +90,7 @@ # WITH_FIREBIRD_VER variable, fall back to default "2". # WITH_FIREBIRD_VER # - User defined variable to set Firebird version. -# FIREBIRD_VER - Detected Firebird version. +# FIREBIRD_VER - Detected Firebird version. .if defined(USE_MYSQL) DEFAULT_MYSQL_VER?= 50 ==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#9 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.399 2006/10/05 17:26:10 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.400 2006/10/07 17:47:05 dinoex Exp $ # # Where to put distfiles that don't have any other master site @@ -455,7 +455,7 @@ .if !defined(IGNORE_MASTER_SITE_GNUSTEP) MASTER_SITE_GNUSTEP+= \ http://downloads.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \ - http://public.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \ + ftp://ftp.planetmirror.com/pub/gnustep/gnustep/%SUBDIR%/ \ ftp://ftp.gnustep.org/pub/gnustep/%SUBDIR%/ \ ftp://ftp.easynet.nl/mirror/GNUstep/pub/gnustep/%SUBDIR%/ .endif ==== //depot/projects/dtrace/ports/Mk/bsd.tcl.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.3 2006/05/01 19:49:57 sem Exp $ +# $FreeBSD: ports/Mk/bsd.tcl.mk,v 1.4 2006/10/07 10:24:57 miwi Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Tcl_Pre_Include) @@ -9,37 +9,40 @@ Tcl_Pre_Include= bsd.tcl.mk Tcl_Include_MAINTAINER= ports@FreeBSD.org -# USE_TCL: Depend on tcl to run. In case of incompatible APIs of different -# TCL versions the version can be specified directly. If version -# is not specified (USE_TCL=yes) then the latest version is -# used (8.4 currently). -# Available values are: 84, 83, 82, 81 and 80. +# USE_TCL - Depend on tcl to run. In case of incompatible APIs of +# different TCL versions the version can be specified directly. +# If version is not specified (USE_TCL=yes) then the latest +# version is used (8.4 currently). +# Available values are: 84, 83, 82, 81 and 80. # -# USE_TK: Depend on tk to run. In case of incompatible APIs of different -# TK versions the version can be specified directly. If version -# is not specified (USE_TK=yes) then the latest version is -# used (8.4 currently). -# Available values are: 84, 83, 82, 81 and 80. +# USE_TK - Depend on tk to run. In case of incompatible APIs of different +# TK versions the version can be specified directly. If version +# is not specified (USE_TK=yes) then the latest version is +# used (8.4 currently). +# Available values are: 84, 83, 82, 81 and 80. ## -# TCL_LIBDIR: Path where tcl libraries can be found +# TCL_LIBDIR - Path where tcl libraries can be found # -# TCL_INCLUDEDIR: Path where tcl C headers can be found +# TCL_INCLUDEDIR +# - Path where tcl C headers can be found ## -# TK_LIBDIR: Path where tk libraries can be found +# TK_LIBDIR - Path where tk libraries can be found # -# TK_INCLUDEDIR: Path where tk C headers can be found +# TK_INCLUDEDIR - Path where tk C headers can be found ## -# TCLSH: Path to tclsh executable respecting tcl version +# TCLSH - Path to tclsh executable respecting tcl version # -# WISH: Path to wish executable respecting tk version +# WISH - Path to wish executable respecting tk version ## -# PATCH_TCL_SCRIPTS: List of tcl scripts that need to be patched to replace -# tclsh calls with tclsh${TK_VER} calls. Also note that -# post-patch target is used. +# PATCH_TCL_SCRIPTS +# - List of tcl scripts that need to be patched to replace +# tclsh calls with tclsh${TK_VER} calls. Also note that +# post-patch target is used. # -# PATCH_TK_SCRIPTS: List of tcl scripts that need to be patched to replace -# wish calls with wish${TK_VER} calls. Also note that -# post-patch target is used. +# PATCH_TK_SCRIPTS +# - List of tcl scripts that need to be patched to replace +# wish calls with wish${TK_VER} calls. Also note that +# post-patch target is used. .if defined(USE_TCL) || defined(USE_TCL_BUILD) ==== //depot/projects/dtrace/ports/UPDATING#14 (text+ko) ==== @@ -6,6 +6,22 @@ time you update your ports collection, before attempting any port upgrades. +20061007: + AFFECTS: users of security/p5-openxpki + AUTHOR: svysh@cryptocom.ru + + Old port security/p5-openxpki has been split into 8 new ports: + p5-openxpki: core for server part + p5-openxpki-client: base class for actual clients + p5-openxpki-i18n: internationalization of the user interface + p5-openxpki-client-cli: command line interface to local OpenXPKI daemon + p5-openxpki-client-html-mason: web interface to local OpenXPKI daemon + p5-openxpki-client-scep: set of SCEP tools + p5-openxpki-client-soap-lite: set of SOAP-Lite tools + p5-openxpki-deployment: set of deployment tools + + Please see security/p5-openxpki/pkg-descr for their interdependencies. + 20060926: AFFECTS: users of security/libgpg-error and any port that depends on it AUTHOR: novel@FreeBSD.org @@ -4188,4 +4204,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.399 2006/09/26 11:19:38 novel Exp $ +$FreeBSD: ports/UPDATING,v 1.400 2006/10/07 12:34:00 rafan Exp $ ==== //depot/projects/dtrace/src/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.559 2006/09/08 10:09:02 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.561 2006/10/07 19:26:46 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1034,60 +1034,62 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= lib/libelf +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ + lib/libexpat ${_lib_libgssapi} ${_lib_libipx} \ + lib/libkiconv lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libpam \ + lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ + ${_lib_libypclnt} lib/libz lib/msun \ + ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ + ${_secure_lib_libssl} -_generic_libs= gnu/lib - -.if ${MK_IPX} != "no" -_prebuild_libs+= lib/libipx -.endif - -.if ${MK_KERBEROS} != "no" -_prebuild_libs+= kerberos5/lib/libasn1 -_prebuild_libs+= kerberos5/lib/libkrb5 -_prebuild_libs+= kerberos5/lib/libroken -_generic_libs+= kerberos5/lib -.endif - -_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ - lib/libradius \ - lib/libsbuf lib/libtacplus lib/libutil \ - lib/libz lib/msun lib/libgssapi +_generic_libs= gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib lib/libopie__L lib/libtacplus__L: lib/libmd__L -_generic_libs+= lib - .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no" -_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +_secure_lib_libcrypto= secure/lib/libcrypto +_secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L .if ${MK_OPENSSH} != "no" -_prebuild_libs+= secure/lib/libssh +_secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -secure/lib/libssh__L: lib/libgssapi__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libasn1__L lib/libcom_err__L lib/libmd__L \ + kerberos5/lib/libroken__L +.endif .endif .endif +_secure_lib= secure/lib .endif -_generic_libs+= secure/lib + +.if ${MK_IPX} != "no" +_lib_libipx= lib/libipx .endif -.if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +.if ${MK_KERBEROS} != "no" +_kerberos5_lib= kerberos5/lib +_kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 +_kerberos5_lib_libroken= kerberos5/lib/libroken +_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" -_prebuild_libs+= lib/libypclnt +_lib_libypclnt= lib/libypclnt .endif .if ${MK_CDDL} != "no" _prebuild_libs+= cddl/lib .endif -_generic_libs+= usr.bin/lex/lib +.if ${MK_OPENSSL} == "no" +lib/libradius__L: lib/libmd__L +.endif .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY ==== //depot/projects/dtrace/src/bin/cp/utils.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.50 2006/10/06 08:30:33 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.52 2006/10/07 12:14:50 maxim Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -54,17 +54,18 @@ #include <unistd.h> #include "extern.h" -#define cp_pct(x,y) (int)(100.0 * (double)(x) / (double)(y)) + +#define cp_pct(x, y) ((y == 0) ? 0 : (int)(100.0 * (x) / (y))) int copy_file(const FTSENT *entp, int dne) { static char buf[MAXBSIZE]; struct stat *fs; - int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; ssize_t wcount; size_t wresid; off_t wtotal; + int ch, checkch, from_fd = 0, rcount, rval, to_fd = 0; char *bufp; #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED char *p; @@ -149,16 +150,17 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { @@ -179,16 +181,17 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); + if (wcount <= 0) + break; wtotal += wcount; if (info) { info = 0; (void)fprintf(stderr, - "%s -> %s %3d%%\n", - entp->fts_path, to.p_path, - cp_pct(wtotal, fs->st_size)); - + "%s -> %s %3d%%\n", + entp->fts_path, to.p_path, + cp_pct(wtotal, fs->st_size)); } - if (wcount >= (ssize_t)wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid) break; } if (wcount != (ssize_t)wresid) { ==== //depot/projects/dtrace/src/bin/sh/jobs.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.71 2006/02/04 14:37:50 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.72 2006/10/07 16:51:16 stefanf Exp $"); #include <fcntl.h> #include <signal.h> @@ -98,7 +98,7 @@ STATIC void deljob(struct job *); STATIC struct job *getcurjob(struct job *); #endif -STATIC void showjob(struct job *, pid_t, int, int); +STATIC void showjob(struct job *, pid_t, int); /* @@ -265,18 +265,21 @@ jobscmd(int argc, char *argv[]) { char *id; - int ch, sformat, lformat; + int ch, mode; optind = optreset = 1; opterr = 0; - sformat = lformat = 0; - while ((ch = getopt(argc, argv, "ls")) != -1) { + mode = SHOWJOBS_DEFAULT; + while ((ch = getopt(argc, argv, "lps")) != -1) { switch (ch) { case 'l': - lformat = 1; + mode = SHOWJOBS_VERBOSE; + break; + case 'p': + mode = SHOWJOBS_PGIDS; break; case 's': - sformat = 1; + mode = SHOWJOBS_PIDS; break; case '?': default: @@ -287,24 +290,25 @@ argv += optind; if (argc == 0) - showjobs(0, sformat, lformat); + showjobs(0, mode); else while ((id = *argv++) != NULL) - showjob(getjob(id), 0, sformat, lformat); + showjob(getjob(id), 0, mode); return (0); } STATIC void -showjob(struct job *jp, pid_t pid, int sformat, int lformat) +showjob(struct job *jp, pid_t pid, int mode) { char s[64]; struct procstat *ps; struct job *j; int col, curr, i, jobno, prev, procno; + pid_t ppid; char c; - procno = jp->nprocs; + procno = (mode == SHOWJOBS_PGIDS) ? 1 : jp->nprocs; jobno = jp - jobtab + 1; curr = prev = 0; #if JOBS @@ -315,11 +319,13 @@ } #endif for (ps = jp->ps ; ; ps++) { /* for each process */ - if (sformat) { - out1fmt("%d\n", (int)ps->pid); + if (mode == SHOWJOBS_PIDS || mode == SHOWJOBS_PGIDS) { + ppid = (mode == SHOWJOBS_PIDS) ? ps->pid : + getpgid(ps->pid); + out1fmt("%d\n", (int)ppid); goto skip; } - if (!lformat && ps != jp->ps && pid == 0) + if (mode != SHOWJOBS_VERBOSE && ps != jp->ps && pid == 0) goto skip; if (pid != 0 && pid != ps->pid) goto skip; @@ -335,7 +341,7 @@ fmtstr(s, 64, " %c ", c); out1str(s); col = strlen(s); - if (lformat) { + if (mode == SHOWJOBS_VERBOSE) { fmtstr(s, 64, "%d ", (int)ps->pid); out1str(s); col += strlen(s); @@ -388,7 +394,7 @@ */ void -showjobs(int change, int sformat, int lformat) +showjobs(int change, int mode) { int jobno; struct job *jp; @@ -404,7 +410,7 @@ } if (change && ! jp->changed) continue; - showjob(jp, 0, sformat, lformat); + showjob(jp, 0, mode); jp->changed = 0; if (jp->state == JOBDONE) { freejob(jp); @@ -992,7 +998,7 @@ out1str(" (core dumped)"); out1c('\n'); } else - showjob(thisjob, pid, 0, 0); + showjob(thisjob, pid, SHOWJOBS_DEFAULT); } } else { TRACE(("Not printing status, rootshell=%d, job=%p\n", rootshell, job)); ==== //depot/projects/dtrace/src/bin/sh/jobs.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/jobs.h,v 1.18 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/jobs.h,v 1.19 2006/10/07 16:51:16 stefanf Exp $ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ @@ -74,6 +74,13 @@ #endif }; +enum { + SHOWJOBS_DEFAULT, /* job number, status, command */ + SHOWJOBS_VERBOSE, /* job number, PID, status, command */ + SHOWJOBS_PIDS, /* PID only */ + SHOWJOBS_PGIDS /* PID of the group leader only */ +}; + extern pid_t backgndpid; /* pid of last background process */ extern int job_warning; /* user was warned about stopped jobs */ extern int in_waitcmd; /* are we in waitcmd()? */ @@ -84,7 +91,7 @@ int fgcmd(int, char **); int bgcmd(int, char **); int jobscmd(int, char **); -void showjobs(int, int, int); +void showjobs(int, int); int waitcmd(int, char **); int jobidcmd(int, char **); struct job *makejob(union node *, int); ==== //depot/projects/dtrace/src/bin/sh/main.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.28 2006/04/02 18:51:32 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.29 2006/10/07 16:51:16 stefanf Exp $"); #include <stdio.h> #include <signal.h> @@ -211,7 +211,7 @@ inter = 0; if (iflag && top) { inter++; - showjobs(1, 0, 0); + showjobs(1, SHOWJOBS_DEFAULT); chkmail(0); flushout(&output); } ==== //depot/projects/dtrace/src/bin/sh/sh.1#6 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.123 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.124 2006/10/07 16:51:16 stefanf Exp $ .\" -.Dd July 29, 2006 +.Dd October 7, 2006 .Dt SH 1 .Os .Sh NAME @@ -1777,7 +1777,7 @@ If the .Ar job argument is omitted, use the current job. -.It Ic jobs Oo Fl ls Oc Op Ar job ... +.It Ic jobs Oo Fl lps Oc Op Ar job ... Print information about the specified jobs, or all jobs if no .Ar job argument is given. @@ -1787,8 +1787,13 @@ .Fl l option is specified, the PID of each job is also printed. If the +.Fl p +option is specified, only the process IDs for the process group leaders +are printed, one per line. +If the .Fl s -option is specified, only the PIDs of the jobs are printed, one per line. +option is specified, only the PIDs of the job commands are printed, one per +line. .It Ic local Oo Ar variable ... Oc Op Fl See the .Sx Functions ==== //depot/projects/dtrace/src/etc/network.subr#7 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $ +# $FreeBSD: src/etc/network.subr,v 1.175 2006/10/07 15:45:56 ume Exp $ # # @@ -41,10 +41,6 @@ { _cfg=1 - if checkyesno ipv6_enable; then - ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 - fi - ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up ==== //depot/projects/dtrace/src/etc/rc.d/Makefile#8 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.76 2006/09/07 22:25:08 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.77 2006/10/07 15:45:56 ume Exp $ .include <bsd.own.mk> FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ - apm apmd archdep atm1 atm2 atm3 auditd \ + apm apmd archdep atm1 atm2 atm3 auditd auto_linklocal \ bgfsck bluetooth bootparams bridge bsnmpd bthidd \ ccd cleanvar cleartmp cron \ devd devfs dhclient \ ==== //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#12 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.226 2006/09/17 21:36:16 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.227 2006/10/07 08:29:20 phk Exp $ % ======================================================================= @@ -5192,6 +5192,22 @@ \ \ /___\/ \ \ \ \____\/ \__\/ % + THE + NORMAL + LAW OF ERROR + STANDS OUT IN THE + EXPERIENCE OF MANKIND + AS ONE OF THE BROADEST + GENERALIZATIONS OF NATURAL + PHILOSOPHY * IT SERVES AS THE + GUIDING INSTRUMENT IN RESEARCHES + IN THE PHYSICAL AND SOCIAL SCIENCES AND + IN MEDICINE, AGRICULTURE AND ENGINEERING * + IT IS AN INDISPENSABLE TOOL FOR THE ANALYSIS AND THE +INTERPRETATION OF THE BASIC DATA OBTAINED BY OBSERVATION AND EXPERIMENT + + -- W. J. Youden +% *** ******* ********* ==== //depot/projects/dtrace/src/lib/libc/sys/aio_return.2#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.17 2003/01/13 10:37:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/sys/aio_return.2,v 1.19 2006/10/07 10:49:20 trhodes Exp $ .\" -.Dd June 2, 1999 +.Dd October 7, 2006 .Dt AIO_RETURN 2 .Os .Sh NAME @@ -47,10 +47,10 @@ .Fn aio_return system call should only be called once, to obtain the final status of an asynchronous -I/O operation once -.Xr aio_error 2 +I/O operation once it has completed +.Xr ( aio_error 2 returns something other than -.Er EINPROGRESS . +.Er EINPROGRESS ) . .Sh RETURN VALUES If the asynchronous I/O request has completed, the status is returned as described in @@ -58,12 +58,10 @@ .Xr write 2 , or .Xr fsync 2 . -On failure, +Otherwise, .Fn aio_return -returns -.Dv -1 -and sets -.Dv errno +returns \-1 and sets +.Va errno to indicate the error condition. .Sh ERRORS The @@ -74,7 +72,7 @@ The .Fa iocb argument -does not reference an outstanding asynchronous I/O request. +does not reference a completed asynchronous I/O request. .El .Sh SEE ALSO .Xr aio_cancel 2 , ==== //depot/projects/dtrace/src/lib/libc/sys/lio_listio.2#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.5 2005/12/13 13:43:35 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/sys/lio_listio.2,v 1.6 2006/10/07 05:13:32 trhodes Exp $ .\" .Dd January 12, 2003 .Dt LIO_LISTIO 2 @@ -112,7 +112,7 @@ .Dv LIO_NOWAIT , the .Fn lio_listio -function 0 if the operations are successfully queued, +function returns 0 if the operations are successfully queued, otherwise \-1. .Sh ERRORS The ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.977 2006/09/28 15:36:59 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.978 2006/10/07 14:49:45 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -777,17 +777,18 @@ This feature can be re-enabled by using a new sysctl variable <varname>net.inet6.ip6.mcast_pmtu</varname>. &merged;</para> + <para>IPv6 link-local addresses are now enabled only + if <varname>ipv6_enable</varname> is set in &man.rc.conf.5;. + &merged;</para> + <para>The &man.ipfw.4; IP packet filter now supports IPv6. &merged;</para> - <para>The &man.ipfw.4; firewall system now supports substitution of the action - argument with the value obtained from table lookup, - which allows some optimization of rulesets. - This is now applicable only to <literal>pipe</literal>, - <literal>queue</literal>, - <literal>divert</literal>, - <literal>tee</literal>, - <literal>netgraph</literal>, - and <literal>ngtee</literal> rules. &merged; + <para>The &man.ipfw.4; firewall system now supports + a <literal>tablearg</literal> feature, which allows + values obtained from a table lookup to be used as part of a + rule. &merged; + This feature can be used to optimize some rulesets + or to implement policy-based routing inside a firewall. For example, the following rules will throw different packets to different pipes:</para> @@ -805,7 +806,7 @@ The tag acts as an internal marker (it is not sent out over the wire) that can be used to identify these packets later on, for example, by using <literal>tagged</literal> - rule option. For more details, see &man.ipfw.8;.</para> + rule option. For more details, see &man.ipfw.8;. &merged;</para> <para>The <literal>IPFIREWALL_FORWARD_EXTENDED</literal> kernel option has been removed. This option was used to permit @@ -823,6 +824,10 @@ <para>The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. &merged;</para> + <para>The &man.ng.tag.4; Netgraph node has been added to + support the manipulation of mbuf tags attached to data in the + kernel. &merged;</para> + <para>A bug has been fixed in which NFS over TCP would not reconnect when the server sent a FIN. This problem had occurred with Solaris NFS servers. &merged;</para> @@ -1653,10 +1658,10 @@ NetBSD as of 31 August 2006. &merged;</para> <para><application>OpenSSH</application> has been updated from - 4.2p1 to 4.3p1.</para> + 4.2p1 to 4.4p1. &merged;</para> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610072140.k97Leid2064135>