From owner-svn-src-projects@FreeBSD.ORG Sat Nov 29 05:28:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 589B89B4; Sat, 29 Nov 2014 05:28:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 420A18FA; Sat, 29 Nov 2014 05:28:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAT5SmhY064753; Sat, 29 Nov 2014 05:28:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAT5SgE5064726; Sat, 29 Nov 2014 05:28:42 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411290528.sAT5SgE5064726@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 29 Nov 2014 05:28:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275233 - in projects/building-blocks: . bin/csh bin/df bin/ed bin/ls bin/pkill bin/ps bin/rmail bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/elftoolchain/addr2line cont... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 05:28:48 -0000 Author: ngie Date: Sat Nov 29 05:28:40 2014 New Revision: 275233 URL: https://svnweb.freebsd.org/changeset/base/275233 Log: MFHead @ r275232 Added: projects/building-blocks/contrib/elftoolchain/addr2line/ - copied from r275232, head/contrib/elftoolchain/addr2line/ projects/building-blocks/contrib/elftoolchain/cxxfilt/ - copied from r275232, head/contrib/elftoolchain/cxxfilt/ projects/building-blocks/contrib/elftoolchain/elfcopy/ - copied from r275232, head/contrib/elftoolchain/elfcopy/ projects/building-blocks/contrib/elftoolchain/libelftc/ - copied from r275232, head/contrib/elftoolchain/libelftc/ projects/building-blocks/contrib/elftoolchain/nm/ - copied from r275232, head/contrib/elftoolchain/nm/ projects/building-blocks/contrib/elftoolchain/size/ - copied from r275232, head/contrib/elftoolchain/size/ projects/building-blocks/contrib/elftoolchain/strings/ - copied from r275232, head/contrib/elftoolchain/strings/ projects/building-blocks/contrib/libucl/COPYING - copied unchanged from r275232, head/contrib/libucl/COPYING projects/building-blocks/contrib/libucl/doc/lua_api.md - copied unchanged from r275232, head/contrib/libucl/doc/lua_api.md projects/building-blocks/contrib/libucl/include/lua_ucl.h - copied unchanged from r275232, head/contrib/libucl/include/lua_ucl.h projects/building-blocks/contrib/libucl/lua/ - copied from r275232, head/contrib/libucl/lua/ projects/building-blocks/contrib/libucl/m4/ - copied from r275232, head/contrib/libucl/m4/ projects/building-blocks/contrib/libucl/tests/basic/12.in - copied unchanged from r275232, head/contrib/libucl/tests/basic/12.in projects/building-blocks/contrib/libucl/tests/basic/12.res - copied unchanged from r275232, head/contrib/libucl/tests/basic/12.res projects/building-blocks/contrib/libucl/tests/basic/13.in - copied unchanged from r275232, head/contrib/libucl/tests/basic/13.in projects/building-blocks/contrib/libucl/tests/basic/13.res - copied unchanged from r275232, head/contrib/libucl/tests/basic/13.res projects/building-blocks/contrib/libucl/tests/basic/comments.in - copied unchanged from r275232, head/contrib/libucl/tests/basic/comments.in projects/building-blocks/contrib/libucl/tests/basic/comments.res - copied unchanged from r275232, head/contrib/libucl/tests/basic/comments.res projects/building-blocks/contrib/libucl/tests/basic/include_dir/ - copied from r275232, head/contrib/libucl/tests/basic/include_dir/ projects/building-blocks/lib/libgpio/ - copied from r275232, head/lib/libgpio/ projects/building-blocks/sbin/mdconfig/tests/mdconfig_test.sh - copied unchanged from r275232, head/sbin/mdconfig/tests/mdconfig_test.sh projects/building-blocks/sys/dev/beri/virtio/virtio.c - copied unchanged from r275232, head/sys/dev/beri/virtio/virtio.c projects/building-blocks/sys/dev/beri/virtio/virtio.h - copied unchanged from r275232, head/sys/dev/beri/virtio/virtio.h projects/building-blocks/sys/dev/beri/virtio/virtio_block.c - copied unchanged from r275232, head/sys/dev/beri/virtio/virtio_block.c projects/building-blocks/sys/mips/conf/WZR-HPAG300H - copied unchanged from r275232, head/sys/mips/conf/WZR-HPAG300H projects/building-blocks/sys/mips/conf/WZR-HPAG300H.hints - copied unchanged from r275232, head/sys/mips/conf/WZR-HPAG300H.hints Replaced: projects/building-blocks/usr.sbin/cron/Makefile.inc - copied unchanged from r275232, head/usr.sbin/cron/Makefile.inc projects/building-blocks/usr.sbin/fifolog/Makefile.inc - copied unchanged from r275232, head/usr.sbin/fifolog/Makefile.inc Deleted: projects/building-blocks/sbin/mdconfig/tests/legacy_test.sh projects/building-blocks/sbin/mdconfig/tests/mdconfig.test projects/building-blocks/sbin/mdconfig/tests/run.pl projects/building-blocks/sys/netipsec/ipip_var.h Modified: projects/building-blocks/MAINTAINERS (contents, props changed) projects/building-blocks/ObsoleteFiles.inc projects/building-blocks/bin/csh/Makefile projects/building-blocks/bin/df/Makefile projects/building-blocks/bin/ed/Makefile projects/building-blocks/bin/ls/Makefile projects/building-blocks/bin/pkill/Makefile projects/building-blocks/bin/ps/Makefile projects/building-blocks/bin/rmail/Makefile projects/building-blocks/bin/sh/Makefile projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/building-blocks/contrib/libucl/ChangeLog.md projects/building-blocks/contrib/libucl/Makefile.am projects/building-blocks/contrib/libucl/Makefile.w32 projects/building-blocks/contrib/libucl/README.md projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt projects/building-blocks/contrib/libucl/configure.ac projects/building-blocks/contrib/libucl/include/ucl.h projects/building-blocks/contrib/libucl/libucl.pc.in projects/building-blocks/contrib/libucl/src/ucl_emitter.c projects/building-blocks/contrib/libucl/src/ucl_emitter_streamline.c projects/building-blocks/contrib/libucl/src/ucl_emitter_utils.c projects/building-blocks/contrib/libucl/src/ucl_hash.c projects/building-blocks/contrib/libucl/src/ucl_hash.h projects/building-blocks/contrib/libucl/src/ucl_internal.h projects/building-blocks/contrib/libucl/src/ucl_parser.c projects/building-blocks/contrib/libucl/src/ucl_util.c projects/building-blocks/contrib/libucl/tests/Makefile.am projects/building-blocks/contrib/libucl/tests/basic/4.res projects/building-blocks/contrib/libucl/tests/generate.res projects/building-blocks/contrib/libucl/tests/test_basic.c projects/building-blocks/contrib/libucl/tests/test_generate.c projects/building-blocks/contrib/libucl/tests/test_schema.c projects/building-blocks/contrib/libucl/utils/objdump.c projects/building-blocks/contrib/mdocml/lib.in projects/building-blocks/contrib/netbsd-tests/lib/libc/sys/t_getcontext.c projects/building-blocks/contrib/ofed/libmlx4/src/cq.c projects/building-blocks/contrib/ofed/libmlx4/src/mlx4-abi.h projects/building-blocks/contrib/ofed/libmlx4/src/mlx4.c projects/building-blocks/contrib/ofed/libmlx4/src/mlx4.h projects/building-blocks/contrib/ofed/libmlx4/src/verbs.c projects/building-blocks/gnu/lib/libdialog/Makefile projects/building-blocks/gnu/lib/libgcc/Makefile projects/building-blocks/gnu/lib/libreadline/readline/Makefile projects/building-blocks/gnu/lib/libstdc++/Makefile projects/building-blocks/gnu/usr.bin/binutils/Makefile projects/building-blocks/gnu/usr.bin/dialog/Makefile projects/building-blocks/gnu/usr.bin/diff/Makefile projects/building-blocks/gnu/usr.bin/gdb/gdb/Makefile projects/building-blocks/gnu/usr.bin/gdb/gdbtui/Makefile projects/building-blocks/gnu/usr.bin/gdb/kgdb/Makefile projects/building-blocks/gnu/usr.bin/grep/Makefile projects/building-blocks/kerberos5/Makefile.inc projects/building-blocks/kerberos5/lib/libasn1/Makefile projects/building-blocks/kerberos5/lib/libgssapi_krb5/Makefile projects/building-blocks/kerberos5/lib/libgssapi_ntlm/Makefile projects/building-blocks/kerberos5/lib/libgssapi_spnego/Makefile projects/building-blocks/kerberos5/lib/libhdb/Makefile projects/building-blocks/kerberos5/lib/libheimbase/Makefile projects/building-blocks/kerberos5/lib/libheimipcc/Makefile projects/building-blocks/kerberos5/lib/libheimipcs/Makefile projects/building-blocks/kerberos5/lib/libheimntlm/Makefile projects/building-blocks/kerberos5/lib/libheimsqlite/Makefile projects/building-blocks/kerberos5/lib/libhx509/Makefile projects/building-blocks/kerberos5/lib/libkadm5clnt/Makefile projects/building-blocks/kerberos5/lib/libkadm5srv/Makefile projects/building-blocks/kerberos5/lib/libkafs5/Makefile projects/building-blocks/kerberos5/lib/libkdc/Makefile projects/building-blocks/kerberos5/lib/libkrb5/Makefile projects/building-blocks/kerberos5/lib/libroken/Makefile projects/building-blocks/kerberos5/lib/libwind/Makefile projects/building-blocks/kerberos5/libexec/digest-service/Makefile projects/building-blocks/kerberos5/libexec/hprop/Makefile projects/building-blocks/kerberos5/libexec/hpropd/Makefile projects/building-blocks/kerberos5/libexec/ipropd-master/Makefile projects/building-blocks/kerberos5/libexec/ipropd-slave/Makefile projects/building-blocks/kerberos5/libexec/kadmind/Makefile projects/building-blocks/kerberos5/libexec/kcm/Makefile projects/building-blocks/kerberos5/libexec/kdc/Makefile projects/building-blocks/kerberos5/libexec/kdigest/Makefile projects/building-blocks/kerberos5/libexec/kfd/Makefile projects/building-blocks/kerberos5/libexec/kimpersonate/Makefile projects/building-blocks/kerberos5/libexec/kpasswdd/Makefile projects/building-blocks/kerberos5/tools/asn1_compile/Makefile projects/building-blocks/kerberos5/tools/slc/Makefile projects/building-blocks/kerberos5/usr.bin/hxtool/Makefile projects/building-blocks/kerberos5/usr.bin/kadmin/Makefile projects/building-blocks/kerberos5/usr.bin/kcc/Makefile projects/building-blocks/kerberos5/usr.bin/kdestroy/Makefile projects/building-blocks/kerberos5/usr.bin/kf/Makefile projects/building-blocks/kerberos5/usr.bin/kgetcred/Makefile projects/building-blocks/kerberos5/usr.bin/kinit/Makefile projects/building-blocks/kerberos5/usr.bin/kpasswd/Makefile projects/building-blocks/kerberos5/usr.bin/ksu/Makefile projects/building-blocks/kerberos5/usr.bin/string2key/Makefile projects/building-blocks/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/building-blocks/kerberos5/usr.sbin/iprop-log/Makefile projects/building-blocks/kerberos5/usr.sbin/kstash/Makefile projects/building-blocks/kerberos5/usr.sbin/ktutil/Makefile projects/building-blocks/lib/Makefile projects/building-blocks/lib/atf/libatf-c++/Makefile projects/building-blocks/lib/libarchive/Makefile projects/building-blocks/lib/libarchive/test/Makefile projects/building-blocks/lib/libbsnmp/libbsnmp/Makefile projects/building-blocks/lib/libc++/Makefile projects/building-blocks/lib/libc/Makefile projects/building-blocks/lib/libc/gen/errlst.c projects/building-blocks/lib/libc/gen/isnan.c projects/building-blocks/lib/libc/gen/syslog.c projects/building-blocks/lib/libc/gen/tls.c projects/building-blocks/lib/libc/include/errlst.h projects/building-blocks/lib/libc/net/base64.c projects/building-blocks/lib/libc/net/getifaddrs.3 projects/building-blocks/lib/libc/net/nsdispatch.c projects/building-blocks/lib/libc/sys/stack_protector.c projects/building-blocks/lib/libc/sys/stack_protector_compat.c projects/building-blocks/lib/libcam/Makefile projects/building-blocks/lib/libcapsicum/Makefile projects/building-blocks/lib/libcasper/Makefile projects/building-blocks/lib/libcrypt/tests/Makefile projects/building-blocks/lib/libcuse/Makefile projects/building-blocks/lib/libdevstat/Makefile projects/building-blocks/lib/libdpv/Makefile projects/building-blocks/lib/libdwarf/Makefile projects/building-blocks/lib/libedit/Makefile projects/building-blocks/lib/libexecinfo/Makefile projects/building-blocks/lib/libfetch/Makefile projects/building-blocks/lib/libgeom/Makefile projects/building-blocks/lib/libjail/jail.c projects/building-blocks/lib/libjail/jail_getid.c projects/building-blocks/lib/libkiconv/quirks.c projects/building-blocks/lib/libkiconv/xlat16_iconv.c projects/building-blocks/lib/libkiconv/xlat16_sysctl.c projects/building-blocks/lib/libldns/Makefile projects/building-blocks/lib/libmagic/Makefile projects/building-blocks/lib/libmd/rmd160c.c projects/building-blocks/lib/libmd/sha1c.c projects/building-blocks/lib/libmemstat/Makefile projects/building-blocks/lib/libmp/Makefile projects/building-blocks/lib/libmp/tests/Makefile projects/building-blocks/lib/libnv/tests/Makefile projects/building-blocks/lib/libopie/Makefile projects/building-blocks/lib/libpam/libpam/tests/Makefile projects/building-blocks/lib/libpam/modules/Makefile.inc projects/building-blocks/lib/libpam/modules/pam_krb5/Makefile projects/building-blocks/lib/libpam/modules/pam_ksu/Makefile projects/building-blocks/lib/libpam/modules/pam_nologin/Makefile projects/building-blocks/lib/libpam/modules/pam_opie/Makefile projects/building-blocks/lib/libpam/modules/pam_opieaccess/Makefile projects/building-blocks/lib/libpam/modules/pam_passwdqc/Makefile projects/building-blocks/lib/libpam/modules/pam_radius/Makefile projects/building-blocks/lib/libpam/modules/pam_ssh/Makefile projects/building-blocks/lib/libpam/modules/pam_tacplus/Makefile projects/building-blocks/lib/libpam/modules/pam_unix/Makefile projects/building-blocks/lib/libpjdlog/Makefile projects/building-blocks/lib/libproc/Makefile projects/building-blocks/lib/libprocstat/Makefile projects/building-blocks/lib/libradius/Makefile projects/building-blocks/lib/librpcsec_gss/Makefile projects/building-blocks/lib/librt/Makefile projects/building-blocks/lib/librt/tests/Makefile projects/building-blocks/lib/libsmb/Makefile projects/building-blocks/lib/libsqlite3/Makefile projects/building-blocks/lib/libstdthreads/Makefile projects/building-blocks/lib/libtacplus/Makefile projects/building-blocks/lib/libthr/thread/thr_exit.c projects/building-blocks/lib/libthr/thread/thr_private.h projects/building-blocks/lib/libucl/Makefile projects/building-blocks/lib/libulog/Makefile projects/building-blocks/lib/libunbound/Makefile projects/building-blocks/lib/libusb/Makefile projects/building-blocks/lib/libutil/tests/Makefile projects/building-blocks/lib/msun/src/s_isnan.c projects/building-blocks/lib/msun/tests/Makefile projects/building-blocks/lib/ncurses/form/Makefile projects/building-blocks/lib/ncurses/menu/Makefile projects/building-blocks/lib/ncurses/panel/Makefile projects/building-blocks/libexec/atf/atf-check/Makefile projects/building-blocks/libexec/atf/atf-sh/Makefile projects/building-blocks/libexec/atrun/Makefile projects/building-blocks/libexec/casper/dns/Makefile projects/building-blocks/libexec/casper/grp/Makefile projects/building-blocks/libexec/casper/pwd/Makefile projects/building-blocks/libexec/casper/random/Makefile projects/building-blocks/libexec/casper/sysctl/Makefile projects/building-blocks/libexec/dma/Makefile projects/building-blocks/libexec/fingerd/Makefile projects/building-blocks/libexec/ftpd/Makefile projects/building-blocks/libexec/getty/Makefile projects/building-blocks/libexec/mail.local/Makefile projects/building-blocks/libexec/pppoed/Makefile projects/building-blocks/libexec/rlogind/Makefile projects/building-blocks/libexec/rpc.rquotad/Makefile projects/building-blocks/libexec/rpc.rstatd/Makefile projects/building-blocks/libexec/rpc.rusersd/Makefile projects/building-blocks/libexec/rpc.rwalld/Makefile projects/building-blocks/libexec/rpc.sprayd/Makefile projects/building-blocks/libexec/rshd/Makefile projects/building-blocks/libexec/rtld-elf/Makefile projects/building-blocks/libexec/rtld-elf/rtld.c projects/building-blocks/libexec/smrsh/Makefile projects/building-blocks/libexec/tcpd/Makefile projects/building-blocks/libexec/telnetd/Makefile projects/building-blocks/libexec/tftpd/Makefile projects/building-blocks/libexec/ulog-helper/Makefile projects/building-blocks/libexec/ypxfr/Makefile projects/building-blocks/release/picobsd/tinyware/login/Makefile projects/building-blocks/release/picobsd/tinyware/oinit/Makefile projects/building-blocks/release/picobsd/tinyware/passwd/Makefile projects/building-blocks/sbin/atm/atmconfig/Makefile projects/building-blocks/sbin/badsect/Makefile projects/building-blocks/sbin/bsdlabel/Makefile projects/building-blocks/sbin/camcontrol/Makefile projects/building-blocks/sbin/casperd/Makefile projects/building-blocks/sbin/ccdconfig/Makefile projects/building-blocks/sbin/ddb/Makefile projects/building-blocks/sbin/devd/Makefile projects/building-blocks/sbin/dhclient/Makefile projects/building-blocks/sbin/dmesg/Makefile projects/building-blocks/sbin/dumpfs/Makefile projects/building-blocks/sbin/fdisk/Makefile projects/building-blocks/sbin/fdisk_pc98/Makefile projects/building-blocks/sbin/ffsinfo/Makefile projects/building-blocks/sbin/fsck_ffs/Makefile projects/building-blocks/sbin/fsck_ffs/dir.c projects/building-blocks/sbin/fsdb/Makefile projects/building-blocks/sbin/gbde/Makefile projects/building-blocks/sbin/geom/Makefile projects/building-blocks/sbin/geom/class/eli/Makefile projects/building-blocks/sbin/geom/class/journal/Makefile projects/building-blocks/sbin/geom/class/mirror/Makefile projects/building-blocks/sbin/geom/class/part/Makefile projects/building-blocks/sbin/geom/class/raid/Makefile projects/building-blocks/sbin/geom/class/raid3/Makefile projects/building-blocks/sbin/geom/core/Makefile projects/building-blocks/sbin/ggate/ggatec/Makefile projects/building-blocks/sbin/ggate/ggated/Makefile projects/building-blocks/sbin/ggate/ggatel/Makefile projects/building-blocks/sbin/growfs/Makefile projects/building-blocks/sbin/gvinum/Makefile projects/building-blocks/sbin/hastctl/Makefile projects/building-blocks/sbin/hastd/Makefile projects/building-blocks/sbin/ifconfig/Makefile projects/building-blocks/sbin/init/Makefile projects/building-blocks/sbin/ipf/Makefile.inc projects/building-blocks/sbin/ipf/ipf/Makefile projects/building-blocks/sbin/ipf/ipfstat/Makefile projects/building-blocks/sbin/ipf/ipsend/Makefile projects/building-blocks/sbin/ipfw/Makefile projects/building-blocks/sbin/iscontrol/Makefile projects/building-blocks/sbin/md5/Makefile projects/building-blocks/sbin/mdconfig/Makefile projects/building-blocks/sbin/mdconfig/tests/Makefile projects/building-blocks/sbin/mount/Makefile projects/building-blocks/sbin/mount_cd9660/Makefile projects/building-blocks/sbin/mount_msdosfs/Makefile projects/building-blocks/sbin/mount_udf/Makefile projects/building-blocks/sbin/nandfs/Makefile projects/building-blocks/sbin/natd/Makefile projects/building-blocks/sbin/newfs/Makefile projects/building-blocks/sbin/newfs_nandfs/Makefile projects/building-blocks/sbin/pfctl/Makefile projects/building-blocks/sbin/pflogd/Makefile projects/building-blocks/sbin/ping/Makefile projects/building-blocks/sbin/ping6/Makefile projects/building-blocks/sbin/quotacheck/Makefile projects/building-blocks/sbin/rcorder/Makefile projects/building-blocks/sbin/routed/Makefile projects/building-blocks/sbin/routed/rtquery/Makefile projects/building-blocks/sbin/savecore/Makefile projects/building-blocks/sbin/setkey/Makefile projects/building-blocks/sbin/sunlabel/Makefile projects/building-blocks/sbin/swapon/Makefile projects/building-blocks/sbin/tunefs/Makefile projects/building-blocks/secure/lib/libssh/Makefile projects/building-blocks/secure/lib/libssl/Makefile projects/building-blocks/secure/libexec/sftp-server/Makefile projects/building-blocks/secure/libexec/ssh-keysign/Makefile projects/building-blocks/secure/libexec/ssh-pkcs11-helper/Makefile projects/building-blocks/secure/usr.bin/bdes/Makefile projects/building-blocks/secure/usr.bin/openssl/Makefile projects/building-blocks/secure/usr.bin/scp/Makefile projects/building-blocks/secure/usr.bin/sftp/Makefile projects/building-blocks/secure/usr.bin/ssh-add/Makefile projects/building-blocks/secure/usr.bin/ssh-agent/Makefile projects/building-blocks/secure/usr.bin/ssh-keygen/Makefile projects/building-blocks/secure/usr.bin/ssh-keyscan/Makefile projects/building-blocks/secure/usr.bin/ssh/Makefile projects/building-blocks/secure/usr.sbin/sshd/Makefile projects/building-blocks/share/man/man5/src.conf.5 projects/building-blocks/share/man/man9/Makefile projects/building-blocks/share/man/man9/timeout.9 projects/building-blocks/share/misc/bsd-family-tree projects/building-blocks/share/mk/bsd.libnames.mk projects/building-blocks/share/mk/src.libnames.mk projects/building-blocks/sys/amd64/include/asm.h projects/building-blocks/sys/arm/altera/socfpga/files.socfpga projects/building-blocks/sys/arm/altera/socfpga/socfpga_machdep.c projects/building-blocks/sys/arm/arm/generic_timer.c projects/building-blocks/sys/arm/conf/SOCKIT-BERI projects/building-blocks/sys/arm/include/asm.h projects/building-blocks/sys/boot/fdt/dts/arm/socfpga-sockit-beri.dts projects/building-blocks/sys/boot/i386/boot2/boot2.c projects/building-blocks/sys/cam/ctl/ctl.c projects/building-blocks/sys/cam/ctl/ctl_backend_block.c projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c projects/building-blocks/sys/cam/ctl/ctl_frontend_iscsi.c projects/building-blocks/sys/cam/ctl/ctl_io.h projects/building-blocks/sys/cam/ctl/ctl_tpc.c projects/building-blocks/sys/cam/ctl/scsi_ctl.c projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/building-blocks/sys/compat/linux/linux_misc.c projects/building-blocks/sys/compat/svr4/svr4_misc.c projects/building-blocks/sys/conf/files projects/building-blocks/sys/conf/files.amd64 projects/building-blocks/sys/conf/files.i386 projects/building-blocks/sys/contrib/dev/ral/Makefile projects/building-blocks/sys/contrib/ipfilter/netinet/fil.c projects/building-blocks/sys/contrib/ipfilter/netinet/ip_frag.c projects/building-blocks/sys/dev/ahci/ahci_pci.c projects/building-blocks/sys/dev/ata/ata-pci.h projects/building-blocks/sys/dev/ata/chipsets/ata-intel.c projects/building-blocks/sys/dev/drm2/drm_drv.c projects/building-blocks/sys/dev/e1000/if_igb.c projects/building-blocks/sys/dev/hwpmc/hwpmc_mpc7xxx.c projects/building-blocks/sys/dev/hwpmc/hwpmc_ppc970.c projects/building-blocks/sys/dev/ichsmb/ichsmb_pci.c projects/building-blocks/sys/dev/ichwd/ichwd.c projects/building-blocks/sys/dev/ichwd/ichwd.h projects/building-blocks/sys/dev/isp/isp.c projects/building-blocks/sys/dev/isp/isp_freebsd.c projects/building-blocks/sys/dev/isp/isp_freebsd.h projects/building-blocks/sys/dev/isp/isp_library.c projects/building-blocks/sys/dev/ixgbe/ixgbe.c projects/building-blocks/sys/dev/sound/pci/hda/hdac.c projects/building-blocks/sys/dev/sound/pci/hda/hdac.h projects/building-blocks/sys/dev/uart/uart_bus_pci.c projects/building-blocks/sys/dev/usb/controller/ehci_pci.c projects/building-blocks/sys/dev/usb/controller/ohci_pci.c projects/building-blocks/sys/dev/usb/controller/xhci_pci.c projects/building-blocks/sys/dev/usb/quirk/usb_quirk.c projects/building-blocks/sys/dev/usb/usbdevs projects/building-blocks/sys/fs/procfs/procfs_status.c projects/building-blocks/sys/i386/i386/machdep.c projects/building-blocks/sys/i386/include/asm.h projects/building-blocks/sys/kern/init_main.c projects/building-blocks/sys/kern/kern_clock.c projects/building-blocks/sys/kern/kern_exit.c projects/building-blocks/sys/kern/kern_mutex.c projects/building-blocks/sys/kern/kern_proc.c projects/building-blocks/sys/kern/kern_racct.c projects/building-blocks/sys/kern/kern_resource.c projects/building-blocks/sys/kern/kern_sig.c projects/building-blocks/sys/kern/kern_thread.c projects/building-blocks/sys/kern/kern_time.c projects/building-blocks/sys/kern/subr_bus.c projects/building-blocks/sys/kern/subr_prof.c projects/building-blocks/sys/kern/sys_generic.c projects/building-blocks/sys/net/if_arcsubr.c projects/building-blocks/sys/net/if_ethersubr.c projects/building-blocks/sys/net/if_fddisubr.c projects/building-blocks/sys/net/if_fwsubr.c projects/building-blocks/sys/net/if_iso88025subr.c projects/building-blocks/sys/netinet/if_ether.c projects/building-blocks/sys/netinet/if_ether.h projects/building-blocks/sys/netinet/toecore.c projects/building-blocks/sys/netinet6/nd6.c projects/building-blocks/sys/netinet6/nd6.h projects/building-blocks/sys/netipsec/xform.h projects/building-blocks/sys/netipsec/xform_ipip.c projects/building-blocks/sys/ofed/drivers/infiniband/core/addr.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/building-blocks/sys/powerpc/include/asm.h projects/building-blocks/sys/powerpc/include/profile.h projects/building-blocks/sys/sparc64/include/asm.h projects/building-blocks/sys/sys/bus.h projects/building-blocks/sys/sys/callout.h projects/building-blocks/sys/sys/pmc.h projects/building-blocks/sys/sys/proc.h projects/building-blocks/sys/sys/resourcevar.h projects/building-blocks/tools/build/options/WITHOUT_CROSS_COMPILER projects/building-blocks/tools/build/options/WITHOUT_INCLUDES projects/building-blocks/tools/build/options/WITHOUT_RCS projects/building-blocks/tools/build/options/WITH_FMAKE projects/building-blocks/tools/tools/ath/athaggrstats/Makefile projects/building-blocks/tools/tools/ath/athstats/Makefile projects/building-blocks/tools/tools/mwl/mwlstats/Makefile projects/building-blocks/tools/tools/nanobsd/nanobsd.sh projects/building-blocks/tools/tools/net80211/wlanstats/Makefile projects/building-blocks/tools/tools/npe/npestats/Makefile projects/building-blocks/usr.bin/apply/Makefile projects/building-blocks/usr.bin/ar/Makefile projects/building-blocks/usr.bin/atm/sscop/Makefile projects/building-blocks/usr.bin/awk/Makefile projects/building-blocks/usr.bin/bc/Makefile projects/building-blocks/usr.bin/bluetooth/bthost/Makefile projects/building-blocks/usr.bin/bluetooth/btsockstat/Makefile projects/building-blocks/usr.bin/bluetooth/rfcomm_sppd/Makefile projects/building-blocks/usr.bin/bsdiff/bsdiff/Makefile projects/building-blocks/usr.bin/bsdiff/bspatch/Makefile projects/building-blocks/usr.bin/bzip2/Makefile projects/building-blocks/usr.bin/calendar/Makefile projects/building-blocks/usr.bin/chkey/Makefile projects/building-blocks/usr.bin/chpass/Makefile projects/building-blocks/usr.bin/colldef/Makefile projects/building-blocks/usr.bin/compile_et/Makefile projects/building-blocks/usr.bin/cpio/Makefile projects/building-blocks/usr.bin/cpio/test/Makefile projects/building-blocks/usr.bin/dc/Makefile projects/building-blocks/usr.bin/dc/stack.c projects/building-blocks/usr.bin/demandoc/Makefile projects/building-blocks/usr.bin/dpv/Makefile projects/building-blocks/usr.bin/drill/Makefile projects/building-blocks/usr.bin/du/Makefile projects/building-blocks/usr.bin/ee/Makefile projects/building-blocks/usr.bin/enigma/Makefile projects/building-blocks/usr.bin/fetch/Makefile projects/building-blocks/usr.bin/file/Makefile projects/building-blocks/usr.bin/fstat/Makefile projects/building-blocks/usr.bin/ftp/Makefile projects/building-blocks/usr.bin/gcore/Makefile projects/building-blocks/usr.bin/grep/Makefile projects/building-blocks/usr.bin/gzip/Makefile projects/building-blocks/usr.bin/host/Makefile projects/building-blocks/usr.bin/ipcrm/Makefile projects/building-blocks/usr.bin/ipcs/Makefile projects/building-blocks/usr.bin/iscsictl/Makefile projects/building-blocks/usr.bin/kdump/Makefile projects/building-blocks/usr.bin/keylogin/Makefile projects/building-blocks/usr.bin/killall/Makefile projects/building-blocks/usr.bin/ktrdump/Makefile projects/building-blocks/usr.bin/less/Makefile projects/building-blocks/usr.bin/limits/Makefile projects/building-blocks/usr.bin/lock/Makefile projects/building-blocks/usr.bin/login/Makefile projects/building-blocks/usr.bin/lzmainfo/Makefile projects/building-blocks/usr.bin/m4/Makefile projects/building-blocks/usr.bin/makewhatis/Makefile projects/building-blocks/usr.bin/mandoc/Makefile projects/building-blocks/usr.bin/minigzip/Makefile projects/building-blocks/usr.bin/ministat/Makefile projects/building-blocks/usr.bin/mkimg/Makefile projects/building-blocks/usr.bin/mkulzma/Makefile projects/building-blocks/usr.bin/mkuzip/Makefile projects/building-blocks/usr.bin/msgs/Makefile projects/building-blocks/usr.bin/nc/Makefile projects/building-blocks/usr.bin/ncal/Makefile projects/building-blocks/usr.bin/netstat/Makefile projects/building-blocks/usr.bin/newgrp/Makefile projects/building-blocks/usr.bin/newkey/Makefile projects/building-blocks/usr.bin/nfsstat/Makefile projects/building-blocks/usr.bin/opieinfo/Makefile projects/building-blocks/usr.bin/opiekey/Makefile projects/building-blocks/usr.bin/opiepasswd/Makefile projects/building-blocks/usr.bin/pamtest/Makefile projects/building-blocks/usr.bin/passwd/Makefile projects/building-blocks/usr.bin/procstat/Makefile projects/building-blocks/usr.bin/quota/Makefile projects/building-blocks/usr.bin/rctl/Makefile projects/building-blocks/usr.bin/rup/Makefile projects/building-blocks/usr.bin/rusers/Makefile projects/building-blocks/usr.bin/script/Makefile projects/building-blocks/usr.bin/seq/Makefile projects/building-blocks/usr.bin/smbutil/Makefile projects/building-blocks/usr.bin/sort/Makefile projects/building-blocks/usr.bin/split/Makefile projects/building-blocks/usr.bin/su/Makefile projects/building-blocks/usr.bin/svn/svn/Makefile projects/building-blocks/usr.bin/svn/svnadmin/Makefile projects/building-blocks/usr.bin/svn/svndumpfilter/Makefile projects/building-blocks/usr.bin/svn/svnlook/Makefile projects/building-blocks/usr.bin/svn/svnmucc/Makefile projects/building-blocks/usr.bin/svn/svnrdump/Makefile projects/building-blocks/usr.bin/svn/svnserve/Makefile projects/building-blocks/usr.bin/svn/svnsync/Makefile projects/building-blocks/usr.bin/svn/svnversion/Makefile projects/building-blocks/usr.bin/systat/Makefile projects/building-blocks/usr.bin/tabs/Makefile projects/building-blocks/usr.bin/talk/Makefile projects/building-blocks/usr.bin/tar/Makefile projects/building-blocks/usr.bin/telnet/Makefile projects/building-blocks/usr.bin/tftp/Makefile projects/building-blocks/usr.bin/top/Makefile projects/building-blocks/usr.bin/tput/Makefile projects/building-blocks/usr.bin/truncate/Makefile projects/building-blocks/usr.bin/tset/Makefile projects/building-blocks/usr.bin/ul/Makefile projects/building-blocks/usr.bin/units/Makefile projects/building-blocks/usr.bin/unzip/Makefile projects/building-blocks/usr.bin/usbhidaction/Makefile projects/building-blocks/usr.bin/usbhidctl/Makefile projects/building-blocks/usr.bin/vacation/Makefile projects/building-blocks/usr.bin/vi/Makefile projects/building-blocks/usr.bin/vmstat/Makefile projects/building-blocks/usr.bin/w/Makefile projects/building-blocks/usr.bin/wc/Makefile projects/building-blocks/usr.bin/xinstall/Makefile projects/building-blocks/usr.bin/xlint/lint1/Makefile projects/building-blocks/usr.bin/xo/Makefile projects/building-blocks/usr.bin/xz/Makefile projects/building-blocks/usr.bin/xzdec/Makefile projects/building-blocks/usr.sbin/acpi/acpidb/Makefile projects/building-blocks/usr.sbin/amd/Makefile.inc projects/building-blocks/usr.sbin/amd/amd/Makefile projects/building-blocks/usr.sbin/amd/amq/Makefile projects/building-blocks/usr.sbin/amd/fixmount/Makefile projects/building-blocks/usr.sbin/amd/fsinfo/Makefile projects/building-blocks/usr.sbin/amd/hlfsd/Makefile projects/building-blocks/usr.sbin/amd/mk-amd-map/Makefile projects/building-blocks/usr.sbin/amd/pawd/Makefile projects/building-blocks/usr.sbin/amd/wire-test/Makefile projects/building-blocks/usr.sbin/ancontrol/Makefile projects/building-blocks/usr.sbin/apmd/Makefile projects/building-blocks/usr.sbin/asf/Makefile projects/building-blocks/usr.sbin/audit/Makefile projects/building-blocks/usr.sbin/auditd/Makefile projects/building-blocks/usr.sbin/auditdistd/Makefile projects/building-blocks/usr.sbin/auditreduce/Makefile projects/building-blocks/usr.sbin/authpf/Makefile projects/building-blocks/usr.sbin/autofs/Makefile projects/building-blocks/usr.sbin/bhyve/Makefile projects/building-blocks/usr.sbin/bhyvectl/Makefile projects/building-blocks/usr.sbin/bhyveload/Makefile projects/building-blocks/usr.sbin/bluetooth/ath3kfw/Makefile projects/building-blocks/usr.sbin/bluetooth/bt3cfw/Makefile projects/building-blocks/usr.sbin/bluetooth/bthidcontrol/Makefile projects/building-blocks/usr.sbin/bluetooth/bthidd/Makefile projects/building-blocks/usr.sbin/bluetooth/btpand/Makefile projects/building-blocks/usr.sbin/bluetooth/hccontrol/Makefile projects/building-blocks/usr.sbin/bluetooth/hcsecd/Makefile projects/building-blocks/usr.sbin/bluetooth/hcseriald/Makefile projects/building-blocks/usr.sbin/bluetooth/l2control/Makefile projects/building-blocks/usr.sbin/bluetooth/l2ping/Makefile projects/building-blocks/usr.sbin/bluetooth/rfcomm_pppd/Makefile projects/building-blocks/usr.sbin/bluetooth/sdpcontrol/Makefile projects/building-blocks/usr.sbin/boot0cfg/Makefile projects/building-blocks/usr.sbin/boot98cfg/Makefile projects/building-blocks/usr.sbin/bsdinstall/distextract/Makefile projects/building-blocks/usr.sbin/bsdinstall/distfetch/Makefile projects/building-blocks/usr.sbin/bsdinstall/partedit/Makefile projects/building-blocks/usr.sbin/bsnmpd/bsnmpd/Makefile projects/building-blocks/usr.sbin/bsnmpd/modules/snmp_hast/Makefile projects/building-blocks/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile projects/building-blocks/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile projects/building-blocks/usr.sbin/bsnmpd/tools/bsnmptools/Makefile projects/building-blocks/usr.sbin/cdcontrol/Makefile projects/building-blocks/usr.sbin/ckdist/Makefile projects/building-blocks/usr.sbin/clear_locks/Makefile projects/building-blocks/usr.sbin/config/Makefile projects/building-blocks/usr.sbin/cron/cron/Makefile projects/building-blocks/usr.sbin/cron/crontab/Makefile projects/building-blocks/usr.sbin/ctladm/Makefile projects/building-blocks/usr.sbin/ctld/Makefile projects/building-blocks/usr.sbin/ctm/ctm/Makefile projects/building-blocks/usr.sbin/ctm/mkCTM/Makefile projects/building-blocks/usr.sbin/daemon/Makefile projects/building-blocks/usr.sbin/dconschat/Makefile projects/building-blocks/usr.sbin/devinfo/Makefile projects/building-blocks/usr.sbin/diskinfo/Makefile projects/building-blocks/usr.sbin/editmap/Makefile projects/building-blocks/usr.sbin/edquota/Makefile projects/building-blocks/usr.sbin/fifolog/fifolog_create/Makefile projects/building-blocks/usr.sbin/fifolog/fifolog_reader/Makefile projects/building-blocks/usr.sbin/fifolog/fifolog_writer/Makefile projects/building-blocks/usr.sbin/flowctl/Makefile projects/building-blocks/usr.sbin/ftp-proxy/Makefile projects/building-blocks/usr.sbin/gssd/Makefile projects/building-blocks/usr.sbin/gstat/Makefile projects/building-blocks/usr.sbin/ifmcstat/Makefile projects/building-blocks/usr.sbin/inetd/Makefile projects/building-blocks/usr.sbin/iostat/Makefile projects/building-blocks/usr.sbin/ipfwpcap/Makefile projects/building-blocks/usr.sbin/iscsid/Makefile projects/building-blocks/usr.sbin/jail/Makefile projects/building-blocks/usr.sbin/jail/command.c projects/building-blocks/usr.sbin/jail/jail.c projects/building-blocks/usr.sbin/jail/state.c projects/building-blocks/usr.sbin/jexec/Makefile projects/building-blocks/usr.sbin/jls/Makefile projects/building-blocks/usr.sbin/kbdcontrol/Makefile projects/building-blocks/usr.sbin/keyserv/Makefile projects/building-blocks/usr.sbin/kgmon/Makefile projects/building-blocks/usr.sbin/lmcconfig/Makefile projects/building-blocks/usr.sbin/lpr/Makefile.inc projects/building-blocks/usr.sbin/lpr/chkprintcap/Makefile projects/building-blocks/usr.sbin/lpr/lpc/Makefile projects/building-blocks/usr.sbin/lpr/lpd/Makefile projects/building-blocks/usr.sbin/lpr/lpq/Makefile projects/building-blocks/usr.sbin/lpr/lpr/Makefile projects/building-blocks/usr.sbin/lpr/lprm/Makefile projects/building-blocks/usr.sbin/lpr/pac/Makefile projects/building-blocks/usr.sbin/mailstats/Makefile projects/building-blocks/usr.sbin/mailwrapper/Makefile projects/building-blocks/usr.sbin/makefs/Makefile projects/building-blocks/usr.sbin/makemap/Makefile projects/building-blocks/usr.sbin/mfiutil/Makefile projects/building-blocks/usr.sbin/mount_smbfs/Makefile projects/building-blocks/usr.sbin/mountd/Makefile projects/building-blocks/usr.sbin/moused/Makefile projects/building-blocks/usr.sbin/mptutil/Makefile projects/building-blocks/usr.sbin/mtree/Makefile projects/building-blocks/usr.sbin/nandtool/Makefile projects/building-blocks/usr.sbin/ndiscvt/Makefile projects/building-blocks/usr.sbin/ngctl/Makefile projects/building-blocks/usr.sbin/nghook/Makefile projects/building-blocks/usr.sbin/nmtree/Makefile projects/building-blocks/usr.sbin/nscd/Makefile projects/building-blocks/usr.sbin/ntp/Makefile.inc projects/building-blocks/usr.sbin/ntp/ntp-keygen/Makefile projects/building-blocks/usr.sbin/ntp/ntpd/Makefile projects/building-blocks/usr.sbin/ntp/ntpdate/Makefile projects/building-blocks/usr.sbin/ntp/ntpdc/Makefile projects/building-blocks/usr.sbin/ntp/ntpq/Makefile projects/building-blocks/usr.sbin/ntp/ntptime/Makefile projects/building-blocks/usr.sbin/ntp/sntp/Makefile projects/building-blocks/usr.sbin/pkg/Makefile projects/building-blocks/usr.sbin/pmccontrol/Makefile projects/building-blocks/usr.sbin/pmcstat/Makefile projects/building-blocks/usr.sbin/powerd/Makefile projects/building-blocks/usr.sbin/ppp/Makefile projects/building-blocks/usr.sbin/pppctl/Makefile projects/building-blocks/usr.sbin/praliases/Makefile projects/building-blocks/usr.sbin/praudit/Makefile projects/building-blocks/usr.sbin/pstat/Makefile projects/building-blocks/usr.sbin/pw/Makefile projects/building-blocks/usr.sbin/quotaon/Makefile projects/building-blocks/usr.sbin/rarpd/Makefile projects/building-blocks/usr.sbin/repquota/Makefile projects/building-blocks/usr.sbin/rpc.lockd/Makefile projects/building-blocks/usr.sbin/rpc.statd/Makefile projects/building-blocks/usr.sbin/rpc.yppasswdd/Makefile projects/building-blocks/usr.sbin/rpc.ypupdated/Makefile projects/building-blocks/usr.sbin/rpc.ypxfrd/Makefile projects/building-blocks/usr.sbin/rpcbind/Makefile projects/building-blocks/usr.sbin/rrenumd/Makefile projects/building-blocks/usr.sbin/rtadvd/Makefile projects/building-blocks/usr.sbin/rtsold/Makefile projects/building-blocks/usr.sbin/sendmail/Makefile projects/building-blocks/usr.sbin/services_mkdb/Makefile projects/building-blocks/usr.sbin/snapinfo/Makefile projects/building-blocks/usr.sbin/spray/Makefile projects/building-blocks/usr.sbin/syslogd/Makefile projects/building-blocks/usr.sbin/tcpdchk/Makefile projects/building-blocks/usr.sbin/tcpdmatch/Makefile projects/building-blocks/usr.sbin/tcpdump/tcpdump/Makefile projects/building-blocks/usr.sbin/timed/timed/Makefile projects/building-blocks/usr.sbin/traceroute/Makefile projects/building-blocks/usr.sbin/traceroute6/Makefile projects/building-blocks/usr.sbin/tzsetup/Makefile projects/building-blocks/usr.sbin/ugidfw/Makefile projects/building-blocks/usr.sbin/uhsoctl/Makefile projects/building-blocks/usr.sbin/unbound/anchor/Makefile projects/building-blocks/usr.sbin/unbound/checkconf/Makefile projects/building-blocks/usr.sbin/unbound/control/Makefile projects/building-blocks/usr.sbin/unbound/daemon/Makefile projects/building-blocks/usr.sbin/usbconfig/Makefile projects/building-blocks/usr.sbin/vipw/Makefile projects/building-blocks/usr.sbin/watch/Makefile projects/building-blocks/usr.sbin/watchdogd/Makefile projects/building-blocks/usr.sbin/wpa/Makefile.crypto projects/building-blocks/usr.sbin/wpa/hostapd/Makefile projects/building-blocks/usr.sbin/wpa/hostapd_cli/Makefile projects/building-blocks/usr.sbin/wpa/wpa_cli/Makefile projects/building-blocks/usr.sbin/wpa/wpa_passphrase/Makefile projects/building-blocks/usr.sbin/wpa/wpa_priv/Makefile projects/building-blocks/usr.sbin/wpa/wpa_supplicant/Makefile projects/building-blocks/usr.sbin/ypserv/Makefile Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/cddl/ (props changed) projects/building-blocks/cddl/contrib/opensolaris/ (props changed) projects/building-blocks/contrib/libucl/ (props changed) projects/building-blocks/contrib/mdocml/ (props changed) projects/building-blocks/gnu/lib/ (props changed) projects/building-blocks/gnu/usr.bin/binutils/ (props changed) projects/building-blocks/gnu/usr.bin/gdb/ (props changed) projects/building-blocks/lib/libc/ (props changed) projects/building-blocks/lib/libutil/ (props changed) projects/building-blocks/sbin/ (props changed) projects/building-blocks/sbin/ipfw/ (props changed) projects/building-blocks/share/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/boot/ (props changed) projects/building-blocks/sys/cddl/contrib/opensolaris/ (props changed) projects/building-blocks/sys/conf/ (props changed) projects/building-blocks/sys/contrib/ipfilter/ (props changed) projects/building-blocks/usr.bin/calendar/ (props changed) projects/building-blocks/usr.bin/mkimg/ (props changed) projects/building-blocks/usr.bin/procstat/ (props changed) projects/building-blocks/usr.sbin/bhyve/ (props changed) projects/building-blocks/usr.sbin/bhyvectl/ (props changed) projects/building-blocks/usr.sbin/bhyveload/ (props changed) projects/building-blocks/usr.sbin/jail/ (props changed) projects/building-blocks/usr.sbin/ndiscvt/ (props changed) projects/building-blocks/usr.sbin/rtadvd/ (props changed) projects/building-blocks/usr.sbin/rtsold/ (props changed) Modified: projects/building-blocks/MAINTAINERS ============================================================================== --- projects/building-blocks/MAINTAINERS Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/MAINTAINERS Sat Nov 29 05:28:40 2014 (r275233) @@ -48,7 +48,6 @@ cd(4) ken Pre-commit review requested. pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. em(4) jfv Pre-commit review requested. -tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -118,7 +117,6 @@ lib/libc/stdtime edwin Heads-up apprec is maintained by a third party source. sbin/routed bms Pre-commit review; notify vendor at rhyolite.com isci(4) jimharris Pre-commit review requested. -3dfx cokane Pre-commit review preferred. cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. Modified: projects/building-blocks/ObsoleteFiles.inc ============================================================================== --- projects/building-blocks/ObsoleteFiles.inc Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/ObsoleteFiles.inc Sat Nov 29 05:28:40 2014 (r275233) @@ -38,6 +38,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20141126: convert sbin/mdconfig/tests to ATF format tests +OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test +OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test +OLD_FILES+=usr/tests/sbin/mdconfig/run.pl +# 20141126: remove xform_ipip decapsulation fallback +OLD_FILES+=usr/include/netipsec/ipip_var.h # 20141109: faith/faithd removal OLD_FILES+=etc/rc.d/faith OLD_FILES+=usr/share/man/man4/faith.4.gz @@ -134,10 +140,12 @@ OLD_FILES+=usr/include/readline/chardefs OLD_FILES+=usr/include/readline/history.h OLD_FILES+=usr/include/readline/keymaps.h OLD_FILES+=usr/include/readline/readline.h +OLD_FILES+=usr/include/readline/tilde.h OLD_FILES+=usr/include/readline/rlconf.h OLD_FILES+=usr/include/readline/rlstdc.h OLD_FILES+=usr/include/readline/rltypedefs.h OLD_FILES+=usr/include/readline/rltypedefs.h +OLD_DIRS+=usr/include/readline OLD_FILES+=usr/share/info/readline.info.gz OLD_FILES+=usr/share/man/man3/readline.3.gz # 20140625: csup removal Modified: projects/building-blocks/bin/csh/Makefile ============================================================================== --- projects/building-blocks/bin/csh/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/csh/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -40,8 +40,7 @@ MLINKS= csh.1 tcsh.1 # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Modified: projects/building-blocks/bin/df/Makefile ============================================================================== --- projects/building-blocks/bin/df/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/df/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -9,7 +9,6 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} ${LIBXO} -LDADD= -lutil -lxo +LIBADD= xo util .include Modified: projects/building-blocks/bin/ed/Makefile ============================================================================== --- projects/building-blocks/bin/ed/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/ed/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -9,8 +9,7 @@ MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include Modified: projects/building-blocks/bin/ls/Makefile ============================================================================== --- projects/building-blocks/bin/ls/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/ls/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -5,14 +5,12 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAPW} -LDADD+= -ltermcapw +LIBADD+= termcapw .endif .include Modified: projects/building-blocks/bin/pkill/Makefile ============================================================================== --- projects/building-blocks/bin/pkill/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/pkill/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Modified: projects/building-blocks/bin/ps/Makefile ============================================================================== --- projects/building-blocks/bin/ps/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/ps/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -11,7 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include Modified: projects/building-blocks/bin/rmail/Makefile ============================================================================== --- projects/building-blocks/bin/rmail/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/rmail/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -14,11 +14,7 @@ MAN= rmail.8 WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a - -DPADD= ${LIBSM} -LDADD= ${LIBSM} +LIBADD= sm SRCS+= sm_os.h CLEANFILES+=sm_os.h Modified: projects/building-blocks/bin/sh/Makefile ============================================================================== --- projects/building-blocks/bin/sh/Makefile Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/bin/sh/Makefile Sat Nov 29 05:28:40 2014 (r275233) @@ -18,8 +18,7 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c Sat Nov 29 05:28:40 2014 (r275233) @@ -1211,13 +1211,13 @@ dt_module_update(dtrace_hdl_t *dtp, stru #if defined(__FreeBSD__) if (sh.sh_size == 0) continue; - if (is_elf_obj && (sh.sh_type == SHT_PROGBITS || - sh.sh_type == SHT_NOBITS)) { + if (sh.sh_type == SHT_PROGBITS || sh.sh_type == SHT_NOBITS) { alignmask = sh.sh_addralign - 1; mapbase += alignmask; mapbase &= ~alignmask; sh.sh_addr = mapbase; - dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; + if (is_elf_obj) + dmp->dm_sec_offsets[elf_ndxscn(sp)] = sh.sh_addr; mapbase += sh.sh_size; } #endif Modified: projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Sat Nov 29 05:28:40 2014 (r275233) @@ -545,8 +545,9 @@ dt_probe_define(dt_provider_t *pvp, dt_p for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) { if (strcmp(pip->pi_fname, fname) == 0 && - ((rname == NULL && pip->pi_rname[0] == '\0') || - (rname != NULL && strcmp(pip->pi_rname, rname)) == 0)) + ((rname == NULL && pip->pi_rname == NULL) || + (rname != NULL && pip->pi_rname != NULL && + strcmp(pip->pi_rname, rname) == 0))) break; } Copied: projects/building-blocks/contrib/libucl/COPYING (from r275232, head/contrib/libucl/COPYING) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/contrib/libucl/COPYING Sat Nov 29 05:28:40 2014 (r275233, copy of r275232, head/contrib/libucl/COPYING) @@ -0,0 +1,23 @@ +Copyright (c) 2013-2014, Vsevolod Stakhov +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Modified: projects/building-blocks/contrib/libucl/ChangeLog.md ============================================================================== --- projects/building-blocks/contrib/libucl/ChangeLog.md Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/ChangeLog.md Sat Nov 29 05:28:40 2014 (r275233) @@ -4,3 +4,19 @@ - Streamline emitter has been added, so it is now possible to output partial `ucl` objects - Emitter now is more flexible due to emitter_context structure + +### 0.5.1 +- Fixed number of bugs and memory leaks + +### 0.5.2 + +- Allow userdata objects to be emitted and destructed +- Use userdata objects to store lua function references + +### Libucl 0.6 + +- Reworked macro interface + +### Libucl 0.6.1 + +- Various utilities fixes Modified: projects/building-blocks/contrib/libucl/Makefile.am ============================================================================== --- projects/building-blocks/contrib/libucl/Makefile.am Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/Makefile.am Sat Nov 29 05:28:40 2014 (r275233) @@ -4,4 +4,8 @@ EXTRA_DIST = uthash README.md pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libucl.pc -SUBDIRS = src tests utils doc +if LUA_SUB + LUA_SUBDIR = lua +endif + +SUBDIRS = src tests utils doc $(LUA_SUBDIR) \ No newline at end of file Modified: projects/building-blocks/contrib/libucl/Makefile.w32 ============================================================================== --- projects/building-blocks/contrib/libucl/Makefile.w32 Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/Makefile.w32 Sat Nov 29 05:28:40 2014 (r275233) @@ -33,6 +33,7 @@ OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ + $(OBJDIR)/ucl_emitter_utils.o \ $(OBJDIR)/ucl_schema.o \ $(OBJDIR)/xxhash.o @@ -51,6 +52,8 @@ $(OBJDIR)/ucl_parser.o: $(SRCDIR)/ucl_pa $(CC) -o $(OBJDIR)/ucl_parser.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_parser.c $(OBJDIR)/ucl_emitter.o: $(SRCDIR)/ucl_emitter.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_emitter.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter.c +$(OBJDIR)/ucl_emitter_utils.o: $(SRCDIR)/ucl_emitter_utils.c $(HDEPS) + $(CC) -o $(OBJDIR)/ucl_emitter_utils.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_emitter_utils.c $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c $(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS) @@ -61,7 +64,7 @@ $(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $ clean: $(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(RMDIR) $(OBJDIR) - + # Utils chargen: utils/chargen.c $(OBJDIR)/$(SONAME) @@ -75,7 +78,7 @@ test: $(OBJDIR) $(OBJDIR)/$(SONAME) $(OB run-test: test TEST_DIR=$(TESTDIR) $(TESTDIR)/run_tests.sh $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/test_generate - + $(OBJDIR)/test_basic: $(TESTDIR)/test_basic.c $(OBJDIR)/$(SONAME) $(CC) -o $(OBJDIR)/test_basic $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) $(LDFLAGS) $(TESTDIR)/test_basic.c $(LD_UCL_FLAGS) $(OBJDIR)/test_speed: $(TESTDIR)/test_speed.c $(OBJDIR)/$(SONAME) Modified: projects/building-blocks/contrib/libucl/README.md ============================================================================== --- projects/building-blocks/contrib/libucl/README.md Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/README.md Sat Nov 29 05:28:40 2014 (r275233) @@ -223,15 +223,57 @@ UCL supports external macros both multil .... }; ``` -There are two internal macros provided by UCL: -* `include` - read a file `/path/to/file` or an url `http://example.com/file` and include it to the current place of -UCL configuration; -* `try\_include` - try to read a file or url and include it but do not create a fatal error if a file or url is not accessible; -* `includes` - read a file or an url like the previous macro, but fetch and check the signature file (which is obtained -by `.sig` suffix appending). - -Public keys which are used for the last command are specified by the concrete UCL user. +Moreover, each macro can accept an optional list of arguments in braces. These +arguments themselves are the UCL object that is parsed and passed to a macro as +options: + +```nginx +.macro(param=value) "something"; +.macro(param={key=value}) "something"; +.macro(.include "params.conf") "something"; +.macro(#this is multiline macro +param = [value1, value2]) "something"; +.macro(key="()") "something"; +``` + +UCL also provide a convenient `include` macro to load content from another files +to the current UCL object. This macro accepts either path to file: + +```nginx +.include "/full/path.conf" +.include "./relative/path.conf" +.include "${CURDIR}/path.conf" +``` + +or URL (if ucl is built with url support provided by either `libcurl` or `libfetch`): + + .include "http://example.com/file.conf" + +`.include` macro supports a set of options: + +* `try` (default: **false**) - if this option is `true` than UCL treats errors on loading of +this file as non-fatal. For example, such a file can be absent but it won't stop the parsing +of the top-level document. +* `sign` (default: **false**) - if this option is `true` UCL loads and checks the signature for +a file from path named `.sig`. Trusted public keys should be provided for UCL API after +parser is created but before any configurations are parsed. +* `glob` (default: **false**) - if this option is `true` UCL treats the filename as GLOB pattern and load +all files that matches the specified pattern (normally the format of patterns is defined in `glob` manual page +for your operating system). This option is meaningless for URL includes. +* `url` (default: **true**) - allow URL includes. +* `priority` (default: 0) - specify priority for the include (see below). + +Priorities are used by UCL parser to manage the policy of objects rewriting during including other files +as following: + +* If we have two objects with the same priority then we form an implicit array +* If a new object has bigger priority then we overwrite an old one +* If a new object has lower priority then we ignore it + +By default, the priority of top-level object is set to zero (lowest priority). Currently, +you can define up to 16 priorities (from 0 to 15). Includes with bigger priorities will +rewrite keys from the objects with lower priorities as specified by the policy. ### Variables support @@ -317,7 +359,7 @@ ucl: emitted compact json in 0.0991 seco ucl: emitted yaml in 0.1354 seconds ``` -You can do your own benchmarks by running `make test` in libucl top directory. +You can do your own benchmarks by running `make check` in libucl top directory. ## Conclusion Modified: projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt ============================================================================== --- projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/cmake/CMakeLists.txt Sat Nov 29 05:28:40 2014 (r275233) @@ -1,8 +1,8 @@ PROJECT(libucl C) SET(LIBUCL_VERSION_MAJOR 0) -SET(LIBUCL_VERSION_MINOR 2) -SET(LIBUCL_VERSION_PATCH 9) +SET(LIBUCL_VERSION_MINOR 5) +SET(LIBUCL_VERSION_PATCH 0) SET(LIBUCL_VERSION "${LIBUCL_VERSION_MAJOR}.${LIBUCL_VERSION_MINOR}.${LIBUCL_VERSION_PATCH}") @@ -86,6 +86,8 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOU SET(UCLSRC ../src/ucl_util.c ../src/ucl_parser.c ../src/ucl_emitter.c + ../src/ucl_emitter_streamline.c + ../src/ucl_emitter_utils.c ../src/ucl_hash.c ../src/ucl_schema.c ../src/xxhash.c) @@ -98,6 +100,18 @@ ENDIF (BUILD_SHARED_LIBS) ADD_LIBRARY(ucl ${LIB_TYPE} ${UCLSRC}) SET_TARGET_PROPERTIES(ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +IF(WITH_LUA) + SET(UCL_LUA_SRC ../lua/lua_ucl.c) + ADD_LIBRARY(lua-ucl ${LIB_TYPE} ${UCL_LUA_SRC}) + IF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUAJIT_LIBRARY}") + ELSE(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl "${LUA_LIBRARY}") + ENDIF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(lua-ucl ucl) + SET_TARGET_PROPERTIES(lua-ucl PROPERTIES VERSION ${LIBUCL_VERSION} SOVERSION ${LIBUCL_VERSION_MAJOR}) +ENDIF(WITH_LUA) + IF(HAVE_FETCH_H) TARGET_LINK_LIBRARIES(ucl fetch) ELSE(HAVE_FETCH_H) Modified: projects/building-blocks/contrib/libucl/configure.ac ============================================================================== --- projects/building-blocks/contrib/libucl/configure.ac Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/configure.ac Sat Nov 29 05:28:40 2014 (r275233) @@ -1,12 +1,13 @@ m4_define([maj_ver], [0]) -m4_define([med_ver], [5]) -m4_define([min_ver], [0]) -m4_define([so_version], [2:0:0]) +m4_define([med_ver], [6]) +m4_define([min_ver], [1]) +m4_define([so_version], [3:0:1]) m4_define([ucl_version], [maj_ver.med_ver.min_ver]) AC_INIT([libucl],[ucl_version],[https://github.com/vstakhov/libucl],[libucl]) AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE([1.11 foreign silent-rules -Wall -Wportability no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wportability no-dist-gzip dist-xz]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) UCL_VERSION=ucl_version SO_VERSION=so_version @@ -57,6 +58,9 @@ AC_ARG_ENABLE([regex], AS_HELP_STRING([- AC_ARG_ENABLE([signatures], AS_HELP_STRING([--enable-signatures], [Enable signatures check (requires openssl) @<:@default=no@:>@]), [], [enable_signatures=no]) +AC_ARG_ENABLE([lua], AS_HELP_STRING([--enable-lua], + [Enable lua API build (requires lua libraries and headers) @<:@default=no@:>@]), [], + [enable_lua=no]) AC_ARG_ENABLE([utils], AS_HELP_STRING([--enable-utils], [Build and install utils @<:@default=no@:>@]), [case "${enableval}" in @@ -99,6 +103,21 @@ AS_IF([test "x$enable_regex" = "xyes"], ]) AC_SUBST(LIBREGEX_LIB) +AS_IF([test "x$enable_lua" = "xyes"], [ + AX_PROG_LUA([5.1], [], [ + AX_LUA_HEADERS([ + AX_LUA_LIBS([ + AC_DEFINE(HAVE_LUA, 1, [Define to 1 for lua support.]) + with_lua="yes" + ], [AC_MSG_ERROR([unable to find the lua libraries]) + ]) + ], [AC_MSG_ERROR([unable to find the lua header files]) + ]) + ], [AC_MSG_ERROR([unable to find the lua interpreter])]) +], [with_lua="no"]) + +AM_CONDITIONAL([LUA_SUB], [test "$with_lua" = "yes"]) + AS_IF([test "x$enable_urls" = "xyes"], [ AC_CHECK_HEADER([fetch.h], [ AC_DEFINE(HAVE_FETCH_H, 1, [Define to 1 if you have the header file.]) @@ -155,9 +174,11 @@ AC_LINK_IFELSE([ AC_CONFIG_FILES(Makefile \ src/Makefile \ + lua/Makefile tests/Makefile \ utils/Makefile \ doc/Makefile \ + lua/libucl.rockspec \ libucl.pc) AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h]) AC_OUTPUT Copied: projects/building-blocks/contrib/libucl/doc/lua_api.md (from r275232, head/contrib/libucl/doc/lua_api.md) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/contrib/libucl/doc/lua_api.md Sat Nov 29 05:28:40 2014 (r275233, copy of r275232, head/contrib/libucl/doc/lua_api.md) @@ -0,0 +1,194 @@ +## Module `ucl` + +This lua module allows to parse objects from strings and to store data into +ucl objects. It uses `libucl` C library to parse and manipulate with ucl objects. + +Example: + +~~~lua +local ucl = require("ucl") + +local parser = ucl.parser() +local res,err = parser:parse_string('{key=value}') + +if not res then + print('parser error: ' .. err) +else + local obj = parser:get_object() + local got = ucl.to_format(obj, 'json') +endif + +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +###Brief content: + +**Functions**: + +> [`ucl_object_push_lua(L, obj, allow_array)`](#function-ucl_object_push_lual-obj-allow_array) + +> [`ucl.to_format(var, format)`](#function-uclto_formatvar-format) + + + +**Methods**: + +> [`parser:parse_file(name)`](#method-parserparse_filename) + +> [`parser:parse_string(input)`](#method-parserparse_stringinput) + +> [`parser:get_object()`](#method-parserget_object) + + +## Functions + +The module `ucl` defines the following functions. + +### Function `ucl_object_push_lua(L, obj, allow_array)` + +This is a `C` function to push `UCL` object as lua variable. This function +converts `obj` to lua representation using the following conversions: + +- *scalar* values are directly presented by lua objects +- *userdata* values are converted to lua function objects using `LUA_REGISTRYINDEX`, +this can be used to pass functions from lua to c and vice-versa +- *arrays* are converted to lua tables with numeric indicies suitable for `ipairs` iterations +- *objects* are converted to lua tables with string indicies + +**Parameters:** + +- `L {lua_State}`: lua state pointer +- `obj {ucl_object_t}`: object to push +- `allow_array {bool}`: expand implicit arrays (should be true for all but partial arrays) + +**Returns:** + +- `{int}`: `1` if an object is pushed to lua + +Back to [module description](#module-ucl). + +### Function `ucl.to_format(var, format)` + +Converts lua variable `var` to the specified `format`. Formats supported are: + +- `json` - fine printed json +- `json-compact` - compacted json +- `config` - fine printed configuration +- `ucl` - same as `config` +- `yaml` - embedded yaml + +If `var` contains function, they are called during output formatting and if +they return string value, then this value is used for ouptut. + +**Parameters:** + +- `var {variant}`: any sort of lua variable (if userdata then metafield `__to_ucl` is searched for output) +- `format {string}`: any available format + +**Returns:** + +- `{string}`: string representation of `var` in the specific `format`. + +Example: + +~~~lua +local table = { + str = 'value', + num = 100500, + null = ucl.null, + func = function () + return 'huh' + end + + +print(ucl.to_format(table, 'ucl')) +-- Output: +--[[ +num = 100500; +str = "value"; +null = null; +func = "huh"; +--]] +~~~ + +Back to [module description](#module-ucl). + + +## Methods + +The module `ucl` defines the following methods. + +### Method `parser:parse_file(name)` + +Parse UCL object from file. + +**Parameters:** + +- `name {string}`: filename to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Example: + +~~~lua +local parser = ucl.parser() +local res,err = parser:parse_file('/some/file.conf') + +if not res then + print('parser error: ' .. err) +else + -- Do something with object +end +~~~ + +Back to [module description](#module-ucl). + +### Method `parser:parse_string(input)` + +Parse UCL object from file. + +**Parameters:** + +- `input {string}`: string to parse + +**Returns:** + +- `{bool[, string]}`: if res is `true` then file has been parsed successfully, otherwise an error string is also returned + +Back to [module description](#module-ucl). + +### Method `parser:get_object()` + +Get top object from parser and export it to lua representation. + +**Parameters:** + + nothing + +**Returns:** + +- `{variant or nil}`: ucl object as lua native variable + +Back to [module description](#module-ucl). + + +Back to [top](#). + Copied: projects/building-blocks/contrib/libucl/include/lua_ucl.h (from r275232, head/contrib/libucl/include/lua_ucl.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/contrib/libucl/include/lua_ucl.h Sat Nov 29 05:28:40 2014 (r275233, copy of r275232, head/contrib/libucl/include/lua_ucl.h) @@ -0,0 +1,69 @@ +/* Copyright (c) 2014, Vsevolod Stakhov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef LUA_UCL_H_ +#define LUA_UCL_H_ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include "ucl.h" + +/** + * Closure structure for lua function storing inside UCL + */ +struct ucl_lua_funcdata { + lua_State *L; + int idx; + char *ret; +}; + +/** + * Initialize lua UCL API + */ +UCL_EXTERN int luaopen_ucl (lua_State *L); + +/** + * Import UCL object from lua state + * @param L lua state + * @param idx index of object at the lua stack to convert to UCL + * @return new UCL object or NULL, the caller should unref object after using + */ +UCL_EXTERN ucl_object_t* ucl_object_lua_import (lua_State *L, int idx); + +/** + * Push an object to lua + * @param L lua state + * @param obj object to push + * @param allow_array traverse over implicit arrays + */ +UCL_EXTERN int ucl_object_push_lua (lua_State *L, + const ucl_object_t *obj, bool allow_array); + +UCL_EXTERN struct ucl_lua_funcdata* ucl_object_toclosure ( + const ucl_object_t *obj); + +#endif /* LUA_UCL_H_ */ Modified: projects/building-blocks/contrib/libucl/include/ucl.h ============================================================================== --- projects/building-blocks/contrib/libucl/include/ucl.h Sat Nov 29 05:14:26 2014 (r275232) +++ projects/building-blocks/contrib/libucl/include/ucl.h Sat Nov 29 05:28:40 2014 (r275233) @@ -147,7 +147,8 @@ typedef enum ucl_emitter { typedef enum ucl_parser_flags { UCL_PARSER_KEY_LOWERCASE = 0x1, /**< Convert all keys to lower case */ UCL_PARSER_ZEROCOPY = 0x2, /**< Parse input in zero-copy mode if possible */ - UCL_PARSER_NO_TIME = 0x4 /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_TIME = 0x4, /**< Do not parse time and treat time values as strings */ + UCL_PARSER_NO_IMPLICIT_ARRAYS = 0x8 /** Create explicit arrays instead of implicit ones */ } ucl_parser_flags_t; /** @@ -171,9 +172,12 @@ typedef enum ucl_string_flags { * Basic flags for an object */ typedef enum ucl_object_flags { - UCL_OBJECT_ALLOCATED_KEY = 1, /**< An object has key allocated internally */ - UCL_OBJECT_ALLOCATED_VALUE = 2, /**< An object has a string value allocated internally */ - UCL_OBJECT_NEED_KEY_ESCAPE = 4 /**< The key of an object need to be escaped on output */ + UCL_OBJECT_ALLOCATED_KEY = 0x1, /**< An object has key allocated internally */ + UCL_OBJECT_ALLOCATED_VALUE = 0x2, /**< An object has a string value allocated internally */ + UCL_OBJECT_NEED_KEY_ESCAPE = 0x4, /**< The key of an object need to be escaped on output */ + UCL_OBJECT_EPHEMERAL = 0x8, /**< Temporary object that does not need to be freed really */ + UCL_OBJECT_MULTILINE = 0x10, /**< String should be displayed as multiline string */ + UCL_OBJECT_MULTIVALUE = 0x20 /**< Object is a key with multiple values */ } ucl_object_flags_t; /** @@ -195,14 +199,21 @@ typedef struct ucl_object_s { const char *key; /**< Key of an object */ struct ucl_object_s *next; /**< Array handle */ struct ucl_object_s *prev; /**< Array handle */ - unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ - unsigned keylen; /**< Lenght of a key */ - unsigned len; /**< Size of an object */ - enum ucl_type type; /**< Real type */ - uint16_t ref; /**< Reference count */ + uint32_t keylen; /**< Lenght of a key */ + uint32_t len; /**< Size of an object */ + uint32_t ref; /**< Reference count */ uint16_t flags; /**< Object flags */ + uint16_t type; /**< Real type */ + unsigned char* trash_stack[2]; /**< Pointer to allocated chunks */ } ucl_object_t; +/** + * Destructor type for userdata objects + * @param ud user specified data pointer + */ +typedef void (*ucl_userdata_dtor)(void *ud); +typedef const char* (*ucl_userdata_emitter)(void *ud); + /** @} */ /** @@ -239,6 +250,31 @@ UCL_EXTERN ucl_object_t* ucl_object_new UCL_EXTERN ucl_object_t* ucl_object_typed_new (ucl_type_t type) UCL_WARN_UNUSED_RESULT; /** + * Create new object with type and priority specified + * @param type type of a new object + * @param priority priority of an object + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_full (ucl_type_t type, unsigned priority) + UCL_WARN_UNUSED_RESULT; + +/** + * Create new object with userdata dtor + * @param dtor destructor function + * @return new object + */ +UCL_EXTERN ucl_object_t* ucl_object_new_userdata (ucl_userdata_dtor dtor, + ucl_userdata_emitter emitter) UCL_WARN_UNUSED_RESULT; + +/** + * Perform deep copy of an object copying everything + * @param other object to copy + * @return new object with refcount equal to 1 + */ +UCL_EXTERN ucl_object_t * ucl_object_copy (const ucl_object_t *other) + UCL_WARN_UNUSED_RESULT; + +/** * Return the type of an object * @return the object type */ @@ -293,7 +329,7 @@ UCL_EXTERN ucl_object_t* ucl_object_from /** * Insert a object 'elt' to the hash 'top' and associate it with key 'key' - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -306,7 +342,7 @@ UCL_EXTERN bool ucl_object_insert_key (u /** * Replace a object 'elt' to the hash 'top' and associate it with key 'key', old object will be unrefed, * if no object has been found this function works like ucl_object_insert_key() - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -317,6 +353,15 @@ UCL_EXTERN bool ucl_object_replace_key ( const char *key, size_t keylen, bool copy_key); /** + * Merge the keys from one object to another object. Overwrite on conflict + * @param top destination object (must be of type UCL_OBJECT) + * @param elt element to insert (must be of type UCL_OBJECT) + * @param copy copy rather than reference the elements + * @return true if all keys have been merged + */ +UCL_EXTERN bool ucl_object_merge (ucl_object_t *top, ucl_object_t *elt, bool copy); + +/** * Delete a object associated with key 'key', old object will be unrefered, * @param top object * @param key key associated to the object to remove @@ -335,8 +380,9 @@ UCL_EXTERN bool ucl_object_delete_key (u /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object, returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @param keylen length of the key (or 0 for NULL terminated keys) @@ -346,8 +392,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ size_t keylen) UCL_WARN_UNUSED_RESULT; /** - * Delete key from `top` object returning the object deleted. This object is not - * released + * Removes `key` from `top` object returning the object that was removed. This + * object is not released, caller must unref the returned object when it is no + * longer needed. * @param top object * @param key key to remove * @return removed object or NULL if object has not been found @@ -356,9 +403,9 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_ UCL_WARN_UNUSED_RESULT; /** - * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if the specified key exist, - * try to merge its content - * @param top destination object (will be created automatically if top is NULL) + * Insert a object 'elt' to the hash 'top' and associate it with key 'key', if + * the specified key exist, try to merge its content + * @param top destination object (must be of type UCL_OBJECT) * @param elt element to insert (must NOT be NULL) * @param key key to associate with this object (either const or preallocated) * @param keylen length of the key (or 0 for NULL terminated keys) @@ -369,8 +416,8 @@ UCL_EXTERN bool ucl_object_insert_key_me const char *key, size_t keylen, bool copy_key); /** - * Append an element to the front of array object - * @param top destination object (will be created automatically if top is NULL) + * Append an element to the end of array object + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -379,7 +426,7 @@ UCL_EXTERN bool ucl_array_append (ucl_ob /** * Append an element to the start of array object - * @param top destination object (will be created automatically if top is NULL) + * @param top destination object (must NOT be NULL) * @param elt element to append (must NOT be NULL) * @return true if value has been inserted */ @@ -387,8 +434,19 @@ UCL_EXTERN bool ucl_array_prepend (ucl_o ucl_object_t *elt); /** - * Removes an element `elt` from the array `top`. Caller must unref the returned object when it is not - * needed. + * Merge all elements of second array into the first array + * @param top destination array (must be of type UCL_ARRAY) + * @param elt array to copy elements from (must be of type UCL_ARRAY) + * @param copy copy elements instead of referencing them + * @return true if arrays were merged + */ +UCL_EXTERN bool ucl_array_merge (ucl_object_t *top, ucl_object_t *elt, + bool copy); + +/** + * Removes an element `elt` from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @param elt element to remove * @return removed element or NULL if `top` is NULL or not an array @@ -411,35 +469,50 @@ UCL_EXTERN const ucl_object_t* ucl_array UCL_EXTERN const ucl_object_t* ucl_array_tail (const ucl_object_t *top); /** - * Removes the last element from the array `top`. Caller must unref the returned object when it is not - * needed. + * Removes the last element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. * @param top array ucl object * @return removed element or NULL if `top` is NULL or not an array */ UCL_EXTERN ucl_object_t* ucl_array_pop_last (ucl_object_t *top); /** - * Return object identified by an index of the array `top` - * @param obj object to get a key from (must be of type UCL_ARRAY) - * @param index index to return + * Removes the first element from the array `top`, returning the object that was + * removed. This object is not released, caller must unref the returned object + * when it is no longer needed. + * @param top array ucl object + * @return removed element or NULL if `top` is NULL or not an array + */ +UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); + +/** + * Return object identified by index of the array `top` + * @param top object to get a key from (must be of type UCL_ARRAY) + * @param index array index to return * @return object at the specified index or NULL if index is not found */ UCL_EXTERN const ucl_object_t* ucl_array_find_index (const ucl_object_t *top, unsigned int index); /** - * Removes the first element from the array `top`. Caller must unref the returned object when it is not - * needed. - * @param top array ucl object - * @return removed element or NULL if `top` is NULL or not an array + * Replace an element in an array with a different element, returning the object + * that was replaced. This object is not released, caller must unref the + * returned object when it is no longer needed. + * @param top destination object (must be of type UCL_ARRAY) + * @param elt element to append (must NOT be NULL) + * @param index array index in destination to overwrite with elt + * @return object that was replaced or NULL if index is not found */ -UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top); +ucl_object_t * +ucl_array_replace_index (ucl_object_t *top, ucl_object_t *elt, + unsigned int index); /** * Append a element to another element forming an implicit array * @param head head to append (may be NULL) * @param elt new element - * @return true if element has been inserted + * @return the new implicit array */ UCL_EXTERN ucl_object_t * ucl_elt_append (ucl_object_t *head, ucl_object_t *elt); @@ -533,7 +606,7 @@ UCL_EXTERN const char* ucl_object_tolstr * Return object identified by a key in the specified object * @param obj object to get a key from (must be of type UCL_OBJECT) * @param key key to search - * @return object matched the specified key or NULL if key is not found + * @return object matching the specified key or NULL if key was not found *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***