PERFORCE change 122788 for review
Warner Losh
imp at FreeBSD.org
Tue Jul 3 16:34:35 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=122788
Change 122788 by imp at imp_paco-paco on 2007/07/03 16:33:51
IFC @122786
Affected files ...
.. //depot/projects/arm/src/ObsoleteFiles.inc#23 integrate
.. //depot/projects/arm/src/UPDATING#18 integrate
.. //depot/projects/arm/src/bin/ed/Makefile#2 integrate
.. //depot/projects/arm/src/contrib/ipfilter/tools/ipfstat.c#4 integrate
.. //depot/projects/arm/src/contrib/less/main.c#6 integrate
.. //depot/projects/arm/src/contrib/less/screen.c#5 integrate
.. //depot/projects/arm/src/contrib/netcat/netcat.c#3 integrate
.. //depot/projects/arm/src/contrib/pf/authpf/authpf.8#2 integrate
.. //depot/projects/arm/src/contrib/pf/authpf/authpf.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/ftp-proxy/filter.c#1 branch
.. //depot/projects/arm/src/contrib/pf/ftp-proxy/filter.h#1 branch
.. //depot/projects/arm/src/contrib/pf/ftp-proxy/ftp-proxy.8#2 integrate
.. //depot/projects/arm/src/contrib/pf/ftp-proxy/ftp-proxy.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/ftp-proxy/getline.c#2 delete
.. //depot/projects/arm/src/contrib/pf/ftp-proxy/util.c#2 delete
.. //depot/projects/arm/src/contrib/pf/ftp-proxy/util.h#2 delete
.. //depot/projects/arm/src/contrib/pf/libevent/buffer.c#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/evbuffer.c#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/event-internal.h#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/event.c#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/event.h#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/evsignal.h#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/kqueue.c#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/log.c#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/log.h#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/poll.c#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/select.c#1 branch
.. //depot/projects/arm/src/contrib/pf/libevent/signal.c#1 branch
.. //depot/projects/arm/src/contrib/pf/man/pf.4#2 integrate
.. //depot/projects/arm/src/contrib/pf/man/pf.conf.5#4 integrate
.. //depot/projects/arm/src/contrib/pf/man/pf.os.5#2 integrate
.. //depot/projects/arm/src/contrib/pf/man/pflog.4#2 integrate
.. //depot/projects/arm/src/contrib/pf/man/pfsync.4#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/parse.y#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pf_print_state.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl.8#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl.h#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_altq.c#3 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_optimize.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_osfp.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_parser.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_parser.h#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_radix.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pfctl/pfctl_table.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pflogd/pflogd.8#2 integrate
.. //depot/projects/arm/src/contrib/pf/pflogd/pflogd.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/pflogd/pflogd.h#2 integrate
.. //depot/projects/arm/src/contrib/pf/pflogd/privsep.c#2 integrate
.. //depot/projects/arm/src/contrib/pf/tftp-proxy/filter.c#1 branch
.. //depot/projects/arm/src/contrib/pf/tftp-proxy/filter.h#1 branch
.. //depot/projects/arm/src/contrib/pf/tftp-proxy/tftp-proxy.8#1 branch
.. //depot/projects/arm/src/contrib/pf/tftp-proxy/tftp-proxy.c#1 branch
.. //depot/projects/arm/src/contrib/telnet/telnet/externs.h#2 integrate
.. //depot/projects/arm/src/contrib/traceroute/traceroute.c#4 integrate
.. //depot/projects/arm/src/etc/mtree/BSD.include.dist#9 integrate
.. //depot/projects/arm/src/include/Makefile#10 integrate
.. //depot/projects/arm/src/lib/libarchive/Makefile#14 integrate
.. //depot/projects/arm/src/lib/libarchive/archive.h.in#15 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_open_fd.c#7 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_open_file.c#10 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_read_open_filename.c#5 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_set_format.c#4 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_by_name.c#5 integrate
.. //depot/projects/arm/src/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch
.. //depot/projects/arm/src/lib/libarchive/test/Makefile#6 integrate
.. //depot/projects/arm/src/lib/libarchive/test/test_write_format_cpio.c#1 branch
.. //depot/projects/arm/src/lib/libc/arm/sys/sbrk.S#2 integrate
.. //depot/projects/arm/src/lib/libc/net/sctp_sys_calls.c#6 integrate
.. //depot/projects/arm/src/lib/libgssapi/gss_accept_sec_context.c#3 integrate
.. //depot/projects/arm/src/lib/libgssapi/gss_display_status.c#2 integrate
.. //depot/projects/arm/src/lib/libgssapi/gss_export_name.c#2 integrate
.. //depot/projects/arm/src/lib/libgssapi/gss_indicate_mechs.c#2 integrate
.. //depot/projects/arm/src/lib/libgssapi/gss_init_sec_context.c#4 integrate
.. //depot/projects/arm/src/lib/libipsec/Makefile#3 integrate
.. //depot/projects/arm/src/lib/libipsec/ipsec_dump_policy.c#2 integrate
.. //depot/projects/arm/src/lib/libipsec/ipsec_get_policylen.c#2 integrate
.. //depot/projects/arm/src/lib/libipsec/ipsec_set_policy.3#3 integrate
.. //depot/projects/arm/src/lib/libipsec/ipsec_strerror.3#2 integrate
.. //depot/projects/arm/src/lib/libipsec/ipsec_strerror.c#2 integrate
.. //depot/projects/arm/src/lib/libipsec/pfkey.c#2 integrate
.. //depot/projects/arm/src/lib/libipsec/pfkey_dump.c#3 integrate
.. //depot/projects/arm/src/lib/libipsec/policy_parse.y#2 integrate
.. //depot/projects/arm/src/lib/libipsec/policy_token.l#2 integrate
.. //depot/projects/arm/src/lib/libipsec/test-policy.c#2 integrate
.. //depot/projects/arm/src/libexec/Makefile#2 integrate
.. //depot/projects/arm/src/libexec/ftp-proxy/Makefile#2 delete
.. //depot/projects/arm/src/libexec/tftp-proxy/Makefile#1 branch
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate
.. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#8 integrate
.. //depot/projects/arm/src/release/i386/fixit_crunch.conf#3 integrate
.. //depot/projects/arm/src/release/scripts/src-install.sh#2 integrate
.. //depot/projects/arm/src/rescue/rescue/Makefile#6 integrate
.. //depot/projects/arm/src/sbin/Makefile#7 integrate
.. //depot/projects/arm/src/sbin/mount/mount.8#5 integrate
.. //depot/projects/arm/src/sbin/mount/mount.c#8 integrate
.. //depot/projects/arm/src/sbin/mount_umapfs/Makefile#2 delete
.. //depot/projects/arm/src/sbin/mount_umapfs/mount_umapfs.8#2 delete
.. //depot/projects/arm/src/sbin/mount_umapfs/mount_umapfs.c#2 delete
.. //depot/projects/arm/src/sbin/mount_umapfs/sample.group.mapfile#2 delete
.. //depot/projects/arm/src/sbin/mount_umapfs/sample.user.mapfile#2 delete
.. //depot/projects/arm/src/sbin/mount_umapfs/umap_manual#2 delete
.. //depot/projects/arm/src/sbin/pfctl/Makefile#2 integrate
.. //depot/projects/arm/src/sbin/ping/ping.c#4 integrate
.. //depot/projects/arm/src/sbin/ping6/Makefile#3 integrate
.. //depot/projects/arm/src/sbin/ping6/ping6.c#3 integrate
.. //depot/projects/arm/src/sbin/setkey/Makefile#3 integrate
.. //depot/projects/arm/src/sbin/setkey/parse.y#2 integrate
.. //depot/projects/arm/src/sbin/setkey/setkey.c#2 integrate
.. //depot/projects/arm/src/sbin/setkey/test-pfkey.c#2 integrate
.. //depot/projects/arm/src/sbin/setkey/test-policy.c#2 integrate
.. //depot/projects/arm/src/sbin/setkey/token.l#3 integrate
.. //depot/projects/arm/src/share/Makefile#2 integrate
.. //depot/projects/arm/src/share/man/man4/Makefile#15 integrate
.. //depot/projects/arm/src/share/man/man4/ath.4#4 integrate
.. //depot/projects/arm/src/share/man/man4/bce.4#7 integrate
.. //depot/projects/arm/src/share/man/man4/ieee80211.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/mac.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/msk.4#3 integrate
.. //depot/projects/arm/src/share/man/man4/nxge.4#1 branch
.. //depot/projects/arm/src/share/man/man4/pcm.4#6 integrate
.. //depot/projects/arm/src/share/man/man4/tty.4#2 integrate
.. //depot/projects/arm/src/share/man/man4/ucom.4#3 integrate
.. //depot/projects/arm/src/share/man/man4/uhid.4#4 integrate
.. //depot/projects/arm/src/share/man/man4/wi.4#3 integrate
.. //depot/projects/arm/src/share/man/man7/hier.7#10 integrate
.. //depot/projects/arm/src/share/man/man9/ieee80211_ioctl.9#3 integrate
.. //depot/projects/arm/src/share/man/man9/priv.9#5 integrate
.. //depot/projects/arm/src/share/man/man9/suser.9#4 integrate
.. //depot/projects/arm/src/share/misc/committers-ports.dot#7 integrate
.. //depot/projects/arm/src/share/misc/committers-src.dot#6 integrate
.. //depot/projects/arm/src/share/mk/bsd.own.mk#14 integrate
.. //depot/projects/arm/src/share/mk/sys.mk#3 integrate
.. //depot/projects/arm/src/sys/Makefile#13 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#35 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#24 integrate
.. //depot/projects/arm/src/sys/amd64/conf/NOTES#16 integrate
.. //depot/projects/arm/src/sys/boot/forth/loader.conf#15 integrate
.. //depot/projects/arm/src/sys/cam/cam_xpt.c#22 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#22 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#51 integrate
.. //depot/projects/arm/src/sys/conf/files#75 integrate
.. //depot/projects/arm/src/sys/conf/files.amd64#25 integrate
.. //depot/projects/arm/src/sys/conf/files.arm#8 integrate
.. //depot/projects/arm/src/sys/conf/files.i386#27 integrate
.. //depot/projects/arm/src/sys/conf/files.ia64#10 integrate
.. //depot/projects/arm/src/sys/conf/files.pc98#18 integrate
.. //depot/projects/arm/src/sys/conf/files.powerpc#16 integrate
.. //depot/projects/arm/src/sys/conf/files.sparc64#13 integrate
.. //depot/projects/arm/src/sys/conf/files.sun4v#8 integrate
.. //depot/projects/arm/src/sys/conf/options#48 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_cbq.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_hfsc.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_priq.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/altq/altq/altq_red.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.c#6 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/if_pflog.h#5 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.c#10 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/if_pfsync.h#4 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf.c#10 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_if.c#4 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_ioctl.c#9 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_mtag.h#1 branch
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_norm.c#7 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_osfp.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_ruleset.c#1 branch
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_subr.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_table.c#3 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pfvar.h#5 integrate
.. //depot/projects/arm/src/sys/crypto/via/padlock.c#10 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi.c#24 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-all.h#16 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#37 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#14 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#21 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-usb.c#6 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_ath.c#31 integrate
.. //depot/projects/arm/src/sys/dev/ipw/if_ipw.c#11 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp.c#22 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#21 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_library.c#12 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#28 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispvar.h#18 integrate
.. //depot/projects/arm/src/sys/dev/iwi/if_iwi.c#18 integrate
.. //depot/projects/arm/src/sys/dev/nxge/if_nxge.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/if_nxge.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/build-version.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/version.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xge-debug.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xge-defs.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xge-list.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xge-os-pal.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xge-os-template.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xge-queue.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-channel.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-config.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-device.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-driver.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-event.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-fifo.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-mgmt.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-mgmtaux.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-mm.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-regs.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-ring.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-stats.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal-types.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/include/xgehal.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xge-osdep.h#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xge-queue.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-channel.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-config.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-device.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-driver.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-fifo.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-mm.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-ring.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgehal/xgehal-stats.c#1 branch
.. //depot/projects/arm/src/sys/dev/nxge/xgell-version.h#1 branch
.. //depot/projects/arm/src/sys/dev/ral/rt2560.c#12 integrate
.. //depot/projects/arm/src/sys/dev/ral/rt2661.c#10 integrate
.. //depot/projects/arm/src/sys/dev/rp/rp.c#5 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#16 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac_private.h#7 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/ac97_patch.c#7 integrate
.. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#12 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_aue.c#15 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_axe.c#13 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_axereg.h#7 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_cdce.c#7 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_cue.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_kue.c#7 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_ural.c#24 integrate
.. //depot/projects/arm/src/sys/dev/usb/uark.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/ucom.c#7 integrate
.. //depot/projects/arm/src/sys/dev/usb/ugen.c#7 integrate
.. //depot/projects/arm/src/sys/dev/usb/uhub.c#7 integrate
.. //depot/projects/arm/src/sys/dev/usb/ukbd.c#11 integrate
.. //depot/projects/arm/src/sys/dev/usb/umass.c#18 integrate
.. //depot/projects/arm/src/sys/dev/usb/umodem.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/ums.c#10 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb.h#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_port.h#10 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#15 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_quirks.h#8 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#17 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#34 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdi.c#11 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdi.h#7 integrate
.. //depot/projects/arm/src/sys/dev/wi/if_wi.c#14 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_uma.c#2 delete
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_uma.h#2 delete
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/arm/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate
.. //depot/projects/arm/src/sys/fs/umapfs/umap.h#2 delete
.. //depot/projects/arm/src/sys/fs/umapfs/umap_subr.c#3 delete
.. //depot/projects/arm/src/sys/fs/umapfs/umap_vfsops.c#6 delete
.. //depot/projects/arm/src/sys/fs/umapfs/umap_vnops.c#5 delete
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#24 integrate
.. //depot/projects/arm/src/sys/i386/conf/NOTES#24 integrate
.. //depot/projects/arm/src/sys/i386/i386/pmap.c#34 integrate
.. //depot/projects/arm/src/sys/kern/Make.tags.inc#5 integrate
.. //depot/projects/arm/src/sys/kern/Makefile#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_malloc.c#12 integrate
.. //depot/projects/arm/src/sys/kern/kern_priv.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_rwlock.c#12 integrate
.. //depot/projects/arm/src/sys/kern/kern_timeout.c#6 integrate
.. //depot/projects/arm/src/sys/kern/sysv_sem.c#10 integrate
.. //depot/projects/arm/src/sys/kern/tty.c#16 integrate
.. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#26 integrate
.. //depot/projects/arm/src/sys/modules/Makefile#45 integrate
.. //depot/projects/arm/src/sys/modules/acpi/acpi_video/Makefile#4 integrate
.. //depot/projects/arm/src/sys/modules/ath_rate_amrr/Makefile#5 integrate
.. //depot/projects/arm/src/sys/modules/ath_rate_onoe/Makefile#4 integrate
.. //depot/projects/arm/src/sys/modules/i2c/controllers/alpm/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/i2c/controllers/viapm/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/ipfw/Makefile#5 integrate
.. //depot/projects/arm/src/sys/modules/nxge/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/pf/Makefile#6 integrate
.. //depot/projects/arm/src/sys/modules/tmpfs/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/umapfs/Makefile#2 delete
.. //depot/projects/arm/src/sys/net/bridgestp.c#17 integrate
.. //depot/projects/arm/src/sys/net/if_ethersubr.c#25 integrate
.. //depot/projects/arm/src/sys/net/if_gre.c#10 integrate
.. //depot/projects/arm/src/sys/net/if_ppp.c#12 integrate
.. //depot/projects/arm/src/sys/net/pfkeyv2.h#3 integrate
.. //depot/projects/arm/src/sys/net80211/_ieee80211.h#9 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_freebsd.h#8 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#19 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_radiotap.h#5 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_scan_sta.c#2 integrate
.. //depot/projects/arm/src/sys/netatalk/aarp.h#3 integrate
.. //depot/projects/arm/src/sys/netatalk/ddp.h#3 integrate
.. //depot/projects/arm/src/sys/netatm/atm_cm.c#4 integrate
.. //depot/projects/arm/src/sys/netatm/ipatm/ipatm_event.c#2 integrate
.. //depot/projects/arm/src/sys/netatm/spans/spans_proto.c#2 integrate
.. //depot/projects/arm/src/sys/netatm/uni/sscf_uni_lower.c#2 integrate
.. //depot/projects/arm/src/sys/netatm/uni/uniarp.c#3 integrate
.. //depot/projects/arm/src/sys/netatm/uni/uniarp_timer.c#2 integrate
.. //depot/projects/arm/src/sys/netatm/uni/unisig_decode.h#2 integrate
.. //depot/projects/arm/src/sys/netatm/uni/unisig_proto.c#2 integrate
.. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate
.. //depot/projects/arm/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_parse.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.h#12 integrate
.. //depot/projects/arm/src/sys/netinet/in_proto.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#33 integrate
.. //depot/projects/arm/src/sys/netinet/ip_icmp.c#8 integrate
.. //depot/projects/arm/src/sys/netinet/ip_input.c#20 integrate
.. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#24 integrate
.. //depot/projects/arm/src/sys/netinet/raw_ip.c#16 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_indata.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_indata.h#7 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_input.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_input.h#5 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#12 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_uio.h#15 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#17 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_var.h#9 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.c#18 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_input.c#33 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_output.c#20 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_subr.c#28 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#23 integrate
.. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#22 integrate
.. //depot/projects/arm/src/sys/netinet6/ah.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/ah6.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/ah_aesxcbcmac.c#4 delete
.. //depot/projects/arm/src/sys/netinet6/ah_aesxcbcmac.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/ah_core.c#5 delete
.. //depot/projects/arm/src/sys/netinet6/ah_input.c#3 delete
.. //depot/projects/arm/src/sys/netinet6/ah_output.c#4 delete
.. //depot/projects/arm/src/sys/netinet6/esp.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/esp6.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/esp_aesctr.c#5 delete
.. //depot/projects/arm/src/sys/netinet6/esp_aesctr.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/esp_camellia.c#2 delete
.. //depot/projects/arm/src/sys/netinet6/esp_camellia.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/esp_core.c#5 delete
.. //depot/projects/arm/src/sys/netinet6/esp_input.c#3 delete
.. //depot/projects/arm/src/sys/netinet6/esp_rijndael.c#3 delete
.. //depot/projects/arm/src/sys/netinet6/esp_rijndael.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/icmp6.c#12 integrate
.. //depot/projects/arm/src/sys/netinet6/in6.h#6 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#15 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_proto.c#10 integrate
.. //depot/projects/arm/src/sys/netinet6/ip6_forward.c#8 integrate
.. //depot/projects/arm/src/sys/netinet6/ip6_input.c#11 integrate
.. //depot/projects/arm/src/sys/netinet6/ip6_ipsec.c#1 branch
.. //depot/projects/arm/src/sys/netinet6/ip6_ipsec.h#1 branch
.. //depot/projects/arm/src/sys/netinet6/ip6_output.c#9 integrate
.. //depot/projects/arm/src/sys/netinet6/ipcomp.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/ipcomp6.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/ipcomp_core.c#3 delete
.. //depot/projects/arm/src/sys/netinet6/ipcomp_input.c#4 delete
.. //depot/projects/arm/src/sys/netinet6/ipcomp_output.c#3 delete
.. //depot/projects/arm/src/sys/netinet6/ipsec.c#11 delete
.. //depot/projects/arm/src/sys/netinet6/ipsec.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/ipsec6.h#2 delete
.. //depot/projects/arm/src/sys/netinet6/nd6.c#16 integrate
.. //depot/projects/arm/src/sys/netinet6/nd6_nbr.c#8 integrate
.. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#10 integrate
.. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#15 integrate
.. //depot/projects/arm/src/sys/netinet6/udp6_output.c#6 integrate
.. //depot/projects/arm/src/sys/netinet6/udp6_usrreq.c#14 integrate
.. //depot/projects/arm/src/sys/netipsec/ipsec.c#11 integrate
.. //depot/projects/arm/src/sys/netipsec/ipsec.h#5 integrate
.. //depot/projects/arm/src/sys/netipsec/ipsec6.h#2 integrate
.. //depot/projects/arm/src/sys/netipsec/ipsec_mbuf.c#4 integrate
.. //depot/projects/arm/src/sys/netipsec/ipsec_output.c#5 integrate
.. //depot/projects/arm/src/sys/netipsec/key.c#6 integrate
.. //depot/projects/arm/src/sys/netipsec/key_debug.c#3 integrate
.. //depot/projects/arm/src/sys/netipsec/keysock.c#6 integrate
.. //depot/projects/arm/src/sys/netipsec/xform_ah.c#6 integrate
.. //depot/projects/arm/src/sys/netipsec/xform_ipip.c#4 integrate
.. //depot/projects/arm/src/sys/netkey/key.c#4 delete
.. //depot/projects/arm/src/sys/netkey/key.h#2 delete
.. //depot/projects/arm/src/sys/netkey/key_debug.c#3 delete
.. //depot/projects/arm/src/sys/netkey/key_debug.h#2 delete
.. //depot/projects/arm/src/sys/netkey/key_var.h#2 delete
.. //depot/projects/arm/src/sys/netkey/keydb.c#4 delete
.. //depot/projects/arm/src/sys/netkey/keydb.h#2 delete
.. //depot/projects/arm/src/sys/netkey/keysock.c#6 delete
.. //depot/projects/arm/src/sys/netkey/keysock.h#3 delete
.. //depot/projects/arm/src/sys/security/audit/audit.c#19 integrate
.. //depot/projects/arm/src/sys/security/audit/audit.h#9 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_arg.c#14 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#13 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_bsm_token.c#11 integrate
.. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#15 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_audit.c#2 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_framework.h#8 integrate
.. //depot/projects/arm/src/sys/security/mac/mac_policy.h#4 integrate
.. //depot/projects/arm/src/sys/security/mac_stub/mac_stub.c#8 integrate
.. //depot/projects/arm/src/sys/security/mac_test/mac_test.c#7 integrate
.. //depot/projects/arm/src/sys/sys/_rwlock.h#4 integrate
.. //depot/projects/arm/src/sys/sys/mbuf.h#23 integrate
.. //depot/projects/arm/src/sys/sys/param.h#33 integrate
.. //depot/projects/arm/src/sys/sys/rwlock.h#9 integrate
.. //depot/projects/arm/src/sys/sys/systm.h#25 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#19 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/dir.h#2 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_inode.c#9 integrate
.. //depot/projects/arm/src/sys/vm/swap_pager.c#14 integrate
.. //depot/projects/arm/src/sys/vm/vm_pageout.c#13 integrate
.. //depot/projects/arm/src/tools/regression/fsx/fsx.c#3 integrate
.. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-gethostby.c#2 integrate
.. //depot/projects/arm/src/tools/regression/lib/libc/nss/test-gethostby.t#2 integrate
.. //depot/projects/arm/src/tools/regression/tmpfs/Makefile#2 integrate
.. //depot/projects/arm/src/tools/regression/tmpfs/t_id_gen#2 delete
.. //depot/projects/arm/src/tools/tools/README#4 integrate
.. //depot/projects/arm/src/tools/tools/nxge/Makefile#1 branch
.. //depot/projects/arm/src/tools/tools/nxge/xge_cmn.h#1 branch
.. //depot/projects/arm/src/tools/tools/nxge/xge_info.c#1 branch
.. //depot/projects/arm/src/tools/tools/nxge/xge_info.h#1 branch
.. //depot/projects/arm/src/tools/tools/nxge/xge_log.c#1 branch
.. //depot/projects/arm/src/tools/tools/nxge/xge_log.h#1 branch
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles#3 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/default/tinybsd.basefiles#3 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles#3 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles#3 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles#3 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles#3 integrate
.. //depot/projects/arm/src/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles#3 integrate
.. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.freebsd#15 integrate
.. //depot/projects/arm/src/usr.bin/netstat/Makefile#4 integrate
.. //depot/projects/arm/src/usr.bin/netstat/ipsec.c#4 integrate
.. //depot/projects/arm/src/usr.bin/netstat/main.c#4 integrate
.. //depot/projects/arm/src/usr.bin/netstat/netstat.h#4 integrate
.. //depot/projects/arm/src/usr.bin/netstat/pfkey.c#4 integrate
.. //depot/projects/arm/src/usr.bin/telnet/Makefile#4 integrate
.. //depot/projects/arm/src/usr.bin/truss/amd64-fbsd.c#3 integrate
.. //depot/projects/arm/src/usr.bin/truss/i386-fbsd.c#4 integrate
.. //depot/projects/arm/src/usr.bin/truss/i386-linux.c#3 integrate
.. //depot/projects/arm/src/usr.bin/truss/ia64-fbsd.c#3 integrate
.. //depot/projects/arm/src/usr.bin/truss/main.c#3 integrate
.. //depot/projects/arm/src/usr.bin/truss/powerpc-fbsd.c#3 integrate
.. //depot/projects/arm/src/usr.bin/truss/setup.c#3 integrate
.. //depot/projects/arm/src/usr.bin/truss/sparc64-fbsd.c#3 integrate
.. //depot/projects/arm/src/usr.bin/usbhidaction/usbhidaction.1#2 integrate
.. //depot/projects/arm/src/usr.bin/usbhidaction/usbhidaction.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/Makefile#12 integrate
.. //depot/projects/arm/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/ftp-proxy/Makefile#1 branch
.. //depot/projects/arm/src/usr.sbin/ftp-proxy/Makefile.inc#1 branch
.. //depot/projects/arm/src/usr.sbin/ftp-proxy/ftp-proxy/Makefile#1 branch
.. //depot/projects/arm/src/usr.sbin/ftp-proxy/libevent/Makefile#1 branch
.. //depot/projects/arm/src/usr.sbin/inetd/Makefile#4 integrate
.. //depot/projects/arm/src/usr.sbin/inetd/inetd.c#4 integrate
.. //depot/projects/arm/src/usr.sbin/periodic/periodic.8#2 integrate
.. //depot/projects/arm/src/usr.sbin/periodic/periodic.sh#2 integrate
.. //depot/projects/arm/src/usr.sbin/portsnap/phttpget/phttpget.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/rrenumd/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/rrenumd/rrenumd.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/dist.c#5 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/dist.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/help/distributions.hlp#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/help/fixit.hlp#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/help/media.hlp#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/help/network_device.hlp#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/help/options.hlp#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/help/securelevel.hlp#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/help/shortcuts.hlp#2 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/index.c#8 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/install.c#5 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/menus.c#5 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/sysinstall.8#3 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/sysinstall.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/sysinstall/system.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/traceroute6/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/traceroute6/traceroute6.c#4 integrate
.. //depot/projects/arm/src/usr.sbin/wicontrol/Makefile#2 delete
.. //depot/projects/arm/src/usr.sbin/wicontrol/wicontrol.8#3 delete
.. //depot/projects/arm/src/usr.sbin/wicontrol/wicontrol.c#3 delete
Differences ...
==== //depot/projects/arm/src/ObsoleteFiles.inc#23 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.102 2007/07/03 13:06:45 mlaier Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,36 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20070703: pf 4.1 import
+OLD_FILES+=usr/libexec/ftp-proxy
+# 20070701: KAME IPSec removal
+OLD_FILES+=usr/include/netinet6/ah.h
+OLD_FILES+=usr/include/netinet6/ah6.h
+OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h
+OLD_FILES+=usr/include/netinet6/esp.h
+OLD_FILES+=usr/include/netinet6/esp6.h
+OLD_FILES+=usr/include/netinet6/esp_aesctr.h
+OLD_FILES+=usr/include/netinet6/esp_camellia.h
+OLD_FILES+=usr/include/netinet6/esp_rijndael.h
+OLD_FILES+=usr/include/netinet6/ipsec.h
+OLD_FILES+=usr/include/netinet6/ipsec6.h
+OLD_FILES+=usr/include/netinet6/ipcomp.h
+OLD_FILES+=usr/include/netinet6/ipcomp6.h
+OLD_FILES+=usr/include/netkey/key.h
+OLD_FILES+=usr/include/netkey/key_debug.h
+OLD_FILES+=usr/include/netkey/key_var.h
+OLD_FILES+=usr/include/netkey/keydb.h
+OLD_FILES+=usr/include/netkey/keysock.h
+OLD_DIRS+=usr/include/netkey
+# 20070701: remove wicontrol
+OLD_FILES+=usr/sbin/wicontrol
+OLD_FILES+=usr/share/man/man8/wicontrol.8.gz
+# 20070625: umapfs removal
+OLD_FILES+=rescue/mount_umapfs
+OLD_FILES+=sbin/mount_umapfs
+OLD_FILES+=usr/include/fs/umapfs/umap.h
+OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
+OLD_DIRS+=usr/include/fs/umapfs
# 20070618: shared library version bump
OLD_LIBS+=lib/libalias.so.5
OLD_LIBS+=lib/libbsnmp.so.3
@@ -3583,7 +3613,6 @@
# - usr/share/tmac/mm/locale
# - usr/share/tmac/mm/se_locale
# - var/yp/Makefile
-
# 20070519: GCC 4.2
OLD_LIBS+=usr/lib/libg2c.a
OLD_LIBS+=usr/lib/libg2c.so
==== //depot/projects/arm/src/UPDATING#18 (text+ko) ====
@@ -21,6 +21,26 @@
developers choose to disable these features on build machines
to maximize performance.
+20070702:
+ The packet filter (pf) code has been updated to OpenBSD 4.1 Please
+ note the changed syntax - keep state is now on by default. Also
+ note the fact that ftp-proxy(8) has been changed from bottom up and
+ has been moved from libexec to usr/sbin. Changes in the ALTQ
+ handling also affect users of IPFW's ALTQ capabilities.
+
+20070701:
+ Remove KAME IPsec in favor of FAST_IPSEC, which is now the
+ only IPsec supported by FreeBSD. The new IPsec stack
+ supports both IPv4 and IPv6. The kernel option will change
+ after the code changes have settled in. For now the kernel
+ option IPSEC is deprecated and FAST_IPSEC is the only option, that
+ will change after some settling time.
+
+20070701:
+ The wicontrol(8) utility has been removed from the base system. wi(4)
+ cards should be configured using ifconfig(8), see the man page for more
+ information.
+
20070612:
By default, /etc/rc.d/sendmail no longer rebuilds the aliases
database if it is missing or older than the aliases file. If
@@ -857,4 +877,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.497 2007/06/12 17:33:56 gshapiro Exp $
+$FreeBSD: src/UPDATING,v 1.500 2007/07/03 13:06:44 mlaier Exp $
==== //depot/projects/arm/src/bin/ed/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.32 2006/03/17 18:54:20 ru Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $
.include <bsd.own.mk>
@@ -7,11 +7,13 @@
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
+.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
CFLAGS+=-DDES
WARNS?= 2
DPADD= ${LIBCRYPTO}
LDADD= -lcrypto
.endif
+.endif
.include <bsd.prog.mk>
==== //depot/projects/arm/src/contrib/ipfilter/tools/ipfstat.c#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6 2007/06/24 16:39:12 darrenr Exp $ */
/*
* Copyright (C) 2002-2006 by Darren Reed.
@@ -1811,7 +1811,7 @@
*port = -1;
} else if (!sscanf(comma + 1, "%d", port) ||
(*port < 0) || (*port > 65535)) {
- fprintf(stderr, "Invalid port specfication in %s\n",
+ fprintf(stderr, "Invalid port specification in %s\n",
argument);
free(s);
exit(-2);
@@ -1823,6 +1823,7 @@
/* get ip address */
if (!strcasecmp(s, "any")) {
ip->in4.s_addr = INADDR_ANY;
+ ok = 1;
#ifdef USE_INET6
ip->in6 = in6addr_any;
} else if (use_inet6 && inet_pton(AF_INET6, s, &ip->in6)) {
==== //depot/projects/arm/src/contrib/less/main.c#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */
+/* $FreeBSD: src/contrib/less/main.c,v 1.9 2007/06/23 15:28:00 delphij Exp $ */
/*
* Copyright (C) 1984-2007 Mark Nudelman
*
@@ -59,6 +59,7 @@
extern int missing_cap;
extern int know_dumb;
extern int quit_if_one_screen;
+extern int no_init;
extern int pr_type;
@@ -165,7 +166,7 @@
}
if (less_is_more && get_quit_at_eof())
- quit_if_one_screen = TRUE;
+ no_init = quit_if_one_screen = TRUE;
#if EDITOR
editor = lgetenv("VISUAL");
==== //depot/projects/arm/src/contrib/less/screen.c#5 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */
+/* $FreeBSD: src/contrib/less/screen.c,v 1.8 2007/06/23 15:28:00 delphij Exp $ */
/*
* Copyright (C) 1984-2007 Mark Nudelman
*
@@ -228,8 +228,6 @@
extern int no_back_scroll;
extern int swindow;
extern int no_init;
-extern int quit_at_eof;
-extern int less_is_more;
extern int no_keypad;
extern int sigs;
extern int wscroll;
@@ -1211,19 +1209,11 @@
if (sc_e_keypad == NULL)
sc_e_keypad = "";
- /*
- * This loses for terminals with termcap entries with ti/te strings
- * that switch to/from an alternate screen, and we're in quit_at_eof
- * (eg, more(1)).
- */
- if (!quit_at_eof && !less_is_more) {
- sc_init = ltgetstr("ti", &sp);
- sc_deinit = ltgetstr("te", &sp);
- }
-
+ sc_init = ltgetstr("ti", &sp);
if (sc_init == NULL)
sc_init = "";
+ sc_deinit= ltgetstr("te", &sp);
if (sc_deinit == NULL)
sc_deinit = "";
==== //depot/projects/arm/src/contrib/netcat/netcat.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/netcat/netcat.c,v 1.5 2007/03/28 01:57:03 delphij Exp $
+ * $FreeBSD: src/contrib/netcat/netcat.c,v 1.6 2007/07/01 12:08:04 gnn Exp $
*/
/*
@@ -42,7 +42,7 @@
#include <netinet/in.h>
#include <netinet/in_systm.h>
#ifdef IPSEC
-#include <netinet6/ipsec.h>
+#include <netipsec/ipsec.h>
#endif
#include <netinet/tcp.h>
#include <netinet/ip.h>
==== //depot/projects/arm/src/contrib/pf/authpf/authpf.8#2 (text+ko) ====
@@ -1,29 +1,19 @@
-.\" $FreeBSD: src/contrib/pf/authpf/authpf.8,v 1.2 2006/03/28 15:26:16 mlaier Exp $
-.\" $OpenBSD: authpf.8,v 1.38 2005/01/04 09:57:04 jmc Exp $
+.\" $FreeBSD: src/contrib/pf/authpf/authpf.8,v 1.3 2007/07/03 12:30:00 mlaier Exp $
+.\" $OpenBSD: authpf.8,v 1.43 2007/02/24 17:21:04 beck Exp $
.\"
-.\" Copyright (c) 2002 Bob Beck (beck at openbsd.org>. All rights reserved.
+.\" Copyright (c) 1998-2007 Bob Beck (beck at openbsd.org>. All rights reserved.
.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\" derived from this software without specific prior written permission.
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd March 28, 2006
.Dt AUTHPF 8
@@ -230,8 +220,11 @@
hijack the session.
Note that TCP keepalives are not sufficient for
this, since they are not secure.
-Also note that
+Also note that the various SSH tunnelling mechanisms,
+such as
.Ar AllowTcpForwarding
+and
+.Ar PermitTunnel ,
should be disabled for
.Nm
users to prevent them from circumventing restrictions imposed by the
@@ -429,8 +422,7 @@
external_if = "xl0"
internal_if = "fxp0"
-pass in log quick on $internal_if proto tcp from $user_ip to any \e
- keep state
+pass in log quick on $internal_if proto tcp from $user_ip to any
pass in quick on $internal_if from $user_ip to any
.Ed
.Pp
@@ -445,16 +437,15 @@
# rdr ftp for proxying by ftp-proxy(8)
rdr on $internal_if proto tcp from $user_ip to any port 21 \e
- -> 127.0.0.1 port 8081
+ -> 127.0.0.1 port 8021
# allow out ftp, ssh, www and https only, and allow user to negotiate
# ipsec with the ipsec server.
pass in log quick on $internal_if proto tcp from $user_ip to any \e
- port { 21, 22, 80, 443 } flags S/SA
+ port { 21, 22, 80, 443 }
pass in quick on $internal_if proto tcp from $user_ip to any \e
port { 21, 22, 80, 443 }
-pass in quick proto udp from $user_ip to $ipsec_gw port = isakmp \e
- keep state
+pass in quick proto udp from $user_ip to $ipsec_gw port = isakmp
pass in quick proto esp from $user_ip to $ipsec_gw
.Ed
.Pp
@@ -469,7 +460,7 @@
# nat and tag connections...
nat on $ext_if from $user_ip to any tag $user_ip -> $ext_addr
pass in quick on $int_if from $user_ip to any
-pass out log quick on $ext_if tagged $user_ip keep state
+pass out log quick on $ext_if tagged $user_ip
.Ed
.Pp
With the above rules added by
@@ -495,7 +486,7 @@
.Bd -literal
table <authpf_users> persist
pass in on $ext_if proto tcp from <authpf_users> \e
- to port { smtp imap } keep state
+ to port { smtp imap }
.Ed
.Pp
It is also possible to use the "authpf_users"
@@ -522,6 +513,7 @@
.Xr pf 4 ,
.Xr pf.conf 5 ,
.Xr fdescfs 5 ,
+.Xr securelevel 7 ,
.Xr ftp-proxy 8
.Sh HISTORY
The
==== //depot/projects/arm/src/contrib/pf/authpf/authpf.c#2 (text+ko) ====
@@ -1,32 +1,23 @@
-/* $OpenBSD: authpf.c,v 1.89 2005/02/10 04:24:15 joel Exp $ */
+/* $OpenBSD: authpf.c,v 1.104 2007/02/24 17:35:08 beck Exp $ */
/*
- * Copyright (C) 1998 - 2002 Bob Beck (beck at openbsd.org).
+ * Copyright (C) 1998 - 2007 Bob Beck (beck at openbsd.org).
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.7 2005/12/25 22:57:08 mlaier Exp $");
+__FBSDID("$FreeBSD: src/contrib/pf/authpf/authpf.c,v 1.8 2007/07/03 12:30:01 mlaier Exp $");
#include <sys/param.h>
#include <sys/file.h>
@@ -56,15 +47,13 @@
#include "pathnames.h"
-extern int symset(const char *, const char *, int);
-
static int read_config(FILE *);
static void print_message(char *);
static int allowed_luser(char *);
static int check_luser(char *, char *);
static int remove_stale_rulesets(void);
static int change_filter(int, const char *, const char *);
-static int change_table(int, const char *, const char *);
+static int change_table(int, const char *);
static void authpf_kill_states(void);
int dev; /* pf device */
@@ -73,7 +62,6 @@
char tablename[PF_TABLE_NAME_SIZE] = "authpf_users";
FILE *pidfp;
-char *infile; /* file name printed by yyerror() in parse.y */
char luser[MAXLOGNAME]; /* username */
char ipsrc[256]; /* ip as a string */
char pidfile[MAXPATHLEN]; /* we save pid in this file. */
@@ -102,11 +90,16 @@
struct in6_addr ina;
struct passwd *pw;
char *cp;
+ gid_t gid;
uid_t uid;
char *shell;
login_cap_t *lc;
config = fopen(PATH_CONFFILE, "r");
+ if (config == NULL) {
+ syslog(LOG_ERR, "can not open %s (%m)", PATH_CONFFILE);
+ exit(1);
+ }
if ((cp = getenv("SSH_TTY")) == NULL) {
syslog(LOG_ERR, "non-interactive session connection for authpf");
@@ -143,7 +136,6 @@
uid = getuid();
pw = getpwuid(uid);
- endpwent();
if (pw == NULL) {
syslog(LOG_ERR, "cannot find user for uid %u", uid);
goto die;
@@ -256,6 +248,8 @@
if (++lockcnt > 10) {
syslog(LOG_ERR, "cannot kill previous authpf (pid %d)",
otherpid);
+ fclose(pidfp);
+ pidfp = NULL;
goto dogdeath;
}
sleep(1);
@@ -265,12 +259,22 @@
* it's lock, giving us a chance to get it now
*/
fclose(pidfp);
+ pidfp = NULL;
} while (1);
+
+ /* whack the group list */
+ gid = getegid();
+ if (setgroups(1, &gid) == -1) {
+ syslog(LOG_INFO, "setgroups: %s", strerror(errno));
+ do_death(0);
+ }
/* revoke privs */
- seteuid(getuid());
- setuid(getuid());
-
+ uid = getuid();
+ if (setresuid(uid, uid, uid) == -1) {
+ syslog(LOG_INFO, "setresuid: %s", strerror(errno));
+ do_death(0);
+ }
openlog("authpf", LOG_PID | LOG_NDELAY, LOG_DAEMON);
if (!check_luser(PATH_BAN_DIR, luser) || !allowed_luser(luser)) {
@@ -278,8 +282,8 @@
do_death(0);
}
- if (config == NULL || read_config(config)) {
- syslog(LOG_INFO, "bad or nonexistent %s", PATH_CONFFILE);
+ if (read_config(config)) {
+ syslog(LOG_ERR, "invalid config file %s", PATH_CONFFILE);
do_death(0);
}
@@ -298,7 +302,7 @@
printf("Unable to modify filters\r\n");
do_death(0);
}
- if (change_table(1, luser, ipsrc) == -1) {
+ if (change_table(1, ipsrc) == -1) {
printf("Unable to modify table\r\n");
change_filter(0, luser, ipsrc);
do_death(0);
@@ -309,7 +313,7 @@
signal(SIGALRM, need_death);
signal(SIGPIPE, need_death);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list