PERFORCE change 146743 for review
Andrew Thompson
thompsa at FreeBSD.org
Wed Aug 6 00:07:46 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=146743
Change 146743 by thompsa at thompsa_burger on 2008/08/06 00:06:45
IFC @146738 (fix build)
Affected files ...
.. //depot/projects/vap/Makefile.inc1#14 integrate
.. //depot/projects/vap/bin/echo/echo.c#3 integrate
.. //depot/projects/vap/bin/sh/eval.c#3 integrate
.. //depot/projects/vap/bin/sh/mknodes.c#3 integrate
.. //depot/projects/vap/bin/stty/gfmt.c#3 integrate
.. //depot/projects/vap/contrib/cvs/doc/HACKING.DOCS#3 integrate
.. //depot/projects/vap/contrib/ipfilter/ip_fil.c#4 integrate
.. //depot/projects/vap/crypto/openssh/ChangeLog#3 integrate
.. //depot/projects/vap/crypto/openssh/FREEBSD-Xlist#4 delete
.. //depot/projects/vap/crypto/openssh/FREEBSD-tricks#3 integrate
.. //depot/projects/vap/crypto/openssh/FREEBSD-upgrade#4 integrate
.. //depot/projects/vap/crypto/openssh/FREEBSD-vendor#2 integrate
.. //depot/projects/vap/crypto/openssh/INSTALL#3 integrate
.. //depot/projects/vap/crypto/openssh/LICENCE#3 integrate
.. //depot/projects/vap/crypto/openssh/PROTOCOL#1 branch
.. //depot/projects/vap/crypto/openssh/PROTOCOL.agent#1 branch
.. //depot/projects/vap/crypto/openssh/README#3 integrate
.. //depot/projects/vap/crypto/openssh/README.platform#3 integrate
.. //depot/projects/vap/crypto/openssh/RFC.nroff#3 delete
.. //depot/projects/vap/crypto/openssh/addrmatch.c#1 branch
.. //depot/projects/vap/crypto/openssh/atomicio.c#3 integrate
.. //depot/projects/vap/crypto/openssh/audit-bsm.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-bsdauth.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-chall.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-krb5.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-options.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-options.h#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-pam.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-pam.h#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-passwd.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-rhosts.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-rsa.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-shadow.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-sia.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth-skey.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth.h#3 integrate
.. //depot/projects/vap/crypto/openssh/auth1.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth2-chall.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth2-gss.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth2-hostbased.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth2-kbdint.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth2-none.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth2-pubkey.c#3 integrate
.. //depot/projects/vap/crypto/openssh/auth2.c#3 integrate
.. //depot/projects/vap/crypto/openssh/bufaux.c#3 integrate
.. //depot/projects/vap/crypto/openssh/bufbn.c#3 integrate
.. //depot/projects/vap/crypto/openssh/buffer.h#3 integrate
.. //depot/projects/vap/crypto/openssh/canohost.c#3 integrate
.. //depot/projects/vap/crypto/openssh/channels.c#3 integrate
.. //depot/projects/vap/crypto/openssh/channels.h#3 integrate
.. //depot/projects/vap/crypto/openssh/cipher-3des1.c#3 integrate
.. //depot/projects/vap/crypto/openssh/cipher-bf1.c#3 integrate
.. //depot/projects/vap/crypto/openssh/cipher-ctr.c#3 integrate
.. //depot/projects/vap/crypto/openssh/clientloop.c#3 integrate
.. //depot/projects/vap/crypto/openssh/clientloop.h#3 integrate
.. //depot/projects/vap/crypto/openssh/compat.c#3 integrate
.. //depot/projects/vap/crypto/openssh/compat.h#3 integrate
.. //depot/projects/vap/crypto/openssh/config.h#3 integrate
.. //depot/projects/vap/crypto/openssh/config.h.in#1 branch
.. //depot/projects/vap/crypto/openssh/defines.h#3 integrate
.. //depot/projects/vap/crypto/openssh/dh.c#3 integrate
.. //depot/projects/vap/crypto/openssh/dh.h#3 integrate
.. //depot/projects/vap/crypto/openssh/dns.c#3 integrate
.. //depot/projects/vap/crypto/openssh/entropy.c#3 integrate
.. //depot/projects/vap/crypto/openssh/groupaccess.c#3 integrate
.. //depot/projects/vap/crypto/openssh/groupaccess.h#3 integrate
.. //depot/projects/vap/crypto/openssh/gss-genr.c#3 integrate
.. //depot/projects/vap/crypto/openssh/gss-serv.c#3 integrate
.. //depot/projects/vap/crypto/openssh/includes.h#3 integrate
.. //depot/projects/vap/crypto/openssh/kex.c#3 integrate
.. //depot/projects/vap/crypto/openssh/kex.h#3 integrate
.. //depot/projects/vap/crypto/openssh/key.c#3 integrate
.. //depot/projects/vap/crypto/openssh/key.h#3 integrate
.. //depot/projects/vap/crypto/openssh/log.c#3 integrate
.. //depot/projects/vap/crypto/openssh/log.h#3 integrate
.. //depot/projects/vap/crypto/openssh/loginrec.c#3 integrate
.. //depot/projects/vap/crypto/openssh/mac.c#3 integrate
.. //depot/projects/vap/crypto/openssh/mac.h#3 integrate
.. //depot/projects/vap/crypto/openssh/match.c#3 integrate
.. //depot/projects/vap/crypto/openssh/match.h#3 integrate
.. //depot/projects/vap/crypto/openssh/misc.c#3 integrate
.. //depot/projects/vap/crypto/openssh/misc.h#3 integrate
.. //depot/projects/vap/crypto/openssh/moduli#3 integrate
.. //depot/projects/vap/crypto/openssh/moduli.5#1 branch
.. //depot/projects/vap/crypto/openssh/moduli.c#3 integrate
.. //depot/projects/vap/crypto/openssh/monitor.c#3 integrate
.. //depot/projects/vap/crypto/openssh/monitor.h#3 integrate
.. //depot/projects/vap/crypto/openssh/monitor_fdpass.c#3 integrate
.. //depot/projects/vap/crypto/openssh/monitor_fdpass.h#3 integrate
.. //depot/projects/vap/crypto/openssh/monitor_mm.h#3 integrate
.. //depot/projects/vap/crypto/openssh/monitor_wrap.c#3 integrate
.. //depot/projects/vap/crypto/openssh/monitor_wrap.h#3 integrate
.. //depot/projects/vap/crypto/openssh/mux.c#1 branch
.. //depot/projects/vap/crypto/openssh/myproposal.h#3 integrate
.. //depot/projects/vap/crypto/openssh/nchan.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/base64.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bindresvport.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-asprintf.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-cray.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-getpeereid.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-misc.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-poll.c#1 branch
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-poll.h#1 branch
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-snprintf.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-statvfs.c#1 branch
.. //depot/projects/vap/crypto/openssh/openbsd-compat/bsd-statvfs.h#1 branch
.. //depot/projects/vap/crypto/openssh/openbsd-compat/fake-rfc2553.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/fmt_scaled.c#1 branch
.. //depot/projects/vap/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/getrrsetbyname.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/glob.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/glob.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/openbsd-compat.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/openssl-compat.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/openssl-compat.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/port-aix.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/port-aix.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/port-linux.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/port-linux.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/port-tun.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/port-uw.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/port-uw.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/rresvport.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/setenv.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/setproctitle.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/sigact.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/sys-queue.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/sys-tree.h#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/xcrypt.c#3 integrate
.. //depot/projects/vap/crypto/openssh/openbsd-compat/xmmap.c#3 integrate
.. //depot/projects/vap/crypto/openssh/packet.c#3 integrate
.. //depot/projects/vap/crypto/openssh/packet.h#3 integrate
.. //depot/projects/vap/crypto/openssh/readconf.c#3 integrate
.. //depot/projects/vap/crypto/openssh/readconf.h#3 integrate
.. //depot/projects/vap/crypto/openssh/scard-opensc.c#3 integrate
.. //depot/projects/vap/crypto/openssh/scp.1#3 integrate
.. //depot/projects/vap/crypto/openssh/scp.c#3 integrate
.. //depot/projects/vap/crypto/openssh/servconf.c#3 integrate
.. //depot/projects/vap/crypto/openssh/servconf.h#3 integrate
.. //depot/projects/vap/crypto/openssh/serverloop.c#3 integrate
.. //depot/projects/vap/crypto/openssh/session.c#3 integrate
.. //depot/projects/vap/crypto/openssh/session.h#3 integrate
.. //depot/projects/vap/crypto/openssh/sftp-client.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sftp-client.h#3 integrate
.. //depot/projects/vap/crypto/openssh/sftp-server-main.c#1 branch
.. //depot/projects/vap/crypto/openssh/sftp-server.8#3 integrate
.. //depot/projects/vap/crypto/openssh/sftp-server.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sftp.1#3 integrate
.. //depot/projects/vap/crypto/openssh/sftp.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sftp.h#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-add.1#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-add.c#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-agent.1#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-agent.c#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-gss.h#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-keygen.1#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-keygen.c#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-keyscan.1#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-keyscan.c#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-keysign.8#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-rand-helper.8#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh-rand-helper.c#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh.1#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh.c#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh_config#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh_config.5#3 integrate
.. //depot/projects/vap/crypto/openssh/ssh_namespace.h#3 integrate
.. //depot/projects/vap/crypto/openssh/sshconnect.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sshconnect.h#3 integrate
.. //depot/projects/vap/crypto/openssh/sshconnect2.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sshd.8#3 integrate
.. //depot/projects/vap/crypto/openssh/sshd.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sshd_config#3 integrate
.. //depot/projects/vap/crypto/openssh/sshd_config.5#3 integrate
.. //depot/projects/vap/crypto/openssh/sshlogin.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sshpty.c#3 integrate
.. //depot/projects/vap/crypto/openssh/sshpty.h#3 integrate
.. //depot/projects/vap/crypto/openssh/sshtty.c#3 integrate
.. //depot/projects/vap/crypto/openssh/ttymodes.c#3 integrate
.. //depot/projects/vap/crypto/openssh/umac.c#1 branch
.. //depot/projects/vap/crypto/openssh/umac.h#1 branch
.. //depot/projects/vap/crypto/openssh/version.c#3 integrate
.. //depot/projects/vap/crypto/openssh/version.h#3 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#16 integrate
.. //depot/projects/vap/etc/freebsd-update.conf#4 integrate
.. //depot/projects/vap/etc/rc.d/named#3 integrate
.. //depot/projects/vap/etc/rc.d/sysctl#5 integrate
.. //depot/projects/vap/etc/rc.firewall#7 integrate
.. //depot/projects/vap/games/fortune/datfiles/fortunes#13 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/arch/arm/Makefile#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_private.h#3 integrate
.. //depot/projects/vap/lib/libc/gen/arc4random.c#4 integrate
.. //depot/projects/vap/lib/libc/gen/fmtcheck.3#3 integrate
.. //depot/projects/vap/lib/libc/gen/fmtcheck.c#3 integrate
.. //depot/projects/vap/lib/libc/gen/getbsize.c#3 integrate
.. //depot/projects/vap/lib/libc/stdio/vfwprintf.c#6 integrate
.. //depot/projects/vap/lib/libc/stdlib/getenv.c#4 integrate
.. //depot/projects/vap/lib/libc/sys/jail.2#3 integrate
.. //depot/projects/vap/lib/libc/sys/ktrace.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/socket.2#4 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_condattr.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/Makefile#5 integrate
.. //depot/projects/vap/lib/libthread_db/arch/amd64/libpthread_md.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/arch/arm/libpthread_md.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/arch/i386/libpthread_md.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/arch/ia64/libpthread_md.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/arch/powerpc/libpthread_md.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/arch/sparc64/libpthread_md.c#3 integrate
.. //depot/projects/vap/lib/libthread_db/libpthread_db.c#4 integrate
.. //depot/projects/vap/lib/libthread_db/libpthread_db.h#3 integrate
.. //depot/projects/vap/lib/libthread_db/libthr_db.c#4 integrate
.. //depot/projects/vap/lib/libthread_db/thread_db.c#4 integrate
.. //depot/projects/vap/lib/libthread_db/thread_db.h#3 integrate
.. //depot/projects/vap/lib/libthread_db/thread_db_int.h#3 integrate
.. //depot/projects/vap/lib/msun/Makefile#10 integrate
.. //depot/projects/vap/lib/msun/Symbol.map#9 integrate
.. //depot/projects/vap/lib/msun/i387/invtrig.c#1 branch
.. //depot/projects/vap/lib/msun/ld128/invtrig.c#1 branch
.. //depot/projects/vap/lib/msun/ld128/invtrig.h#1 branch
.. //depot/projects/vap/lib/msun/ld80/invtrig.c#1 branch
.. //depot/projects/vap/lib/msun/ld80/invtrig.h#1 branch
.. //depot/projects/vap/lib/msun/man/acos.3#3 integrate
.. //depot/projects/vap/lib/msun/man/asin.3#3 integrate
.. //depot/projects/vap/lib/msun/man/atan.3#3 integrate
.. //depot/projects/vap/lib/msun/man/atan2.3#4 integrate
.. //depot/projects/vap/lib/msun/src/e_acos.c#4 integrate
.. //depot/projects/vap/lib/msun/src/e_acosf.c#4 integrate
.. //depot/projects/vap/lib/msun/src/e_acosl.c#1 branch
.. //depot/projects/vap/lib/msun/src/e_asin.c#4 integrate
.. //depot/projects/vap/lib/msun/src/e_asinf.c#4 integrate
.. //depot/projects/vap/lib/msun/src/e_asinl.c#1 branch
.. //depot/projects/vap/lib/msun/src/e_atan2.c#4 integrate
.. //depot/projects/vap/lib/msun/src/e_atan2f.c#4 integrate
.. //depot/projects/vap/lib/msun/src/e_atan2l.c#1 branch
.. //depot/projects/vap/lib/msun/src/e_fmodl.c#2 integrate
.. //depot/projects/vap/lib/msun/src/math.h#9 integrate
.. //depot/projects/vap/lib/msun/src/s_atan.c#4 integrate
.. //depot/projects/vap/lib/msun/src/s_atanf.c#4 integrate
.. //depot/projects/vap/lib/msun/src/s_atanl.c#1 branch
.. //depot/projects/vap/lib/msun/src/s_cargl.c#1 branch
.. //depot/projects/vap/lib/msun/src/s_remquol.c#2 integrate
.. //depot/projects/vap/libexec/fingerd/fingerd.c#3 integrate
.. //depot/projects/vap/sbin/ddb/ddb.8#5 integrate
.. //depot/projects/vap/sbin/fdisk/fdisk.8#3 integrate
.. //depot/projects/vap/sbin/fdisk/fdisk.c#3 integrate
.. //depot/projects/vap/sbin/ifconfig/Makefile#10 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.8#14 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.c#10 integrate
.. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#24 integrate
.. //depot/projects/vap/sbin/ipfw/ipfw.8#7 integrate
.. //depot/projects/vap/sbin/routed/defs.h#3 integrate
.. //depot/projects/vap/sbin/routed/if.c#3 integrate
.. //depot/projects/vap/sbin/routed/main.c#3 integrate
.. //depot/projects/vap/sbin/routed/output.c#3 integrate
.. //depot/projects/vap/sbin/routed/rdisc.c#3 integrate
.. //depot/projects/vap/sbin/routed/routed.8#3 integrate
.. //depot/projects/vap/secure/lib/libssh/Makefile#4 integrate
.. //depot/projects/vap/secure/libexec/sftp-server/Makefile#3 integrate
.. //depot/projects/vap/secure/usr.bin/ssh/Makefile#4 integrate
.. //depot/projects/vap/secure/usr.sbin/sshd/Makefile#5 integrate
.. //depot/projects/vap/share/colldef/no_NO.ISO8859-1.src#2 integrate
.. //depot/projects/vap/share/colldef/no_NO.ISO8859-15.src#2 integrate
.. //depot/projects/vap/share/man/man4/ddb.4#10 integrate
.. //depot/projects/vap/share/man/man4/if_bridge.4#3 integrate
.. //depot/projects/vap/share/man/man4/textdump.4#3 integrate
.. //depot/projects/vap/share/man/man4/wi.4#7 integrate
.. //depot/projects/vap/share/man/man5/freebsd-update.conf.5#3 integrate
.. //depot/projects/vap/share/man/man9/firmware.9#3 integrate
.. //depot/projects/vap/share/man/man9/timeout.9#4 integrate
.. //depot/projects/vap/share/misc/committers-ports.dot#9 integrate
.. //depot/projects/vap/sys/amd64/amd64/cpu_switch.S#6 integrate
.. //depot/projects/vap/sys/amd64/amd64/genassym.c#7 integrate
.. //depot/projects/vap/sys/amd64/amd64/pmap.c#23 integrate
.. //depot/projects/vap/sys/amd64/conf/GENERIC#19 integrate
.. //depot/projects/vap/sys/amd64/conf/NOTES#13 integrate
.. //depot/projects/vap/sys/amd64/ia32/ia32_signal.c#7 integrate
.. //depot/projects/vap/sys/amd64/include/param.h#8 integrate
.. //depot/projects/vap/sys/amd64/include/pcb.h#6 integrate
.. //depot/projects/vap/sys/amd64/include/pmap.h#9 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_machdep.c#7 integrate
.. //depot/projects/vap/sys/arm/arm/db_interface.c#5 integrate
.. //depot/projects/vap/sys/arm/arm/elf_trampoline.c#5 integrate
.. //depot/projects/vap/sys/arm/arm/intr.c#9 integrate
.. //depot/projects/vap/sys/arm/arm/swtch.S#7 integrate
.. //depot/projects/vap/sys/arm/arm/vm_machdep.c#7 integrate
.. //depot/projects/vap/sys/arm/at91/at91_twi.c#4 integrate
.. //depot/projects/vap/sys/arm/at91/uart_dev_at91usart.c#5 integrate
.. //depot/projects/vap/sys/arm/conf/AVILA#11 integrate
.. //depot/projects/vap/sys/arm/conf/KB920X#8 integrate
.. //depot/projects/vap/sys/arm/conf/NSLU#1 branch
.. //depot/projects/vap/sys/arm/conf/NSLU.hints#1 branch
.. //depot/projects/vap/sys/arm/include/db_machdep.h#5 integrate
.. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate
.. //depot/projects/vap/sys/boot/common/misc.c#3 integrate
.. //depot/projects/vap/sys/boot/forth/loader.conf#11 integrate
.. //depot/projects/vap/sys/boot/i386/libi386/devicename.c#5 integrate
.. //depot/projects/vap/sys/bsm/audit.h#3 integrate
.. //depot/projects/vap/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/vap/sys/bsm/audit_kevents.h#5 integrate
.. //depot/projects/vap/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/vap/sys/cam/cam_xpt.c#9 integrate
.. //depot/projects/vap/sys/conf/Makefile.arm#9 integrate
.. //depot/projects/vap/sys/conf/NOTES#25 integrate
.. //depot/projects/vap/sys/contrib/pf/net/pf.c#9 integrate
.. //depot/projects/vap/sys/ddb/db_run.c#4 integrate
.. //depot/projects/vap/sys/dev/acpica/acpi.c#12 integrate
.. //depot/projects/vap/sys/dev/agp/agp_i810.c#5 integrate
.. //depot/projects/vap/sys/dev/bktr/bktr_i2c.c#6 integrate
.. //depot/projects/vap/sys/dev/ciss/ciss.c#11 integrate
.. //depot/projects/vap/sys/dev/ciss/cissreg.h#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#9 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#4 integrate
.. //depot/projects/vap/sys/dev/e1000/LICENSE#1 branch
.. //depot/projects/vap/sys/dev/e1000/README#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_80003es2lan.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_80003es2lan.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82540.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82541.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82541.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82542.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82543.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82543.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82571.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82571.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82575.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_82575.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_api.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_api.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_defines.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_hw.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_ich8lan.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_ich8lan.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_mac.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_mac.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_manage.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_manage.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_nvm.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_nvm.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_osdep.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_osdep.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_phy.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_phy.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/e1000_regs.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/if_em.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/if_em.h#1 branch
.. //depot/projects/vap/sys/dev/e1000/if_igb.c#1 branch
.. //depot/projects/vap/sys/dev/e1000/if_igb.h#1 branch
.. //depot/projects/vap/sys/dev/em/LICENSE#6 delete
.. //depot/projects/vap/sys/dev/em/README#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_80003es2lan.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_80003es2lan.h#4 delete
.. //depot/projects/vap/sys/dev/em/e1000_82540.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_82541.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_82541.h#4 delete
.. //depot/projects/vap/sys/dev/em/e1000_82542.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_82543.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_82543.h#4 delete
.. //depot/projects/vap/sys/dev/em/e1000_82571.c#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_82571.h#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_api.c#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_api.h#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_defines.h#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_hw.h#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_ich8lan.c#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_ich8lan.h#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_mac.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_mac.h#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_manage.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_manage.h#4 delete
.. //depot/projects/vap/sys/dev/em/e1000_nvm.c#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_nvm.h#5 delete
.. //depot/projects/vap/sys/dev/em/e1000_osdep.c#2 delete
.. //depot/projects/vap/sys/dev/em/e1000_osdep.h#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_phy.c#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_phy.h#6 delete
.. //depot/projects/vap/sys/dev/em/e1000_regs.h#4 delete
.. //depot/projects/vap/sys/dev/em/if_em.c#10 delete
.. //depot/projects/vap/sys/dev/em/if_em.h#8 delete
.. //depot/projects/vap/sys/dev/ie/if_ie.c#6 integrate
.. //depot/projects/vap/sys/dev/ie/if_ie_isa.c#6 integrate
.. //depot/projects/vap/sys/dev/ie/if_ievar.h#6 integrate
.. //depot/projects/vap/sys/dev/igb/e1000_82575.c#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_82575.h#2 delete
.. //depot/projects/vap/sys/dev/igb/e1000_api.c#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_api.h#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_defines.h#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_hw.h#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_mac.c#4 delete
.. //depot/projects/vap/sys/dev/igb/e1000_mac.h#2 delete
.. //depot/projects/vap/sys/dev/igb/e1000_manage.c#2 delete
.. //depot/projects/vap/sys/dev/igb/e1000_manage.h#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_nvm.c#2 delete
.. //depot/projects/vap/sys/dev/igb/e1000_nvm.h#2 delete
.. //depot/projects/vap/sys/dev/igb/e1000_osdep.c#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_osdep.h#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_phy.c#3 delete
.. //depot/projects/vap/sys/dev/igb/e1000_phy.h#2 delete
.. //depot/projects/vap/sys/dev/igb/e1000_regs.h#2 delete
.. //depot/projects/vap/sys/dev/igb/if_igb.c#4 delete
.. //depot/projects/vap/sys/dev/igb/if_igb.h#3 delete
.. //depot/projects/vap/sys/dev/iicbus/ad7418.c#3 integrate
.. //depot/projects/vap/sys/dev/iicbus/ds1339.c#2 integrate
.. //depot/projects/vap/sys/dev/iicbus/icee.c#3 integrate
.. //depot/projects/vap/sys/dev/iicbus/if_ic.c#5 integrate
.. //depot/projects/vap/sys/dev/iicbus/iic.c#5 integrate
.. //depot/projects/vap/sys/dev/iicbus/iicbb.c#5 integrate
.. //depot/projects/vap/sys/dev/iicbus/iicbus.c#5 integrate
.. //depot/projects/vap/sys/dev/iicbus/iicbus.h#5 integrate
.. //depot/projects/vap/sys/dev/iicbus/iiconf.c#5 integrate
.. //depot/projects/vap/sys/dev/iicbus/iicsmb.c#6 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe.c#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe.h#5 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_82598.c#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_api.c#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_api.h#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_common.c#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_common.h#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_phy.c#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_phy.h#4 integrate
.. //depot/projects/vap/sys/dev/ixgbe/ixgbe_type.h#4 integrate
.. //depot/projects/vap/sys/dev/nvram/nvram.c#4 integrate
.. //depot/projects/vap/sys/dev/pccard/pccarddevs#8 integrate
.. //depot/projects/vap/sys/dev/pcf/envctrl.c#5 integrate
.. //depot/projects/vap/sys/dev/pcf/pcf.c#3 integrate
.. //depot/projects/vap/sys/dev/pcf/pcf_ebus.c#5 integrate
.. //depot/projects/vap/sys/dev/pcf/pcf_isa.c#5 integrate
.. //depot/projects/vap/sys/dev/pcf/pcfvar.h#3 integrate
.. //depot/projects/vap/sys/dev/pci/pci.c#8 integrate
.. //depot/projects/vap/sys/dev/ppbus/lpbb.c#5 integrate
.. //depot/projects/vap/sys/dev/re/if_re.c#14 integrate
.. //depot/projects/vap/sys/dev/snc/dp83932.c#7 integrate
.. //depot/projects/vap/sys/dev/snc/dp83932var.h#6 integrate
.. //depot/projects/vap/sys/dev/snc/if_snc.c#3 integrate
.. //depot/projects/vap/sys/dev/snc/if_snc_cbus.c#5 integrate
.. //depot/projects/vap/sys/dev/snc/if_snc_pccard.c#6 integrate
.. //depot/projects/vap/sys/dev/syscons/syscons.c#10 integrate
.. //depot/projects/vap/sys/dev/usb/ehci_pci.c#10 integrate
.. //depot/projects/vap/sys/dev/usb/ehcireg.h#5 integrate
.. //depot/projects/vap/sys/dev/usb/if_rum.c#28 integrate
.. //depot/projects/vap/sys/dev/usb/if_ural.c#25 integrate
.. //depot/projects/vap/sys/dev/usb/uipaq.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#23 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi.c#36 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi_pccard.c#8 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi_pci.c#9 integrate
.. //depot/projects/vap/sys/dev/wi/if_wireg.h#5 integrate
.. //depot/projects/vap/sys/i386/conf/GENERIC#21 integrate
.. //depot/projects/vap/sys/i386/conf/NOTES#14 integrate
.. //depot/projects/vap/sys/i386/i386/mp_machdep.c#11 integrate
.. //depot/projects/vap/sys/i386/i386/pmap.c#18 integrate
.. //depot/projects/vap/sys/i386/include/pmap.h#7 integrate
.. //depot/projects/vap/sys/kern/kern_condvar.c#6 integrate
.. //depot/projects/vap/sys/kern/kern_kthread.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_lock.c#16 integrate
.. //depot/projects/vap/sys/kern/kern_sig.c#12 integrate
.. //depot/projects/vap/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/vap/sys/kern/kern_synch.c#10 integrate
.. //depot/projects/vap/sys/kern/kern_thread.c#12 integrate
.. //depot/projects/vap/sys/kern/kern_timeout.c#13 integrate
.. //depot/projects/vap/sys/kern/link_elf.c#9 integrate
.. //depot/projects/vap/sys/kern/link_elf_obj.c#10 integrate
.. //depot/projects/vap/sys/kern/subr_clist.c#2 integrate
.. //depot/projects/vap/sys/kern/subr_sleepqueue.c#14 integrate
.. //depot/projects/vap/sys/kern/tty_pts.c#4 integrate
.. //depot/projects/vap/sys/kern/tty_pty.c#8 integrate
.. //depot/projects/vap/sys/kern/vfs_cache.c#11 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#20 integrate
.. //depot/projects/vap/sys/kern/vfs_vnops.c#9 integrate
.. //depot/projects/vap/sys/mips/mips/machdep.c#4 integrate
.. //depot/projects/vap/sys/mips/mips/tick.c#2 integrate
.. //depot/projects/vap/sys/modules/Makefile#35 integrate
.. //depot/projects/vap/sys/modules/em/Makefile#8 integrate
.. //depot/projects/vap/sys/modules/igb/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/netgraph/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/netgraph/bluetooth/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/netgraph/bluetooth/socket/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/nfslockd/Makefile#3 integrate
.. //depot/projects/vap/sys/net/bpf.c#18 integrate
.. //depot/projects/vap/sys/net/bpfdesc.h#6 integrate
.. //depot/projects/vap/sys/net/if.h#8 integrate
.. //depot/projects/vap/sys/net/if_loop.c#11 integrate
.. //depot/projects/vap/sys/net/if_media.h#10 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_dfs.c#7 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#32 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#26 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_input.c#32 integrate
.. //depot/projects/vap/sys/netgraph/bluetooth/include/ng_btsocket_sco.h#1 branch
.. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket.c#6 integrate
.. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate
.. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate
.. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate
.. //depot/projects/vap/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#1 branch
.. //depot/projects/vap/sys/netinet/ip_fw2.c#14 integrate
.. //depot/projects/vap/sys/netinet/sctp.h#6 integrate
.. //depot/projects/vap/sys/netinet/sctp_output.c#10 integrate
.. //depot/projects/vap/sys/netinet/sctp_pcb.c#9 integrate
.. //depot/projects/vap/sys/netinet/sctp_pcb.h#7 integrate
.. //depot/projects/vap/sys/netinet/sctp_usrreq.c#9 integrate
.. //depot/projects/vap/sys/netinet/sctp_var.h#8 integrate
.. //depot/projects/vap/sys/netinet/sctputil.c#10 integrate
.. //depot/projects/vap/sys/netinet/tcp_input.c#10 integrate
.. //depot/projects/vap/sys/netinet/tcp_output.c#11 integrate
.. //depot/projects/vap/sys/netinet/tcp_syncache.c#13 integrate
.. //depot/projects/vap/sys/netinet/tcp_usrreq.c#10 integrate
.. //depot/projects/vap/sys/netinet/tcp_var.h#9 integrate
.. //depot/projects/vap/sys/netinet6/icmp6.c#11 integrate
.. //depot/projects/vap/sys/netinet6/raw_ip6.c#13 integrate
.. //depot/projects/vap/sys/netipsec/key.c#9 integrate
.. //depot/projects/vap/sys/pc98/conf/GENERIC#15 integrate
.. //depot/projects/vap/sys/pc98/conf/NOTES#11 integrate
.. //depot/projects/vap/sys/pci/if_rlreg.h#13 integrate
.. //depot/projects/vap/sys/pci/if_sis.c#6 integrate
.. //depot/projects/vap/sys/pci/viapm.c#8 integrate
.. //depot/projects/vap/sys/powerpc/conf/GENERIC#12 integrate
.. //depot/projects/vap/sys/security/audit/audit.c#11 integrate
.. //depot/projects/vap/sys/security/audit/audit.h#7 integrate
.. //depot/projects/vap/sys/security/audit/audit_arg.c#9 integrate
.. //depot/projects/vap/sys/security/audit/audit_bsm_klib.c#8 integrate
.. //depot/projects/vap/sys/security/audit/audit_bsm_token.c#5 integrate
.. //depot/projects/vap/sys/security/audit/audit_pipe.c#6 integrate
.. //depot/projects/vap/sys/security/audit/audit_private.h#6 integrate
.. //depot/projects/vap/sys/security/audit/audit_syscalls.c#7 integrate
.. //depot/projects/vap/sys/security/audit/audit_worker.c#11 integrate
.. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#9 integrate
.. //depot/projects/vap/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate
.. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#7 integrate
.. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#10 integrate
.. //depot/projects/vap/sys/security/mac_partition/mac_partition.c#5 integrate
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#16 integrate
.. //depot/projects/vap/sys/sun4v/conf/GENERIC#7 integrate
.. //depot/projects/vap/sys/sys/callout.h#8 integrate
.. //depot/projects/vap/sys/sys/elf_common.h#5 integrate
.. //depot/projects/vap/sys/sys/proc.h#20 integrate
.. //depot/projects/vap/sys/sys/procfs.h#3 integrate
.. //depot/projects/vap/sys/sys/sleepqueue.h#7 integrate
.. //depot/projects/vap/sys/sys/sockbuf.h#2 integrate
.. //depot/projects/vap/sys/sys/socketvar.h#13 integrate
.. //depot/projects/vap/sys/sys/sockio.h#5 integrate
.. //depot/projects/vap/sys/sys/vnode.h#13 integrate
.. //depot/projects/vap/sys/ufs/ufs/quota.h#5 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_lookup.c#10 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_quota.c#6 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufsmount.h#6 integrate
.. //depot/projects/vap/sys/vm/swap_pager.c#9 integrate
.. //depot/projects/vap/sys/vm/vm_glue.c#9 integrate
.. //depot/projects/vap/sys/vm/vm_mmap.c#12 integrate
.. //depot/projects/vap/sys/vm/vm_object.c#10 integrate
.. //depot/projects/vap/sys/vm/vm_pageout.c#7 integrate
.. //depot/projects/vap/sys/vm/vm_zeroidle.c#8 integrate
.. //depot/projects/vap/sys/vm/vnode_pager.c#9 integrate
.. //depot/projects/vap/tools/regression/bin/sh/errors/redirection-error2.2#1 branch
.. //depot/projects/vap/tools/regression/environ/envctl.c#5 integrate
.. //depot/projects/vap/tools/regression/environ/envtest.t#4 integrate
.. //depot/projects/vap/tools/regression/lib/libc/gen/Makefile#3 integrate
.. //depot/projects/vap/tools/regression/lib/libc/gen/test-fmtcheck.c#1 branch
.. //depot/projects/vap/tools/regression/lib/msun/Makefile#8 integrate
.. //depot/projects/vap/tools/regression/lib/msun/test-invtrig.c#1 branch
.. //depot/projects/vap/tools/regression/lib/msun/test-invtrig.t#1 branch
.. //depot/projects/vap/tools/regression/netinet6/icmp6_filter/Makefile#1 branch
.. //depot/projects/vap/tools/regression/netinet6/icmp6_filter/icmp6_filter.c#1 branch
.. //depot/projects/vap/tools/tools/editing/freebsd.vim#2 integrate
.. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#4 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.dfs#5 integrate
.. //depot/projects/vap/usr.bin/bluetooth/btsockstat/btsockstat.c#3 integrate
.. //depot/projects/vap/usr.bin/calendar/calendar.c#3 integrate
.. //depot/projects/vap/usr.bin/calendar/calendar.h#3 integrate
.. //depot/projects/vap/usr.bin/calendar/calendars/calendar.holiday#3 integrate
.. //depot/projects/vap/usr.bin/calendar/day.c#3 integrate
.. //depot/projects/vap/usr.bin/calendar/io.c#4 integrate
.. //depot/projects/vap/usr.bin/calendar/ostern.c#3 integrate
.. //depot/projects/vap/usr.bin/calendar/paskha.c#3 integrate
.. //depot/projects/vap/usr.bin/cpio/cpio.c#5 integrate
.. //depot/projects/vap/usr.bin/cpio/cpio.h#4 integrate
.. //depot/projects/vap/usr.bin/gzip/gzip.c#5 integrate
.. //depot/projects/vap/usr.bin/ldd/Makefile#3 integrate
.. //depot/projects/vap/usr.bin/ldd/ldd.1#5 integrate
.. //depot/projects/vap/usr.bin/ldd/ldd.c#5 integrate
.. //depot/projects/vap/usr.bin/lex/flex.skl#4 integrate
.. //depot/projects/vap/usr.bin/make/main.c#5 integrate
.. //depot/projects/vap/usr.bin/make/make.1#7 integrate
.. //depot/projects/vap/usr.bin/netstat/inet.c#5 integrate
.. //depot/projects/vap/usr.bin/printf/printf.c#3 integrate
.. //depot/projects/vap/usr.bin/quota/quota.c#4 integrate
.. //depot/projects/vap/usr.bin/rs/rs.c#3 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.h#8 integrate
.. //depot/projects/vap/usr.bin/truncate/truncate.c#3 integrate
.. //depot/projects/vap/usr.bin/truss/syscall.h#3 integrate
.. //depot/projects/vap/usr.bin/truss/syscalls.c#4 integrate
.. //depot/projects/vap/usr.bin/yacc/closure.c#3 integrate
.. //depot/projects/vap/usr.bin/yacc/defs.h#3 integrate
.. //depot/projects/vap/usr.sbin/Makefile#11 integrate
.. //depot/projects/vap/usr.sbin/adduser/rmuser.sh#3 integrate
.. //depot/projects/vap/usr.sbin/bootparamd/bootparamd/main.c#4 integrate
.. //depot/projects/vap/usr.sbin/crashinfo/Makefile#1 branch
.. //depot/projects/vap/usr.sbin/crashinfo/crashinfo.8#1 branch
.. //depot/projects/vap/usr.sbin/crashinfo/crashinfo.sh#1 branch
.. //depot/projects/vap/usr.sbin/cron/cron/do_command.c#4 integrate
.. //depot/projects/vap/usr.sbin/freebsd-update/freebsd-update.8#3 integrate
.. //depot/projects/vap/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate
Differences ...
==== //depot/projects/vap/Makefile.inc1#14 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.607 2008/06/25 21:33:28 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.609 2008/08/02 12:14:22 jhb Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -453,7 +453,8 @@
.if ${MK_KERBEROS} != "no"
.for _t in obj depend all
cd ${.CURDIR}/kerberos5/tools; \
- MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= ${_t}
+ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \
+ ${_t}
.endfor
.endif
.for _t in obj includes
@@ -475,13 +476,14 @@
.endfor
.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
cd ${.CURDIR}/${_dir}; \
- MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= build-tools
+ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= \
+ build-tools
.endfor
cd ${.CURDIR}; \
${LIB32WMAKE} -f Makefile.inc1 libraries
.for _t in obj depend all
- cd ${.CURDIR}/libexec/rtld-elf; \
- PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t}
+ cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t}
+ cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${_t}
.endfor
distribute32 install32:
@@ -500,10 +502,11 @@
.if ${MK_CRYPT} != "no"
cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
.endif
- cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
+ cd ${.CURDIR}/libexec/rtld-elf; \
+ PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
+ cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//}
.endif
-
WMAKE_TGTS=
.if !defined(SUBDIR_OVERRIDE)
WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools
@@ -666,7 +669,8 @@
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no"
- ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32
+ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \
+ DISTRIBUTION=lib32
.endif
distrib-dirs distribution:
==== //depot/projects/vap/bin/echo/echo.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.18 2005/01/10 08:39:22 imp Exp $");
+__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.19 2008/08/04 01:25:48 cperciva Exp $");
#include <sys/types.h>
#include <sys/uio.h>
@@ -55,7 +55,7 @@
* Report an error and exit.
* Use it instead of err(3) to avoid linking-in stdio.
*/
-static void
+static __dead2 void
errexit(const char *prog, const char *reason)
{
char *errstr = strerror(errno);
==== //depot/projects/vap/bin/sh/eval.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.54 2007/10/04 16:14:48 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.55 2008/07/30 21:07:04 stefanf Exp $");
#include <paths.h>
#include <signal.h>
@@ -437,7 +437,7 @@
case NFROMFD:
case NTOFD:
if (redir->ndup.vname) {
- expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE);
+ expandarg(redir->ndup.vname, &fn, EXP_TILDE | EXP_REDIR);
fixredir(redir, fn.list->text, 1);
}
break;
==== //depot/projects/vap/bin/sh/mknodes.c#3 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.17 2004/04/06 20:06:51 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.18 2008/08/04 01:25:48 cperciva Exp $");
/*
* This program reads the nodetypes file and nodes.c.pat file. It generates
@@ -103,7 +103,7 @@
static int nextfield(char *);
static void skipbl(void);
static int readline(void);
-static void error(const char *, ...) __printf0like(1, 2);
+static void error(const char *, ...) __printf0like(1, 2) __dead2;
static char *savestr(const char *);
==== //depot/projects/vap/bin/stty/gfmt.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/stty/gfmt.c,v 1.20 2004/04/06 20:06:53 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/stty/gfmt.c,v 1.21 2008/08/04 01:25:48 cperciva Exp $");
#include <sys/types.h>
@@ -44,7 +44,7 @@
#include "stty.h"
#include "extern.h"
-static void gerr(const char *s);
+static void gerr(const char *s) __dead2;
static void
gerr(const char *s)
==== //depot/projects/vap/contrib/cvs/doc/HACKING.DOCS#3 (text+ko) ====
@@ -12,7 +12,11 @@
@emph{ ... } emphasis - warnings, stress, etc. This will be
bracketed by underline characters in info files
(_ ... _) and in italics in PDF & probably in
- postscript & HTML.
+ postscript & HTML.
+ at strong{ ... } Similar to @emph{}, but the effect is to
+ bracket with asterisks in info files (* ... *)
+ and in bold in PDF & probably in postscript &
+ HTML.
@noindent Suppresses indentation of the following
paragraph. This can ocassionally be useful
after examples and the like.
@@ -22,7 +26,7 @@
Preformatted text should be marked as such (use @example... there may be other
ways) since many of the final output formats can use relational fonts otherwise
-and marking it as formatted should restrict it to a fixed wiidth font. Keep
+and marking it as formatted should restrict it to a fixed width font. Keep
this sort of text to 80 characters or less per line since larger may not be
properly viewable for some info users.
@@ -33,5 +37,10 @@
Use lots of index markers. Scan the index for the current style. Try to reuse
an existing entry if the meaning is similar.
+`makeinfo' 3.11 or greater is required for output generation since earlier
+versions do not support the @ifnottex & @ifnothtml commands. There may be
+other commands used in `cvs.texinfo' that are unsupported by earlier versions
+of `makeinfo' by the time you read this.
+
For more on using texinfo docs, see the `info texinfo' documentation or
http://www.gnu.org/manual/texinfo/texinfo.html .
==== //depot/projects/vap/contrib/ipfilter/ip_fil.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.7 2008/07/24 12:35:05 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.8 2008/08/04 22:45:27 mlaier Exp $ */
/*
* Copyright (C) 1993-2001 by Darren Reed.
@@ -803,6 +803,7 @@
}
+#ifndef ipf_random
u_32_t ipf_random()
{
static int seeded = 0;
@@ -816,3 +817,4 @@
}
return rand();
}
+#endif
==== //depot/projects/vap/crypto/openssh/ChangeLog#3 (text+ko) ====
@@ -1,3 +1,2108 @@
+20080721
+ - (djm) OpenBSD CVS Sync
+ - jmc at cvs.openbsd.org 2008/07/18 22:51:01
+ [sftp-server.8]
+ no need for .Pp before or after .Sh;
+ - djm at cvs.openbsd.org 2008/07/21 08:19:07
+ [version.h]
+ openssh-5.1
+ - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+ [contrib/suse/openssh.spec] Update version number in README and RPM specs
+ - (djm) Release OpenSSH-5.1
+
+20080717
+ - (djm) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2008/07/17 08:48:00
+ [sshconnect2.c]
+ strnvis preauth banner; pointed out by mpf@ ok markus@
+ - djm at cvs.openbsd.org 2008/07/17 08:51:07
+ [auth2-hostbased.c]
+ strip trailing '.' from hostname when HostbasedUsesNameFromPacketOnly=yes
+ report and patch from res AT qoxp.net (bz#1200); ok markus@
+ - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Remove long-unneeded compat
+ code, replace with equivalent cygwin library call. Patch from vinschen
+ at redhat.com, ok djm at .
+ - (djm) [sshconnect2.c] vis.h isn't available everywhere
+
+20080716
+ - OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2008/07/15 02:23:14
+ [sftp.1]
+ number of pipelined requests is now 64;
+ prodded by Iain.Morgan AT nasa.gov
+ - djm at cvs.openbsd.org 2008/07/16 11:51:14
+ [clientloop.c]
+ rename variable first_gc -> last_gc (since it is actually the last
+ in the list).
+ - djm at cvs.openbsd.org 2008/07/16 11:52:19
+ [channels.c]
+ this loop index should be automatic, not static
+
+20080714
+ - (djm) OpenBSD CVS Sync
+ - sthen at cvs.openbsd.org 2008/07/13 21:22:52
+ [ssh-keygen.c]
+ Change "ssh-keygen -F [host] -l" to not display random art unless
+ -v is also specified, making it consistent with the manual and other
+ uses of -l.
+ ok grunk@
+ - djm at cvs.openbsd.org 2008/07/13 22:13:07
+ [channels.c]
+ use struct sockaddr_storage instead of struct sockaddr for accept(2)
+ address argument. from visibilis AT yahoo.com in bz#1485; ok markus@
+ - djm at cvs.openbsd.org 2008/07/13 22:16:03
+ [sftp.c]
+ increase number of piplelined requests so they properly fill the
+ (recently increased) channel window. prompted by rapier AT psc.edu;
+ ok markus@
+ - djm at cvs.openbsd.org 2008/07/14 01:55:56
+ [sftp-server.8]
+ mention requirement for /dev/log inside chroot when using sftp-server
+ with ChrootDirectory
+ - (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to
+ avoid clash with sin(3) function; reported by
+ cristian.ionescu-idbohrn AT axis.com
+ - (djm) [openbsd-compat/rresvport.c] Add unistd.h for missing close()
+ prototype; reported by cristian.ionescu-idbohrn AT axis.com
+ - (djm) [umac.c] Rename variable s/buffer_ptr/bufp/ to avoid clash;
+ reported by cristian.ionescu-idbohrn AT axis.com
+ - (djm) [contrib/cygwin/Makefile contrib/cygwin/ssh-host-config]
+ [contrib/cygwin/ssh-user-config contrib/cygwin/sshd-inetd]
+ Revamped and simplified Cygwin ssh-host-config script that uses
+ unified csih configuration tool. Requires recent Cygwin.
+ Patch from vinschen AT redhat.com
+
+20080712
+ - (djm) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2008/07/12 04:52:50
+ [channels.c]
+ unbreak; move clearing of cctx struct to before first use
+ reported by dkrause@
+ - djm at cvs.openbsd.org 2008/07/12 05:33:41
+ [scp.1]
+ better description for -i flag:
+ s/RSA authentication/public key authentication/
+ - (djm) [openbsd-compat/fake-rfc2553.c openbsd-compat/fake-rfc2553.h]
+ return EAI_FAMILY when trying to lookup unsupported address family;
+ from vinschen AT redhat.com
+
+20080711
+ - (djm) OpenBSD CVS Sync
+ - stevesk at cvs.openbsd.org 2008/07/07 00:31:41
+ [ttymodes.c]
+ we don't need arg after the debug3() was removed. from lint.
+ ok djm@
+ - stevesk at cvs.openbsd.org 2008/07/07 23:32:51
+ [key.c]
+ /*NOTREACHED*/ for lint warning:
+ warning: function key_equal falls off bottom without returning value
+ ok djm@
+ - markus at cvs.openbsd.org 2008/07/10 18:05:58
+ [channels.c]
+ missing bzero; from mickey; ok djm@
+ - markus at cvs.openbsd.org 2008/07/10 18:08:11
+ [clientloop.c monitor.c monitor_wrap.c packet.c packet.h sshd.c]
+ sync v1 and v2 traffic accounting; add it to sshd, too;
+ ok djm@, dtucker@
+
+20080709
+ - (djm) [Makefile.in] Print "all tests passed" when all regress tests pass
+ - (djm) [auth1.c] Fix format string vulnerability in protocol 1 PAM
+ account check failure path. The vulnerable format buffer is supplied
+ from PAM and should not contain attacker-supplied data.
+ - (djm) [auth.c] Missing unistd.h for close()
+ - (djm) [configure.ac] Add -Wformat-security to CFLAGS for gcc 3.x and 4.x
+
+20080705
+ - (djm) [auth.c] Fixed test for locked account on HP/UX with shadowed
+ passwords disabled. bz#1083 report & patch from senthilkumar_sen AT
+ hotpop.com, w/ dtucker@
+ - (djm) [atomicio.c configure.ac] Disable poll() fallback in atomiciov for
+ Tru64. readv doesn't seem to be a comparable object there.
+ bz#1386, patch from dtucker@ ok me
+ - (djm) [Makefile.in] Pass though pass to conch for interop tests
+ - (djm) [configure.ac] unbreak: remove extra closing brace
+ - (djm) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2008/07/04 23:08:25
+ [packet.c]
+ handle EINTR in packet_write_poll()l ok dtucker@
+ - djm at cvs.openbsd.org 2008/07/04 23:30:16
+ [auth1.c auth2.c]
+ Make protocol 1 MaxAuthTries logic match protocol 2's.
+ Do not treat the first protocol 2 authentication attempt as
+ a failure IFF it is for method "none".
+ Makes MaxAuthTries' user-visible behaviour identical for
+ protocol 1 vs 2.
+ ok dtucker@
+ - djm at cvs.openbsd.org 2008/07/05 05:16:01
+ [PROTOCOL]
+ grammar
+
+20080704
+ - (dtucker) OpenBSD CVS Sync
+ - djm at cvs.openbsd.org 2008/07/02 13:30:34
+ [auth2.c]
+ really really remove the freebie "none" auth try for protocol 2
+ - djm at cvs.openbsd.org 2008/07/02 13:47:39
+ [ssh.1 ssh.c]
+ When forking after authentication ("ssh -f") with ExitOnForwardFailure
+ enabled, delay the fork until after replies for any -R forwards have
+ been seen. Allows for robust detection of -R forward failure when
+ using -f (similar to bz#92); ok dtucker@
+ - otto at cvs.openbsd.org 2008/07/03 21:46:58
+ [auth2-pubkey.c]
+ avoid nasty double free; ok dtucker@ djm@
+ - djm at cvs.openbsd.org 2008/07/04 03:44:59
+ [servconf.c groupaccess.h groupaccess.c]
+ support negation of groups in "Match group" block (bz#1315); ok dtucker@
+ - dtucker at cvs.openbsd.org 2008/07/04 03:47:02
+ [monitor.c]
+ Make debug a little clearer. ok djm@
+ - djm at cvs.openbsd.org 2008/06/30 08:07:34
+ [regress/key-options.sh]
+ shell portability: use "=" instead of "==" in test(1) expressions,
+ double-quote string with backslash escaped /
+ - djm at cvs.openbsd.org 2008/06/30 10:31:11
+ [regress/{putty-transfer,putty-kex,putty-ciphers}.sh]
+ remove "set -e" left over from debugging
+ - djm at cvs.openbsd.org 2008/06/30 10:43:03
+ [regress/conch-ciphers.sh]
+ explicitly disable conch options that could interfere with the test
+ - (dtucker) [sftp-server.c] Bug #1447: fall back to racy rename if link
+ returns EXDEV. Patch from Mike Garrison, ok djm@
+ - (djm) [atomicio.c channels.c clientloop.c defines.h includes.h]
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list