Date: Mon, 11 Jul 2005 21:13:48 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 80026 for review Message-ID: <200507112113.j6BLDmv0086870@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=80026 Change 80026 by peter@peter_daintree on 2005/07/11 21:13:20 IFC @80022 Affected files ... .. //depot/projects/hammer/Makefile.inc1#96 integrate .. //depot/projects/hammer/UPDATING#81 integrate .. //depot/projects/hammer/bin/sh/expand.c#10 integrate .. //depot/projects/hammer/contrib/binutils/opcodes/sparc-opc.c#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/hammer/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/hammer/contrib/libpcap/FILES#4 integrate .. //depot/projects/hammer/contrib/libpcap/INSTALL.txt#4 integrate .. //depot/projects/hammer/contrib/libpcap/README.septel#1 branch .. //depot/projects/hammer/contrib/libpcap/VERSION#5 integrate .. //depot/projects/hammer/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/hammer/contrib/libpcap/configure#4 integrate .. //depot/projects/hammer/contrib/libpcap/configure.in#4 integrate .. //depot/projects/hammer/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/fad-gifc.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/fad-glifc.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.c#6 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/hammer/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/hammer/contrib/libpcap/inet.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/nametoaddr.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-namedb.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-nit.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-pf.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-septel.c#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-septel.h#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-snit.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-snoop.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.3#6 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.h#5 integrate .. //depot/projects/hammer/contrib/libpcap/rawss7.h#2 delete .. //depot/projects/hammer/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/scanner.l#5 integrate .. //depot/projects/hammer/contrib/tcpdump/CHANGES#5 integrate .. //depot/projects/hammer/contrib/tcpdump/CREDITS#5 integrate .. //depot/projects/hammer/contrib/tcpdump/FILES#5 integrate .. //depot/projects/hammer/contrib/tcpdump/INSTALL#5 integrate .. //depot/projects/hammer/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/tcpdump/VERSION#5 integrate .. //depot/projects/hammer/contrib/tcpdump/acconfig.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/addrtoname.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/atm.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/config.h.in#5 integrate .. //depot/projects/hammer/contrib/tcpdump/configure#5 integrate .. //depot/projects/hammer/contrib/tcpdump/configure.in#5 integrate .. //depot/projects/hammer/contrib/tcpdump/gmpls.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/gmpls.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/interface.h#5 integrate .. //depot/projects/hammer/contrib/tcpdump/ip6.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/llc.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/oui.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/oui.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/pcap-missing.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/pcap_dump_ftell.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/pmap_prot.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atm.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bfd.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bgp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bootp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-chdlc.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cnfp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-decnet.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-domain.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-eigrp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-esp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ether.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fr.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-frag6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-hsrp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp6.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-igrp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6opts.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipx.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-llc.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mobility.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mpls.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-nfs.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ntp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-null.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ospf.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pgm.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-pim.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ppp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pppoe.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rsvp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rt6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sctp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sll.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-smb.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-snmp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-stp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sunrpc.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-vrrp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-zephyr.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/rpc_auth.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/rpc_msg.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/smbutil.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/util.c#5 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/su.c#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#20 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#22 integrate .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#16 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#9 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#6 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/pam_krb5.c#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#9 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.c#3 integrate .. //depot/projects/hammer/lib/libz/inftrees.c#4 integrate .. //depot/projects/hammer/release/Makefile#74 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#102 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#15 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#12 integrate .. //depot/projects/hammer/sbin/devd/devd.h#5 integrate .. //depot/projects/hammer/sbin/devd/devd.hh#3 integrate .. //depot/projects/hammer/sbin/devd/parse.y#5 integrate .. //depot/projects/hammer/sbin/devd/token.l#5 integrate .. //depot/projects/hammer/sbin/ggate/Makefile#2 integrate .. //depot/projects/hammer/sbin/ggate/ggatec/Makefile#4 integrate .. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.c#3 integrate .. //depot/projects/hammer/sbin/ggate/ggated/Makefile#3 integrate .. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#4 integrate .. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.c#4 integrate .. //depot/projects/hammer/sbin/ggate/shared/ggate.c#4 integrate .. //depot/projects/hammer/sbin/ggate/shared/ggate.h#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#25 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#12 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#39 integrate .. //depot/projects/hammer/share/man/man4/altq.4#9 integrate .. //depot/projects/hammer/share/man/man4/ed.4#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#12 integrate .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#9 integrate .. //depot/projects/hammer/share/man/man4/sn.4#4 integrate .. //depot/projects/hammer/share/man/man4/wi.4#21 integrate .. //depot/projects/hammer/share/man/man4/xe.4#7 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#37 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/alpha/include/atomic.h#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#75 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#15 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#44 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#30 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#29 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#27 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#27 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#27 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#31 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#30 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#32 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ipc.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#20 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_socket.c#7 integrate .. //depot/projects/hammer/sys/conf/files#116 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#16 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#33 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/hammer/sys/dev/auxio/auxio.c#4 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#18 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#19 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#25 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#24 integrate .. //depot/projects/hammer/sys/dev/em/README#9 integrate .. //depot/projects/hammer/sys/dev/fb/creator.c#8 integrate .. //depot/projects/hammer/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#6 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/fc_log.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_init.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_raid.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.c#13 delete .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.h#7 delete .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_reg.h#1 branch .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#35 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#5 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#19 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/sn/if_snvar.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#61 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#27 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#16 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#13 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#29 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#12 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.h#3 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#10 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#46 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#14 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#8 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#27 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#29 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#28 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#25 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#44 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#44 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#50 integrate .. //depot/projects/hammer/sys/modules/Makefile#82 integrate .. //depot/projects/hammer/sys/modules/mpt/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/Makefile#3 integrate .. //depot/projects/hammer/sys/net/bpf.h#13 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#2 integrate .. //depot/projects/hammer/sys/net/bsd_comp.c#6 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#5 integrate .. //depot/projects/hammer/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/hammer/sys/netatalk/ddp_output.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#47 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#54 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#33 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#31 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#16 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#25 integrate .. //depot/projects/hammer/sys/security/mac/mac_net.c#12 integrate .. //depot/projects/hammer/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#34 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#23 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#33 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#16 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#34 integrate .. //depot/projects/hammer/sys/sparc64/creator/creator.h#5 integrate .. //depot/projects/hammer/sys/sparc64/creator/creator_upa.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/sys/mac.h#26 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#28 integrate .. //depot/projects/hammer/sys/sys/param.h#63 integrate .. //depot/projects/hammer/sys/sys/pmc.h#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#83 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#29 integrate .. //depot/projects/hammer/sys/sys/syscall.h#43 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#43 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#22 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#43 integrate .. //depot/projects/hammer/sys/sys/uio.h#12 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#37 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#11 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#5 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/tcpip.c#6 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#10 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/config.h#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#96 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.498 2005/06/16 18:16:12 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.499 2005/07/07 00:58:41 kan Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -472,7 +472,7 @@ @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} sh || true -TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything} +TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} ==== //depot/projects/hammer/UPDATING#81 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW: - FreeBSD 6.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: + FreeBSD 7.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -21,6 +21,9 @@ developers choose to disable these features on build machines to maximize performance. +20050711: + RELENG_6 branched here. + 20050629: The pccard_ifconfig rc.conf variable has been removed and a new variable, ifconfig_DEFAULT has been introduced. Unlike @@ -397,4 +400,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.416 2005/07/01 15:12:09 des Exp $ +$FreeBSD: src/UPDATING,v 1.417 2005/07/11 15:46:45 kensmith Exp $ ==== //depot/projects/hammer/bin/sh/expand.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.46 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.47 2005/07/07 18:10:33 delphij Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -1162,7 +1162,7 @@ if (*p == '\0') break; } - if (metaflag == 0 || stat(expdir, &statb) >= 0) + if (metaflag == 0 || lstat(expdir, &statb) >= 0) addfname(expdir); return; } ==== //depot/projects/hammer/contrib/binutils/opcodes/sparc-opc.c#4 (text+ko) ==== @@ -1273,110 +1273,72 @@ #define FM_DF 2 /* v9 */ #define FM_QF 3 /* v9 */ -#define fmovicc(opcode, fpsize, cond, flags) /* v9 */ \ -{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z,f,g", flags, v9 } +#define fmoviccx(opcode, fpsize, args, cond, flags) /* v9 */ \ +{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z," args, flags, v9 } -#define fmovfcc(opcode, fpsize, fcond, flags) /* v9 */ \ -{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9,f,g", flags, v9 } +#define fmovfccx(opcode, fpsize, args, fcond, flags) /* v9 */ \ +{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9," args, flags, v9 } /* FIXME: use fmovicc/fmovfcc? */ /* v9 */ -#define fmovcc(opcode, fpsize, cond, fcond, flags) /* v9 */ \ -{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9,f,g", flags | F_FLOAT, v9 } +#define fmovccx(opcode, fpsize, args, cond, fcond, flags) /* v9 */ \ +{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9," args, flags | F_FLOAT, v9 } + +#define fmovicc(suffix, cond, flags) /* v9 */ \ +fmoviccx("fmovd" suffix, FM_DF, "B,H", cond, flags), \ +fmoviccx("fmovq" suffix, FM_QF, "R,J", cond, flags), \ +fmoviccx("fmovs" suffix, FM_SF, "f,g", cond, flags) + +#define fmovfcc(suffix, fcond, flags) /* v9 */ \ +fmovfccx("fmovd" suffix, FM_DF, "B,H", fcond, flags), \ +fmovfccx("fmovq" suffix, FM_QF, "R,J", fcond, flags), \ +fmovfccx("fmovs" suffix, FM_SF, "f,g", fcond, flags) + +#define fmovcc(suffix, cond, fcond, flags) /* v9 */ \ +fmovccx("fmovd" suffix, FM_DF, "B,H", cond, fcond, flags), \ +fmovccx("fmovq" suffix, FM_QF, "R,J", cond, fcond, flags), \ +fmovccx("fmovs" suffix, FM_SF, "f,g", cond, fcond, flags) -/* v9 */ fmovcc ("fmovda", FM_DF, CONDA, FCONDA, 0), -/* v9 */ fmovcc ("fmovqa", FM_QF, CONDA, FCONDA, 0), -/* v9 */ fmovcc ("fmovsa", FM_SF, CONDA, FCONDA, 0), -/* v9 */ fmovicc ("fmovdcc", FM_DF, CONDCC, 0), -/* v9 */ fmovicc ("fmovqcc", FM_QF, CONDCC, 0), -/* v9 */ fmovicc ("fmovscc", FM_SF, CONDCC, 0), -/* v9 */ fmovicc ("fmovdcs", FM_DF, CONDCS, 0), -/* v9 */ fmovicc ("fmovqcs", FM_QF, CONDCS, 0), -/* v9 */ fmovicc ("fmovscs", FM_SF, CONDCS, 0), -/* v9 */ fmovcc ("fmovde", FM_DF, CONDE, FCONDE, 0), -/* v9 */ fmovcc ("fmovqe", FM_QF, CONDE, FCONDE, 0), -/* v9 */ fmovcc ("fmovse", FM_SF, CONDE, FCONDE, 0), -/* v9 */ fmovcc ("fmovdg", FM_DF, CONDG, FCONDG, 0), -/* v9 */ fmovcc ("fmovqg", FM_QF, CONDG, FCONDG, 0), -/* v9 */ fmovcc ("fmovsg", FM_SF, CONDG, FCONDG, 0), -/* v9 */ fmovcc ("fmovdge", FM_DF, CONDGE, FCONDGE, 0), -/* v9 */ fmovcc ("fmovqge", FM_QF, CONDGE, FCONDGE, 0), -/* v9 */ fmovcc ("fmovsge", FM_SF, CONDGE, FCONDGE, 0), -/* v9 */ fmovicc ("fmovdgeu", FM_DF, CONDGEU, F_ALIAS), -/* v9 */ fmovicc ("fmovqgeu", FM_QF, CONDGEU, F_ALIAS), -/* v9 */ fmovicc ("fmovsgeu", FM_SF, CONDGEU, F_ALIAS), -/* v9 */ fmovicc ("fmovdgu", FM_DF, CONDGU, 0), -/* v9 */ fmovicc ("fmovqgu", FM_QF, CONDGU, 0), -/* v9 */ fmovicc ("fmovsgu", FM_SF, CONDGU, 0), -/* v9 */ fmovcc ("fmovdl", FM_DF, CONDL, FCONDL, 0), -/* v9 */ fmovcc ("fmovql", FM_QF, CONDL, FCONDL, 0), -/* v9 */ fmovcc ("fmovsl", FM_SF, CONDL, FCONDL, 0), -/* v9 */ fmovcc ("fmovdle", FM_DF, CONDLE, FCONDLE, 0), -/* v9 */ fmovcc ("fmovqle", FM_QF, CONDLE, FCONDLE, 0), -/* v9 */ fmovcc ("fmovsle", FM_SF, CONDLE, FCONDLE, 0), -/* v9 */ fmovicc ("fmovdleu", FM_DF, CONDLEU, 0), -/* v9 */ fmovicc ("fmovqleu", FM_QF, CONDLEU, 0), -/* v9 */ fmovicc ("fmovsleu", FM_SF, CONDLEU, 0), -/* v9 */ fmovfcc ("fmovdlg", FM_DF, FCONDLG, 0), -/* v9 */ fmovfcc ("fmovqlg", FM_QF, FCONDLG, 0), -/* v9 */ fmovfcc ("fmovslg", FM_SF, FCONDLG, 0), -/* v9 */ fmovicc ("fmovdlu", FM_DF, CONDLU, F_ALIAS), -/* v9 */ fmovicc ("fmovqlu", FM_QF, CONDLU, F_ALIAS), -/* v9 */ fmovicc ("fmovslu", FM_SF, CONDLU, F_ALIAS), -/* v9 */ fmovcc ("fmovdn", FM_DF, CONDN, FCONDN, 0), -/* v9 */ fmovcc ("fmovqn", FM_QF, CONDN, FCONDN, 0), -/* v9 */ fmovcc ("fmovsn", FM_SF, CONDN, FCONDN, 0), -/* v9 */ fmovcc ("fmovdne", FM_DF, CONDNE, FCONDNE, 0), -/* v9 */ fmovcc ("fmovqne", FM_QF, CONDNE, FCONDNE, 0), -/* v9 */ fmovcc ("fmovsne", FM_SF, CONDNE, FCONDNE, 0), -/* v9 */ fmovicc ("fmovdneg", FM_DF, CONDNEG, 0), -/* v9 */ fmovicc ("fmovqneg", FM_QF, CONDNEG, 0), -/* v9 */ fmovicc ("fmovsneg", FM_SF, CONDNEG, 0), -/* v9 */ fmovcc ("fmovdnz", FM_DF, CONDNZ, FCONDNZ, F_ALIAS), -/* v9 */ fmovcc ("fmovqnz", FM_QF, CONDNZ, FCONDNZ, F_ALIAS), -/* v9 */ fmovcc ("fmovsnz", FM_SF, CONDNZ, FCONDNZ, F_ALIAS), -/* v9 */ fmovfcc ("fmovdo", FM_DF, FCONDO, 0), -/* v9 */ fmovfcc ("fmovqo", FM_QF, FCONDO, 0), -/* v9 */ fmovfcc ("fmovso", FM_SF, FCONDO, 0), -/* v9 */ fmovicc ("fmovdpos", FM_DF, CONDPOS, 0), -/* v9 */ fmovicc ("fmovqpos", FM_QF, CONDPOS, 0), -/* v9 */ fmovicc ("fmovspos", FM_SF, CONDPOS, 0), -/* v9 */ fmovfcc ("fmovdu", FM_DF, FCONDU, 0), -/* v9 */ fmovfcc ("fmovqu", FM_QF, FCONDU, 0), -/* v9 */ fmovfcc ("fmovsu", FM_SF, FCONDU, 0), -/* v9 */ fmovfcc ("fmovdue", FM_DF, FCONDUE, 0), -/* v9 */ fmovfcc ("fmovque", FM_QF, FCONDUE, 0), -/* v9 */ fmovfcc ("fmovsue", FM_SF, FCONDUE, 0), -/* v9 */ fmovfcc ("fmovdug", FM_DF, FCONDUG, 0), -/* v9 */ fmovfcc ("fmovqug", FM_QF, FCONDUG, 0), -/* v9 */ fmovfcc ("fmovsug", FM_SF, FCONDUG, 0), -/* v9 */ fmovfcc ("fmovduge", FM_DF, FCONDUGE, 0), -/* v9 */ fmovfcc ("fmovquge", FM_QF, FCONDUGE, 0), -/* v9 */ fmovfcc ("fmovsuge", FM_SF, FCONDUGE, 0), -/* v9 */ fmovfcc ("fmovdul", FM_DF, FCONDUL, 0), -/* v9 */ fmovfcc ("fmovqul", FM_QF, FCONDUL, 0), -/* v9 */ fmovfcc ("fmovsul", FM_SF, FCONDUL, 0), -/* v9 */ fmovfcc ("fmovdule", FM_DF, FCONDULE, 0), -/* v9 */ fmovfcc ("fmovqule", FM_QF, FCONDULE, 0), -/* v9 */ fmovfcc ("fmovsule", FM_SF, FCONDULE, 0), -/* v9 */ fmovicc ("fmovdvc", FM_DF, CONDVC, 0), -/* v9 */ fmovicc ("fmovqvc", FM_QF, CONDVC, 0), -/* v9 */ fmovicc ("fmovsvc", FM_SF, CONDVC, 0), -/* v9 */ fmovicc ("fmovdvs", FM_DF, CONDVS, 0), -/* v9 */ fmovicc ("fmovqvs", FM_QF, CONDVS, 0), -/* v9 */ fmovicc ("fmovsvs", FM_SF, CONDVS, 0), -/* v9 */ fmovcc ("fmovdz", FM_DF, CONDZ, FCONDZ, F_ALIAS), -/* v9 */ fmovcc ("fmovqz", FM_QF, CONDZ, FCONDZ, F_ALIAS), -/* v9 */ fmovcc ("fmovsz", FM_SF, CONDZ, FCONDZ, F_ALIAS), +/* v9 */ fmovcc ("a", CONDA, FCONDA, 0), +/* v9 */ fmovicc ("cc", CONDCC, 0), +/* v9 */ fmovicc ("cs", CONDCS, 0), +/* v9 */ fmovcc ("e", CONDE, FCONDE, 0), +/* v9 */ fmovcc ("g", CONDG, FCONDG, 0), +/* v9 */ fmovcc ("ge", CONDGE, FCONDGE, 0), +/* v9 */ fmovicc ("geu", CONDGEU, F_ALIAS), +/* v9 */ fmovicc ("gu", CONDGU, 0), +/* v9 */ fmovcc ("l", CONDL, FCONDL, 0), +/* v9 */ fmovcc ("le", CONDLE, FCONDLE, 0), +/* v9 */ fmovicc ("leu", CONDLEU, 0), +/* v9 */ fmovfcc ("lg", FCONDLG, 0), +/* v9 */ fmovicc ("lu", CONDLU, F_ALIAS), +/* v9 */ fmovcc ("n", CONDN, FCONDN, 0), +/* v9 */ fmovcc ("ne", CONDNE, FCONDNE, 0), +/* v9 */ fmovicc ("neg", CONDNEG, 0), +/* v9 */ fmovcc ("nz", CONDNZ, FCONDNZ, F_ALIAS), +/* v9 */ fmovfcc ("o", FCONDO, 0), +/* v9 */ fmovicc ("pos", CONDPOS, 0), +/* v9 */ fmovfcc ("u", FCONDU, 0), +/* v9 */ fmovfcc ("ue", FCONDUE, 0), +/* v9 */ fmovfcc ("ug", FCONDUG, 0), +/* v9 */ fmovfcc ("uge", FCONDUGE, 0), +/* v9 */ fmovfcc ("ul", FCONDUL, 0), +/* v9 */ fmovfcc ("ule", FCONDULE, 0), +/* v9 */ fmovicc ("vc", CONDVC, 0), +/* v9 */ fmovicc ("vs", CONDVS, 0), +/* v9 */ fmovcc ("z", CONDZ, FCONDZ, F_ALIAS), +#undef fmoviccx /* v9 */ +#undef fmovfccx /* v9 */ +#undef fmovccx /* v9 */ #undef fmovicc /* v9 */ #undef fmovfcc /* v9 */ #undef fmovcc /* v9 */ ==== //depot/projects/hammer/contrib/gcc/config/rs6000/freebsd.h#4 (text+ko) ==== @@ -24,6 +24,12 @@ #undef CPP_OS_DEFAULT_SPEC #define CPP_OS_DEFAULT_SPEC "%(cpp_os_freebsd)" +#undef CPP_OS_FREEBSD_SPEC +#define CPP_OS_FREEBSD_SPEC "\ + -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ \ + -Acpu=powerpc -Amachine=powerpc \ + %{fPIC|fpic|fPIE|fpie:-D__PIC__ -D__pic__} " + #undef STARTFILE_DEFAULT_SPEC #define STARTFILE_DEFAULT_SPEC "%(startfile_freebsd)" ==== //depot/projects/hammer/contrib/libpcap/CHANGES#4 (text+ko) ==== @@ -1,4 +1,17 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59 2004/03/30 14:42:50 mcr Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.1 2005/07/05 21:04:27 mcr Exp $ (LBL) + +Tue. July 5, 2005. ken@xelerance.com. Summary for 3.9.x tcpdump + + Fixes for compiling on nearly every platform, + including improved 64bit support + MSDOS Support + Add support for sending packets + OpenBSD pf format support + IrDA capture (Linux only) + +Tue. May 27, 2005. mcr@sandelman.ottawa.on.ca. Summary for 0.9.1 release + + Numerous fixes for Tue. March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release ==== //depot/projects/hammer/contrib/libpcap/CREDITS#4 (text+ko) ==== @@ -33,6 +33,7 @@ Erik de Castro Lopo <erik.de.castro.lopo@sensorynetworks.com> Franz Schaefer <schaefer@mond.at> Gianluca Varenni <varenni@netgroup-serv.polito.it> + Gilbert Hoyek <gil_hoyek@hotmail.com> Gisle Vanem <giva@bgnett.no> Graeme Hewson <ghewson@cix.compulink.co.uk> Greg Stark <gsstark@mit.edu> @@ -58,6 +59,7 @@ Love Hörnquist-Åstrand <lha@stacken.kth.se> Maciej W. Rozycki <macro@ds2.pg.gda.pl> Marcus Felipe Pereira <marcus@task.com.br> + Mark C. Brown <mbrown@hp.com> Mark Pizzolato <List-tcpdump-workers@subscriptions.pizzolato.net> Martin Husemann <martin@netbsd.org> Matthew Luckie <mjl@luckie.org.nz> @@ -67,8 +69,10 @@ Octavian Cerna <tavy@ylabs.com> Olaf Kirch <okir@caldera.de> Onno van der Linden <onno@simplex.nl> + Patrick Marie <mycroft@virgaria.org> Paul Mundt <lethal@linux-sh.org> Pavel Kankovsky <kan@dcit.cz> + Pawel Pokrywka <publicpp@gmail.com> Peter Fales <peter@fales-lorenz.net> Peter Jeremy <peter.jeremy@alcatel.com.au> Phil Wood <cpw@lanl.gov> @@ -81,6 +85,7 @@ Solomon Peachy <pizza@shaftnet.org> Stefan Hudson <hudson@mbay.net> Takashi Yamamoto <yamt@mwd.biglobe.ne.jp> + Tanaka Shin-ya <zstanaka@archer.livedoor.com> Tony Li <tli@procket.com> Torsten Landschoff <torsten@debian.org> Uns Lider <unslider@miranda.org> ==== //depot/projects/hammer/contrib/libpcap/FILES#4 (text+ko) ==== @@ -12,6 +12,7 @@ README.hpux README.linux README.macosx +README.septel README.tru64 README.Win32 SUNOS4/nit_if.o.sparc @@ -87,6 +88,8 @@ pcap-null.c pcap-pf.c pcap-pf.h +pcap-septel.c +pcap-septel.h pcap-stdinc.h pcap-snit.c pcap-snoop.c @@ -96,7 +99,6 @@ pcap.h pf.h ppp.h -rawss7.h savefile.c scanner.l sll.h ==== //depot/projects/hammer/contrib/libpcap/INSTALL.txt#4 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12 2004/12/18 08:52:08 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL) To build libpcap, run "./configure" (a shell script). The configure script will determine your system attributes and generate an @@ -308,6 +308,7 @@ README.hpux - notes on using libpcap on HP-UX README.linux - notes on using libpcap on Linux README.macosx - notes on using libpcap on Mac OS X +README.septel - notes on using libpcap to capture on Intel/Septel devices README.tru64 - notes on using libpcap on Digital/Tru64 UNIX README.Win32 - notes on using libpcap on Win32 systems (with WinPcap) SUNOS4 - pre-SunOS 4.1 replacement kernel nit modules @@ -363,6 +364,8 @@ pcap-null.c - dummy monitor support (allows offline use of libpcap) pcap-pf.c - Ultrix and Digital/Tru64 UNIX Packet Filter support pcap-pf.h - Ultrix and Digital/Tru64 UNIX Packet Filter definitions +pcap-septel.c - INTEL/Septel device capture support +pcap-septel.h - INTEL/Septel device capture support pcap-stdinc.h - includes and #defines for compiling on Win32 systems pcap-snit.c - SunOS 4.x STREAMS-based Network Interface Tap support pcap-snoop.c - IRIX Snoop network monitoring support ==== //depot/projects/hammer/contrib/libpcap/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -0.9-PRE-CVS +0.9.1 ==== //depot/projects/hammer/contrib/libpcap/config.h.in#4 (text+ko) ==== @@ -23,8 +23,8 @@ /* Define to 1 if you have the `ether_hostton' function. */ #undef HAVE_ETHER_HOSTTON -/* on HP-UX 10.20 */ -#undef HAVE_HPUX10_20 +/* on HP-UX 10.20 or later */ +#undef HAVE_HPUX10_20_OR_LATER /* on HP-UX 9.x */ #undef HAVE_HPUX9 @@ -53,6 +53,9 @@ /* define if you have a /proc/net/dev */ #undef HAVE_PROC_NET_DEV +/* define if you have a Septel API */ +#undef HAVE_SEPTEL_API + /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF @@ -83,6 +86,9 @@ /* Define to 1 if you have the `strlcpy' function. */ #undef HAVE_STRLCPY +/* Define to 1 if the system has the type `struct ether_addr'. */ +#undef HAVE_STRUCT_ETHER_ADDR + /* Define to 1 if you have the <sys/bufmod.h> header file. */ #undef HAVE_SYS_BUFMOD_H ==== //depot/projects/hammer/contrib/libpcap/configure#4 (text+ko) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.120 . +# From configure.in Revision: 1.120.2.6 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -855,9 +855,10 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-gcc don't use gcc --with-pcap=TYPE use packet capture TYPE - --with-dag[=DIR] include Endace DAG support ("yes", "no" or DIR; default="yes" on BSD and Linux if present) + --with-dag[=DIR] include Endace DAG support ("yes", "no" or DIR; default="yes" on BSD and Linux if present) --with-dag-includes=DIR Endace DAG include directory --with-dag-libraries=DIR Endace DAG library directory + --with-septel[=DIR] include Septel support (located in directory DIR, if supplied). default=yes, on Linux, if present --without-flex don't use flex --without-bison don't use bison @@ -2633,10 +2634,6 @@ #include <stdlib.h> -int -main () -{ - static void foo(void) __attribute__ ((noreturn)); static void @@ -2645,9 +2642,12 @@ exit(1); } - ; - return 0; +int +main(int argc, char **argv) +{ + foo(); } + _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -4416,6 +4416,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> +#include <arpa/inet.h> struct mbuf; struct rtentry; #include <net/if.h> @@ -4458,26 +4459,14 @@ echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6 if test $ac_cv_have_decl_ether_hostton = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF #define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON _ACEOF -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 0 -_ACEOF - - fi - fi # # Did that succeed? @@ -4688,27 +4677,101 @@ echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6 if test $ac_cv_have_decl_ether_hostton = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 1 + +cat >>confdefs.h <<\_ACEOF +#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON _ACEOF +fi -cat >>confdefs.h <<\_ACEOF -#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON + fi + fi + # + # Is ether_hostton() declared? + # + if test "$ac_cv_have_decl_ether_hostton" != yes; then + # + # No, we'll have to declare it ourselves. + # Do we have "struct ether_addr"? + # + echo "$as_me:$LINENO: checking for struct ether_addr" >&5 +echo $ECHO_N "checking for struct ether_addr... $ECHO_C" >&6 +if test "${ac_cv_type_struct_ether_addr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> +struct mbuf; +struct rtentry; +#include <net/if.h> +#include <netinet/if_ether.h> + +int +main () +{ +if ((struct ether_addr *) 0) + return 0; +if (sizeof (struct ether_addr)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_struct_ether_addr=yes else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 0 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_struct_ether_addr=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_struct_ether_addr" >&5 +echo "${ECHO_T}$ac_cv_type_struct_ether_addr" >&6 +if test $ac_cv_type_struct_ether_addr = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_ETHER_ADDR 1 _ACEOF fi - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_DECL_ETHER_HOSTTON 0 +_ACEOF + + else + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DECL_ETHER_HOSTTON 1 +_ACEOF + fi fi @@ -5433,6 +5496,10 @@ V_DEFS="$V_DEFS -DDAG_ONLY" ;; +septel) + V_DEFS="$V_DEFS -DSEPTEL_ONLY" + ;; + null) { echo "$as_me:$LINENO: WARNING: cannot determine packet capture interface" >&5 echo "$as_me: WARNING: cannot determine packet capture interface" >&2;} @@ -5513,8 +5580,8 @@ case "$V_PCAP" in linux|bpf|dag) # - # We support the DAG API on Linux or BSD, or if we're building a - # DAG-only libpcap. + # We support the DAG API if we're on Linux or BSD, or if we're + # building a DAG-only libpcap. # ;; *) @@ -5540,7 +5607,7 @@ echo "$as_me:$LINENO: checking whether we have DAG API headers" >&5 echo $ECHO_N "checking whether we have DAG API headers... $ECHO_C" >&6 - # If necessary, set default paths for DAG API headers and libraries. + # If necessary, set default paths for DAG API headers and libraries. if test -z "$dag_root"; then dag_root=/usr/local fi @@ -5560,7 +5627,7 @@ if test -r $dag_include_dir/dagapi.h; then ac_cv_lbl_dag_api=yes fi - echo "$as_me:$LINENO: result: $ac_cv_lbl_dag_api ($dag_include_dir)" >&5 + echo "$as_me:$LINENO: result: $ac_cv_lbl_dag_api ($dag_include_dir)" >&5 echo "${ECHO_T}$ac_cv_lbl_dag_api ($dag_include_dir)" >&6 fi @@ -5570,32 +5637,27 @@ echo $ECHO_N "checking dagapi.o... $ECHO_C" >&6 dagapi_obj=no if test -r $dag_tools_dir/dagapi.o; then - - # 2.4.x. + # 2.4.x. dagapi_obj=$dag_tools_dir/dagapi.o - elif test -r $dag_lib_dir/dagapi.o; then - - # 2.5.x. - dagapi_obj=$dag_lib_dir/dagapi.o - - elif test -r $dag_lib_dir/libdag.a; then - - # 2.5.x. + # 2.5.x. + dagapi_obj=$dag_lib_dir/dagapi.o + elif test -r $dag_lib_dir/libdag.a; then + # 2.5.x. ar x $dag_lib_dir/libdag.a dagapi.o if test -r ./dagapi.o; then dagapi_obj=./dagapi.o fi - fi >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507112113.j6BLDmv0086870>