Date: Wed, 13 Nov 2002 06:53:27 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21030 for review Message-ID: <200211131453.gADErRIh028568@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21030 Change 21030 by rwatson@rwatson_tislabs on 2002/11/13 06:53:14 Integ TrustedBSD base from FreeBSD vendor branch. Bring in various things, but largely loop back minor MAC changes such as MACOPVEC removal, devfs trimmage, etc. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#11 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/acconfig.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/lukemftpd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/todo#3 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#17 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.subr#8 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/gerrold.limerick#3 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/btowc.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrtowc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbstowcs.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wctrans.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/findfp.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/uuidgen.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_writev.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/create_chunk.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_sparc64_disk.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_class.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#6 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#16 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/config.h#2 integrate .. //depot/projects/trustedbsd/base/libexec/mknetid/mknetid.c#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#31 integrate .. //depot/projects/trustedbsd/base/release/Makefile.inc.docports#6 integrate .. //depot/projects/trustedbsd/base/release/alpha/dokern.sh#7 integrate .. //depot/projects/trustedbsd/base/release/alpha/drivers.conf#9 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/Makefile#5 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#13 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#8 integrate .. //depot/projects/trustedbsd/base/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#10 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/create.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/destroy.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/migrate.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/recover.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/show.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/trustedbsd/base/share/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snp.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#20 integrate .. //depot/projects/trustedbsd/base/sys/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_devsearch.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/metadata.c#7 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#48 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/gx/if_gxvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/snp/snp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_defs.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/gpib.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#19 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#27 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/setjmp.h#3 integrate .. //depot/projects/trustedbsd/base/sys/isa/fd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#21 integrate .. //depot/projects/trustedbsd/base/sys/libkern/qsort.c#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/splash/bmp/splash_bmp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/dragon/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/fire/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/rain/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/warp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/net/radix.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/zlib.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#10 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_tireg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/viapm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#22 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#20 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/gpt.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/snoop.h#4 integrate .. //depot/projects/trustedbsd/base/sys/vm/pmap.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_dbg.c#5 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#16 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#24 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#16 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-btowc.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mblen.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrtowc.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbstowcs.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbtowc.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcstombs.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wctomb.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/Makefile#18 integrate .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/btsockstat/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/btsockstat/btsockstat.1#2 delete .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/btsockstat/btsockstat.c#2 delete .. //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/kenv/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/alpha-fbsd.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/extern.h#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-fbsd.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-linux.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/ia64-fbsd.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/truss/main.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/yes/yes.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/info.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/link_control.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/link_policy.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/node.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/send_recv.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/status.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/util.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2cap.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2control.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2control.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2control.h#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2ping/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2ping/l2ping.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2ping/l2ping.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/watch/watch.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#11 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.50 2002/11/06 14:01:08 jmallett Exp $ +$FreeBSD: src/MAINTAINERS,v 1.52 2002/11/11 16:56:40 mjacob Exp $ subsystem login notes ----------------------------- @@ -44,7 +44,7 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -sa(4) mjacob Pre-commit review requested. +mpt(4) mjacob Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. ==== //depot/projects/trustedbsd/base/bin/echo/echo.c#5 (text+ko) ==== @@ -43,10 +43,9 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.13 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); -#include <stdio.h> -#include <stdlib.h> +#include <unistd.h> #include <string.h> /* ARGSUSED */ @@ -64,6 +63,9 @@ nflag = 0; while (argv[0] != NULL) { + size_t len; + + len = strlen(argv[0]); /* * If the next argument is NULL then this is this @@ -71,23 +73,20 @@ * for a trailing \c. */ if (argv[1] == NULL) { - size_t len; - - len = strlen(argv[0]); /* is there room for a '\c' and is there one? */ if (len >= 2 && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /* chop it and set the no-newline flag. */ - argv[0][len - 2] = '\0'; + len -= 2; nflag = 1; } } - (void)printf("%s", argv[0]); + write(STDOUT_FILENO, argv[0], len); if (*++argv) - putchar(' '); + write(STDOUT_FILENO, " ", 1); } if (!nflag) - putchar('\n'); + write(STDOUT_FILENO, "\n", 1); return 0; } ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,14 @@ +Thu May 23 02:43:41 UTC 2002 lukem + + * released 1.2 beta 2 + + * replace fnmatch(3) if FNM_CASEFOLD isn't available + +Sat Mar 16 01:28:28 UTC 2002 lukem + + * libukem/glob.c: Fix two problems in the KNR->ANSI conversion + noticed by Yuji Yamano <yyamano@kt.rim.or.jp> + Thu Mar 14 06:02:31 UTC 2002 lukem * released 1.2 beta 1 ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/acconfig.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.9 2001/04/28 07:11:06 lukem Exp $ */ +/* $Id: acconfig.h,v 1.10 2002/05/23 02:42:55 lukem Exp $ */ @TOP@ @BOTTOM@ @@ -48,6 +48,9 @@ /* Define if fclose() is declared in <stdio.h> */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in <fnmatch.h> */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in <stdlib.h> or <unistd.h> */ #undef HAVE_OPTARG_D ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/config.h.in#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* $Id: config.h.in,v 1.15 2001/04/28 07:11:46 lukem Exp $ */ +/* $Id: config.h.in,v 1.16 2002/05/23 02:42:55 lukem Exp $ */ /* Define if the closedir function returns void instead of int. */ @@ -221,6 +221,9 @@ /* Define if fclose() is declared in <stdio.h> */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in <fnmatch.h> */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in <stdlib.h> or <unistd.h> */ #undef HAVE_OPTARG_D ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/configure#3 (text+ko) ==== @@ -3181,14 +3181,55 @@ + echo $ac_n "checking for FNM_CASEFOLD""... $ac_c" 1>&6 +echo "configure:3186: checking for FNM_CASEFOLD" >&5 +if eval "test \"`echo '$''{'ftp_cv_HAVE_FNM_CASEFOLD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext <<EOF +#line 3192 "configure" +#include "confdefs.h" + +#include <fnmatch.h> +int main() { + int X = FNM_CASEFOLD ; +; return 0; } +EOF +if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ftp_cv_HAVE_FNM_CASEFOLD" 1>&6 + if test "x$ftp_cv_HAVE_FNM_CASEFOLD" = "xyes"; then + cat >> confdefs.h <<\EOF +#define HAVE_FNM_CASEFOLD 1 +EOF + + else + LIBOBJS="$LIBOBJS fnmatch.o" + : + fi + + + echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6 -echo "configure:3186: checking for optarg declaration" >&5 +echo "configure:3227: checking for optarg declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTARG_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3192 "configure" +#line 3233 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3197,7 +3238,7 @@ char *X = optarg ; ; return 0; } EOF -if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTARG_D=yes else @@ -3224,13 +3265,13 @@ echo $ac_n "checking for optind declaration""... $ac_c" 1>&6 -echo "configure:3228: checking for optind declaration" >&5 +echo "configure:3269: checking for optind declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTIND_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3234 "configure" +#line 3275 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3239,7 +3280,7 @@ int X = optind ; ; return 0; } EOF -if { (eval echo configure:3243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTIND_D=yes else @@ -3266,13 +3307,13 @@ echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:3270: checking for optreset" >&5 +echo "configure:3311: checking for optreset" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTRESET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3276 "configure" +#line 3317 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3281,7 +3322,7 @@ int X = optreset ; ; return 0; } EOF -if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ftp_cv_HAVE_OPTRESET=yes else @@ -3308,13 +3349,13 @@ echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6 -echo "configure:3312: checking for pclose() declaration" >&5 +echo "configure:3353: checking for pclose() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_PCLOSE_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3318 "configure" +#line 3359 "configure" #include "confdefs.h" #include <stdio.h> @@ -3322,7 +3363,7 @@ int (*X)() = pclose ; ; return 0; } EOF -if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_PCLOSE_D=yes else @@ -3350,13 +3391,13 @@ if test $ac_cv_func_getusershell = yes; then echo $ac_n "checking for getusershell() declaration""... $ac_c" 1>&6 -echo "configure:3354: checking for getusershell() declaration" >&5 +echo "configure:3395: checking for getusershell() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_GETUSERSHELL_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3360 "configure" +#line 3401 "configure" #include "confdefs.h" #include <unistd.h> @@ -3364,7 +3405,7 @@ char *(*X)() = getusershell ; ; return 0; } EOF -if { (eval echo configure:3368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_GETUSERSHELL_D=yes else @@ -3395,13 +3436,13 @@ echo $ac_n "checking *printf() support for %lld""... $ac_c" 1>&6 -echo "configure:3399: checking *printf() support for %lld" >&5 +echo "configure:3440: checking *printf() support for %lld" >&5 can_printf_longlong=no if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3405 "configure" +#line 3446 "configure" #include "confdefs.h" #include <stdio.h> @@ -3412,7 +3453,7 @@ } EOF -if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3432,12 +3473,12 @@ if test $can_printf_longlong != yes; then echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6 -echo "configure:3436: checking *printf() support for %qd" >&5 +echo "configure:3477: checking *printf() support for %qd" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 3441 "configure" +#line 3482 "configure" #include "confdefs.h" #include <stdio.h> @@ -3448,7 +3489,7 @@ } EOF -if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3479,12 +3520,12 @@ for ac_func in strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3483: checking for $ac_func" >&5 +echo "configure:3524: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3488 "configure" +#line 3529 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3507,7 +3548,7 @@ ; return 0; } EOF -if { (eval echo configure:3511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3542,13 +3583,13 @@ if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6 -echo "configure:3546: checking for AI_NUMERICHOST" >&5 +echo "configure:3587: checking for AI_NUMERICHOST" >&5 if eval "test \"`echo '$''{'ftp_cv_have_ai_numerichost'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3552 "configure" +#line 3593 "configure" #include "confdefs.h" #include <sys/types.h> @@ -3558,7 +3599,7 @@ int X = AI_NUMERICHOST ; ; return 0; } EOF -if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_ai_numerichost=yes else @@ -3581,7 +3622,7 @@ fi echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6 -echo "configure:3585: checking for working getaddrinfo()" >&5 +echo "configure:3626: checking for working getaddrinfo()" >&5 if test $have_rfc2553_netdb = yes; then cat >> confdefs.h <<\EOF #define HAVE_RFC2553_NETDB 1 @@ -3600,13 +3641,13 @@ if test $ac_cv_func_sl_init = yes; then echo $ac_n "checking if sl_add() returns int""... $ac_c" 1>&6 -echo "configure:3604: checking if sl_add() returns int" >&5 +echo "configure:3645: checking if sl_add() returns int" >&5 if eval "test \"`echo '$''{'ftp_cv_INT_SL_ADD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3610 "configure" +#line 3651 "configure" #include "confdefs.h" #include <stringlist.h> @@ -3614,7 +3655,7 @@ int f = sl_add((StringList *)0, "foo") ; ; return 0; } EOF -if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_INT_SL_ADD=yes else @@ -3643,12 +3684,12 @@ for ac_func in fts_open strmode user_from_uid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3647: checking for $ac_func" >&5 +echo "configure:3688: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3652 "configure" +#line 3693 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3671,7 +3712,7 @@ ; return 0; } EOF -if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/configure.in#3 (text+ko) ==== @@ -1,10 +1,10 @@ -dnl $Id: configure.in,v 1.17 2001/12/01 02:00:48 lukem Exp $ +dnl $Id: configure.in,v 1.18 2002/05/23 02:42:55 lukem Exp $ dnl dnl configure.in -- dnl process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.17 $)dnl +AC_REVISION($Revision: 1.18 $)dnl AC_INIT(lukemftpd.h) @@ -166,6 +166,11 @@ AC_MSG_TRY_COMPILE(for fclose() declaration, ftp_cv_HAVE_FCLOSE_D, [ #include <stdio.h> ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)]) +AC_MSG_TRY_COMPILE(for FNM_CASEFOLD, ftp_cv_HAVE_FNM_CASEFOLD, [ +#include <fnmatch.h> ], [ int X = FNM_CASEFOLD ], +[AC_DEFINE(HAVE_FNM_CASEFOLD, 1)], +[LIBOBJS="$LIBOBJS fnmatch.o"]) + AC_MSG_TRY_COMPILE(for optarg declaration, ftp_cv_HAVE_OPTARG_D, [ #include <stdlib.h> #include <unistd.h> ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)]) ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/lukemftpd.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $Id: lukemftpd.h,v 1.18 2002/03/14 06:02:24 lukem Exp $ */ +/* $Id: lukemftpd.h,v 1.20 2002/05/23 02:43:58 lukem Exp $ */ -#define FTPD_VERSION "lukemftpd 1.2 beta 1" +#define FTPD_VERSION "lukemftpd 1.2 beta 2" #include "config.h" @@ -28,7 +28,6 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> -#include <fnmatch.h> #include <grp.h> #include <limits.h> #include <locale.h> @@ -82,6 +81,12 @@ # include "ftpglob.h" #endif +#if HAVE_FNM_CASEFOLD +# include <fnmatch.h> +#else +# include "ftpfnmatch.h" +#endif + #if HAVE_PATHS_H # include <paths.h> #endif ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/todo#3 (text+ko) ==== @@ -4,7 +4,6 @@ is not available? - IF_NAMESIZE not available on darwin - inet_net_pton() ipv6 support - - FNM_CASEFOLD for fnmatch(3) support lfcompile(5) (large files) on solaris ==== //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#3 (text+ko) ==== @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20020218 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20020101 ==== //depot/projects/trustedbsd/base/etc/defaults/rc.conf#17 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.160 2002/11/02 08:21:25 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,6 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +devd_enable="NO" # Run devd, to trigger progams on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. ==== //depot/projects/trustedbsd/base/etc/inetd.conf#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.60 2002/10/29 08:41:12 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.61 2002/11/12 17:31:11 obrien Exp $ # # Internet server configuration database # @@ -6,12 +6,6 @@ # To disable a service, comment it out by prefixing the line with '#'. # To enable a service, remove the '#' at the beginning of the line. # -# WARNING: lukemftpd does not utilize PAM, MAC, per-class nologin files, -# or any login.conf resource limits or features. Use this ftpd only if this -# is appropriate for your environment. If you require these features, use -# the alternate FreeBSD ftpd below. -#ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r -# #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l #telnet stream tcp nowait root /usr/libexec/telnetd telnetd ==== //depot/projects/trustedbsd/base/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.8 2002/09/06 01:23:31 peter Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.9 2002/11/09 07:45:53 imp Exp $ .include <bsd.own.mk> FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ - cleartmp cron devdb devfs diskless dmesg dumpon fsck inetd \ + cleartmp cron devd devdb devfs diskless dmesg dumpon fsck inetd \ initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \ ipxrouted isdnd kadmind kerberos keyserv ldconfig local \ localdaemons lomac lpd motd mountcritlocal mountcritremote \ ==== //depot/projects/trustedbsd/base/etc/rc.subr#8 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.7 2002/11/08 17:06:15 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.8 2002/11/09 17:34:21 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -900,8 +900,10 @@ { case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + if [ -x /usr/bin/logger ]; then + logger "$0: INFO: $*" + fi echo 1>&2 "$0: DEBUG: $*" - return ;; esac } ==== //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/19/94 -# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.28 2001/12/17 13:59:29 ru Exp $ +# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.29 2002/11/10 23:41:01 dcs Exp $ FILES= fortunes fortunes2 freebsd-tips murphy startrek zippy BLDS= fortunes.dat fortunes2.dat murphy.dat startrek.dat zippy.dat \ @@ -14,8 +14,8 @@ # THREE LINES AND UNCOMMENT THE FOURTH LINE. # THE THREE LINES: -FILES+= fortunes2-o limerick murphy-o -BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat +FILES+= fortunes2-o limerick murphy-o gerrold.limerick +BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat gerrold.limerick.dat TYPE= real # THE FOURTH LINE: @@ -26,7 +26,7 @@ FILESDIR= ${SHAREDIR}/games/fortune -.for f in fortunes fortunes2 fortunes2-o freebsd-tips limerick murphy murphy-o startrek zippy +.for f in fortunes fortunes2 fortunes2-o freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy $f.dat: $f PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Crs ${.ALLSRC} ${.TARGET} ==== //depot/projects/trustedbsd/base/games/fortune/datfiles/gerrold.limerick#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.3 2002/04/28 21:59:07 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.5 2002/11/10 23:37:25 dcs Exp $ %% From The War Against The Chtorr, %% Copyright David Gerrold, 1984-2000, all rights reserved, %% used with permission of the author. @@ -44,3 +44,780 @@ From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all rights reserved, used with permission of the author. +% +There was a young lady named Susie, +Who everyone thought was a floozy. + She liked boy scout troops + and Shriners, in groups; +"What the hell?" She replied. "I'm not choosy." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A fellow who lived in West Perkin +was always a-jerkin' his gherkin. + Said he, "It's not fickle + to play with my pickle. +At least my gherkin's a workin'." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A proctologist name of McGee +once bent over double to see + an eyeball of glass + he had shoved up his ass, +"-- so I can see one that looks back at me." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Bart has a singular penis +for his wife who is built like a Venus. + He awoke with a fright + last Saturday night: +"Hey! Something is coming between us!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who lives in New Delhi +has habits disgusting and smelhi. + She likes to eat feces + of various species. +(The recipe is tattooed or her belhi.) + >>> 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?200211131453.gADErRIh028568>