Date: Mon, 29 Apr 2002 20:30:50 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10502 for review Message-ID: <200204300330.g3U3Uo781542@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10502 Change 10502 by rwatson@rwatson_curry on 2002/04/29 20:30:29 Integ TrustedBSD base branch to pick up various things, including UMA-related fixes. Affected files ... ... //depot/projects/trustedbsd/base/Makefile#6 integrate ... //depot/projects/trustedbsd/base/Makefile.inc1#14 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/misc.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni1#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni2#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni4#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni5#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni2#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni5#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni5.ipf#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni5.nat#1 branch ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp_var.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/main.c#2 integrate ... //depot/projects/trustedbsd/base/etc/Makefile#15 integrate ... //depot/projects/trustedbsd/base/etc/defaults/rc.conf#11 integrate ... //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#13 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/other#4 integrate ... //depot/projects/trustedbsd/base/etc/rc#12 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#12 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#3 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#5 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#4 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#6 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/gerrold.limerick#2 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#2 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/zippy#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.c#5 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/backupfile.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/backupfile.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/common.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/getopt.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/getopt.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/inp.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/inp.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/patch.c#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/pch.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/pch.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/util.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/util.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/version.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/version.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/perl/library/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/clnt.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpc/pmap_clnt.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpc/svc.h#4 integrate ... //depot/projects/trustedbsd/base/include/rpc/xdr.h#4 integrate ... //depot/projects/trustedbsd/base/include/rpcsvc/ypclnt.h#4 integrate ... //depot/projects/trustedbsd/base/kerberos5/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/include/version.h#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/lib/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/lib/libkrb5/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/hprop/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/k5passwdd/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5admin/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5destroy/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5init/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5list/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5passwd/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5su/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.sbin/k5stash/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.sbin/ktutil/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberosIV/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberosIV/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#3 integrate ... //depot/projects/trustedbsd/base/lib/csu/sparc64/crt1.c#7 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/auth_time.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_dg.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_raw.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/crypt_client.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/key_call.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_soc.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc_dg.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc_raw.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_add.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_explode.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_extern.h#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_implode.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_qp.c#1 branch ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_subr.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#1 branch ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_emul.c#1 branch ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_private.h#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_setup.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/assym.s#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/sigcode.S#1 branch ... //depot/projects/trustedbsd/base/lib/libc/xdr/xdr.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_rec.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/yp/xdryp.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/yp/yplib.c#6 integrate ... //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.c#9 integrate ... //depot/projects/trustedbsd/base/lib/libutil/pw_copy.c#1 branch ... //depot/projects/trustedbsd/base/lib/libutil/pw_util.c#1 branch ... //depot/projects/trustedbsd/base/lib/libypclnt/ypclnt_passwd.c#2 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rquotad/rquotad.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rusersd/rusers_proc.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rwalld/rwalld.c#4 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.sprayd/sprayd.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/reloc.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#6 integrate ... //depot/projects/trustedbsd/base/libexec/tftpd/tftpd.c#5 integrate ... //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_getmap.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_misc.c#4 integrate ... //depot/projects/trustedbsd/base/release/Makefile#11 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate ... //depot/projects/trustedbsd/base/release/scripts/base-install.sh#1 branch ... //depot/projects/trustedbsd/base/release/scripts/catpages-make.sh#3 integrate ... //depot/projects/trustedbsd/base/release/scripts/compat4x-install.sh#1 branch ... //depot/projects/trustedbsd/base/release/scripts/dict-make.sh#3 integrate ... //depot/projects/trustedbsd/base/release/scripts/doFS.sh#4 integrate ... //depot/projects/trustedbsd/base/release/scripts/manpages-make.sh#3 integrate ... //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#6 integrate ... //depot/projects/trustedbsd/base/sbin/reboot/reboot.8#2 integrate ... //depot/projects/trustedbsd/base/sbin/reboot/reboot.c#2 integrate ... //depot/projects/trustedbsd/base/sbin/vinum/commands.c#3 integrate ... //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#3 integrate ... //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#5 integrate ... //depot/projects/trustedbsd/base/share/examples/isdn/SupportedCards#3 integrate ... //depot/projects/trustedbsd/base/share/man/man9/Makefile#14 integrate ... //depot/projects/trustedbsd/base/share/man/man9/byteorder.9#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#8 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#5 integrate ... //depot/projects/trustedbsd/base/share/termcap/termcap.src#6 integrate ... //depot/projects/trustedbsd/base/sys/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#10 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#9 integrate ... //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/base/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#6 integrate ... //depot/projects/trustedbsd/base/sys/conf/NOTES#3 integrate ... //depot/projects/trustedbsd/base/sys/conf/files#17 integrate ... //depot/projects/trustedbsd/base/sys/conf/files.ia64#5 integrate ... //depot/projects/trustedbsd/base/sys/conf/kmod.mk#7 integrate ... //depot/projects/trustedbsd/base/sys/conf/options#8 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_disk.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#9 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aacreg.h#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aacvar.h#8 integrate ... //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/ata/ata-dma.c#14 integrate ... //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#9 integrate ... //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/drm/drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/gx/if_gx.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/acphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/amphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/exphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/inphy.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/lxtphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mii.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mii_physubr.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mlphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/nsphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/pnaphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/pnphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/qsphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/rlphy.c#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/tdkphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/tlphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/ukphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/xmphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#10 integrate ... //depot/projects/trustedbsd/base/sys/dev/ppbus/pps.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#10 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#13 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#15 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#5 integrate ... //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#9 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#4 integrate ... //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#10 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#7 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#10 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#11 integrate ... //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#7 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate ... //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#4 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#15 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#12 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/sal.c#4 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/sscdisk.c#2 integrate ... //depot/projects/trustedbsd/base/sys/ia64/include/mca.h#1 branch ... //depot/projects/trustedbsd/base/sys/ia64/include/pmap.h#4 integrate ... //depot/projects/trustedbsd/base/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#13 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_ntptime.c#5 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_time.c#5 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_hints.c#3 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_mchain.c#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#15 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#4 integrate ... //depot/projects/trustedbsd/base/sys/modules/Makefile#15 integrate ... //depot/projects/trustedbsd/base/sys/modules/aac/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/modules/drm/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/udf/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/net/if_media.h#4 integrate ... //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#4 integrate ... //depot/projects/trustedbsd/base/sys/net/rtsock.c#8 integrate ... //depot/projects/trustedbsd/base/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet/accf_data.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet/accf_http.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#7 integrate ... //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#7 integrate ... //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#10 integrate ... //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_mroute.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#7 integrate ... //depot/projects/trustedbsd/base/sys/netipx/ipx_usrreq.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netipx/spx_usrreq.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netkey/keysock.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netnatm/natm.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_iod.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_rq.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#5 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/nfs_node.c#4 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#8 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/nfsnode.h#2 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/clock.c#6 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#10 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_dc.c#9 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_de.c#2 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_sk.c#5 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_ti.c#7 integrate ... //depot/projects/trustedbsd/base/sys/pci/xrpu.c#2 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/frame.h#3 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/pcpu.h#3 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/spr.h#1 branch ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/genassym.c#6 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/locore.s#4 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#7 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/swtch.s#4 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#5 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/include/proc.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#15 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#11 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/sys_machdep.c#4 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/endian.h#1 branch ... //depot/projects/trustedbsd/base/sys/sys/filedesc.h#9 integrate ... //depot/projects/trustedbsd/base/sys/sys/param.h#8 integrate ... //depot/projects/trustedbsd/base/sys/sys/proc.h#11 integrate ... //depot/projects/trustedbsd/base/sys/sys/signalvar.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sys/socketvar.h#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/time.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sys/timepps.h#3 integrate ... //depot/projects/trustedbsd/base/sys/sys/timetc.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sys/timex.h#3 integrate ... //depot/projects/trustedbsd/base/sys/sys/vnode.h#10 integrate ... //depot/projects/trustedbsd/base/sys/vm/pmap.h#6 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma.h#3 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma_core.c#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma_int.h#3 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#9 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.c#8 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.h#6 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_page.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_page.h#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#6 integrate ... //depot/projects/trustedbsd/base/tools/regression/README#4 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/jot/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendar.1#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.all#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.french#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes#1 branch ... //depot/projects/trustedbsd/base/usr.bin/chat/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/chflags/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ee/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/fmt/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/getopt/getopt.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/head/head.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ipcrm/ipcrm.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/join/join.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.h#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ktrace/subr.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/extern.h#1 branch ... //depot/projects/trustedbsd/base/usr.bin/ldd/ldd.c#7 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/sods.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/look/look.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/lsvfs/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/mklocale/extern.h#1 branch ... //depot/projects/trustedbsd/base/usr.bin/mklocale/lex.l#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/mkstr/mkstr.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncal/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncal/ncal.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncplist/ncplist.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncplogin/ncplogin.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/if.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/inet6.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/main.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/generic.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/newkey.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/update.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/nm/nm.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/local_passwd.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/passwd.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/yp_passwd.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/paste/paste.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/quota/quota.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/build.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/extern.h#1 branch ... //depot/projects/trustedbsd/base/usr.bin/ranlib/misc.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/ranlib.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/touch.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rlogin/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rlogin/rlogin.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/rs/rs.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rup/rup.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ruptime/ruptime.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rusers/rusers.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/strip/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/tftp/tftp.1#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/keyserv/keyserv.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/moused/moused.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/prefix/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.8#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/spray/spray.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/yp_mkdb/yp_mkdb.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypbind/yp_ping.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypbind/ypbind.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/yppush/yppush_main.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_dblookup.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_server.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypset/ypset.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.250 2002/04/23 09:03:55 ru Exp $ +# $FreeBSD: src/Makefile,v 1.252 2002/04/29 15:22:01 ru Exp $ # # The user-driven targets are: # @@ -82,12 +82,17 @@ # Define the user-driven targets. These are listed here in alphabetical # order, but that's not important. # -TGTS= afterdistribute all all-man buildkernel buildworld checkdpadd clean \ +TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distribworld everything \ - hierarchy includes install installcheck installkernel kernel \ + hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update +.ORDER: buildworld installworld +.ORDER: buildworld distribworld +.ORDER: buildkernel installkernel +.ORDER: buildkernel reinstallkernel + PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1 @@ -134,6 +139,13 @@ @echo "--------------------------------------------------------------" # +# kernel +# +# Short hand for `make buildkernel installkernel' +# +kernel: buildkernel installkernel + +# # Perform a few tests to determine if the installed tools are adequate # for building the world. These are for older systems (prior to 2.2.5). # ==== //depot/projects/trustedbsd/base/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.260 2002/04/20 19:04:59 gshapiro Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.262 2002/04/29 15:22:01 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -57,6 +57,9 @@ .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif +.if exists(${.CURDIR}/etc) +SUBDIR+= etc +.endif .if exists(${.CURDIR}/games) && !defined(NOGAMES) SUBDIR+= games .endif @@ -93,11 +96,6 @@ SUBDIR+= usr.sbin .endif -# etc must be last for "distribute" to work -.if exists(${.CURDIR}/etc) -SUBDIR+= etc -.endif - # These are last, since it is nice to at least get the base system # rebuilt before you do them. .if defined(LOCAL_DIRS) @@ -108,6 +106,10 @@ .endfor .endif +.if defined(SUBDIR_OVERRIDE) +SUBDIR= ${SUBDIR_OVERRIDE} +.endif + .if defined(NOCLEANDIR) CLEANDIR= clean cleandepend .else @@ -239,7 +241,7 @@ # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -buildworld: +_worldtmp: @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @@ -258,11 +260,13 @@ mkdir -p ${WORLDTMP}/usr/include/${_dir} .endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} +_bootstrap-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 1: bootstrap tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${BMAKE} bootstrap-tools +_cleanobj: .if !defined(NOCLEAN) @echo @echo "--------------------------------------------------------------" @@ -270,47 +274,62 @@ @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .endif +_obj: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2: rebuilding the object tree" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-obj +_build-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2: build tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${TMAKE} build-tools +_cross-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 3: cross tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${XMAKE} cross-tools +_includes: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: populating ${WORLDTMP}/usr/include" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes +_libraries: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries +_depend: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: make dependencies" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-depend +everything: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} all -everything: - @echo "--------------------------------------------------------------" - @echo ">>> Building everything.." - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} all + +WMAKE_TGTS= +.if !defined(SUBDIR_OVERRIDE) +WMAKE_TGTS+= _worldtmp _bootstrap-tools +.endif +WMAKE_TGTS+= _cleanobj _obj _build-tools +.if !defined(SUBDIR_OVERRIDE) +WMAKE_TGTS+= _cross-tools +.endif +WMAKE_TGTS+= _includes _libraries _depend everything + +buildworld: ${WMAKE_TGTS} +.ORDER: ${WMAKE_TGTS} # # installcheck @@ -361,7 +380,7 @@ @echo ">>> Installing everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if !defined(NOMAN) +.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN) @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding man page indices" @@ -472,19 +491,9 @@ # # Install the kernel defined by INSTALLKERNEL # -installkernel: +installkernel reinstallkernel: cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ - ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} install -reinstallkernel: - cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ - ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} reinstall - -# -# kernel -# -# Short hand for `make buildkernel installkernel' -# -kernel: buildkernel installkernel + ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} # # update ==== //depot/projects/trustedbsd/base/contrib/ipfilter/misc.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)misc.c 1.3 2/4/96 (C) 1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.7 2002/02/22 15:32:55 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.8 2002/04/26 10:24:24 darrenr Exp $"; #endif extern int opts; @@ -82,7 +82,8 @@ i++; printf("%02x", *s++ & 0xff); } - putchar(' '); + if (i + 1 != len) + putchar(' '); } putchar('\n'); return; @@ -103,9 +104,29 @@ (void)printf(",%d", ntohs(tcp->th_sport)); (void)printf(" > "); (void)printf("%s", inet_ntoa(ip->ip_dst)); - if (!(ip->ip_off & IP_OFFMASK)) + if (!(ip->ip_off & IP_OFFMASK)) { if (ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP) (void)printf(",%d", ntohs(tcp->th_dport)); + if ((ip->ip_p == IPPROTO_TCP) && (tcp->th_flags)) { + putchar(' '); + if (tcp->th_flags & TH_FIN) + putchar('F'); + if (tcp->th_flags & TH_SYN) + putchar('S'); + if (tcp->th_flags & TH_RST) + putchar('R'); + if (tcp->th_flags & TH_PUSH) + putchar('P'); + if (tcp->th_flags & TH_ACK) + putchar('A'); + if (tcp->th_flags & TH_URG) + putchar('U'); + if (tcp->th_flags & TH_ECN) + putchar('E'); + if (tcp->th_flags & TH_CWR) + putchar('C'); + } + } putchar('\n'); } ==== //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ #endif #if !defined(lint) -static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.7 2002/04/24 17:35:37 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.8 2002/04/25 16:44:13 darrenr Exp $"; #endif @@ -298,8 +298,7 @@ struct servent *sv; int bits; - if (np->in_p != 0) - pr = getprotobynumber(np->in_p); + pr = getprotobynumber(np->in_p); switch (np->in_redir) { ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#4 (text+ko) ==== @@ -22,7 +22,7 @@ ntests: n1 n2 n3 n4 n5 n6 n7 -nitests: ni1 ni2 ni3 ni4 +nitests: ni1 ni2 ni3 ni4 ni5 intests: in1 in2 in3 in4 @@ -51,7 +51,7 @@ n1 n2 n3 n4 n5 n6 n7: @/bin/sh ./nattest $@ -ni1 ni2 ni3 ni4: +ni1 ni2 ni3 ni4 ni5: @/bin/sh ./natipftest $@ in1 in2 in3 in4: @@ -67,7 +67,7 @@ /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f13 f12 f14 f15 f16 f17 /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 /bin/rm -f n1 n2 n3 n4 n5 n6 n7 - /bin/rm -f ni1 ni2 ni3 ni4 + /bin/rm -f ni1 ni2 ni3 ni4 ni5 /bin/rm -f in1 in2 in3 in4 /bin/rm -f l1 /bin/rm -f ipv6.1 ipv6.2 ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni1#2 (text+ko) ==== @@ -1,3 +1,3 @@ -4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 -4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 a537 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f +4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 +4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 a537 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f ------------------------------- ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni2#2 (text+ko) ==== @@ -1,10 +1,10 @@ -4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 cea4 0000 0204 05b4 -4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 62a5 0000 0204 05b4 -4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 cbdf 0000 -4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 b5d9 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a -4510 0028 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 cbac 0000 -4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 deb6 0000 0000 0000 0d0a -4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 fe54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f6c 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 222! 2 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -4500 0038 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 348b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 +4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 +4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 +4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 +4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a +4510 0028 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 +4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a +4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 +4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 222! 2 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 +4500 0038 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 348b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 ------------------------------- ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 -4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 -4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 +4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 +4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 +4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ------------------------------- ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni2#2 (text+ko) ==== @@ -4,28 +4,28 @@ 0a01 0201 c0a8 0133 05f6 0077 a664 2485 0000 0000 -6002 4000 5aef 0000 0204 05b4 +6002 4000 b8f2 0000 0204 05b4 [in,xl0] 4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 -6012 2238 62a5 0000 0204 05b4 0000 +6012 2238 c0a8 0000 0204 05b4 0000 [out,xl0] 4510 0028 bd0e 4000 3e06 ea20 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a22 -5010 4470 582a 0000 +5010 4470 b62d 0000 [in,xl0] 4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 -5018 2238 b5d9 0000 0000 0000 0000 0000 +5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a @@ -35,21 +35,21 @@ 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 -5010 4470 57f7 0000 +5010 4470 b5fa 0000 [out,xl0] 4510 002e bd1e 4000 3e06 ea0a 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 -5018 4470 6b01 0000 0000 0000 0d0a +5018 4470 a8e2 0000 0000 0000 0d0a [in,xl0] 4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c -5018 2232 fe54 0000 0000 0000 0000 0000 +5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 @@ -58,7 +58,7 @@ c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c -5010 2232 9f6c 0000 0000 0000 0000 0000 +5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 ==== //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#2 (text+ko) ==== @@ -617,7 +617,7 @@ memset(&hints, 0, sizeof(hints)); hints.ai_flags = 0; - hints.ai_family = AF_UNSPEC; + hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; error = getaddrinfo(host, NULL, &hints, &res0); ==== //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#2 (text+ko) ==== @@ -77,7 +77,7 @@ Internet file transfer program .Sh SYNOPSIS .Nm "" -.Op Fl AadefginpRtvV +.Op Fl 46AadefginpRtvV .Bk -words .Op Fl o Ar output .Ek @@ -146,6 +146,14 @@ Options may be specified at the command line, or to the command interpreter. .Bl -tag -width "port " +.It Fl 4 +Forces +.Nm +to only use IPv4 addresses. +.It Fl 6 +Forces +.Nm +to only use IPv6 addresses. .It Fl A Force active mode ftp. By default, ==== //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#2 (text+ko) ==== @@ -149,7 +149,7 @@ memset(&hints, 0, sizeof(hints)); portnum = parseport(port, FTP_PORT); hints.ai_flags = AI_CANONNAME; - hints.ai_family = AF_UNSPEC; + hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; error = getaddrinfo(host, NULL, &hints, &res0); @@ -453,9 +453,10 @@ if (dig > 4 && pflag == 1 && isdigit(c)) pflag = 2; if (pflag == 2) { - if (c != '\r' && c != ')') - *pt++ = c; - else { + if (c != '\r' && c != ')') { + if (pt < &pasv[sizeof(pasv) - 1]) + *pt++ = c; + } else { *pt = '\0'; pflag = 3; } @@ -689,7 +690,7 @@ rc = -1; switch (curtype) { case TYPE_A: - rc = fseek(fin, (long) restart_point, SEEK_SET); + rc = fseeko(fin, restart_point, SEEK_SET); break; case TYPE_I: case TYPE_L: @@ -1134,18 +1135,17 @@ case TYPE_A: if (is_retr && restart_point) { int ch; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204300330.g3U3Uo781542>