Date: Wed, 26 Aug 2009 21:17:24 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 167863 for review Message-ID: <200908262117.n7QLHOER014240@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=167863 Change 167863 by peter@peter_melody on 2009/08/26 21:16:33 IFC @167861 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#70 integrate .. //depot/projects/hammer/UPDATING#135 integrate .. //depot/projects/hammer/bin/sh/eval.c#21 integrate .. //depot/projects/hammer/bin/sh/exec.c#13 integrate .. //depot/projects/hammer/bin/sh/exec.h#6 integrate .. //depot/projects/hammer/bin/sh/mknodes.c#5 integrate .. //depot/projects/hammer/bin/sh/nodes.c.pat#5 integrate .. //depot/projects/hammer/contrib/traceroute/as.c#2 integrate .. //depot/projects/hammer/contrib/traceroute/as.h#2 integrate .. //depot/projects/hammer/contrib/traceroute/traceroute.c#11 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pqueue/pqueue.c#2 integrate .. //depot/projects/hammer/crypto/openssl/crypto/pqueue/pqueue.h#2 integrate .. //depot/projects/hammer/crypto/openssl/ssl/d1_both.c#4 integrate .. //depot/projects/hammer/crypto/openssl/ssl/d1_pkt.c#4 integrate .. //depot/projects/hammer/etc/defaults/periodic.conf#24 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#98 integrate .. //depot/projects/hammer/etc/freebsd-update.conf#7 integrate .. //depot/projects/hammer/etc/network.subr#30 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#68 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#14 integrate .. //depot/projects/hammer/etc/rc.d/static_arp#1 branch .. //depot/projects/hammer/etc/rc.d/wpa_supplicant#5 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#35 integrate .. //depot/projects/hammer/gnu/usr.bin/patch/pch.c#3 integrate .. //depot/projects/hammer/lib/libc/db/hash/hash.c#7 integrate .. //depot/projects/hammer/lib/libc/stdlib/ptsname.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#20 integrate .. //depot/projects/hammer/lib/libpmc/pmc.atom.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.core.3#4 integrate .. //depot/projects/hammer/lib/libpmc/pmc.core2.3#4 integrate .. //depot/projects/hammer/lib/libpmc/pmc.iaf.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.k7.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.k8.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.p4.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.p5.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc.p6.3#3 integrate .. //depot/projects/hammer/lib/libpmc/pmc_capabilities.3#4 integrate .. //depot/projects/hammer/lib/libpmc/pmc_read.3#2 integrate .. //depot/projects/hammer/release/Makefile#107 integrate .. //depot/projects/hammer/release/scripts/lib32-make.sh#2 integrate .. //depot/projects/hammer/release/scripts/mm-mtree.sh#1 branch .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#14 integrate .. //depot/projects/hammer/sbin/route/route.c#19 integrate .. //depot/projects/hammer/sbin/savecore/savecore.c#18 integrate .. //depot/projects/hammer/share/examples/cvsup/stable-supfile#9 integrate .. //depot/projects/hammer/share/man/man5/freebsd-update.conf.5#4 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#98 integrate .. //depot/projects/hammer/share/man/man5/tmpfs.5#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#96 integrate .. //depot/projects/hammer/share/man/man9/kproc.9#4 integrate .. //depot/projects/hammer/share/man/man9/kthread.9#10 integrate .. //depot/projects/hammer/share/man/man9/sglist.9#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#178 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#111 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#31 integrate .. //depot/projects/hammer/sys/arm/arm/undefined.c#13 integrate .. //depot/projects/hammer/sys/arm/conf/SHEEVAPLUG#1 branch .. //depot/projects/hammer/sys/arm/mv/common.c#6 integrate .. //depot/projects/hammer/sys/arm/mv/discovery/db78xxx.c#5 integrate .. //depot/projects/hammer/sys/arm/mv/kirkwood/db88f6xxx.c#5 integrate .. //depot/projects/hammer/sys/arm/mv/kirkwood/files.db88f6xxx#2 integrate .. //depot/projects/hammer/sys/arm/mv/kirkwood/files.kirkwood#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/files.sheevaplug#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/sheevaplug.c#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/std.db88f6xxx#2 integrate .. //depot/projects/hammer/sys/arm/mv/kirkwood/std.kirkwood#1 branch .. //depot/projects/hammer/sys/arm/mv/kirkwood/std.sheevaplug#1 branch .. //depot/projects/hammer/sys/arm/mv/mv_machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/mv/mvreg.h#6 integrate .. //depot/projects/hammer/sys/arm/mv/mvvar.h#4 integrate .. //depot/projects/hammer/sys/arm/mv/orion/db88f5xxx.c#5 integrate .. //depot/projects/hammer/sys/arm/xscale/ixp425/ixdp425_pci.c#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/rpc/xdr.h#4 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/mutex.h#4 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#26 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#42 integrate .. //depot/projects/hammer/sys/conf/files#201 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#27 integrate .. //depot/projects/hammer/sys/conf/options#145 integrate .. //depot/projects/hammer/sys/conf/options.arm#19 integrate .. //depot/projects/hammer/sys/contrib/altq/altq/altq_subr.c#15 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#19 integrate .. //depot/projects/hammer/sys/dev/aac/aac.c#53 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#92 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#47 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_dock.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#37 integrate .. //depot/projects/hammer/sys/dev/adb/adb_bus.c#6 integrate .. //depot/projects/hammer/sys/dev/alc/if_alc.c#3 integrate .. //depot/projects/hammer/sys/dev/amdtemp/amdtemp.c#3 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#44 integrate .. //depot/projects/hammer/sys/dev/asmc/asmc.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#76 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#19 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#23 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#24 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#15 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/r600_blit.c#1 branch .. //depot/projects/hammer/sys/dev/drm/r600_cp.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#22 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cs.c#1 branch .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#15 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#19 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#17 integrate .. //depot/projects/hammer/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#15 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.c#9 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#23 integrate .. //depot/projects/hammer/sys/dev/mge/if_mge.c#6 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx.c#17 integrate .. //depot/projects/hammer/sys/dev/mmc/mmc.c#10 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#55 integrate .. //depot/projects/hammer/sys/dev/pst/pst-iop.c#9 integrate .. //depot/projects/hammer/sys/dev/pty/pty.c#1 branch .. //depot/projects/hammer/sys/dev/re/if_re.c#73 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#27 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#33 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#33 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio.c#23 integrate .. //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#11 integrate .. //depot/projects/hammer/sys/dev/syscons/scvidctl.c#12 integrate .. //depot/projects/hammer/sys/dev/twe/twe.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/input/ukbd.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/net/usb_ethernet.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#16 integrate .. //depot/projects/hammer/sys/dev/usb/usb_busdma.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_compat_linux.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usb_device.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/usb_process.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_process.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/usb_transfer.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#122 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_upgt.c#5 integrate .. //depot/projects/hammer/sys/dev/xen/blkback/blkback.c#4 integrate .. //depot/projects/hammer/sys/dev/xen/console/console.c#8 integrate .. //depot/projects/hammer/sys/dev/xen/netback/netback.c#4 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#50 integrate .. //depot/projects/hammer/sys/fs/nfsclient/nfs_clvnops.c#5 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#36 integrate .. //depot/projects/hammer/sys/i386/bios/smapi.c#13 integrate .. //depot/projects/hammer/sys/i386/bios/smbios.c#8 integrate .. //depot/projects/hammer/sys/i386/bios/vpd.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#95 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#67 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#16 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#41 integrate .. //depot/projects/hammer/sys/isa/isahint.c#8 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_cons.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#44 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_uuid.c#20 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#70 integrate .. //depot/projects/hammer/sys/kern/subr_sglist.c#2 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#45 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#20 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#43 delete .. //depot/projects/hammer/sys/kern/tty_ttydisc.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#26 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#96 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#93 integrate .. //depot/projects/hammer/sys/modules/drm/radeon/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/pty/Makefile#1 branch .. //depot/projects/hammer/sys/net/bridgestp.c#25 integrate .. //depot/projects/hammer/sys/net/flowtable.c#4 integrate .. //depot/projects/hammer/sys/net/if.c#92 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#51 integrate .. //depot/projects/hammer/sys/net/if_ef.c#25 integrate .. //depot/projects/hammer/sys/net/if_llatbl.c#5 integrate .. //depot/projects/hammer/sys/net/if_llatbl.h#3 integrate .. //depot/projects/hammer/sys/net/if_var.h#60 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#52 integrate .. //depot/projects/hammer/sys/netgraph/ng_gif.c#19 integrate .. //depot/projects/hammer/sys/netinet/in.c#42 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#36 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#53 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.h#3 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#44 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw2.c#3 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#15 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#47 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#44 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#35 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#47 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#24 integrate .. //depot/projects/hammer/sys/nfsclient/bootp_subr.c#30 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#74 integrate .. //depot/projects/hammer/sys/pc98/cbus/fdc.c#10 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#45 integrate .. //depot/projects/hammer/sys/rpc/clnt_dg.c#7 integrate .. //depot/projects/hammer/sys/rpc/clnt_rc.c#10 integrate .. //depot/projects/hammer/sys/rpc/clnt_vc.c#9 integrate .. //depot/projects/hammer/sys/rpc/rpc_generic.c#4 integrate .. //depot/projects/hammer/sys/rpc/svc_dg.c#5 integrate .. //depot/projects/hammer/sys/rpc/svc_generic.c#5 integrate .. //depot/projects/hammer/sys/rpc/svc_vc.c#7 integrate .. //depot/projects/hammer/sys/sys/bus.h#31 integrate .. //depot/projects/hammer/sys/sys/cons.h#12 integrate .. //depot/projects/hammer/sys/sys/imgact_elf.h#11 integrate .. //depot/projects/hammer/sys/sys/param.h#132 integrate .. //depot/projects/hammer/sys/sys/sglist.h#2 integrate .. //depot/projects/hammer/sys/sys/ttydisc.h#4 integrate .. //depot/projects/hammer/sys/xen/xenbus/xenbus_probe.c#6 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Dependencies#4 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-cam#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-crypto#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-dev_pci#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-dev_sound#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-dev_usb#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-geom#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-kern#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-libkern#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-linux#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-net80211#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-netgraph#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-netinet#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-netinet6#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-netipsec#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-opencrypto#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Doxyfile-vm#3 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/Makefile#4 integrate .. //depot/projects/hammer/tools/kerneldoc/subsys/common-Doxyfile#3 integrate .. //depot/projects/hammer/tools/regression/bin/sh/execution/func1.0#1 branch .. //depot/projects/hammer/tools/regression/poll/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/poll/sockpoll.c#1 branch .. //depot/projects/hammer/tools/tools/vimage/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/vimage/vimage.8#2 integrate .. //depot/projects/hammer/tools/tools/vimage/vimage.c#3 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#25 integrate .. //depot/projects/hammer/usr.bin/fstat/zfs.c#5 integrate .. //depot/projects/hammer/usr.bin/look/look.c#5 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi.c#19 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpi_user.c#10 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.c#7 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidump/acpidump.h#14 integrate .. //depot/projects/hammer/usr.sbin/freebsd-update/freebsd-update.sh#10 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#27 integrate .. //depot/projects/hammer/usr.sbin/ppp/ether.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/exec.c#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/exec.h#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/main.c#7 integrate .. //depot/projects/hammer/usr.sbin/ppp/netgraph.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.c#10 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#25 integrate .. //depot/projects/hammer/usr.sbin/ppp/tty.c#5 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#11 integrate .. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.c#14 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/Makefile#5 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#70 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.205 2009/08/01 19:26:27 rwatson Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.206 2009/08/23 18:28:58 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -803,8 +803,6 @@ OLD_FILES+=rescue/fdisk OLD_FILES+=rescue/gpt .endif -# 20071026: kthread(9)/kproc(9) API changes -OLD_FILES+=usr/share/man/man9/kthread_create.9.gz # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd ==== //depot/projects/hammer/UPDATING#135 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: - FreeBSD 8.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW: + FreeBSD 9.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 @@ -1671,4 +1671,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.633 2009/08/13 17:09:45 attilio Exp $ +$FreeBSD: src/UPDATING,v 1.634 2009/08/22 23:44:37 kensmith Exp $ ==== //depot/projects/hammer/bin/sh/eval.c#21 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.64 2009/06/23 22:53:34 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.65 2009/08/23 21:09:46 jilles Exp $"); #include <paths.h> #include <signal.h> @@ -785,6 +785,7 @@ INTOFF; savelocalvars = localvars; localvars = NULL; + reffunc(cmdentry.u.func); INTON; savehandler = handler; if (setjmp(jmploc.loc)) { @@ -794,6 +795,7 @@ freeparam(&shellparam); shellparam = saveparam; } + unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; handler = savehandler; @@ -805,11 +807,12 @@ funcnest++; exitstatus = oexitstatus; if (flags & EV_TESTED) - evaltree(cmdentry.u.func, EV_TESTED); + evaltree(&cmdentry.u.func->n, EV_TESTED); else - evaltree(cmdentry.u.func, 0); + evaltree(&cmdentry.u.func->n, 0); funcnest--; INTOFF; + unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; freeparam(&shellparam); ==== //depot/projects/hammer/bin/sh/exec.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.34 2009/06/24 22:04:04 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.35 2009/08/23 21:09:46 jilles Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -286,7 +286,7 @@ out1fmt("function %s", cmdp->cmdname); if (verbose) { INTOFF; - name = commandtext(cmdp->param.func); + name = commandtext(&cmdp->param.func->n); out1c(' '); out1str(name); ckfree(name); @@ -583,7 +583,7 @@ while ((cmdp = *pp) != NULL) { if (cmdp->cmdtype == CMDFUNCTION) { *pp = cmdp->next; - freefunc(cmdp->param.func); + unreffunc(cmdp->param.func); ckfree(cmdp); } else { pp = &cmdp->next; @@ -670,7 +670,7 @@ INTOFF; cmdp = cmdlookup(name, 1); if (cmdp->cmdtype == CMDFUNCTION) { - freefunc(cmdp->param.func); + unreffunc(cmdp->param.func); } cmdp->cmdtype = entry->cmdtype; cmdp->param = entry->u; @@ -705,7 +705,7 @@ struct tblentry *cmdp; if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->cmdtype == CMDFUNCTION) { - freefunc(cmdp->param.func); + unreffunc(cmdp->param.func); delete_cmd_entry(); return (0); } ==== //depot/projects/hammer/bin/sh/exec.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD: src/bin/sh/exec.h,v 1.15 2006/04/09 12:21:20 stefanf Exp $ + * $FreeBSD: src/bin/sh/exec.h,v 1.16 2009/08/23 21:09:46 jilles Exp $ */ /* values of cmdtype */ @@ -46,11 +46,12 @@ TYPECMD_TYPE /* type */ }; +union node; struct cmdentry { int cmdtype; union param { int index; - union node *func; + struct funcdef *func; } u; int special; }; ==== //depot/projects/hammer/bin/sh/mknodes.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.18 2008/08/04 01:25:48 cperciva Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.19 2009/08/23 21:09:46 jilles Exp $"); /* * This program reads the nodetypes file and nodes.c.pat file. It generates @@ -248,8 +248,13 @@ fputs("\tstruct nodelist *next;\n", hfile); fputs("\tunion node *n;\n", hfile); fputs("};\n\n\n", hfile); - fputs("union node *copyfunc(union node *);\n", hfile); - fputs("void freefunc(union node *);\n", hfile); + fputs("struct funcdef {\n", hfile); + fputs("\tunsigned int refcount;\n", hfile); + fputs("\tunion node n;\n", hfile); + fputs("};\n\n\n", hfile); + fputs("struct funcdef *copyfunc(union node *);\n", hfile); + fputs("void reffunc(struct funcdef *);\n", hfile); + fputs("void unreffunc(struct funcdef *);\n", hfile); fputs(writer, cfile); while (fgets(line, sizeof line, patfile) != NULL) { ==== //depot/projects/hammer/bin/sh/nodes.c.pat#5 (text+ko) ==== @@ -30,11 +30,12 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.15 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.16 2009/08/23 21:09:46 jilles Exp $ */ #include <sys/param.h> #include <stdlib.h> +#include <stddef.h> /* * Routine for dealing with parsed shell commands. */ @@ -65,17 +66,22 @@ * Make a copy of a parse tree. */ -union node * +struct funcdef * copyfunc(union node *n) { + struct funcdef *fn; + if (n == NULL) return NULL; - funcblocksize = 0; + funcblocksize = offsetof(struct funcdef, n); funcstringsize = 0; calcsize(n); - funcblock = ckmalloc(funcblocksize + funcstringsize); - funcstring = (char *)funcblock + funcblocksize; - return copynode(n); + fn = ckmalloc(funcblocksize + funcstringsize); + fn->refcount = 1; + funcblock = (char *)fn + offsetof(struct funcdef, n); + funcstring = (char *)fn + funcblocksize; + copynode(n); + return fn; } @@ -144,14 +150,25 @@ } +void +reffunc(struct funcdef *fn) +{ + fn->refcount++; +} + /* - * Free a parse tree. + * Decrement the reference count of a function definition, freeing it + * if it falls to 0. */ void -freefunc(union node *n) +unreffunc(struct funcdef *fn) { - if (n) - ckfree(n); + if (fn) { + fn->refcount--; + if (fn->refcount > 0) + return; + ckfree(fn); + } } ==== //depot/projects/hammer/contrib/traceroute/as.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/traceroute/as.c,v 1.1 2008/02/20 23:29:52 rpaulo Exp $ */ +/* $FreeBSD: src/contrib/traceroute/as.c,v 1.2 2009/08/23 17:00:16 ume Exp $ */ /* $NetBSD: as.c,v 1.1 2001/11/04 23:14:36 atatat Exp $ */ /* @@ -63,55 +63,42 @@ }; void * -as_setup(server) - char *server; +as_setup(char *server) { struct aslookup *asn; - struct hostent *he = NULL; - struct servent *se; - struct sockaddr_in in; + struct addrinfo hints, *res0, *res; FILE *f; - int s; + int s, error; if (server == NULL) + server = getenv("RA_SERVER"); + if (server == NULL) server = DEFAULT_AS_SERVER; - (void)memset(&in, 0, sizeof(in)); - in.sin_family = AF_INET; - in.sin_len = sizeof(in); - if ((se = getservbyname("whois", "tcp")) == NULL) { + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + error = getaddrinfo(server, "whois", &hints, &res0); + if (error == EAI_SERVICE) { warnx("warning: whois/tcp service not found"); - in.sin_port = ntohs(43); - } else - in.sin_port = se->s_port; - - if (inet_aton(server, &in.sin_addr) == 0 && - ((he = gethostbyname(server)) == NULL || - he->h_addr == NULL)) { - warnx("%s: %s", server, hstrerror(h_errno)); - return (NULL); + error = getaddrinfo(server, "43", &hints, &res0); } - - if ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) { - warn("socket"); + if (error != 0) { + warnx("%s: %s", server, gai_strerror(error)); return (NULL); } - do { - if (he != NULL) { - memcpy(&in.sin_addr, he->h_addr, he->h_length); - he->h_addr_list++; - } - if (connect(s, (struct sockaddr *)&in, sizeof(in)) == 0) + for (res = res0; res; res = res->ai_next) { + s = socket(res->ai_family, res->ai_socktype, res->ai_protocol); + if (s < 0) + continue; + if (connect(s, res->ai_addr, res->ai_addrlen) >= 0) break; - if (he == NULL || he->h_addr == NULL) { - close(s); - s = -1; - break; - } - } while (1); - - if (s == -1) { + close(s); + s = -1; + } + freeaddrinfo(res0); + if (s < 0) { warn("connect"); return (NULL); } @@ -137,23 +124,23 @@ return (asn); } -int -as_lookup(_asn, addr) - void *_asn; - struct in_addr *addr; +unsigned int +as_lookup(void *_asn, char *addr, sa_family_t family) { struct aslookup *asn = _asn; char buf[1024]; - int as, rc, dlen; + unsigned int as; + int rc, dlen, plen; - as = rc = dlen = 0; - (void)fprintf(asn->as_f, "!r%s/32,l\n", inet_ntoa(*addr)); + as = 0; + rc = dlen = 0; + plen = (family == AF_INET6) ? 128 : 32; + (void)fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen); (void)fflush(asn->as_f); #ifdef AS_DEBUG_FILE if (asn->as_debug) { - (void)fprintf(asn->as_debug, ">> !r%s/32,l\n", - inet_ntoa(*addr)); + (void)fprintf(asn->as_debug, ">> !r%s/%d,l\n", addr, plen); (void)fflush(asn->as_debug); } #endif /* AS_DEBUG_FILE */ @@ -182,7 +169,7 @@ } #endif /* AS_DEBUG_FILE */ break; - case 'C': + case 'C': case 'D': case 'E': case 'F': @@ -209,7 +196,7 @@ /* origin line is the interesting bit */ if (as == 0 && strncasecmp(buf, "origin:", 7) == 0) { - sscanf(buf + 7, " AS%d", &as); + sscanf(buf + 7, " AS%u", &as); #ifdef AS_DEBUG_FILE if (asn->as_debug) { (void)fprintf(asn->as_debug, "as: %d\n", as); @@ -223,8 +210,7 @@ } void -as_shutdown(_asn) - void *_asn; +as_shutdown(void *_asn) { struct aslookup *asn = _asn; ==== //depot/projects/hammer/contrib/traceroute/as.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/traceroute/as.h,v 1.1 2008/02/20 23:29:52 rpaulo Exp $ */ +/* $FreeBSD: src/contrib/traceroute/as.h,v 1.2 2009/08/23 17:00:16 ume Exp $ */ /* $NetBSD: as.h,v 1.1 2001/11/04 23:14:36 atatat Exp $ */ /* @@ -37,6 +37,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -void *as_setup __P((char *)); -int as_lookup __P((void *, struct in_addr *)); -void as_shutdown __P((void *)); +void *as_setup(char *); +unsigned int as_lookup(void *, char *, sa_family_t); +void as_shutdown(void *); ==== //depot/projects/hammer/contrib/traceroute/traceroute.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.35 2008/02/20 23:29:52 rpaulo Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.36 2009/08/23 17:00:16 ume Exp $"; #endif /* @@ -1477,19 +1477,21 @@ { register struct ip *ip; register int hlen; + char addr[INET_ADDRSTRLEN]; ip = (struct ip *) buf; hlen = ip->ip_hl << 2; cc -= hlen; + strlcpy(addr, inet_ntoa(from->sin_addr), sizeof(addr)); + if (as_path) - Printf(" [AS%d]", as_lookup(asn, &from->sin_addr)); + Printf(" [AS%u]", as_lookup(asn, addr, AF_INET)); if (nflag) - Printf(" %s", inet_ntoa(from->sin_addr)); + Printf(" %s", addr); else - Printf(" %s (%s)", inetname(from->sin_addr), - inet_ntoa(from->sin_addr)); + Printf(" %s (%s)", inetname(from->sin_addr), addr); if (verbose) Printf(" %d bytes to %s", cc, inet_ntoa (ip->ip_dst)); ==== //depot/projects/hammer/crypto/openssl/crypto/pqueue/pqueue.c#2 (text+ko) ==== @@ -234,3 +234,17 @@ return ret; } + +int +pqueue_size(pqueue_s *pq) +{ + pitem *item = pq->items; + int count = 0; + + while(item != NULL) + { + count++; + item = item->next; + } + return count; +} ==== //depot/projects/hammer/crypto/openssl/crypto/pqueue/pqueue.h#2 (text+ko) ==== @@ -91,5 +91,6 @@ pitem *pqueue_next(piterator *iter); void pqueue_print(pqueue pq); +int pqueue_size(pqueue pq); #endif /* ! HEADER_PQUEUE_H */ ==== //depot/projects/hammer/crypto/openssl/ssl/d1_both.c#4 (text+ko) ==== @@ -519,6 +519,7 @@ if ( s->d1->handshake_read_seq == frag->msg_header.seq) { + unsigned long frag_len = frag->msg_header.frag_len; pqueue_pop(s->d1->buffered_messages); al=dtls1_preprocess_fragment(s,&frag->msg_header,max); @@ -536,7 +537,7 @@ if (al==0) { *ok = 1; - return frag->msg_header.frag_len; + return frag_len; } ssl3_send_alert(s,SSL3_AL_FATAL,al); @@ -561,7 +562,16 @@ if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len) goto err; - if (msg_hdr->seq <= s->d1->handshake_read_seq) + /* Try to find item in queue, to prevent duplicate entries */ + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pqueue_find(s->d1->buffered_messages, seq64); + pq_64bit_free(&seq64); + + /* Discard the message if sequence number was already there, is + * too far in the future or the fragment is already in the queue */ + if (msg_hdr->seq <= s->d1->handshake_read_seq || + msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL) { unsigned char devnull [256]; @@ -575,30 +585,31 @@ } } - frag = dtls1_hm_fragment_new(frag_len); - if ( frag == NULL) - goto err; + if (frag_len) + { + frag = dtls1_hm_fragment_new(frag_len); + if ( frag == NULL) + goto err; - memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); + memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr)); - if (frag_len) - { - /* read the body of the fragment (header has already been read */ + /* read the body of the fragment (header has already been read) */ i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE, frag->fragment,frag_len,0); if (i<=0 || (unsigned long)i!=frag_len) goto err; - } + + pq_64bit_init(&seq64); + pq_64bit_assign_word(&seq64, msg_hdr->seq); - pq_64bit_init(&seq64); - pq_64bit_assign_word(&seq64, msg_hdr->seq); + item = pitem_new(seq64, frag); + pq_64bit_free(&seq64); + if ( item == NULL) + goto err; - item = pitem_new(seq64, frag); - pq_64bit_free(&seq64); - if ( item == NULL) - goto err; + pqueue_insert(s->d1->buffered_messages, item); + } - pqueue_insert(s->d1->buffered_messages, item); return DTLS1_HM_FRAGMENT_RETRY; err: ==== //depot/projects/hammer/crypto/openssl/ssl/d1_pkt.c#4 (text+ko) ==== @@ -167,6 +167,10 @@ DTLS1_RECORD_DATA *rdata; pitem *item; + /* Limit the size of the queue to prevent DOS attacks */ + if (pqueue_size(queue->q) >= 100) + return 0; + rdata = OPENSSL_malloc(sizeof(DTLS1_RECORD_DATA)); item = pitem_new(priority, rdata); if (rdata == NULL || item == NULL) ==== //depot/projects/hammer/etc/defaults/periodic.conf#24 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.47 2008/01/08 07:22:43 dds Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.48 2009/08/23 06:30:14 kensmith Exp $ # # What files override these defaults ? @@ -224,7 +224,7 @@ # 400.status-pkg weekly_status_pkg_enable="NO" # Find out-of-date pkgs pkg_version=pkg_version # Use this program -pkg_version_index=/usr/ports/INDEX-8 # Use this index file +pkg_version_index=/usr/ports/INDEX-9 # Use this index file # 999.local weekly_local="/etc/weekly.local" # Local scripts ==== //depot/projects/hammer/etc/defaults/rc.conf#98 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.358 2009/06/10 19:03:23 avg Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.359 2009/08/25 19:07:26 delphij Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -357,6 +357,7 @@ ### Network routing options: ### defaultrouter="NO" # Set to default gateway (or NO). +static_arp_pairs="" # Set to static ARP list (or leave empty). static_routes="" # Set to static route list (or leave empty). natm_static_routes="" # Set to static route list for NATM (or leave empty). gateway_enable="NO" # Set to YES if this host will be a gateway. ==== //depot/projects/hammer/etc/freebsd-update.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.6 2008/08/08 10:36:16 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.7 2009/08/19 20:47:31 simon Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from <security-officer@FreeBSD.org> telling you to @@ -63,3 +63,14 @@ # which *might* be installed of which FreeBSD Update should figure out # which actually are installed and upgrade those (StrictComponents no)? # StrictComponents no + +# When installing a new kernel perform a backup of the old one first +# so it is possible to boot the old kernel in case of problems. +# BackupKernel yes + +# If BackupKernel is enabled, the backup kernel is saved to this +# directory. +# BackupKernelDir /boot/kernel.old + +# When backing up a kernel also back up debug symbol files? +# BackupKernelSymbolFiles no ==== //depot/projects/hammer/etc/network.subr#30 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.195 2009/06/26 01:27:16 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.198 2009/08/24 22:05:08 dougb Exp $ # # @@ -727,6 +727,13 @@ ;; *) _tmplist="${network_interfaces} ${cloned_interfaces}" + + # lo0 is effectively mandatory, so help prevent foot-shooting + # + case "$_tmplist" in + lo0|'lo0 '*|*' lo0'|*' lo0 '*) ;; # This is fine, do nothing + *) _tmplist="lo0 ${_tmplist}" ;; + esac ;; esac @@ -816,6 +823,17 @@ echo ${str} } +is_wired_interface() +{ + local media + + case `ifconfig $1 2>/dev/null` in + *media:?Ethernet*) media=Ethernet ;; + esac + + test "$media" = "Ethernet" +} + # Setup the interfaces for IPv6 network6_interface_setup() { @@ -858,14 +876,19 @@ ifconfig $i inet6 ${ipv6_ifconfig} alias fi + # Wireless NIC cards are virtualized through the wlan interface + if ! is_wired_interface ${i}; then + case "${i}" in + wlan*) rtsol_available=yes ;; + *) rtsol_available=no ;; + esac + fi + if [ ${rtsol_available} = yes -a ${rtsol_interface} = yes ] >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908262117.n7QLHOER014240>