PERFORCE change 146087 for review
John Birrell
jb at FreeBSD.org
Mon Jul 28 04:20:14 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=146087
Change 146087 by jb at freebsd3 on 2008/07/28 04:19:15
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#21 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#84 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#51 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#14 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/faq/book.sgml#25 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#79 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#42 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#10 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#4 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#6 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/firewalls/chapter.sgml#8 integrate
.. //depot/projects/dtrace/doc/mn_MN.UTF-8/share/sgml/mailing-lists.ent#5 integrate
.. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/glarkin.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgollucci.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#42 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#40 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/rnoland.key#1 branch
.. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#14 integrate
.. //depot/projects/dtrace/ports/CHANGES#14 integrate
.. //depot/projects/dtrace/ports/KNOBS#15 integrate
.. //depot/projects/dtrace/ports/LEGAL#40 integrate
.. //depot/projects/dtrace/ports/MOVED#101 integrate
.. //depot/projects/dtrace/ports/Makefile#5 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.database.mk#13 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#10 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.gecko.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.java.mk#7 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.ldap.mk#1 branch
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#20 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.subdir.mk#6 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.python.mk#17 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#12 integrate
.. //depot/projects/dtrace/ports/Tools/make_index#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildenv#7 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildfailure#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildproxy#1 branch
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildproxy-client#1 branch
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildsuccess#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/claim-chroot#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/clean-chroot#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/cleanup-chroots#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/client-metrics#1 branch
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/comparelogs#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/cpdistfiles#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dodistfiles#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#9 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages.wrapper#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dosetupnode#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/keeprestr#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeduds#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeindex#7 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeparallel#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makerestr#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/makeworld#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/mkbindist#8 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/packagebuild#1 branch
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/pdispatch#6 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/pollmachine#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/portbuild#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processfail#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/prunebad#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/prunefailure#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/releasemachine#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/reportload#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/setupnode#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/stats#3 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/updatesnap#1 branch
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/zbackup#1 branch
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/zexpire#1 branch
.. //depot/projects/dtrace/ports/UPDATING#83 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#50 integrate
.. //depot/projects/dtrace/src/UPDATING#36 integrate
.. //depot/projects/dtrace/src/bin/mv/mv.c#6 integrate
.. //depot/projects/dtrace/src/bin/ps/ps.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/ip_fil.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/ipsend/iptests.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/ipsend/sock.c#7 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/lib/printnat.c#6 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/n12#4 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/n2#4 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/n5#4 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/ni1.nat#5 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/ni2.nat#4 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/test/regress/ni4.nat#4 integrate
.. //depot/projects/dtrace/src/contrib/ipfilter/tools/ipnat_y.y#7 integrate
.. //depot/projects/dtrace/src/contrib/tcsh/tc.func.c#5 integrate
.. //depot/projects/dtrace/src/crypto/openssh/Makefile.in#6 delete
.. //depot/projects/dtrace/src/crypto/openssh/Makefile.inc#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/buildpkg.sh.in#6 delete
.. //depot/projects/dtrace/src/crypto/openssh/config.sub#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/configure.ac#7 delete
.. //depot/projects/dtrace/src/crypto/openssh/install-sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/mdoc2man.awk#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/nchan.ms#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/nchan2.ms#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/Makefile.in#5 delete
.. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/Makefile.in#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/closefromtest.c#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/snprintftest.c#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/strduptest.c#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/openbsd-compat/regress/strtonumtest.c#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/openssh.xml.in#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/opensshd.init.in#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/Makefile#5 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/README.regress#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/agent-getpeereid.sh#5 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/agent-ptrace.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/agent-timeout.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/agent.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/banner.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/broken-pipe.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/brokenkeys.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/bsd.regress.mk#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/cfgmatch.sh#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/cipher-speed.sh#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/connect-privsep.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/connect.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/copy.1#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/copy.2#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/dsa_ssh2.prv#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/dsa_ssh2.pub#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/dynamic-forward.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/envpass.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/exit-status.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/forcecommand.sh#3 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/forwarding.sh#5 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/keygen-change.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/keyscan.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/login-timeout.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/multiplex.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/proto-mismatch.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/proto-version.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/proxy-connect.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/reconfigure.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/reexec.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/rekey.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/rsa_openssh.prv#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/rsa_openssh.pub#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/rsa_ssh2.prv#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/runtests.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/scp-ssh-wrapper.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/scp.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/sftp-badcmds.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/sftp-batch.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/sftp-cmds.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/sftp-glob.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/sftp.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/ssh-com-client.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/ssh-com-keygen.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/ssh-com-sftp.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/ssh-com.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/sshd-log-wrapper.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/stderr-after-eof.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/stderr-data.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/t4.ok#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/t5.ok#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/test-exec.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/transfer.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/try-ciphers.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/regress/yes-head.sh#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/scard/Makefile.in#5 delete
.. //depot/projects/dtrace/src/crypto/openssh/scard/Ssh.bin#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/scard/Ssh.bin.uu#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/scard/Ssh.java#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/ssh_prng_cmds.in#4 delete
.. //depot/projects/dtrace/src/crypto/openssh/survey.sh.in#4 delete
.. //depot/projects/dtrace/src/etc/ppp/ppp.conf#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/bluetooth#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/serial#4 integrate
.. //depot/projects/dtrace/src/etc/rc.resume#5 integrate
.. //depot/projects/dtrace/src/etc/rc.suspend#5 integrate
.. //depot/projects/dtrace/src/etc/remote#4 integrate
.. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#36 integrate
.. //depot/projects/dtrace/src/include/Makefile#18 integrate
.. //depot/projects/dtrace/src/include/sgtty.h#5 delete
.. //depot/projects/dtrace/src/include/stdlib.h#10 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Makefile.inc#19 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/Symbol.map#10 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/arc4random.3#4 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/arc4random.c#6 integrate
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawn.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawn_file_actions_init.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawnattr_getflags.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawnattr_getpgroup.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawnattr_getschedparam.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawnattr_getsigmask.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/gen/posix_spawnattr_init.3#1 branch
.. //depot/projects/dtrace/src/lib/libc/stdio/mktemp.c#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#25 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/setfib.2#2 integrate
.. //depot/projects/dtrace/src/lib/libkvm/kvm_mips.c#1 branch
.. //depot/projects/dtrace/src/lib/libutil/login.conf.5#7 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_cap.h#4 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_class.3#4 integrate
.. //depot/projects/dtrace/src/lib/libutil/login_class.c#5 integrate
.. //depot/projects/dtrace/src/lib/msun/Makefile#16 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#25 integrate
.. //depot/projects/dtrace/src/sbin/ipfw/ipfw.8#21 integrate
.. //depot/projects/dtrace/src/sbin/mksnap_ffs/mksnap_ffs.8#4 integrate
.. //depot/projects/dtrace/src/secure/lib/libcrypto/opensslconf-mips.h#1 branch
.. //depot/projects/dtrace/src/share/man/man4/ddb.4#19 integrate
.. //depot/projects/dtrace/src/share/man/man4/wi.4#8 integrate
.. //depot/projects/dtrace/src/share/man/man8/rc.subr.8#11 integrate
.. //depot/projects/dtrace/src/share/man/man9/Makefile#32 integrate
.. //depot/projects/dtrace/src/share/man/man9/accept_filter.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/accf_data.9#4 integrate
.. //depot/projects/dtrace/src/share/man/man9/accf_dns.9#1 branch
.. //depot/projects/dtrace/src/share/man/man9/sysctl.9#7 integrate
.. //depot/projects/dtrace/src/share/man/man9/sysctl_add_oid.9#5 integrate
.. //depot/projects/dtrace/src/share/misc/bsd-family-tree#17 integrate
.. //depot/projects/dtrace/src/share/misc/committers-ports.dot#8 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#14 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.sys.mk#13 integrate
.. //depot/projects/dtrace/src/sys/Makefile#16 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#51 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/param.h#7 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91_pmc.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#15 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/pxa/pxa_machdep.c#3 integrate
.. //depot/projects/dtrace/src/sys/boot/Makefile#9 integrate
.. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#18 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#2 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_ioctl.c#8 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_ioctl.h#7 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_misc.c#26 integrate
.. //depot/projects/dtrace/src/sys/compat/ndis/kern_ndis.c#6 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#62 integrate
.. //depot/projects/dtrace/src/sys/conf/files#100 integrate
.. //depot/projects/dtrace/src/sys/conf/kern.mk#13 integrate
.. //depot/projects/dtrace/src/sys/conf/options#55 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_fil.h#7 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_nat.h#6 integrate
.. //depot/projects/dtrace/src/sys/contrib/ipfilter/netinet/ip_state.c#9 integrate
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf_ioctl.c#14 integrate
.. //depot/projects/dtrace/src/sys/crypto/via/padlock.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/amr/amr.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/atkbdc/psm.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_tn1010.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_main.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_osdep.h#8 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#3 integrate
.. //depot/projects/dtrace/src/sys/dev/esp/esp_sbus.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/esp/ncr53c9x.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/esp/ncr53c9xvar.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hwpmc/hwpmc_mod.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/iicbus/ds1339.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/jme/if_jme.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/kbd/kbd.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/kbdmux/kbdmux.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt_raid.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci.c#21 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#13 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ehci_pci.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ugen.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uhid.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#14 integrate
.. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#14 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_apm.c#6 integrate
.. //depot/projects/dtrace/src/sys/geom/vinum/geom_vinum_rename.c#4 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#8 integrate
.. //depot/projects/dtrace/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#42 integrate
.. //depot/projects/dtrace/src/sys/i386/include/profile.h#5 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_environment.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#30 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#33 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_intr.c#22 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_lock.c#27 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_timeout.c#12 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#37 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_autoconf.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_lock.c#13 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_taskqueue.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_witness.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/tty.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/tty_info.c#1 branch
.. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#27 integrate
.. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#24 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#25 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#42 integrate
.. //depot/projects/dtrace/src/sys/libkern/arc4random.c#4 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#52 integrate
.. //depot/projects/dtrace/src/sys/modules/accf_dns/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#7 integrate
.. //depot/projects/dtrace/src/sys/modules/mem/Makefile#5 integrate
.. //depot/projects/dtrace/src/sys/net/bpf_buffer.c#2 integrate
.. //depot/projects/dtrace/src/sys/net/if_gre.c#16 integrate
.. //depot/projects/dtrace/src/sys/net/route.c#16 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_hostap.c#2 integrate
.. //depot/projects/dtrace/src/sys/netinet/accf_dns.c#1 branch
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#24 integrate
.. //depot/projects/dtrace/src/sys/netinet/in_pcb.h#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#14 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#19 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_offload.c#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_offload.h#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.h#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#12 integrate
.. //depot/projects/dtrace/src/sys/netinet/toedev.h#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#21 integrate
.. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#13 integrate
.. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#13 integrate
.. //depot/projects/dtrace/src/sys/netipsec/ipsec6.h#6 integrate
.. //depot/projects/dtrace/src/sys/netipx/ipx_input.c#7 integrate
.. //depot/projects/dtrace/src/sys/netipx/ipx_usrreq.c#9 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_socket.c#4 integrate
.. //depot/projects/dtrace/src/sys/nfs4client/nfs4_vfsops.c#14 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_socket.c#18 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#23 integrate
.. //depot/projects/dtrace/src/sys/rpc/auth_unix.c#4 integrate
.. //depot/projects/dtrace/src/sys/rpc/rpcclnt.c#6 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.c#18 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.h#11 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_arg.c#14 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm.c#14 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_klib.c#11 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_bsm_token.c#10 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_private.h#8 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_syscalls.c#14 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_trigger.c#8 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit_worker.c#15 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/autoconf.c#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/mem.c#6 integrate
.. //depot/projects/dtrace/src/sys/sys/_task.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/interrupt.h#10 integrate
.. //depot/projects/dtrace/src/sys/sys/kernel.h#23 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#58 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#46 integrate
.. //depot/projects/dtrace/src/sys/sys/refcount.h#4 integrate
.. //depot/projects/dtrace/src/sys/sys/socket.h#13 integrate
.. //depot/projects/dtrace/src/sys/sys/sysctl.h#17 integrate
.. //depot/projects/dtrace/src/sys/sys/taskqueue.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/vmmeter.h#6 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_balloc.c#7 integrate
.. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_vfsops.c#25 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_kern.c#15 integrate
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#27 integrate
.. //depot/projects/dtrace/src/usr.bin/gcore/elfcore.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/gzip/gzip.1#3 integrate
.. //depot/projects/dtrace/src/usr.bin/gzip/gzip.c#3 integrate
.. //depot/projects/dtrace/src/usr.bin/ldd/ldd.c#5 integrate
.. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.1#13 integrate
.. //depot/projects/dtrace/src/usr.bin/yacc/skeleton.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#29 integrate
.. //depot/projects/dtrace/src/usr.sbin/ndiscvt/ndisgen.8#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/rtadvd/rtadvd.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/rtsold/rtsold.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/setfib/setfib.c#3 integrate
.. //depot/projects/dtrace/www/en/cgi/cvsweb.conf#4 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#41 integrate
.. //depot/projects/dtrace/www/en/developers/cvs.sgml#5 integrate
.. //depot/projects/dtrace/www/en/releases/index.sgml#10 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#56 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#21 (text+ko) ====
@@ -13,7 +13,7 @@
</author>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.275 2008/06/20 00:28:50 erwin Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.276 2008/07/22 17:05:47 remko Exp $</pubdate>
<copyright>
<year>1999</year>
@@ -107,7 +107,7 @@
<row>
<entry><emphasis>Core Team monthly reports</emphasis></entry>
- <entry><filename>/home/core/public/monthly-report</filename>
+ <entry><filename>/home/core/public/monthly-reports</filename>
on the <hostid role="domainname">FreeBSD.org</hostid> cluster.
</entry>
</row>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#84 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.812 2008/06/19 15:20:07 amdmi3 Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.816 2008/07/25 09:11:10 bsam Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -833,6 +833,11 @@
</listitem>
<listitem>
+ <para>Andrey Surkov
+ <email>nsand at sura.ru</email></para>
+ </listitem>
+
+ <listitem>
<para>Andrey Sverdlichenko
<email>rblaze at users.sourceforge.net</email></para>
</listitem>
@@ -3294,11 +3299,6 @@
</listitem>
<listitem>
- <para>Greg Larkin
- <email>glarkin at sourcehosting.net</email></para>
- </listitem>
-
- <listitem>
<para>Greg Robinson
<email>greg at rosevale.com.au</email></para>
</listitem>
@@ -9189,6 +9189,11 @@
</listitem>
<listitem>
+ <para>Terry Sposato
+ <email>terry at sucked-in.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Teruaki Ata
<email>PFA03027 at nifty.ne.jp</email></para>
</listitem>
@@ -9638,11 +9643,6 @@
</listitem>
<listitem>
- <para>VANHULLEBUS Yvan
- <email>vanhu at netasq.com</email></para>
- </listitem>
-
- <listitem>
<para>Vadim Belman
<email>voland at catpipe.net</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#51 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.234 2008/07/08 05:40:34 sson Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.238 2008/07/23 00:39:25 pgollucci Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -671,7 +671,12 @@
</listitem>
<listitem>
+ <para>&a.glarkin;</para>
+ </listitem>
+
+ <listitem>
<para>&a.laszlof;</para>
+ </listitem>
<listitem>
<para>&a.njl;</para>
@@ -978,6 +983,10 @@
</listitem>
<listitem>
+ <para>&a.pgollucci;</para>
+ </listitem>
+
+ <listitem>
<para>&a.hmp;</para>
</listitem>
@@ -1390,6 +1399,10 @@
</listitem>
<listitem>
+ <para>&a.vanhu;</para>
+ </listitem>
+
+ <listitem>
<para>&a.jayanth;</para>
</listitem>
@@ -1492,6 +1505,10 @@
<listitem>
<para>&a.sephe;</para>
</listitem>
+
+ <listitem>
+ <para>&a.rnoland;</para>
+ </listitem>
</itemizedlist>
<!--
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#14 (text+ko) ====
@@ -11,7 +11,7 @@
<corpauthor>The &os; Ports Management Team</corpauthor>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.29 2008/07/04 13:03:22 pav Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.30 2008/07/23 16:03:16 pav Exp $</pubdate>
<copyright>
<year>2003</year>
@@ -121,45 +121,28 @@
<para>Package builds are performed in a
<literal>chroot</literal> populated by the
<filename>portbuild</filename> script using the
- <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/tarballs/bindist.tar</filename>
- file. This tarball is created by the
- <command>mkbindist</command> script which reads the
- <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/mkbindist.conf</filename>
- file to decide how to create the tarball.</para>
+ <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/bindist.tar</filename>
+ file.</para>
- <para>The script should be run as <username>root</username>
- with the following command:</para>
-
- <screen>/var/portbuild&prompt.root; <userinput>scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable></userinput></screen>
-
- <para>If <literal>ftp=1</literal> in
- <filename>mkbindist.conf</filename> then a pre-built release
- will be downloaded via FTP from the location specified by
- ftp://<replaceable>${ftpserver}</replaceable>/<replaceable>${ftpurl}</replaceable>/<replaceable>${rel}</replaceable>.
- If <literal>ftp=0</literal> and
- <literal>buildworld=1</literal> then
- <command>mkbindist</command> will call
- <command>makeworld</command> to build a new world
- [<literal>XXX</literal> This is currently broken].</para>
-
- <para>If both <literal>ftp=0</literal> and
- <literal>buildworld=0</literal> then
- <command>mkbindist</command> will use the pre-existing
- contents of <replaceable>${worlddir}</replaceable> to
- create <filename>bindist.tar</filename>. In practice
- this means that you must have already installed a world
- in ${worlddir}, which is typically installed with the
- <command>makeworld</command> script:</para>
-
- <screen>/var/portbuild&prompt.root; <userinput>scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> [-nocvs]</userinput></screen>
-
- <para>This command builds a world from the
+ <para>The following command builds a world from the
<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/src</filename>
tree and installs it into
<replaceable>${worlddir}</replaceable>. The tree will
be updated first unless <literal>-nocvs</literal> is
specified.</para>
+ <screen>/var/portbuild&prompt.root; <userinput>scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> [-nocvs]</userinput></screen>
+
+ <para>The <filename>bindist.tar</filename> tarball is created from the
+ previously installed world by the <command>mkbindist</command>
+ script. It should be run as <username>root</username> with the following
+ command:</para>
+
+ <screen>/var/portbuild&prompt.root; <userinput>scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen>
+
+ <para>The per-machine tarballs are located in
+ <filename><replaceable>${arch}</replaceable>/clients</filename>.</para>
+
<para>The <filename>bindist.tar</filename> file is extracted
onto each client at client boot time, and at the start of
each pass of the <command>dopackages</command>
@@ -170,6 +153,20 @@
<sect1 id="starting">
<title>Starting the Build</title>
+ <para>Several separate builds for each architecture - branch combination
+ are supported. All data private to a build (ports tree, src tree,
+ packages, distfiles, log files, bindist, Makefile, etc) are located under
+ <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable></filename>.
+ The last created build can be alternatively referenced under buildid
+ <literal>latest</literal>, the one before is called
+ <literal>previous</literal>.</para>
+
+ <para>New builds are cloned from the <literal>latest</literal>, which is
+ fast since it uses ZFS.</para>
+
+ <sect2 id="build-dopackages">
+ <title><command>dopackages</command> scripts</title>
+
<para>The <filename>scripts/dopackages*</filename> scripts
are used to perform the builds. Most useful are:</para>
@@ -228,11 +225,19 @@
<itemizedlist>
<listitem>
+ <para><literal>-keep</literal> - Do not delete this build in the
+ future, when it would be normally deleted as part of the
+ <literal>latest</literal> - <literal>previous</literal> cycle.
+ Don't forget to clean it up manually when you no longer need it.
+ </para>
+ </listitem>
+
+ <listitem>
<para><literal>-nofinish</literal> - Do not perform
post-processing once the build is complete. Useful
if you expect that the build will need to be restarted
- once it finishes. This option should always be used
- for normal build operations.
+ once it finishes. If you use this option, don't forget to cleanup
+ the clients when you don't need the build anymore.
</para>
</listitem>
@@ -243,6 +248,13 @@
</listitem>
<listitem>
+ <para><literal>-nocleanup</literal> - By default, when the
+ <literal>-finish</literal> stage of the build is complete, the build
+ data will be deleted from the clients. This option will prevent
+ that.</para>
+ </listitem>
+
+ <listitem>
<para><literal>-restart</literal> - Restart an interrupted
(or non-<literal>finish</literal>ed) build from the
beginning. Ports that failed on the previous build will
@@ -311,16 +323,30 @@
</listitem>
<listitem>
- <para><literal>-nocvs</literal> - Do not
- <command>cvs update</command> the
- <literal>src</literal> tree during preprocessing.
+ <para><literal>-nosrc</literal> - Do not update the
+ <literal>src</literal> tree from the ZFS snapshot, keep the tree from
+ previous build instead.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para><literal>-srccvs</literal> - Do not update the
+ <literal>src</literal> tree from the ZFS snapshot, update it with
+ <literal>cvs update</literal> instead.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para><literal>-noports</literal> - Do not update the
+ <literal>ports</literal> tree from the ZFS snapshot, keep the tree from
+ previous build instead.
</para>
</listitem>
<listitem>
- <para><literal>-noportscvs</literal> - Do not
- <command>cvs update</command> the
- <literal>ports</literal> tree during preprocessing.
+ <para><literal>-portscvs</literal> - Do not update the
+ <literal>ports</literal> tree from the ZFS snapshot, update it with
+ <literal>cvs update</literal> instead.
</para>
</listitem>
@@ -352,9 +378,13 @@
</itemizedlist>
<para>If the last build finished cleanly you do not need to delete
- anything; if it was interrupted you just need to run
- <literal>dosetupnodes</literal> on all clients for the
- the relevant branch. <filename>errors/</filename>,
+ anything. If it was interrupted, or you selected
+ <literal>-nocleanup</literal>, you need to clean up clients by running
+ </para>
+
+ <para><command>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</command></para>
+
+ <para><filename>errors/</filename>,
<filename>logs/</filename>, <filename>packages/</filename>, and so
forth, are cleaned by the scripts. If you are short of space,
you can also clean out <filename>ports/distfiles/</filename>.
@@ -409,13 +439,13 @@
<example>
<title>Update the i386-6 tree and do a complete build</title>
- <para><command>dopackages.6 i386 -nocvs -norestr -nofinish</command></para>
+ <para><command>dopackages.6 i386 -nosrc -norestr -nofinish</command></para>
</example>
<example>
<title>Restart an interrupted amd64-8 build without updating</title>
- <para><command>dopackages.8 amd64 -nocvs -noportscvs -norestr -continue -noindex -noduds -nofinish</command></para>
+ <para><command>dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</command></para>
</example>
<example>
@@ -423,6 +453,53 @@
<para><command>dopackages.7 sparc64 -finish</command></para>
</example>
+ </sect2>
+
+ <sect2 id="build-command">
+ <title><command>build</command> command</title>
+
+ <para>You may need to manipulate the build data before starting it,
+ especially for experimental builds. This is done with
+ <command>build</command> command.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><literal>build list <replaceable>arch</replaceable>
+ <replaceable>branch</replaceable></literal> - Shows the current set
+ of build ids.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para><literal>build clone <replaceable>arch</replaceable>
+ <replaceable>branch</replaceable> <replaceable>oldid</replaceable>
+ [<replaceable>newid</replaceable>]</literal> - Clones
+ <replaceable>oldid</replaceable> to
+ <replaceable>newid</replaceable> (or a datestamp if not specified).
+ </para>
+ </listitem>
+
+ <listitem>
+ <para><literal>build srcupdate <replaceable>arch</replaceable>
+ <replaceable>branch</replaceable>
+ <replaceable>buildid</replaceable</literal>> - Replaces the src
+ tree with a new ZFS snapshot. Don't forget to use
+ <literal>-nosrc</literal> flag to <command>dopackages</command>
+ later!
+ </para>
+ </listitem>
+
+ <listitem>
+ <para><literal>build portsupdate <replaceable>arch</replaceable>
+ <replaceable>branch</replaceable></literal> - Replaces the ports
+ tree with a new ZFS snapshot. Don't forget to use
+ <literal>-noports</literal> flag to <command>dopackages</command>
+ later!
+ </para>
+ </listitem>
+
+ </itemizedlist>
+ </sect2>
</sect1>
<sect1 id="anatomy">
@@ -434,14 +511,14 @@
<orderedlist>
<listitem>
- <para>A CVS update of the current <literal>ports</literal>
- tree [*]
+ <para>An update of the current <literal>ports</literal>
+ tree from the ZFS snapshot [*]
</para>
</listitem>
<listitem>
- <para>A CVS update of the running branch's
- <literal>src</literal> tree [*]
+ <para>An update of the running branch's
+ <literal>src</literal> tree from the ZFS snapshot [*]
</para>
</listitem>
@@ -537,15 +614,9 @@
processes, they'll keep going (or respawn) until they've built their
package.</para>
- <para>To free up resources, you will need to clean up by running
- <command>dosetupnode</command> on each client machine. For example,
- in &man.csh.1;:
- <screen>&prompt.user; <userinput>cd ~/loads; foreach i (*); /var/portbuild/scripts/dosetupnode i386 6-exp $i -norsync &; done</userinput></screen>
-
- The <literal>-norsync</literal> says not to bother resyncing the
- entire build data (ports tree, etc) on any remote machines, and it
- will just clean up old <literal>chroot</literal>s and then reset the
- build queue for that machine.</para>
+ <para>To free up resources, you will need to clean up client machines by
+ running <command>build cleanup</command> command. For example:
+ <screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 6-exp 20080714120411 -full</userinput></screen>
<para>If you forget to do this, then the old build
<literal>chroot</literal>s will not be cleaned up for 24 hours, and no
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v 1.10 2007/09/28 16:05:30 chinsan Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v 1.11 2008/07/22 16:46:34 remko Exp $
-->
<chapter id="l10n">
@@ -56,20 +56,6 @@
<para>Perl and Python have I18N and wide character handling
libraries. Please use them for I18N compliance.</para>
-
- <para>In older FreeBSD versions,
- Perl may give warnings about not having a wide character locale
- installed on your system. You can set the
- environment variable <envar>LD_PRELOAD</envar> to
- <filename>/usr/lib/libxpg4.so</filename> in your shell.</para>
-
- <para>In <literal>sh</literal>-based shells:</para>
-
- <programlisting><envar>LD_PRELOAD=/usr/lib/libxpg4.so</envar></programlisting>
-
- <para>In <literal>C</literal>-based shells:</para>
-
- <programlisting><envar>setenv LD_PRELOAD /usr/lib/libxpg4.so</envar></programlisting>
</sect2>
</sect1>
</chapter>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml,v 1.28 2007/08/04 08:11:40 remko Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml,v 1.29 2008/07/23 21:40:57 pgj Exp $
-->
<chapter id="secure">
@@ -57,13 +57,7 @@
<indexterm><primary>Morris Internet worm</primary></indexterm>
- effective today. Of the 17 CERT security advisories of 1999, 10
-
- <indexterm>
- <primary>CERT</primary><secondary>security advisories</secondary>
- </indexterm>
-
- of them were directly caused by buffer-overflow software bugs.
+ effective today.
By far the most common type of buffer overflow attack is based
on corrupting the stack.</para>
@@ -258,40 +252,32 @@
<para>Unfortunately there is still a very large assortment of
code in public use which blindly copies memory around without
using any of the bounded copy routines we just discussed.
- Fortunately, there is another solution. Several compiler
- add-ons and libraries exist to do Run-time bounds checking in
- C/C++.</para>
+ Fortunately, there is a way to help prevent such attacks —
+ run-time bounds checking, which is implemented by several
+ C/C++ compilers.</para>
+ <indexterm><primary>ProPolice</primary></indexterm>
<indexterm><primary>StackGuard</primary></indexterm>
<indexterm><primary>gcc</primary></indexterm>
- <para>StackGuard is one such add-on that is implemented as a
- small patch to the gcc code generator. From the <ulink
- url="http://immunix.org/stackguard.html">StackGuard
- website</ulink>:
+ <para>ProPolice is one such compiler feature, and is integrated
+ into &man.gcc.1; versions 4.1 and later. It replaces and
+ extends the earlier StackGuard &man.gcc.1; extension.</para>
- <blockquote><para>"StackGuard detects and defeats stack
- smashing attacks by protecting the return address on the stack
- from being altered. StackGuard places a "canary" word next to
- the return address when a function is called. If the canary
- word has been altered when the function returns, then a stack
- smashing attack has been attempted, and the program responds
- by emitting an intruder alert into syslog, and then
- halts."</para></blockquote>
-
- <blockquote><para>"StackGuard is implemented as a small patch
- to the gcc code generator, specifically the function_prolog()
- and function_epilog() routines. function_prolog() has been
- enhanced to lay down canaries on the stack when functions
- start, and function_epilog() checks canary integrity when the
- function exits. Any attempt at corrupting the return address
- is thus detected before the function
- returns."</para></blockquote>
- </para>
+ <para>ProPolice helps to protect against stack-based buffer
+ overflows and other attacks by laying pseudo-random numbers in
+ key areas of the stack before calling any function. When a
+ function returns, these <quote>canaries</quote> are checked
+ and if they are found to have been changed the executable is
+ immediately aborted. Thus any attempt to modify the return
+ address or other variable stored on the stack in an attempt to
+ get malicious code to run is unlikely to succeed, as the
+ attacker would have to also manage to leave the pseudo-random
+ canaries untouched.</para>
<indexterm><primary>buffer overflow</primary></indexterm>
- <para>Recompiling your application with StackGuard is an
+ <para>Recompiling your application with ProPolice is an
effective means of stopping most buffer-overflow attacks, but
it can still be compromised.</para>
@@ -378,7 +364,8 @@
should also be noted that a process can easily break out of a
chroot environment if it has root privilege. This could be
accomplished by creating device nodes to read kernel memory,
- attaching a debugger to a process outside of the jail, or in
+ attaching a debugger to a process outside of the &man.chroot.8;
+ environment, or in
many other creative ways.</para>
<para>The behavior of the <function>chroot()</function> system
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#5 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml,v 1.48 2008/02/03 18:26:28 brueffer Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml,v 1.49 2008/07/23 20:39:55 pgj Exp $
-->
<chapter id="tools">
@@ -138,10 +138,10 @@
<para>The Bywater Basic Interpreter can be found in the
Ports Collection as
- <filename role="package">lang/bwbasic</filename>
+ <filename role="port">lang/bwbasic</filename>
and the Phil Cockroft's Basic Interpreter
(formerly Rabbit Basic) is available as
- <filename role="package">lang/pbasic</filename>.</para>
+ <filename role="port">lang/pbasic</filename>.</para>
</listitem>
</varlistentry>
@@ -163,14 +163,14 @@
<para>Various implementations of Lisp that can run on &unix;
systems are available in the Ports Collection for &os;.
GNU Common Lisp can be found as
- <filename role="package">lang/gcl</filename>. CLISP
+ <filename role="port">lang/gcl</filename>. CLISP
by Bruno Haible and Michael Stoll is available as
- <filename role="package">lang/clisp</filename>.
+ <filename role="port">lang/clisp</filename>.
For CMUCL, which includes a highly-optimizing compiler too, or
simpler Lisp implementations like SLisp, which implements most
of the Common Lisp constructs in a few hundred lines of C code,
- <filename role="package">lang/cmucl</filename> and
- <filename role="package">lang/slisp</filename> are available
+ <filename role="port">lang/cmucl</filename> and
+ <filename role="port">lang/slisp</filename> are available
respectively.</para>
</listitem>
</varlistentry>
@@ -184,7 +184,7 @@
writing <acronym>CGI</acronym> scripts.</para>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list