Date: Sat, 27 Dec 2014 03:01:21 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276279 - in projects/elftoolchain-update-r3130: . cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/common contrib/binutils/gas contrib/bzip2 contrib/ee contrib... Message-ID: <201412270301.sBR31LPG097155@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sat Dec 27 03:01:19 2014 New Revision: 276279 URL: https://svnweb.freebsd.org/changeset/base/276279 Log: Merge from HEAD at r276277 Added: projects/elftoolchain-update-r3130/contrib/mdocml/mandoc_headers.3 - copied unchanged from r276277, head/contrib/mdocml/mandoc_headers.3 projects/elftoolchain-update-r3130/contrib/ofed/libibverbs/examples/build/ - copied from r276277, head/contrib/ofed/libibverbs/examples/build/ Deleted: projects/elftoolchain-update-r3130/contrib/ofed/libibverbs/examples/Makefile projects/elftoolchain-update-r3130/share/man/man4/gpib.4 projects/elftoolchain-update-r3130/share/man/man4/pcii.4 projects/elftoolchain-update-r3130/share/man/man4/tnt4882.4 projects/elftoolchain-update-r3130/sys/dev/ieee488/ibfoo.c projects/elftoolchain-update-r3130/sys/dev/ieee488/ibfoo_int.h projects/elftoolchain-update-r3130/sys/dev/ieee488/pcii.c projects/elftoolchain-update-r3130/sys/dev/ieee488/tnt4882.c projects/elftoolchain-update-r3130/sys/dev/ieee488/tnt4882.h projects/elftoolchain-update-r3130/sys/dev/ieee488/ugpib.h projects/elftoolchain-update-r3130/sys/dev/ieee488/upd7210.c projects/elftoolchain-update-r3130/sys/dev/ieee488/upd7210.h projects/elftoolchain-update-r3130/tools/build/options/WITHOUT_GPIB Modified: projects/elftoolchain-update-r3130/ObsoleteFiles.inc projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/elftoolchain-update-r3130/contrib/binutils/gas/expr.c projects/elftoolchain-update-r3130/contrib/binutils/gas/input-scrub.c projects/elftoolchain-update-r3130/contrib/binutils/gas/read.c projects/elftoolchain-update-r3130/contrib/bzip2/bzip2.1 projects/elftoolchain-update-r3130/contrib/ee/ee.1 projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 projects/elftoolchain-update-r3130/contrib/elftoolchain/libelf/elf.3 projects/elftoolchain-update-r3130/contrib/libxo/libxo/libxo.c projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_create.3 projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_emit.3 projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_open_container.3 projects/elftoolchain-update-r3130/contrib/mdocml/INSTALL projects/elftoolchain-update-r3130/contrib/mdocml/LICENSE projects/elftoolchain-update-r3130/contrib/mdocml/Makefile projects/elftoolchain-update-r3130/contrib/mdocml/Makefile.depend projects/elftoolchain-update-r3130/contrib/mdocml/NEWS projects/elftoolchain-update-r3130/contrib/mdocml/TODO projects/elftoolchain-update-r3130/contrib/mdocml/compat_fts.c projects/elftoolchain-update-r3130/contrib/mdocml/compat_reallocarray.c projects/elftoolchain-update-r3130/contrib/mdocml/compat_strcasestr.c projects/elftoolchain-update-r3130/contrib/mdocml/compat_strsep.c projects/elftoolchain-update-r3130/contrib/mdocml/config.h projects/elftoolchain-update-r3130/contrib/mdocml/configure projects/elftoolchain-update-r3130/contrib/mdocml/configure.local.example projects/elftoolchain-update-r3130/contrib/mdocml/example.style.css projects/elftoolchain-update-r3130/contrib/mdocml/html.c projects/elftoolchain-update-r3130/contrib/mdocml/html.h projects/elftoolchain-update-r3130/contrib/mdocml/libman.h projects/elftoolchain-update-r3130/contrib/mdocml/libmandoc.h projects/elftoolchain-update-r3130/contrib/mdocml/libmdoc.h projects/elftoolchain-update-r3130/contrib/mdocml/libroff.h projects/elftoolchain-update-r3130/contrib/mdocml/main.c projects/elftoolchain-update-r3130/contrib/mdocml/main.h projects/elftoolchain-update-r3130/contrib/mdocml/man.h projects/elftoolchain-update-r3130/contrib/mdocml/man_hash.c projects/elftoolchain-update-r3130/contrib/mdocml/man_html.c projects/elftoolchain-update-r3130/contrib/mdocml/man_term.c projects/elftoolchain-update-r3130/contrib/mdocml/mandoc.1 projects/elftoolchain-update-r3130/contrib/mdocml/mandoc.h projects/elftoolchain-update-r3130/contrib/mdocml/mandoc_aux.h projects/elftoolchain-update-r3130/contrib/mdocml/mandocdb.c projects/elftoolchain-update-r3130/contrib/mdocml/manpath.h projects/elftoolchain-update-r3130/contrib/mdocml/mansearch.3 projects/elftoolchain-update-r3130/contrib/mdocml/mansearch.c projects/elftoolchain-update-r3130/contrib/mdocml/mansearch.h projects/elftoolchain-update-r3130/contrib/mdocml/mansearch_const.c projects/elftoolchain-update-r3130/contrib/mdocml/mdoc.7 projects/elftoolchain-update-r3130/contrib/mdocml/mdoc.h projects/elftoolchain-update-r3130/contrib/mdocml/mdoc_html.c projects/elftoolchain-update-r3130/contrib/mdocml/mdoc_macro.c projects/elftoolchain-update-r3130/contrib/mdocml/mdoc_man.c projects/elftoolchain-update-r3130/contrib/mdocml/mdoc_term.c projects/elftoolchain-update-r3130/contrib/mdocml/mdoc_validate.c projects/elftoolchain-update-r3130/contrib/mdocml/msec.c projects/elftoolchain-update-r3130/contrib/mdocml/out.c projects/elftoolchain-update-r3130/contrib/mdocml/out.h projects/elftoolchain-update-r3130/contrib/mdocml/read.c projects/elftoolchain-update-r3130/contrib/mdocml/roff.7 projects/elftoolchain-update-r3130/contrib/mdocml/st.in projects/elftoolchain-update-r3130/contrib/mdocml/term.c projects/elftoolchain-update-r3130/contrib/mdocml/term.h projects/elftoolchain-update-r3130/contrib/mdocml/term_ps.c projects/elftoolchain-update-r3130/etc/hosts.allow projects/elftoolchain-update-r3130/gnu/usr.bin/gdb/kgdb/trgt_arm.c projects/elftoolchain-update-r3130/include/Makefile projects/elftoolchain-update-r3130/lib/Makefile projects/elftoolchain-update-r3130/lib/libmandoc/Makefile projects/elftoolchain-update-r3130/lib/libxo/Makefile projects/elftoolchain-update-r3130/lib/msun/man/csqrt.3 projects/elftoolchain-update-r3130/lib/msun/src/math_private.h projects/elftoolchain-update-r3130/release/arm/release.sh projects/elftoolchain-update-r3130/share/man/man3/ATOMIC_VAR_INIT.3 projects/elftoolchain-update-r3130/share/man/man3/makedev.3 projects/elftoolchain-update-r3130/share/man/man3/pthread.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_attr.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_cond_init.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_mutex_init.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_mutexattr_getkind_np.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_rwlock_init.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_rwlockattr_getpshared.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_rwlockattr_init.3 projects/elftoolchain-update-r3130/share/man/man3/pthread_rwlockattr_setpshared.3 projects/elftoolchain-update-r3130/share/man/man4/Makefile projects/elftoolchain-update-r3130/share/man/man4/ata.4 projects/elftoolchain-update-r3130/share/man/man4/audit.4 projects/elftoolchain-update-r3130/share/man/man4/bhyve.4 (contents, props changed) projects/elftoolchain-update-r3130/share/man/man4/carp.4 projects/elftoolchain-update-r3130/share/man/man4/ch.4 projects/elftoolchain-update-r3130/share/man/man4/ehci.4 projects/elftoolchain-update-r3130/share/man/man4/geom.4 projects/elftoolchain-update-r3130/share/man/man4/hv_ata_pci_disengage.4 projects/elftoolchain-update-r3130/share/man/man4/hv_kvp.4 projects/elftoolchain-update-r3130/share/man/man4/hv_netvsc.4 projects/elftoolchain-update-r3130/share/man/man4/hv_storvsc.4 projects/elftoolchain-update-r3130/share/man/man4/hv_utils.4 projects/elftoolchain-update-r3130/share/man/man4/hv_vmbus.4 projects/elftoolchain-update-r3130/share/man/man4/igmp.4 projects/elftoolchain-update-r3130/share/man/man4/ip6.4 projects/elftoolchain-update-r3130/share/man/man4/ips.4 projects/elftoolchain-update-r3130/share/man/man4/lagg.4 projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/smu.4 projects/elftoolchain-update-r3130/share/man/man4/mmc.4 projects/elftoolchain-update-r3130/share/man/man4/mmcsd.4 projects/elftoolchain-update-r3130/share/man/man4/mod_cc.4 projects/elftoolchain-update-r3130/share/man/man4/mpt.4 projects/elftoolchain-update-r3130/share/man/man4/netmap.4 projects/elftoolchain-update-r3130/share/man/man4/ohci.4 projects/elftoolchain-update-r3130/share/man/man4/pflog.4 projects/elftoolchain-update-r3130/share/man/man4/pfsync.4 projects/elftoolchain-update-r3130/share/man/man4/ral.4 projects/elftoolchain-update-r3130/share/man/man4/rsu.4 projects/elftoolchain-update-r3130/share/man/man4/rum.4 projects/elftoolchain-update-r3130/share/man/man4/run.4 projects/elftoolchain-update-r3130/share/man/man4/uhci.4 projects/elftoolchain-update-r3130/share/man/man4/umass.4 projects/elftoolchain-update-r3130/share/man/man7/c99.7 projects/elftoolchain-update-r3130/share/man/man7/environ.7 projects/elftoolchain-update-r3130/share/man/man7/tuning.7 projects/elftoolchain-update-r3130/share/man/man8/rc.8 projects/elftoolchain-update-r3130/share/man/man9/Makefile projects/elftoolchain-update-r3130/share/man/man9/mod_cc.9 projects/elftoolchain-update-r3130/share/misc/committers-ports.dot projects/elftoolchain-update-r3130/share/mk/src.opts.mk projects/elftoolchain-update-r3130/sys/amd64/conf/NOTES projects/elftoolchain-update-r3130/sys/arm/arm/db_trace.c projects/elftoolchain-update-r3130/sys/arm/arm/dump_machdep.c projects/elftoolchain-update-r3130/sys/arm/arm/exception.S projects/elftoolchain-update-r3130/sys/arm/arm/gdb_machdep.c projects/elftoolchain-update-r3130/sys/arm/arm/genassym.c projects/elftoolchain-update-r3130/sys/arm/arm/gic.c projects/elftoolchain-update-r3130/sys/arm/arm/identcpu.c projects/elftoolchain-update-r3130/sys/arm/arm/machdep.c projects/elftoolchain-update-r3130/sys/arm/arm/mp_machdep.c projects/elftoolchain-update-r3130/sys/arm/arm/stack_machdep.c projects/elftoolchain-update-r3130/sys/arm/arm/swtch.S projects/elftoolchain-update-r3130/sys/arm/arm/trap.c projects/elftoolchain-update-r3130/sys/arm/arm/vm_machdep.c projects/elftoolchain-update-r3130/sys/arm/conf/EFIKA_MX projects/elftoolchain-update-r3130/sys/arm/conf/IMX53 projects/elftoolchain-update-r3130/sys/arm/conf/IMX6 projects/elftoolchain-update-r3130/sys/arm/freescale/imx/imx51_machdep.c projects/elftoolchain-update-r3130/sys/arm/freescale/imx/imx53_machdep.c projects/elftoolchain-update-r3130/sys/arm/freescale/imx/imx6_machdep.c projects/elftoolchain-update-r3130/sys/arm/include/asm.h projects/elftoolchain-update-r3130/sys/arm/include/cpuconf.h projects/elftoolchain-update-r3130/sys/arm/include/db_machdep.h projects/elftoolchain-update-r3130/sys/arm/include/frame.h projects/elftoolchain-update-r3130/sys/arm/include/machdep.h projects/elftoolchain-update-r3130/sys/arm/include/pcb.h projects/elftoolchain-update-r3130/sys/arm/include/smp.h projects/elftoolchain-update-r3130/sys/arm/include/sysreg.h projects/elftoolchain-update-r3130/sys/arm/mv/mpic.c projects/elftoolchain-update-r3130/sys/arm/ti/am335x/am335x_usbss.c projects/elftoolchain-update-r3130/sys/arm/ti/ti_gpio.c projects/elftoolchain-update-r3130/sys/arm/ti/ti_gpio.h projects/elftoolchain-update-r3130/sys/boot/fdt/dts/arm/am335x.dtsi projects/elftoolchain-update-r3130/sys/boot/fdt/dts/arm/rpi.dts projects/elftoolchain-update-r3130/sys/conf/NOTES projects/elftoolchain-update-r3130/sys/conf/files projects/elftoolchain-update-r3130/sys/dev/fxp/if_fxp.c projects/elftoolchain-update-r3130/sys/dev/fxp/if_fxpreg.h projects/elftoolchain-update-r3130/sys/dev/fxp/if_fxpvar.h projects/elftoolchain-update-r3130/sys/dev/gpio/gpio_if.m projects/elftoolchain-update-r3130/sys/dev/isci/isci_controller.c projects/elftoolchain-update-r3130/sys/dev/isci/isci_sysctl.c projects/elftoolchain-update-r3130/sys/dev/ofw/ofw_cpu.c projects/elftoolchain-update-r3130/sys/dev/usb/quirk/usb_quirk.c projects/elftoolchain-update-r3130/sys/dev/usb/usbdevs projects/elftoolchain-update-r3130/sys/fs/nfsclient/nfs_clvnops.c projects/elftoolchain-update-r3130/sys/fs/nfsserver/nfs_nfsdport.c projects/elftoolchain-update-r3130/sys/fs/nfsserver/nfs_nfsdstate.c projects/elftoolchain-update-r3130/sys/kern/vfs_default.c projects/elftoolchain-update-r3130/sys/modules/if_gif/Makefile projects/elftoolchain-update-r3130/sys/net/if_gif.c projects/elftoolchain-update-r3130/sys/net/if_gif.h projects/elftoolchain-update-r3130/sys/net/if_gre.c projects/elftoolchain-update-r3130/sys/net/if_gre.h projects/elftoolchain-update-r3130/sys/netinet/in_gif.c projects/elftoolchain-update-r3130/sys/netinet/ip_gre.c projects/elftoolchain-update-r3130/sys/netinet6/in6_gif.c projects/elftoolchain-update-r3130/sys/netinet6/ip6_gre.c projects/elftoolchain-update-r3130/sys/netipsec/ipsec.c projects/elftoolchain-update-r3130/sys/netipsec/ipsec.h projects/elftoolchain-update-r3130/sys/netipsec/key.c projects/elftoolchain-update-r3130/sys/netipsec/key_debug.c projects/elftoolchain-update-r3130/tools/build/mk/OptionalObsoleteFiles.inc projects/elftoolchain-update-r3130/tools/tools/sysbuild/sysbuild.sh projects/elftoolchain-update-r3130/usr.bin/dpv/dpv.1 projects/elftoolchain-update-r3130/usr.bin/iscsictl/iscsi.conf.5 projects/elftoolchain-update-r3130/usr.bin/last/last.1 projects/elftoolchain-update-r3130/usr.bin/man/man.1 projects/elftoolchain-update-r3130/usr.bin/man/man.sh projects/elftoolchain-update-r3130/usr.bin/mandoc/Makefile projects/elftoolchain-update-r3130/usr.bin/mkcsmapper/mkcsmapper.1 projects/elftoolchain-update-r3130/usr.bin/mkesdb/mkesdb.1 projects/elftoolchain-update-r3130/usr.bin/patch/patch.c projects/elftoolchain-update-r3130/usr.bin/patch/pch.c projects/elftoolchain-update-r3130/usr.bin/patch/util.c projects/elftoolchain-update-r3130/usr.bin/patch/util.h projects/elftoolchain-update-r3130/usr.bin/rup/rup.1 projects/elftoolchain-update-r3130/usr.bin/rusers/rusers.1 projects/elftoolchain-update-r3130/usr.bin/rwall/rwall.1 projects/elftoolchain-update-r3130/usr.bin/script/script.1 projects/elftoolchain-update-r3130/usr.bin/setchannel/setchannel.1 projects/elftoolchain-update-r3130/usr.bin/showmount/showmount.8 projects/elftoolchain-update-r3130/usr.sbin/bluetooth/btpand/btpand.8 projects/elftoolchain-update-r3130/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3 projects/elftoolchain-update-r3130/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3 projects/elftoolchain-update-r3130/usr.sbin/gpioctl/gpioctl.8 projects/elftoolchain-update-r3130/usr.sbin/gssd/gssd.8 projects/elftoolchain-update-r3130/usr.sbin/jail/jail.8 projects/elftoolchain-update-r3130/usr.sbin/nandsim/nandsim.8 projects/elftoolchain-update-r3130/usr.sbin/nfsuserd/nfsuserd.8 projects/elftoolchain-update-r3130/usr.sbin/rpc.umntall/rpc.umntall.8 projects/elftoolchain-update-r3130/usr.sbin/rtadvctl/rtadvctl.8 projects/elftoolchain-update-r3130/usr.sbin/rtadvd/rtadvd.conf.5 Directory Properties: projects/elftoolchain-update-r3130/ (props changed) projects/elftoolchain-update-r3130/cddl/ (props changed) projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/ (props changed) projects/elftoolchain-update-r3130/contrib/binutils/ (props changed) projects/elftoolchain-update-r3130/contrib/bzip2/ (props changed) projects/elftoolchain-update-r3130/contrib/ee/ (props changed) projects/elftoolchain-update-r3130/contrib/elftoolchain/ (props changed) projects/elftoolchain-update-r3130/contrib/mdocml/ (props changed) projects/elftoolchain-update-r3130/etc/ (props changed) projects/elftoolchain-update-r3130/gnu/usr.bin/gdb/ (props changed) projects/elftoolchain-update-r3130/include/ (props changed) projects/elftoolchain-update-r3130/share/ (props changed) projects/elftoolchain-update-r3130/share/man/man4/ (props changed) projects/elftoolchain-update-r3130/sys/ (props changed) projects/elftoolchain-update-r3130/sys/boot/ (props changed) projects/elftoolchain-update-r3130/sys/conf/ (props changed) projects/elftoolchain-update-r3130/usr.sbin/jail/ (props changed) projects/elftoolchain-update-r3130/usr.sbin/rtadvctl/ (props changed) projects/elftoolchain-update-r3130/usr.sbin/rtadvd/ (props changed) Modified: projects/elftoolchain-update-r3130/ObsoleteFiles.inc ============================================================================== --- projects/elftoolchain-update-r3130/ObsoleteFiles.inc Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/ObsoleteFiles.inc Sat Dec 27 03:01:19 2014 (r276279) @@ -38,6 +38,31 @@ # xargs -n1 | sort | uniq -d; # done +# 20141226: Remove gpib/ieee488 +OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h +OLD_FILES+=usr/include/dev/ieee488/tnt4882.h +OLD_FILES+=usr/include/dev/ieee488/ugpib.h +OLD_FILES+=usr/include/dev/ieee488/upd7210.h +OLD_DIRS+=usr/include/dev/ieee488 +OLD_FILES+=usr/include/gpib/gpib.h +OLD_DIRS+=usr/include/gpib +OLD_FILES+=usr/lib/libgpib.a +OLD_FILES+=usr/lib/libgpib_p.a +OLD_FILES+=usr/lib/libgpib.so +OLD_LIBS+=usr/lib/libgpib.so.3 +OLD_FILES+=usr/lib/libgpib_p.a +OLD_FILES+=share/man/man4/pcii.4.gz +OLD_FILES+=share/man/man4/gpib.4.gz +OLD_FILES+=share/man/man4/tnt4882.4.gz +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" +OLD_FILES+=usr/lib32/libgpib.a +OLD_FILES+=usr/lib32/libgpib_p.a +OLD_FILES+=usr/lib32/libgpib.so +OLD_LIBS+=usr/lib32/libgpib.so.3 +.endif + +# 20141224: libxo moved to /lib +OLD_LIBS+=usr/lib/libxo.so.0 # 20141223: remove in6_gif.h, in_gif.h and if_stf.h OLD_FILES+=usr/include/net/if_stf.h OLD_FILES+=usr/include/netinet/in_gif.h Modified: projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Sat Dec 27 03:01:19 2014 (r276279) @@ -4509,11 +4509,12 @@ zpool_do_status(int argc, char **argv) } typedef struct upgrade_cbdata { - int cb_first; - char cb_poolname[ZPOOL_MAXNAMELEN]; - int cb_argc; - uint64_t cb_version; - char **cb_argv; + boolean_t cb_first; + boolean_t cb_unavail; + char cb_poolname[ZPOOL_MAXNAMELEN]; + int cb_argc; + uint64_t cb_version; + char **cb_argv; } upgrade_cbdata_t; #ifdef __FreeBSD__ @@ -4629,6 +4630,14 @@ upgrade_cb(zpool_handle_t *zhp, void *ar boolean_t printnl = B_FALSE; int ret; + if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) { + (void) fprintf(stderr, gettext("cannot upgrade '%s': pool is " + "currently unavailable.\n\n"), zpool_get_name(zhp)); + cbp->cb_unavail = B_TRUE; + /* Allow iteration to continue. */ + return (0); + } + config = zpool_get_config(zhp, NULL); verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -4690,12 +4699,41 @@ upgrade_cb(zpool_handle_t *zhp, void *ar } static int +upgrade_list_unavail(zpool_handle_t *zhp, void *arg) +{ + upgrade_cbdata_t *cbp = arg; + + if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) { + if (cbp->cb_first) { + (void) fprintf(stderr, gettext("The following pools " + "are unavailable and cannot be upgraded as this " + "time.\n\n")); + (void) fprintf(stderr, gettext("POOL\n")); + (void) fprintf(stderr, gettext("------------\n")); + cbp->cb_first = B_FALSE; + } + (void) printf(gettext("%s\n"), zpool_get_name(zhp)); + cbp->cb_unavail = B_TRUE; + } + return (0); +} + +static int upgrade_list_older_cb(zpool_handle_t *zhp, void *arg) { upgrade_cbdata_t *cbp = arg; nvlist_t *config; uint64_t version; + if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) { + /* + * This will have been reported by upgrade_list_unavail so + * just allow iteration to continue. + */ + cbp->cb_unavail = B_TRUE; + return (0); + } + config = zpool_get_config(zhp, NULL); verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -4729,6 +4767,15 @@ upgrade_list_disabled_cb(zpool_handle_t nvlist_t *config; uint64_t version; + if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) { + /* + * This will have been reported by upgrade_list_unavail so + * just allow iteration to continue. + */ + cbp->cb_unavail = B_TRUE; + return (0); + } + config = zpool_get_config(zhp, NULL); verify(nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION, &version) == 0); @@ -4782,10 +4829,17 @@ upgrade_one(zpool_handle_t *zhp, void *d uint64_t cur_version; int ret; + if (zpool_get_state(zhp) == POOL_STATE_UNAVAIL) { + (void) fprintf(stderr, gettext("cannot upgrade '%s': pool is " + "is currently unavailable.\n\n"), zpool_get_name(zhp)); + cbp->cb_unavail = B_TRUE; + return (1); + } + if (strcmp("log", zpool_get_name(zhp)) == 0) { (void) printf(gettext("'log' is now a reserved word\n" "Pool 'log' must be renamed using export and import" - " to upgrade.\n")); + " to upgrade.\n\n")); return (1); } @@ -4829,7 +4883,7 @@ upgrade_one(zpool_handle_t *zhp, void *d #endif /* __FreeBSD __*/ } else if (cur_version == SPA_VERSION) { (void) printf(gettext("Pool '%s' already has all " - "supported features enabled.\n"), + "supported features enabled.\n\n"), zpool_get_name(zhp)); } } @@ -4986,11 +5040,13 @@ zpool_do_upgrade(int argc, char **argv) ret = zpool_iter(g_zfs, upgrade_cb, &cb); if (ret == 0 && cb.cb_first) { if (cb.cb_version == SPA_VERSION) { - (void) printf(gettext("All pools are already " - "formatted using feature flags.\n\n")); - (void) printf(gettext("Every feature flags " + (void) printf(gettext("All %spools are already " + "formatted using feature flags.\n\n"), + cb.cb_unavail ? gettext("available ") : ""); + (void) printf(gettext("Every %sfeature flags " "pool already has all supported features " - "enabled.\n")); + "enabled.\n"), + cb.cb_unavail ? gettext("available ") : ""); } else { (void) printf(gettext("All pools are already " "formatted with version %llu or higher.\n"), @@ -4999,12 +5055,21 @@ zpool_do_upgrade(int argc, char **argv) } } else if (argc == 0) { cb.cb_first = B_TRUE; + ret = zpool_iter(g_zfs, upgrade_list_unavail, &cb); + assert(ret == 0); + + if (!cb.cb_first) { + (void) fprintf(stderr, "\n"); + } + + cb.cb_first = B_TRUE; ret = zpool_iter(g_zfs, upgrade_list_older_cb, &cb); assert(ret == 0); if (cb.cb_first) { - (void) printf(gettext("All pools are formatted " - "using feature flags.\n\n")); + (void) printf(gettext("All %spools are formatted using " + "feature flags.\n\n"), cb.cb_unavail ? + gettext("available ") : ""); } else { (void) printf(gettext("\nUse 'zpool upgrade -v' " "for a list of available legacy versions.\n")); @@ -5015,13 +5080,14 @@ zpool_do_upgrade(int argc, char **argv) assert(ret == 0); if (cb.cb_first) { - (void) printf(gettext("Every feature flags pool has " - "all supported features enabled.\n")); + (void) printf(gettext("Every %sfeature flags pool has " + "all supported features enabled.\n"), + cb.cb_unavail ? gettext("available ") : ""); } else { (void) printf(gettext("\n")); } } else { - ret = for_each_pool(argc, argv, B_FALSE, NULL, + ret = for_each_pool(argc, argv, B_TRUE, NULL, upgrade_one, &cb); } Modified: projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Sat Dec 27 03:01:19 2014 (r276279) @@ -127,6 +127,7 @@ dtrace_dof_init(void) int efd; char *s; size_t shstridx; + uint64_t aligned_filesz; #endif if (getenv("DTRACE_DOF_INIT_DISABLE") != NULL) @@ -183,7 +184,9 @@ dtrace_dof_init(void) } while ((char *) dof < (char *) dofdata->d_buf + dofdata->d_size) { - dof_next = (void *) ((char *) dof + dof->dofh_filesz); + aligned_filesz = (shdr.sh_addralign == 0 ? dof->dofh_filesz : + roundup2(dof->dofh_filesz, shdr.sh_addralign)); + dof_next = (void *) ((char *) dof + aligned_filesz); #endif if (dof->dofh_ident[DOF_ID_MAG0] != DOF_MAG_MAG0 || Modified: projects/elftoolchain-update-r3130/contrib/binutils/gas/expr.c ============================================================================== --- projects/elftoolchain-update-r3130/contrib/binutils/gas/expr.c Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/binutils/gas/expr.c Sat Dec 27 03:01:19 2014 (r276279) @@ -1040,6 +1040,15 @@ operand (expressionS *expressionP, enum { for (i = 0; i < expressionP->X_add_number; ++i) generic_bignum[i] = ~generic_bignum[i]; + + /* Extend the bignum to at least the size of .octa. */ + if (expressionP->X_add_number < SIZE_OF_LARGE_NUMBER) + { + expressionP->X_add_number = SIZE_OF_LARGE_NUMBER; + for (; i < expressionP->X_add_number; ++i) + generic_bignum[i] = ~(LITTLENUM_TYPE) 0; + } + if (c == '-') for (i = 0; i < expressionP->X_add_number; ++i) { @@ -1050,14 +1059,12 @@ operand (expressionS *expressionP, enum } else if (c == '!') { - int nonzero = 0; for (i = 0; i < expressionP->X_add_number; ++i) - { - if (generic_bignum[i]) - nonzero = 1; - generic_bignum[i] = 0; - } - generic_bignum[0] = nonzero; + if (generic_bignum[i] != 0) + break; + expressionP->X_add_number = i >= expressionP->X_add_number; + expressionP->X_op = O_constant; + expressionP->X_unsigned = 1; } } else if (expressionP->X_op != O_illegal Modified: projects/elftoolchain-update-r3130/contrib/binutils/gas/input-scrub.c ============================================================================== --- projects/elftoolchain-update-r3130/contrib/binutils/gas/input-scrub.c Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/binutils/gas/input-scrub.c Sat Dec 27 03:01:19 2014 (r276279) @@ -335,7 +335,7 @@ input_scrub_next_buffer (char **bufp) if (partial_size) { - memcpy (buffer_start + BEFORE_SIZE, partial_where, + memmove (buffer_start + BEFORE_SIZE, partial_where, (unsigned int) partial_size); memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE); } Modified: projects/elftoolchain-update-r3130/contrib/binutils/gas/read.c ============================================================================== --- projects/elftoolchain-update-r3130/contrib/binutils/gas/read.c Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/binutils/gas/read.c Sat Dec 27 03:01:19 2014 (r276279) @@ -4117,15 +4117,32 @@ emit_expr (expressionS *exp, unsigned in unsigned int size; LITTLENUM_TYPE *nums; - know (nbytes % CHARS_PER_LITTLENUM == 0); - size = exp->X_add_number * CHARS_PER_LITTLENUM; if (nbytes < size) { - as_warn (_("bignum truncated to %d bytes"), nbytes); + int i = nbytes / CHARS_PER_LITTLENUM; + if (i != 0) + { + LITTLENUM_TYPE sign = 0; + if ((generic_bignum[--i] + & (1 << (LITTLENUM_NUMBER_OF_BITS - 1))) != 0) + sign = ~(LITTLENUM_TYPE) 0; + while (++i < exp->X_add_number) + if (generic_bignum[i] != sign) + break; + } + if (i < exp->X_add_number) + as_warn (_("bignum truncated to %d bytes"), nbytes); size = nbytes; } + if (nbytes == 1) + { + md_number_to_chars (p, (valueT) generic_bignum[0], 1); + return; + } + know (nbytes % CHARS_PER_LITTLENUM == 0); + if (target_big_endian) { while (nbytes > size) Modified: projects/elftoolchain-update-r3130/contrib/bzip2/bzip2.1 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/bzip2/bzip2.1 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/bzip2/bzip2.1 Sat Dec 27 03:01:19 2014 (r276279) @@ -1,4 +1,3 @@ -.PU .TH bzip2 1 .SH NAME bzip2, bunzip2 \- a block-sorting file compressor, v1.0.6 Modified: projects/elftoolchain-update-r3130/contrib/ee/ee.1 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/ee/ee.1 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/ee/ee.1 Sat Dec 27 03:01:19 2014 (r276279) @@ -7,7 +7,7 @@ .\" $Header: /home/hugh/sources/old_ae/RCS/ee.1,v 1.22 2001/12/16 04:49:27 hugh Exp $ .\" .\" -.TH ee 1 "" "" "" "" +.TH ee 1 "" "" "" .SH NAME ee \- easy editor .SH SYNOPSIS Modified: projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_AT_name.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -247,6 +247,7 @@ constants. .It Fn dwarf_get_VIS_name .Dv DW_VIS_* constants. +.El .Sh RETURN VALUES These functions return .Dv DW_DLV_OK on success. Modified: projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_get_arange_info.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -102,6 +102,7 @@ One of the arguments or .Ar cu_die_offset was NULL. +.El .Sh EXAMPLE To loop through all the address lookup table entries, use: .Bd -literal -offset indent Modified: projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_hasattr.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -85,6 +85,7 @@ Either of argument or .Va ret_bool was NULL. +.El .Sh SEE ALSO .Xr dwarf 3 , .Xr dwarf_attr 3 , Modified: projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/elftoolchain/libdwarf/dwarf_whatattr.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -72,6 +72,7 @@ Either of argument or .Va retcode was NULL. +.El .Sh SEE ALSO .Xr dwarf 3 , .Xr dwarf_attr 3 , Modified: projects/elftoolchain-update-r3130/contrib/elftoolchain/libelf/elf.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/elftoolchain/libelf/elf.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/elftoolchain/libelf/elf.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -413,7 +413,6 @@ Section types in the range .Dv SHT_HIUSER ] are otherwise considered to be of type .Dv ELF_T_BYTE . -.TE .Ss Functional Grouping This section contains a brief overview of the available functionality in the ELF library. Modified: projects/elftoolchain-update-r3130/contrib/libxo/libxo/libxo.c ============================================================================== --- projects/elftoolchain-update-r3130/contrib/libxo/libxo/libxo.c Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/libxo/libxo/libxo.c Sat Dec 27 03:01:19 2014 (r276279) @@ -956,9 +956,6 @@ xo_warn_hcv (xo_handle_t *xop, int code, } memcpy(newfmt + plen, fmt, len); - /* Add a newline to the fmt string */ - if (!(xop->xo_flags & XOF_WARN_XML)) - newfmt[len++ + plen] = '\n'; newfmt[len + plen] = '\0'; if (xop->xo_flags & XOF_WARN_XML) { @@ -1010,6 +1007,7 @@ xo_warn_hcv (xo_handle_t *xop, int code, } else { vfprintf(stderr, newfmt, vap); + fprintf(stderr, ": %s\n", strerror(code)); } } Modified: projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_create.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_create.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_create.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -76,7 +76,7 @@ https://github.com/Juniper/libxo/release .Sh SEE ALSO .Xr xo_emit 3 and -.Xf xo_set_options 3 . +.Xr xo_set_options 3 . .Sh HISTORY The .Fa libxo Modified: projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_emit.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_emit.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_emit.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -35,7 +35,7 @@ but using a more complex format descript .Pp .Fn xo_emit uses the default output handle, as described in -.Xf libxo 3 , +.Xr libxo 3 , where .Fn xo_emit_h uses an explicit handle. Modified: projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_open_container.3 ============================================================================== --- projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_open_container.3 Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/libxo/libxo/xo_open_container.3 Sat Dec 27 03:01:19 2014 (r276279) @@ -105,7 +105,7 @@ container, a warning will be generated. <div class="data" data-tag="host-name">my-host.example.org</div> .Ed -.SH EMITTING HIERARCHY +.Sh EMITTING HIERARCHY To create a container, use the .Fn xo_open_container and @@ -131,7 +131,7 @@ traditional C strings can be used direct The close functions with the .Dq _d suffix are used in -.Dq Do The Right Thing +.Dq \&Do The Right Thing mode, where the name of the open containers, lists, and instances are maintained internally by .Em libxo @@ -161,7 +161,7 @@ Some user may find tracking the names of instances inconvenient. .Em libxo offers -.Dq Do The Right Thing +.Dq \&Do The Right Thing mode, where .Em libxo will track the names of open containers, lists, and instances so Modified: projects/elftoolchain-update-r3130/contrib/mdocml/INSTALL ============================================================================== --- projects/elftoolchain-update-r3130/contrib/mdocml/INSTALL Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/mdocml/INSTALL Sat Dec 27 03:01:19 2014 (r276279) @@ -1,13 +1,12 @@ -$Id: INSTALL,v 1.5 2014/08/18 13:27:47 kristaps Exp $ +$Id: INSTALL,v 1.9 2014/12/11 07:44:46 schwarze Exp $ About mdocml, the portable mandoc distribution ---------------------------------------------- The mandoc manpage compiler toolset is a suite of tools compiling mdoc(7), the roff(7) macro language of choice for BSD manual pages, and man(7), the predominant historical language for UNIX manuals. -The toolset does not yet implement man(1); that is only scheduled -for the next release, 1.13.2. It can, however, already serve to -translate source manpages to the output displayed by man(1). +Since the present version 1.13.2, it includes a man(1) manual viewer +in addition to the apropos(1) manual page search tool. For general information, see <http://mdocml.bsd.lv/>. In this document, we describe the installation and deployment of @@ -22,7 +21,7 @@ tech@ mailing list, too. Enjoy using the mandoc toolset! -Ingo Schwarze, Karlsruhe, August 2014 +Ingo Schwarze, Karlsruhe, December 2014 Installation @@ -59,8 +58,8 @@ should work. If the build fails, look a and go back to step 2. 4. Run "make -n install" and check whether everything will be -installed to the intended places. Otherwise, put some *DIR variables -into "configure.local" and go back to step 2. +installed to the intended places. Otherwise, put some *DIR or *NM* +variables into "configure.local" and go back to step 2. 5. Run "sudo make install". If you intend to build a binary package using some kind of fake root mechanism, you may need a @@ -70,14 +69,14 @@ in the "Makefile" to understand how DEST 6. To set up a man.cgi(8) server, read its manual page. 7. To use mandoc(1) as your man(1) formatter, read the "Deployment" -section below. +sections below. Understanding mandoc dependencies --------------------------------- -The mandoc(1), preconv(1), and demandoc(1) utilities have no external -dependencies. However, makewhatis(8) and apropos(1) depend on the -following software: +The mandoc(1) and demandoc(1) utilities have no external dependencies. +However, makewhatis(8), apropos(1), and man(1) depend on the following +software: 1. The SQLite database system, see <http://sqlite.org/>. The recommended version of SQLite is 3.8.4.3 or newer. The mandoc @@ -89,14 +88,14 @@ fails due to the missing sqlite3_errstr( problems, apropos(1) is fully usable with SQLite 3.7.5. Versions older than 3.7.5 may or may not work, they have not been tested. -1.2. The fts(3) directory traversion functions. +2. The fts(3) directory traversion functions. If your system does not have them, the bundled compatibility version will be used, so you need not worry in that case. But be careful: the glibc version of fts(3) is known to be broken on 32bit platforms, see <https://sourceware.org/bugzilla/show_bug.cgi?id=15838>. If you run into that problem, set "HAVE_FTS=0" in configure.local. -1.3. Marc Espie's ohash(3) library. +3. Marc Espie's ohash(3) library. If your system does not have it, the bundled compatibility version will be used, so you probably need not worry about it. @@ -145,11 +144,39 @@ in unusual headers. You can also look a check that no "#define HAVE_*" differ from your expectations. -Deployment ----------- -If you want to integrate the mandoc(1) tools with your existing -man(1) system as a formatter, then contact us first: on systems without -mandoc(1) as the default, you may have your work cut out for you! +Deployment using the integrated man(1) viewer +--------------------------------------------- +This mode of deployment requires database support. In case of +doubt, look at the section "user settings related to database +support" in the file configure.local.example. + +Deployment requires the following steps: + +1. Build and install mandoc as described above in steps 2 to 5 +below "Installation". + +2. If your system uses manpath(1), make sure it is configured +correctly, in particular, it returns all directory trees where +manual pages are installed. If your system uses man.conf(5), make +sure it contains a "_whatdb" line for each directory tree, and the +order of these lines meets your wishes. + +3. Run the command "sudo makewhatis" to build mandoc.db(5) databases +in all the directory trees configured in step 2. + +At this point, your new man(1), apropos(1), and whatis(1) should work. +Otherwise, please look at <http://mdocml.bsd.lv/contact.html>, both +for help and to have these instructions improved. + +Whenever installing new manual pages, re-run makewhatis(8) to update +the databases, or man(1) will not find the new pages. + + +Deployment using your system's native man(1) viewer +--------------------------------------------------- +This mode of deployment does not require database support, +so it works even if you don't have SQLite3. + Usually, you can have your default installation and mandoc(1) work right alongside each other by using user-specific versions of the files mentioned below. @@ -174,15 +201,17 @@ mandoc(1)" to disregard them. of cached pages being pulled up. You can usually do this by commenting out NOCACHE or similar. + mandoc(1) still has a long way to go in understanding non-trivial low-level roff(7) markup embedded in some man(7) pages. On the BSD systems using mandoc(1), third-party software is generally vetted on whether it may be formatted with mandoc(1). If not, groff(1) is pulled in as a dependency and used to install a pre-formatted -"catpage" intead of directly as manual page source. +"catpage" instead of directly as manual page source. For more background on switching operating systems to use mandoc(1) -instead of groff(1) to format manuals, see the two BSDCan presentations -by Ingo Schwarze: +instead of groff(1) to format manuals, see the BSDCan and EuroBSDCon +presentations by Ingo Schwarze: <http://www.openbsd.org/papers/bsdcan11-mandoc-openbsd.html>; <http://www.openbsd.org/papers/bsdcan14-mandoc.pdf>; +<http://www.openbsd.org/papers/eurobsdcon2014-mandoc-paper.pdf>; Modified: projects/elftoolchain-update-r3130/contrib/mdocml/LICENSE ============================================================================== --- projects/elftoolchain-update-r3130/contrib/mdocml/LICENSE Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/mdocml/LICENSE Sat Dec 27 03:01:19 2014 (r276279) @@ -1,17 +1,17 @@ -$Id: LICENSE,v 1.4 2014/08/21 00:42:38 schwarze Exp $ +$Id: LICENSE,v 1.5 2014/12/11 07:56:24 schwarze Exp $ With the exceptions noted below, all code and documentation contained in the mdocml toolkit is protected by the Copyright of the following developers: -Copyright (c) 2008, 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> +Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> Copyright (c) 2010, 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger <joerg@netbsd.org> Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org> Copyright (c) 1998, 2010 Todd C. Miller <Todd.Miller@courtesan.com> Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> -Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org> +Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org> See the individual source files for information about who contributed to which file during which years. Modified: projects/elftoolchain-update-r3130/contrib/mdocml/Makefile ============================================================================== --- projects/elftoolchain-update-r3130/contrib/mdocml/Makefile Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/mdocml/Makefile Sat Dec 27 03:01:19 2014 (r276279) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.448 2014/11/28 18:57:31 schwarze Exp $ +# $Id: Makefile,v 1.453 2014/12/09 09:14:33 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -15,9 +15,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -BASEBIN = mandoc demandoc -DBBIN = makewhatis -CGIBIN = man.cgi +# === LIST OF FILES ==================================================== TESTSRCS = test-dirent-namlen.c \ test-fgetln.c \ @@ -131,6 +129,7 @@ DISTFILES = INSTALL \ mandoc_aux.h \ mandoc_char.7 \ mandoc_escape.3 \ + mandoc_headers.3 \ mandoc_html.3 \ mandoc_malloc.3 \ manpath.h \ @@ -208,18 +207,19 @@ MANDOC_TERM_OBJS = eqn_term.o \ term_ps.o \ tbl_term.o -MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ +BASE_OBJS = $(MANDOC_HTML_OBJS) \ $(MANDOC_MAN_OBJS) \ $(MANDOC_TERM_OBJS) \ main.o \ out.o \ tree.o -MAN_OBJS = $(MANDOC_OBJS) +MAIN_OBJS = $(BASE_OBJS) -MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o - -APROPOS_OBJS = mansearch.o mansearch_const.o manpath.o +DB_OBJS = mandocdb.o \ + mansearch.o \ + mansearch_const.o \ + manpath.o CGI_OBJS = $(MANDOC_HTML_OBJS) \ cgi.o \ @@ -237,6 +237,7 @@ WWW_MANS = apropos.1.html \ mandoc.1.html \ mandoc.3.html \ mandoc_escape.3.html \ + mandoc_headers.3.html \ mandoc_html.3.html \ mandoc_malloc.3.html \ mansearch.3.html \ @@ -261,19 +262,17 @@ WWW_MANS = apropos.1.html \ WWW_OBJS = mdocml.tar.gz \ mdocml.sha256 -include Makefile.local +# === USER CONFIGURATION =============================================== -INSTALL_TARGETS = $(BUILD_TARGETS:-build=-install) +include Makefile.local # === DEPENDENCY HANDLING ============================================== all: base-build $(BUILD_TARGETS) Makefile.local -base-build: $(BASEBIN) - -db-build: $(DBBIN) +base-build: mandoc demandoc -cgi-build: $(CGIBIN) +cgi-build: man.cgi install: base-install $(INSTALL_TARGETS) @@ -281,6 +280,9 @@ www: $(WWW_OBJS) $(WWW_MANS) $(WWW_MANS): mandoc +.PHONY: base-install cgi-install db-install install www-install +.PHONY: clean distclean depend + include Makefile.depend # === TARGETS CONTAINING SHELL COMMANDS ================================ @@ -290,8 +292,7 @@ distclean: clean clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) - rm -f mandoc $(MANDOC_OBJS) $(APROPOS_OBJS) - rm -f makewhatis $(MAKEWHATIS_OBJS) + rm -f mandoc $(BASE_OBJS) $(DB_OBJS) rm -f man.cgi $(CGI_OBJS) rm -f manpage $(MANPAGE_OBJS) rm -f demandoc $(DEMANDOC_OBJS) @@ -306,34 +307,41 @@ base-install: base-build mkdir -p $(DESTDIR)$(MANDIR)/man1 mkdir -p $(DESTDIR)$(MANDIR)/man3 mkdir -p $(DESTDIR)$(MANDIR)/man7 - $(INSTALL_PROGRAM) $(BASEBIN) $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \ $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_MAN) man.1 mandoc.1 demandoc.1 \ - $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 - $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \ - $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MAN}.7 + $(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MDOC}.7 + $(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/${MANM_ROFF}.7 + $(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7 + $(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7 + $(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) -db-install: db-build +db-install: base-build mkdir -p $(DESTDIR)$(BINDIR) mkdir -p $(DESTDIR)$(SBINDIR) mkdir -p $(DESTDIR)$(MANDIR)/man1 mkdir -p $(DESTDIR)$(MANDIR)/man3 mkdir -p $(DESTDIR)$(MANDIR)/man5 mkdir -p $(DESTDIR)$(MANDIR)/man8 - ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/apropos - ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/whatis - $(INSTALL_PROGRAM) makewhatis $(DESTDIR)$(SBINDIR) - $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1 - ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \ - $(DESTDIR)$(MANDIR)/man1/whatis.1 + ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS) + ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN) + ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS) + ln -f $(DESTDIR)$(BINDIR)/mandoc \ + $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS) + $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 + $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1 + ln -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \ + $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1 $(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3 $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5 - $(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_MAN) makewhatis.8 \ + $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8 cgi-install: cgi-build mkdir -p $(DESTDIR)$(CGIBINDIR) @@ -346,34 +354,15 @@ cgi-install: cgi-build $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/ $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/ -www-install: www - mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots - $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR) - $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots - $(INSTALL_DATA) mdocml.tar.gz \ - $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz - $(INSTALL_DATA) mdocml.sha256 \ - $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 - Makefile.local config.h: configure ${TESTSRCS} @echo "$@ is out of date; please run ./configure" @exit 1 -depend: config.h - mkdep -f Makefile.depend $(CFLAGS) $(SRCS) - perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ - s|\\\n||g; s| +| |g; s| $$||mg; print;' \ - Makefile.depend > Makefile.tmp - mv Makefile.tmp Makefile.depend - libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) -mandoc: $(MAN_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(MAN_OBJS) libmandoc.a $(DBLIB) - -makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB) +mandoc: $(MAIN_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MAIN_OBJS) libmandoc.a $(DBLIB) manpage: $(MANPAGE_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB) @@ -384,6 +373,24 @@ man.cgi: $(CGI_OBJS) libmandoc.a demandoc: $(DEMANDOC_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a +# --- maintainer targets --- + +www-install: www + mkdir -p $(HTDOCDIR)/snapshots + $(INSTALL_DATA) $(WWW_MANS) style.css $(HTDOCDIR)/man + $(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots + $(INSTALL_DATA) mdocml.tar.gz \ + $(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz + $(INSTALL_DATA) mdocml.sha256 \ + $(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 + +depend: config.h + mkdep -f Makefile.depend $(CFLAGS) $(SRCS) + perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ + s|\\\n||g; s| +| |g; s| $$||mg; print;' \ + Makefile.depend > Makefile.tmp + mv Makefile.tmp Makefile.depend + mdocml.sha256: mdocml.tar.gz sha256 mdocml.tar.gz > $@ @@ -394,8 +401,8 @@ mdocml.tar.gz: $(DISTFILES) ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) ) rm -rf .dist/ -.PHONY: base-install cgi-install db-install install www-install -.PHONY: clean distclean depend +# === SUFFIX RULES ===================================================== + .SUFFIXES: .1 .3 .5 .7 .8 .h .SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html Modified: projects/elftoolchain-update-r3130/contrib/mdocml/Makefile.depend ============================================================================== --- projects/elftoolchain-update-r3130/contrib/mdocml/Makefile.depend Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/mdocml/Makefile.depend Sat Dec 27 03:01:19 2014 (r276279) @@ -15,12 +15,12 @@ demandoc.o: demandoc.c config.h man.h md eqn.o: eqn.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h eqn_html.o: eqn_html.c config.h mandoc.h out.h html.h eqn_term.o: eqn_term.c config.h mandoc.h out.h term.h -html.o: html.c config.h mandoc.h mandoc_aux.h libmandoc.h out.h html.h main.h +html.o: html.c config.h mandoc.h mandoc_aux.h out.h html.h main.h lib.o: lib.c config.h mdoc.h libmdoc.h lib.in main.o: main.c config.h mandoc.h mandoc_aux.h main.h mdoc.h man.h manpath.h mansearch.h man.o: man.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h -man_hash.o: man_hash.c config.h man.h mandoc.h libman.h -man_html.o: man_html.c config.h mandoc.h mandoc_aux.h out.h html.h man.h main.h +man_hash.o: man_hash.c config.h man.h libman.h +man_html.o: man_html.c config.h mandoc_aux.h man.h out.h html.h main.h man_macro.o: man_macro.c config.h man.h mandoc.h libmandoc.h libman.h man_term.o: man_term.c config.h mandoc.h mandoc_aux.h out.h man.h term.h main.h man_validate.o: man_validate.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h @@ -30,19 +30,19 @@ mandocdb.o: mandocdb.c config.h compat_f manpage.o: manpage.c config.h manpath.h mansearch.h manpath.o: manpath.c config.h mandoc_aux.h manpath.h mansearch.o: mansearch.c config.h compat_ohash.h mandoc.h mandoc_aux.h manpath.h mansearch.h -mansearch_const.o: mansearch_const.c config.h manpath.h mansearch.h +mansearch_const.o: mansearch_const.c config.h mansearch.h mdoc.o: mdoc.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h mdoc_argv.o: mdoc_argv.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h mdoc_hash.o: mdoc_hash.c config.h mdoc.h libmdoc.h -mdoc_html.o: mdoc_html.c config.h mandoc.h mandoc_aux.h out.h html.h mdoc.h main.h +mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mdoc.h out.h html.h main.h mdoc_macro.o: mdoc_macro.c config.h mdoc.h mandoc.h libmdoc.h libmandoc.h mdoc_man.o: mdoc_man.c config.h mandoc.h mandoc_aux.h out.h man.h mdoc.h main.h mdoc_term.o: mdoc_term.c config.h mandoc.h mandoc_aux.h out.h term.h mdoc.h main.h mdoc_validate.o: mdoc_validate.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h -msec.o: msec.c config.h mandoc.h libmandoc.h msec.in +msec.o: msec.c config.h libmandoc.h msec.in out.o: out.c config.h mandoc_aux.h mandoc.h out.h preconv.o: preconv.c config.h mandoc.h libmandoc.h -read.o: read.c config.h mandoc.h mandoc_aux.h libmandoc.h mdoc.h man.h main.h +read.o: read.c config.h mandoc.h mandoc_aux.h libmandoc.h mdoc.h man.h roff.o: roff.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h predefs.in st.o: st.c config.h mdoc.h libmdoc.h st.in tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h @@ -53,7 +53,7 @@ tbl_opts.o: tbl_opts.c config.h mandoc.h tbl_term.o: tbl_term.c config.h mandoc.h out.h term.h term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h main.h -term_ps.o: term_ps.c config.h mandoc.h mandoc_aux.h out.h main.h term.h +term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h main.h tree.o: tree.c config.h mandoc.h mdoc.h man.h main.h test-dirent-namlen.o: test-dirent-namlen.c test-fgetln.o: test-fgetln.c Modified: projects/elftoolchain-update-r3130/contrib/mdocml/NEWS ============================================================================== --- projects/elftoolchain-update-r3130/contrib/mdocml/NEWS Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/mdocml/NEWS Sat Dec 27 03:01:19 2014 (r276279) @@ -1,7 +1,76 @@ -$Id: NEWS,v 1.6 2014/08/11 01:39:00 schwarze Exp $ +$Id: NEWS,v 1.8 2014/12/13 13:43:47 schwarze Exp $ This file lists the most important changes in the mdocml.bsd.lv distribution. +Changes in version 1.13.2, released on December 13, 2014 + + --- MAJOR NEW FEATURES --- + * Include an implementation of man(1), the manual page viewer. + * Unified set of command line option, each one supported by all + command names, including new options -a (format all), -c (no + pager), -h (synopsis only), and -w (list filenames). + * Support the MANPAGER and PAGER environment variables. + * Support gzip'ed manuals by the whole toolset, even as .so targets. + * Support UTF-8 and Latin-1 input by the whole toolset, delete preconv(1). + * Switch the default output mode from -Tascii to -Tlocale. + * Improve -Tascii output for Unicode escape sequences. + * Let the -Thtml output mode produce polyglot HTML5. + * Many improvements for eqn(7), in particular in-line equations, + MathML output in -Thtml mode, and much improved terminal formatting. + --- PORTABILITY IMPROVEMENTS --- + * Change the build sequence to the usual ./configure; make; make install. + * Support ./configure.local for build customizations. + * Autodetect wchar, sqlite3, and manpath support. + * Provide a fallback version of fts(3) for systems lacking it. + * Support choosing alternative binary and manual names. + --- MINOR NEW FEATURES --- + * Rudimentary implementation of the e, x, and z tbl(7) layout + modifiers to equalize, maximize, and ignore the width of columns. + * Implement font modifiers in tbl(7) layouts. + * Allow comma-separated options in the tbl(7) options line. + * Parse and ignore the .pl (page length) roff(7) request. + * Implement .An -[no]split for the mdoc(7) -Thtml output mode. + * Support bold italic font in PostScript and PDF output. + * Warn about commas in function arguments and parentheses in function names. + * Warn about botched .Xr ordering and punctuation below SEE ALSO. + * Warn about AUTHORS sections without .An macros. + * Warn about attempts to call non-callable macros. + * New developer documentation manual page mandoc_headers(3). + --- BUGFIXES --- + * Fix read buffer overrun sometimes triggered by trailing whitespace. + * Fix read buffer overrun triggered by certain invalid \H sequences. + * Fix NULL pointer access triggered by .Bl without any arguments. + * Fix NULL pointer access triggered by .It Nm Fo without .Fc. + * Fix NULL pointer access triggered by .Sh Xo .Sh without .Xc. + * Fix NULL pointer access triggered by missing .Nm. + * Fix an assertion triggered by .It right after .El. + * Fix an assertion triggered by .Ec without preceding .Eo. + * Fix an assertion triggered by .Sm or .Db with multiple arguments. + * Fix assertion failures triggered by very large width arguments. + * Fix a division by zero in the roff(7) parser. + * Prevent negative arguments to .ll from causing integer underflow. + * Correctly autodetect source format even when .Dd is preceded by .ll. + * Multiple fixes with respect to .Bd and .Bl -offset and -width. + * Many bugfixes with respect to scaling units. + * Multiple fixes with respect to delimiter handling by in-line macros. + * Multiple fixes with respect to .Pf. + * Make \c work properly in no-fill mode. + * Stricter syntax checking of Unicode character names. + --- THANKS TO --- + * Kristaps Dzonsons for rewriting the eqn(7) parser, implementing + HTML5 and MathML output, and various other code contributions. + * Jonathan Gray (OpenBSD) for extensive testing with afl (the + American Fuzzy Lop security fuzzer) resulting in many bug reports. + * Anthony Bentley (OpenBSD), Baptiste Daroussin (FreeBSD), Daniel + Dickman, Doug Hogan, Jason McIntyre, Theo de Raadt (OpenBSD), + and Martin Natano for source code patches. + * Carsten Kunze (Heirloom troff), Daniel Levai (Slackware), + Garrett D'Amore (illumos), Giovanni Becchis, Matthew Dempsky, + Stuart Henderson, Ted Unangst, Todd Miller (OpenBSD), Thomas + Klausner (NetBSD), Ulrich Spoerlein (FreeBSD), Justin Haynes, + Marcus Merighi, Sebastien Marie, Steffen Nurpmeso and Theo Buehler + for bug reports. + Changes in version 1.13.1, released on August 10, 2014 --- MAJOR NEW FEATURES --- Modified: projects/elftoolchain-update-r3130/contrib/mdocml/TODO ============================================================================== --- projects/elftoolchain-update-r3130/contrib/mdocml/TODO Sat Dec 27 02:37:52 2014 (r276278) +++ projects/elftoolchain-update-r3130/contrib/mdocml/TODO Sat Dec 27 03:01:19 2014 (r276279) @@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.189 2014/11/26 21:40:17 schwarze Exp $ +* $Id: TODO,v 1.195 2014/12/13 13:14:39 schwarze Exp $ ************************************************************************ Many issues are annotated for difficulty as follows: @@ -72,7 +72,8 @@ are mere guesses, and some may be wrong. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412270301.sBR31LPG097155>