Date: Thu, 16 Jan 2014 15:26:17 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r260758 - in user/ae/inet6: bin/cat bin/pax/tests bin/sh bin/sh/tests bin/test/tests cddl/contrib/opensolaris/cmd/zinject cddl/usr.bin/zinject contrib/atf contrib/atf/atf-c contrib/atf/... Message-ID: <201401161526.s0GFQHmJ057583@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Thu Jan 16 15:26:16 2014 New Revision: 260758 URL: http://svnweb.freebsd.org/changeset/base/260758 Log: Merge from head/. Added: user/ae/inet6/bin/pax/tests/legacy_test.pl - copied unchanged from r260753, head/bin/pax/tests/legacy_test.pl user/ae/inet6/contrib/atf/atf-c++/atf-c++.pc.in - copied unchanged from r260753, head/contrib/atf/atf-c++/atf-c++.pc.in user/ae/inet6/contrib/atf/atf-c/atf-c.pc.in - copied unchanged from r260753, head/contrib/atf/atf-c/atf-c.pc.in user/ae/inet6/contrib/atf/atf-sh/atf-sh.pc.in - copied unchanged from r260753, head/contrib/atf/atf-sh/atf-sh.pc.in user/ae/inet6/lib/atf/common.mk - copied unchanged from r260753, head/lib/atf/common.mk user/ae/inet6/lib/atf/libatf-c++/tests/Makefile.inc - copied unchanged from r260753, head/lib/atf/libatf-c++/tests/Makefile.inc user/ae/inet6/lib/atf/libatf-c++/tests/detail/ - copied from r260753, head/lib/atf/libatf-c++/tests/detail/ user/ae/inet6/lib/atf/libatf-c/tests/Makefile.inc - copied unchanged from r260753, head/lib/atf/libatf-c/tests/Makefile.inc user/ae/inet6/lib/atf/libatf-c/tests/detail/ - copied from r260753, head/lib/atf/libatf-c/tests/detail/ user/ae/inet6/release/doc/en_US.ISO8859-1/share/xml/catalog.xml - copied unchanged from r260753, head/release/doc/en_US.ISO8859-1/share/xml/catalog.xml user/ae/inet6/release/doc/en_US.ISO8859-1/share/xml/release.xsl - copied unchanged from r260753, head/release/doc/en_US.ISO8859-1/share/xml/release.xsl user/ae/inet6/release/doc/share/xml/release.xsl - copied unchanged from r260753, head/release/doc/share/xml/release.xsl user/ae/inet6/share/man/man4/geom_uncompress.4 - copied unchanged from r260753, head/share/man/man4/geom_uncompress.4 user/ae/inet6/sys/arm/at91/at91_gpio.h - copied unchanged from r260753, head/sys/arm/at91/at91_gpio.h user/ae/inet6/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu - copied unchanged from r260753, head/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu user/ae/inet6/sys/modules/iwnfw/iwn105/ - copied from r260753, head/sys/modules/iwnfw/iwn105/ Deleted: user/ae/inet6/bin/pax/tests/legacy_test.sh user/ae/inet6/bin/sh/tests/Kyuafile user/ae/inet6/bin/test/tests/Kyuafile user/ae/inet6/release/doc/de_DE.ISO8859-1/ user/ae/inet6/release/doc/en_US.ISO8859-1/share/xml/catalog user/ae/inet6/release/doc/en_US.ISO8859-1/share/xml/release.dsl user/ae/inet6/release/doc/fr_FR.ISO8859-1/ user/ae/inet6/release/doc/ja_JP.eucJP/ user/ae/inet6/release/doc/ru_RU.KOI8-R/ user/ae/inet6/release/doc/share/xml/catalog user/ae/inet6/release/doc/share/xml/default.dsl user/ae/inet6/release/doc/share/xml/release.dsl user/ae/inet6/release/doc/zh_CN.GB2312/ Modified: user/ae/inet6/bin/cat/cat.c user/ae/inet6/bin/pax/tests/Makefile user/ae/inet6/bin/sh/input.c user/ae/inet6/bin/sh/tests/Makefile user/ae/inet6/bin/sh/trap.c user/ae/inet6/bin/sh/trap.h user/ae/inet6/bin/test/tests/Makefile user/ae/inet6/cddl/contrib/opensolaris/cmd/zinject/zinject.c user/ae/inet6/cddl/usr.bin/zinject/Makefile user/ae/inet6/contrib/atf/FREEBSD-Xlist user/ae/inet6/contrib/atf/atf-c++/detail/test_helpers.cpp user/ae/inet6/contrib/bsnmp/lib/snmpagent.c user/ae/inet6/contrib/gcc/config/arm/freebsd.h user/ae/inet6/contrib/ntp/ntpd/ntp_config.c user/ae/inet6/etc/mtree/BSD.tests.dist user/ae/inet6/gnu/usr.bin/gdb/kgdb/trgt.c user/ae/inet6/lib/atf/Makefile.inc user/ae/inet6/lib/atf/libatf-c++/Makefile user/ae/inet6/lib/atf/libatf-c++/tests/Makefile user/ae/inet6/lib/atf/libatf-c/Makefile user/ae/inet6/lib/atf/libatf-c/tests/Makefile user/ae/inet6/lib/libc/gen/fts.3 user/ae/inet6/lib/libc/gen/fts.c user/ae/inet6/lib/libc/include/port_before.h user/ae/inet6/lib/libc/resolv/res_send.c user/ae/inet6/lib/libc/stdlib/getsubopt.c user/ae/inet6/lib/libc/sys/accept.2 user/ae/inet6/lib/libc/sys/chflags.2 user/ae/inet6/lib/libc/sys/pipe.2 user/ae/inet6/lib/libcxxrt/Version.map user/ae/inet6/lib/libkvm/Makefile user/ae/inet6/lib/libkvm/kvm_ia64.c user/ae/inet6/lib/libmd/sha256.h user/ae/inet6/lib/libmd/sha256c.c user/ae/inet6/release/doc/en_US.ISO8859-1/errata/article.xml user/ae/inet6/release/doc/en_US.ISO8859-1/relnotes/article.xml user/ae/inet6/release/doc/share/mk/doc.relnotes.mk user/ae/inet6/release/doc/share/xml/catalog.xml user/ae/inet6/sbin/kldload/kldload.c user/ae/inet6/sbin/route/keywords user/ae/inet6/sbin/route/route.8 user/ae/inet6/sbin/route/route.c user/ae/inet6/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 user/ae/inet6/share/man/man4/Makefile user/ae/inet6/share/man/man4/kld.4 user/ae/inet6/share/man/man9/Makefile user/ae/inet6/share/man/man9/malloc.9 user/ae/inet6/share/man/man9/mbuf.9 user/ae/inet6/share/man/man9/sglist.9 user/ae/inet6/share/misc/committers-ports.dot user/ae/inet6/share/mk/bsd.test.mk user/ae/inet6/share/mk/tap.test.mk user/ae/inet6/sys/amd64/amd64/identcpu.c user/ae/inet6/sys/amd64/include/vmm.h (contents, props changed) user/ae/inet6/sys/amd64/vmm/amd/amdv.c user/ae/inet6/sys/amd64/vmm/intel/vmcs.c user/ae/inet6/sys/amd64/vmm/intel/vmcs.h user/ae/inet6/sys/amd64/vmm/intel/vmx.c user/ae/inet6/sys/amd64/vmm/intel/vmx.h user/ae/inet6/sys/amd64/vmm/intel/vmx_genassym.c user/ae/inet6/sys/amd64/vmm/intel/vmx_support.S user/ae/inet6/sys/amd64/vmm/io/vioapic.c user/ae/inet6/sys/amd64/vmm/io/vlapic.c user/ae/inet6/sys/amd64/vmm/io/vlapic.h user/ae/inet6/sys/amd64/vmm/vmm.c user/ae/inet6/sys/amd64/vmm/vmm_stat.c user/ae/inet6/sys/amd64/vmm/vmm_stat.h user/ae/inet6/sys/arm/at91/at91rm9200.c user/ae/inet6/sys/arm/at91/at91sam9260.c user/ae/inet6/sys/arm/at91/at91sam9g20.c user/ae/inet6/sys/arm/at91/at91sam9g45.c user/ae/inet6/sys/arm/at91/at91sam9x5.c user/ae/inet6/sys/arm/at91/at91var.h user/ae/inet6/sys/arm/freescale/imx/imx51_ipuv3_fbd.c user/ae/inet6/sys/cam/cam_periph.c user/ae/inet6/sys/cam/cam_periph.h user/ae/inet6/sys/cam/cam_xpt.c user/ae/inet6/sys/cam/scsi/scsi_xpt.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c user/ae/inet6/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/ae/inet6/sys/contrib/ipfilter/netinet/ip_compat.h user/ae/inet6/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) user/ae/inet6/sys/dev/altera/atse/if_atse.c user/ae/inet6/sys/dev/bxe/bxe.c user/ae/inet6/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c user/ae/inet6/sys/dev/mfi/mfi_cam.c user/ae/inet6/sys/dev/netmap/netmap.c user/ae/inet6/sys/dev/netmap/netmap_generic.c user/ae/inet6/sys/dev/netmap/netmap_mem2.c user/ae/inet6/sys/dev/netmap/netmap_vale.c user/ae/inet6/sys/dev/qlxge/qls_os.c user/ae/inet6/sys/dev/usb/controller/ehci.c user/ae/inet6/sys/dev/usb/controller/uhci.c user/ae/inet6/sys/dev/usb/controller/xhci.c user/ae/inet6/sys/dev/usb/input/ukbd.c user/ae/inet6/sys/dev/usb/net/uhso.c user/ae/inet6/sys/dev/usb/serial/u3g.c user/ae/inet6/sys/dev/usb/serial/umcs.c user/ae/inet6/sys/dev/usb/usb_device.c user/ae/inet6/sys/dev/usb/usb_device.h user/ae/inet6/sys/dev/usb/usb_hub.c user/ae/inet6/sys/dev/usb/usb_hub.h user/ae/inet6/sys/dev/usb/usb_request.c user/ae/inet6/sys/dev/usb/usb_transfer.c user/ae/inet6/sys/dev/usb/wlan/if_rsu.c user/ae/inet6/sys/dev/usb/wlan/if_run.c user/ae/inet6/sys/dev/virtio/block/virtio_blk.c user/ae/inet6/sys/dev/virtio/scsi/virtio_scsi.c user/ae/inet6/sys/dev/vt/hw/xboxfb/xboxfb.c user/ae/inet6/sys/fs/ext2fs/ext2_inode_cnv.c user/ae/inet6/sys/fs/nfs/nfs_var.h user/ae/inet6/sys/fs/nfsserver/nfs_nfsdcache.c user/ae/inet6/sys/fs/nfsserver/nfs_nfsdkrpc.c user/ae/inet6/sys/geom/uncompress/g_uncompress.c user/ae/inet6/sys/i386/i386/identcpu.c user/ae/inet6/sys/ia64/ia64/exception.S user/ae/inet6/sys/kern/subr_sglist.c user/ae/inet6/sys/kern/uipc_mbuf.c user/ae/inet6/sys/kern/uipc_socket.c user/ae/inet6/sys/modules/geom/Makefile user/ae/inet6/sys/modules/geom/geom_uncompress/Makefile user/ae/inet6/sys/modules/iwnfw/Makefile user/ae/inet6/sys/modules/sound/driver/ai2s/Makefile user/ae/inet6/sys/net/netmap_user.h user/ae/inet6/sys/net80211/ieee80211_mesh.c user/ae/inet6/sys/netinet/in.c user/ae/inet6/sys/netinet/ip_output.c user/ae/inet6/sys/powerpc/include/atomic.h user/ae/inet6/sys/powerpc/powermac/macgpio.c user/ae/inet6/sys/powerpc/powermac/macgpiovar.h user/ae/inet6/sys/sys/mbuf.h user/ae/inet6/sys/sys/sglist.h user/ae/inet6/sys/vm/vm_pageout.c user/ae/inet6/tools/build/mk/OptionalObsoleteFiles.inc user/ae/inet6/tools/tools/netmap/Makefile user/ae/inet6/tools/tools/netmap/bridge.c user/ae/inet6/tools/tools/netmap/nm_util.c user/ae/inet6/tools/tools/netmap/nm_util.h user/ae/inet6/tools/tools/netmap/pcap.c user/ae/inet6/tools/tools/netmap/pkt-gen.c user/ae/inet6/tools/tools/netmap/vale-ctl.c user/ae/inet6/tools/tools/usbtest/usb_msc_test.c user/ae/inet6/tools/tools/usbtest/usb_msc_test.h user/ae/inet6/usr.bin/atf/atf-sh/Makefile user/ae/inet6/usr.bin/atf/atf-sh/tests/Makefile user/ae/inet6/usr.bin/elfdump/elfdump.c user/ae/inet6/usr.bin/find/function.c user/ae/inet6/usr.bin/netstat/main.c user/ae/inet6/usr.bin/netstat/netstat.1 user/ae/inet6/usr.sbin/bhyvectl/bhyvectl.c Directory Properties: user/ae/inet6/ (props changed) user/ae/inet6/cddl/ (props changed) user/ae/inet6/cddl/contrib/opensolaris/ (props changed) user/ae/inet6/contrib/atf/ (props changed) user/ae/inet6/contrib/gcc/ (props changed) user/ae/inet6/contrib/ntp/ (props changed) user/ae/inet6/etc/ (props changed) user/ae/inet6/gnu/usr.bin/gdb/ (props changed) user/ae/inet6/lib/libc/ (props changed) user/ae/inet6/sbin/ (props changed) user/ae/inet6/share/man/man4/ (props changed) user/ae/inet6/sys/ (props changed) user/ae/inet6/sys/amd64/vmm/ (props changed) user/ae/inet6/sys/cddl/contrib/opensolaris/ (props changed) user/ae/inet6/sys/contrib/ipfilter/ (props changed) user/ae/inet6/sys/dev/hyperv/ (props changed) user/ae/inet6/usr.sbin/bhyvectl/ (props changed) Modified: user/ae/inet6/bin/cat/cat.c ============================================================================== --- user/ae/inet6/bin/cat/cat.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/bin/cat/cat.c Thu Jan 16 15:26:16 2014 (r260758) @@ -316,6 +316,7 @@ udom_open(const char *path, int flags) sou.sun_family = AF_UNIX; if ((len = strlcpy(sou.sun_path, path, sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { + close(fd); errno = ENAMETOOLONG; return (-1); } Modified: user/ae/inet6/bin/pax/tests/Makefile ============================================================================== --- user/ae/inet6/bin/pax/tests/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/bin/pax/tests/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -4,6 +4,6 @@ TESTSDIR= ${TESTSBASE}/bin/pax -TAP_TESTS_SH= legacy_test +TAP_TESTS_PERL= legacy_test .include <tap.test.mk> Copied: user/ae/inet6/bin/pax/tests/legacy_test.pl (from r260753, head/bin/pax/tests/legacy_test.pl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/inet6/bin/pax/tests/legacy_test.pl Thu Jan 16 15:26:16 2014 (r260758, copy of r260753, head/bin/pax/tests/legacy_test.pl) @@ -0,0 +1,89 @@ +# $FreeBSD$ + +use strict; +use warnings; + +use Test::More tests => 6; +use File::Path qw(rmtree mkpath); +use Cwd; + +my $n = 0; +sub create_file { + my $fn = shift; + + $n++; + (my $dir = $fn) =~ s,/[^/]+$,,; + mkpath $dir; + open my $fd, ">", $fn or die "$fn: $!"; + print $fd "file $n\n"; +} + + +ustar_pathnames: { SKIP: { + # Prove that pax breaks up ustar pathnames properly + + my $top = getcwd . "/ustar-pathnames-1"; + skip "Current path is too long", 6 if length $top > 92; + rmtree $top; + my $subdir = "x" . "x" x (92 - length $top); + my $work94 = "$top/$subdir"; + mkpath $work94; # $work is 94 characters long + + my $x49 = "x" x 49; + my $x50 = "x" x 50; + my $x60 = "x" x 60; + my $x95 = "x" x 95; + + my @paths = ( + "$work94/x099", # 99 chars + "$work94/xx100", # 100 chars + "$work94/xxx101", # 101 chars + "$work94/$x49/${x50}x199", # 199 chars + "$work94/$x49/${x50}xx200", # 200 chars + "$work94/$x49/${x50}xxx201", # 201 chars + "$work94/$x60/${x95}254", # 254 chars + "$work94/$x60/${x95}x255", # 255 chars + ); + + my @l = map { length } @paths; + + my $n = 0; + create_file $_ for @paths; + system "pax -wf ustar.ok $work94"; + ok($? == 0, "Wrote 'ustar.ok' containing files with lengths @l"); + + (my $orig = $top) =~ s,1$,2,; + rmtree $orig; + rename $top, $orig; + + system "pax -rf ustar.ok"; + ok($? == 0, "Restored 'ustar.ok' containing files with lengths @l"); + + system "diff -ru $orig $top"; + ok($? == 0, "Restored files are identical"); + + rmtree $top; + rename $orig, $top; + + # 256 chars (with components < 100 chars) should not work + push @paths, "$work94/x$x60/${x95}x256"; # 256 chars + push @l, length $paths[-1]; + create_file $paths[-1]; + system "pax -wf ustar.fail1 $work94"; + ok($?, "Failed to write 'ustar.fail1' containing files with lengths @l"); + + # Components with 100 chars shouldn't work + unlink $paths[-1]; + $paths[-1] = "$work94/${x95}xc100"; # 100 char filename + $l[-1] = length $paths[-1]; + create_file $paths[-1]; + system "pax -wf ustar.fail2 $work94"; + ok($?, "Failed to write 'ustar.fail2' with a 100 char filename"); + + unlink $paths[-1]; + $paths[-1] = "$work94/${x95}xc100/x"; # 100 char component + $l[-1] = length $paths[-1]; + create_file $paths[-1]; + system "pax -wf ustar.fail3 $work94"; + ok($?, "Failed to write 'ustar.fail3' with a 100 char component"); +}} Modified: user/ae/inet6/bin/sh/input.c ============================================================================== --- user/ae/inet6/bin/sh/input.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/bin/sh/input.c Thu Jan 16 15:26:16 2014 (r260758) @@ -162,20 +162,16 @@ preadfd(void) int nr; parsenextc = parsefile->buf; -#ifndef NO_HISTORY - if (el != NULL && gotwinch) { - gotwinch = 0; - el_resize(el); - } -#endif retry: #ifndef NO_HISTORY if (parsefile->fd == 0 && el) { static const char *rl_cp; static int el_len; - if (rl_cp == NULL) + if (rl_cp == NULL) { + el_resize(el); rl_cp = el_gets(el, &el_len); + } if (rl_cp == NULL) nr = el_len == 0 ? 0 : -1; else { Modified: user/ae/inet6/bin/sh/tests/Makefile ============================================================================== --- user/ae/inet6/bin/sh/tests/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/bin/sh/tests/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -3,10 +3,15 @@ .include <bsd.own.mk> TESTSDIR= ${TESTSBASE}/bin/sh -KYUAFILE= yes TAP_TESTS_SH= legacy_test TAP_TESTS_SH_SED_legacy_test= -e 's,__SH__,/bin/sh,g' +# Some tests in here are silently not run when the tests are executed as +# root. Explicitly tell Kyua to drop privileges. +# +# TODO(jmmv): Kyua needs to do this by default, not only when explicitly +# requested. See https://code.google.com/p/kyua/issues/detail?id=6 +TEST_METADATA.legacy_test+= required_user="unprivileged" SUBDIR+= builtins errors execution expansion parameters parser set-e Modified: user/ae/inet6/bin/sh/trap.c ============================================================================== --- user/ae/inet6/bin/sh/trap.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/bin/sh/trap.c Thu Jan 16 15:26:16 2014 (r260758) @@ -80,7 +80,6 @@ static char *volatile trap[NSIG]; /* tra static volatile sig_atomic_t gotsig[NSIG]; /* indicates specified signal received */ static int ignore_sigchld; /* Used while handling SIGCHLD traps. */ -volatile sig_atomic_t gotwinch; static int last_trapsig; static int exiting; /* exitshell() has been called */ @@ -293,12 +292,6 @@ setsignal(int signo) action = S_IGN; break; #endif -#ifndef NO_HISTORY - case SIGWINCH: - if (rootshell && iflag) - action = S_CATCH; - break; -#endif } } @@ -400,11 +393,6 @@ onsig(int signo) gotsig[signo] = 1; pendingsig = signo; } - -#ifndef NO_HISTORY - if (signo == SIGWINCH) - gotwinch = 1; -#endif } @@ -490,9 +478,6 @@ setinteractive(int on) setsignal(SIGINT); setsignal(SIGQUIT); setsignal(SIGTERM); -#ifndef NO_HISTORY - setsignal(SIGWINCH); -#endif is_interactive = on; } Modified: user/ae/inet6/bin/sh/trap.h ============================================================================== --- user/ae/inet6/bin/sh/trap.h Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/bin/sh/trap.h Thu Jan 16 15:26:16 2014 (r260758) @@ -36,7 +36,6 @@ extern volatile sig_atomic_t pendingsig; extern volatile sig_atomic_t pendingsig_waitcmd; extern int in_dotrap; -extern volatile sig_atomic_t gotwinch; void clear_traps(void); int have_traps(void); Modified: user/ae/inet6/bin/test/tests/Makefile ============================================================================== --- user/ae/inet6/bin/test/tests/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/bin/test/tests/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -3,8 +3,13 @@ .include <bsd.own.mk> TESTSDIR= ${TESTSBASE}/bin/test -KYUAFILE= yes TAP_TESTS_SH= legacy_test +# Some tests in here are silently not run when the tests are executed as +# root. Explicitly tell Kyua to drop privileges. +# +# TODO(jmmv): Kyua needs to do this by default, not only when explicitly +# requested. See https://code.google.com/p/kyua/issues/detail?id=6 +TEST_METADATA.legacy_test+= required_user="unprivileged" .include <tap.test.mk> Modified: user/ae/inet6/cddl/contrib/opensolaris/cmd/zinject/zinject.c ============================================================================== --- user/ae/inet6/cddl/contrib/opensolaris/cmd/zinject/zinject.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/cddl/contrib/opensolaris/cmd/zinject/zinject.c Thu Jan 16 15:26:16 2014 (r260758) @@ -148,6 +148,7 @@ #include <sys/mount.h> #include <libzfs.h> +#include <libzfs_compat.h> #undef verify /* both libzfs.h and zfs_context.h want to define this */ Modified: user/ae/inet6/cddl/usr.bin/zinject/Makefile ============================================================================== --- user/ae/inet6/cddl/usr.bin/zinject/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/cddl/usr.bin/zinject/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -16,6 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem Modified: user/ae/inet6/contrib/atf/FREEBSD-Xlist ============================================================================== --- user/ae/inet6/contrib/atf/FREEBSD-Xlist Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/contrib/atf/FREEBSD-Xlist Thu Jan 16 15:26:16 2014 (r260758) @@ -8,7 +8,6 @@ Makefile* aclocal.m4 admin/ atf-*/atf-*.m4 -atf-*/atf-*.pc.in atf-config/ atf-report/ atf-run/ Copied: user/ae/inet6/contrib/atf/atf-c++/atf-c++.pc.in (from r260753, head/contrib/atf/atf-c++/atf-c++.pc.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/inet6/contrib/atf/atf-c++/atf-c++.pc.in Thu Jan 16 15:26:16 2014 (r260758, copy of r260753, head/contrib/atf/atf-c++/atf-c++.pc.in) @@ -0,0 +1,11 @@ +# ATF pkg-config file + +cxx=__CXX__ +includedir=__INCLUDEDIR__ +libdir=__LIBDIR__ + +Name: atf-c++ +Description: Automated Testing Framework (C++ binding) +Version: __ATF_VERSION__ +Cflags: -I${includedir} +Libs: -L${libdir} -latf-c++ -latf-c Modified: user/ae/inet6/contrib/atf/atf-c++/detail/test_helpers.cpp ============================================================================== --- user/ae/inet6/contrib/atf/atf-c++/detail/test_helpers.cpp Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/contrib/atf/atf-c++/detail/test_helpers.cpp Thu Jan 16 15:26:16 2014 (r260758) @@ -40,6 +40,18 @@ #include "process.hpp" #include "test_helpers.hpp" +// Path to the directory containing the libatf-c tests, used to locate the +// process_helpers program. If NULL (the default), the code will use a +// relative path. Otherwise, the provided path will be used; this is so +// that we can locate the helpers binary if the installation uses a +// different layout than the one we provide (as is the case in FreeBSD). +#if defined(ATF_C_TESTS_BASE) +static const char* atf_c_tests_base = ATF_C_TESTS_BASE; +#else +static const char* atf_c_tests_base = NULL; +#endif +#undef ATF_C_TESTS_BASE + void build_check_cxx_o_aux(const atf::fs::path& sfile, const char* failmsg, const bool expect_pass) @@ -80,12 +92,17 @@ header_check(const char *hdrname) atf::fs::path get_process_helpers_path(const atf::tests::tc& tc, bool is_detail) { - if (is_detail) - return atf::fs::path(tc.get_config_var("srcdir")) / - ".." / ".." / "atf-c" / "detail" / "process_helpers"; - else - return atf::fs::path(tc.get_config_var("srcdir")) / - ".." / "atf-c" / "detail" / "process_helpers"; + const char* helper = "detail/process_helpers"; + if (atf_c_tests_base == NULL) { + if (is_detail) + return atf::fs::path(tc.get_config_var("srcdir")) / + ".." / ".." / "atf-c" / helper; + else + return atf::fs::path(tc.get_config_var("srcdir")) / + ".." / "atf-c" / helper; + } else { + return atf::fs::path(atf_c_tests_base) / helper; + } } void Copied: user/ae/inet6/contrib/atf/atf-c/atf-c.pc.in (from r260753, head/contrib/atf/atf-c/atf-c.pc.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/inet6/contrib/atf/atf-c/atf-c.pc.in Thu Jan 16 15:26:16 2014 (r260758, copy of r260753, head/contrib/atf/atf-c/atf-c.pc.in) @@ -0,0 +1,11 @@ +# ATF pkg-config file + +cc=__CC__ +includedir=__INCLUDEDIR__ +libdir=__LIBDIR__ + +Name: atf-c +Description: Automated Testing Framework (C binding) +Version: __ATF_VERSION__ +Cflags: -I${includedir} +Libs: -L${libdir} -latf-c Copied: user/ae/inet6/contrib/atf/atf-sh/atf-sh.pc.in (from r260753, head/contrib/atf/atf-sh/atf-sh.pc.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/inet6/contrib/atf/atf-sh/atf-sh.pc.in Thu Jan 16 15:26:16 2014 (r260758, copy of r260753, head/contrib/atf/atf-sh/atf-sh.pc.in) @@ -0,0 +1,8 @@ +# ATF pkg-config file + +exec_prefix=__EXEC_PREFIX__ +interpreter=${exec_prefix}/bin/atf-sh + +Name: atf-sh +Description: Automated Testing Framework (POSIX shell binding) +Version: __ATF_VERSION__ Modified: user/ae/inet6/contrib/bsnmp/lib/snmpagent.c ============================================================================== --- user/ae/inet6/contrib/bsnmp/lib/snmpagent.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/contrib/bsnmp/lib/snmpagent.c Thu Jan 16 15:26:16 2014 (r260758) @@ -510,6 +510,11 @@ snmp_getbulk(struct snmp_pdu *pdu, struc for (cnt = 0; cnt < pdu->error_index; cnt++) { eomib = 1; for (i = non_rep; i < pdu->nbindings; i++) { + + if (resp->nbindings == SNMP_MAX_BINDINGS) + /* PDU is full */ + goto done; + if (cnt == 0) result = do_getnext(&context, &pdu->bindings[i], &resp->bindings[resp->nbindings], pdu); Modified: user/ae/inet6/contrib/gcc/config/arm/freebsd.h ============================================================================== --- user/ae/inet6/contrib/gcc/config/arm/freebsd.h Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/contrib/gcc/config/arm/freebsd.h Thu Jan 16 15:26:16 2014 (r260758) @@ -72,6 +72,9 @@ #undef TARGET_DEFAULT_FLOAT_ABI #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT +#undef TARGET_DEFAULT +#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT) + #undef ARM_DEFAULT_ABI #define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX Modified: user/ae/inet6/contrib/ntp/ntpd/ntp_config.c ============================================================================== --- user/ae/inet6/contrib/ntp/ntpd/ntp_config.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/contrib/ntp/ntpd/ntp_config.c Thu Jan 16 15:26:16 2014 (r260758) @@ -597,6 +597,8 @@ getconfig( #endif /* not SYS_WINNT */ } + proto_config(PROTO_MONITOR, 0, 0., NULL); + for (;;) { if (tok == CONFIG_END) break; Modified: user/ae/inet6/etc/mtree/BSD.tests.dist ============================================================================== --- user/ae/inet6/etc/mtree/BSD.tests.dist Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/etc/mtree/BSD.tests.dist Thu Jan 16 15:26:16 2014 (r260758) @@ -49,8 +49,12 @@ lib atf libatf-c + detail + .. .. libatf-c++ + detail + .. .. test-programs .. Modified: user/ae/inet6/gnu/usr.bin/gdb/kgdb/trgt.c ============================================================================== --- user/ae/inet6/gnu/usr.bin/gdb/kgdb/trgt.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/gnu/usr.bin/gdb/kgdb/trgt.c Thu Jan 16 15:26:16 2014 (r260758) @@ -53,6 +53,18 @@ __FBSDID("$FreeBSD$"); #include "kgdb.h" +#ifdef CROSS_DEBUGGER +/* + * We suppress the call to add_target() of core_ops in corelow.c because if + * there are multiple core_stratum targets, the find_core_target() function + * won't know which one to return and returns none. We need it to return + * our target. We only have to do that when we're building a cross-debugger + * because fbsd-threads.c is part of a native debugger and it too defines + * coreops_suppress_target with 1 as the initializer. + */ +int coreops_suppress_target = 1; +#endif + static CORE_ADDR stoppcbs; static void kgdb_core_cleanup(void *); Modified: user/ae/inet6/lib/atf/Makefile.inc ============================================================================== --- user/ae/inet6/lib/atf/Makefile.inc Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/atf/Makefile.inc Thu Jan 16 15:26:16 2014 (r260758) @@ -38,6 +38,7 @@ CFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFL CFLAGS+= -DATF_BUILD_CXX='"${CXX}"' CFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' CFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"' +CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"' CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -DATF_LIBDIR='"${LIBDIR}"' CFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' Copied: user/ae/inet6/lib/atf/common.mk (from r260753, head/lib/atf/common.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/inet6/lib/atf/common.mk Thu Jan 16 15:26:16 2014 (r260758, copy of r260753, head/lib/atf/common.mk) @@ -0,0 +1,19 @@ +# $FreeBSD$ +# +# Common Makefile code for all components of ATF. +# + +.if !defined(ATF) +.error "ATF must be defined and point to the contrib/atf directory" +.endif + +# Depend on the atf-version target to generate a file that contains the +# version number of the currently imported ATF release and that only +# changes on new imports. +atf-version: atf-version-real + @cmp -s atf-version atf-version-real \ + || cp atf-version-real atf-version +atf-version-real: .PHONY + @grep 'define VERSION' ${ATF}/bconfig.h \ + | cut -d '"' -f 2 >atf-version-real +CLEANFILES+= atf-version atf-version-real Modified: user/ae/inet6/lib/atf/libatf-c++/Makefile ============================================================================== --- user/ae/inet6/lib/atf/libatf-c++/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/atf/libatf-c++/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -76,8 +76,21 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR} MAN= atf-c++-api.3 +all: atf-c++.pc +atf-c++.pc: atf-c++.pc.in atf-version + sed -e 's,__CXX__,${CXX},g' \ + -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \ + -e 's,__LIBDIR__,${LIBDIR},g' \ + -e "s,__ATF_VERSION__,$$(cat atf-version),g" \ + <${ATF}/atf-c++/atf-c++.pc.in >atf-c++.pc + +beforeinstall: + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + atf-c++.pc ${DESTDIR}${LIBDATADIR}/pkgconfig + .if ${MK_TESTS} != "no" SUBDIR= tests .endif +.include "../common.mk" .include <bsd.lib.mk> Modified: user/ae/inet6/lib/atf/libatf-c++/tests/Makefile ============================================================================== --- user/ae/inet6/lib/atf/libatf-c++/tests/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/atf/libatf-c++/tests/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -3,6 +3,7 @@ .include <bsd.init.mk> TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++ +TESTS_SUBDIRS= detail ATF= ${.CURDIR:H:H:H:H}/contrib/atf .PATH: ${ATF}/atf-c++ @@ -14,7 +15,6 @@ FILESDIR= ${TESTSDIR} FILES= macros_hpp_test.cpp FILES+= unused_test.cpp -# Tests in atf-c++. .for _T in atf_c++_test \ build_test \ check_test \ @@ -28,20 +28,4 @@ SRCS.${_T}= ${_T}.cpp test_helpers.cpp ATF_TESTS_SH= pkg_config_test -# Tests in atf-c++/detail. - -.for _T in application_test \ - env_test \ - exceptions_test \ - expand_test \ - fs_test \ - parser_test \ - process_test \ - sanity_test \ - text_test \ - ui_test -ATF_TESTS_CXX+= ${_T} -SRCS.${_T}= ${_T}.cpp test_helpers.cpp -.endfor - .include <atf.test.mk> Copied: user/ae/inet6/lib/atf/libatf-c++/tests/Makefile.inc (from r260753, head/lib/atf/libatf-c++/tests/Makefile.inc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/inet6/lib/atf/libatf-c++/tests/Makefile.inc Thu Jan 16 15:26:16 2014 (r260758, copy of r260753, head/lib/atf/libatf-c++/tests/Makefile.inc) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Modified: user/ae/inet6/lib/atf/libatf-c/Makefile ============================================================================== --- user/ae/inet6/lib/atf/libatf-c/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/atf/libatf-c/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -74,8 +74,21 @@ INCSDIR_atf-c.h= ${INCLUDEDIR} MAN= atf-c-api.3 +all: atf-c.pc +atf-c.pc: atf-c.pc.in atf-version + sed -e 's,__CC__,${CC},g' \ + -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \ + -e 's,__LIBDIR__,${LIBDIR},g' \ + -e "s,__ATF_VERSION__,$$(cat atf-version),g" \ + <${ATF}/atf-c/atf-c.pc.in >atf-c.pc + +beforeinstall: + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + atf-c.pc ${DESTDIR}${LIBDATADIR}/pkgconfig + .if ${MK_TESTS} != "no" SUBDIR= tests .endif +.include "../common.mk" .include <bsd.lib.mk> Modified: user/ae/inet6/lib/atf/libatf-c/tests/Makefile ============================================================================== --- user/ae/inet6/lib/atf/libatf-c/tests/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/atf/libatf-c/tests/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -3,6 +3,7 @@ .include <bsd.init.mk> TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c +TESTS_SUBDIRS= detail ATF= ${.CURDIR:H:H:H:H}/contrib/atf .PATH: ${ATF}/atf-c @@ -19,8 +20,6 @@ FILESDIR= ${TESTSDIR} FILES= macros_h_test.c FILES+= unused_test.c -# Tests in atf-c. - .for _T in atf_c_test \ build_test \ check_test \ @@ -36,24 +35,4 @@ SRCS.${_T}= ${_T}.c test_helpers.c ATF_TESTS_SH= pkg_config_test -# Tests in atf-c/detail. - -.for _T in dynstr_test \ - env_test \ - fs_test \ - list_test \ - map_test \ - process_test \ - sanity_test \ - text_test \ - user_test -ATF_TESTS_C+= ${_T} -SRCS.${_T}= ${_T}.c test_helpers.c -.endfor - -PROGS+= process_helpers -SRCS.process_helpers= process_helpers.c -MAN.process_helpers= # defined -BINDIR.process_helpers= ${TESTSDIR} - .include <atf.test.mk> Copied: user/ae/inet6/lib/atf/libatf-c/tests/Makefile.inc (from r260753, head/lib/atf/libatf-c/tests/Makefile.inc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ae/inet6/lib/atf/libatf-c/tests/Makefile.inc Thu Jan 16 15:26:16 2014 (r260758, copy of r260753, head/lib/atf/libatf-c/tests/Makefile.inc) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Modified: user/ae/inet6/lib/libc/gen/fts.3 ============================================================================== --- user/ae/inet6/lib/libc/gen/fts.3 Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/gen/fts.3 Thu Jan 16 15:26:16 2014 (r260758) @@ -28,7 +28,7 @@ .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 .\" $FreeBSD$ .\" -.Dd May 21, 2013 +.Dd January 12, 2014 .Dt FTS 3 .Os .Sh NAME @@ -304,7 +304,6 @@ file is a member. A parent structure for the initial entry point is provided as well, however, only the .Fa fts_level , -.Fa fts_bignum , .Fa fts_number and .Fa fts_pointer @@ -366,13 +365,6 @@ The .Fa fts_name field is always .Dv NUL Ns -terminated . -.Pp -Note that the use of -.Fa fts_bignum -is mutually exclusive with the use of -.Fa fts_number -or -.Fa fts_pointer . .Sh FTS_OPEN The .Fn fts_open Modified: user/ae/inet6/lib/libc/gen/fts.c ============================================================================== --- user/ae/inet6/lib/libc/gen/fts.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/gen/fts.c Thu Jan 16 15:26:16 2014 (r260758) @@ -62,7 +62,7 @@ static size_t fts_maxarglen(char * cons static void fts_padjust(FTS *, FTSENT *); static int fts_palloc(FTS *, size_t); static FTSENT *fts_sort(FTS *, FTSENT *, size_t); -static int fts_stat(FTS *, FTSENT *, int); +static int fts_stat(FTS *, FTSENT *, int, int); static int fts_safe_changedir(FTS *, FTSENT *, int, char *); static int fts_ufslinks(FTS *, const FTSENT *); @@ -171,7 +171,7 @@ fts_open(argv, options, compar) p->fts_level = FTS_ROOTLEVEL; p->fts_parent = parent; p->fts_accpath = p->fts_name; - p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW)); + p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW), -1); /* Command-line "." and ".." are real directories. */ if (p->fts_info == FTS_DOT) @@ -326,7 +326,7 @@ fts_read(FTS *sp) /* Any type of file may be re-visited; re-stat and re-turn. */ if (instr == FTS_AGAIN) { - p->fts_info = fts_stat(sp, p, 0); + p->fts_info = fts_stat(sp, p, 0, -1); return (p); } @@ -338,7 +338,7 @@ fts_read(FTS *sp) */ if (instr == FTS_FOLLOW && (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) { - p->fts_info = fts_stat(sp, p, 1); + p->fts_info = fts_stat(sp, p, 1, -1); if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { if ((p->fts_symfd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0) { @@ -429,7 +429,7 @@ next: tmp = p; if (p->fts_instr == FTS_SKIP) goto next; if (p->fts_instr == FTS_FOLLOW) { - p->fts_info = fts_stat(sp, p, 1); + p->fts_info = fts_stat(sp, p, 1, -1); if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { if ((p->fts_symfd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0) { @@ -800,10 +800,11 @@ mem1: saved_errno = errno; if (ISSET(FTS_NOCHDIR)) { p->fts_accpath = p->fts_path; memmove(cp, p->fts_name, p->fts_namelen + 1); - } else + p->fts_info = fts_stat(sp, p, 0, _dirfd(dirp)); + } else { p->fts_accpath = p->fts_name; - /* Stat it. */ - p->fts_info = fts_stat(sp, p, 0); + p->fts_info = fts_stat(sp, p, 0, -1); + } /* Decrement link count if applicable. */ if (nlinks > 0 && (p->fts_info == FTS_D || @@ -868,13 +869,19 @@ mem1: saved_errno = errno; } static int -fts_stat(FTS *sp, FTSENT *p, int follow) +fts_stat(FTS *sp, FTSENT *p, int follow, int dfd) { FTSENT *t; dev_t dev; ino_t ino; struct stat *sbp, sb; int saved_errno; + const char *path; + + if (dfd == -1) + path = p->fts_accpath, dfd = AT_FDCWD; + else + path = p->fts_name; /* If user needs stat info, stat buffer already allocated. */ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp; @@ -896,16 +903,16 @@ fts_stat(FTS *sp, FTSENT *p, int follow) * fail, set the errno from the stat call. */ if (ISSET(FTS_LOGICAL) || follow) { - if (stat(p->fts_accpath, sbp)) { + if (fstatat(dfd, path, sbp, 0)) { saved_errno = errno; - if (!lstat(p->fts_accpath, sbp)) { + if (!fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) { errno = 0; return (FTS_SLNONE); } p->fts_errno = saved_errno; goto err; } - } else if (lstat(p->fts_accpath, sbp)) { + } else if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) { p->fts_errno = errno; err: memset(sbp, 0, sizeof(struct stat)); return (FTS_NS); Modified: user/ae/inet6/lib/libc/include/port_before.h ============================================================================== --- user/ae/inet6/lib/libc/include/port_before.h Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/include/port_before.h Thu Jan 16 15:26:16 2014 (r260758) @@ -5,7 +5,7 @@ #define _LIBC 1 #define DO_PTHREADS 1 -#define USE_KQUEUE 1 +#define USE_POLL 1 #define ISC_SOCKLEN_T socklen_t #define ISC_FORMAT_PRINTF(fmt, args) \ Modified: user/ae/inet6/lib/libc/resolv/res_send.c ============================================================================== --- user/ae/inet6/lib/libc/resolv/res_send.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/resolv/res_send.c Thu Jan 16 15:26:16 2014 (r260758) @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); */ #include "port_before.h" -#ifndef USE_KQUEUE +#if !defined(USE_KQUEUE) && !defined(USE_POLL) #include "fd_setsize.h" #endif @@ -963,7 +963,7 @@ send_dg(res_state statp, timeout.tv_nsec/1000000; pollfd.fd = s; pollfd.events = POLLRDNORM; - n = poll(&pollfd, 1, polltimeout); + n = _poll(&pollfd, 1, polltimeout); #endif /* USE_POLL */ if (n == 0) { Modified: user/ae/inet6/lib/libc/stdlib/getsubopt.c ============================================================================== --- user/ae/inet6/lib/libc/stdlib/getsubopt.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/stdlib/getsubopt.c Thu Jan 16 15:26:16 2014 (r260758) @@ -45,9 +45,7 @@ __FBSDID("$FreeBSD$"); char *suboptarg; int -getsubopt(optionp, tokens, valuep) - char **optionp, **valuep; - char * const *tokens; +getsubopt(char **optionp, char * const *tokens, char **valuep) { int cnt; char *p; Modified: user/ae/inet6/lib/libc/sys/accept.2 ============================================================================== --- user/ae/inet6/lib/libc/sys/accept.2 Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/sys/accept.2 Thu Jan 16 15:26:16 2014 (r260758) @@ -32,7 +32,8 @@ .Dt ACCEPT 2 .Os .Sh NAME -.Nm accept +.Nm accept , +.Nm accept4 .Nd accept a connection on a socket .Sh LIBRARY .Lb libc Modified: user/ae/inet6/lib/libc/sys/chflags.2 ============================================================================== --- user/ae/inet6/lib/libc/sys/chflags.2 Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/sys/chflags.2 Thu Jan 16 15:26:16 2014 (r260758) @@ -34,7 +34,8 @@ .Sh NAME .Nm chflags , .Nm lchflags , -.Nm fchflags +.Nm fchflags , +.Nm chflagsat .Nd set file flags .Sh LIBRARY .Lb libc Modified: user/ae/inet6/lib/libc/sys/pipe.2 ============================================================================== --- user/ae/inet6/lib/libc/sys/pipe.2 Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libc/sys/pipe.2 Thu Jan 16 15:26:16 2014 (r260758) @@ -32,7 +32,8 @@ .Dt PIPE 2 .Os .Sh NAME -.Nm pipe +.Nm pipe , +.Nm pipe2 .Nd create descriptor pair for interprocess communication .Sh LIBRARY .Lb libc Modified: user/ae/inet6/lib/libcxxrt/Version.map ============================================================================== --- user/ae/inet6/lib/libcxxrt/Version.map Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libcxxrt/Version.map Thu Jan 16 15:26:16 2014 (r260758) @@ -111,6 +111,19 @@ CXXABI_1.3 { "typeinfo for void"; "typeinfo for wchar_t const*"; "typeinfo for wchar_t"; + # C++11 typeinfo not understood by our linker + # std::nullptr_t + _ZTIDn;_ZTIPDn;_ZTIPKDn; + # char16_t + _ZTIDi;_ZTIPDi;_ZTIPKDi; + # char32_t + _ZTIDs;_ZTIPDs;_ZTIPKDs; + # IEEE 754r decimal floating point + _ZTIDd;_ZTIPDd;_ZTIPKDd; + _ZTIDe;_ZTIPDe;_ZTIPKDe; + _ZTIDf;_ZTIPDf;_ZTIPKDf; + # IEEE 754r half-precision floating point + _ZTIDh;_ZTIPDh;_ZTIPKDh; "typeinfo for bool*"; "typeinfo for wchar_t*"; @@ -195,6 +208,19 @@ CXXABI_1.3 { "typeinfo name for void*"; "typeinfo name for unsigned int*"; "typeinfo name for float*"; + # C++11 typeinfo not understood by our linker + # std::nullptr_t + _ZTSDn;_ZTIPDn;_ZTIPKDn; + # char16_t + _ZTSDi;_ZTIPDi;_ZTIPKDi; + # char32_t + _ZTSDs;_ZTIPDs;_ZTIPKDs; + # IEEE 754r decimal floating point + _ZTSDd;_ZTIPDd;_ZTIPKDd; + _ZTSDe;_ZTIPDe;_ZTIPKDe; + _ZTSDf;_ZTIPDf;_ZTIPKDf; + # IEEE 754r half-precision floating point + _ZTSDh;_ZTIPDh;_ZTIPKDh; "typeinfo name for __cxxabiv1::__array_type_info"; "typeinfo name for __cxxabiv1::__class_type_info"; Modified: user/ae/inet6/lib/libkvm/Makefile ============================================================================== --- user/ae/inet6/lib/libkvm/Makefile Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libkvm/Makefile Thu Jan 16 15:26:16 2014 (r260758) @@ -1,23 +1,36 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ +.if defined(TARGET_ARCH) && !defined(COMPAT_32BIT) +KVM_XARCH=${TARGET_ARCH} +KVM_XCPUARCH=${KVM_XARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc64/powerpc/} +.else +KVM_XARCH=${MACHINE_ARCH} +KVM_XCPUARCH=${MACHINE_CPUARCH} +.endif + +.if ${KVM_XARCH} != ${MACHINE_ARCH} +LIB= kvm-${KVM_XARCH} +CFLAGS+=-DCROSS_LIBKVM +.else LIB= kvm +.endif + SHLIBDIR?= /lib SHLIB_MAJOR= 6 CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -.if exists(${.CURDIR}/kvm_${MACHINE_ARCH}.c) -KVM_ARCH=${MACHINE_ARCH} +.if exists(${.CURDIR}/kvm_${KVM_XARCH}.c) +KVM_ARCH=${KVM_XARCH} .else -KVM_ARCH=${MACHINE_CPUARCH} +KVM_ARCH=${KVM_XCPUARCH} .endif WARNS?= 3 SRCS= kvm.c kvm_${KVM_ARCH}.c kvm_cptime.c kvm_file.c kvm_getloadavg.c \ kvm_getswapinfo.c kvm_pcpu.c kvm_proc.c kvm_vnet.c -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" +.if exists(${.CURDIR}/kvm_minidump_${KVM_ARCH}.c) SRCS+= kvm_minidump_${KVM_ARCH}.c .endif INCS= kvm.h Modified: user/ae/inet6/lib/libkvm/kvm_ia64.c ============================================================================== --- user/ae/inet6/lib/libkvm/kvm_ia64.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libkvm/kvm_ia64.c Thu Jan 16 15:26:16 2014 (r260758) @@ -245,7 +245,7 @@ static size_t virt_kvatop(kvm_t *kd, uint64_t va, off_t *ofs) { - return (virt_addr2off(kd, va, ofs, kd->vmst->pagesize)); + return (virt_addr2off(kd, va, ofs, 0)); } /* @@ -371,5 +371,5 @@ _kvm_kvatop(kvm_t *kd, u_long va, off_t size_t sz; sz = kd->vmst->kvatop(kd, va, ofs); - return (sz); + return ((sz > INT_MAX) ? INT_MAX : sz); } Modified: user/ae/inet6/lib/libmd/sha256.h ============================================================================== --- user/ae/inet6/lib/libmd/sha256.h Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libmd/sha256.h Thu Jan 16 15:26:16 2014 (r260758) @@ -33,7 +33,7 @@ typedef struct SHA256Context { uint32_t state[8]; - uint32_t count[2]; + uint64_t count; unsigned char buf[64]; } SHA256_CTX; Modified: user/ae/inet6/lib/libmd/sha256c.c ============================================================================== --- user/ae/inet6/lib/libmd/sha256c.c Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/lib/libmd/sha256c.c Thu Jan 16 15:26:16 2014 (r260758) @@ -208,10 +208,10 @@ SHA256_Pad(SHA256_CTX * ctx) * Convert length to a vector of bytes -- we do this now rather * than later because the length will change after we pad. */ - be32enc_vect(len, ctx->count, 8); + be64enc(len, ctx->count); /* Add 1--64 bytes so that the resulting length is 56 mod 64 */ - r = (ctx->count[1] >> 3) & 0x3f; + r = (ctx->count >> 3) & 0x3f; plen = (r < 56) ? (56 - r) : (120 - r); SHA256_Update(ctx, PAD, (size_t)plen); @@ -225,7 +225,7 @@ SHA256_Init(SHA256_CTX * ctx) { /* Zero bits processed so far */ - ctx->count[0] = ctx->count[1] = 0; + ctx->count = 0; /* Magic initialization constants */ ctx->state[0] = 0x6A09E667; @@ -242,21 +242,18 @@ SHA256_Init(SHA256_CTX * ctx) void SHA256_Update(SHA256_CTX * ctx, const void *in, size_t len) { - uint32_t bitlen[2]; + uint64_t bitlen; uint32_t r; const unsigned char *src = in; /* Number of bytes left in the buffer from previous updates */ - r = (ctx->count[1] >> 3) & 0x3f; + r = (ctx->count >> 3) & 0x3f; /* Convert the length into a number of bits */ - bitlen[1] = ((uint32_t)len) << 3; - bitlen[0] = (uint32_t)(len >> 29); + bitlen = len << 3; /* Update number of bits */ - if ((ctx->count[1] += bitlen[1]) < bitlen[1]) - ctx->count[0]++; - ctx->count[0] += bitlen[0]; + ctx->count += bitlen; /* Handle the case where we don't need to perform any transforms */ if (len < 64 - r) { Modified: user/ae/inet6/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- user/ae/inet6/release/doc/en_US.ISO8859-1/errata/article.xml Thu Jan 16 15:22:49 2014 (r260757) +++ user/ae/inet6/release/doc/en_US.ISO8859-1/errata/article.xml Thu Jan 16 15:26:16 2014 (r260758) @@ -1,45 +1,24 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" - "../../../share/xml/freebsd50.dtd" [ -<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent"> + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ +<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" + "http://www.FreeBSD.org/release/XML/release.ent">; %release; ]> -<!-- - FreeBSD errata document. Unlike some of the other RELNOTESng - files, this file should remain as a single SGML file, so that - the dollar FreeBSD dollar header has a meaningful modification - time. This file is all but useless without a datestamp on it, - so we'll take some extra care to make sure it has one. - - (If we didn't do this, then the file with the datestamp might - not be the one that received the last change in the document.) - ---> -<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> - <info><title>&os; &release; Errata </title> - - - <author><orgname> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401161526.s0GFQHmJ057583>