Date: Sat, 28 Jul 2012 07:56:24 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r238860 - in projects/arm_eabi: . bin/cat bin/ps bin/sh bin/stty cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma c... Message-ID: <201207280756.q6S7uOik099592@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Sat Jul 28 07:56:23 2012 New Revision: 238860 URL: http://svn.freebsd.org/changeset/base/238860 Log: MFC to r238858 Added: projects/arm_eabi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include/ - copied from r238858, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/include/ projects/arm_eabi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh - copied unchanged from r238858, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh projects/arm_eabi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.badstruct.d - copied unchanged from r238858, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.badstruct.d projects/arm_eabi/contrib/dtc/dtdiff - copied unchanged from r238858, head/contrib/dtc/dtdiff projects/arm_eabi/contrib/dtc/fdtdump.c - copied unchanged from r238858, head/contrib/dtc/fdtdump.c projects/arm_eabi/contrib/dtc/fdtget.c - copied unchanged from r238858, head/contrib/dtc/fdtget.c projects/arm_eabi/contrib/dtc/fdtput.c - copied unchanged from r238858, head/contrib/dtc/fdtput.c projects/arm_eabi/contrib/dtc/libfdt/fdt_empty_tree.c - copied unchanged from r238858, head/contrib/dtc/libfdt/fdt_empty_tree.c projects/arm_eabi/contrib/libarchive/libarchive/archive_getdate.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/archive_getdate.c projects/arm_eabi/contrib/libarchive/libarchive/archive_match.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/archive_match.c projects/arm_eabi/contrib/libarchive/libarchive/archive_pathmatch.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/archive_pathmatch.c projects/arm_eabi/contrib/libarchive/libarchive/archive_pathmatch.h - copied unchanged from r238858, head/contrib/libarchive/libarchive/archive_pathmatch.h projects/arm_eabi/contrib/libarchive/libarchive/archive_write_add_filter.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/archive_write_add_filter.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_archive_getdate.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/test/test_archive_getdate.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_archive_match_owner.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/test/test_archive_match_owner.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_archive_match_path.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/test/test_archive_match_path.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_archive_match_time.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/test/test_archive_match_time.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_archive_pathmatch.c - copied unchanged from r238858, head/contrib/libarchive/libarchive/test/test_archive_pathmatch.c projects/arm_eabi/contrib/libarchive/tar/test/test_format_newc.c - copied unchanged from r238858, head/contrib/libarchive/tar/test/test_format_newc.c projects/arm_eabi/contrib/libarchive/tar/test/test_option_nodump.c - copied unchanged from r238858, head/contrib/libarchive/tar/test/test_option_nodump.c projects/arm_eabi/lib/libc/locale/iswalnum_l.3 - copied unchanged from r238858, head/lib/libc/locale/iswalnum_l.3 projects/arm_eabi/lib/msun/ld128/s_expl.c - copied unchanged from r238858, head/lib/msun/ld128/s_expl.c projects/arm_eabi/lib/msun/ld80/s_expl.c - copied unchanged from r238858, head/lib/msun/ld80/s_expl.c projects/arm_eabi/share/dtrace/hotopen - copied unchanged from r238858, head/share/dtrace/hotopen projects/arm_eabi/share/dtrace/nfsattrstats - copied unchanged from r238858, head/share/dtrace/nfsattrstats projects/arm_eabi/share/examples/libusb20/ - copied from r238858, head/share/examples/libusb20/ projects/arm_eabi/sys/arm/at91/at91_pio_sam9g45.h - copied unchanged from r238858, head/sys/arm/at91/at91_pio_sam9g45.h projects/arm_eabi/sys/arm/at91/at91sam9g45.c - copied unchanged from r238858, head/sys/arm/at91/at91sam9g45.c projects/arm_eabi/sys/arm/at91/at91sam9g45reg.h - copied unchanged from r238858, head/sys/arm/at91/at91sam9g45reg.h projects/arm_eabi/sys/arm/at91/board_sam9260ek.c - copied unchanged from r238858, head/sys/arm/at91/board_sam9260ek.c projects/arm_eabi/sys/arm/at91/board_sn9g45.c - copied unchanged from r238858, head/sys/arm/at91/board_sn9g45.c projects/arm_eabi/sys/arm/at91/std.at91sam9g45 - copied unchanged from r238858, head/sys/arm/at91/std.at91sam9g45 projects/arm_eabi/sys/arm/at91/std.sam9260ek - copied unchanged from r238858, head/sys/arm/at91/std.sam9260ek projects/arm_eabi/sys/arm/at91/std.sn9g45 - copied unchanged from r238858, head/sys/arm/at91/std.sn9g45 projects/arm_eabi/sys/arm/conf/SAM9260EK - copied unchanged from r238858, head/sys/arm/conf/SAM9260EK projects/arm_eabi/sys/arm/conf/SAM9260EK.hints - copied unchanged from r238858, head/sys/arm/conf/SAM9260EK.hints projects/arm_eabi/sys/arm/conf/SN9G45 - copied unchanged from r238858, head/sys/arm/conf/SN9G45 projects/arm_eabi/sys/contrib/libfdt/fdt_empty_tree.c - copied unchanged from r238858, head/sys/contrib/libfdt/fdt_empty_tree.c projects/arm_eabi/sys/dev/ahci/ahciem.c - copied unchanged from r238858, head/sys/dev/ahci/ahciem.c projects/arm_eabi/sys/dev/ath/if_ath_tx_edma.c - copied unchanged from r238858, head/sys/dev/ath/if_ath_tx_edma.c projects/arm_eabi/sys/dev/ath/if_ath_tx_edma.h - copied unchanged from r238858, head/sys/dev/ath/if_ath_tx_edma.h projects/arm_eabi/tools/build/options/WITH_BSDCONFIG - copied unchanged from r238858, head/tools/build/options/WITH_BSDCONFIG projects/arm_eabi/tools/regression/bin/sh/builtins/local1.0 - copied unchanged from r238858, head/tools/regression/bin/sh/builtins/local1.0 projects/arm_eabi/tools/regression/bin/sh/expansion/export2.0 - copied unchanged from r238858, head/tools/regression/bin/sh/expansion/export2.0 projects/arm_eabi/tools/regression/bin/sh/expansion/export3.0 - copied unchanged from r238858, head/tools/regression/bin/sh/expansion/export3.0 projects/arm_eabi/tools/regression/bin/sh/expansion/local1.0 - copied unchanged from r238858, head/tools/regression/bin/sh/expansion/local1.0 projects/arm_eabi/tools/regression/bin/sh/expansion/local2.0 - copied unchanged from r238858, head/tools/regression/bin/sh/expansion/local2.0 projects/arm_eabi/tools/regression/bin/sh/expansion/readonly1.0 - copied unchanged from r238858, head/tools/regression/bin/sh/expansion/readonly1.0 projects/arm_eabi/tools/tools/ath/athratestats/ - copied from r238858, head/tools/tools/ath/athratestats/ projects/arm_eabi/usr.sbin/bsdconfig/ - copied from r238858, head/usr.sbin/bsdconfig/ Deleted: projects/arm_eabi/contrib/dtc/Makefile.convert-dtsv0 projects/arm_eabi/contrib/dtc/Makefile.ftdump projects/arm_eabi/contrib/dtc/convert-dtsv0-lexer.l projects/arm_eabi/contrib/dtc/ftdump.c projects/arm_eabi/contrib/libarchive/cpio/test/test_pathmatch.c projects/arm_eabi/contrib/libarchive/libarchive_fe/matching.c projects/arm_eabi/contrib/libarchive/libarchive_fe/matching.h projects/arm_eabi/contrib/libarchive/libarchive_fe/pathmatch.c projects/arm_eabi/contrib/libarchive/libarchive_fe/pathmatch.h projects/arm_eabi/contrib/libarchive/tar/getdate.c projects/arm_eabi/contrib/libarchive/tar/test/test_getdate.c projects/arm_eabi/contrib/libarchive/tar/tree.c projects/arm_eabi/contrib/libarchive/tar/tree.h projects/arm_eabi/sys/arm/at91/at91_pio_rm9200.h projects/arm_eabi/sys/arm/at91/hints.at91rm9200 projects/arm_eabi/sys/arm/at91/hints.at91sam9261 projects/arm_eabi/sys/vm/vm_contig.c Modified: projects/arm_eabi/ObsoleteFiles.inc projects/arm_eabi/UPDATING projects/arm_eabi/bin/cat/cat.c projects/arm_eabi/bin/ps/print.c projects/arm_eabi/bin/sh/eval.c projects/arm_eabi/bin/sh/exec.c projects/arm_eabi/bin/sh/exec.h projects/arm_eabi/bin/sh/jobs.c projects/arm_eabi/bin/sh/jobs.h projects/arm_eabi/bin/sh/sh.1 projects/arm_eabi/bin/sh/trap.c projects/arm_eabi/bin/stty/extern.h projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h projects/arm_eabi/contrib/bind9/CHANGES projects/arm_eabi/contrib/bind9/lib/dns/resolver.c projects/arm_eabi/contrib/bind9/lib/dns/zone.c projects/arm_eabi/contrib/bind9/version projects/arm_eabi/contrib/dtc/Documentation/dts-format.txt projects/arm_eabi/contrib/dtc/Documentation/manual.txt projects/arm_eabi/contrib/dtc/Makefile projects/arm_eabi/contrib/dtc/checks.c projects/arm_eabi/contrib/dtc/data.c projects/arm_eabi/contrib/dtc/dtc-lexer.l projects/arm_eabi/contrib/dtc/dtc-parser.y projects/arm_eabi/contrib/dtc/dtc.c projects/arm_eabi/contrib/dtc/dtc.h projects/arm_eabi/contrib/dtc/flattree.c projects/arm_eabi/contrib/dtc/fstree.c projects/arm_eabi/contrib/dtc/libfdt/Makefile.libfdt projects/arm_eabi/contrib/dtc/libfdt/fdt.c projects/arm_eabi/contrib/dtc/libfdt/fdt_ro.c projects/arm_eabi/contrib/dtc/libfdt/fdt_rw.c projects/arm_eabi/contrib/dtc/libfdt/libfdt.h projects/arm_eabi/contrib/dtc/libfdt/libfdt_env.h projects/arm_eabi/contrib/dtc/libfdt/libfdt_internal.h projects/arm_eabi/contrib/dtc/livetree.c projects/arm_eabi/contrib/dtc/srcpos.c projects/arm_eabi/contrib/dtc/srcpos.h projects/arm_eabi/contrib/dtc/treesource.c projects/arm_eabi/contrib/dtc/util.c projects/arm_eabi/contrib/dtc/util.h projects/arm_eabi/contrib/gcc/config/arm/freebsd.h projects/arm_eabi/contrib/gcc/config/i386/freebsd.h projects/arm_eabi/contrib/gcc/config/i386/freebsd64.h projects/arm_eabi/contrib/gcc/config/ia64/freebsd.h projects/arm_eabi/contrib/gcc/config/mips/freebsd.h projects/arm_eabi/contrib/gcc/config/rs6000/freebsd.h projects/arm_eabi/contrib/gcc/config/sparc/freebsd.h projects/arm_eabi/contrib/groff/tmac/doc-common projects/arm_eabi/contrib/groff/tmac/doc-syms projects/arm_eabi/contrib/groff/tmac/doc.tmac projects/arm_eabi/contrib/groff/tmac/groff_mdoc.man projects/arm_eabi/contrib/less/NEWS projects/arm_eabi/contrib/less/README projects/arm_eabi/contrib/less/brac.c projects/arm_eabi/contrib/less/ch.c projects/arm_eabi/contrib/less/charset.c projects/arm_eabi/contrib/less/charset.h projects/arm_eabi/contrib/less/cmd.h projects/arm_eabi/contrib/less/cmdbuf.c projects/arm_eabi/contrib/less/command.c projects/arm_eabi/contrib/less/cvt.c projects/arm_eabi/contrib/less/decode.c projects/arm_eabi/contrib/less/defines.ds projects/arm_eabi/contrib/less/defines.o2 projects/arm_eabi/contrib/less/defines.o9 projects/arm_eabi/contrib/less/defines.wn projects/arm_eabi/contrib/less/edit.c projects/arm_eabi/contrib/less/filename.c projects/arm_eabi/contrib/less/forwback.c projects/arm_eabi/contrib/less/funcs.h projects/arm_eabi/contrib/less/help.c projects/arm_eabi/contrib/less/ifile.c projects/arm_eabi/contrib/less/input.c projects/arm_eabi/contrib/less/jump.c projects/arm_eabi/contrib/less/less.h projects/arm_eabi/contrib/less/less.hlp projects/arm_eabi/contrib/less/less.man projects/arm_eabi/contrib/less/less.nro projects/arm_eabi/contrib/less/lessecho.c projects/arm_eabi/contrib/less/lessecho.man projects/arm_eabi/contrib/less/lessecho.nro projects/arm_eabi/contrib/less/lesskey.c projects/arm_eabi/contrib/less/lesskey.h projects/arm_eabi/contrib/less/lesskey.man projects/arm_eabi/contrib/less/lesskey.nro projects/arm_eabi/contrib/less/lglob.h projects/arm_eabi/contrib/less/line.c projects/arm_eabi/contrib/less/linenum.c projects/arm_eabi/contrib/less/lsystem.c projects/arm_eabi/contrib/less/main.c projects/arm_eabi/contrib/less/mark.c projects/arm_eabi/contrib/less/mkhelp.c projects/arm_eabi/contrib/less/optfunc.c projects/arm_eabi/contrib/less/option.c projects/arm_eabi/contrib/less/option.h projects/arm_eabi/contrib/less/opttbl.c projects/arm_eabi/contrib/less/os.c projects/arm_eabi/contrib/less/output.c projects/arm_eabi/contrib/less/pattern.c projects/arm_eabi/contrib/less/pattern.h projects/arm_eabi/contrib/less/pckeys.h projects/arm_eabi/contrib/less/position.c projects/arm_eabi/contrib/less/position.h projects/arm_eabi/contrib/less/prompt.c projects/arm_eabi/contrib/less/screen.c projects/arm_eabi/contrib/less/scrsize.c projects/arm_eabi/contrib/less/search.c projects/arm_eabi/contrib/less/signal.c projects/arm_eabi/contrib/less/tags.c projects/arm_eabi/contrib/less/ttyin.c projects/arm_eabi/contrib/less/version.c projects/arm_eabi/contrib/libarchive/FREEBSD-Xlist (contents, props changed) projects/arm_eabi/contrib/libarchive/FREEBSD-upgrade projects/arm_eabi/contrib/libarchive/NEWS projects/arm_eabi/contrib/libarchive/README projects/arm_eabi/contrib/libarchive/cpio/bsdcpio.1 projects/arm_eabi/contrib/libarchive/cpio/cmdline.c projects/arm_eabi/contrib/libarchive/cpio/cpio.c projects/arm_eabi/contrib/libarchive/cpio/cpio.h projects/arm_eabi/contrib/libarchive/cpio/test/main.c projects/arm_eabi/contrib/libarchive/cpio/test/test.h projects/arm_eabi/contrib/libarchive/libarchive/archive.h projects/arm_eabi/contrib/libarchive/libarchive/archive_acl.c projects/arm_eabi/contrib/libarchive/libarchive/archive_check_magic.c projects/arm_eabi/contrib/libarchive/libarchive/archive_endian.h projects/arm_eabi/contrib/libarchive/libarchive/archive_entry.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_entry.c projects/arm_eabi/contrib/libarchive/libarchive/archive_entry.h projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_acl.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_link_resolver.c projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_linkify.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_paths.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_perms.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_stat.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_stat.c projects/arm_eabi/contrib/libarchive/libarchive/archive_entry_time.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_ppmd7.c projects/arm_eabi/contrib/libarchive/libarchive/archive_private.h projects/arm_eabi/contrib/libarchive/libarchive/archive_read.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_data.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_disk.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_disk_private.h projects/arm_eabi/contrib/libarchive/libarchive/archive_read_extract.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_filter.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_format.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_free.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_header.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_new.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_open.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_open_fd.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_open_filename.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_private.h projects/arm_eabi/contrib/libarchive/libarchive/archive_read_set_options.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_7zip.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_cab.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_cpio.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_lha.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_mtree.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_rar.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_tar.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_xar.c projects/arm_eabi/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/arm_eabi/contrib/libarchive/libarchive/archive_string.c projects/arm_eabi/contrib/libarchive/libarchive/archive_string.h projects/arm_eabi/contrib/libarchive/libarchive/archive_string_composition.h projects/arm_eabi/contrib/libarchive/libarchive/archive_string_sprintf.c projects/arm_eabi/contrib/libarchive/libarchive/archive_util.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_util.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_add_filter_compress.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_add_filter_program.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_add_filter_xz.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_blocksize.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_data.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_disk.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_filter.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_finish_entry.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_format.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_free.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_header.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_new.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_open.3 projects/arm_eabi/contrib/libarchive/libarchive/archive_write_open_filename.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_private.h projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_7zip.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_ar.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_cpio.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_gnutar.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_mtree.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_pax.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_ustar.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_xar.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_format_zip.c projects/arm_eabi/contrib/libarchive/libarchive/archive_write_set_options.3 projects/arm_eabi/contrib/libarchive/libarchive/cpio.5 projects/arm_eabi/contrib/libarchive/libarchive/libarchive-formats.5 projects/arm_eabi/contrib/libarchive/libarchive/libarchive.3 projects/arm_eabi/contrib/libarchive/libarchive/libarchive_changes.3 projects/arm_eabi/contrib/libarchive/libarchive/libarchive_internals.3 projects/arm_eabi/contrib/libarchive/libarchive/tar.5 projects/arm_eabi/contrib/libarchive/libarchive/test/main.c projects/arm_eabi/contrib/libarchive/libarchive/test/read_open_memory.c projects/arm_eabi/contrib/libarchive/libarchive/test/test.h projects/arm_eabi/contrib/libarchive/libarchive/test/test_archive_string_conversion.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_compat_zip.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_format_7zip.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_format_cab.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_format_rar.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_format_rar_unicode.rar.uu projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_format_tar_filename.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_pax_truncated.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_read_position.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_sparse_basic.c projects/arm_eabi/contrib/libarchive/libarchive/test/test_write_format_zip.c projects/arm_eabi/contrib/libarchive/libarchive_fe/err.c projects/arm_eabi/contrib/libarchive/libarchive_fe/err.h projects/arm_eabi/contrib/libarchive/tar/bsdtar.1 projects/arm_eabi/contrib/libarchive/tar/bsdtar.c projects/arm_eabi/contrib/libarchive/tar/bsdtar.h projects/arm_eabi/contrib/libarchive/tar/read.c projects/arm_eabi/contrib/libarchive/tar/test/main.c projects/arm_eabi/contrib/libarchive/tar/test/test.h projects/arm_eabi/contrib/libarchive/tar/write.c projects/arm_eabi/etc/mtree/BSD.usr.dist projects/arm_eabi/etc/rc.d/bgfsck projects/arm_eabi/etc/rc.d/ip6addrctl projects/arm_eabi/etc/rc.d/jail projects/arm_eabi/gnu/usr.bin/groff/tmac/Makefile projects/arm_eabi/gnu/usr.bin/groff/tmac/mdoc.local projects/arm_eabi/lib/libarchive/Makefile projects/arm_eabi/lib/libarchive/test/Makefile projects/arm_eabi/lib/libc/locale/Makefile.inc projects/arm_eabi/lib/libc/net/getaddrinfo.c projects/arm_eabi/lib/libc/rpc/getnetpath.c projects/arm_eabi/lib/libc/stdlib/at_quick_exit.3 projects/arm_eabi/lib/libc/stdlib/quick_exit.3 projects/arm_eabi/lib/libc/string/strerror.3 projects/arm_eabi/lib/libc/sys/fcntl.2 projects/arm_eabi/lib/libc/sys/fcntl.c projects/arm_eabi/lib/libedit/el.c projects/arm_eabi/lib/libedit/histedit.h projects/arm_eabi/lib/libedit/makelist projects/arm_eabi/lib/libedit/term.c projects/arm_eabi/lib/libedit/tokenizer.c projects/arm_eabi/lib/libelf/Makefile projects/arm_eabi/lib/libthr/thread/thr_getschedparam.c projects/arm_eabi/lib/libthr/thread/thr_info.c projects/arm_eabi/lib/libthr/thread/thr_setprio.c projects/arm_eabi/lib/libthr/thread/thr_setschedparam.c projects/arm_eabi/lib/msun/Makefile projects/arm_eabi/lib/msun/Symbol.map projects/arm_eabi/lib/msun/man/exp.3 projects/arm_eabi/lib/msun/src/e_exp.c projects/arm_eabi/lib/msun/src/math.h projects/arm_eabi/lib/msun/src/math_private.h projects/arm_eabi/lib/msun/src/s_cbrtl.c projects/arm_eabi/libexec/rtld-elf/rtld.1 projects/arm_eabi/libexec/rtld-elf/rtld.c projects/arm_eabi/libexec/rtld-elf/rtld.h projects/arm_eabi/sbin/geom/class/sched/gsched.8 projects/arm_eabi/sbin/hastd/hast.conf.5 projects/arm_eabi/sbin/ipfw/ipfw.8 projects/arm_eabi/share/dtrace/Makefile projects/arm_eabi/share/examples/Makefile projects/arm_eabi/share/man/man4/ahci.4 projects/arm_eabi/share/man/man4/gpib.4 projects/arm_eabi/share/man/man4/ugen.4 projects/arm_eabi/share/man/man4/uplcom.4 projects/arm_eabi/share/man/man4/uslcom.4 projects/arm_eabi/share/man/man5/moduli.5 projects/arm_eabi/share/man/man5/rc.conf.5 projects/arm_eabi/share/man/man5/src.conf.5 projects/arm_eabi/share/man/man9/ieee80211_node.9 projects/arm_eabi/share/man/man9/kernel_mount.9 projects/arm_eabi/share/man/man9/malloc.9 projects/arm_eabi/share/misc/bsd-family-tree projects/arm_eabi/share/mk/bsd.own.mk projects/arm_eabi/sys/amd64/amd64/cpu_switch.S projects/arm_eabi/sys/amd64/amd64/fpu.c projects/arm_eabi/sys/amd64/amd64/machdep.c projects/arm_eabi/sys/amd64/amd64/pmap.c projects/arm_eabi/sys/amd64/amd64/ptrace_machdep.c projects/arm_eabi/sys/amd64/amd64/trap.c projects/arm_eabi/sys/amd64/amd64/vm_machdep.c projects/arm_eabi/sys/amd64/include/fpu.h projects/arm_eabi/sys/amd64/include/md_var.h projects/arm_eabi/sys/amd64/include/pcpu.h projects/arm_eabi/sys/arm/arm/nexus.c projects/arm_eabi/sys/arm/at91/at91.c projects/arm_eabi/sys/arm/at91/at91_machdep.c projects/arm_eabi/sys/arm/at91/at91_pmc.c projects/arm_eabi/sys/arm/at91/at91_pmcreg.h projects/arm_eabi/sys/arm/at91/at91rm9200_devices.c projects/arm_eabi/sys/arm/at91/at91rm9200var.h projects/arm_eabi/sys/arm/at91/board_bwct.c projects/arm_eabi/sys/arm/at91/board_ethernut5.c projects/arm_eabi/sys/arm/at91/board_hl200.c projects/arm_eabi/sys/arm/at91/board_kb920x.c projects/arm_eabi/sys/arm/at91/board_tsc4370.c projects/arm_eabi/sys/arm/at91/files.at91 projects/arm_eabi/sys/arm/at91/std.atmel projects/arm_eabi/sys/arm/at91/uart_bus_at91usart.c projects/arm_eabi/sys/arm/conf/ATMEL projects/arm_eabi/sys/arm/conf/ETHERNUT5 projects/arm_eabi/sys/arm/conf/ETHERNUT5.hints projects/arm_eabi/sys/arm/econa/econa.c projects/arm_eabi/sys/arm/s3c2xx0/s3c24x0.c projects/arm_eabi/sys/arm/xscale/i8134x/i81342.c projects/arm_eabi/sys/arm/xscale/pxa/pxa_obio.c projects/arm_eabi/sys/boot/arm/at91/bootspi/ee.c projects/arm_eabi/sys/boot/arm/at91/libat91/at91rm9200.h projects/arm_eabi/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c projects/arm_eabi/sys/boot/arm/at91/libat91/eeprom.c projects/arm_eabi/sys/boot/arm/at91/libat91/emac_init.c projects/arm_eabi/sys/boot/arm/at91/libat91/lib_AT91RM9200.h projects/arm_eabi/sys/boot/arm/at91/libat91/spi_flash.c projects/arm_eabi/sys/boot/ficl/Makefile projects/arm_eabi/sys/boot/sparc64/loader/main.c projects/arm_eabi/sys/boot/zfs/Makefile projects/arm_eabi/sys/cam/scsi/scsi_all.c projects/arm_eabi/sys/cam/scsi/scsi_da.c projects/arm_eabi/sys/cam/scsi/scsi_enc_ses.c projects/arm_eabi/sys/cam/scsi/scsi_ses.h projects/arm_eabi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/arm_eabi/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/arm_eabi/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/arm_eabi/sys/compat/ia32/ia32_sysvec.c projects/arm_eabi/sys/compat/ia32/ia32_util.h projects/arm_eabi/sys/conf/Makefile.arm projects/arm_eabi/sys/conf/files projects/arm_eabi/sys/contrib/libfdt/fdt.c projects/arm_eabi/sys/contrib/libfdt/fdt_ro.c projects/arm_eabi/sys/contrib/libfdt/fdt_rw.c projects/arm_eabi/sys/contrib/libfdt/libfdt.h projects/arm_eabi/sys/contrib/libfdt/libfdt_env.h projects/arm_eabi/sys/contrib/libfdt/libfdt_internal.h projects/arm_eabi/sys/contrib/pf/net/pf_if.c projects/arm_eabi/sys/dev/aac/aac_disk.c projects/arm_eabi/sys/dev/ahci/ahci.c projects/arm_eabi/sys/dev/ahci/ahci.h projects/arm_eabi/sys/dev/ata/ata-all.c projects/arm_eabi/sys/dev/ata/ata-lowlevel.c projects/arm_eabi/sys/dev/ath/ath_hal/ah.c projects/arm_eabi/sys/dev/ath/ath_hal/ah.h projects/arm_eabi/sys/dev/ath/ath_hal/ah_desc.h projects/arm_eabi/sys/dev/ath/ath_hal/ah_internal.h projects/arm_eabi/sys/dev/ath/ath_hal/ar5210/ar5210.h projects/arm_eabi/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c projects/arm_eabi/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c projects/arm_eabi/sys/dev/ath/ath_hal/ar5211/ar5211.h projects/arm_eabi/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c projects/arm_eabi/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c projects/arm_eabi/sys/dev/ath/ath_hal/ar5212/ar5212.h projects/arm_eabi/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c projects/arm_eabi/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c projects/arm_eabi/sys/dev/ath/ath_hal/ar5416/ar5416.h projects/arm_eabi/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c projects/arm_eabi/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/arm_eabi/sys/dev/ath/ath_rate/amrr/amrr.c projects/arm_eabi/sys/dev/ath/ath_rate/onoe/onoe.c projects/arm_eabi/sys/dev/ath/ath_rate/sample/sample.c projects/arm_eabi/sys/dev/ath/ath_rate/sample/sample.h projects/arm_eabi/sys/dev/ath/if_ath.c projects/arm_eabi/sys/dev/ath/if_ath_ahb.c projects/arm_eabi/sys/dev/ath/if_ath_beacon.c projects/arm_eabi/sys/dev/ath/if_ath_misc.h projects/arm_eabi/sys/dev/ath/if_ath_pci.c projects/arm_eabi/sys/dev/ath/if_ath_rx.c projects/arm_eabi/sys/dev/ath/if_ath_rx_edma.c projects/arm_eabi/sys/dev/ath/if_ath_sysctl.c projects/arm_eabi/sys/dev/ath/if_ath_tx.c projects/arm_eabi/sys/dev/ath/if_ath_tx.h projects/arm_eabi/sys/dev/ath/if_ath_tx_ht.c projects/arm_eabi/sys/dev/ath/if_athioctl.h projects/arm_eabi/sys/dev/ath/if_athrate.h projects/arm_eabi/sys/dev/ath/if_athvar.h projects/arm_eabi/sys/dev/e1000/if_lem.c projects/arm_eabi/sys/dev/isp/isp.c projects/arm_eabi/sys/dev/ispfw/asm_2300.h projects/arm_eabi/sys/dev/mps/mps_sas_lsi.c projects/arm_eabi/sys/dev/netmap/netmap.c projects/arm_eabi/sys/dev/netmap/netmap_kern.h projects/arm_eabi/sys/dev/netmap/netmap_mem2.c projects/arm_eabi/sys/dev/sdhci/sdhci.c projects/arm_eabi/sys/dev/sym/sym_hipd.c projects/arm_eabi/sys/dev/usb/controller/at91dci_atmelarm.c projects/arm_eabi/sys/dev/usb/controller/ohci_atmelarm.c projects/arm_eabi/sys/dev/usb/controller/xhci_pci.c projects/arm_eabi/sys/dev/usb/controller/xhcireg.h projects/arm_eabi/sys/dev/usb/net/if_udav.c projects/arm_eabi/sys/dev/usb/net/if_udavreg.h projects/arm_eabi/sys/dev/usb/quirk/usb_quirk.c projects/arm_eabi/sys/dev/usb/serial/u3g.c projects/arm_eabi/sys/dev/usb/serial/uplcom.c projects/arm_eabi/sys/dev/usb/serial/uslcom.c projects/arm_eabi/sys/dev/usb/usbdevs projects/arm_eabi/sys/fs/cd9660/cd9660_vfsops.c projects/arm_eabi/sys/fs/ext2fs/ext2_vfsops.c projects/arm_eabi/sys/fs/msdosfs/msdosfs_lookup.c projects/arm_eabi/sys/fs/portalfs/portal_vnops.c projects/arm_eabi/sys/fs/smbfs/smbfs_node.c projects/arm_eabi/sys/fs/udf/udf_vfsops.c projects/arm_eabi/sys/geom/geom.h projects/arm_eabi/sys/geom/geom_subr.c projects/arm_eabi/sys/geom/part/g_part.c projects/arm_eabi/sys/i386/i386/machdep.c projects/arm_eabi/sys/i386/i386/pmap.c projects/arm_eabi/sys/i386/i386/ptrace_machdep.c projects/arm_eabi/sys/i386/i386/trap.c projects/arm_eabi/sys/i386/i386/vm86.c projects/arm_eabi/sys/i386/i386/vm_machdep.c projects/arm_eabi/sys/i386/include/npx.h projects/arm_eabi/sys/i386/include/pcpu.h projects/arm_eabi/sys/i386/isa/npx.c projects/arm_eabi/sys/kern/imgact_aout.c projects/arm_eabi/sys/kern/imgact_elf.c projects/arm_eabi/sys/kern/kern_descrip.c projects/arm_eabi/sys/kern/kern_malloc.c projects/arm_eabi/sys/kern/kern_proc.c projects/arm_eabi/sys/kern/kern_tc.c projects/arm_eabi/sys/mips/mips/pmap.c projects/arm_eabi/sys/modules/ahci/Makefile projects/arm_eabi/sys/modules/ath/Makefile projects/arm_eabi/sys/net/if_stf.c projects/arm_eabi/sys/netgraph/ng_ether.c projects/arm_eabi/sys/netinet/in_var.h projects/arm_eabi/sys/netinet/ip_carp.c projects/arm_eabi/sys/netinet/ip_output.c projects/arm_eabi/sys/netinet/sctp_asconf.c projects/arm_eabi/sys/netinet/sctp_input.c projects/arm_eabi/sys/netinet/sctp_output.c projects/arm_eabi/sys/netinet/sctp_pcb.c projects/arm_eabi/sys/netinet/sctp_uio.h projects/arm_eabi/sys/netinet/sctp_usrreq.c projects/arm_eabi/sys/netinet/sctputil.c projects/arm_eabi/sys/netinet/tcp_input.c projects/arm_eabi/sys/netinet/tcp_output.c projects/arm_eabi/sys/netinet6/sctp6_usrreq.c projects/arm_eabi/sys/netipsec/ipsec_output.c projects/arm_eabi/sys/sys/fcntl.h projects/arm_eabi/sys/sys/refcount.h projects/arm_eabi/sys/sys/stat.h projects/arm_eabi/sys/sys/user.h projects/arm_eabi/sys/ufs/ffs/ffs_snapshot.c projects/arm_eabi/sys/ufs/ffs/ffs_vfsops.c projects/arm_eabi/sys/vm/memguard.c projects/arm_eabi/sys/vm/memguard.h projects/arm_eabi/sys/vm/vm_kern.c projects/arm_eabi/sys/vm/vm_map.h projects/arm_eabi/sys/vm/vm_page.c projects/arm_eabi/sys/vm/vm_pageout.c projects/arm_eabi/sys/vm/vm_pageout.h projects/arm_eabi/sys/vm/vm_reserv.c projects/arm_eabi/sys/x86/include/specialreg.h projects/arm_eabi/sys/x86/x86/tsc.c projects/arm_eabi/tools/build/mk/OptionalObsoleteFiles.inc projects/arm_eabi/tools/tools/ath/Makefile projects/arm_eabi/tools/tools/ath/common/diag.h projects/arm_eabi/tools/tools/sysbuild/sysbuild.sh projects/arm_eabi/usr.bin/Makefile projects/arm_eabi/usr.bin/cpio/Makefile projects/arm_eabi/usr.bin/cpio/test/Makefile projects/arm_eabi/usr.bin/du/du.1 projects/arm_eabi/usr.bin/du/du.c projects/arm_eabi/usr.bin/find/extern.h projects/arm_eabi/usr.bin/find/find.1 projects/arm_eabi/usr.bin/find/find.c projects/arm_eabi/usr.bin/find/function.c projects/arm_eabi/usr.bin/find/main.c projects/arm_eabi/usr.bin/find/option.c projects/arm_eabi/usr.bin/netstat/Makefile projects/arm_eabi/usr.bin/netstat/sctp.c projects/arm_eabi/usr.bin/nfsstat/nfsstat.c projects/arm_eabi/usr.bin/procstat/procstat.1 projects/arm_eabi/usr.bin/procstat/procstat_vm.c projects/arm_eabi/usr.bin/tar/Makefile projects/arm_eabi/usr.bin/tar/test/Makefile projects/arm_eabi/usr.sbin/Makefile projects/arm_eabi/usr.sbin/ipfwpcap/ipfwpcap.8 projects/arm_eabi/usr.sbin/lpr/common_source/common.c projects/arm_eabi/usr.sbin/pkg/pkg.c projects/arm_eabi/usr.sbin/wpa/hostapd/hostapd.8 Directory Properties: projects/arm_eabi/ (props changed) projects/arm_eabi/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi/contrib/bind9/ (props changed) projects/arm_eabi/contrib/dtc/ (props changed) projects/arm_eabi/contrib/gcc/ (props changed) projects/arm_eabi/contrib/groff/ (props changed) projects/arm_eabi/contrib/less/ (props changed) projects/arm_eabi/contrib/libarchive/ (props changed) projects/arm_eabi/contrib/libarchive/cpio/ (props changed) projects/arm_eabi/contrib/libarchive/libarchive/ (props changed) projects/arm_eabi/contrib/libarchive/libarchive_fe/ (props changed) projects/arm_eabi/contrib/libarchive/tar/ (props changed) projects/arm_eabi/lib/libc/ (props changed) projects/arm_eabi/sbin/ (props changed) projects/arm_eabi/sbin/ipfw/ (props changed) projects/arm_eabi/share/man/man4/ (props changed) projects/arm_eabi/sys/ (props changed) projects/arm_eabi/sys/boot/ (props changed) projects/arm_eabi/sys/cddl/contrib/opensolaris/ (props changed) projects/arm_eabi/sys/conf/ (props changed) projects/arm_eabi/sys/contrib/libfdt/ (props changed) projects/arm_eabi/sys/contrib/pf/ (props changed) projects/arm_eabi/usr.bin/procstat/ (props changed) Modified: projects/arm_eabi/ObsoleteFiles.inc ============================================================================== --- projects/arm_eabi/ObsoleteFiles.inc Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/ObsoleteFiles.inc Sat Jul 28 07:56:23 2012 (r238860) @@ -1358,6 +1358,11 @@ OLD_FILES+=usr/share/man/man2/kse_thr_in OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz OLD_FILES+=usr/lib32/libkse.so OLD_LIBS+=usr/lib32/libkse.so.3 +# 20080225: bsdar/bsdranlib rename to ar/ranlib +OLD_FILES+=usr/bin/bsdar +OLD_FILES+=usr/bin/bsdranlib +OLD_FILES+=usr/share/man/man1/bsdar.1.gz +OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal Modified: projects/arm_eabi/UPDATING ============================================================================== --- projects/arm_eabi/UPDATING Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/UPDATING Sat Jul 28 07:56:23 2012 (r238860) @@ -24,6 +24,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20120727: + The sparc64 ZFS loader has been changed to no longer try to auto- + detect ZFS providers based on diskN aliases but now requires these + to be explicitly listed in the OFW boot-device environment variable. + 20120712: The OpenSSL has been upgraded to 1.0.1c. Any binaries requiring libcrypto.so.6 or libssl.so.6 must be recompiled. Also, there are Modified: projects/arm_eabi/bin/cat/cat.c ============================================================================== --- projects/arm_eabi/bin/cat/cat.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/cat/cat.c Sat Jul 28 07:56:23 2012 (r238860) @@ -58,11 +58,11 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <fcntl.h> #include <locale.h> +#include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <stddef.h> static int bflag, eflag, nflag, sflag, tflag, vflag; static int rval; @@ -77,16 +77,20 @@ static void raw_cat(int); static int udom_open(const char *path, int flags); #endif -/* Memory strategy threshold, in pages: if physmem is larger then this, use a - * large buffer */ -#define PHYSPAGES_THRESHOLD (32*1024) - -/* Maximum buffer size in bytes - do not allow it to grow larger than this */ -#define BUFSIZE_MAX (2*1024*1024) - -/* Small (default) buffer size in bytes. It's inefficient for this to be - * smaller than MAXPHYS */ -#define BUFSIZE_SMALL (MAXPHYS) +/* + * Memory strategy threshold, in pages: if physmem is larger than this, + * use a large buffer. + */ +#define PHYSPAGES_THRESHOLD (32 * 1024) + +/* Maximum buffer size in bytes - do not allow it to grow larger than this. */ +#define BUFSIZE_MAX (2 * 1024 * 1024) + +/* + * Small (default) buffer size in bytes. It's inefficient for this to be + * smaller than MAXPHYS. + */ +#define BUFSIZE_SMALL (MAXPHYS) int main(int argc, char *argv[]) @@ -144,13 +148,12 @@ usage(void) static void scanfiles(char *argv[], int cooked) { - int i = 0; + int fd, i; char *path; FILE *fp; + i = 0; while ((path = argv[i]) != NULL || i == 0) { - int fd; - if (path == NULL || strcmp(path, "-") == 0) { filename = "stdin"; fd = STDIN_FILENO; @@ -257,16 +260,16 @@ raw_cat(int rfd) wfd = fileno(stdout); if (buf == NULL) { if (fstat(wfd, &sbuf)) - err(1, "%s", filename); + err(1, "stdout"); if (S_ISREG(sbuf.st_mode)) { /* If there's plenty of RAM, use a large copy buffer */ if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD) - bsize = MIN(BUFSIZE_MAX, MAXPHYS*8); + bsize = MIN(BUFSIZE_MAX, MAXPHYS * 8); else bsize = BUFSIZE_SMALL; } else - bsize = MAX(sbuf.st_blksize, - (blksize_t)sysconf(_SC_PAGESIZE)); + bsize = MAX(sbuf.st_blksize, + (blksize_t)sysconf(_SC_PAGESIZE)); if ((buf = malloc(bsize)) == NULL) err(1, "malloc() failure of IO buffer"); } @@ -327,7 +330,7 @@ udom_open(const char *path, int flags) break; } } - return(fd); + return (fd); } #endif Modified: projects/arm_eabi/bin/ps/print.c ============================================================================== --- projects/arm_eabi/bin/ps/print.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/ps/print.c Sat Jul 28 07:56:23 2012 (r238860) @@ -387,12 +387,13 @@ started(KINFO *k, VARENT *ve __unused) size_t buflen = 100; char *buf; + if (!k->ki_valid) + return (NULL); + buf = malloc(buflen); if (buf == NULL) errx(1, "malloc failed"); - if (!k->ki_valid) - return (NULL); if (use_ampm < 0) use_ampm = (*nl_langinfo(T_FMT_AMPM) != '\0'); then = k->ki_p->ki_start.tv_sec; @@ -415,12 +416,13 @@ lstarted(KINFO *k, VARENT *ve __unused) char *buf; size_t buflen = 100; + if (!k->ki_valid) + return (NULL); + buf = malloc(buflen); if (buf == NULL) errx(1, "malloc failed"); - if (!k->ki_valid) - return (NULL); then = k->ki_p->ki_start.tv_sec; (void)strftime(buf, buflen, "%c", localtime(&then)); return (buf); Modified: projects/arm_eabi/bin/sh/eval.c ============================================================================== --- projects/arm_eabi/bin/sh/eval.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/sh/eval.c Sat Jul 28 07:56:23 2012 (r238860) @@ -672,6 +672,52 @@ out: result->fd, result->buf, result->nleft, result->jp)); } +static int +mustexpandto(const char *argtext, const char *mask) +{ + for (;;) { + if (*argtext == CTLQUOTEMARK || *argtext == CTLQUOTEEND) { + argtext++; + continue; + } + if (*argtext == CTLESC) + argtext++; + else if (BASESYNTAX[(int)*argtext] == CCTL) + return (0); + if (*argtext != *mask) + return (0); + if (*argtext == '\0') + return (1); + argtext++; + mask++; + } +} + +static int +isdeclarationcmd(struct narg *arg) +{ + int have_command = 0; + + if (arg == NULL) + return (0); + while (mustexpandto(arg->text, "command")) { + have_command = 1; + arg = &arg->next->narg; + if (arg == NULL) + return (0); + /* + * To also allow "command -p" and "command --" as part of + * a declaration command, add code here. + * We do not do this, as ksh does not do it either and it + * is not required by POSIX. + */ + } + return (mustexpandto(arg->text, "export") || + mustexpandto(arg->text, "readonly") || + (mustexpandto(arg->text, "local") && + (have_command || !isfunc("local")))); +} + /* * Check if a builtin can safely be executed in the same process, * even though it should be in a subshell (command substitution). @@ -743,11 +789,12 @@ evalcommand(union node *cmd, int flags, exitstatus = 0; for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) { if (varflag && isassignment(argp->narg.text)) { - expandarg(argp, &varlist, EXP_VARTILDE); + expandarg(argp, varflag == 1 ? &varlist : &arglist, + EXP_VARTILDE); continue; - } + } else if (varflag == 1) + varflag = isdeclarationcmd(&argp->narg) ? 2 : 0; expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); - varflag = 0; } *arglist.lastp = NULL; *varlist.lastp = NULL; Modified: projects/arm_eabi/bin/sh/exec.c ============================================================================== --- projects/arm_eabi/bin/sh/exec.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/sh/exec.c Sat Jul 28 07:56:23 2012 (r238860) @@ -648,6 +648,19 @@ unsetfunc(const char *name) return (0); } + +/* + * Check if a function by a certain name exists. + */ +int +isfunc(const char *name) +{ + struct tblentry *cmdp; + cmdp = cmdlookup(name, 0); + return (cmdp != NULL && cmdp->cmdtype == CMDFUNCTION); +} + + /* * Shared code for the following builtin commands: * type, command -v, command -V Modified: projects/arm_eabi/bin/sh/exec.h ============================================================================== --- projects/arm_eabi/bin/sh/exec.h Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/sh/exec.h Sat Jul 28 07:56:23 2012 (r238860) @@ -72,5 +72,6 @@ void hashcd(void); void changepath(const char *); void defun(const char *, union node *); int unsetfunc(const char *); +int isfunc(const char *); int typecmd_impl(int, char **, int, const char *); void clearcmdentry(void); Modified: projects/arm_eabi/bin/sh/jobs.c ============================================================================== --- projects/arm_eabi/bin/sh/jobs.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/sh/jobs.c Sat Jul 28 07:56:23 2012 (r238860) @@ -84,7 +84,6 @@ static struct job *jobmru; /* most recen static pid_t initialpgrp; /* pgrp of shell on invocation */ #endif int in_waitcmd = 0; /* are we in waitcmd()? */ -int in_dowait = 0; /* are we in dowait()? */ volatile sig_atomic_t breakwaitcmd = 0; /* should wait be terminated? */ static int ttyfd = -1; @@ -1023,14 +1022,12 @@ dowait(int block, struct job *job) int sig; int coredump; - in_dowait++; TRACE(("dowait(%d) called\n", block)); do { pid = waitproc(block, &status); TRACE(("wait returns %d, status=%d\n", (int)pid, status)); } while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) || (pid > 0 && WIFSTOPPED(status) && !iflag)); - in_dowait--; if (pid == -1 && errno == ECHILD && job != NULL) job->state = JOBDONE; if (breakwaitcmd != 0) { Modified: projects/arm_eabi/bin/sh/jobs.h ============================================================================== --- projects/arm_eabi/bin/sh/jobs.h Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/sh/jobs.h Sat Jul 28 07:56:23 2012 (r238860) @@ -84,7 +84,6 @@ enum { extern int job_warning; /* user was warned about stopped jobs */ extern int in_waitcmd; /* are we in waitcmd()? */ -extern int in_dowait; /* are we in dowait()? */ extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */ void setjobctl(int); Modified: projects/arm_eabi/bin/sh/sh.1 ============================================================================== --- projects/arm_eabi/bin/sh/sh.1 Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/sh/sh.1 Sat Jul 28 07:56:23 2012 (r238860) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 5, 2011 +.Dd July 15, 2012 .Dt SH 1 .Os .Sh NAME @@ -1164,6 +1164,20 @@ Assignments are expanded differently fro tilde expansion is also performed after the equals sign and after any colon and usernames are also terminated by colons, and field splitting and pathname expansion are not performed. +.Pp +This special expansion applies not only to assignments that form a simple +command by themselves or precede a command word, +but also to words passed to the +.Ic export , +.Ic local +or +.Ic readonly +built-in commands that have this form. +For this, the builtin's name must be literal +(not the result of an expansion) +and may optionally be preceded by one or more literal instances of +.Ic command +without options. .Ss Positional Parameters A positional parameter is a parameter denoted by a number greater than zero. The shell sets these initially to the values of its command line Modified: projects/arm_eabi/bin/sh/trap.c ============================================================================== --- projects/arm_eabi/bin/sh/trap.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/sh/trap.c Sat Jul 28 07:56:23 2012 (r238860) @@ -416,6 +416,7 @@ dotrap(void) in_dotrap++; for (;;) { + pendingsigs = 0; for (i = 1; i < NSIG; i++) { if (gotsig[i]) { gotsig[i] = 0; @@ -467,7 +468,6 @@ dotrap(void) break; } in_dotrap--; - pendingsigs = 0; } Modified: projects/arm_eabi/bin/stty/extern.h ============================================================================== --- projects/arm_eabi/bin/stty/extern.h Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/bin/stty/extern.h Sat Jul 28 07:56:23 2012 (r238860) @@ -40,6 +40,6 @@ int ksearch(char ***, struct info *); int msearch(char ***, struct info *); void optlist(void); void print(struct termios *, struct winsize *, int, enum FMT); -void usage(void); +void usage(void) __dead2; extern struct cchar cchars1[], cchars2[]; Copied: projects/arm_eabi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh (from r238858, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/arm_eabi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh Sat Jul 28 07:56:23 2012 (r238860, copy of r238858, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepsepdir.ksh) @@ -0,0 +1,76 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent Inc. All rights reserved. +# Use is subject to license terms. +# + +# +# Test to catch that we properly look for libraries dependencies in +# our full library parth +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +libdira=${TMPDIR:-/tmp}/libdepa.$$ +libdirb=${TMPDIR:-/tmp}/libdepb.$$ +libdirc=${TMPDIR:-/tmp}/libdepc.$$ +dtrace=$1 + +setup_libs() +{ + mkdir $libdira + mkdir $libdirb + mkdir $libdirc + cat > $libdira/liba.$$.d <<EOF +#pragma D depends_on library libb.$$.d +#pragma D depends_on library libc.$$.d +#pragma D depends_on library libd.$$.d +EOF + cat > $libdirb/libb.$$.d <<EOF +#pragma D depends_on library libc.$$.d +EOF + cat > $libdirb/libc.$$.d <<EOF +EOF + cat > $libdirb/libd.$$.d <<EOF +EOF + cat > $libdirc/libe.$$.d <<EOF +#pragma D depends_on library liba.$$.d +EOF + cat > $libdirc/libf.$$.d <<EOF +EOF +} + + +setup_libs + +$dtrace -L$libdira -L$libdirb -L$libdirc -e + +status=$? +rm -rf $libdira +rm -rf $libdirb +rm -rf $libdirc +return $status + Copied: projects/arm_eabi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.badstruct.d (from r238858, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.badstruct.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/arm_eabi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.badstruct.d Sat Jul 28 07:56:23 2012 (r238860, copy of r238858, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sizeof/err.D_SIZEOF_TYPE.badstruct.d) @@ -0,0 +1,30 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2011, Joyent Inc. All rights reserved. + */ + +BEGIN +{ + trace(sizeof (struct suckitlarry)); + exit(0); +} Modified: projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c ============================================================================== --- projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Sat Jul 28 07:56:23 2012 (r238860) @@ -21,6 +21,7 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, Joyent Inc. All rights reserved. */ /* @@ -2150,25 +2151,23 @@ dt_lib_depend_free(dtrace_hdl_t *dtp) } } - /* - * Open all of the .d library files found in the specified directory and - * compile each one in topological order to cache its inlines and translators, - * etc. We silently ignore any missing directories and other files found - * therein. We only fail (and thereby fail dt_load_libs()) if we fail to - * compile a library and the error is something other than #pragma D depends_on. - * Dependency errors are silently ignored to permit a library directory to - * contain libraries which may not be accessible depending on our privileges. + * Open all the .d library files found in the specified directory and + * compile each one of them. We silently ignore any missing directories and + * other files found therein. We only fail (and thereby fail dt_load_libs()) if + * we fail to compile a library and the error is something other than #pragma D + * depends_on. Dependency errors are silently ignored to permit a library + * directory to contain libraries which may not be accessible depending on our + * privileges. */ static int dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path) { struct dirent *dp; - const char *p; + const char *p, *end; DIR *dirp; char fname[PATH_MAX]; - dtrace_prog_t *pgp; FILE *fp; void *rv; dt_lib_depend_t *dld; @@ -2192,9 +2191,28 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, cons continue; } + /* + * Skip files whose name match an already processed library + */ + for (dld = dt_list_next(&dtp->dt_lib_dep); dld != NULL; + dld = dt_list_next(dld)) { + end = strrchr(dld->dtld_library, '/'); + /* dt_lib_depend_add ensures this */ + assert(end != NULL); + if (strcmp(end + 1, dp->d_name) == 0) + break; + } + + if (dld != NULL) { + dt_dprintf("skipping library %s, already processed " + "library with the same name: %s", dp->d_name, + dld->dtld_library); + continue; + } + dtp->dt_filetag = fname; if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0) - goto err; + return (-1); /* preserve dt_errno */ rv = dt_compile(dtp, DT_CTX_DPROG, DTRACE_PROBESPEC_NAME, NULL, @@ -2203,7 +2221,7 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, cons if (rv != NULL && dtp->dt_errno && (dtp->dt_errno != EDT_COMPILER || dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND))) - goto err; + return (-1); /* preserve dt_errno */ if (dtp->dt_errno) dt_dprintf("error parsing library %s: %s\n", @@ -2214,6 +2232,27 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, cons } (void) closedir(dirp); + + return (0); +} + +/* + * Perform a topological sorting of all the libraries found across the entire + * dt_lib_path. Once sorted, compile each one in topological order to cache its + * inlines and translators, etc. We silently ignore any missing directories and + * other files found therein. We only fail (and thereby fail dt_load_libs()) if + * we fail to compile a library and the error is something other than #pragma D + * depends_on. Dependency errors are silently ignored to permit a library + * directory to contain libraries which may not be accessible depending on our + * privileges. + */ +static int +dt_load_libs_sort(dtrace_hdl_t *dtp) +{ + dtrace_prog_t *pgp; + FILE *fp; + dt_lib_depend_t *dld; + /* * Finish building the graph containing the library dependencies * and perform a topological sort to generate an ordered list @@ -2274,7 +2313,14 @@ dt_load_libs(dtrace_hdl_t *dtp) dtp->dt_cflags |= DTRACE_C_NOLIBS; - for (dirp = dt_list_next(&dtp->dt_lib_path); + /* + * /usr/lib/dtrace is always at the head of the list. The rest of the + * list is specified in the precedence order the user requested. Process + * everything other than the head first. DTRACE_C_NOLIBS has already + * been spcified so dt_vopen will ensure that there is always one entry + * in dt_lib_path. + */ + for (dirp = dt_list_next(dt_list_next(&dtp->dt_lib_path)); dirp != NULL; dirp = dt_list_next(dirp)) { if (dt_load_libs_dir(dtp, dirp->dir_path) != 0) { dtp->dt_cflags &= ~DTRACE_C_NOLIBS; @@ -2282,6 +2328,16 @@ dt_load_libs(dtrace_hdl_t *dtp) } } + /* Handle /usr/lib/dtrace */ + dirp = dt_list_next(&dtp->dt_lib_path); + if (dt_load_libs_dir(dtp, dirp->dir_path) != 0) { + dtp->dt_cflags &= ~DTRACE_C_NOLIBS; + return (-1); /* errno is set for us */ + } + + if (dt_load_libs_sort(dtp) < 0) + return (-1); /* errno is set for us */ + return (0); } Modified: projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c ============================================================================== --- projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c Sat Jul 28 07:56:23 2012 (r238860) @@ -22,7 +22,7 @@ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2011, Joyent Inc. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -725,12 +725,19 @@ dt_node_type_name(const dt_node_t *dnp, size_t dt_node_type_size(const dt_node_t *dnp) { + ctf_id_t base; + if (dnp->dn_kind == DT_NODE_STRING) return (strlen(dnp->dn_string) + 1); if (dt_node_is_dynamic(dnp) && dnp->dn_ident != NULL) return (dt_ident_size(dnp->dn_ident)); + base = ctf_type_resolve(dnp->dn_ctfp, dnp->dn_type); + + if (ctf_type_kind(dnp->dn_ctfp, base) == CTF_K_FORWARD) + return (0); + return (ctf_type_size(dnp->dn_ctfp, dnp->dn_type)); } Modified: projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c ============================================================================== --- projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Sat Jul 28 07:56:23 2012 (r238860) @@ -21,7 +21,7 @@ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2011, Joyent Inc. All rights reserved. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -31,9 +31,13 @@ #if defined(sun) #include <alloca.h> #endif +#include <fcntl.h> #include <stdlib.h> #include <stdio.h> +#include <sys/types.h> +#include <sys/stat.h> + #include <dt_parser.h> #include <dt_impl.h> #include <dt_provider.h> @@ -201,6 +205,29 @@ dt_pragma_binding(const char *prname, dt dtp->dt_globals->dh_defer = &dt_pragma_apply; } +static void +dt_pragma_depends_finddep(dtrace_hdl_t *dtp, const char *lname, char *lib, + size_t len) +{ + dt_dirpath_t *dirp; + struct stat sbuf; + int found = 0; + + for (dirp = dt_list_next(&dtp->dt_lib_path); dirp != NULL; + dirp = dt_list_next(dirp)) { + (void) snprintf(lib, len, "%s/%s", dirp->dir_path, lname); + + if (stat(lib, &sbuf) == 0) { + found = 1; + break; + } + } + + if (!found) + xyerror(D_PRAGMA_DEPEND, + "failed to find dependency in libpath: %s", lname); +} + /* * The #pragma depends_on directive can be used to express a dependency on a * module, provider or library which if not present will cause processing to @@ -230,16 +257,13 @@ dt_pragma_depends(const char *prname, dt if (yypcb->pcb_cflags & DTRACE_C_CTL) { assert(dtp->dt_filetag != NULL); - /* - * We have the file we are working on in dtp->dt_filetag - * so find that node and add the dependency in. - */ + dt_pragma_depends_finddep(dtp, nnp->dn_string, lib, + sizeof (lib)); + dld = dt_lib_depend_lookup(&dtp->dt_lib_dep, dtp->dt_filetag); assert(dld != NULL); - (void) snprintf(lib, sizeof (lib), "%s%s", - dld->dtld_libpath, nnp->dn_string); if ((dt_lib_depend_add(dtp, &dld->dtld_dependencies, lib)) != 0) { xyerror(D_PRAGMA_DEPEND, @@ -261,8 +285,8 @@ dt_pragma_depends(const char *prname, dt dtp->dt_filetag); assert(dld != NULL); - (void) snprintf(lib, sizeof (lib), "%s%s", - dld->dtld_libpath, nnp->dn_string); + dt_pragma_depends_finddep(dtp, nnp->dn_string, lib, + sizeof (lib)); dld = dt_lib_depend_lookup(&dtp->dt_lib_dep_sorted, lib); assert(dld != NULL); Modified: projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c ============================================================================== --- projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c Sat Jul 28 07:56:23 2012 (r238860) @@ -29,23 +29,6 @@ #include <ctype.h> #include <dt_string.h> -#include <dt_impl.h> - -/* - * Create a copy of string s, but only duplicate the first n bytes. - */ -char * -strndup(const char *s, size_t n) -{ - char *s2 = malloc(n + 1); - - if (s2 == NULL) - longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); - - (void) strncpy(s2, s, n); - s2[n] = '\0'; - return (s2); -} /* * Transform string s inline, converting each embedded C escape sequence string Modified: projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h ============================================================================== --- projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h Sat Jul 28 07:56:23 2012 (r238860) @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,14 +19,12 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _DT_STRING_H #define _DT_STRING_H -#pragma ident "%Z%%M% %I% %E% SMI" #include <sys/types.h> #include <strings.h> @@ -36,7 +33,6 @@ extern "C" { #endif -extern char *strndup(const char *, size_t); extern size_t stresc2chr(char *); extern char *strchr2esc(const char *, size_t); extern const char *strbasename(const char *); Modified: projects/arm_eabi/contrib/bind9/CHANGES ============================================================================== --- projects/arm_eabi/contrib/bind9/CHANGES Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/contrib/bind9/CHANGES Sat Jul 28 07:56:23 2012 (r238860) @@ -1,3 +1,12 @@ + --- 9.8.3-P2 released --- + +3346. [security] Bad-cache data could be used before it was + initialized, causing an assert. [RT #30025] + +3342. [bug] Change #3314 broke saving of stub zones to disk + resulting in excessive cpu usage in some cases. + [RT #29952] + --- 9.8.3-P1 released --- 3331. [security] dns_rdataslab_fromrdataset could produce bad Modified: projects/arm_eabi/contrib/bind9/lib/dns/resolver.c ============================================================================== --- projects/arm_eabi/contrib/bind9/lib/dns/resolver.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/contrib/bind9/lib/dns/resolver.c Sat Jul 28 07:56:23 2012 (r238860) @@ -8448,6 +8448,7 @@ dns_resolver_addbadcache(dns_resolver_t goto cleanup; bad->type = type; bad->hashval = hashval; + bad->expire = *expire; isc_buffer_init(&buffer, bad + 1, name->length); dns_name_init(&bad->name, NULL); dns_name_copy(name, &bad->name, &buffer); @@ -8459,8 +8460,8 @@ dns_resolver_addbadcache(dns_resolver_t if (resolver->badcount < resolver->badhash * 2 && resolver->badhash > DNS_BADCACHE_SIZE) resizehash(resolver, &now, ISC_FALSE); - } - bad->expire = *expire; + } else + bad->expire = *expire; cleanup: UNLOCK(&resolver->lock); } Modified: projects/arm_eabi/contrib/bind9/lib/dns/zone.c ============================================================================== --- projects/arm_eabi/contrib/bind9/lib/dns/zone.c Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/contrib/bind9/lib/dns/zone.c Sat Jul 28 07:56:23 2012 (r238860) @@ -8027,13 +8027,14 @@ zone_maintenance(dns_zone_t *zone) { case dns_zone_master: case dns_zone_slave: case dns_zone_key: + case dns_zone_stub: LOCK_ZONE(zone); if (zone->masterfile != NULL && isc_time_compare(&now, &zone->dumptime) >= 0 && DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) && DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP)) { dumping = was_dumping(zone); - } else + } else dumping = ISC_TRUE; UNLOCK_ZONE(zone); if (!dumping) { @@ -8386,7 +8387,7 @@ zone_dump(dns_zone_t *zone, isc_boolean_ goto fail; } - if (compact) { + if (compact && zone->type != dns_zone_stub) { dns_zone_t *dummy = NULL; LOCK_ZONE(zone); zone_iattach(zone, &dummy); @@ -9242,7 +9243,7 @@ stub_callback(isc_task_t *task, isc_even dns_zone_t *zone = NULL; char master[ISC_SOCKADDR_FORMATSIZE]; char source[ISC_SOCKADDR_FORMATSIZE]; - isc_uint32_t nscnt, cnamecnt; + isc_uint32_t nscnt, cnamecnt, refresh, retry, expire; isc_result_t result; isc_time_t now; isc_boolean_t exiting = ISC_FALSE; @@ -9390,19 +9391,32 @@ stub_callback(isc_task_t *task, isc_even ZONEDB_LOCK(&zone->dblock, isc_rwlocktype_write); if (zone->db == NULL) zone_attachdb(zone, stub->db); + result = zone_get_from_db(zone, zone->db, NULL, NULL, NULL, &refresh, + &retry, &expire, NULL, NULL); + if (result == ISC_R_SUCCESS) { + zone->refresh = RANGE(refresh, zone->minrefresh, + zone->maxrefresh); + zone->retry = RANGE(retry, zone->minretry, zone->maxretry); + zone->expire = RANGE(expire, zone->refresh + zone->retry, + DNS_MAX_EXPIRE); + DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HAVETIMERS); + } ZONEDB_UNLOCK(&zone->dblock, isc_rwlocktype_write); dns_db_detach(&stub->db); - if (zone->masterfile != NULL) - zone_needdump(zone, 0); - dns_message_destroy(&msg); isc_event_free(&event); dns_request_destroy(&zone->request); + DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_REFRESH); + DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED); DNS_ZONE_JITTER_ADD(&now, zone->refresh, &zone->refreshtime); isc_interval_set(&i, zone->expire, 0); DNS_ZONE_TIME_ADD(&now, zone->expire, &zone->expiretime); + + if (zone->masterfile != NULL) + zone_needdump(zone, 0); + zone_settimer(zone, &now); goto free_stub; Modified: projects/arm_eabi/contrib/bind9/version ============================================================================== --- projects/arm_eabi/contrib/bind9/version Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/contrib/bind9/version Sat Jul 28 07:56:23 2012 (r238860) @@ -7,4 +7,4 @@ MAJORVER=9 MINORVER=8 PATCHVER=3 RELEASETYPE=-P -RELEASEVER=1 +RELEASEVER=2 Modified: projects/arm_eabi/contrib/dtc/Documentation/dts-format.txt ============================================================================== --- projects/arm_eabi/contrib/dtc/Documentation/dts-format.txt Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/contrib/dtc/Documentation/dts-format.txt Sat Jul 28 07:56:23 2012 (r238860) @@ -29,18 +29,28 @@ except for properties with empty (zero l form: [label:] property-name; -Property values may be defined as an array of 32-bit integer cells, as -NUL-terminated strings, as bytestrings or a combination of these. +Property values may be defined as an array of 8, 16, 32, or 64-bit integer +elements, as NUL-terminated strings, as bytestrings or a combination of these. -* Arrays of cells are represented by angle brackets surrounding a - space separated list of C-style integers +* Arrays are represented by angle brackets surrounding a space separated list + of C-style integers or character literals. Array elements default to 32-bits + in size. An array of 32-bit elements is also known as a cell list or a list + of cells. A cell being an unsigned 32-bit integer. e.g. interrupts = <17 0xc>; -* A 64-bit value is represented with two 32-bit cells. +* A 64-bit value can be represented with two 32-bit elements. e.g. clock-frequency = <0x00000001 0x00000000>; +* The storage size of an element can be changed using the /bits/ prefix. The + /bits/ prefix allows for the creation of 8, 16, 32, and 64-bit elements. + The resulting array will not be padded to a multiple of the default 32-bit + element size. + + e.g. interrupts = /bits/ 8 <17 0xc>; + e.g. clock-frequency = /bits/ 64 <0x0000000100000000>; + * A NUL-terminated string value is represented using double quotes (the property value is considered to include the terminating NUL character). @@ -59,19 +69,20 @@ NUL-terminated strings, as bytestrings o e.g. compatible = "ns16550", "ns8250"; example = <0xf00f0000 19>, "a strange property format"; -* In a cell array a reference to another node will be expanded to that - node's phandle. References may by '&' followed by a node's label: +* In an array a reference to another node will be expanded to that node's + phandle. References may by '&' followed by a node's label: e.g. interrupt-parent = < &mpic >; or they may be '&' followed by a node's full path in braces: e.g. interrupt-parent = < &{/soc/interrupt-controller@40000} >; + References are only permitted in arrays that have an element size of + 32-bits. -* Outside a cell array, a reference to another node will be expanded - to that node's full path. +* Outside an array, a reference to another node will be expanded to that + node's full path. e.g. ethernet0 = &EMAC0; * Labels may also appear before or after any component of a property - value, or between cells of a cell array, or between bytes of a - bytestring. + value, or between elements of an array, or between bytes of a bytestring. e.g. reg = reglabel: <0 sizelabel: 0x1000000>; e.g. prop = [ab cd ef byte4: 00 ff fe]; e.g. str = start: "string value" end: ; @@ -108,3 +119,4 @@ Version 1 DTS files have the overall lay -- David Gibson <david@gibson.dropbear.id.au> -- Yoder Stuart <stuart.yoder@freescale.com> + -- Anton Staaf <robotboy@chromium.org> Modified: projects/arm_eabi/contrib/dtc/Documentation/manual.txt ============================================================================== --- projects/arm_eabi/contrib/dtc/Documentation/manual.txt Sat Jul 28 07:42:30 2012 (r238859) +++ projects/arm_eabi/contrib/dtc/Documentation/manual.txt Sat Jul 28 07:56:23 2012 (r238860) @@ -21,7 +21,7 @@ III - libfdt IV - Utility Tools 1) convert-dtsv0 -- Conversion to Version 1 - 1) ftdump + 1) fdtdump I - "dtc", the device tree compiler @@ -106,6 +106,9 @@ Options: -O <output_format> The generated output format, as listed above. + -d <dependency_filename> + Generate a dependency file during compilation. + -q Quiet: -q suppress warnings, -qq errors, -qqq all @@ -643,10 +646,10 @@ a new file with a "v1" appended the file Comments, empty lines, etc. are preserved. -2) ftdump -- Flat Tree dumping utility +2) fdtdump -- Flat Device Tree dumping utility *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207280756.q6S7uOik099592>