Date: Sat, 13 Jun 2009 08:04:57 +0000 (UTC) From: "Simon L. Nielsen" <simon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r194100 - in projects/openssl_098_merge_8: . contrib/csup contrib/gdb/gdb contrib/ntp/ntpd etc etc/defaults etc/mtree etc/rc.d lib/libc/stdtime lib/libpmc lib/libthread_db lib/libufs li... Message-ID: <200906130804.n5D84vi0006940@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: simon Date: Sat Jun 13 08:04:56 2009 New Revision: 194100 URL: http://svn.freebsd.org/changeset/base/194100 Log: Merge from head. Added: projects/openssl_098_merge_8/share/colldef/hr_HR.ISO8859-2.src - copied unchanged from r194099, head/share/colldef/hr_HR.ISO8859-2.src projects/openssl_098_merge_8/share/man/man4/alc.4 - copied unchanged from r194099, head/share/man/man4/alc.4 projects/openssl_098_merge_8/share/man/man4/mwl.4 - copied unchanged from r194099, head/share/man/man4/mwl.4 projects/openssl_098_merge_8/share/man/man4/mwlfw.4 - copied unchanged from r194099, head/share/man/man4/mwlfw.4 projects/openssl_098_merge_8/share/man/man9/BUS_NEW_PASS.9 - copied unchanged from r194099, head/share/man/man9/BUS_NEW_PASS.9 projects/openssl_098_merge_8/share/man/man9/bus_generic_new_pass.9 - copied unchanged from r194099, head/share/man/man9/bus_generic_new_pass.9 projects/openssl_098_merge_8/share/man/man9/bus_set_pass.9 - copied unchanged from r194099, head/share/man/man9/bus_set_pass.9 projects/openssl_098_merge_8/share/monetdef/pt_PT.ISO8859-15.src - copied unchanged from r194099, head/share/monetdef/pt_PT.ISO8859-15.src projects/openssl_098_merge_8/share/monetdef/pt_PT.UTF-8.src - copied unchanged from r194099, head/share/monetdef/pt_PT.UTF-8.src projects/openssl_098_merge_8/share/numericdef/de_CH.ISO8859-1.src - copied unchanged from r194099, head/share/numericdef/de_CH.ISO8859-1.src projects/openssl_098_merge_8/share/syscons/keymaps/danish.iso.acc.kbd - copied unchanged from r194099, head/share/syscons/keymaps/danish.iso.acc.kbd projects/openssl_098_merge_8/share/syscons/keymaps/pl_PL.dvorak.kbd - copied unchanged from r194099, head/share/syscons/keymaps/pl_PL.dvorak.kbd projects/openssl_098_merge_8/share/syscons/keymaps/uk.dvorak.kbd - copied unchanged from r194099, head/share/syscons/keymaps/uk.dvorak.kbd projects/openssl_098_merge_8/sys/arm/mv/mvwin.h - copied unchanged from r194099, head/sys/arm/mv/mvwin.h projects/openssl_098_merge_8/sys/dev/alc/ - copied from r194099, head/sys/dev/alc/ projects/openssl_098_merge_8/sys/geom/label/g_label_gpt.c - copied unchanged from r194099, head/sys/geom/label/g_label_gpt.c projects/openssl_098_merge_8/sys/kern/subr_acl_nfs4.c - copied unchanged from r194099, head/sys/kern/subr_acl_nfs4.c projects/openssl_098_merge_8/sys/libkern/jenkins.h - copied unchanged from r194099, head/sys/libkern/jenkins.h projects/openssl_098_merge_8/sys/modules/alc/ - copied from r194099, head/sys/modules/alc/ projects/openssl_098_merge_8/sys/tools/sound/ - copied from r194099, head/sys/tools/sound/ Deleted: projects/openssl_098_merge_8/share/man/man9/devclass_add_driver.9 projects/openssl_098_merge_8/sys/tools/emu10k1-mkalsa.sh projects/openssl_098_merge_8/sys/tools/feeder_eq_mkfilter.awk projects/openssl_098_merge_8/sys/tools/feeder_rate_mkfilter.awk projects/openssl_098_merge_8/sys/tools/snd_fxdiv_gen.awk Modified: projects/openssl_098_merge_8/ (props changed) projects/openssl_098_merge_8/UPDATING projects/openssl_098_merge_8/contrib/csup/rcsfile.c projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c projects/openssl_098_merge_8/etc/defaults/rc.conf projects/openssl_098_merge_8/etc/mtree/BSD.local.dist projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist projects/openssl_098_merge_8/etc/rc.d/fsck projects/openssl_098_merge_8/etc/rc.d/jail projects/openssl_098_merge_8/etc/syslog.conf projects/openssl_098_merge_8/etc/termcap.small projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c projects/openssl_098_merge_8/lib/libpmc/libpmc.c projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3 projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c projects/openssl_098_merge_8/lib/libthread_db/thread_db.h projects/openssl_098_merge_8/lib/libufs/type.c projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3 projects/openssl_098_merge_8/lib/libusb/ (props changed) projects/openssl_098_merge_8/lib/libusb/libusb.3 projects/openssl_098_merge_8/lib/libusb/libusb20.c projects/openssl_098_merge_8/lib/libusb/libusb20.h projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c projects/openssl_098_merge_8/lib/libusb/libusb20_int.h projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3 projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3 projects/openssl_098_merge_8/lib/msun/src/math_private.h projects/openssl_098_merge_8/sbin/dhclient/dhclient.c projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8 projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8 projects/openssl_098_merge_8/share/colldef/Makefile projects/openssl_098_merge_8/share/man/man4/Makefile projects/openssl_098_merge_8/share/man/man4/acpi.4 projects/openssl_098_merge_8/share/man/man4/altq.4 projects/openssl_098_merge_8/share/man/man4/iwn.4 projects/openssl_098_merge_8/share/man/man4/miibus.4 projects/openssl_098_merge_8/share/man/man4/ng_ipfw.4 projects/openssl_098_merge_8/share/man/man4/vlan.4 projects/openssl_098_merge_8/share/man/man9/Makefile projects/openssl_098_merge_8/share/misc/committers-src.dot projects/openssl_098_merge_8/share/mklocale/Makefile projects/openssl_098_merge_8/share/mklocale/ja_JP.SJIS.src projects/openssl_098_merge_8/share/mklocale/ja_JP.eucJP.src projects/openssl_098_merge_8/share/monetdef/Makefile projects/openssl_098_merge_8/share/monetdef/de_CH.ISO8859-1.src projects/openssl_098_merge_8/share/msgdef/Makefile projects/openssl_098_merge_8/share/numericdef/Makefile projects/openssl_098_merge_8/share/syscons/keymaps/INDEX.keymaps projects/openssl_098_merge_8/share/syscons/keymaps/Makefile projects/openssl_098_merge_8/share/termcap/termcap.src projects/openssl_098_merge_8/share/timedef/Makefile projects/openssl_098_merge_8/share/timedef/ja_JP.SJIS.src projects/openssl_098_merge_8/share/timedef/ja_JP.eucJP.src projects/openssl_098_merge_8/share/timedef/ko_KR.UTF-8.src projects/openssl_098_merge_8/share/timedef/ko_KR.eucKR.src projects/openssl_098_merge_8/share/timedef/pl_PL.ISO8859-2.src projects/openssl_098_merge_8/share/timedef/pl_PL.UTF-8.src projects/openssl_098_merge_8/share/zoneinfo/ (props changed) projects/openssl_098_merge_8/share/zoneinfo/asia projects/openssl_098_merge_8/sys/amd64/amd64/local_apic.c projects/openssl_098_merge_8/sys/amd64/amd64/machdep.c projects/openssl_098_merge_8/sys/amd64/conf/DEFAULTS projects/openssl_098_merge_8/sys/amd64/conf/GENERIC projects/openssl_098_merge_8/sys/amd64/conf/NOTES projects/openssl_098_merge_8/sys/amd64/isa/clock.c projects/openssl_098_merge_8/sys/arm/arm/intr.c projects/openssl_098_merge_8/sys/arm/arm/locore.S projects/openssl_098_merge_8/sys/arm/at91/at91.c projects/openssl_098_merge_8/sys/arm/at91/at91_cfata.c projects/openssl_098_merge_8/sys/arm/at91/at91_mci.c projects/openssl_098_merge_8/sys/arm/at91/at91_twi.c projects/openssl_098_merge_8/sys/arm/at91/if_ate.c projects/openssl_098_merge_8/sys/arm/include/intr.h projects/openssl_098_merge_8/sys/arm/mv/common.c projects/openssl_098_merge_8/sys/arm/mv/discovery/db78xxx.c projects/openssl_098_merge_8/sys/arm/mv/discovery/discovery.c projects/openssl_098_merge_8/sys/arm/mv/ic.c projects/openssl_098_merge_8/sys/arm/mv/kirkwood/db88f6xxx.c projects/openssl_098_merge_8/sys/arm/mv/kirkwood/kirkwood.c projects/openssl_098_merge_8/sys/arm/mv/mvreg.h projects/openssl_098_merge_8/sys/arm/mv/orion/db88f5xxx.c projects/openssl_098_merge_8/sys/arm/mv/orion/orion.c projects/openssl_098_merge_8/sys/arm/mv/twsi.c projects/openssl_098_merge_8/sys/arm/sa11x0/sa11x0_irqhandler.c projects/openssl_098_merge_8/sys/arm/xscale/i80321/i80321.c projects/openssl_098_merge_8/sys/arm/xscale/i80321/i80321_pci.c projects/openssl_098_merge_8/sys/arm/xscale/i8134x/i81342.c projects/openssl_098_merge_8/sys/arm/xscale/ixp425/avila_ata.c projects/openssl_098_merge_8/sys/arm/xscale/ixp425/avila_led.c projects/openssl_098_merge_8/sys/arm/xscale/ixp425/cambria_led.c projects/openssl_098_merge_8/sys/arm/xscale/ixp425/if_npe.c projects/openssl_098_merge_8/sys/arm/xscale/ixp425/ixp425.c projects/openssl_098_merge_8/sys/arm/xscale/ixp425/ixp425_iic.c projects/openssl_098_merge_8/sys/arm/xscale/pxa/pxa_icu.c projects/openssl_098_merge_8/sys/boot/forth/loader.conf projects/openssl_098_merge_8/sys/cam/scsi/scsi_target.c projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/openssl_098_merge_8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_proto.h projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_syscall.h projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_syscalls.c projects/openssl_098_merge_8/sys/compat/freebsd32/freebsd32_sysent.c projects/openssl_098_merge_8/sys/compat/freebsd32/syscalls.master projects/openssl_098_merge_8/sys/compat/linux/linux_misc.c projects/openssl_098_merge_8/sys/compat/svr4/svr4_stat.c projects/openssl_098_merge_8/sys/conf/NOTES projects/openssl_098_merge_8/sys/conf/files projects/openssl_098_merge_8/sys/conf/options projects/openssl_098_merge_8/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/openssl_098_merge_8/sys/contrib/pf/net/if_pflog.c projects/openssl_098_merge_8/sys/dev/acpica/Osd/OsdSchedule.c projects/openssl_098_merge_8/sys/dev/acpica/Osd/OsdSynch.c projects/openssl_098_merge_8/sys/dev/acpica/acpi_pcib_acpi.c projects/openssl_098_merge_8/sys/dev/acpica/acpivar.h projects/openssl_098_merge_8/sys/dev/agp/agp_ali.c projects/openssl_098_merge_8/sys/dev/agp/agp_amd.c projects/openssl_098_merge_8/sys/dev/agp/agp_ati.c projects/openssl_098_merge_8/sys/dev/agp/agp_nvidia.c projects/openssl_098_merge_8/sys/dev/agp/agp_sis.c projects/openssl_098_merge_8/sys/dev/ata/chipsets/ata-acerlabs.c projects/openssl_098_merge_8/sys/dev/ce/if_ce.c projects/openssl_098_merge_8/sys/dev/cfi/cfi_core.c projects/openssl_098_merge_8/sys/dev/cp/if_cp.c projects/openssl_098_merge_8/sys/dev/ctau/if_ct.c projects/openssl_098_merge_8/sys/dev/cx/if_cx.c projects/openssl_098_merge_8/sys/dev/cxgb/cxgb_main.c projects/openssl_098_merge_8/sys/dev/cxgb/cxgb_multiq.c projects/openssl_098_merge_8/sys/dev/cxgb/cxgb_sge.c projects/openssl_098_merge_8/sys/dev/e1000/if_igb.c projects/openssl_098_merge_8/sys/dev/eisa/eisaconf.c projects/openssl_098_merge_8/sys/dev/fxp/if_fxp.c projects/openssl_098_merge_8/sys/dev/if_ndis/if_ndis.c projects/openssl_098_merge_8/sys/dev/kbdmux/kbdmux.c projects/openssl_098_merge_8/sys/dev/ksyms/ksyms.c projects/openssl_098_merge_8/sys/dev/mca/mca_bus.c projects/openssl_098_merge_8/sys/dev/mge/if_mge.c projects/openssl_098_merge_8/sys/dev/ncv/ncr53c500_pccard.c projects/openssl_098_merge_8/sys/dev/nmdm/nmdm.c projects/openssl_098_merge_8/sys/dev/nsp/nsp_pccard.c projects/openssl_098_merge_8/sys/dev/ofw/ofw_standard.c projects/openssl_098_merge_8/sys/dev/pcf/pcf.c projects/openssl_098_merge_8/sys/dev/pcf/pcfvar.h projects/openssl_098_merge_8/sys/dev/pdq/if_fpa.c projects/openssl_098_merge_8/sys/dev/smc/if_smc.c projects/openssl_098_merge_8/sys/dev/smc/if_smcvar.h projects/openssl_098_merge_8/sys/dev/snc/if_snc.c projects/openssl_098_merge_8/sys/dev/snc/if_sncvar.h projects/openssl_098_merge_8/sys/dev/sound/midi/midi.c projects/openssl_098_merge_8/sys/dev/sound/midi/mpu401.c projects/openssl_098_merge_8/sys/dev/sound/pcm/channel.h projects/openssl_098_merge_8/sys/dev/sound/pcm/mixer.h projects/openssl_098_merge_8/sys/dev/sound/pcm/sound.h projects/openssl_098_merge_8/sys/dev/sound/sbus/cs4231.c projects/openssl_098_merge_8/sys/dev/spibus/spibus.c projects/openssl_098_merge_8/sys/dev/stg/tmc18c30.h projects/openssl_098_merge_8/sys/dev/stg/tmc18c30_subr.c projects/openssl_098_merge_8/sys/dev/syscons/teken/teken_demo.c projects/openssl_098_merge_8/sys/dev/syscons/teken/teken_stress.c projects/openssl_098_merge_8/sys/dev/uart/uart_cpu_mv.c projects/openssl_098_merge_8/sys/dev/ubsec/ubsec.c projects/openssl_098_merge_8/sys/dev/usb/controller/ehci_mbus.c projects/openssl_098_merge_8/sys/dev/usb/input/ukbd.c projects/openssl_098_merge_8/sys/dev/usb/input/ums.c projects/openssl_098_merge_8/sys/dev/usb/serial/uchcom.c projects/openssl_098_merge_8/sys/dev/usb/serial/ufoma.c projects/openssl_098_merge_8/sys/dev/usb/serial/uplcom.c projects/openssl_098_merge_8/sys/dev/usb/serial/uslcom.c projects/openssl_098_merge_8/sys/dev/usb/storage/umass.c projects/openssl_098_merge_8/sys/dev/usb/storage/ustorage_fs.c projects/openssl_098_merge_8/sys/dev/usb/usb_compat_linux.c projects/openssl_098_merge_8/sys/dev/usb/usb_core.h projects/openssl_098_merge_8/sys/dev/usb/usb_dev.c projects/openssl_098_merge_8/sys/dev/usb/usb_handle_request.c projects/openssl_098_merge_8/sys/dev/usb/usb_if.m projects/openssl_098_merge_8/sys/dev/usb/wlan/if_urtw.c projects/openssl_098_merge_8/sys/dev/usb/wlan/if_zyd.c projects/openssl_098_merge_8/sys/dev/usb/wlan/if_zydreg.h projects/openssl_098_merge_8/sys/dev/wb/if_wb.c projects/openssl_098_merge_8/sys/dev/wi/if_wi.c projects/openssl_098_merge_8/sys/dev/wi/if_wivar.h projects/openssl_098_merge_8/sys/dev/xen/netfront/ (props changed) projects/openssl_098_merge_8/sys/dev/xen/xenpci/ (props changed) projects/openssl_098_merge_8/sys/fs/cd9660/cd9660_lookup.c projects/openssl_098_merge_8/sys/fs/cd9660/cd9660_vnops.c projects/openssl_098_merge_8/sys/fs/devfs/devfs_vnops.c projects/openssl_098_merge_8/sys/fs/fifofs/fifo_vnops.c projects/openssl_098_merge_8/sys/fs/msdosfs/msdosfs_vnops.c projects/openssl_098_merge_8/sys/fs/nfsclient/nfs_clbio.c projects/openssl_098_merge_8/sys/fs/nfsclient/nfs_clvnops.c projects/openssl_098_merge_8/sys/fs/pseudofs/pseudofs_vnops.c projects/openssl_098_merge_8/sys/geom/geom.h projects/openssl_098_merge_8/sys/geom/geom_io.c projects/openssl_098_merge_8/sys/geom/label/g_label.c projects/openssl_098_merge_8/sys/geom/label/g_label.h projects/openssl_098_merge_8/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c projects/openssl_098_merge_8/sys/i386/acpica/acpi_machdep.c projects/openssl_098_merge_8/sys/i386/conf/DEFAULTS projects/openssl_098_merge_8/sys/i386/conf/GENERIC projects/openssl_098_merge_8/sys/i386/conf/NOTES projects/openssl_098_merge_8/sys/i386/i386/local_apic.c projects/openssl_098_merge_8/sys/i386/i386/machdep.c projects/openssl_098_merge_8/sys/i386/include/legacyvar.h projects/openssl_098_merge_8/sys/i386/isa/clock.c projects/openssl_098_merge_8/sys/i386/isa/vesa.c projects/openssl_098_merge_8/sys/i386/pci/pci_bus.c projects/openssl_098_merge_8/sys/kern/bus_if.m projects/openssl_098_merge_8/sys/kern/init_main.c projects/openssl_098_merge_8/sys/kern/kern_event.c projects/openssl_098_merge_8/sys/kern/kern_fork.c projects/openssl_098_merge_8/sys/kern/kern_jail.c projects/openssl_098_merge_8/sys/kern/kern_lockf.c projects/openssl_098_merge_8/sys/kern/link_elf_obj.c projects/openssl_098_merge_8/sys/kern/linker_if.m projects/openssl_098_merge_8/sys/kern/subr_bus.c projects/openssl_098_merge_8/sys/kern/sys_pipe.c projects/openssl_098_merge_8/sys/kern/sysv_shm.c projects/openssl_098_merge_8/sys/kern/tty.c projects/openssl_098_merge_8/sys/kern/tty_pts.c projects/openssl_098_merge_8/sys/kern/uipc_mqueue.c projects/openssl_098_merge_8/sys/kern/uipc_socket.c projects/openssl_098_merge_8/sys/kern/uipc_syscalls.c projects/openssl_098_merge_8/sys/kern/vfs_aio.c projects/openssl_098_merge_8/sys/kern/vfs_subr.c projects/openssl_098_merge_8/sys/kern/vfs_syscalls.c projects/openssl_098_merge_8/sys/kern/vfs_vnops.c projects/openssl_098_merge_8/sys/kern/vnode_if.src projects/openssl_098_merge_8/sys/mips/malta/gt_pci.c projects/openssl_098_merge_8/sys/mips/mips/mainbus.c projects/openssl_098_merge_8/sys/modules/Makefile projects/openssl_098_merge_8/sys/modules/dtrace/dtnfsclient/ (props changed) projects/openssl_098_merge_8/sys/modules/ip6_mroute_mod/ (props changed) projects/openssl_098_merge_8/sys/modules/ipmi/ipmi_linux/ (props changed) projects/openssl_098_merge_8/sys/modules/sound/sound/Makefile projects/openssl_098_merge_8/sys/net/bpf.c projects/openssl_098_merge_8/sys/net/flowtable.c projects/openssl_098_merge_8/sys/net/flowtable.h projects/openssl_098_merge_8/sys/net/if.c projects/openssl_098_merge_8/sys/net/if_arcsubr.c projects/openssl_098_merge_8/sys/net/if_bridge.c projects/openssl_098_merge_8/sys/net/if_ethersubr.c projects/openssl_098_merge_8/sys/net/if_fddisubr.c projects/openssl_098_merge_8/sys/net/if_fwsubr.c projects/openssl_098_merge_8/sys/net/if_gif.c projects/openssl_098_merge_8/sys/net/if_gif.h projects/openssl_098_merge_8/sys/net/if_iso88025subr.c projects/openssl_098_merge_8/sys/net/if_tap.c projects/openssl_098_merge_8/sys/net/if_tun.c projects/openssl_098_merge_8/sys/net/if_var.h projects/openssl_098_merge_8/sys/net/pfkeyv2.h projects/openssl_098_merge_8/sys/net/rtsock.c projects/openssl_098_merge_8/sys/net80211/_ieee80211.h projects/openssl_098_merge_8/sys/net80211/ieee80211.c projects/openssl_098_merge_8/sys/net80211/ieee80211.h projects/openssl_098_merge_8/sys/net80211/ieee80211_crypto_ccmp.c projects/openssl_098_merge_8/sys/net80211/ieee80211_dfs.c projects/openssl_098_merge_8/sys/net80211/ieee80211_ht.c projects/openssl_098_merge_8/sys/net80211/ieee80211_ioctl.c projects/openssl_098_merge_8/sys/net80211/ieee80211_node.c projects/openssl_098_merge_8/sys/net80211/ieee80211_node.h projects/openssl_098_merge_8/sys/net80211/ieee80211_proto.h projects/openssl_098_merge_8/sys/net80211/ieee80211_radiotap.c projects/openssl_098_merge_8/sys/net80211/ieee80211_sta.c projects/openssl_098_merge_8/sys/netgraph/netgraph.h projects/openssl_098_merge_8/sys/netgraph/ng_base.c projects/openssl_098_merge_8/sys/netgraph/ng_eiface.c projects/openssl_098_merge_8/sys/netgraph/ng_ether.c projects/openssl_098_merge_8/sys/netgraph/ng_iface.c projects/openssl_098_merge_8/sys/netgraph/ng_ip_input.c projects/openssl_098_merge_8/sys/netgraph/ng_ipfw.c projects/openssl_098_merge_8/sys/netgraph/ng_ipfw.h projects/openssl_098_merge_8/sys/netgraph/ng_message.h projects/openssl_098_merge_8/sys/netinet/igmp.h projects/openssl_098_merge_8/sys/netinet/in_proto.c projects/openssl_098_merge_8/sys/netinet/ip_dummynet.h projects/openssl_098_merge_8/sys/netinet/ip_fw.h projects/openssl_098_merge_8/sys/netinet/ip_input.c projects/openssl_098_merge_8/sys/netinet/ip_output.c projects/openssl_098_merge_8/sys/netinet/ipfw/ip_dummynet.c (contents, props changed) projects/openssl_098_merge_8/sys/netinet/ipfw/ip_fw2.c (contents, props changed) projects/openssl_098_merge_8/sys/netinet/ipfw/ip_fw_pfil.c (contents, props changed) projects/openssl_098_merge_8/sys/netinet/tcp_debug.c projects/openssl_098_merge_8/sys/netinet/tcp_input.c projects/openssl_098_merge_8/sys/netinet/tcp_usrreq.c projects/openssl_098_merge_8/sys/netinet/tcp_var.h projects/openssl_098_merge_8/sys/netinet/udp.h projects/openssl_098_merge_8/sys/netinet/udp_usrreq.c projects/openssl_098_merge_8/sys/netinet/udp_var.h projects/openssl_098_merge_8/sys/netinet6/in6.c projects/openssl_098_merge_8/sys/netinet6/mld6.c projects/openssl_098_merge_8/sys/netipsec/ipsec.c projects/openssl_098_merge_8/sys/netipsec/ipsec_input.c projects/openssl_098_merge_8/sys/netipsec/ipsec_output.c projects/openssl_098_merge_8/sys/netipsec/key.c projects/openssl_098_merge_8/sys/netipsec/key.h projects/openssl_098_merge_8/sys/netipsec/keydb.h projects/openssl_098_merge_8/sys/netipsec/xform_ipip.c projects/openssl_098_merge_8/sys/netipx/spx_debug.c projects/openssl_098_merge_8/sys/nfsclient/nfs_bio.c projects/openssl_098_merge_8/sys/nfsserver/nfs_srvkrpc.c projects/openssl_098_merge_8/sys/powerpc/aim/machdep.c projects/openssl_098_merge_8/sys/powerpc/aim/platform_chrp.c projects/openssl_098_merge_8/sys/powerpc/ofw/ofw_real.c projects/openssl_098_merge_8/sys/powerpc/powermac/cuda.c projects/openssl_098_merge_8/sys/powerpc/powermac/pmu.c projects/openssl_098_merge_8/sys/powerpc/powerpc/openpic.c projects/openssl_098_merge_8/sys/powerpc/psim/ata_iobus.c projects/openssl_098_merge_8/sys/rpc/clnt_rc.c projects/openssl_098_merge_8/sys/security/audit/audit_pipe.c projects/openssl_098_merge_8/sys/sys/bio.h projects/openssl_098_merge_8/sys/sys/buf_ring.h projects/openssl_098_merge_8/sys/sys/bus.h projects/openssl_098_merge_8/sys/sys/event.h projects/openssl_098_merge_8/sys/sys/jail.h projects/openssl_098_merge_8/sys/sys/kobj.h projects/openssl_098_merge_8/sys/sys/mbuf.h projects/openssl_098_merge_8/sys/sys/mount.h projects/openssl_098_merge_8/sys/sys/proc.h projects/openssl_098_merge_8/sys/sys/soundcard.h projects/openssl_098_merge_8/sys/sys/vimage.h projects/openssl_098_merge_8/sys/vm/vm_map.c projects/openssl_098_merge_8/tools/regression/lib/msun/test-conj.t (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs.h (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/openssl_098_merge_8/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/openssl_098_merge_8/usr.bin/fstat/zfs.c projects/openssl_098_merge_8/usr.sbin/arp/Makefile projects/openssl_098_merge_8/usr.sbin/arp/arp.c projects/openssl_098_merge_8/usr.sbin/flowctl/flowctl.c projects/openssl_098_merge_8/usr.sbin/jail/jail.c projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/openssl_098_merge_8/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/openssl_098_merge_8/usr.sbin/makefs/getid.c (props changed) projects/openssl_098_merge_8/usr.sbin/mergemaster/mergemaster.sh projects/openssl_098_merge_8/usr.sbin/nfsd/nfsv4.4 projects/openssl_098_merge_8/usr.sbin/nscd/Makefile projects/openssl_098_merge_8/usr.sbin/nscd/agent.c projects/openssl_098_merge_8/usr.sbin/nscd/agent.h projects/openssl_098_merge_8/usr.sbin/nscd/agents/group.c projects/openssl_098_merge_8/usr.sbin/nscd/agents/group.h projects/openssl_098_merge_8/usr.sbin/nscd/agents/passwd.c projects/openssl_098_merge_8/usr.sbin/nscd/agents/passwd.h projects/openssl_098_merge_8/usr.sbin/nscd/agents/services.c projects/openssl_098_merge_8/usr.sbin/nscd/agents/services.h projects/openssl_098_merge_8/usr.sbin/nscd/cachelib.c projects/openssl_098_merge_8/usr.sbin/nscd/cachelib.h projects/openssl_098_merge_8/usr.sbin/nscd/cacheplcs.c projects/openssl_098_merge_8/usr.sbin/nscd/cacheplcs.h projects/openssl_098_merge_8/usr.sbin/nscd/config.c projects/openssl_098_merge_8/usr.sbin/nscd/config.h projects/openssl_098_merge_8/usr.sbin/nscd/debug.c projects/openssl_098_merge_8/usr.sbin/nscd/debug.h projects/openssl_098_merge_8/usr.sbin/nscd/hashtable.h projects/openssl_098_merge_8/usr.sbin/nscd/log.c projects/openssl_098_merge_8/usr.sbin/nscd/mp_rs_query.c projects/openssl_098_merge_8/usr.sbin/nscd/mp_ws_query.c projects/openssl_098_merge_8/usr.sbin/nscd/nscd.c projects/openssl_098_merge_8/usr.sbin/nscd/nscdcli.c projects/openssl_098_merge_8/usr.sbin/nscd/parser.c projects/openssl_098_merge_8/usr.sbin/nscd/protocol.c projects/openssl_098_merge_8/usr.sbin/nscd/protocol.h projects/openssl_098_merge_8/usr.sbin/nscd/query.c projects/openssl_098_merge_8/usr.sbin/nscd/query.h projects/openssl_098_merge_8/usr.sbin/nscd/singletons.c projects/openssl_098_merge_8/usr.sbin/pstat/Makefile projects/openssl_098_merge_8/usr.sbin/pstat/pstat.c projects/openssl_098_merge_8/usr.sbin/sysinstall/devices.c projects/openssl_098_merge_8/usr.sbin/syslogd/syslog.conf.5 Modified: projects/openssl_098_merge_8/UPDATING ============================================================================== --- projects/openssl_098_merge_8/UPDATING Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/UPDATING Sat Jun 13 08:04:56 2009 (r194100) @@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090611: + The layout of struct thread has changed. Kernel and modules + need to be rebuilt. + 20090608: The layout of structs ifnet, domain, protosw and vnet_net has changed. Kernel modules need to be rebuilt. Modified: projects/openssl_098_merge_8/contrib/csup/rcsfile.c ============================================================================== --- projects/openssl_098_merge_8/contrib/csup/rcsfile.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/contrib/csup/rcsfile.c Sat Jun 13 08:04:56 2009 (r194100) @@ -730,7 +730,7 @@ rcsfile_print(struct rcsfile *rf) lprintf(1, "Strict!\n"); if (rf->comment != NULL) lprintf(1, "comment: '%s'\n", rf->comment); - if (rf->expand != EXPAND_DEFAULT); + if (rf->expand != EXPAND_DEFAULT) lprintf(1, "expand: '%s'\n", keyword_encode_expand(rf->expand)); /* Print all deltas. */ Modified: projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c ============================================================================== --- projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/contrib/gdb/gdb/stack.c Sat Jun 13 08:04:56 2009 (r194100) @@ -1230,6 +1230,22 @@ backtrace_command_1 (char *count_exp, in printf_filtered ("(More stack frames follow...)\n"); } +struct backtrace_command_args + { + char *count_exp; + int show_locals; + int from_tty; + }; + +/* Stub to call backtrace_command_1 by way of an error catcher. */ +static int +backtrace_command_stub (void *data) +{ + struct backtrace_command_args *args = (struct backtrace_command_args *)data; + backtrace_command_1 (args->count_exp, args->show_locals, args->from_tty); + return 0; +} + static void backtrace_command (char *arg, int from_tty) { @@ -1237,6 +1253,7 @@ backtrace_command (char *arg, int from_t char **argv = (char **) NULL; int argIndicatingFullTrace = (-1), totArgLen = 0, argc = 0; char *argPtr = arg; + struct backtrace_command_args btargs; if (arg != (char *) NULL) { @@ -1286,7 +1303,10 @@ backtrace_command (char *arg, int from_t } } - backtrace_command_1 (argPtr, (argIndicatingFullTrace >= 0), from_tty); + btargs.count_exp = argPtr; + btargs.show_locals = (argIndicatingFullTrace >= 0); + btargs.from_tty = from_tty; + catch_errors (backtrace_command_stub, (char *)&btargs, "", RETURN_MASK_ERROR); if (argIndicatingFullTrace >= 0 && totArgLen > 0) xfree (argPtr); @@ -1299,7 +1319,11 @@ static void backtrace_full_command (char static void backtrace_full_command (char *arg, int from_tty) { - backtrace_command_1 (arg, 1, from_tty); + struct backtrace_command_args btargs; + btargs.count_exp = arg; + btargs.show_locals = 1; + btargs.from_tty = from_tty; + catch_errors (backtrace_command_stub, (char *)&btargs, "", RETURN_MASK_ERROR); } Modified: projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c ============================================================================== --- projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/contrib/ntp/ntpd/ntp_crypto.c Sat Jun 13 08:04:56 2009 (r194100) @@ -570,7 +570,7 @@ crypto_recv( peer->issuer = emalloc(vallen + 1); strcpy(peer->issuer, peer->subject); temp32 = (fstamp >> 16) & 0xffff; - sprintf(statstr, + snprintf(statstr, NTP_MAXSTRLEN, "flags 0x%x host %s signature %s", fstamp, peer->subject, OBJ_nid2ln(temp32)); record_crypto_stats(&peer->srcadr, statstr); @@ -636,7 +636,8 @@ crypto_recv( } peer->flash &= ~TEST8; temp32 = cinfo->nid; - sprintf(statstr, "cert %s 0x%x %s (%u) fs %u", + snprintf(statstr, NTP_MAXSTRLEN, + "cert %s 0x%x %s (%u) fs %u", cinfo->subject, cinfo->flags, OBJ_nid2ln(temp32), temp32, ntohl(ep->fstamp)); @@ -685,7 +686,7 @@ crypto_recv( peer->crypto |= CRYPTO_FLAG_VRFY | CRYPTO_FLAG_PROV; peer->flash &= ~TEST8; - sprintf(statstr, "iff fs %u", + snprintf(statstr, NTP_MAXSTRLEN, "iff fs %u", ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); #ifdef DEBUG @@ -733,7 +734,7 @@ crypto_recv( peer->crypto |= CRYPTO_FLAG_VRFY | CRYPTO_FLAG_PROV; peer->flash &= ~TEST8; - sprintf(statstr, "gq fs %u", + snprintf(statstr, NTP_MAXSTRLEN, "gq fs %u", ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); #ifdef DEBUG @@ -774,7 +775,7 @@ crypto_recv( peer->crypto |= CRYPTO_FLAG_VRFY | CRYPTO_FLAG_PROV; peer->flash &= ~TEST8; - sprintf(statstr, "mv fs %u", + snprintf(statstr, NTP_MAXSTRLEN, "mv fs %u", ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); #ifdef DEBUG @@ -828,7 +829,7 @@ crypto_recv( peer->crypto &= ~CRYPTO_FLAG_AUTO; peer->crypto |= CRYPTO_FLAG_AGREE; peer->flash &= ~TEST8; - sprintf(statstr, "cook %x ts %u fs %u", + snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u", peer->pcookie, ntohl(ep->tstamp), ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); @@ -893,7 +894,7 @@ crypto_recv( peer->crypto &= ~CRYPTO_FLAG_AUTO; peer->crypto |= CRYPTO_FLAG_AGREE; peer->flash &= ~TEST8; - sprintf(statstr, "cook %x ts %u fs %u", + snprintf(statstr, NTP_MAXSTRLEN, "cook %x ts %u fs %u", peer->pcookie, ntohl(ep->tstamp), ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); @@ -944,7 +945,7 @@ crypto_recv( peer->pkeyid = bp->key; peer->crypto |= CRYPTO_FLAG_AUTO; peer->flash &= ~TEST8; - sprintf(statstr, + snprintf(statstr, NTP_MAXSTRLEN, "auto seq %d key %x ts %u fs %u", bp->seq, bp->key, ntohl(ep->tstamp), ntohl(ep->fstamp)); @@ -987,7 +988,8 @@ crypto_recv( peer->crypto |= CRYPTO_FLAG_SIGN; peer->flash &= ~TEST8; temp32 = cinfo->nid; - sprintf(statstr, "sign %s 0x%x %s (%u) fs %u", + snprintf(statstr, NTP_MAXSTRLEN, + "sign %s 0x%x %s (%u) fs %u", cinfo->issuer, cinfo->flags, OBJ_nid2ln(temp32), temp32, ntohl(ep->fstamp)); @@ -1071,7 +1073,8 @@ crypto_recv( crypto_flags |= CRYPTO_FLAG_TAI; peer->crypto |= CRYPTO_FLAG_LEAP; peer->flash &= ~TEST8; - sprintf(statstr, "leap %u ts %u fs %u", vallen, + snprintf(statstr, NTP_MAXSTRLEN, + "leap %u ts %u fs %u", vallen, ntohl(ep->tstamp), ntohl(ep->fstamp)); record_crypto_stats(&peer->srcadr, statstr); #ifdef DEBUG @@ -1127,7 +1130,7 @@ crypto_recv( * cheerfully ignored, as the message is not sent. */ if (rval > XEVNT_TSP) { - sprintf(statstr, + snprintf(statstr, NTP_MAXSTRLEN, "error %x opcode %x ts %u fs %u", rval, code, tstamp, fstamp); record_crypto_stats(&peer->srcadr, statstr); @@ -1453,7 +1456,8 @@ crypto_xmit( */ if (rval != XEVNT_OK) { opcode |= CRYPTO_ERROR; - sprintf(statstr, "error %x opcode %x", rval, opcode); + snprintf(statstr, NTP_MAXSTRLEN, + "error %x opcode %x", rval, opcode); record_crypto_stats(srcadr_sin, statstr); report_event(rval, NULL); #ifdef DEBUG @@ -1952,7 +1956,8 @@ crypto_update(void) if (EVP_SignFinal(&ctx, tai_leap.sig, &len, sign_pkey)) tai_leap.siglen = htonl(len); } - sprintf(statstr, "update ts %u", ntohl(hostval.tstamp)); + snprintf(statstr, NTP_MAXSTRLEN, + "update ts %u", ntohl(hostval.tstamp)); record_crypto_stats(NULL, statstr); #ifdef DEBUG if (debug) @@ -3606,7 +3611,7 @@ crypto_key( */ if ((ptr = strrchr(linkname, '\n')) != NULL) *ptr = '\0'; - sprintf(statstr, "%s mod %d", &linkname[2], + snprintf(statstr, NTP_MAXSTRLEN, "%s mod %d", &linkname[2], EVP_PKEY_size(pkey) * 8); record_crypto_stats(NULL, statstr); #ifdef DEBUG @@ -3715,8 +3720,8 @@ crypto_cert( if ((ptr = strrchr(linkname, '\n')) != NULL) *ptr = '\0'; - sprintf(statstr, "%s 0x%x len %lu", &linkname[2], ret->flags, - len); + snprintf(statstr, NTP_MAXSTRLEN, + "%s 0x%x len %lu", &linkname[2], ret->flags, len); record_crypto_stats(NULL, statstr); #ifdef DEBUG if (debug) @@ -3832,7 +3837,7 @@ crypto_tai( for (j = 0; j < i; j++) *ptr++ = htonl(leapsec[j]); crypto_flags |= CRYPTO_FLAG_TAI; - sprintf(statstr, "%s fs %u leap %u len %u", cp, fstamp, + snprintf(statstr, NTP_MAXSTRLEN, "%s fs %u leap %u len %u", cp, fstamp, leapsec[--j], len); record_crypto_stats(NULL, statstr); #ifdef DEBUG Modified: projects/openssl_098_merge_8/etc/defaults/rc.conf ============================================================================== --- projects/openssl_098_merge_8/etc/defaults/rc.conf Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/etc/defaults/rc.conf Sat Jun 13 08:04:56 2009 (r194100) @@ -83,6 +83,7 @@ geli_swap_flags="-e aes -l 256 -s 4096 - root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. +fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. Modified: projects/openssl_098_merge_8/etc/mtree/BSD.local.dist ============================================================================== --- projects/openssl_098_merge_8/etc/mtree/BSD.local.dist Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/etc/mtree/BSD.local.dist Sat Jun 13 08:04:56 2009 (r194100) @@ -541,12 +541,30 @@ .. bg_BG.UTF-8 .. + ca_AD.ISO8859-1 + .. ca_ES.ISO8859-1 .. + ca_FR.ISO8859-1 + .. + ca_IT.ISO8859-1 + .. + ca_AD.ISO8859-15 + .. ca_ES.ISO8859-15 .. + ca_FR.ISO8859-15 + .. + ca_IT.ISO8859-15 + .. + ca_AD.UTF-8 + .. ca_ES.UTF-8 .. + ca_FR.UTF-8 + .. + ca_IT.UTF-8 + .. cs_CZ.ISO8859-2 .. cs_CZ.UTF-8 Modified: projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist ============================================================================== --- projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/etc/mtree/BSD.usr.dist Sat Jun 13 08:04:56 2009 (r194100) @@ -357,12 +357,30 @@ .. bg_BG.UTF-8 .. + ca_AD.ISO8859-1 + .. ca_ES.ISO8859-1 .. + ca_FR.ISO8859-1 + .. + ca_IT.ISO8859-1 + .. + ca_AD.ISO8859-15 + .. ca_ES.ISO8859-15 .. + ca_FR.ISO8859-15 + .. + ca_IT.ISO8859-15 + .. + ca_AD.UTF-8 + .. ca_ES.UTF-8 .. + ca_FR.UTF-8 + .. + ca_IT.UTF-8 + .. cs_CZ.ISO8859-2 .. cs_CZ.UTF-8 Modified: projects/openssl_098_merge_8/etc/rc.d/fsck ============================================================================== --- projects/openssl_098_merge_8/etc/rc.d/fsck Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/etc/rc.d/fsck Sat Jun 13 08:04:56 2009 (r194100) @@ -44,8 +44,8 @@ fsck_start() ;; 8) if checkyesno fsck_y_enable; then - echo "File system preen failed, trying fsck -y." - fsck -y + echo "File system preen failed, trying fsck -y ${fsck_y_flags}" + fsck -y ${fsck_y_flags} case $? in 0) ;; Modified: projects/openssl_098_merge_8/etc/rc.d/jail ============================================================================== --- projects/openssl_098_merge_8/etc/rc.d/jail Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/etc/rc.d/jail Sat Jun 13 08:04:56 2009 (r194100) @@ -52,7 +52,7 @@ init_variables() eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\" i=1 - while [ true ]; do + while : ; do eval _exec_afterstart${i}=\"\${jail_${_j}_exec_afterstart${i}:-\${jail_exec_afterstart${i}}}\" [ -z "$(eval echo \"\$_exec_afterstart${i}\")" ] && break i=$((i + 1)) @@ -132,7 +132,6 @@ init_variables() debug "$_j procdir: $_procdir" debug "$_j ruleset: $_ruleset" debug "$_j fstab: $_fstab" - debug "$_j consolelog: $_consolelog" i=0 while : ; do @@ -147,7 +146,7 @@ init_variables() debug "$_j exec start: $_exec_start" i=1 - while [ true ]; do + while : ; do eval out=\"\${_exec_afterstart${i}:-''}\" if [ -z "$out" ]; then @@ -642,7 +641,7 @@ jail_start() if [ "$?" -eq 0 ] ; then _jail_id=$(head -1 ${_tmp_jail}) i=1 - while [ true ]; do + while : ; do eval out=\"\${_exec_afterstart${i}:-''}\" if [ -z "$out" ]; then Modified: projects/openssl_098_merge_8/etc/syslog.conf ============================================================================== --- projects/openssl_098_merge_8/etc/syslog.conf Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/etc/syslog.conf Sat Jun 13 08:04:56 2009 (r194100) @@ -28,3 +28,4 @@ cron.* /var/log/cron # news.notice /var/log/news/news.notice !ppp *.* /var/log/ppp.log +!* Modified: projects/openssl_098_merge_8/etc/termcap.small ============================================================================== --- projects/openssl_098_merge_8/etc/termcap.small Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/etc/termcap.small Sat Jun 13 08:04:56 2009 (r194100) @@ -138,7 +138,7 @@ cons60l1|cons60-iso8859-1:\ cons60l1-m|cons60-iso8859-1-mono:\ :li#60:tc=cons25l1-m: # ISO 8859-7 FreeBSD console with ACS support -cons25l7:cons25-iso8859-7:\ +cons25l7|cons25-iso8859-7:\ :ac=f\260g\261{\360}\243+\253,\273i\247:\ :tc=cons25w: cons25l7-m|cons25-iso8859-7-mono:\ Modified: projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c ============================================================================== --- projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libc/stdtime/strftime.c Sat Jun 13 08:04:56 2009 (r194100) @@ -57,7 +57,7 @@ extern char * tzname[]; #define IN_THIS 2 #define IN_ALL 3 -#define PAD_DEFAULT 0 +#define PAD_DEFAULT 0 #define PAD_LESS 1 #define PAD_SPACE 2 #define PAD_ZERO 3 @@ -65,7 +65,7 @@ extern char * tzname[]; static const char* fmt_padding[][4] = { /* DEFAULT, LESS, SPACE, ZERO */ #define PAD_FMT_MONTHDAY 0 -#define PAD_FMT_HMS 0 +#define PAD_FMT_HMS 0 #define PAD_FMT_CENTURY 0 #define PAD_FMT_SHORTYEAR 0 #define PAD_FMT_MONTH 0 Modified: projects/openssl_098_merge_8/lib/libpmc/libpmc.c ============================================================================== --- projects/openssl_098_merge_8/lib/libpmc/libpmc.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libpmc/libpmc.c Sat Jun 13 08:04:56 2009 (r194100) @@ -591,22 +591,22 @@ iap_allocate_pmc(enum pmc_event pe, char pmc_config->pm_caps |= PMC_CAP_USER; } else if (KWMATCH(p, IAP_KW_ANYTHREAD)) { pmc_config->pm_md.pm_iap.pm_iap_config |= IAP_ANY; - } else if (KWMATCH(p, IAP_KW_CORE)) { + } else if (KWPREFIXMATCH(p, IAP_KW_CORE "=")) { n = pmc_parse_mask(iap_core_mask, p, &evmask); if (n != 1) return (-1); - } else if (KWMATCH(p, IAP_KW_AGENT)) { + } else if (KWPREFIXMATCH(p, IAP_KW_AGENT "=")) { n = pmc_parse_mask(iap_agent_mask, p, &evmask); if (n != 1) return (-1); - } else if (KWMATCH(p, IAP_KW_PREFETCH)) { + } else if (KWPREFIXMATCH(p, IAP_KW_PREFETCH "=")) { n = pmc_parse_mask(iap_prefetch_mask, p, &evmask); if (n != 1) return (-1); - } else if (KWMATCH(p, IAP_KW_CACHESTATE)) { + } else if (KWPREFIXMATCH(p, IAP_KW_CACHESTATE "=")) { n = pmc_parse_mask(iap_cachestate_mask, p, &cachestate); } else if (cpu_info.pm_cputype == PMC_CPU_INTEL_CORE && - KWMATCH(p, IAP_KW_TRANSITION)) { + KWPREFIXMATCH(p, IAP_KW_TRANSITION "=")) { n = pmc_parse_mask(iap_transition_mask, p, &evmask); if (n != 1) return (-1); @@ -614,10 +614,10 @@ iap_allocate_pmc(enum pmc_event pe, char cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 || cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME || cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7) { - if (KWMATCH(p, IAP_KW_SNOOPRESPONSE)) { + if (KWPREFIXMATCH(p, IAP_KW_SNOOPRESPONSE "=")) { n = pmc_parse_mask(iap_snoopresponse_mask, p, &evmask); - } else if (KWMATCH(p, IAP_KW_SNOOPTYPE)) { + } else if (KWPREFIXMATCH(p, IAP_KW_SNOOPTYPE "=")) { n = pmc_parse_mask(iap_snooptype_mask, p, &evmask); } else Modified: projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3 ============================================================================== --- projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3 Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libpmc/pmc.core2.3 Sat Jun 13 08:04:56 2009 (r194100) @@ -1,4 +1,4 @@ -.\" Copyright (c) 2008 Joseph Koshy. All rights reserved. +.\" Copyright (c) 2008,2009 Joseph Koshy. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 12, 2008 +.Dd June 8, 2009 .Os .Dt PMC.CORE2 3 .Sh NAME @@ -42,7 +42,7 @@ family CPUs CPUs contain PMCs conforming to version 2 of the .Tn Intel performance measurement architecture. -These CPUs contains two classes of PMCs: +These CPUs may contain upto two classes of PMCs: .Bl -tag -width "Li PMC_CLASS_IAP" .It Li PMC_CLASS_IAF Fixed-function counters that count only one hardware event per counter. @@ -66,6 +66,7 @@ Intel Core2 PMCs are documented in .Ss CORE2 FIXED FUNCTION PMCS These PMCs and their supported events are documented in .Xr pmc.iaf 3 . +Not all CPUs in this family implement fixed-function counters. .Ss CORE2 PROGRAMMABLE PMCS The programmable PMCs support the following capabilities: .Bl -column "PMC_CAP_INTERRUPT" "Support" Modified: projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c ============================================================================== --- projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libthread_db/libthr_db.c Sat Jun 13 08:04:56 2009 (r194100) @@ -457,6 +457,7 @@ pt_thr_get_info(const td_thrhandle_t *th { const td_thragent_t *ta = th->th_ta; struct ptrace_lwpinfo linfo; + int traceme; int state; int ret; @@ -470,7 +471,8 @@ pt_thr_get_info(const td_thrhandle_t *th if (ret != 0) return (TD_ERR); ret = thr_pread_int(ta, th->th_thread + ta->thread_off_report_events, - &info->ti_traceme); + &traceme); + info->ti_traceme = traceme; if (ret != 0) return (TD_ERR); ret = ps_pread(ta->ph, th->th_thread + ta->thread_off_event_mask, Modified: projects/openssl_098_merge_8/lib/libthread_db/thread_db.h ============================================================================== --- projects/openssl_098_merge_8/lib/libthread_db/thread_db.h Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libthread_db/thread_db.h Sat Jun 13 08:04:56 2009 (r194100) @@ -184,7 +184,7 @@ typedef struct { int ti_pri; lwpid_t ti_lid; char ti_db_suspended; - int ti_traceme; + char ti_traceme; sigset_t ti_sigmask; sigset_t ti_pending; psaddr_t ti_tls; Modified: projects/openssl_098_merge_8/lib/libufs/type.c ============================================================================== --- projects/openssl_098_merge_8/lib/libufs/type.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libufs/type.c Sat Jun 13 08:04:56 2009 (r194100) @@ -108,7 +108,10 @@ again: if ((ret = stat(name, &st)) < 0) */ name = oname; } - if (ret >= 0 && S_ISCHR(st.st_mode)) { + if (ret >= 0 && S_ISREG(st.st_mode)) { + /* Possibly a disk image, give it a try. */ + ; + } else if (ret >= 0 && S_ISCHR(st.st_mode)) { /* This is what we need, do nothing. */ ; } else if ((fs = getfsfile(name)) != NULL) { Modified: projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3 ============================================================================== --- projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3 Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libufs/ufs_disk_close.3 Sat Jun 13 08:04:56 2009 (r194100) @@ -53,7 +53,7 @@ and populate the structure pointed to by The disk is opened read-only. The specified .Fa name -may be either a mountpoint, or a device name. +may be either a mountpoint, a device name or a filesystem image. The .Fn ufs_disk_fillout function assumes there is a valid superblock and will fail if not, Modified: projects/openssl_098_merge_8/lib/libusb/libusb.3 ============================================================================== --- projects/openssl_098_merge_8/lib/libusb/libusb.3 Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libusb/libusb.3 Sat Jun 13 08:04:56 2009 (r194100) @@ -117,8 +117,6 @@ USB access library (libusb -lusb) .Ft const char * .Fn libusb20_dev_get_desc "struct libusb20_device *pdev" .Ft int -.Fn libusb20_dev_claim_interface "struct libusb20_device *pdev" "uint8_t iface_index" -.Ft int .Fn libusb20_dev_close "struct libusb20_device *pdev" .Ft int .Fn libusb20_dev_detach_kernel_driver "struct libusb20_device *pdev" "uint8_t iface_index" @@ -135,8 +133,6 @@ USB access library (libusb -lusb) .Ft int .Fn libusb20_dev_process "struct libusb20_device *pdev" .Ft int -.Fn libusb20_dev_release_interface "struct libusb20_device *pdev" "uint8_t iface_index" -.Ft int .Fn libusb20_dev_request_sync "struct libusb20_device *pdev" "struct LIBUSB20_CONTROL_SETUP_DECODED *setup" "void *data" "uint16_t *pactlen" "uint32_t timeout" "uint8_t flags" .Ft int .Fn libusb20_dev_req_string_sync "struct libusb20_device *pdev" "uint8_t index" "uint16_t langid" "void *ptr" "uint16_t len" @@ -517,14 +513,6 @@ The format of the string is: "drivername . .Pp . -.Fn libusb20_dev_claim_interface -This function will try to claim the given USB interface given by -.Fa iface_index . -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. .Fn libusb20_dev_close will close the given USB device. . @@ -601,14 +589,6 @@ detached. . .Pp . -.Fn libusb20_dev_release_interface -will try to release a claimed USB interface for the specified USB device. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. .Fn libusb20_dev_request_sync will perform a synchronous control request on the given USB device. Modified: projects/openssl_098_merge_8/lib/libusb/libusb20.c ============================================================================== --- projects/openssl_098_merge_8/lib/libusb/libusb20.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libusb/libusb20.c Sat Jun 13 08:04:56 2009 (r194100) @@ -65,8 +65,6 @@ dummy_callback(struct libusb20_transfer #define dummy_get_config_desc_full (void *)dummy_int #define dummy_get_config_index (void *)dummy_int #define dummy_set_config_index (void *)dummy_int -#define dummy_claim_interface (void *)dummy_int -#define dummy_release_interface (void *)dummy_int #define dummy_set_alt_index (void *)dummy_int #define dummy_reset_device (void *)dummy_int #define dummy_set_power_mode (void *)dummy_int @@ -451,24 +449,6 @@ libusb20_tr_start(struct libusb20_transf /* USB device operations */ int -libusb20_dev_claim_interface(struct libusb20_device *pdev, uint8_t ifaceIndex) -{ - int error; - - if (ifaceIndex >= 32) { - error = LIBUSB20_ERROR_INVALID_PARAM; - } else if (pdev->claimed_interfaces & (1 << ifaceIndex)) { - error = LIBUSB20_ERROR_NOT_FOUND; - } else { - error = pdev->methods->claim_interface(pdev, ifaceIndex); - } - if (!error) { - pdev->claimed_interfaces |= (1 << ifaceIndex); - } - return (error); -} - -int libusb20_dev_close(struct libusb20_device *pdev) { struct libusb20_transfer *xfer; @@ -494,7 +474,11 @@ libusb20_dev_close(struct libusb20_devic pdev->is_opened = 0; - pdev->claimed_interfaces = 0; + /* + * The following variable is only used by the libusb v0.1 + * compat layer: + */ + pdev->claimed_interface = 0; return (error); } @@ -580,24 +564,6 @@ libusb20_dev_open(struct libusb20_device } int -libusb20_dev_release_interface(struct libusb20_device *pdev, uint8_t ifaceIndex) -{ - int error; - - if (ifaceIndex >= 32) { - error = LIBUSB20_ERROR_INVALID_PARAM; - } else if (!(pdev->claimed_interfaces & (1 << ifaceIndex))) { - error = LIBUSB20_ERROR_NOT_FOUND; - } else { - error = pdev->methods->release_interface(pdev, ifaceIndex); - } - if (!error) { - pdev->claimed_interfaces &= ~(1 << ifaceIndex); - } - return (error); -} - -int libusb20_dev_reset(struct libusb20_device *pdev) { int error; Modified: projects/openssl_098_merge_8/lib/libusb/libusb20.h ============================================================================== --- projects/openssl_098_merge_8/lib/libusb/libusb20.h Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libusb/libusb20.h Sat Jun 13 08:04:56 2009 (r194100) @@ -237,7 +237,6 @@ void *libusb20_tr_get_priv_sc1(struct const char *libusb20_dev_get_backend_name(struct libusb20_device *pdev); const char *libusb20_dev_get_desc(struct libusb20_device *pdev); -int libusb20_dev_claim_interface(struct libusb20_device *pdev, uint8_t iface_index); int libusb20_dev_close(struct libusb20_device *pdev); int libusb20_dev_detach_kernel_driver(struct libusb20_device *pdev, uint8_t iface_index); int libusb20_dev_set_config_index(struct libusb20_device *pdev, uint8_t configIndex); @@ -246,7 +245,6 @@ int libusb20_dev_get_fd(struct libusb20_ int libusb20_dev_kernel_driver_active(struct libusb20_device *pdev, uint8_t iface_index); int libusb20_dev_open(struct libusb20_device *pdev, uint16_t transfer_max); int libusb20_dev_process(struct libusb20_device *pdev); -int libusb20_dev_release_interface(struct libusb20_device *pdev, uint8_t iface_index); int libusb20_dev_request_sync(struct libusb20_device *pdev, struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags); int libusb20_dev_req_string_sync(struct libusb20_device *pdev, uint8_t index, uint16_t langid, void *ptr, uint16_t len); int libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, uint8_t index, void *ptr, uint16_t len); Modified: projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c ============================================================================== --- projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libusb/libusb20_compat01.c Sat Jun 13 08:04:56 2009 (r194100) @@ -99,26 +99,6 @@ struct usb_parse_state { uint8_t preparse; }; -static uint8_t -usb_get_first_claimed_interface(usb_dev_handle * dev) -{ - struct libusb20_device *pdev = (void *)dev; - uint32_t x; - uint8_t y; - - x = pdev->claimed_interfaces; - - for (y = 0; y != 32; y++) { - if (x & (1 << y)) - break; - } - - if (y == 32) - y = 0xFF; /* dummy */ - - return (y); -} - static struct libusb20_transfer * usb_get_transfer_by_ep_no(usb_dev_handle * dev, uint8_t ep_no) { @@ -746,12 +726,9 @@ usb_set_configuration(usb_dev_handle * u int usb_claim_interface(usb_dev_handle * dev, int interface) { - int err; - - err = libusb20_dev_claim_interface((void *)dev, interface); + struct libusb20_device *pdev = (void *)dev; - if (err) - return (-1); + pdev->claimed_interface = interface; return (0); } @@ -759,23 +736,18 @@ usb_claim_interface(usb_dev_handle * dev int usb_release_interface(usb_dev_handle * dev, int interface) { - int err; - - err = libusb20_dev_release_interface((void *)dev, interface); - - if (err) - return (-1); - + /* do nothing */ return (0); } int usb_set_altinterface(usb_dev_handle * dev, int alternate) { + struct libusb20_device *pdev = (void *)dev; int err; uint8_t iface; - iface = usb_get_first_claimed_interface(dev); + iface = pdev->claimed_interface; err = libusb20_dev_set_alt_index((void *)dev, iface, alternate); Modified: projects/openssl_098_merge_8/lib/libusb/libusb20_int.h ============================================================================== --- projects/openssl_098_merge_8/lib/libusb/libusb20_int.h Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libusb/libusb20_int.h Sat Jun 13 08:04:56 2009 (r194100) @@ -90,14 +90,12 @@ typedef int (libusb20_dummy_int_t)(void) typedef void (libusb20_dummy_void_t)(void); /* USB device specific */ -typedef int (libusb20_claim_interface_t)(struct libusb20_device *pdev, uint8_t iface_index); typedef int (libusb20_detach_kernel_driver_t)(struct libusb20_device *pdev, uint8_t iface_index); typedef int (libusb20_do_request_sync_t)(struct libusb20_device *pdev, struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags); typedef int (libusb20_get_config_desc_full_t)(struct libusb20_device *pdev, uint8_t **ppbuf, uint16_t *plen, uint8_t index); typedef int (libusb20_get_config_index_t)(struct libusb20_device *pdev, uint8_t *pindex); typedef int (libusb20_kernel_driver_active_t)(struct libusb20_device *pdev, uint8_t iface_index); typedef int (libusb20_process_t)(struct libusb20_device *pdev); -typedef int (libusb20_release_interface_t)(struct libusb20_device *pdev, uint8_t iface_index); typedef int (libusb20_reset_device_t)(struct libusb20_device *pdev); typedef int (libusb20_set_power_mode_t)(struct libusb20_device *pdev, uint8_t power_mode); typedef int (libusb20_get_power_mode_t)(struct libusb20_device *pdev, uint8_t *power_mode); @@ -112,14 +110,12 @@ typedef void (libusb20_tr_submit_t)(stru typedef void (libusb20_tr_cancel_async_t)(struct libusb20_transfer *xfer); #define LIBUSB20_DEVICE(m,n) \ - m(n, claim_interface) \ m(n, detach_kernel_driver) \ m(n, do_request_sync) \ m(n, get_config_desc_full) \ m(n, get_config_index) \ m(n, kernel_driver_active) \ m(n, process) \ - m(n, release_interface) \ m(n, reset_device) \ m(n, set_power_mode) \ m(n, get_power_mode) \ @@ -198,8 +194,8 @@ struct libusb20_device { /* libUSB v0.1 compat data */ void *priv01Data; - /* claimed interfaces */ - uint32_t claimed_interfaces; + /* claimed interface */ + uint8_t claimed_interface; /* device file handle */ int file; Modified: projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c ============================================================================== --- projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libusb/libusb20_ugen20.c Sat Jun 13 08:04:56 2009 (r194100) @@ -67,8 +67,6 @@ const struct libusb20_backend_methods li static libusb20_get_config_desc_full_t ugen20_get_config_desc_full; static libusb20_get_config_index_t ugen20_get_config_index; static libusb20_set_config_index_t ugen20_set_config_index; -static libusb20_claim_interface_t ugen20_claim_interface; -static libusb20_release_interface_t ugen20_release_interface; static libusb20_set_alt_index_t ugen20_set_alt_index; static libusb20_reset_device_t ugen20_reset_device; static libusb20_set_power_mode_t ugen20_set_power_mode; @@ -517,28 +515,6 @@ ugen20_set_config_index(struct libusb20_ } static int -ugen20_claim_interface(struct libusb20_device *pdev, uint8_t iface_index) -{ - int temp = iface_index; - - if (ioctl(pdev->file_ctrl, USB_CLAIM_INTERFACE, &temp)) { - return (LIBUSB20_ERROR_OTHER); - } - return (0); -} - -static int -ugen20_release_interface(struct libusb20_device *pdev, uint8_t iface_index) -{ - int temp = iface_index; - - if (ioctl(pdev->file_ctrl, USB_RELEASE_INTERFACE, &temp)) { - return (LIBUSB20_ERROR_OTHER); - } - return (0); -} - -static int ugen20_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index) { Modified: projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3 ============================================================================== --- projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3 Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libutil/kinfo_getfile.3 Sat Jun 13 08:04:56 2009 (r194100) @@ -35,6 +35,7 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h +.In sys/user.h .In libutil.h .Ft struct kinfo_file * .Fn kinfo_getfile "pid_t pid" "int *cntp" @@ -58,7 +59,7 @@ mib. While the kernel returns a packed structure, this function expands the data into a fixed record format. .Sh RETURN VALUES -The +On success the .Fn kinfo_getfile function returns a pointer to an array of .Vt struct kinfo_file @@ -67,6 +68,10 @@ The array was obtained by an internal ca .Xr malloc 3 and must be freed by the caller with a call to .Xr free 3 . +On failure the +.Fn kinfo_getfile +function returns +.Dv NULL . .Sh SEE ALSO .Xr free 3 , .Xr kinfo_getvmmap 3 , Modified: projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3 ============================================================================== --- projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3 Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/libutil/kinfo_getvmmap.3 Sat Jun 13 08:04:56 2009 (r194100) @@ -35,6 +35,7 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h +.In sys/user.h .In libutil.h .Ft struct kinfo_vmentry * .Fn kinfo_getfile "pid_t pid" "int *cntp" @@ -58,7 +59,7 @@ mib. While the kernel returns a packed structure, this function expands the data into a fixed record format. .Sh RETURN VALUES -The +On success the .Fn kinfo_getvmmap function returns a pointer to an array of .Vt struct kinfo_vmentry @@ -67,6 +68,10 @@ The array was obtained by an internal ca .Xr malloc 3 and must be freed by the caller with a call to .Xr free 3 . +On failure the +.Fn kinfo_getvmmap +function returns +.Dv NULL . .Sh SEE ALSO .Xr free 3 , .Xr kinfo_getfile 3 , Modified: projects/openssl_098_merge_8/lib/msun/src/math_private.h ============================================================================== --- projects/openssl_098_merge_8/lib/msun/src/math_private.h Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/lib/msun/src/math_private.h Sat Jun 13 08:04:56 2009 (r194100) @@ -262,7 +262,7 @@ irint(double x) { int n; - asm("cvtsd2si %1,%0" : "=r" (n) : "Y" (x)); + asm("cvtsd2si %1,%0" : "=r" (n) : "x" (x)); return (n); } #define HAVE_EFFICIENT_IRINT Modified: projects/openssl_098_merge_8/sbin/dhclient/dhclient.c ============================================================================== --- projects/openssl_098_merge_8/sbin/dhclient/dhclient.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/sbin/dhclient/dhclient.c Sat Jun 13 08:04:56 2009 (r194100) @@ -1977,7 +1977,7 @@ supersede: len = ip->client-> config->defaults[i].len + lease->options[i].len; - if (len > sizeof(dbuf)) { + if (len >= sizeof(dbuf)) { warning("no space to %s %s", "prepend option", dhcp_options[i].name); @@ -1996,24 +1996,34 @@ supersede: dp[len] = '\0'; break; case ACTION_APPEND: + /* + * When we append, we assume that we're + * appending to text. Some MS servers + * include a NUL byte at the end of + * the search string provided. + */ len = ip->client-> config->defaults[i].len + lease->options[i].len; - if (len > sizeof(dbuf)) { + if (len >= sizeof(dbuf)) { warning("no space to %s %s", "append option", dhcp_options[i].name); goto supersede; } - dp = dbuf; - memcpy(dp, + memcpy(dbuf, lease->options[i].data, lease->options[i].len); - memcpy(dp + lease->options[i].len, + for (dp = dbuf + lease->options[i].len; + dp > dbuf; dp--, len--) + if (dp[-1] != '\0') + break; + memcpy(dp, ip->client-> config->defaults[i].data, ip->client-> config->defaults[i].len); + dp = dbuf; dp[len] = '\0'; } } else { Modified: projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8 ============================================================================== --- projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8 Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/sbin/fsck_msdosfs/fsck_msdosfs.8 Sat Jun 13 08:04:56 2009 (r194100) @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 13, 1995 +.Dd June 4, 2009 .Dt FSCK_MSDOSFS 8 .Os .Sh NAME @@ -41,10 +41,10 @@ .Sh SYNOPSIS .Nm .Fl p -.Op Fl f +.Op Fl Cf .Ar filesystem ... .Nm -.Op Fl ny +.Op Fl Cny .Ar filesystem ... .Sh DESCRIPTION The @@ -80,6 +80,10 @@ making any changes. .Pp The options are as follows: .Bl -tag -width indent +.It Fl C +Compatibility with the corresponding +.Xr fsck 8 +option (skip check if clean), defined to no-op. .It Fl F Compatibility with the wrapper .Xr fsck 8 Modified: projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c ============================================================================== --- projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/sbin/fsck_msdosfs/main.c Sat Jun 13 08:04:56 2009 (r194100) @@ -74,8 +74,10 @@ main(int argc, char **argv) int ch; skipclean = 1; - while ((ch = getopt(argc, argv, "fFnpy")) != -1) { + while ((ch = getopt(argc, argv, "CfFnpy")) != -1) { switch (ch) { + case 'C': /* for fsck_ffs compatibility */ + break; case 'f': skipclean = 0; break; Modified: projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8 ============================================================================== --- projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8 Sat Jun 13 04:56:45 2009 (r194099) +++ projects/openssl_098_merge_8/sbin/geom/class/label/glabel.8 Sat Jun 13 08:04:56 2009 (r194100) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906130804.n5D84vi0006940>