From owner-svn-src-user@freebsd.org Sun Jan 17 12:07:59 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3F1BA85501
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 17 Jan 2016 12:07:58 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 B51EB1735;
Sun, 17 Jan 2016 12:07:58 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HC7v10077842;
Sun, 17 Jan 2016 12:07:57 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HC7vgZ077840;
Sun, 17 Jan 2016 12:07:57 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201601171207.u0HC7vgZ077840@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 17 Jan 2016 12:07:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294211 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2016 12:07:59 -0000
Author: pho
Date: Sun Jan 17 12:07:57 2016
New Revision: 294211
URL: https://svnweb.freebsd.org/changeset/base/294211
Log:
Added two regression tests.
Sponsored by: EMC / Isilon storage division
Added:
user/pho/stress2/misc/advlock.sh (contents, props changed)
user/pho/stress2/misc/dev2.sh (contents, props changed)
Added: user/pho/stress2/misc/advlock.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pho/stress2/misc/advlock.sh Sun Jan 17 12:07:57 2016 (r294211)
@@ -0,0 +1,246 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2016 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. 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 AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+
+# From r238952's commit log:
+# The first change closes a race where an open() that will block with O_SHLOCK
+# or O_EXLOCK can increase the write count while it waits. If the process
+# holding the current lock on the file then tries to call exec() on the file
+# it has locked, it can fail with ETXTBUSY even though the advisory lock is
+# preventing other threads from successfully completing a writable open().
+#
+# The second change closes a race where a read-only open() with O_SHLOCK or
+# O_EXLOCK may return successfully while the write count is non-zero due to
+# another descriptor that had the advisory lock and was blocking the open()
+# still being in the process of closing. If the process that completed the
+# open() then attempts to call exec() on the file it locked, it can fail with
+# ETXTBUSY even though the other process that held a write lock has closed
+# the file and released the lock.
+
+# https://people.freebsd.org/~pho/stress/log/kostik859.txt
+# https://people.freebsd.org/~pho/stress/log/kostik860.txt
+
+# Fixed by r294204.
+
+. ../default.cfg
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+dir=/tmp
+odir=`pwd`
+cd $dir
+sed '1,/^EOF/d' < $odir/$0 > $dir/advlock.c
+mycc -o advlock -Wall -Wextra -O0 -g advlock.c || exit 1
+rm -f advlock.c
+
+mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint
+mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart
+mdconfig -a -t swap -s 512m -u $mdstart || exit 1
+bsdlabel -w md$mdstart auto
+newfs $newfs_flags md${mdstart}$part > /dev/null
+mount /dev/md${mdstart}$part $mntpoint
+
+cp /usr/bin/true $mntpoint
+cd $mntpoint
+/tmp/advlock
+r=$?
+cd $odir
+
+while mount | grep "on $mntpoint " | grep -q /dev/md; do
+ umount $mntpoint || sleep 1
+done
+mdconfig -d -u $mdstart
+rm -f /tmp/advlock
+exit $r
+
+EOF
+#include <sys/param.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <machine/atomic.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+volatile u_int *share;
+char *cmdline[] = { "./true", NULL };
+const char *tp;
+
+#define EXAMPLE 0
+#define PARALLEL 2
+
+#define RUNTIME (1 * 60)
+
+void
+handler(int i __unused) {
+
+ fprintf(stderr, "ALARM from %s.\n", tp);
+ _exit(1);
+}
+
+void
+slock(void)
+{
+ int fd;
+
+ setproctitle("%s", __func__);
+ atomic_add_int(&share[EXAMPLE], 1);
+ while (share[EXAMPLE] != PARALLEL)
+ ;
+
+ tp = __func__;
+ alarm(2);
+ if ((fd = open(cmdline[0], O_RDONLY | O_SHLOCK)) == -1)
+ err(1, "open(%s). %d", cmdline[0], __LINE__);
+ usleep(500);
+ close(fd);
+
+ _exit(0);
+}
+
+void
+elock(void)
+{
+ int fd;
+
+ setproctitle("%s", __func__);
+ atomic_add_int(&share[EXAMPLE], 1);
+ while (share[EXAMPLE] != PARALLEL)
+ ;
+
+ tp = __func__;
+ alarm(2);
+ if ((fd = open(cmdline[0], O_WRONLY | O_EXLOCK)) == -1) {
+ if (errno != ETXTBSY)
+ err(1, "open(%s). %d", cmdline[0], __LINE__);
+ } else {
+ usleep(500);
+ close(fd);
+ }
+
+ _exit(0);
+}
+
+void
+stest(void)
+{
+ int fd;
+
+ setproctitle("%s", __func__);
+ atomic_add_int(&share[EXAMPLE], 1);
+ while (share[EXAMPLE] != PARALLEL)
+ ;
+
+ tp = __func__;
+ alarm(2);
+ if ((fd = open(cmdline[0], O_RDONLY | O_SHLOCK)) == -1)
+ err(1, "open(%s). %d", cmdline[0], __LINE__);
+
+ if (execve(cmdline[0], cmdline, NULL) == -1)
+ err(1, "execve(%s) @ %d", cmdline[0], __LINE__);
+
+ _exit(0);
+}
+
+void
+etest(void)
+{
+ int fd;
+
+ setproctitle("%s", __func__);
+ atomic_add_int(&share[EXAMPLE], 1);
+ while (share[EXAMPLE] != PARALLEL)
+ ;
+
+ tp = __func__;
+ alarm(2);
+ if ((fd = open(cmdline[0], O_RDONLY | O_EXLOCK)) == -1)
+ err(1, "open(%s). %d", cmdline[0], __LINE__);
+
+ if (execve(cmdline[0], cmdline, NULL) == -1)
+ err(1, "execve(%s) @ %d", cmdline[0], __LINE__);
+
+ _exit(0);
+}
+
+int
+main(void)
+{
+ size_t len;
+ time_t start;
+ int i, n, r, s;
+
+ len = PAGE_SIZE;
+ if ((share = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED,
+ -1, 0)) == MAP_FAILED)
+ err(1, "mmap");
+
+ signal(SIGALRM, handler);
+ n = r = 0;
+ start = time(NULL);
+ while ((time(NULL) - start) < RUNTIME) {
+ n++;
+ share[EXAMPLE] = 0;
+ if (fork() == 0)
+ slock();
+ if (fork() == 0)
+ stest();
+
+ for (i = 0; i < PARALLEL; i++) {
+ wait(&s);
+ r += s == 0 ? 0 : 1;
+ }
+ if (r != 0)
+ break;
+
+ share[EXAMPLE] = 0;
+ if (fork() == 0)
+ elock();
+ if (fork() == 0)
+ etest();
+
+ for (i = 0; i < PARALLEL; i++) {
+ wait(&s);
+ r += s == 0 ? 0 : 1;
+ }
+ if (r != 0)
+ break;
+ }
+ if (r != 0)
+ fprintf(stderr, "FAIL @ %d\n", n);
+
+ return (r);
+}
Added: user/pho/stress2/misc/dev2.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pho/stress2/misc/dev2.sh Sun Jan 17 12:07:57 2016 (r294211)
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2016 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. 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 AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+#
+
+# Test parallel access to /dev. A non-root version.
+
+# "panic: Bad link elm 0xfffff8000b07ed00 prev->next != elm" seen.
+# https://people.freebsd.org/~pho/stress/log/dev2.txt
+
+# Fixed by r294204.
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+here=`pwd`
+cd /tmp
+sed '1,/^EOF/d' < $here/$0 > dev2.c
+mycc -o dev2 -Wall -Wextra -O2 dev2.c || exit 1
+rm -f dev2.c
+
+kldstat -v | grep -q pty || kldload pty
+daemon sh -c \
+ "(cd $here/../testcases/swap; ./swap -t 6m -i 20 -k -l 100)" > \
+ /dev/null
+
+su $testuser -c /tmp/dev2
+
+while pkill -9 swap; do
+ :
+done
+
+rm -f /tmp/dev2
+exit
+EOF
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <fts.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+#define NFLAGS
+#define PARALLEL 4
+#define RUNTIME 300
+
+jmp_buf jbuf;
+char path[80];
+
+void
+handler(int i __unused) {
+ longjmp(jbuf, 1);
+}
+
+void
+churn(char *path)
+{
+ FTS *fts;
+ FTSENT *p;
+ time_t start;
+ int fd, ftsoptions;
+ char *args[2];
+
+ ftsoptions = FTS_PHYSICAL;
+ args[0] = path;
+ args[1] = 0;
+
+ start = time(NULL);
+ while (time(NULL) - start < RUNTIME) {
+ if ((fts = fts_open(args, ftsoptions, NULL)) == NULL)
+ err(1, "fts_open");
+
+ (void)setjmp(jbuf);
+ ualarm(0, 0);
+ while ((p = fts_read(fts)) != NULL) {
+ if (p->fts_info == FTS_D ||
+ p->fts_info == FTS_DP)
+ continue;
+ ualarm(500000, 0);
+ if ((fd = open(p->fts_path, arc4random() % (O_CLOEXEC << 2))) == -1)
+ continue;
+ ualarm(0, 0);
+ usleep(arc4random() % 1000);
+ close(fd);
+
+ }
+
+ if (errno != 0 && errno != ENOENT)
+ warn("fts_read");
+ if (fts_close(fts) == -1)
+ err(1, "fts_close()");
+ }
+
+ _exit(0);
+}
+
+int
+main(void)
+{
+ int i;
+
+ signal(SIGALRM, handler);
+ for (i = 0; i < PARALLEL; i++)
+ if (fork() == 0)
+ churn("/dev");
+
+ for (i = 0; i < PARALLEL; i++)
+ wait(NULL);
+
+ return (0);
+}
From owner-svn-src-user@freebsd.org Sun Jan 17 12:08:53 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2500A85568
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 17 Jan 2016 12:08:53 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 AADBD187A;
Sun, 17 Jan 2016 12:08:53 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HC8qAt077927;
Sun, 17 Jan 2016 12:08:52 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HC8qET077926;
Sun, 17 Jan 2016 12:08:52 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201601171208.u0HC8qET077926@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 17 Jan 2016 12:08:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294212 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2016 12:08:54 -0000
Author: pho
Date: Sun Jan 17 12:08:52 2016
New Revision: 294212
URL: https://svnweb.freebsd.org/changeset/base/294212
Log:
Added a regression test.
Sponsored by: EMC / Isilon storage division
Added:
user/pho/stress2/misc/audit.sh (contents, props changed)
Added: user/pho/stress2/misc/audit.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pho/stress2/misc/audit.sh Sun Jan 17 12:08:52 2016 (r294212)
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2016 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. 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 AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+
+# "Fatal trap 12: page fault while in kernel mode" seen.
+# https://people.freebsd.org/~pho/stress/log/audit.txt
+# Fixed by: r294137
+
+# Test scenario by: kib
+
+. ../default.cfg
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+pgrep -q auditd && exit 0
+mount | grep -q /var || exit 0
+
+service auditd onestart
+
+sleep 1
+su $testuser -c date > /dev/null
+
+sleep 1
+umount -f /var
+sleep 1
+mount /var
+
+service auditd onestop
+
+# Some services react badly to /var being unmounted.
+service -R
From owner-svn-src-user@freebsd.org Sun Jan 17 12:13:41 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2B7EA857DE
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 17 Jan 2016 12:13:41 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 94CEE1E5C;
Sun, 17 Jan 2016 12:13:41 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HCDelc080635;
Sun, 17 Jan 2016 12:13:40 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HCDenC080634;
Sun, 17 Jan 2016 12:13:40 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201601171213.u0HCDenC080634@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 17 Jan 2016 12:13:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294214 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2016 12:13:41 -0000
Author: pho
Date: Sun Jan 17 12:13:40 2016
New Revision: 294214
URL: https://svnweb.freebsd.org/changeset/base/294214
Log:
Added finding.
Sponsored by: EMC / Isilon storage division
Modified:
user/pho/stress2/misc/fifo.sh
Modified: user/pho/stress2/misc/fifo.sh
==============================================================================
--- user/pho/stress2/misc/fifo.sh Sun Jan 17 12:13:21 2016 (r294213)
+++ user/pho/stress2/misc/fifo.sh Sun Jan 17 12:13:40 2016 (r294214)
@@ -32,6 +32,8 @@
# http://people.freebsd.org/~pho/stress/log/kostik652.txt
# Fixed by r259522.
+# https://people.freebsd.org/~pho/stress/log/kostik863.txt
+
[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
. ../default.cfg
From owner-svn-src-user@freebsd.org Sun Jan 17 12:19:58 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 713B1A859F7
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 17 Jan 2016 12:19:58 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 4BC4B13A2;
Sun, 17 Jan 2016 12:19:58 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HCJvrN081095;
Sun, 17 Jan 2016 12:19:57 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HCJvxM081094;
Sun, 17 Jan 2016 12:19:57 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201601171219.u0HCJvxM081094@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 17 Jan 2016 12:19:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294217 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2016 12:19:58 -0000
Author: pho
Date: Sun Jan 17 12:19:57 2016
New Revision: 294217
URL: https://svnweb.freebsd.org/changeset/base/294217
Log:
Added a regression test.
Sponsored by: EMC / Isilon storage division
Added:
user/pho/stress2/misc/dev.sh (contents, props changed)
Added: user/pho/stress2/misc/dev.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pho/stress2/misc/dev.sh Sun Jan 17 12:19:57 2016 (r294217)
@@ -0,0 +1,128 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2016 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. 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 AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+#
+
+# Test parallel read access to /dev.
+
+# "panic: Most recently used by DEVFS1" seen.
+# https://people.freebsd.org/~pho/stress/log/dev.txt
+# Fixed by r293826.
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+here=`pwd`
+cd /tmp
+sed '1,/^EOF/d' < $here/$0 > dev.c
+mycc -o dev -Wall -Wextra -O2 dev.c || exit 1
+rm -f dev.c
+
+daemon sh -c \
+ "(cd $here/../testcases/swap; ./swap -t 6m -i 20 -k -l 100)" > \
+ /dev/null
+
+/tmp/dev # Note: this runs as root.
+
+while pkill -9 swap; do
+ :
+done
+
+rm -f /tmp/dev
+exit
+EOF
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <fts.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+
+#define PARALLEL 4
+#define RUNTIME 300
+
+char path[80];
+
+void
+churn(char *path)
+{
+ FTS *fts;
+ FTSENT *p;
+ time_t start;
+ int fd, ftsoptions;
+ char *args[2];
+
+ ftsoptions = FTS_PHYSICAL;
+ args[0] = path;
+ args[1] = 0;
+
+ start = time(NULL);
+ while (time(NULL) - start < RUNTIME) {
+ if ((fts = fts_open(args, ftsoptions, NULL)) == NULL)
+ err(1, "fts_open");
+
+ while ((p = fts_read(fts)) != NULL) {
+ if (p->fts_info == FTS_D ||
+ p->fts_info == FTS_DP)
+ continue;
+ if ((fd = open(p->fts_path, O_RDONLY)) == -1)
+ continue;
+ usleep(arc4random() % 1000);
+ close(fd);
+
+ }
+
+ if (errno != 0 && errno != ENOENT)
+ warn("fts_read");
+ if (fts_close(fts) == -1)
+ err(1, "fts_close()");
+ }
+
+ _exit(0);
+}
+
+int
+main(void)
+{
+ int i;
+
+ for (i = 0; i < PARALLEL; i++)
+ if (fork() == 0)
+ churn("/dev");
+
+ for (i = 0; i < PARALLEL; i++)
+ wait(NULL);
+
+ return (0);
+}
From owner-svn-src-user@freebsd.org Sun Jan 17 12:24:03 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5254A85D7C
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 17 Jan 2016 12:24:03 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 9716E185F;
Sun, 17 Jan 2016 12:24:03 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HCO2dW083880;
Sun, 17 Jan 2016 12:24:02 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HCO24v083879;
Sun, 17 Jan 2016 12:24:02 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201601171224.u0HCO24v083879@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Sun, 17 Jan 2016 12:24:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294218 - user/pho/stress2/misc
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2016 12:24:04 -0000
Author: pho
Date: Sun Jan 17 12:24:02 2016
New Revision: 294218
URL: https://svnweb.freebsd.org/changeset/base/294218
Log:
Added a regression test.
Sponsored by: EMC / Isilon storage division
Added:
user/pho/stress2/misc/pty2.sh (contents, props changed)
Added: user/pho/stress2/misc/pty2.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/pho/stress2/misc/pty2.sh Sun Jan 17 12:24:02 2016 (r294218)
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2016 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. 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 AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+#
+
+# pty(4) test scenario.
+
+# "panic: make_dev_sv: bad si_name (error=17, si_name=ptyp0)" seen.
+# Fixed by r293825.
+
+# Based on test scenario by Bruce Evans.
+
+[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
+
+. ../default.cfg
+
+kldstat -v | grep -q pty || { kldload pty || exit 1; }
+
+here=`pwd`
+cd /tmp
+sed '1,/^EOF/d' < $here/$0 > pty2.c
+mycc -o pty2 -Wall -Wextra -O2 pty2.c || exit 1
+rm -f pty2.c
+
+/tmp/pty2
+
+rm -f /tmp/pty2
+exit
+EOF
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <unistd.h>
+
+#define PARALLEL 3
+#define RUNTIME 180
+
+#define IN "/dev/ptyp0"
+
+void
+test(void)
+{
+ time_t start;
+ int fd;
+
+ start = time(NULL);
+ while (time(NULL) - start < RUNTIME) {
+ if ((fd = open(IN, O_RDONLY)) == -1) {
+ if (errno != EBUSY && errno != ENXIO && errno != ENOENT)
+ err(1, "open(%s)", IN);
+ } else
+ close(fd);
+
+ }
+ _exit(0);
+}
+
+int
+main(void)
+{
+ int i;
+
+ for (i = 0; i < PARALLEL; i++)
+ if (fork() == 0)
+ test();
+
+ for (i = 0; i < PARALLEL; i++)
+ wait(NULL);
+
+ return(0);
+}
+
From owner-svn-src-user@freebsd.org Sun Jan 17 22:05:52 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 600B7A867CE
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 17 Jan 2016 22:05:52 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 E7E05121C;
Sun, 17 Jan 2016 22:05:51 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0HM5pV3091238;
Sun, 17 Jan 2016 22:05:51 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0HM5nj7091212;
Sun, 17 Jan 2016 22:05:49 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601172205.u0HM5nj7091212@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 17 Jan 2016 22:05:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294236 - in user/ngie/stable-10-libnv: contrib/openpam
contrib/openpam/bin contrib/openpam/bin/su contrib/openpam/doc
contrib/openpam/doc/man contrib/openpam/include contrib/openpam/in...
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2016 22:05:52 -0000
Author: ngie
Date: Sun Jan 17 22:05:48 2016
New Revision: 294236
URL: https://svnweb.freebsd.org/changeset/base/294236
Log:
MFstable/10 @ r294235
Added:
user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_ctype.c
- copied unchanged from r294235, stable/10/contrib/openpam/t/t_openpam_ctype.c
user/ngie/stable-10-libnv/contrib/unbound/.gitignore
- copied unchanged from r294235, stable/10/contrib/unbound/.gitignore
user/ngie/stable-10-libnv/contrib/unbound/compat/isblank.c
- copied unchanged from r294235, stable/10/contrib/unbound/compat/isblank.c
user/ngie/stable-10-libnv/sys/dev/uart/uart_ppstypes.h
- copied unchanged from r294235, stable/10/sys/dev/uart/uart_ppstypes.h
user/ngie/stable-10-libnv/usr.bin/kdump/linux32_syscalls.conf
- copied unchanged from r294235, stable/10/usr.bin/kdump/linux32_syscalls.conf
Modified:
user/ngie/stable-10-libnv/contrib/openpam/CREDITS (contents, props changed)
user/ngie/stable-10-libnv/contrib/openpam/configure.ac (contents, props changed)
user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c
user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h
user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c (contents, props changed)
user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am
user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c
user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c
user/ngie/stable-10-libnv/contrib/unbound/Makefile.in
user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4
user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c
user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c
user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c
user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c
user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c
user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c
user/ngie/stable-10-libnv/contrib/unbound/config.h
user/ngie/stable-10-libnv/contrib/unbound/config.h.in
user/ngie/stable-10-libnv/contrib/unbound/configure
user/ngie/stable-10-libnv/contrib/unbound/configure.ac
user/ngie/stable-10-libnv/contrib/unbound/daemon/remote.c
user/ngie/stable-10-libnv/contrib/unbound/daemon/unbound.c
user/ngie/stable-10-libnv/contrib/unbound/daemon/worker.c
user/ngie/stable-10-libnv/contrib/unbound/dns64/dns64.c
user/ngie/stable-10-libnv/contrib/unbound/dnstap/dnstap.proto
user/ngie/stable-10-libnv/contrib/unbound/doc/Changelog
user/ngie/stable-10-libnv/contrib/unbound/doc/README
user/ngie/stable-10-libnv/contrib/unbound/doc/example.conf
user/ngie/stable-10-libnv/contrib/unbound/doc/example.conf.in
user/ngie/stable-10-libnv/contrib/unbound/doc/libunbound.3
user/ngie/stable-10-libnv/contrib/unbound/doc/libunbound.3.in
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-anchor.8
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-anchor.8.in
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-checkconf.8
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-checkconf.8.in
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-control.8
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-control.8.in
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-host.1
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound-host.1.in
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.8
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.8.in
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.conf.5
user/ngie/stable-10-libnv/contrib/unbound/doc/unbound.conf.5.in
user/ngie/stable-10-libnv/contrib/unbound/freebsd-configure.sh
user/ngie/stable-10-libnv/contrib/unbound/iterator/iter_scrub.c
user/ngie/stable-10-libnv/contrib/unbound/iterator/iter_utils.c
user/ngie/stable-10-libnv/contrib/unbound/iterator/iterator.c
user/ngie/stable-10-libnv/contrib/unbound/iterator/iterator.h
user/ngie/stable-10-libnv/contrib/unbound/libunbound/libunbound.c
user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/Makefile
user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/doc/install.rst
user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/doc/modules/unbound.rst
user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/examples/dnssec-valid.py
user/ngie/stable-10-libnv/contrib/unbound/libunbound/python/libunbound.i
user/ngie/stable-10-libnv/contrib/unbound/ltmain.sh
user/ngie/stable-10-libnv/contrib/unbound/services/cache/dns.c
user/ngie/stable-10-libnv/contrib/unbound/services/cache/rrset.c
user/ngie/stable-10-libnv/contrib/unbound/sldns/parseutil.h
user/ngie/stable-10-libnv/contrib/unbound/sldns/wire2str.c
user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-anchor.c
user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-checkconf.c
user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-control-setup.sh
user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-control-setup.sh.in
user/ngie/stable-10-libnv/contrib/unbound/smallapp/unbound-control.c
user/ngie/stable-10-libnv/contrib/unbound/util/config_file.c
user/ngie/stable-10-libnv/contrib/unbound/util/config_file.h
user/ngie/stable-10-libnv/contrib/unbound/util/configlexer.lex
user/ngie/stable-10-libnv/contrib/unbound/util/configparser.y
user/ngie/stable-10-libnv/contrib/unbound/util/iana_ports.inc
user/ngie/stable-10-libnv/contrib/unbound/util/locks.c
user/ngie/stable-10-libnv/contrib/unbound/util/net_help.c
user/ngie/stable-10-libnv/contrib/unbound/util/random.c
user/ngie/stable-10-libnv/contrib/unbound/util/rbtree.c
user/ngie/stable-10-libnv/contrib/unbound/util/rtt.h
user/ngie/stable-10-libnv/contrib/unbound/util/storage/lookup3.c
user/ngie/stable-10-libnv/contrib/unbound/util/tube.h
user/ngie/stable-10-libnv/contrib/unbound/util/winsock_event.h
user/ngie/stable-10-libnv/contrib/unbound/validator/autotrust.c
user/ngie/stable-10-libnv/contrib/unbound/validator/val_neg.c
user/ngie/stable-10-libnv/contrib/unbound/validator/val_neg.h
user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec.c
user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec.h
user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec3.c
user/ngie/stable-10-libnv/contrib/unbound/validator/val_nsec3.h
user/ngie/stable-10-libnv/contrib/unbound/validator/val_secalgo.c
user/ngie/stable-10-libnv/contrib/unbound/validator/val_secalgo.h
user/ngie/stable-10-libnv/contrib/unbound/validator/val_sigcrypt.c
user/ngie/stable-10-libnv/contrib/unbound/validator/val_utils.h
user/ngie/stable-10-libnv/contrib/unbound/validator/validator.c
user/ngie/stable-10-libnv/crypto/openssh/digest-libc.c
user/ngie/stable-10-libnv/lib/libc/net/if_nametoindex.c
user/ngie/stable-10-libnv/lib/libc/sys/futimens.c
user/ngie/stable-10-libnv/lib/libc/sys/utimensat.2
user/ngie/stable-10-libnv/lib/libc/sys/utimensat.c
user/ngie/stable-10-libnv/lib/libfetch/common.c
user/ngie/stable-10-libnv/lib/libfetch/fetch.3
user/ngie/stable-10-libnv/lib/libfetch/file.c
user/ngie/stable-10-libnv/lib/libfetch/http.c
user/ngie/stable-10-libnv/lib/libpam/Makefile.inc
user/ngie/stable-10-libnv/lib/libpam/libpam/Makefile
user/ngie/stable-10-libnv/sbin/ifconfig/sfp.c
user/ngie/stable-10-libnv/share/man/man4/uart.4
user/ngie/stable-10-libnv/sys/amd64/amd64/elf_machdep.c
user/ngie/stable-10-libnv/sys/amd64/amd64/trap.c
user/ngie/stable-10-libnv/sys/amd64/linux/linux_sysvec.c
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysvec.c
user/ngie/stable-10-libnv/sys/arm/arm/elf_machdep.c
user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
user/ngie/stable-10-libnv/sys/compat/ia32/ia32_sysvec.c
user/ngie/stable-10-libnv/sys/compat/svr4/svr4_sysvec.c
user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.c
user/ngie/stable-10-libnv/sys/dev/uart/uart_bus.h
user/ngie/stable-10-libnv/sys/dev/uart/uart_core.c
user/ngie/stable-10-libnv/sys/dev/uart/uart_dev_ns8250.c
user/ngie/stable-10-libnv/sys/i386/i386/elf_machdep.c
user/ngie/stable-10-libnv/sys/i386/ibcs2/ibcs2_sysvec.c
user/ngie/stable-10-libnv/sys/i386/linux/linux_sysvec.c
user/ngie/stable-10-libnv/sys/kern/imgact_aout.c
user/ngie/stable-10-libnv/sys/kern/init_main.c
user/ngie/stable-10-libnv/sys/mips/mips/elf_machdep.c
user/ngie/stable-10-libnv/sys/mips/mips/freebsd32_machdep.c
user/ngie/stable-10-libnv/sys/net/sff8436.h
user/ngie/stable-10-libnv/sys/netinet/sctp.h
user/ngie/stable-10-libnv/sys/netinet/sctp_asconf.c
user/ngie/stable-10-libnv/sys/netinet/sctp_auth.c
user/ngie/stable-10-libnv/sys/netinet/sctp_constants.h
user/ngie/stable-10-libnv/sys/netinet/sctp_header.h
user/ngie/stable-10-libnv/sys/netinet/sctp_indata.c
user/ngie/stable-10-libnv/sys/netinet/sctp_indata.h
user/ngie/stable-10-libnv/sys/netinet/sctp_input.c
user/ngie/stable-10-libnv/sys/netinet/sctp_os_bsd.h
user/ngie/stable-10-libnv/sys/netinet/sctp_output.c
user/ngie/stable-10-libnv/sys/netinet/sctp_output.h
user/ngie/stable-10-libnv/sys/netinet/sctp_pcb.c
user/ngie/stable-10-libnv/sys/netinet/sctp_pcb.h
user/ngie/stable-10-libnv/sys/netinet/sctp_structs.h
user/ngie/stable-10-libnv/sys/netinet/sctp_sysctl.c
user/ngie/stable-10-libnv/sys/netinet/sctp_sysctl.h
user/ngie/stable-10-libnv/sys/netinet/sctp_timer.c
user/ngie/stable-10-libnv/sys/netinet/sctp_uio.h
user/ngie/stable-10-libnv/sys/netinet/sctp_usrreq.c
user/ngie/stable-10-libnv/sys/netinet/sctputil.c
user/ngie/stable-10-libnv/sys/netinet/sctputil.h
user/ngie/stable-10-libnv/sys/netinet6/sctp6_usrreq.c
user/ngie/stable-10-libnv/sys/powerpc/powerpc/elf32_machdep.c
user/ngie/stable-10-libnv/sys/powerpc/powerpc/elf64_machdep.c
user/ngie/stable-10-libnv/sys/sparc64/sparc64/elf_machdep.c
user/ngie/stable-10-libnv/sys/sys/sysent.h
user/ngie/stable-10-libnv/usr.bin/fetch/fetch.1
user/ngie/stable-10-libnv/usr.bin/fetch/fetch.c
user/ngie/stable-10-libnv/usr.bin/kdump/Makefile
user/ngie/stable-10-libnv/usr.bin/kdump/kdump.c
user/ngie/stable-10-libnv/usr.bin/netstat/sctp.c
user/ngie/stable-10-libnv/usr.bin/sockstat/sockstat.1
user/ngie/stable-10-libnv/usr.bin/sockstat/sockstat.c
user/ngie/stable-10-libnv/usr.sbin/arp/arp.c
user/ngie/stable-10-libnv/usr.sbin/mountd/exports.5
user/ngie/stable-10-libnv/usr.sbin/mountd/mountd.c
user/ngie/stable-10-libnv/usr.sbin/ndp/ndp.c
user/ngie/stable-10-libnv/usr.sbin/service/service.sh
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
user/ngie/stable-10-libnv/contrib/openpam/HISTORY (props changed)
user/ngie/stable-10-libnv/contrib/openpam/INSTALL (props changed)
user/ngie/stable-10-libnv/contrib/openpam/LICENSE (props changed)
user/ngie/stable-10-libnv/contrib/openpam/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/README (props changed)
user/ngie/stable-10-libnv/contrib/openpam/RELNOTES (props changed)
user/ngie/stable-10-libnv/contrib/openpam/aclocal.m4 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/autogen.sh (props changed)
user/ngie/stable-10-libnv/contrib/openpam/bin/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/bin/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/bin/su/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/bin/su/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/bin/su/su.c (props changed)
user/ngie/stable-10-libnv/contrib/openpam/compile (props changed)
user/ngie/stable-10-libnv/contrib/openpam/config.guess (props changed)
user/ngie/stable-10-libnv/contrib/openpam/config.h.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/config.sub (props changed)
user/ngie/stable-10-libnv/contrib/openpam/configure (props changed)
user/ngie/stable-10-libnv/contrib/openpam/depcomp (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam.man (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_borrow_cred.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_free_data.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_free_envlist.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_get_option.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_log.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_nullconv.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_readline.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_restore_cred.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_set_option.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/openpam_ttyconv.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam.conf.5 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam.man (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_acct_mgmt.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_authenticate.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_chauthtok.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_close_session.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_conv.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_end.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_error.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_authtok.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_data.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_item.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_get_user.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_getenv.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_getenvlist.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_info.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_open_session.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_prompt.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_putenv.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_set_data.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_set_item.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_setcred.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_setenv.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_acct_mgmt.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_authenticate.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_chauthtok.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_close_session.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_open_session.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_sm_setcred.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_start.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_strerror.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_verror.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_vinfo.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/doc/man/pam_vprompt.3 (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/openpam.h (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/openpam_attr.h (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/openpam_version.h (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_appl.h (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_constants.h (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_modules.h (props changed)
user/ngie/stable-10-libnv/contrib/openpam/include/security/pam_types.h (props changed)
user/ngie/stable-10-libnv/contrib/openpam/install-sh (props changed)
user/ngie/stable-10-libnv/contrib/openpam/ltmain.sh (props changed)
user/ngie/stable-10-libnv/contrib/openpam/misc/gendoc.pl (props changed)
user/ngie/stable-10-libnv/contrib/openpam/missing (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_deny/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_deny/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_deny/pam_deny.c (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_permit/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_permit/Makefile.in (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_permit/pam_permit.c (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/Makefile.am (props changed)
user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/Makefile.in (props changed)
Modified: user/ngie/stable-10-libnv/contrib/openpam/CREDITS
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/CREDITS Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/CREDITS Sun Jan 17 22:05:48 2016 (r294236)
@@ -21,6 +21,7 @@ ideas:
Christos Zoulas <christos@netbsd.org>
Daniel Richard G. <skunk@iskunk.org>
Darren J. Moffat <darren.moffat@sun.com>
+ Dimitry Andric <dim@freebsd.org>
Dmitry V. Levin <ldv@altlinux.org>
Don Lewis <truckman@freebsd.org>
Emmanuel Dreyfus <manu@netbsd.org>
@@ -32,9 +33,9 @@ ideas:
Hubert Feyrer <hubert@feyrer.de>
Jason Evans <jasone@freebsd.org>
Joe Marcus Clarke <marcus@freebsd.org>
- Juli Mallett <jmallett@freebsd.org>
- Ankita Pal <pal.ankita.ankita@gmail.com>
Jörg Sonnenberger <joerg@britannica.bec.de>
+ Juli Mallett <jmallett@freebsd.org>
+ Larry Baird <lab@gta.com>
Maëlle Lesage <lesage.maelle@gmail.com>
Mark Murray <markm@freebsd.org>
Matthias Drochner <drochner@netbsd.org>
Modified: user/ngie/stable-10-libnv/contrib/openpam/configure.ac
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/configure.ac Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/configure.ac Sun Jan 17 22:05:48 2016 (r294236)
@@ -110,7 +110,7 @@ AC_SUBST(CRYPTO_LIBS)
AC_ARG_ENABLE([developer-warnings],
AS_HELP_STRING([--enable-developer-warnings], [enable strict warnings (default is NO)]),
- [CFLAGS="${CFLAGS} -Wall -Wextra"])
+ [CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual"])
AC_ARG_ENABLE([debugging-symbols],
AS_HELP_STRING([--enable-debugging-symbols], [enable debugging symbols (default is NO)]),
[CFLAGS="${CFLAGS} -O0 -g -fno-inline"])
Modified: user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_constants.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -137,6 +137,9 @@ const char *openpam_policy_path[] = {
const char *openpam_module_path[] = {
#ifdef OPENPAM_MODULES_DIRECTORY
OPENPAM_MODULES_DIRECTORY,
+#elif COMPAT_32BIT
+ "/usr/lib32",
+ "/usr/local/lib32",
#else
"/usr/lib",
"/usr/local/lib",
Modified: user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_ctype.h Sun Jan 17 22:05:48 2016 (r294236)
@@ -39,10 +39,18 @@
(ch >= '0' && ch <= '9')
/*
+ * Evaluates to non-zero if the argument is a hex digit.
+ */
+#define is_xdigit(ch) \
+ ((ch >= '0' && ch <= '9') || \
+ (ch >= 'a' && ch <= 'f') || \
+ (ch >= 'A' && ch <= 'F'))
+
+/*
* Evaluates to non-zero if the argument is an uppercase letter.
*/
#define is_upper(ch) \
- (ch >= 'A' && ch <= 'A')
+ (ch >= 'A' && ch <= 'Z')
/*
* Evaluates to non-zero if the argument is a lowercase letter.
Modified: user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/lib/libpam/openpam_dispatch.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -117,7 +117,7 @@ openpam_dispatch(pam_handle_t *pamh,
openpam_log(PAM_LOG_LIBDEBUG, "calling %s() in %s",
pam_sm_func_name[primitive], chain->module->path);
r = (chain->module->func[primitive])(pamh, flags,
- chain->optc, (const char **)chain->optv);
+ chain->optc, (const char **)(intptr_t)chain->optv);
pamh->current = NULL;
openpam_log(PAM_LOG_LIBDEBUG, "%s: %s(): %s",
chain->module->path, pam_sm_func_name[primitive],
Modified: user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/modules/pam_unix/pam_unix.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -74,7 +74,7 @@ pam_sm_authenticate(pam_handle_t *pamh,
#endif
struct passwd *pwd;
const char *user;
- char *crypt_password, *password;
+ const char *crypt_password, *password;
int pam_err, retry;
(void)argc;
@@ -98,7 +98,7 @@ pam_sm_authenticate(pam_handle_t *pamh,
for (retry = 0; retry < 3; ++retry) {
#ifdef OPENPAM
pam_err = pam_get_authtok(pamh, PAM_AUTHTOK,
- (const char **)&password, NULL);
+ &password, NULL);
#else
resp = NULL;
pam_err = (*conv->conv)(1, &msgp, &resp, conv->appdata_ptr);
Modified: user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/Makefile.am Sun Jan 17 22:05:48 2016 (r294236)
@@ -6,6 +6,7 @@ noinst_HEADERS = t.h
# tests
TESTS =
+TESTS += t_openpam_ctype
TESTS += t_openpam_readword
TESTS += t_openpam_readlinev
check_PROGRAMS = $(TESTS)
Copied: user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_ctype.c (from r294235, stable/10/contrib/openpam/t/t_openpam_ctype.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_ctype.c Sun Jan 17 22:05:48 2016 (r294236, copy of r294235, stable/10/contrib/openpam/t/t_openpam_ctype.c)
@@ -0,0 +1,122 @@
+/*-
+ * Copyright (c) 2014 Dag-Erling Smørgrav
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote
+ * products derived from this software without specific prior written
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "openpam_ctype.h"
+
+#include "t.h"
+
+#define OC_DIGIT "0123456789"
+#define OC_XDIGIT OC_DIGIT "ABCDEFabcdef"
+#define OC_UPPER "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+#define OC_LOWER "abcdefghijklmnopqrstuvwxyz"
+#define OC_LETTER OC_UPPER OC_LOWER
+#define OC_LWS " \t\f\r"
+#define OC_WS OC_LWS "\n"
+#define OC_P "!\"#$%&'()*+,-./" OC_DIGIT ":;<=>?@" OC_UPPER "[\\]^_`" OC_LOWER "{|}~"
+#define OC_PFCS OC_DIGIT OC_LETTER "._-"
+
+static const char oc_digit[] = OC_DIGIT;
+static const char oc_xdigit[] = OC_XDIGIT;
+static const char oc_upper[] = OC_UPPER;
+static const char oc_lower[] = OC_LOWER;
+static const char oc_letter[] = OC_LETTER;
+static const char oc_lws[] = OC_LWS;
+static const char oc_ws[] = OC_WS;
+static const char oc_p[] = OC_P;
+static const char oc_pfcs[] = OC_PFCS;
+
+#define T_OC(set) \
+ T_FUNC(t_oc_##set, "is_" #set) \
+ { \
+ char crib[256]; \
+ unsigned int i, ret; \
+ \
+ memset(crib, 0, sizeof crib); \
+ for (i = 0; oc_##set[i]; ++i) \
+ crib[(int)oc_##set[i]] = 1; \
+ for (i = ret = 0; i < sizeof crib; ++i) { \
+ if (is_##set(i) != crib[i]) { \
+ t_verbose("is_%s() incorrect " \
+ "for %#02x\n", #set, i); \
+ ++ret; \
+ } \
+ } \
+ return (ret == 0); \
+ }
+
+T_OC(digit)
+T_OC(xdigit)
+T_OC(upper)
+T_OC(lower)
+T_OC(letter)
+T_OC(lws)
+T_OC(ws)
+T_OC(p)
+T_OC(pfcs)
+
+
+/***************************************************************************
+ * Boilerplate
+ */
+
+static const struct t_test *t_plan[] = {
+ T(t_oc_digit),
+ T(t_oc_xdigit),
+ T(t_oc_upper),
+ T(t_oc_lower),
+ T(t_oc_letter),
+ T(t_oc_lws),
+ T(t_oc_ws),
+ T(t_oc_p),
+ T(t_oc_pfcs),
+ NULL
+};
+
+const struct t_test **
+t_prepare(int argc, char *argv[])
+{
+
+ (void)argc;
+ (void)argv;
+ return (t_plan);
+}
+
+void
+t_cleanup(void)
+{
+}
Modified: user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readlinev.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -255,7 +255,7 @@ T_FUNC(unterminated_line, "unterminated
* Boilerplate
*/
-const struct t_test *t_plan[] = {
+static const struct t_test *t_plan[] = {
T(empty_input),
T(empty_line),
T(unterminated_empty_line),
Modified: user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/openpam/t/t_openpam_readword.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -823,7 +823,7 @@ T_FUNC(escaped_double_quote_within_doubl
* Boilerplate
*/
-const struct t_test *t_plan[] = {
+static const struct t_test *t_plan[] = {
T(empty_input),
T(empty_line),
T(single_whitespace),
Copied: user/ngie/stable-10-libnv/contrib/unbound/.gitignore (from r294235, stable/10/contrib/unbound/.gitignore)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/stable-10-libnv/contrib/unbound/.gitignore Sun Jan 17 22:05:48 2016 (r294236, copy of r294235, stable/10/contrib/unbound/.gitignore)
@@ -0,0 +1,38 @@
+*.lo
+*.o
+/.libs/
+/Makefile
+/autom4te.cache/
+/config.h
+/config.log
+/config.status
+/dnstap/dnstap_config.h
+/doc/example.conf
+/doc/libunbound.3
+/doc/unbound-anchor.8
+/doc/unbound-checkconf.8
+/doc/unbound-control.8
+/doc/unbound-host.1
+/doc/unbound.8
+/doc/unbound.conf.5
+/libtool
+/libunbound.la
+/smallapp/unbound-control-setup.sh
+/unbound
+/unbound-anchor
+/unbound-checkconf
+/unbound-control
+/unbound-control-setup
+/unbound-host
+/unbound.h
+/asynclook
+/delayer
+/lock-verify
+/memstats
+/perf
+/petal
+/pktview
+/streamtcp
+/testbound
+/unittest
+
Modified: user/ngie/stable-10-libnv/contrib/unbound/Makefile.in
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/Makefile.in Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/Makefile.in Sun Jan 17 22:05:48 2016 (r294236)
@@ -38,6 +38,7 @@ UNBOUND_VERSION_MINOR=@UNBOUND_VERSION_M
UNBOUND_VERSION_MICRO=@UNBOUND_VERSION_MICRO@
ALLTARGET=@ALLTARGET@
INSTALLTARGET=@INSTALLTARGET@
+SSLLIB=@SSLLIB@
# _unbound.la if pyunbound enabled.
PYUNBOUND_TARGET=@PYUNBOUND_TARGET@
@@ -132,7 +133,7 @@ compat/memcmp.c compat/memmove.c compat/
compat/strlcpy.c compat/strptime.c compat/getentropy_linux.c \
compat/getentropy_osx.c compat/getentropy_solaris.c compat/getentropy_win.c \
compat/explicit_bzero.c compat/arc4random.c compat/arc4random_uniform.c \
-compat/arc4_lock.c compat/sha512.c compat/reallocarray.c
+compat/arc4_lock.c compat/sha512.c compat/reallocarray.c compat/isblank.c
COMPAT_OBJ=$(LIBOBJS:.o=.lo)
COMPAT_OBJ_WITHOUT_CTIME=$(LIBOBJ_WITHOUT_CTIME:.o=.lo)
COMPAT_OBJ_WITHOUT_CTIMEARC4=$(LIBOBJ_WITHOUT_CTIMEARC4:.o=.lo)
@@ -295,22 +296,22 @@ longtest: tests
lib: libunbound.la unbound.h
libunbound.la: $(LIBUNBOUND_OBJ_LINK)
- $(LINK_LIB) $(UBSYMS) -o $@ $(LIBUNBOUND_OBJ_LINK) -rpath $(libdir) -lssl $(LIBS)
+ $(LINK_LIB) $(UBSYMS) -o $@ $(LIBUNBOUND_OBJ_LINK) -rpath $(libdir) $(SSLLIB) $(LIBS)
unbound$(EXEEXT): $(DAEMON_OBJ_LINK) libunbound.la
- $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(DAEMON_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
unbound-checkconf$(EXEEXT): $(CHECKCONF_OBJ_LINK) libunbound.la
- $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(CHECKCONF_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
unbound-control$(EXEEXT): $(CONTROL_OBJ_LINK) libunbound.la
- $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(CONTROL_OBJ_LINK) $(EXTRALINK) $(SSLLIB) $(LIBS)
unbound-host$(EXEEXT): $(HOST_OBJ_LINK) libunbound.la
$(LINK) -o $@ $(HOST_OBJ_LINK) -L. -L.libs -lunbound $(LIBS)
unbound-anchor$(EXEEXT): $(UBANCHOR_OBJ_LINK) libunbound.la
- $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat -lssl $(LIBS)
+ $(LINK) -o $@ $(UBANCHOR_OBJ_LINK) -L. -L.libs -lunbound -lexpat $(SSLLIB) $(LIBS)
unbound-service-install$(EXEEXT): $(SVCINST_OBJ_LINK)
$(LINK) -o $@ $(SVCINST_OBJ_LINK) $(LIBS)
@@ -322,37 +323,37 @@ anchor-update$(EXEEXT): $(ANCHORUPD_OBJ
$(LINK) -o $@ $(ANCHORUPD_OBJ_LINK) -L. -L.libs -lunbound $(LIBS)
unittest$(EXEEXT): $(UNITTEST_OBJ_LINK)
- $(LINK) -o $@ $(UNITTEST_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(UNITTEST_OBJ_LINK) $(SSLLIB) $(LIBS)
testbound$(EXEEXT): $(TESTBOUND_OBJ_LINK)
- $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(TESTBOUND_OBJ_LINK) $(SSLLIB) $(LIBS)
lock-verify$(EXEEXT): $(LOCKVERIFY_OBJ_LINK)
- $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(LOCKVERIFY_OBJ_LINK) $(SSLLIB) $(LIBS)
petal$(EXEEXT): $(PETAL_OBJ_LINK)
- $(LINK) -o $@ $(PETAL_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(PETAL_OBJ_LINK) $(SSLLIB) $(LIBS)
pktview$(EXEEXT): $(PKTVIEW_OBJ_LINK)
- $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(PKTVIEW_OBJ_LINK) $(SSLLIB) $(LIBS)
memstats$(EXEEXT): $(MEMSTATS_OBJ_LINK)
- $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(MEMSTATS_OBJ_LINK) $(SSLLIB) $(LIBS)
asynclook$(EXEEXT): $(ASYNCLOOK_OBJ_LINK) libunbound.la
$(LINK) -o $@ $(ASYNCLOOK_OBJ_LINK) $(LIBS) -L. -L.libs -lunbound
streamtcp$(EXEEXT): $(STREAMTCP_OBJ_LINK)
- $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(STREAMTCP_OBJ_LINK) $(SSLLIB) $(LIBS)
perf$(EXEEXT): $(PERF_OBJ_LINK)
- $(LINK) -o $@ $(PERF_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(PERF_OBJ_LINK) $(SSLLIB) $(LIBS)
delayer$(EXEEXT): $(DELAYER_OBJ_LINK)
- $(LINK) -o $@ $(DELAYER_OBJ_LINK) -lssl $(LIBS)
+ $(LINK) -o $@ $(DELAYER_OBJ_LINK) $(SSLLIB) $(LIBS)
signit$(EXEEXT): testcode/signit.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ testcode/signit.c $(LDFLAGS) -lldns -lssl $(LIBS)
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ testcode/signit.c $(LDFLAGS) -lldns $(SSLLIB) $(LIBS)
unbound.h: $(srcdir)/libunbound/unbound.h
sed -e 's/@''UNBOUND_VERSION_MAJOR@/$(UNBOUND_VERSION_MAJOR)/' -e 's/@''UNBOUND_VERSION_MINOR@/$(UNBOUND_VERSION_MINOR)/' -e 's/@''UNBOUND_VERSION_MICRO@/$(UNBOUND_VERSION_MICRO)/' < $(srcdir)/libunbound/unbound.h > $@
@@ -644,7 +645,7 @@ iterator.lo iterator.o: $(srcdir)/iterat
$(srcdir)/util/rtt.h $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h \
$(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \
$(srcdir)/services/mesh.h $(srcdir)/services/modstack.h $(srcdir)/util/config_file.h $(srcdir)/util/random.h \
- $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h
+ $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h
iter_delegpt.lo iter_delegpt.o: $(srcdir)/iterator/iter_delegpt.c config.h $(srcdir)/iterator/iter_delegpt.h \
$(srcdir)/util/log.h $(srcdir)/services/cache/dns.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
$(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/regional.h \
@@ -727,8 +728,7 @@ outside_network.lo outside_network.o: $(
$(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \
$(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/random.h $(srcdir)/util/fptr_wlist.h \
$(srcdir)/util/module.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/services/modstack.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h \
-
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/dnstap/dnstap.h
alloc.lo alloc.o: $(srcdir)/util/alloc.c config.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
$(srcdir)/util/regional.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
$(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
@@ -776,14 +776,12 @@ netevent.lo netevent.o: $(srcdir)/util/n
$(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
$(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \
$(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/dnstap/dnstap.h \
- $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
+ $(srcdir)/dnstap/dnstap.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
$(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h \
$(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \
$(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/sldns/parseutil.h \
- $(srcdir)/sldns/wire2str.h \
-
+ $(srcdir)/sldns/wire2str.h
random.lo random.o: $(srcdir)/util/random.c config.h $(srcdir)/util/random.h $(srcdir)/util/log.h
rbtree.lo rbtree.o: $(srcdir)/util/rbtree.c config.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \
$(srcdir)/util/netevent.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
@@ -818,8 +816,7 @@ autotrust.lo autotrust.o: $(srcdir)/vali
$(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/random.h \
$(srcdir)/services/mesh.h $(srcdir)/util/netevent.h $(srcdir)/services/modstack.h \
$(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/validator/val_kcache.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h \
-
+ $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/keyraw.h
val_anchor.lo val_anchor.o: $(srcdir)/validator/val_anchor.c config.h $(srcdir)/validator/val_anchor.h \
$(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_sigcrypt.h \
$(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/autotrust.h \
@@ -844,18 +841,16 @@ val_kcache.lo val_kcache.o: $(srcdir)/va
val_kentry.lo val_kentry.o: $(srcdir)/validator/val_kentry.c config.h $(srcdir)/validator/val_kentry.h \
$(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \
$(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
-
-val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h \
- $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/rbtree.h \
- $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h $(srcdir)/util/data/dname.h \
- $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h \
- $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h
-val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h \
- $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/validator.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h
+val_neg.lo val_neg.o: $(srcdir)/validator/val_neg.c config.h $(srcdir)/validator/val_neg.h $(srcdir)/util/locks.h \
+ $(srcdir)/util/log.h $(srcdir)/util/rbtree.h $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_utils.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/config_file.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
+ $(srcdir)/services/cache/dns.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h
+val_nsec3.lo val_nsec3.o: $(srcdir)/validator/val_nsec3.c config.h $(srcdir)/validator/val_nsec3.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
+ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h \
$(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
$(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/validator/val_kentry.h \
$(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/regional.h \
@@ -867,17 +862,15 @@ val_nsec.lo val_nsec.o: $(srcdir)/valida
$(srcdir)/sldns/rrdef.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h
val_secalgo.lo val_secalgo.o: $(srcdir)/validator/val_secalgo.c config.h $(srcdir)/util/data/packed_rrset.h \
$(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
- $(srcdir)/sldns/sbuffer.h \
-
+ $(srcdir)/validator/val_nsec3.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
+ $(srcdir)/sldns/sbuffer.h
val_sigcrypt.lo val_sigcrypt.o: $(srcdir)/validator/val_sigcrypt.c config.h \
$(srcdir)/validator/val_sigcrypt.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
$(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_secalgo.h $(srcdir)/validator/validator.h \
$(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
$(srcdir)/sldns/rrdef.h $(srcdir)/validator/val_utils.h $(srcdir)/util/data/dname.h $(srcdir)/util/rbtree.h \
- $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/sldns/keyraw.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \
-
+ $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h
val_utils.lo val_utils.o: $(srcdir)/validator/val_utils.c config.h $(srcdir)/validator/val_utils.h \
$(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
$(srcdir)/validator/validator.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
@@ -895,11 +888,6 @@ dns64.lo dns64.o: $(srcdir)/dns64/dns64.
$(srcdir)/services/modstack.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h
checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
$(srcdir)/testcode/checklocks.h
-dnstap.lo dnstap.o: $(srcdir)/dnstap/dnstap.c config.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
- $(srcdir)/dnstap/dnstap.h \
- $(srcdir)/dnstap/dnstap.pb-c.h
-dnstap.pb-c.lo dnstap.pb-c.o: $(srcdir)/dnstap/dnstap.pb-c.c $(srcdir)/dnstap/dnstap.pb-c.h
unitanchor.lo unitanchor.o: $(srcdir)/testcode/unitanchor.c config.h $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \
$(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/testcode/unitmain.h \
$(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h
@@ -908,8 +896,7 @@ unitdname.lo unitdname.o: $(srcdir)/test
$(srcdir)/sldns/str2wire.h $(srcdir)/sldns/rrdef.h
unitlruhash.lo unitlruhash.o: $(srcdir)/testcode/unitlruhash.c config.h $(srcdir)/testcode/unitmain.h \
$(srcdir)/util/log.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/storage/slabhash.h
-unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
+unitmain.lo unitmain.o: $(srcdir)/testcode/unitmain.c config.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/keyraw.h \
$(srcdir)/util/log.h $(srcdir)/testcode/unitmain.h $(srcdir)/util/alloc.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
$(srcdir)/util/config_file.h $(srcdir)/util/rtt.h $(srcdir)/services/cache/infra.h \
$(srcdir)/util/storage/lruhash.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
@@ -947,38 +934,35 @@ unitldns.lo unitldns.o: $(srcdir)/testco
acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \
$(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/log.h \
$(srcdir)/util/config_file.h $(srcdir)/util/net_help.h
-cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h \
- $(srcdir)/daemon/cachedump.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h \
+cachedump.lo cachedump.o: $(srcdir)/daemon/cachedump.c config.h $(srcdir)/daemon/cachedump.h \
+ $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
+ $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
+ $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
+ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h \
+ $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h \
+ $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h \
+ $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h \
+ $(srcdir)/iterator/iter_resptype.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
+ $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
+daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \
+ $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
+ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h \
$(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
$(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
- $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/cache/dns.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
- $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h \
- $(srcdir)/util/data/dname.h $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h \
- $(srcdir)/iterator/iter_delegpt.h $(srcdir)/iterator/iter_utils.h $(srcdir)/iterator/iter_resptype.h \
- $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/sldns/wire2str.h \
- $(srcdir)/sldns/str2wire.h
-daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \
- $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
- $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
- $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
+ $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
$(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h \
$(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
$(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/util/random.h $(srcdir)/util/tube.h \
$(srcdir)/util/net_help.h $(srcdir)/sldns/keyraw.h
-remote.lo remote.o: $(srcdir)/daemon/remote.c config.h \
- $(srcdir)/daemon/remote.h \
- $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
- $(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
- $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
- $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \
+remote.lo remote.o: $(srcdir)/daemon/remote.c config.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/worker.h \
+ $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/netevent.h \
+ $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
+ $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \
$(srcdir)/services/modstack.h $(srcdir)/daemon/cachedump.h $(srcdir)/util/config_file.h \
$(srcdir)/util/net_help.h $(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
$(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
@@ -1002,35 +986,33 @@ stats.lo stats.o: $(srcdir)/daemon/stats
$(srcdir)/util/rtt.h $(srcdir)/validator/val_kcache.h
unbound.lo unbound.o: $(srcdir)/daemon/unbound.c config.h $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h \
$(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
- $(srcdir)/daemon/remote.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
- $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h \
- $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
- $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/mini_event.h \
- $(srcdir)/util/rbtree.h
+ $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/storage/slabhash.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/services/listen_dnsport.h $(srcdir)/util/netevent.h \
+ $(srcdir)/services/cache/rrset.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.h \
+ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
+ $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h
worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \
$(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
$(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \
$(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
$(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
$(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \
- $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
- $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \
+ $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h $(srcdir)/util/regional.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \
+ $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \
+ $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
+ $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \
$(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \
$(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h \
$(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound.h \
$(srcdir)/libunbound/libworker.h
testbound.lo testbound.o: $(srcdir)/testcode/testbound.c config.h $(srcdir)/testcode/testpkts.h \
$(srcdir)/testcode/replay.h $(srcdir)/util/netevent.h $(srcdir)/util/rbtree.h $(srcdir)/testcode/fake_event.h \
- $(srcdir)/daemon/remote.h \
- $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c $(srcdir)/util/log.h \
- $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
+ $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/sldns/keyraw.h $(srcdir)/daemon/unbound.c \
+ $(srcdir)/util/log.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
$(srcdir)/util/storage/slabhash.h $(srcdir)/util/storage/lruhash.h \
$(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h \
$(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \
@@ -1046,12 +1028,12 @@ worker.lo worker.o: $(srcdir)/daemon/wor
$(srcdir)/util/netevent.h $(srcdir)/util/alloc.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h \
$(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h \
$(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/daemon.h \
- $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h \
- $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/regional.h $(srcdir)/util/storage/slabhash.h \
- $(srcdir)/services/listen_dnsport.h $(srcdir)/services/outside_network.h \
- $(srcdir)/services/outbound_list.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
- $(srcdir)/util/rtt.h $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \
+ $(srcdir)/services/modstack.h $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h \
+ $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/config_file.h $(srcdir)/util/regional.h \
+ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/listen_dnsport.h \
+ $(srcdir)/services/outside_network.h $(srcdir)/services/outbound_list.h \
+ $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/rtt.h \
+ $(srcdir)/services/cache/dns.h $(srcdir)/services/mesh.h $(srcdir)/services/localzone.h \
$(srcdir)/util/data/msgencode.h $(srcdir)/util/data/dname.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h \
$(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h $(srcdir)/validator/autotrust.h \
$(srcdir)/validator/val_anchor.h $(srcdir)/libunbound/context.h $(srcdir)/libunbound/unbound.h \
@@ -1059,14 +1041,13 @@ worker.lo worker.o: $(srcdir)/daemon/wor
acl_list.lo acl_list.o: $(srcdir)/daemon/acl_list.c config.h $(srcdir)/daemon/acl_list.h \
$(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/regional.h $(srcdir)/util/log.h \
$(srcdir)/util/config_file.h $(srcdir)/util/net_help.h
-daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h \
- $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
- $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
- $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
+daemon.lo daemon.o: $(srcdir)/daemon/daemon.c config.h $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h \
+ $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \
+ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/netevent.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h $(srcdir)/dnstap/dnstap.h \
+ $(srcdir)/daemon/remote.h $(srcdir)/daemon/acl_list.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h \
$(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/storage/slabhash.h \
$(srcdir)/services/listen_dnsport.h $(srcdir)/services/cache/rrset.h $(srcdir)/services/cache/infra.h \
$(srcdir)/util/rtt.h $(srcdir)/services/localzone.h $(srcdir)/util/random.h $(srcdir)/util/tube.h \
@@ -1141,19 +1122,18 @@ libunbound.lo libunbound.o: $(srcdir)/li
$(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/services/localzone.h \
$(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \
$(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/sldns/sbuffer.h
-libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h \
- $(srcdir)/libunbound/libworker.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
- $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h \
- $(srcdir)/services/modstack.h $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/worker.h \
- $(srcdir)/sldns/sbuffer.h $(srcdir)/libunbound/unbound-event.h $(srcdir)/services/outside_network.h \
- $(srcdir)/util/netevent.h $(srcdir)/services/mesh.h \
- $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h \
- $(srcdir)/util/data/msgreply.h $(srcdir)/services/localzone.h $(srcdir)/services/cache/rrset.h \
- $(srcdir)/util/storage/slabhash.h $(srcdir)/services/outbound_list.h $(srcdir)/util/fptr_wlist.h \
- $(srcdir)/util/tube.h $(srcdir)/util/regional.h $(srcdir)/util/random.h $(srcdir)/util/config_file.h \
- $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h $(srcdir)/util/data/dname.h \
- $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h $(srcdir)/iterator/iter_hints.h \
- $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h
+libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/libunbound/libworker.h \
+ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \
+ $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
+ $(srcdir)/libunbound/unbound.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \
+ $(srcdir)/libunbound/unbound-event.h $(srcdir)/services/outside_network.h $(srcdir)/util/netevent.h \
+ $(srcdir)/services/mesh.h $(srcdir)/util/data/msgparse.h \
+ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \
+ $(srcdir)/services/localzone.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \
+ $(srcdir)/services/outbound_list.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h $(srcdir)/util/regional.h \
+ $(srcdir)/util/random.h $(srcdir)/util/config_file.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/net_help.h \
+ $(srcdir)/util/data/dname.h $(srcdir)/util/data/msgencode.h $(srcdir)/iterator/iter_fwd.h \
+ $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h $(srcdir)/sldns/str2wire.h
unbound-host.lo unbound-host.o: $(srcdir)/smallapp/unbound-host.c config.h $(srcdir)/libunbound/unbound.h \
$(srcdir)/sldns/rrdef.h $(srcdir)/sldns/wire2str.h
asynclook.lo asynclook.o: $(srcdir)/testcode/asynclook.c config.h $(srcdir)/libunbound/unbound.h \
@@ -1164,21 +1144,18 @@ streamtcp.lo streamtcp.o: $(srcdir)/test
$(srcdir)/util/net_help.h $(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgparse.h \
$(srcdir)/util/storage/lruhash.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h \
$(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/dname.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h \
-
+ $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h
perf.lo perf.o: $(srcdir)/testcode/perf.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h \
$(srcdir)/util/data/msgencode.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/storage/lruhash.h \
$(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
$(srcdir)/sldns/rrdef.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h
delayer.lo delayer.o: $(srcdir)/testcode/delayer.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \
$(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h
-unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h \
- $(srcdir)/util/log.h $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h
+unbound-control.lo unbound-control.o: $(srcdir)/smallapp/unbound-control.c config.h $(srcdir)/util/log.h \
+ $(srcdir)/util/config_file.h $(srcdir)/util/locks.h $(srcdir)/util/net_help.h
unbound-anchor.lo unbound-anchor.o: $(srcdir)/smallapp/unbound-anchor.c config.h $(srcdir)/libunbound/unbound.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h \
-
-petal.lo petal.o: $(srcdir)/testcode/petal.c config.h \
-
+ $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/parseutil.h
+petal.lo petal.o: $(srcdir)/testcode/petal.c config.h
pythonmod_utils.lo pythonmod_utils.o: $(srcdir)/pythonmod/pythonmod_utils.c config.h $(srcdir)/util/module.h \
$(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \
$(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
@@ -1191,8 +1168,7 @@ win_svc.lo win_svc.o: $(srcdir)/winrc/wi
$(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
$(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \
$(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \
- $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h \
- $(srcdir)/util/config_file.h $(srcdir)/util/winsock_event.h
+ $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/winsock_event.h
w_inst.lo w_inst.o: $(srcdir)/winrc/w_inst.c config.h $(srcdir)/winrc/w_inst.h $(srcdir)/winrc/win_svc.h
unbound-service-install.lo unbound-service-install.o: $(srcdir)/winrc/unbound-service-install.c config.h \
$(srcdir)/winrc/w_inst.h
@@ -1200,14 +1176,11 @@ unbound-service-remove.lo unbound-servic
$(srcdir)/winrc/w_inst.h
anchor-update.lo anchor-update.o: $(srcdir)/winrc/anchor-update.c config.h $(srcdir)/libunbound/unbound.h \
$(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/wire2str.h
-keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h \
- $(srcdir)/sldns/rrdef.h \
-
+keyraw.lo keyraw.o: $(srcdir)/sldns/keyraw.c config.h $(srcdir)/sldns/keyraw.h $(srcdir)/sldns/rrdef.h
sbuffer.lo sbuffer.o: $(srcdir)/sldns/sbuffer.c config.h $(srcdir)/sldns/sbuffer.h
wire2str.lo wire2str.o: $(srcdir)/sldns/wire2str.c config.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/str2wire.h \
$(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/sbuffer.h \
- $(srcdir)/sldns/keyraw.h \
-
+ $(srcdir)/sldns/keyraw.h
parse.lo parse.o: $(srcdir)/sldns/parse.c config.h $(srcdir)/sldns/parse.h $(srcdir)/sldns/parseutil.h \
$(srcdir)/sldns/sbuffer.h
parseutil.lo parseutil.o: $(srcdir)/sldns/parseutil.c config.h $(srcdir)/sldns/parseutil.h
@@ -1227,8 +1200,7 @@ snprintf.lo snprintf.o: $(srcdir)/compat
strlcat.lo strlcat.o: $(srcdir)/compat/strlcat.c config.h
strlcpy.lo strlcpy.o: $(srcdir)/compat/strlcpy.c config.h
strptime.lo strptime.o: $(srcdir)/compat/strptime.c config.h
-getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h \
-
+getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h
getentropy_osx.lo getentropy_osx.o: $(srcdir)/compat/getentropy_osx.c config.h
getentropy_solaris.lo getentropy_solaris.o: $(srcdir)/compat/getentropy_solaris.c config.h
getentropy_win.lo getentropy_win.o: $(srcdir)/compat/getentropy_win.c
@@ -1238,3 +1210,4 @@ arc4random_uniform.lo arc4random_uniform
arc4_lock.lo arc4_lock.o: $(srcdir)/compat/arc4_lock.c config.h $(srcdir)/util/locks.h
sha512.lo sha512.o: $(srcdir)/compat/sha512.c config.h
reallocarray.lo reallocarray.o: $(srcdir)/compat/reallocarray.c config.h
+isblank.lo isblank.o: $(srcdir)/compat/isblank.c config.h
Modified: user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4 Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/acx_nlnetlabs.m4 Sun Jan 17 22:05:48 2016 (r294236)
@@ -2,7 +2,9 @@
# Copyright 2009, Wouter Wijngaards, NLnet Labs.
# BSD licensed.
#
-# Version 28
+# Version 30
+# 2015-11-18 spelling check fix.
+# 2015-11-05 ACX_SSL_CHECKS no longer adds -ldl needlessly.
# 2015-08-28 ACX_CHECK_PIE and ACX_CHECK_RELRO_NOW added.
# 2015-03-17 AHX_CONFIG_REALLOCARRAY added
# 2013-09-19 FLTO help text improved.
@@ -24,7 +26,7 @@
# 2010-07-02 Add check for ss_family (for minix).
# 2010-04-26 Fix to use CPPFLAGS for CHECK_COMPILER_FLAGS.
# 2010-03-01 Fix RPATH using CONFIG_COMMANDS to run at the very end.
-# 2010-02-18 WITH_SSL outputs the LIBSSL_LDFLAGS, LIBS, CPPFLAGS seperate, -ldl
+# 2010-02-18 WITH_SSL outputs the LIBSSL_LDFLAGS, LIBS, CPPFLAGS separate, -ldl
# 2010-02-01 added ACX_CHECK_MEMCMP_SIGNED, AHX_MEMCMP_BROKEN
# 2010-01-20 added AHX_COONFIG_STRLCAT
# 2009-07-14 U_CHAR detection improved for windows crosscompile.
@@ -715,12 +717,6 @@ AC_DEFUN([ACX_SSL_CHECKS], [
fi
AC_SUBST(HAVE_SSL)
AC_SUBST(RUNTIME_PATH)
- # openssl engine functionality needs dlopen().
- BAKLIBS="$LIBS"
- AC_SEARCH_LIBS([dlopen], [dl])
- if test "$LIBS" != "$BAKLIBS"; then
- LIBSSL_LIBS="$LIBSSL_LIBS -ldl"
- fi
fi
AC_CHECK_HEADERS([openssl/ssl.h],,, [AC_INCLUDES_DEFAULT])
AC_CHECK_HEADERS([openssl/err.h],,, [AC_INCLUDES_DEFAULT])
Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/arc4random.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -26,7 +26,9 @@
#include <fcntl.h>
#include <limits.h>
#include <signal.h>
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_linux.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -46,7 +46,12 @@
#include <errno.h>
#include <unistd.h>
#include <time.h>
+
+#if defined(HAVE_SSL)
#include <openssl/sha.h>
+#elif defined(HAVE_NETTLE)
+#include <nettle/sha.h>
+#endif
#include <linux/types.h>
#include <linux/random.h>
@@ -67,9 +72,21 @@
HD(b); \
} while (0)
+#if defined(HAVE_SSL)
+#define CRYPTO_SHA512_CTX SHA512_CTX
+#define CRYPTO_SHA512_INIT(x) SHA512_Init(x)
+#define CRYPTO_SHA512_FINAL(r, c) SHA512_Final(r, c)
#define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l)))
#define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x)))
#define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*)))
+#elif defined(HAVE_NETTLE)
+#define CRYPTO_SHA512_CTX struct sha512_ctx
+#define CRYPTO_SHA512_INIT(x) sha512_init(x)
+#define CRYPTO_SHA512_FINAL(r, c) sha512_digest(c, SHA512_DIGEST_SIZE, r)
+#define HR(x, l) (sha512_update(&ctx, (l), (uint8_t *)(x)))
+#define HD(x) (sha512_update(&ctx, sizeof (x), (uint8_t *)&(x)))
+#define HF(x) (sha512_update(&ctx, sizeof (void*), (uint8_t *)&(x)))
+#endif
int getentropy(void *buf, size_t len);
@@ -122,7 +139,7 @@ getentropy(void *buf, size_t len)
* Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID.
* sysctl is a failsafe API, so it guarantees a result. This
* should work inside a chroot, or when file descriptors are
- * exhuasted.
+ * exhausted.
*
* However this can fail if the Linux kernel removes support
* for sysctl. Starting in 2007, there have been efforts to
@@ -337,7 +354,7 @@ getentropy_fallback(void *buf, size_t le
struct rusage ru;
sigset_t sigset;
struct stat st;
- SHA512_CTX ctx;
+ CRYPTO_SHA512_CTX ctx;
static pid_t lastpid;
pid_t pid;
size_t i, ii, m;
@@ -354,7 +371,7 @@ getentropy_fallback(void *buf, size_t le
}
for (i = 0; i < len; ) {
int j;
- SHA512_Init(&ctx);
+ CRYPTO_SHA512_INIT(&ctx);
for (j = 0; j < repeat; j++) {
HX((e = gettimeofday(&tv, NULL)) == -1, tv);
if (e != -1) {
@@ -526,7 +543,7 @@ getentropy_fallback(void *buf, size_t le
# endif
#endif /* HAVE_GETAUXVAL */
- SHA512_Final(results, &ctx);
+ CRYPTO_SHA512_FINAL(results, &ctx);
memcpy((char*)buf + i, results, min(sizeof(results), len - i));
i += min(sizeof(results), len - i);
}
Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/getentropy_solaris.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -30,7 +30,9 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#endif
#include <stdio.h>
#include <termios.h>
#include <fcntl.h>
@@ -39,10 +41,14 @@
#include <errno.h>
#include <unistd.h>
#include <time.h>
+#ifdef HAVE_SYS_SHA2_H
#include <sys/sha2.h>
#define SHA512_Init SHA512Init
#define SHA512_Update SHA512Update
#define SHA512_Final SHA512Final
+#else
+#include "openssl/sha.h"
+#endif
#include <sys/vfs.h>
#include <sys/statfs.h>
Copied: user/ngie/stable-10-libnv/contrib/unbound/compat/isblank.c (from r294235, stable/10/contrib/unbound/compat/isblank.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/isblank.c Sun Jan 17 22:05:48 2016 (r294236, copy of r294235, stable/10/contrib/unbound/compat/isblank.c)
@@ -0,0 +1,45 @@
+/* isblank - compatibility implementation of isblank
+ *
+ * Copyright (c) 2015, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ *
+ * 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.
+ *
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * 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.
+ */
+
+#include "config.h"
+
+/* return true for a blank character: space or tab */
+int isblank(int c);
+
+/* implementation of isblank. unsigned char is the argument */
+int
+isblank(int c)
+{
+ return (c==' ' || c=='\t');
+}
Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/reallocarray.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -18,7 +18,10 @@
#include "config.h"
#include <sys/types.h>
#include <errno.h>
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#endif
+#include <limits.h>
#include <stdlib.h>
/*
Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/sha512.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -70,7 +70,7 @@ unsigned char *SHA512(void *data, unsign
* Please make sure that your system defines BYTE_ORDER. If your
* architecture is little-endian, make sure it also defines
* LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
- * equivilent.
+ * equivalent.
*
* If your system does not define the above, then you can do so by
* hand like this:
Modified: user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c Sun Jan 17 21:19:45 2016 (r294235)
+++ user/ngie/stable-10-libnv/contrib/unbound/compat/snprintf.c Sun Jan 17 22:05:48 2016 (r294236)
@@ -42,6 +42,7 @@
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
+#include <limits.h>
/* for test */
/* #define SNPRINTF_TEST 1 */
@@ -428,7 +429,7 @@ print_num_llp(char** at, size_t* left, i
char buf[PRINT_DEC_BUFSZ];
int negative = 0;
int zero = (value == 0);
-#if defined(UINTPTR_MAX) && defined(UINT32_MAX) && (UINTPTR_MAX == UINT32_MAX)
+#if defined(SIZE_MAX) && defined(UINT32_MAX) && (UINT32_MAX == SIZE_MAX || INT32_MAX == SIZE_MAX)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Mon Jan 18 04:24:44 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB26EA86321
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Jan 2016 04:24:44 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 7B4FC1154;
Mon, 18 Jan 2016 04:24:44 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0I4Ohlp005985;
Mon, 18 Jan 2016 04:24:43 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0I4OhbE005984;
Mon, 18 Jan 2016 04:24:43 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601180424.u0I4OhbE005984@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 18 Jan 2016 04:24:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294245 -
user/ngie/socket-tests/tools/regression/sockets/zerosend
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2016 04:24:44 -0000
Author: ngie
Date: Mon Jan 18 04:24:43 2016
New Revision: 294245
URL: https://svnweb.freebsd.org/changeset/base/294245
Log:
Use different ports in the TCP/UDP testcases with the first set and
the second set
This avoids issues where the first listening socket might not be torn
down by the time it makes it to the second set of testcases.
The sockets should likely only be setup once, but this keeps in the
spirit of the original testcases
Modified:
user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c
Modified: user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c Mon Jan 18 03:56:49 2016 (r294244)
+++ user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c Mon Jan 18 04:24:43 2016 (r294245)
@@ -74,7 +74,7 @@ try_0write(const char *test, int fd)
}
static void
-setup_udp(const char *test, int *fdp)
+setup_udp(const char *test, int *fdp, int port1, int port2)
{
struct sockaddr_in sin;
int sock1, sock2;
@@ -84,14 +84,14 @@ setup_udp(const char *test, int *fdp)
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- sin.sin_port = htons(PORT1);
+ sin.sin_port = htons(port1);
sock1 = socket(PF_INET, SOCK_DGRAM, 0);
if (sock1 < 0)
err(1, "%s: setup_udp: socket", test);
if (bind(sock1, (struct sockaddr *)&sin, sizeof(sin)) < 0)
err(1, "%s: setup_udp: bind(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT1);
- sin.sin_port = htons(PORT2);
+ sin.sin_port = htons(port2);
if (connect(sock1, (struct sockaddr *)&sin, sizeof(sin)) < 0)
err(1, "%s: setup_udp: connect(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT2);
@@ -102,7 +102,7 @@ setup_udp(const char *test, int *fdp)
if (bind(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0)
err(1, "%s: setup_udp: bind(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT2);
- sin.sin_port = htons(PORT1);
+ sin.sin_port = htons(port1);
if (connect(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0)
err(1, "%s: setup_udp: connect(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT1);
@@ -112,7 +112,7 @@ setup_udp(const char *test, int *fdp)
}
static void
-setup_tcp(const char *test, int *fdp)
+setup_tcp(const char *test, int *fdp, int port)
{
fd_set writefds, exceptfds;
struct sockaddr_in sin;
@@ -127,7 +127,7 @@ setup_tcp(const char *test, int *fdp)
/*
* First set up the listen socket.
*/
- sin.sin_port = htons(PORT1);
+ sin.sin_port = htons(port);
sock1 = socket(PF_INET, SOCK_STREAM, 0);
if (sock1 < 0)
err(1, "%s: setup_tcp: socket", test);
@@ -246,19 +246,19 @@ main(void)
{
int fd[2];
- setup_udp("udp_0send", fd);
+ setup_udp("udp_0send", fd, PORT1, PORT2);
try_0send("udp_0send", fd[0]);
close_both(fd);
- setup_udp("udp_0write", fd);
+ setup_udp("udp_0write", fd, PORT1 + 10, PORT2 + 10);
try_0write("udp_0write", fd[0]);
close_both(fd);
- setup_tcp("tcp_0send", fd);
+ setup_tcp("tcp_0send", fd, PORT1);
try_0send("tcp_0send", fd[0]);
close_both(fd);
- setup_tcp("tcp_0write", fd);
+ setup_tcp("tcp_0write", fd, PORT1 + 10);
try_0write("tcp_0write", fd[0]);
close_both(fd);
From owner-svn-src-user@freebsd.org Mon Jan 18 04:32:20 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FC40A86557
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Jan 2016 04:32:20 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 4E0CC154F;
Mon, 18 Jan 2016 04:32:20 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0I4WJA2008710;
Mon, 18 Jan 2016 04:32:19 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0I4WJYa008708;
Mon, 18 Jan 2016 04:32:19 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601180432.u0I4WJYa008708@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 18 Jan 2016 04:32:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294246 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2016 04:32:20 -0000
Author: ngie
Date: Mon Jan 18 04:32:19 2016
New Revision: 294246
URL: https://svnweb.freebsd.org/changeset/base/294246
Log:
Checkpoint work to bump WARNS to 6
Try to fix -Wcast-align issues by using bcopy to assign the values in
the structure.
The testcase fails more now, but it was failing prior to the change (1 vs
3 failures)
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile Mon Jan 18 04:24:43 2016 (r294245)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile Mon Jan 18 04:32:19 2016 (r294246)
@@ -2,6 +2,6 @@
PROG= unix_cmsg
MAN=
-WARNS?= 3
+WARNS?= 6
.include <bsd.prog.mk>
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:24:43 2016 (r294245)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:32:19 2016 (r294246)
@@ -1027,60 +1027,60 @@ check_xucred(const struct xucred *xucred
static int
check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
{
- const struct cmsgcred *cmsgcred;
+ struct cmsgcred cmsgcred;
- if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(*cmsgcred)) < 0)
+ if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(cmsgcred)) < 0)
return (-1);
- cmsgcred = (struct cmsgcred *)CMSG_DATA(cmsghdr);
+ bcopy(&cmsgcred, CMSG_DATA(cmsghdr), sizeof(struct cmsgcred));
- dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmsgcred->cmcred_pid);
- dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmsgcred->cmcred_uid);
- dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmsgcred->cmcred_euid);
- dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred->cmcred_gid);
- dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred->cmcred_ngroups);
+ dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmsgcred.cmcred_pid);
+ dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmsgcred.cmcred_uid);
+ dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmsgcred.cmcred_euid);
+ dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred.cmcred_gid);
+ dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred.cmcred_ngroups);
- if (cmsgcred->cmcred_pid != client_pid) {
+ if (cmsgcred.cmcred_pid != client_pid) {
logmsgx("cmsgcred.cmcred_pid %ld != %ld",
- (long)cmsgcred->cmcred_pid, (long)client_pid);
+ (long)cmsgcred.cmcred_pid, (long)client_pid);
return (-1);
}
- if (cmsgcred->cmcred_uid != proc_cred.uid) {
+ if (cmsgcred.cmcred_uid != proc_cred.uid) {
logmsgx("cmsgcred.cmcred_uid %lu != %lu",
- (u_long)cmsgcred->cmcred_uid, (u_long)proc_cred.uid);
+ (u_long)cmsgcred.cmcred_uid, (u_long)proc_cred.uid);
return (-1);
}
- if (cmsgcred->cmcred_euid != proc_cred.euid) {
+ if (cmsgcred.cmcred_euid != proc_cred.euid) {
logmsgx("cmsgcred.cmcred_euid %lu != %lu",
- (u_long)cmsgcred->cmcred_euid, (u_long)proc_cred.euid);
+ (u_long)cmsgcred.cmcred_euid, (u_long)proc_cred.euid);
return (-1);
}
- if (cmsgcred->cmcred_gid != proc_cred.gid) {
+ if (cmsgcred.cmcred_gid != proc_cred.gid) {
logmsgx("cmsgcred.cmcred_gid %lu != %lu",
- (u_long)cmsgcred->cmcred_gid, (u_long)proc_cred.gid);
+ (u_long)cmsgcred.cmcred_gid, (u_long)proc_cred.gid);
return (-1);
}
- if (cmsgcred->cmcred_ngroups == 0) {
+ if (cmsgcred.cmcred_ngroups == 0) {
logmsgx("cmsgcred.cmcred_ngroups == 0");
return (-1);
}
- if (cmsgcred->cmcred_ngroups < 0) {
+ if (cmsgcred.cmcred_ngroups < 0) {
logmsgx("cmsgcred.cmcred_ngroups %d < 0",
- cmsgcred->cmcred_ngroups);
+ cmsgcred.cmcred_ngroups);
return (-1);
}
- if (cmsgcred->cmcred_ngroups > CMGROUP_MAX) {
+ if (cmsgcred.cmcred_ngroups > CMGROUP_MAX) {
logmsgx("cmsgcred.cmcred_ngroups %d > %d",
- cmsgcred->cmcred_ngroups, CMGROUP_MAX);
+ cmsgcred.cmcred_ngroups, CMGROUP_MAX);
return (-1);
}
- if (cmsgcred->cmcred_groups[0] != proc_cred.egid) {
+ if (cmsgcred.cmcred_groups[0] != proc_cred.egid) {
logmsgx("cmsgcred.cmcred_groups[0] %lu != %lu (EGID)",
- (u_long)cmsgcred->cmcred_groups[0], (u_long)proc_cred.egid);
+ (u_long)cmsgcred.cmcred_groups[0], (u_long)proc_cred.egid);
return (-1);
}
- if (check_groups("cmsgcred.cmcred_groups", cmsgcred->cmcred_groups,
- "cmsgcred.cmcred_ngroups", cmsgcred->cmcred_ngroups, false) < 0)
+ if (check_groups("cmsgcred.cmcred_groups", cmsgcred.cmcred_groups,
+ "cmsgcred.cmcred_ngroups", cmsgcred.cmcred_ngroups, false) < 0)
return (-1);
return (0);
}
@@ -1088,56 +1088,56 @@ check_scm_creds_cmsgcred(struct cmsghdr
static int
check_scm_creds_sockcred(struct cmsghdr *cmsghdr)
{
- const struct sockcred *sockcred;
+ struct sockcred sockcred;
if (check_cmsghdr(cmsghdr, SCM_CREDS,
SOCKCREDSIZE(proc_cred.gid_num)) < 0)
return (-1);
- sockcred = (struct sockcred *)CMSG_DATA(cmsghdr);
+ bcopy(&sockcred, CMSG_DATA(cmsghdr), sizeof(sockcred));
- dbgmsg("sockcred.sc_uid %lu", (u_long)sockcred->sc_uid);
- dbgmsg("sockcred.sc_euid %lu", (u_long)sockcred->sc_euid);
- dbgmsg("sockcred.sc_gid %lu", (u_long)sockcred->sc_gid);
- dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred->sc_egid);
- dbgmsg("sockcred.sc_ngroups %d", sockcred->sc_ngroups);
+ dbgmsg("sockcred.sc_uid %lu", (u_long)sockcred.sc_uid);
+ dbgmsg("sockcred.sc_euid %lu", (u_long)sockcred.sc_euid);
+ dbgmsg("sockcred.sc_gid %lu", (u_long)sockcred.sc_gid);
+ dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred.sc_egid);
+ dbgmsg("sockcred.sc_ngroups %d", sockcred.sc_ngroups);
- if (sockcred->sc_uid != proc_cred.uid) {
+ if (sockcred.sc_uid != proc_cred.uid) {
logmsgx("sockcred.sc_uid %lu != %lu",
- (u_long)sockcred->sc_uid, (u_long)proc_cred.uid);
+ (u_long)sockcred.sc_uid, (u_long)proc_cred.uid);
return (-1);
}
- if (sockcred->sc_euid != proc_cred.euid) {
+ if (sockcred.sc_euid != proc_cred.euid) {
logmsgx("sockcred.sc_euid %lu != %lu",
- (u_long)sockcred->sc_euid, (u_long)proc_cred.euid);
+ (u_long)sockcred.sc_euid, (u_long)proc_cred.euid);
return (-1);
}
- if (sockcred->sc_gid != proc_cred.gid) {
+ if (sockcred.sc_gid != proc_cred.gid) {
logmsgx("sockcred.sc_gid %lu != %lu",
- (u_long)sockcred->sc_gid, (u_long)proc_cred.gid);
+ (u_long)sockcred.sc_gid, (u_long)proc_cred.gid);
return (-1);
}
- if (sockcred->sc_egid != proc_cred.egid) {
+ if (sockcred.sc_egid != proc_cred.egid) {
logmsgx("sockcred.sc_egid %lu != %lu",
- (u_long)sockcred->sc_egid, (u_long)proc_cred.egid);
+ (u_long)sockcred.sc_egid, (u_long)proc_cred.egid);
return (-1);
}
- if (sockcred->sc_ngroups == 0) {
+ if (sockcred.sc_ngroups == 0) {
logmsgx("sockcred.sc_ngroups == 0");
return (-1);
}
- if (sockcred->sc_ngroups < 0) {
+ if (sockcred.sc_ngroups < 0) {
logmsgx("sockcred.sc_ngroups %d < 0",
- sockcred->sc_ngroups);
+ sockcred.sc_ngroups);
return (-1);
}
- if (sockcred->sc_ngroups != proc_cred.gid_num) {
+ if (sockcred.sc_ngroups != proc_cred.gid_num) {
logmsgx("sockcred.sc_ngroups %d != %u",
- sockcred->sc_ngroups, proc_cred.gid_num);
+ sockcred.sc_ngroups, proc_cred.gid_num);
return (-1);
}
- if (check_groups("sockcred.sc_groups", sockcred->sc_groups,
- "sockcred.sc_ngroups", sockcred->sc_ngroups, true) < 0)
+ if (check_groups("sockcred.sc_groups", sockcred.sc_groups,
+ "sockcred.sc_ngroups", sockcred.sc_ngroups, true) < 0)
return (-1);
return (0);
}
@@ -1145,15 +1145,15 @@ check_scm_creds_sockcred(struct cmsghdr
static int
check_scm_timestamp(struct cmsghdr *cmsghdr)
{
- const struct timeval *timeval;
+ const struct timeval timeval;
if (check_cmsghdr(cmsghdr, SCM_TIMESTAMP, sizeof(struct timeval)) < 0)
return (-1);
- timeval = (struct timeval *)CMSG_DATA(cmsghdr);
+ bcopy(&timeval, CMSG_DATA(cmsghdr), sizeof(timeval));
dbgmsg("timeval.tv_sec %"PRIdMAX", timeval.tv_usec %"PRIdMAX,
- (intmax_t)timeval->tv_sec, (intmax_t)timeval->tv_usec);
+ (intmax_t)timeval.tv_sec, (intmax_t)timeval.tv_usec);
return (0);
}
@@ -1161,15 +1161,15 @@ check_scm_timestamp(struct cmsghdr *cmsg
static int
check_scm_bintime(struct cmsghdr *cmsghdr)
{
- const struct bintime *bintime;
+ const struct bintime bintime;
if (check_cmsghdr(cmsghdr, SCM_BINTIME, sizeof(struct bintime)) < 0)
return (-1);
- bintime = (struct bintime *)CMSG_DATA(cmsghdr);
+ bcopy(&bintime, CMSG_DATA(cmsghdr), sizeof(bintime));
dbgmsg("bintime.sec %"PRIdMAX", bintime.frac %"PRIu64,
- (intmax_t)bintime->sec, bintime->frac);
+ (intmax_t)bintime.sec, bintime.frac);
return (0);
}
From owner-svn-src-user@freebsd.org Mon Jan 18 04:41:13 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1589FA8687D
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Jan 2016 04:41:13 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 C810F181F;
Mon, 18 Jan 2016 04:41:12 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0I4fBC2011009;
Mon, 18 Jan 2016 04:41:11 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0I4fBs9011008;
Mon, 18 Jan 2016 04:41:11 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601180441.u0I4fBs9011008@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 18 Jan 2016 04:41:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294247 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2016 04:41:13 -0000
Author: ngie
Date: Mon Jan 18 04:41:11 2016
New Revision: 294247
URL: https://svnweb.freebsd.org/changeset/base/294247
Log:
Don't return immediately in check_xucred, check_scm_creds_cmsgcred, and
check_scm_creds_sockcred after initial != NULL checks have been done
This will provide potentially helpful data as to what all failed when
compared, not just the first thing that failed.
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:32:19 2016 (r294246)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:41:11 2016 (r294247)
@@ -980,6 +980,8 @@ check_groups(const char *gid_arr_str, co
static int
check_xucred(const struct xucred *xucred, socklen_t len)
{
+ int rc;
+
if (len != sizeof(*xucred)) {
logmsgx("option value size %zu != %zu",
(size_t)len, sizeof(*xucred));
@@ -990,44 +992,47 @@ check_xucred(const struct xucred *xucred
dbgmsg("xucred.cr_uid %lu", (u_long)xucred->cr_uid);
dbgmsg("xucred.cr_ngroups %d", xucred->cr_ngroups);
+ rc = 0;
+
if (xucred->cr_version != XUCRED_VERSION) {
logmsgx("xucred.cr_version %u != %d",
xucred->cr_version, XUCRED_VERSION);
- return (-1);
+ rc = -1;
}
if (xucred->cr_uid != proc_cred.euid) {
logmsgx("xucred.cr_uid %lu != %lu (EUID)",
(u_long)xucred->cr_uid, (u_long)proc_cred.euid);
- return (-1);
+ rc = -1;
}
if (xucred->cr_ngroups == 0) {
logmsgx("xucred.cr_ngroups == 0");
- return (-1);
+ rc = -1;
}
if (xucred->cr_ngroups < 0) {
logmsgx("xucred.cr_ngroups < 0");
- return (-1);
+ rc = -1;
}
if (xucred->cr_ngroups > XU_NGROUPS) {
logmsgx("xucred.cr_ngroups %hu > %u (max)",
xucred->cr_ngroups, XU_NGROUPS);
- return (-1);
+ rc = -1;
}
if (xucred->cr_groups[0] != proc_cred.egid) {
logmsgx("xucred.cr_groups[0] %lu != %lu (EGID)",
(u_long)xucred->cr_groups[0], (u_long)proc_cred.egid);
- return (-1);
+ rc = -1;
}
if (check_groups("xucred.cr_groups", xucred->cr_groups,
"xucred.cr_ngroups", xucred->cr_ngroups, false) < 0)
- return (-1);
- return (0);
+ rc = -1;
+ return (rc);
}
static int
check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
{
struct cmsgcred cmsgcred;
+ int rc;
if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(cmsgcred)) < 0)
return (-1);
@@ -1040,55 +1045,58 @@ check_scm_creds_cmsgcred(struct cmsghdr
dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred.cmcred_gid);
dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred.cmcred_ngroups);
+ rc = 0;
+
if (cmsgcred.cmcred_pid != client_pid) {
logmsgx("cmsgcred.cmcred_pid %ld != %ld",
(long)cmsgcred.cmcred_pid, (long)client_pid);
- return (-1);
+ rc = -1;
}
if (cmsgcred.cmcred_uid != proc_cred.uid) {
logmsgx("cmsgcred.cmcred_uid %lu != %lu",
(u_long)cmsgcred.cmcred_uid, (u_long)proc_cred.uid);
- return (-1);
+ rc = -1;
}
if (cmsgcred.cmcred_euid != proc_cred.euid) {
logmsgx("cmsgcred.cmcred_euid %lu != %lu",
(u_long)cmsgcred.cmcred_euid, (u_long)proc_cred.euid);
- return (-1);
+ rc = -1;
}
if (cmsgcred.cmcred_gid != proc_cred.gid) {
logmsgx("cmsgcred.cmcred_gid %lu != %lu",
(u_long)cmsgcred.cmcred_gid, (u_long)proc_cred.gid);
- return (-1);
+ rc = -1;
}
if (cmsgcred.cmcred_ngroups == 0) {
logmsgx("cmsgcred.cmcred_ngroups == 0");
- return (-1);
+ rc = -1;
}
if (cmsgcred.cmcred_ngroups < 0) {
logmsgx("cmsgcred.cmcred_ngroups %d < 0",
cmsgcred.cmcred_ngroups);
- return (-1);
+ rc = -1;
}
if (cmsgcred.cmcred_ngroups > CMGROUP_MAX) {
logmsgx("cmsgcred.cmcred_ngroups %d > %d",
cmsgcred.cmcred_ngroups, CMGROUP_MAX);
- return (-1);
+ rc = -1;
}
if (cmsgcred.cmcred_groups[0] != proc_cred.egid) {
logmsgx("cmsgcred.cmcred_groups[0] %lu != %lu (EGID)",
(u_long)cmsgcred.cmcred_groups[0], (u_long)proc_cred.egid);
- return (-1);
+ rc = -1;
}
if (check_groups("cmsgcred.cmcred_groups", cmsgcred.cmcred_groups,
"cmsgcred.cmcred_ngroups", cmsgcred.cmcred_ngroups, false) < 0)
- return (-1);
- return (0);
+ rc = -1;
+ return (rc);
}
static int
check_scm_creds_sockcred(struct cmsghdr *cmsghdr)
{
struct sockcred sockcred;
+ int rc;
if (check_cmsghdr(cmsghdr, SCM_CREDS,
SOCKCREDSIZE(proc_cred.gid_num)) < 0)
@@ -1102,44 +1110,46 @@ check_scm_creds_sockcred(struct cmsghdr
dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred.sc_egid);
dbgmsg("sockcred.sc_ngroups %d", sockcred.sc_ngroups);
+ rc = 0;
+
if (sockcred.sc_uid != proc_cred.uid) {
logmsgx("sockcred.sc_uid %lu != %lu",
(u_long)sockcred.sc_uid, (u_long)proc_cred.uid);
- return (-1);
+ rc = -1;
}
if (sockcred.sc_euid != proc_cred.euid) {
logmsgx("sockcred.sc_euid %lu != %lu",
(u_long)sockcred.sc_euid, (u_long)proc_cred.euid);
- return (-1);
+ rc = -1;
}
if (sockcred.sc_gid != proc_cred.gid) {
logmsgx("sockcred.sc_gid %lu != %lu",
(u_long)sockcred.sc_gid, (u_long)proc_cred.gid);
- return (-1);
+ rc = -1;
}
if (sockcred.sc_egid != proc_cred.egid) {
logmsgx("sockcred.sc_egid %lu != %lu",
(u_long)sockcred.sc_egid, (u_long)proc_cred.egid);
- return (-1);
+ rc = -1;
}
if (sockcred.sc_ngroups == 0) {
logmsgx("sockcred.sc_ngroups == 0");
- return (-1);
+ rc = -1;
}
if (sockcred.sc_ngroups < 0) {
logmsgx("sockcred.sc_ngroups %d < 0",
sockcred.sc_ngroups);
- return (-1);
+ rc = -1;
}
if (sockcred.sc_ngroups != proc_cred.gid_num) {
logmsgx("sockcred.sc_ngroups %d != %u",
sockcred.sc_ngroups, proc_cred.gid_num);
- return (-1);
+ rc = -1;
}
if (check_groups("sockcred.sc_groups", sockcred.sc_groups,
"sockcred.sc_ngroups", sockcred.sc_ngroups, true) < 0)
- return (-1);
- return (0);
+ rc = -1;
+ return (rc);
}
static int
From owner-svn-src-user@freebsd.org Mon Jan 18 05:34:36 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19697A8687D
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Jan 2016 05:34:36 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail107.syd.optusnet.com.au (mail107.syd.optusnet.com.au
[211.29.132.53])
by mx1.freebsd.org (Postfix) with ESMTP id B8FE31B02;
Mon, 18 Jan 2016 05:34:35 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au
(c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197])
by mail107.syd.optusnet.com.au (Postfix) with ESMTPS id 1DA29D40A3E;
Mon, 18 Jan 2016 16:13:15 +1100 (AEDT)
Date: Mon, 18 Jan 2016 16:13:15 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: Garrett Cooper <ngie@freebsd.org>
cc: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r294246 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
In-Reply-To: <201601180432.u0I4WJYa008708@repo.freebsd.org>
Message-ID: <20160118153831.K1354@besplex.bde.org>
References: <201601180432.u0I4WJYa008708@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.1 cv=cK4dyQqN c=1 sm=1 tr=0
a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=L9H7d07YOLsA:10
a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=JzwRw_2MAAAA:8 a=kj9zAlcOel0A:10
a=oZL5hqpM5VHBIK8RlYQA:9 a=CjuIK1q_8ugA:10
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2016 05:34:36 -0000
On Mon, 18 Jan 2016, Garrett Cooper wrote:
> Log:
> Checkpoint work to bump WARNS to 6
>
> Try to fix -Wcast-align issues by using bcopy to assign the values in
> the structure.
Using the standard memmove() instead of the BSD bcopy() might be considered
a style bug. However, this is a case where memmove() works better. The
compiler normally replaces it by __builtin_mmemove() which can be optimized
better for small fixed-size copies. On arches without strict alignment
requirements, this normally results in the same loads and stores that the
pointer hack would give.
However2, the kernel build environment is not normal, and changes
related to this give a mess of style bugs and negative optimizations
instead of the indended positive ones. Long ago, the style was broken
by changing some bcopy()s (mainly in networking code) to memcpy()s and
adding a fallback extern memcpy() for compilers that don't do the
optimization (mainly for the -O0 case). Before that, it was easier
to enforce the style by not supporting memcpy(). This was turned into
less than a style bug by adding -ffreestanding to CFLAGS (mainly to
fix the compiler replacing printf() by __builtin_printf() and turning
that into puts() in some cases). -ffreestanding is technically correct,
but it disables _all_ builtins. This made the changes to use
__builtin_memcpy() less than style bugs since the fallback memcpy()
didn't attempt to be optimal. However, it is more optimal than bcopy()
for small copies on some arches. No one cares about the lost builtins
since the optimizations that they give are tiny.
Later, many more mem*() functions were added, mainly to support contribed
software that doesn't follow BSD style. The result is a mess of different
styles in non-contrib'ed code too.
> ==============================================================================
> --- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:24:43 2016 (r294245)
> +++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:32:19 2016 (r294246)
> @@ -1027,60 +1027,60 @@ check_xucred(const struct xucred *xucred
> static int
> check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
> {
> - const struct cmsgcred *cmsgcred;
> + struct cmsgcred cmsgcred;
The changes fix many style bugs (pointer variables not spelled with
a p) but leave many others (verbose variable names).
> @@ -1145,15 +1145,15 @@ check_scm_creds_sockcred(struct cmsghdr
> static int
> check_scm_timestamp(struct cmsghdr *cmsghdr)
> {
> - const struct timeval *timeval;
> + const struct timeval timeval;
'timeval' is a bad enough name for a struct tag. 'timeval' is a worse
variable name since it is the same as the struct tag. The normal name
is 'tv'.
> @@ -1161,15 +1161,15 @@ check_scm_timestamp(struct cmsghdr *cmsg
> static int
> check_scm_bintime(struct cmsghdr *cmsghdr)
> {
> - const struct bintime *bintime;
> + const struct bintime bintime;
Names related to bintimes are generally worse than for timevals, starting
in the implementation not having prefixes in the struct member names.
Timespecs are in between. They have prefixes in the struct member names,
but POSIX broke these from ts_ to tv_.
Bruce
From owner-svn-src-user@freebsd.org Thu Jan 21 06:21:19 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52FBFA8B34C
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 21 Jan 2016 06:21:19 +0000 (UTC)
(envelope-from yaneurabeya@gmail.com)
Received: from mail-oi0-x234.google.com (mail-oi0-x234.google.com
[IPv6:2607:f8b0:4003:c06::234])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 156631CF6;
Thu, 21 Jan 2016 06:21:19 +0000 (UTC)
(envelope-from yaneurabeya@gmail.com)
Received: by mail-oi0-x234.google.com with SMTP id o124so20487039oia.3;
Wed, 20 Jan 2016 22:21:19 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=content-type:mime-version:subject:from:in-reply-to:date:cc
:content-transfer-encoding:message-id:references:to;
bh=JfTdtUhS6yU+tot3Fzkx9k32GrCBmQw1v1Mqc+unJkg=;
b=QzjG/MhTgujAhLAklFOSsNpaNoiMtPYeTw6SHSYXQ+PxAgxg0ot5edVyZcuvJp6B2L
IRmHJQtX+2AOtCx3B+61Q46THpQJb7YI0ZFOGHXx1QNYtETRdHXANIjIgYlMdNlxZ5BT
xJGBGT5AvGEja8M6uCADZq7ym6HtbG9rU61DsgsbUjzXg2moOF5kj+XC2zr58eUMCr7O
5CB8mtJHUzh77TD4TLmzZC0uxWyFXVXPeNMfU60wltkN7FYR6EJI1HS6L141IAQ7IAeG
BtBMiKRuNSLXR6MfSb+4mz1ol1dQxKjWdkU/+RyJVkiex1bsn2Ch/JI6Y6BekIjLbGzM
NwHQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:content-type:mime-version:subject:from
:in-reply-to:date:cc:content-transfer-encoding:message-id:references
:to; bh=JfTdtUhS6yU+tot3Fzkx9k32GrCBmQw1v1Mqc+unJkg=;
b=PiHNxmPpdJXXwYVfmrjDoH3AAFDPBy2EAIQavUCLWHKNWfeYD6ZDCxURxhs9NxMzOF
51P9pDRFhl1KZs6+1Z4jF21/SokNvHWPByiF3vw2zjfMDkoMC6dWFOiTTXhhUWOrcarN
3oeloRPypeN4Oi/7dAllB5FWEjOKd5M0SXB3xJ4odMUOEedF9vwTwpFlC4t6KZEPRK1C
b6LLb2dGGbPK2EasyOtxvk8/jgDG8YHMgNG2yxflEuDlh1b4r7kb/KaynJJ//4CUJWrD
atUR4uVYxSbn2xCe+82JfER5dEQNd0QCphpWc2WWbHlvuHfGJ2pHtz1jqnKqbDtLKOKH
iQIQ==
X-Gm-Message-State: ALoCoQn1aQVCVPU6fskCfO11YgIOWZCJRM9FusIkOy0aS+NUk2WiH/SEjoOa1PKUZ03gl2lMXIrBE0nBWoUsmp2cZEqXJ0R5Ig==
X-Received: by 10.202.73.67 with SMTP id w64mr29643867oia.84.1453357278278;
Wed, 20 Jan 2016 22:21:18 -0800 (PST)
Received: from ?IPv6:2601:601:800:126d:8d00:ce96:4479:35a1?
([2601:601:800:126d:8d00:ce96:4479:35a1])
by smtp.gmail.com with ESMTPSA id v142sm19837280oie.28.2016.01.20.22.21.16
(version=TLSv1/SSLv3 cipher=OTHER);
Wed, 20 Jan 2016 22:21:16 -0800 (PST)
Content-Type: text/plain; charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\))
Subject: Re: svn commit: r294246 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
From: NGie Cooper <yaneurabeya@gmail.com>
In-Reply-To: <20160118153831.K1354@besplex.bde.org>
Date: Wed, 20 Jan 2016 22:21:14 -0800
Cc: Garrett Cooper <ngie@freebsd.org>, src-committers@freebsd.org,
svn-src-user@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <347D22CE-6DDB-4AE9-879A-73743723B481@gmail.com>
References: <201601180432.u0I4WJYa008708@repo.freebsd.org>
<20160118153831.K1354@besplex.bde.org>
To: Bruce Evans <brde@optusnet.com.au>
X-Mailer: Apple Mail (2.2104)
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jan 2016 06:21:19 -0000
> On Jan 17, 2016, at 21:13, Bruce Evans <brde@optusnet.com.au> wrote:
>=20
> On Mon, 18 Jan 2016, Garrett Cooper wrote:
>=20
>> Log:
>> Checkpoint work to bump WARNS to 6
>>=20
>> Try to fix -Wcast-align issues by using bcopy to assign the values in
>> the structure.
>=20
> Using the standard memmove() instead of the BSD bcopy() might be =
considered
> a style bug. However, this is a case where memmove() works better. =
The
> compiler normally replaces it by __builtin_mmemove() which can be =
optimized
> better for small fixed-size copies. On arches without strict =
alignment
> requirements, this normally results in the same loads and stores that =
the
> pointer hack would give.
>=20
> However2, the kernel build environment is not normal, and changes
> related to this give a mess of style bugs and negative optimizations
> instead of the indended positive ones. Long ago, the style was broken
> by changing some bcopy()s (mainly in networking code) to memcpy()s and
> adding a fallback extern memcpy() for compilers that don't do the
> optimization (mainly for the -O0 case). Before that, it was easier
> to enforce the style by not supporting memcpy(). This was turned into
> less than a style bug by adding -ffreestanding to CFLAGS (mainly to
> fix the compiler replacing printf() by __builtin_printf() and turning
> that into puts() in some cases). -ffreestanding is technically =
correct,
> but it disables _all_ builtins. This made the changes to use
> __builtin_memcpy() less than style bugs since the fallback memcpy()
> didn't attempt to be optimal. However, it is more optimal than =
bcopy()
> for small copies on some arches. No one cares about the lost builtins
> since the optimizations that they give are tiny.
>=20
> Later, many more mem*() functions were added, mainly to support =
contribed
> software that doesn't follow BSD style. The result is a mess of =
different
> styles in non-contrib'ed code too.
I tried memmove and unfortunately it failed similar to bcopy. I think I =
need to do =E2=80=9Cdeeper copying=E2=80=9D in the structures to ensure =
that all of the fields are properly copied over in the bcopy, but I=E2=80=99=
ll look at what gdb says first.
>> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
>> --- =
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c =
Mon Jan 18 04:24:43 2016 (r294245)
>> +++ =
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c =
Mon Jan 18 04:32:19 2016 (r294246)
>> @@ -1027,60 +1027,60 @@ check_xucred(const struct xucred *xucred
>> static int
>> check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
>> {
>> - const struct cmsgcred *cmsgcred;
>> + struct cmsgcred cmsgcred;
>=20
> The changes fix many style bugs (pointer variables not spelled with
> a p) but leave many others (verbose variable names).
Agreed. I=E2=80=99ll fix this in the next commit.
>> @@ -1145,15 +1145,15 @@ check_scm_creds_sockcred(struct cmsghdr
>> static int
>> check_scm_timestamp(struct cmsghdr *cmsghdr)
>> {
>> - const struct timeval *timeval;
>> + const struct timeval timeval;
>=20
> 'timeval' is a bad enough name for a struct tag. 'timeval' is a worse
> variable name since it is the same as the struct tag. The normal name
> is 'tv=E2=80=99.
I agree in these cases. Unless it=E2=80=99s standard variable naming =
convention for C (rc/retval/rv being shorthand for =E2=80=9Creturn_value=E2=
=80=9D, etc), I try to stick with more verbose names to make the meaning =
of variables unambiguous. I agree though=E2=80=A6 the variable name =
`timeval` is not incredibly helpful to the reader...
>> @@ -1161,15 +1161,15 @@ check_scm_timestamp(struct cmsghdr *cmsg
>> static int
>> check_scm_bintime(struct cmsghdr *cmsghdr)
>> {
>> - const struct bintime *bintime;
>> + const struct bintime bintime;
>=20
> Names related to bintimes are generally worse than for timevals, =
starting
> in the implementation not having prefixes in the struct member names.
>=20
> Timespecs are in between. They have prefixes in the struct member =
names,
> but POSIX broke these from ts_ to tv_.
Thanks for the feedback!
-NGie=
From owner-svn-src-user@freebsd.org Thu Jan 21 07:59:45 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41C4CA8A920
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 21 Jan 2016 07:59:45 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 1F6791462;
Thu, 21 Jan 2016 07:59:45 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0L7xi9V024147;
Thu, 21 Jan 2016 07:59:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0L7xi2c024145;
Thu, 21 Jan 2016 07:59:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601210759.u0L7xi2c024145@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 21 Jan 2016 07:59:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294488 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jan 2016 07:59:45 -0000
Author: ngie
Date: Thu Jan 21 07:59:43 2016
New Revision: 294488
URL: https://svnweb.freebsd.org/changeset/base/294488
Log:
Restore the pointer hacks and reduce WARNS to 3 again
For some odd reason it's messing up the structure when using bcopy, so
assign directly using CMSG_DATA for the time being to unbreak the test
a bit less
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile Thu Jan 21 07:54:05 2016 (r294487)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile Thu Jan 21 07:59:43 2016 (r294488)
@@ -2,6 +2,6 @@
PROG= unix_cmsg
MAN=
-WARNS?= 6
+WARNS?= 3
.include <bsd.prog.mk>
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Thu Jan 21 07:54:05 2016 (r294487)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Thu Jan 21 07:59:43 2016 (r294488)
@@ -1031,63 +1031,63 @@ check_xucred(const struct xucred *xucred
static int
check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
{
- struct cmsgcred cmsgcred;
+ const struct cmsgcred *cmsgcred;
int rc;
- if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(cmsgcred)) < 0)
+ if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(*cmsgcred)) < 0)
return (-1);
- bcopy(&cmsgcred, CMSG_DATA(cmsghdr), sizeof(struct cmsgcred));
+ cmsgcred = (struct cmsgcred *)CMSG_DATA(cmsghdr);
- dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmsgcred.cmcred_pid);
- dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmsgcred.cmcred_uid);
- dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmsgcred.cmcred_euid);
- dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred.cmcred_gid);
- dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred.cmcred_ngroups);
+ dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmsgcred->cmcred_pid);
+ dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmsgcred->cmcred_uid);
+ dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmsgcred->cmcred_euid);
+ dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred->cmcred_gid);
+ dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred->cmcred_ngroups);
rc = 0;
- if (cmsgcred.cmcred_pid != client_pid) {
+ if (cmsgcred->cmcred_pid != client_pid) {
logmsgx("cmsgcred.cmcred_pid %ld != %ld",
- (long)cmsgcred.cmcred_pid, (long)client_pid);
+ (long)cmsgcred->cmcred_pid, (long)client_pid);
rc = -1;
}
- if (cmsgcred.cmcred_uid != proc_cred.uid) {
+ if (cmsgcred->cmcred_uid != proc_cred.uid) {
logmsgx("cmsgcred.cmcred_uid %lu != %lu",
- (u_long)cmsgcred.cmcred_uid, (u_long)proc_cred.uid);
+ (u_long)cmsgcred->cmcred_uid, (u_long)proc_cred.uid);
rc = -1;
}
- if (cmsgcred.cmcred_euid != proc_cred.euid) {
+ if (cmsgcred->cmcred_euid != proc_cred.euid) {
logmsgx("cmsgcred.cmcred_euid %lu != %lu",
- (u_long)cmsgcred.cmcred_euid, (u_long)proc_cred.euid);
+ (u_long)cmsgcred->cmcred_euid, (u_long)proc_cred.euid);
rc = -1;
}
- if (cmsgcred.cmcred_gid != proc_cred.gid) {
+ if (cmsgcred->cmcred_gid != proc_cred.gid) {
logmsgx("cmsgcred.cmcred_gid %lu != %lu",
- (u_long)cmsgcred.cmcred_gid, (u_long)proc_cred.gid);
+ (u_long)cmsgcred->cmcred_gid, (u_long)proc_cred.gid);
rc = -1;
}
- if (cmsgcred.cmcred_ngroups == 0) {
+ if (cmsgcred->cmcred_ngroups == 0) {
logmsgx("cmsgcred.cmcred_ngroups == 0");
rc = -1;
}
- if (cmsgcred.cmcred_ngroups < 0) {
+ if (cmsgcred->cmcred_ngroups < 0) {
logmsgx("cmsgcred.cmcred_ngroups %d < 0",
- cmsgcred.cmcred_ngroups);
+ cmsgcred->cmcred_ngroups);
rc = -1;
}
- if (cmsgcred.cmcred_ngroups > CMGROUP_MAX) {
+ if (cmsgcred->cmcred_ngroups > CMGROUP_MAX) {
logmsgx("cmsgcred.cmcred_ngroups %d > %d",
- cmsgcred.cmcred_ngroups, CMGROUP_MAX);
+ cmsgcred->cmcred_ngroups, CMGROUP_MAX);
rc = -1;
}
- if (cmsgcred.cmcred_groups[0] != proc_cred.egid) {
+ if (cmsgcred->cmcred_groups[0] != proc_cred.egid) {
logmsgx("cmsgcred.cmcred_groups[0] %lu != %lu (EGID)",
- (u_long)cmsgcred.cmcred_groups[0], (u_long)proc_cred.egid);
+ (u_long)cmsgcred->cmcred_groups[0], (u_long)proc_cred.egid);
rc = -1;
}
- if (check_groups("cmsgcred.cmcred_groups", cmsgcred.cmcred_groups,
- "cmsgcred.cmcred_ngroups", cmsgcred.cmcred_ngroups, false) < 0)
+ if (check_groups("cmsgcred.cmcred_groups", cmsgcred->cmcred_groups,
+ "cmsgcred.cmcred_ngroups", cmsgcred->cmcred_ngroups, false) < 0)
rc = -1;
return (rc);
}
@@ -1095,59 +1095,59 @@ check_scm_creds_cmsgcred(struct cmsghdr
static int
check_scm_creds_sockcred(struct cmsghdr *cmsghdr)
{
- struct sockcred sockcred;
+ const struct sockcred *sockcred;
int rc;
if (check_cmsghdr(cmsghdr, SCM_CREDS,
SOCKCREDSIZE(proc_cred.gid_num)) < 0)
return (-1);
- bcopy(&sockcred, CMSG_DATA(cmsghdr), sizeof(sockcred));
-
- dbgmsg("sockcred.sc_uid %lu", (u_long)sockcred.sc_uid);
- dbgmsg("sockcred.sc_euid %lu", (u_long)sockcred.sc_euid);
- dbgmsg("sockcred.sc_gid %lu", (u_long)sockcred.sc_gid);
- dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred.sc_egid);
- dbgmsg("sockcred.sc_ngroups %d", sockcred.sc_ngroups);
+ sockcred = (struct sockcred *)CMSG_DATA(cmsghdr);
rc = 0;
- if (sockcred.sc_uid != proc_cred.uid) {
+ dbgmsg("sockcred.sc_uid %lu", (u_long)sockcred->sc_uid);
+ dbgmsg("sockcred.sc_euid %lu", (u_long)sockcred->sc_euid);
+ dbgmsg("sockcred.sc_gid %lu", (u_long)sockcred->sc_gid);
+ dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred->sc_egid);
+ dbgmsg("sockcred.sc_ngroups %d", sockcred->sc_ngroups);
+
+ if (sockcred->sc_uid != proc_cred.uid) {
logmsgx("sockcred.sc_uid %lu != %lu",
- (u_long)sockcred.sc_uid, (u_long)proc_cred.uid);
+ (u_long)sockcred->sc_uid, (u_long)proc_cred.uid);
rc = -1;
}
- if (sockcred.sc_euid != proc_cred.euid) {
+ if (sockcred->sc_euid != proc_cred.euid) {
logmsgx("sockcred.sc_euid %lu != %lu",
- (u_long)sockcred.sc_euid, (u_long)proc_cred.euid);
+ (u_long)sockcred->sc_euid, (u_long)proc_cred.euid);
rc = -1;
}
- if (sockcred.sc_gid != proc_cred.gid) {
+ if (sockcred->sc_gid != proc_cred.gid) {
logmsgx("sockcred.sc_gid %lu != %lu",
- (u_long)sockcred.sc_gid, (u_long)proc_cred.gid);
+ (u_long)sockcred->sc_gid, (u_long)proc_cred.gid);
rc = -1;
}
- if (sockcred.sc_egid != proc_cred.egid) {
+ if (sockcred->sc_egid != proc_cred.egid) {
logmsgx("sockcred.sc_egid %lu != %lu",
- (u_long)sockcred.sc_egid, (u_long)proc_cred.egid);
+ (u_long)sockcred->sc_egid, (u_long)proc_cred.egid);
rc = -1;
}
- if (sockcred.sc_ngroups == 0) {
+ if (sockcred->sc_ngroups == 0) {
logmsgx("sockcred.sc_ngroups == 0");
rc = -1;
}
- if (sockcred.sc_ngroups < 0) {
+ if (sockcred->sc_ngroups < 0) {
logmsgx("sockcred.sc_ngroups %d < 0",
- sockcred.sc_ngroups);
+ sockcred->sc_ngroups);
rc = -1;
}
- if (sockcred.sc_ngroups != proc_cred.gid_num) {
+ if (sockcred->sc_ngroups != proc_cred.gid_num) {
logmsgx("sockcred.sc_ngroups %d != %u",
- sockcred.sc_ngroups, proc_cred.gid_num);
+ sockcred->sc_ngroups, proc_cred.gid_num);
rc = -1;
}
- if (check_groups("sockcred.sc_groups", sockcred.sc_groups,
- "sockcred.sc_ngroups", sockcred.sc_ngroups, true) < 0)
+ if (check_groups("sockcred.sc_groups", sockcred->sc_groups,
+ "sockcred.sc_ngroups", sockcred->sc_ngroups, true) < 0)
rc = -1;
return (rc);
}
@@ -1155,15 +1155,15 @@ check_scm_creds_sockcred(struct cmsghdr
static int
check_scm_timestamp(struct cmsghdr *cmsghdr)
{
- const struct timeval timeval;
+ const struct timeval *timeval;
if (check_cmsghdr(cmsghdr, SCM_TIMESTAMP, sizeof(struct timeval)) < 0)
return (-1);
- bcopy(&timeval, CMSG_DATA(cmsghdr), sizeof(timeval));
+ timeval = (struct timeval *)CMSG_DATA(cmsghdr);
dbgmsg("timeval.tv_sec %"PRIdMAX", timeval.tv_usec %"PRIdMAX,
- (intmax_t)timeval.tv_sec, (intmax_t)timeval.tv_usec);
+ (intmax_t)timeval->tv_sec, (intmax_t)timeval->tv_usec);
return (0);
}
@@ -1171,15 +1171,15 @@ check_scm_timestamp(struct cmsghdr *cmsg
static int
check_scm_bintime(struct cmsghdr *cmsghdr)
{
- const struct bintime bintime;
+ const struct bintime *bintime;
if (check_cmsghdr(cmsghdr, SCM_BINTIME, sizeof(struct bintime)) < 0)
return (-1);
- bcopy(&bintime, CMSG_DATA(cmsghdr), sizeof(bintime));
+ bintime = (struct bintime *)CMSG_DATA(cmsghdr);
dbgmsg("bintime.sec %"PRIdMAX", bintime.frac %"PRIu64,
- (intmax_t)bintime.sec, bintime.frac);
+ (intmax_t)bintime->sec, bintime->frac);
return (0);
}
From owner-svn-src-user@freebsd.org Thu Jan 21 10:35:52 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9895AA88FC3
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 21 Jan 2016 10:35:52 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from mail104.syd.optusnet.com.au (mail104.syd.optusnet.com.au
[211.29.132.246])
by mx1.freebsd.org (Postfix) with ESMTP id 5F9941E99;
Thu, 21 Jan 2016 10:35:51 +0000 (UTC)
(envelope-from brde@optusnet.com.au)
Received: from c211-30-166-197.carlnfd1.nsw.optusnet.com.au
(c211-30-166-197.carlnfd1.nsw.optusnet.com.au [211.30.166.197])
by mail104.syd.optusnet.com.au (Postfix) with ESMTPS id 55006428E56;
Thu, 21 Jan 2016 21:09:50 +1100 (AEDT)
Date: Thu, 21 Jan 2016 21:09:49 +1100 (EST)
From: Bruce Evans <brde@optusnet.com.au>
X-X-Sender: bde@besplex.bde.org
To: NGie Cooper <yaneurabeya@gmail.com>
cc: Bruce Evans <brde@optusnet.com.au>, Garrett Cooper <ngie@freebsd.org>,
src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r294246 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
In-Reply-To: <347D22CE-6DDB-4AE9-879A-73743723B481@gmail.com>
Message-ID: <20160121210556.H1101@besplex.bde.org>
References: <201601180432.u0I4WJYa008708@repo.freebsd.org>
<20160118153831.K1354@besplex.bde.org>
<347D22CE-6DDB-4AE9-879A-73743723B481@gmail.com>
MIME-Version: 1.0
X-Optus-CM-Score: 0
X-Optus-CM-Analysis: v=2.1 cv=cK4dyQqN c=1 sm=1 tr=0
a=KA6XNC2GZCFrdESI5ZmdjQ==:117 a=PO7r1zJSAAAA:8 a=L9H7d07YOLsA:10
a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=JzwRw_2MAAAA:8
a=nlC_4_pT8q9DhB4Ho9EA:9 a=BUn9Htn59E5Gw4Pbzb4A:9 a=45ClL6m2LaAA:10
Content-Type: TEXT/PLAIN; charset=X-UNKNOWN; format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jan 2016 10:35:52 -0000
On Wed, 20 Jan 2016, NGie Cooper wrote:
>> On Jan 17, 2016, at 21:13, Bruce Evans <brde@optusnet.com.au> wrote:
>>
>> On Mon, 18 Jan 2016, Garrett Cooper wrote:
>>
>>> Log:
>>> Checkpoint work to bump WARNS to 6
>>>
>>> Try to fix -Wcast-align issues by using bcopy to assign the values in
>>> the structure.
>>
>> Using the standard memmove() instead of the BSD bcopy() might be conside=
red
>> a style bug. However, this is a case where memmove() works better. The
> ...
> I tried memmove and unfortunately it failed similar to bcopy. I think I n=
eed to do =E2=80=9Cdeeper copying=E2=80=9D in the structures to ensure that=
all of the fields are properly copied over in the bcopy, but I=E2=80=99ll =
look at what gdb says first.
I didn't know that using bcopy didn't actually work. On x86 you should
expect it to not change the object code except for bugs in the conversion
or some complication which is hopefully localized.
Bruce
From owner-svn-src-user@freebsd.org Thu Jan 21 17:09:41 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 79FC7A8CEFC
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 21 Jan 2016 17:09:41 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 3206615FC;
Thu, 21 Jan 2016 17:09:41 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LH9eKw005275;
Thu, 21 Jan 2016 17:09:40 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LH9d7J005265;
Thu, 21 Jan 2016 17:09:39 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601211709.u0LH9d7J005265@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 21 Jan 2016 17:09:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294513 - in user/ngie/stable-10-libnv: contrib/less
contrib/netcat contrib/smbfs/lib/smb lib lib/libc/rpc lib/libc/string
lib/libc/tests/net lib/libstand lib/msun/tests sbin/mount shar...
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jan 2016 17:09:41 -0000
Author: ngie
Date: Thu Jan 21 17:09:38 2016
New Revision: 294513
URL: https://svnweb.freebsd.org/changeset/base/294513
Log:
MFstable/10 @ r294512
Added:
user/ngie/stable-10-libnv/contrib/less/compose.uni
- copied unchanged from r294512, stable/10/contrib/less/compose.uni
user/ngie/stable-10-libnv/contrib/less/mkutable
- copied unchanged from r294512, stable/10/contrib/less/mkutable
user/ngie/stable-10-libnv/contrib/less/ubin.uni
- copied unchanged from r294512, stable/10/contrib/less/ubin.uni
user/ngie/stable-10-libnv/contrib/less/wide.uni
- copied unchanged from r294512, stable/10/contrib/less/wide.uni
user/ngie/stable-10-libnv/lib/msun/tests/ctrig_test.c
- copied unchanged from r294512, stable/10/lib/msun/tests/ctrig_test.c
user/ngie/stable-10-libnv/lib/msun/tests/exponential_test.c
- copied unchanged from r294512, stable/10/lib/msun/tests/exponential_test.c
user/ngie/stable-10-libnv/lib/msun/tests/fma_test.c
- copied unchanged from r294512, stable/10/lib/msun/tests/fma_test.c
user/ngie/stable-10-libnv/lib/msun/tests/invtrig_test.c
- copied unchanged from r294512, stable/10/lib/msun/tests/invtrig_test.c
user/ngie/stable-10-libnv/lib/msun/tests/lround_test.c
- copied unchanged from r294512, stable/10/lib/msun/tests/lround_test.c
user/ngie/stable-10-libnv/lib/msun/tests/lround_test.t
- copied unchanged from r294512, stable/10/lib/msun/tests/lround_test.t
user/ngie/stable-10-libnv/lib/msun/tests/test-utils.h
- copied unchanged from r294512, stable/10/lib/msun/tests/test-utils.h
user/ngie/stable-10-libnv/sys/boot/i386/libi386/multiboot.c
- copied unchanged from r294512, stable/10/sys/boot/i386/libi386/multiboot.c
user/ngie/stable-10-libnv/sys/boot/i386/libi386/multiboot.h
- copied unchanged from r294512, stable/10/sys/boot/i386/libi386/multiboot.h
user/ngie/stable-10-libnv/sys/boot/i386/libi386/multiboot_tramp.S
- copied unchanged from r294512, stable/10/sys/boot/i386/libi386/multiboot_tramp.S
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_lic.c
- copied unchanged from r294512, stable/10/sys/dev/sfxge/common/efx_lic.c
user/ngie/stable-10-libnv/sys/modules/dtrace/systrace_linux/
- copied from r294512, stable/10/sys/modules/dtrace/systrace_linux/
user/ngie/stable-10-libnv/sys/x86/include/metadata.h
- copied unchanged from r294512, stable/10/sys/x86/include/metadata.h
user/ngie/stable-10-libnv/usr.bin/systat/sctp.c
- copied unchanged from r294512, stable/10/usr.bin/systat/sctp.c
Deleted:
user/ngie/stable-10-libnv/tools/regression/lib/msun/
Modified:
user/ngie/stable-10-libnv/contrib/less/LICENSE
user/ngie/stable-10-libnv/contrib/less/NEWS
user/ngie/stable-10-libnv/contrib/less/README
user/ngie/stable-10-libnv/contrib/less/brac.c
user/ngie/stable-10-libnv/contrib/less/ch.c
user/ngie/stable-10-libnv/contrib/less/charset.c
user/ngie/stable-10-libnv/contrib/less/charset.h
user/ngie/stable-10-libnv/contrib/less/cmd.h
user/ngie/stable-10-libnv/contrib/less/cmdbuf.c
user/ngie/stable-10-libnv/contrib/less/command.c
user/ngie/stable-10-libnv/contrib/less/cvt.c
user/ngie/stable-10-libnv/contrib/less/decode.c
user/ngie/stable-10-libnv/contrib/less/edit.c
user/ngie/stable-10-libnv/contrib/less/filename.c
user/ngie/stable-10-libnv/contrib/less/forwback.c
user/ngie/stable-10-libnv/contrib/less/funcs.h
user/ngie/stable-10-libnv/contrib/less/help.c
user/ngie/stable-10-libnv/contrib/less/ifile.c
user/ngie/stable-10-libnv/contrib/less/input.c
user/ngie/stable-10-libnv/contrib/less/jump.c
user/ngie/stable-10-libnv/contrib/less/less.h
user/ngie/stable-10-libnv/contrib/less/less.hlp
user/ngie/stable-10-libnv/contrib/less/less.nro
user/ngie/stable-10-libnv/contrib/less/lessecho.c
user/ngie/stable-10-libnv/contrib/less/lessecho.nro
user/ngie/stable-10-libnv/contrib/less/lesskey.c
user/ngie/stable-10-libnv/contrib/less/lesskey.h
user/ngie/stable-10-libnv/contrib/less/lesskey.nro
user/ngie/stable-10-libnv/contrib/less/lglob.h
user/ngie/stable-10-libnv/contrib/less/line.c
user/ngie/stable-10-libnv/contrib/less/linenum.c
user/ngie/stable-10-libnv/contrib/less/lsystem.c
user/ngie/stable-10-libnv/contrib/less/main.c
user/ngie/stable-10-libnv/contrib/less/mark.c
user/ngie/stable-10-libnv/contrib/less/mkhelp.c
user/ngie/stable-10-libnv/contrib/less/optfunc.c
user/ngie/stable-10-libnv/contrib/less/option.c
user/ngie/stable-10-libnv/contrib/less/option.h
user/ngie/stable-10-libnv/contrib/less/opttbl.c
user/ngie/stable-10-libnv/contrib/less/os.c
user/ngie/stable-10-libnv/contrib/less/output.c
user/ngie/stable-10-libnv/contrib/less/pattern.c
user/ngie/stable-10-libnv/contrib/less/pattern.h
user/ngie/stable-10-libnv/contrib/less/pckeys.h
user/ngie/stable-10-libnv/contrib/less/position.c
user/ngie/stable-10-libnv/contrib/less/position.h
user/ngie/stable-10-libnv/contrib/less/prompt.c
user/ngie/stable-10-libnv/contrib/less/regexp.c
user/ngie/stable-10-libnv/contrib/less/screen.c
user/ngie/stable-10-libnv/contrib/less/scrsize.c
user/ngie/stable-10-libnv/contrib/less/search.c
user/ngie/stable-10-libnv/contrib/less/signal.c
user/ngie/stable-10-libnv/contrib/less/tags.c
user/ngie/stable-10-libnv/contrib/less/ttyin.c
user/ngie/stable-10-libnv/contrib/less/version.c
user/ngie/stable-10-libnv/contrib/netcat/nc.1
user/ngie/stable-10-libnv/contrib/netcat/netcat.c
user/ngie/stable-10-libnv/contrib/netcat/socks.c
user/ngie/stable-10-libnv/contrib/smbfs/lib/smb/nb_name.c
user/ngie/stable-10-libnv/lib/Makefile
user/ngie/stable-10-libnv/lib/libc/rpc/rpc_soc.c
user/ngie/stable-10-libnv/lib/libc/rpc/rpcb_clnt.c
user/ngie/stable-10-libnv/lib/libc/rpc/rpcb_prot.c
user/ngie/stable-10-libnv/lib/libc/string/wcslcat.c
user/ngie/stable-10-libnv/lib/libc/string/wcsncat.c
user/ngie/stable-10-libnv/lib/libc/tests/net/Makefile
user/ngie/stable-10-libnv/lib/libstand/Makefile
user/ngie/stable-10-libnv/lib/libstand/bootp.c
user/ngie/stable-10-libnv/lib/msun/tests/Makefile
user/ngie/stable-10-libnv/sbin/mount/mount.c
user/ngie/stable-10-libnv/share/man/man4/sfxge.4
user/ngie/stable-10-libnv/share/man/man7/ascii.7
user/ngie/stable-10-libnv/share/man/man9/Makefile
user/ngie/stable-10-libnv/share/man/man9/pci.9
user/ngie/stable-10-libnv/share/misc/ascii (contents, props changed)
user/ngie/stable-10-libnv/sys/amd64/include/metadata.h
user/ngie/stable-10-libnv/sys/amd64/include/pcb.h
user/ngie/stable-10-libnv/sys/amd64/linux/linux_proto.h
user/ngie/stable-10-libnv/sys/amd64/linux/linux_syscall.h
user/ngie/stable-10-libnv/sys/amd64/linux/linux_syscalls.c
user/ngie/stable-10-libnv/sys/amd64/linux/linux_sysent.c
user/ngie/stable-10-libnv/sys/amd64/linux/linux_systrace_args.c
user/ngie/stable-10-libnv/sys/amd64/linux/syscalls.master
user/ngie/stable-10-libnv/sys/amd64/linux32/linux.h
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_locore.s
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_proto.h
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_syscall.h
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_syscalls.c
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysent.c
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_sysvec.c
user/ngie/stable-10-libnv/sys/amd64/linux32/syscalls.conf
user/ngie/stable-10-libnv/sys/amd64/linux32/syscalls.master
user/ngie/stable-10-libnv/sys/boot/common/bootstrap.h
user/ngie/stable-10-libnv/sys/boot/common/load_elf.c
user/ngie/stable-10-libnv/sys/boot/common/load_elf_obj.c
user/ngie/stable-10-libnv/sys/boot/common/module.c
user/ngie/stable-10-libnv/sys/boot/efi/boot1/Makefile
user/ngie/stable-10-libnv/sys/boot/efi/boot1/boot1.c
user/ngie/stable-10-libnv/sys/boot/efi/include/efierr.h
user/ngie/stable-10-libnv/sys/boot/efi/libefi/Makefile
user/ngie/stable-10-libnv/sys/boot/efi/libefi/efi_console.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/Makefile
user/ngie/stable-10-libnv/sys/boot/efi/loader/bootinfo.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/copy.c
user/ngie/stable-10-libnv/sys/boot/efi/loader/main.c
user/ngie/stable-10-libnv/sys/boot/fdt/fdt_loader_cmd.c
user/ngie/stable-10-libnv/sys/boot/ficl/amd64/sysdep.c
user/ngie/stable-10-libnv/sys/boot/forth/beastie.4th
user/ngie/stable-10-libnv/sys/boot/forth/beastie.4th.8
user/ngie/stable-10-libnv/sys/boot/forth/loader.4th
user/ngie/stable-10-libnv/sys/boot/forth/loader.conf.5
user/ngie/stable-10-libnv/sys/boot/forth/support.4th
user/ngie/stable-10-libnv/sys/boot/i386/libi386/Makefile
user/ngie/stable-10-libnv/sys/boot/i386/libi386/bootinfo64.c
user/ngie/stable-10-libnv/sys/boot/i386/libi386/elf64_freebsd.c
user/ngie/stable-10-libnv/sys/boot/i386/libi386/libi386.h
user/ngie/stable-10-libnv/sys/boot/i386/loader/conf.c
user/ngie/stable-10-libnv/sys/boot/i386/zfsboot/zfsboot.c
user/ngie/stable-10-libnv/sys/boot/ia64/efi/Makefile
user/ngie/stable-10-libnv/sys/boot/libstand32/Makefile
user/ngie/stable-10-libnv/sys/boot/pc98/boot2/boot2.c
user/ngie/stable-10-libnv/sys/boot/pc98/libpc98/biosdisk.c
user/ngie/stable-10-libnv/sys/boot/uboot/common/main.c
user/ngie/stable-10-libnv/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
user/ngie/stable-10-libnv/sys/cddl/dev/systrace/systrace.c
user/ngie/stable-10-libnv/sys/compat/linux/linux_misc.c
user/ngie/stable-10-libnv/sys/conf/files.amd64
user/ngie/stable-10-libnv/sys/dev/drm2/i915/intel_iic.c
user/ngie/stable-10-libnv/sys/dev/iicbus/iicbb.c
user/ngie/stable-10-libnv/sys/dev/iicbus/iicbus.c
user/ngie/stable-10-libnv/sys/dev/iicbus/iicoc.c
user/ngie/stable-10-libnv/sys/dev/iicbus/iicsmb.c
user/ngie/stable-10-libnv/sys/dev/pci/pci.c
user/ngie/stable-10-libnv/sys/dev/pci/pci_if.m
user/ngie/stable-10-libnv/sys/dev/pci/pci_private.h
user/ngie/stable-10-libnv/sys/dev/pci/pcireg.h
user/ngie/stable-10-libnv/sys/dev/pci/pcivar.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/ef10_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/ef10_tlv_layout.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efsys.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_check.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_mac.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_mcdi.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_mcdi.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_nic.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_nvram.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_phy.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_regs_ef10.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_rx.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_tx.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_vpd.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_ev.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_mac.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_mcdi.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_nic.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_nvram.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_phy.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_tx.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_vpd.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/medford_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/medford_nic.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_flash.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_mcdi.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_nic.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_nvram.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_vpd.c
user/ngie/stable-10-libnv/sys/dev/sfxge/sfxge.h
user/ngie/stable-10-libnv/sys/dev/sfxge/sfxge_tx.c
user/ngie/stable-10-libnv/sys/dev/sfxge/sfxge_tx.h
user/ngie/stable-10-libnv/sys/dev/sfxge/sfxge_version.h
user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2_bmap.c
user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2_extents.c
user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2_extents.h
user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2_vnops.c
user/ngie/stable-10-libnv/sys/fs/smbfs/smbfs_smb.c
user/ngie/stable-10-libnv/sys/fs/smbfs/smbfs_subr.h
user/ngie/stable-10-libnv/sys/fs/smbfs/smbfs_vnops.c
user/ngie/stable-10-libnv/sys/geom/geom_disk.c
user/ngie/stable-10-libnv/sys/i386/include/metadata.h
user/ngie/stable-10-libnv/sys/i386/include/pcb.h
user/ngie/stable-10-libnv/sys/kern/kern_linker.c
user/ngie/stable-10-libnv/sys/kern/kern_mib.c
user/ngie/stable-10-libnv/sys/kern/kern_proc.c
user/ngie/stable-10-libnv/sys/kern/makesyscalls.sh
user/ngie/stable-10-libnv/sys/mips/include/elf.h
user/ngie/stable-10-libnv/sys/modules/dtrace/Makefile
user/ngie/stable-10-libnv/sys/modules/dtrace/systrace_linux32/Makefile
user/ngie/stable-10-libnv/sys/modules/sfxge/Makefile
user/ngie/stable-10-libnv/sys/net/bpf.c
user/ngie/stable-10-libnv/sys/net/if.c
user/ngie/stable-10-libnv/sys/net/if_llatbl.c
user/ngie/stable-10-libnv/sys/netinet/tcp_subr.c
user/ngie/stable-10-libnv/sys/netinet6/in6.c
user/ngie/stable-10-libnv/sys/sys/elf32.h
user/ngie/stable-10-libnv/sys/sys/elf64.h
user/ngie/stable-10-libnv/sys/sys/elf_common.h
user/ngie/stable-10-libnv/sys/vm/vm_kern.c
user/ngie/stable-10-libnv/tools/regression/sockets/accf_data_attach/accf_data_attach.c
user/ngie/stable-10-libnv/tools/regression/sockets/reconnect/reconnect.c
user/ngie/stable-10-libnv/tools/regression/sockets/sendfile/sendfile.c
user/ngie/stable-10-libnv/tools/regression/sockets/so_setfib/so_setfib.c
user/ngie/stable-10-libnv/tools/regression/sockets/unix_gc/Makefile
user/ngie/stable-10-libnv/tools/regression/sockets/unix_gc/unix_gc.c
user/ngie/stable-10-libnv/tools/regression/sockets/zerosend/Makefile
user/ngie/stable-10-libnv/tools/regression/sockets/zerosend/zerosend.c
user/ngie/stable-10-libnv/usr.bin/elfdump/elfdump.c
user/ngie/stable-10-libnv/usr.bin/less/defines.h
user/ngie/stable-10-libnv/usr.bin/systat/Makefile
user/ngie/stable-10-libnv/usr.bin/systat/cmdtab.c
user/ngie/stable-10-libnv/usr.bin/systat/extern.h
user/ngie/stable-10-libnv/usr.bin/systat/systat.1
user/ngie/stable-10-libnv/usr.sbin/Makefile
user/ngie/stable-10-libnv/usr.sbin/Makefile.amd64
user/ngie/stable-10-libnv/usr.sbin/Makefile.arm
user/ngie/stable-10-libnv/usr.sbin/Makefile.i386
user/ngie/stable-10-libnv/usr.sbin/Makefile.ia64
user/ngie/stable-10-libnv/usr.sbin/Makefile.powerpc
user/ngie/stable-10-libnv/usr.sbin/Makefile.sparc64
user/ngie/stable-10-libnv/usr.sbin/bhyve/pci_virtio_net.c
user/ngie/stable-10-libnv/usr.sbin/boot0cfg/boot0cfg.c
user/ngie/stable-10-libnv/usr.sbin/bsdinstall/scripts/zfsboot
user/ngie/stable-10-libnv/usr.sbin/jail/command.c
user/ngie/stable-10-libnv/usr.sbin/jail/config.c
user/ngie/stable-10-libnv/usr.sbin/pciconf/pciconf.8
user/ngie/stable-10-libnv/usr.sbin/pciconf/pciconf.c
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
Modified: user/ngie/stable-10-libnv/contrib/less/LICENSE
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/LICENSE Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/LICENSE Thu Jan 21 17:09:38 2016 (r294513)
@@ -2,7 +2,7 @@
------------
Less
-Copyright (C) 1984-2012 Mark Nudelman
+Copyright (C) 1984-2015 Mark Nudelman
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Modified: user/ngie/stable-10-libnv/contrib/less/NEWS
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/NEWS Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/NEWS Thu Jan 21 17:09:38 2016 (r294513)
@@ -7,7 +7,44 @@
http://www.greenwoodsoftware.com/less
You can also download the latest version of less from there.
- To report bugs, suggestions or comments, send email to bug-less@gnu.org.
+ To report bugs, suggestions or comments, send email to bug-less@gnu.org
+
+======================================================================
+
+ Major changes between "less" versions 458 and 481
+
+* Don't overwrite history file; just append to it.
+
+* New command ESC-G goes to end of currently buffered data in a pipe.
+
+* Disable history feature when compiled with LESSHISTFILE set to "-".
+
+* In more-compatible mode, make the -p option apply to every file opened,
+ not just the first one.
+
+* In more-compatible mode, change the -e option to work like -E, not -EF.
+
+* Treat multiple CRs before LF are like one CR (all the CRs are hidden).
+
+* Allow "extra" string in lesskey file to append to a multi-char command
+ (like a search pattern), without executing the command.
+
+* Ignore -u/-U setting while viewing help file, so that
+ underline and bold chars are displayed correctly.
+
+* Improve detection of "binary" files in UTF-8 mode.
+
+* Fix bug with ++ commands.
+
+* Fix bug where prompt was sometimes not displayed with +G.
+
+* Fix possible memory corruption
+
+* Fix bugs and improve performance in ampersand filtering.
+
+* Automate construction of Unicode tables from Unicode database.
+
+* Allow %% escape sequence in LESSOPEN variable.
======================================================================
Modified: user/ngie/stable-10-libnv/contrib/less/README
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/README Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/README Thu Jan 21 17:09:38 2016 (r294513)
@@ -7,9 +7,9 @@
**************************************************************************
**************************************************************************
- Less, version 458
+ Less, version 481
- This is the distribution of less, version 458, released 04 Apr 2013.
+ This is the distribution of less, version 481, released 31 Aug 2015.
This program is part of the GNU project (http://www.gnu.org).
This program is free software. You may redistribute it and/or
@@ -53,8 +53,9 @@ INSTALLATION (Unix systems only):
Specifies the regular expression library used by less for pattern
matching. The default is "auto", which means the configure program
finds a regular expression library automatically. Other values are:
- posix Use the POSIX-compatible regcomp.
+ gnu Use the GNU regex library.
pcre Use the PCRE library.
+ posix Use the POSIX-compatible regcomp.
regcmp Use the regcmp library.
re_comp Use the re_comp library.
regcomp Use the V8-compatible regcomp.
Modified: user/ngie/stable-10-libnv/contrib/less/brac.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/brac.c Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/brac.c Thu Jan 21 17:09:38 2016 (r294513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2015 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Modified: user/ngie/stable-10-libnv/contrib/less/ch.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/ch.c Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/ch.c Thu Jan 21 17:09:38 2016 (r294513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2015 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -54,7 +54,7 @@ struct buf {
* The file state is maintained in a filestate structure.
* A pointer to the filestate is kept in the ifile structure.
*/
-#define BUFHASH_SIZE 64
+#define BUFHASH_SIZE 1024
struct filestate {
struct bufnode buflist;
struct bufnode hashtbl[BUFHASH_SIZE];
@@ -323,13 +323,16 @@ ch_get()
#if HAVE_STAT_INO
if (follow_mode == FOLLOW_NAME)
{
- /* See whether the file's i-number has changed.
+ /* See whether the file's i-number has changed,
+ * or the file has shrunk.
* If so, force the file to be closed and
* reopened. */
struct stat st;
+ POSITION curr_pos = ch_tell();
int r = stat(get_filename(curr_ifile), &st);
if (r == 0 && (st.st_ino != curr_ino ||
- st.st_dev != curr_dev))
+ st.st_dev != curr_dev ||
+ (curr_pos != NULL_POSITION && st.st_size < curr_pos)))
{
/* screen_trashed=2 causes
* make_display to reopen the file. */
@@ -536,6 +539,32 @@ ch_end_seek()
}
/*
+ * Seek to the last position in the file that is currently buffered.
+ */
+ public int
+ch_end_buffer_seek()
+{
+ register struct buf *bp;
+ register struct bufnode *bn;
+ POSITION buf_pos;
+ POSITION end_pos;
+
+ if (thisfile == NULL || (ch_flags & CH_CANSEEK))
+ return (ch_end_seek());
+
+ end_pos = 0;
+ FOR_BUFS(bn)
+ {
+ bp = bufnode_buf(bn);
+ buf_pos = (bp->block * LBUFSIZE) + bp->datasize;
+ if (buf_pos > end_pos)
+ end_pos = buf_pos;
+ }
+
+ return (ch_seek(end_pos));
+}
+
+/*
* Seek to the beginning of the file, or as close to it as we can get.
* We may not be able to seek there if input is a pipe and the
* beginning of the pipe is no longer buffered.
Modified: user/ngie/stable-10-libnv/contrib/less/charset.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/charset.c Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/charset.c Thu Jan 21 17:09:38 2016 (r294513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2015 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -466,36 +466,15 @@ prutfchar(ch)
else
SNPRINTF1(buf, sizeof(buf), binfmt, (char) ch);
} else if (is_ubin_char(ch))
+ {
SNPRINTF1(buf, sizeof(buf), utfbinfmt, ch);
- else
+ } else
{
- int len;
+ char *p = buf;
if (ch >= 0x80000000)
- {
- len = 3;
- ch = 0xFFFD;
- } else
- {
- len = (ch < 0x80) ? 1
- : (ch < 0x800) ? 2
- : (ch < 0x10000) ? 3
- : (ch < 0x200000) ? 4
- : (ch < 0x4000000) ? 5
- : 6;
- }
- buf[len] = '\0';
- if (len == 1)
- *buf = (char) ch;
- else
- {
- *buf = ((1 << len) - 1) << (8 - len);
- while (--len > 0)
- {
- buf[len] = (char) (0x80 | (ch & 0x3F));
- ch >>= 6;
- }
- *buf |= ch;
- }
+ ch = 0xFFFD; /* REPLACEMENT CHARACTER */
+ put_wchar(&p, ch);
+ *p = '\0';
}
return (buf);
}
@@ -524,11 +503,12 @@ utf_len(ch)
}
/*
- * Is a UTF-8 character well-formed?
+ * Does the parameter point to the lead byte of a well-formed UTF-8 character?
*/
public int
-is_utf8_well_formed(s)
+is_utf8_well_formed(s, slen)
unsigned char *s;
+ int slen;
{
int i;
int len;
@@ -537,6 +517,8 @@ is_utf8_well_formed(s)
return (0);
len = utf_len((char) s[0]);
+ if (len > slen)
+ return (0);
if (len == 1)
return (1);
if (len == 2)
@@ -558,6 +540,35 @@ is_utf8_well_formed(s)
}
/*
+ * Return number of invalid UTF-8 sequences found in a buffer.
+ */
+ public int
+utf_bin_count(data, len)
+ unsigned char *data;
+ int len;
+{
+ int bin_count = 0;
+ while (len > 0)
+ {
+ if (is_utf8_well_formed(data, len))
+ {
+ int clen = utf_len(*data);
+ data += clen;
+ len -= clen;
+ } else
+ {
+ /* Skip to next lead byte. */
+ bin_count++;
+ do {
+ ++data;
+ --len;
+ } while (len > 0 && !IS_UTF8_LEAD(*data));
+ }
+ }
+ return (bin_count);
+}
+
+/*
* Get the value of a UTF-8 character.
*/
public LWCHAR
@@ -706,411 +717,51 @@ step_char(pp, dir, limit)
/*
* Unicode characters data
+ * Actual data is in the generated *.uni files.
*/
-struct wchar_range { LWCHAR first, last; };
-/*
- * Characters with general category values
- * Mn: Mark, Nonspacing
- * Me: Mark, Enclosing
- * Last synched with
- * <http://www.unicode.org/Public/5.0.0/ucd/UnicodeData-5.0.0d7.txt>
- * dated 2005-11-30T00:58:48Z
- */
-static struct wchar_range comp_table[] = {
- { 0x0300, 0x036F} /* Mn */, { 0x0483, 0x0486} /* Mn */,
- { 0x0488, 0x0489} /* Me */,
- { 0x0591, 0x05BD} /* Mn */, { 0x05BF, 0x05BF} /* Mn */,
- { 0x05C1, 0x05C2} /* Mn */, { 0x05C4, 0x05C5} /* Mn */,
- { 0x05C7, 0x05C7} /* Mn */, { 0x0610, 0x0615} /* Mn */,
- { 0x064B, 0x065E} /* Mn */, { 0x0670, 0x0670} /* Mn */,
- { 0x06D6, 0x06DC} /* Mn */,
- { 0x06DE, 0x06DE} /* Me */,
- { 0x06DF, 0x06E4} /* Mn */, { 0x06E7, 0x06E8} /* Mn */,
- { 0x06EA, 0x06ED} /* Mn */, { 0x0711, 0x0711} /* Mn */,
- { 0x0730, 0x074A} /* Mn */, { 0x07A6, 0x07B0} /* Mn */,
- { 0x07EB, 0x07F3} /* Mn */, { 0x0901, 0x0902} /* Mn */,
- { 0x093C, 0x093C} /* Mn */, { 0x0941, 0x0948} /* Mn */,
- { 0x094D, 0x094D} /* Mn */, { 0x0951, 0x0954} /* Mn */,
- { 0x0962, 0x0963} /* Mn */, { 0x0981, 0x0981} /* Mn */,
- { 0x09BC, 0x09BC} /* Mn */, { 0x09C1, 0x09C4} /* Mn */,
- { 0x09CD, 0x09CD} /* Mn */, { 0x09E2, 0x09E3} /* Mn */,
- { 0x0A01, 0x0A02} /* Mn */, { 0x0A3C, 0x0A3C} /* Mn */,
- { 0x0A41, 0x0A42} /* Mn */, { 0x0A47, 0x0A48} /* Mn */,
- { 0x0A4B, 0x0A4D} /* Mn */, { 0x0A70, 0x0A71} /* Mn */,
- { 0x0A81, 0x0A82} /* Mn */, { 0x0ABC, 0x0ABC} /* Mn */,
- { 0x0AC1, 0x0AC5} /* Mn */, { 0x0AC7, 0x0AC8} /* Mn */,
- { 0x0ACD, 0x0ACD} /* Mn */, { 0x0AE2, 0x0AE3} /* Mn */,
- { 0x0B01, 0x0B01} /* Mn */, { 0x0B3C, 0x0B3C} /* Mn */,
- { 0x0B3F, 0x0B3F} /* Mn */, { 0x0B41, 0x0B43} /* Mn */,
- { 0x0B4D, 0x0B4D} /* Mn */, { 0x0B56, 0x0B56} /* Mn */,
- { 0x0B82, 0x0B82} /* Mn */, { 0x0BC0, 0x0BC0} /* Mn */,
- { 0x0BCD, 0x0BCD} /* Mn */, { 0x0C3E, 0x0C40} /* Mn */,
- { 0x0C46, 0x0C48} /* Mn */, { 0x0C4A, 0x0C4D} /* Mn */,
- { 0x0C55, 0x0C56} /* Mn */, { 0x0CBC, 0x0CBC} /* Mn */,
- { 0x0CBF, 0x0CBF} /* Mn */, { 0x0CC6, 0x0CC6} /* Mn */,
- { 0x0CCC, 0x0CCD} /* Mn */, { 0x0CE2, 0x0CE3} /* Mn */,
- { 0x0D41, 0x0D43} /* Mn */, { 0x0D4D, 0x0D4D} /* Mn */,
- { 0x0DCA, 0x0DCA} /* Mn */, { 0x0DD2, 0x0DD4} /* Mn */,
- { 0x0DD6, 0x0DD6} /* Mn */, { 0x0E31, 0x0E31} /* Mn */,
- { 0x0E34, 0x0E3A} /* Mn */, { 0x0E47, 0x0E4E} /* Mn */,
- { 0x0EB1, 0x0EB1} /* Mn */, { 0x0EB4, 0x0EB9} /* Mn */,
- { 0x0EBB, 0x0EBC} /* Mn */, { 0x0EC8, 0x0ECD} /* Mn */,
- { 0x0F18, 0x0F19} /* Mn */, { 0x0F35, 0x0F35} /* Mn */,
- { 0x0F37, 0x0F37} /* Mn */, { 0x0F39, 0x0F39} /* Mn */,
- { 0x0F71, 0x0F7E} /* Mn */, { 0x0F80, 0x0F84} /* Mn */,
- { 0x0F86, 0x0F87} /* Mn */, { 0x0F90, 0x0F97} /* Mn */,
- { 0x0F99, 0x0FBC} /* Mn */, { 0x0FC6, 0x0FC6} /* Mn */,
- { 0x102D, 0x1030} /* Mn */, { 0x1032, 0x1032} /* Mn */,
- { 0x1036, 0x1037} /* Mn */, { 0x1039, 0x1039} /* Mn */,
- { 0x1058, 0x1059} /* Mn */, { 0x135F, 0x135F} /* Mn */,
- { 0x1712, 0x1714} /* Mn */, { 0x1732, 0x1734} /* Mn */,
- { 0x1752, 0x1753} /* Mn */, { 0x1772, 0x1773} /* Mn */,
- { 0x17B7, 0x17BD} /* Mn */, { 0x17C6, 0x17C6} /* Mn */,
- { 0x17C9, 0x17D3} /* Mn */, { 0x17DD, 0x17DD} /* Mn */,
- { 0x180B, 0x180D} /* Mn */, { 0x18A9, 0x18A9} /* Mn */,
- { 0x1920, 0x1922} /* Mn */, { 0x1927, 0x1928} /* Mn */,
- { 0x1932, 0x1932} /* Mn */, { 0x1939, 0x193B} /* Mn */,
- { 0x1A17, 0x1A18} /* Mn */, { 0x1B00, 0x1B03} /* Mn */,
- { 0x1B34, 0x1B34} /* Mn */, { 0x1B36, 0x1B3A} /* Mn */,
- { 0x1B3C, 0x1B3C} /* Mn */, { 0x1B42, 0x1B42} /* Mn */,
- { 0x1B6B, 0x1B73} /* Mn */, { 0x1DC0, 0x1DCA} /* Mn */,
- { 0x1DFE, 0x1DFF} /* Mn */, { 0x20D0, 0x20DC} /* Mn */,
- { 0x20DD, 0x20E0} /* Me */,
- { 0x20E1, 0x20E1} /* Mn */,
- { 0x20E2, 0x20E4} /* Me */,
- { 0x20E5, 0x20EF} /* Mn */, { 0x302A, 0x302F} /* Mn */,
- { 0x3099, 0x309A} /* Mn */, { 0xA806, 0xA806} /* Mn */,
- { 0xA80B, 0xA80B} /* Mn */, { 0xA825, 0xA826} /* Mn */,
- { 0xFB1E, 0xFB1E} /* Mn */, { 0xFE00, 0xFE0F} /* Mn */,
- { 0xFE20, 0xFE23} /* Mn */, { 0x10A01, 0x10A03} /* Mn */,
- { 0x10A05, 0x10A06} /* Mn */, { 0x10A0C, 0x10A0F} /* Mn */,
- { 0x10A38, 0x10A3A} /* Mn */, { 0x10A3F, 0x10A3F} /* Mn */,
- { 0x1D167, 0x1D169} /* Mn */, { 0x1D17B, 0x1D182} /* Mn */,
- { 0x1D185, 0x1D18B} /* Mn */, { 0x1D1AA, 0x1D1AD} /* Mn */,
- { 0x1D242, 0x1D244} /* Mn */, { 0xE0100, 0xE01EF} /* Mn */,
-};
+#define DECLARE_RANGE_TABLE_START(name) \
+ static struct wchar_range name##_array[] = {
+#define DECLARE_RANGE_TABLE_END(name) \
+ }; struct wchar_range_table name##_table = { name##_array, sizeof(name##_array)/sizeof(*name##_array) };
-/*
- * Special pairs, not ranges.
- */
+DECLARE_RANGE_TABLE_START(compose)
+#include "compose.uni"
+DECLARE_RANGE_TABLE_END(compose)
+
+DECLARE_RANGE_TABLE_START(ubin)
+#include "ubin.uni"
+DECLARE_RANGE_TABLE_END(ubin)
+
+DECLARE_RANGE_TABLE_START(wide)
+#include "wide.uni"
+DECLARE_RANGE_TABLE_END(wide)
+
+/* comb_table is special pairs, not ranges. */
static struct wchar_range comb_table[] = {
{0x0644,0x0622}, {0x0644,0x0623}, {0x0644,0x0625}, {0x0644,0x0627},
};
-/*
- * Characters with general category values
- * Cc: Other, Control
- * Cf: Other, Format
- * Cs: Other, Surrogate
- * Co: Other, Private Use
- * Cn: Other, Not Assigned
- * Zl: Separator, Line
- * Zp: Separator, Paragraph
- * Last synched with
- * <http://www.unicode.org/Public/5.0.0/ucd/UnicodeData-5.0.0d7.txt>
- * dated 2005-11-30T00:58:48Z
- */
-static struct wchar_range ubin_table[] = {
- { 0x0000, 0x0007} /* Cc */,
- { 0x000B, 0x000C} /* Cc */,
- { 0x000E, 0x001A} /* Cc */,
- { 0x001C, 0x001F} /* Cc */,
- { 0x007F, 0x009F} /* Cc */,
-#if 0
- { 0x00AD, 0x00AD} /* Cf */,
-#endif
- { 0x0370, 0x0373} /* Cn */, { 0x0376, 0x0379} /* Cn */,
- { 0x037F, 0x0383} /* Cn */, { 0x038B, 0x038B} /* Cn */,
- { 0x038D, 0x038D} /* Cn */, { 0x03A2, 0x03A2} /* Cn */,
- { 0x03CF, 0x03CF} /* Cn */, { 0x0487, 0x0487} /* Cn */,
- { 0x0514, 0x0530} /* Cn */, { 0x0557, 0x0558} /* Cn */,
- { 0x0560, 0x0560} /* Cn */, { 0x0588, 0x0588} /* Cn */,
- { 0x058B, 0x0590} /* Cn */, { 0x05C8, 0x05CF} /* Cn */,
- { 0x05EB, 0x05EF} /* Cn */, { 0x05F5, 0x05FF} /* Cn */,
-#if 0
- { 0x0600, 0x0603} /* Cf */,
-#endif
- { 0x0604, 0x060A} /* Cn */, { 0x0616, 0x061A} /* Cn */,
- { 0x061C, 0x061D} /* Cn */, { 0x0620, 0x0620} /* Cn */,
- { 0x063B, 0x063F} /* Cn */, { 0x065F, 0x065F} /* Cn */,
-#if 0
- { 0x06DD, 0x06DD} /* Cf */,
-#endif
- { 0x070E, 0x070E} /* Cn */,
-#if 0
- { 0x070F, 0x070F} /* Cf */,
-#endif
- { 0x074B, 0x074C} /* Cn */, { 0x076E, 0x077F} /* Cn */,
- { 0x07B2, 0x07BF} /* Cn */, { 0x07FB, 0x0900} /* Cn */,
- { 0x093A, 0x093B} /* Cn */, { 0x094E, 0x094F} /* Cn */,
- { 0x0955, 0x0957} /* Cn */, { 0x0971, 0x097A} /* Cn */,
- { 0x0980, 0x0980} /* Cn */, { 0x0984, 0x0984} /* Cn */,
- { 0x098D, 0x098E} /* Cn */, { 0x0991, 0x0992} /* Cn */,
- { 0x09A9, 0x09A9} /* Cn */, { 0x09B1, 0x09B1} /* Cn */,
- { 0x09B3, 0x09B5} /* Cn */, { 0x09BA, 0x09BB} /* Cn */,
- { 0x09C5, 0x09C6} /* Cn */, { 0x09C9, 0x09CA} /* Cn */,
- { 0x09CF, 0x09D6} /* Cn */, { 0x09D8, 0x09DB} /* Cn */,
- { 0x09DE, 0x09DE} /* Cn */, { 0x09E4, 0x09E5} /* Cn */,
- { 0x09FB, 0x0A00} /* Cn */, { 0x0A04, 0x0A04} /* Cn */,
- { 0x0A0B, 0x0A0E} /* Cn */, { 0x0A11, 0x0A12} /* Cn */,
- { 0x0A29, 0x0A29} /* Cn */, { 0x0A31, 0x0A31} /* Cn */,
- { 0x0A34, 0x0A34} /* Cn */, { 0x0A37, 0x0A37} /* Cn */,
- { 0x0A3A, 0x0A3B} /* Cn */, { 0x0A3D, 0x0A3D} /* Cn */,
- { 0x0A43, 0x0A46} /* Cn */, { 0x0A49, 0x0A4A} /* Cn */,
- { 0x0A4E, 0x0A58} /* Cn */, { 0x0A5D, 0x0A5D} /* Cn */,
- { 0x0A5F, 0x0A65} /* Cn */, { 0x0A75, 0x0A80} /* Cn */,
- { 0x0A84, 0x0A84} /* Cn */, { 0x0A8E, 0x0A8E} /* Cn */,
- { 0x0A92, 0x0A92} /* Cn */, { 0x0AA9, 0x0AA9} /* Cn */,
- { 0x0AB1, 0x0AB1} /* Cn */, { 0x0AB4, 0x0AB4} /* Cn */,
- { 0x0ABA, 0x0ABB} /* Cn */, { 0x0AC6, 0x0AC6} /* Cn */,
- { 0x0ACA, 0x0ACA} /* Cn */, { 0x0ACE, 0x0ACF} /* Cn */,
- { 0x0AD1, 0x0ADF} /* Cn */, { 0x0AE4, 0x0AE5} /* Cn */,
- { 0x0AF0, 0x0AF0} /* Cn */, { 0x0AF2, 0x0B00} /* Cn */,
- { 0x0B04, 0x0B04} /* Cn */, { 0x0B0D, 0x0B0E} /* Cn */,
- { 0x0B11, 0x0B12} /* Cn */, { 0x0B29, 0x0B29} /* Cn */,
- { 0x0B31, 0x0B31} /* Cn */, { 0x0B34, 0x0B34} /* Cn */,
- { 0x0B3A, 0x0B3B} /* Cn */, { 0x0B44, 0x0B46} /* Cn */,
- { 0x0B49, 0x0B4A} /* Cn */, { 0x0B4E, 0x0B55} /* Cn */,
- { 0x0B58, 0x0B5B} /* Cn */, { 0x0B5E, 0x0B5E} /* Cn */,
- { 0x0B62, 0x0B65} /* Cn */, { 0x0B72, 0x0B81} /* Cn */,
- { 0x0B84, 0x0B84} /* Cn */, { 0x0B8B, 0x0B8D} /* Cn */,
- { 0x0B91, 0x0B91} /* Cn */, { 0x0B96, 0x0B98} /* Cn */,
- { 0x0B9B, 0x0B9B} /* Cn */, { 0x0B9D, 0x0B9D} /* Cn */,
- { 0x0BA0, 0x0BA2} /* Cn */, { 0x0BA5, 0x0BA7} /* Cn */,
- { 0x0BAB, 0x0BAD} /* Cn */, { 0x0BBA, 0x0BBD} /* Cn */,
- { 0x0BC3, 0x0BC5} /* Cn */, { 0x0BC9, 0x0BC9} /* Cn */,
- { 0x0BCE, 0x0BD6} /* Cn */, { 0x0BD8, 0x0BE5} /* Cn */,
- { 0x0BFB, 0x0C00} /* Cn */, { 0x0C04, 0x0C04} /* Cn */,
- { 0x0C0D, 0x0C0D} /* Cn */, { 0x0C11, 0x0C11} /* Cn */,
- { 0x0C29, 0x0C29} /* Cn */, { 0x0C34, 0x0C34} /* Cn */,
- { 0x0C3A, 0x0C3D} /* Cn */, { 0x0C45, 0x0C45} /* Cn */,
- { 0x0C49, 0x0C49} /* Cn */, { 0x0C4E, 0x0C54} /* Cn */,
- { 0x0C57, 0x0C5F} /* Cn */, { 0x0C62, 0x0C65} /* Cn */,
- { 0x0C70, 0x0C81} /* Cn */, { 0x0C84, 0x0C84} /* Cn */,
- { 0x0C8D, 0x0C8D} /* Cn */, { 0x0C91, 0x0C91} /* Cn */,
- { 0x0CA9, 0x0CA9} /* Cn */, { 0x0CB4, 0x0CB4} /* Cn */,
- { 0x0CBA, 0x0CBB} /* Cn */, { 0x0CC5, 0x0CC5} /* Cn */,
- { 0x0CC9, 0x0CC9} /* Cn */, { 0x0CCE, 0x0CD4} /* Cn */,
- { 0x0CD7, 0x0CDD} /* Cn */, { 0x0CDF, 0x0CDF} /* Cn */,
- { 0x0CE4, 0x0CE5} /* Cn */, { 0x0CF0, 0x0CF0} /* Cn */,
- { 0x0CF3, 0x0D01} /* Cn */, { 0x0D04, 0x0D04} /* Cn */,
- { 0x0D0D, 0x0D0D} /* Cn */, { 0x0D11, 0x0D11} /* Cn */,
- { 0x0D29, 0x0D29} /* Cn */, { 0x0D3A, 0x0D3D} /* Cn */,
- { 0x0D44, 0x0D45} /* Cn */, { 0x0D49, 0x0D49} /* Cn */,
- { 0x0D4E, 0x0D56} /* Cn */, { 0x0D58, 0x0D5F} /* Cn */,
- { 0x0D62, 0x0D65} /* Cn */, { 0x0D70, 0x0D81} /* Cn */,
- { 0x0D84, 0x0D84} /* Cn */, { 0x0D97, 0x0D99} /* Cn */,
- { 0x0DB2, 0x0DB2} /* Cn */, { 0x0DBC, 0x0DBC} /* Cn */,
- { 0x0DBE, 0x0DBF} /* Cn */, { 0x0DC7, 0x0DC9} /* Cn */,
- { 0x0DCB, 0x0DCE} /* Cn */, { 0x0DD5, 0x0DD5} /* Cn */,
- { 0x0DD7, 0x0DD7} /* Cn */, { 0x0DE0, 0x0DF1} /* Cn */,
- { 0x0DF5, 0x0E00} /* Cn */, { 0x0E3B, 0x0E3E} /* Cn */,
- { 0x0E5C, 0x0E80} /* Cn */, { 0x0E83, 0x0E83} /* Cn */,
- { 0x0E85, 0x0E86} /* Cn */, { 0x0E89, 0x0E89} /* Cn */,
- { 0x0E8B, 0x0E8C} /* Cn */, { 0x0E8E, 0x0E93} /* Cn */,
- { 0x0E98, 0x0E98} /* Cn */, { 0x0EA0, 0x0EA0} /* Cn */,
- { 0x0EA4, 0x0EA4} /* Cn */, { 0x0EA6, 0x0EA6} /* Cn */,
- { 0x0EA8, 0x0EA9} /* Cn */, { 0x0EAC, 0x0EAC} /* Cn */,
- { 0x0EBA, 0x0EBA} /* Cn */, { 0x0EBE, 0x0EBF} /* Cn */,
- { 0x0EC5, 0x0EC5} /* Cn */, { 0x0EC7, 0x0EC7} /* Cn */,
- { 0x0ECE, 0x0ECF} /* Cn */, { 0x0EDA, 0x0EDB} /* Cn */,
- { 0x0EDE, 0x0EFF} /* Cn */, { 0x0F48, 0x0F48} /* Cn */,
- { 0x0F6B, 0x0F70} /* Cn */, { 0x0F8C, 0x0F8F} /* Cn */,
- { 0x0F98, 0x0F98} /* Cn */, { 0x0FBD, 0x0FBD} /* Cn */,
- { 0x0FCD, 0x0FCE} /* Cn */, { 0x0FD2, 0x0FFF} /* Cn */,
- { 0x1022, 0x1022} /* Cn */, { 0x1028, 0x1028} /* Cn */,
- { 0x102B, 0x102B} /* Cn */, { 0x1033, 0x1035} /* Cn */,
- { 0x103A, 0x103F} /* Cn */, { 0x105A, 0x109F} /* Cn */,
- { 0x10C6, 0x10CF} /* Cn */, { 0x10FD, 0x10FF} /* Cn */,
- { 0x115A, 0x115E} /* Cn */, { 0x11A3, 0x11A7} /* Cn */,
- { 0x11FA, 0x11FF} /* Cn */, { 0x1249, 0x1249} /* Cn */,
- { 0x124E, 0x124F} /* Cn */, { 0x1257, 0x1257} /* Cn */,
- { 0x1259, 0x1259} /* Cn */, { 0x125E, 0x125F} /* Cn */,
- { 0x1289, 0x1289} /* Cn */, { 0x128E, 0x128F} /* Cn */,
- { 0x12B1, 0x12B1} /* Cn */, { 0x12B6, 0x12B7} /* Cn */,
- { 0x12BF, 0x12BF} /* Cn */, { 0x12C1, 0x12C1} /* Cn */,
- { 0x12C6, 0x12C7} /* Cn */, { 0x12D7, 0x12D7} /* Cn */,
- { 0x1311, 0x1311} /* Cn */, { 0x1316, 0x1317} /* Cn */,
- { 0x135B, 0x135E} /* Cn */, { 0x137D, 0x137F} /* Cn */,
- { 0x139A, 0x139F} /* Cn */, { 0x13F5, 0x1400} /* Cn */,
- { 0x1677, 0x167F} /* Cn */, { 0x169D, 0x169F} /* Cn */,
- { 0x16F1, 0x16FF} /* Cn */, { 0x170D, 0x170D} /* Cn */,
- { 0x1715, 0x171F} /* Cn */, { 0x1737, 0x173F} /* Cn */,
- { 0x1754, 0x175F} /* Cn */, { 0x176D, 0x176D} /* Cn */,
- { 0x1771, 0x1771} /* Cn */, { 0x1774, 0x177F} /* Cn */,
-#if 0
- { 0x17B4, 0x17B5} /* Cf */,
-#endif
- { 0x17DE, 0x17DF} /* Cn */, { 0x17EA, 0x17EF} /* Cn */,
- { 0x17FA, 0x17FF} /* Cn */, { 0x180F, 0x180F} /* Cn */,
- { 0x181A, 0x181F} /* Cn */, { 0x1878, 0x187F} /* Cn */,
- { 0x18AA, 0x18FF} /* Cn */, { 0x191D, 0x191F} /* Cn */,
- { 0x192C, 0x192F} /* Cn */, { 0x193C, 0x193F} /* Cn */,
- { 0x1941, 0x1943} /* Cn */, { 0x196E, 0x196F} /* Cn */,
- { 0x1975, 0x197F} /* Cn */, { 0x19AA, 0x19AF} /* Cn */,
- { 0x19CA, 0x19CF} /* Cn */, { 0x19DA, 0x19DD} /* Cn */,
- { 0x1A1C, 0x1A1D} /* Cn */, { 0x1A20, 0x1AFF} /* Cn */,
- { 0x1B4C, 0x1B4F} /* Cn */, { 0x1B7D, 0x1CFF} /* Cn */,
- { 0x1DCB, 0x1DFD} /* Cn */, { 0x1E9C, 0x1E9F} /* Cn */,
- { 0x1EFA, 0x1EFF} /* Cn */, { 0x1F16, 0x1F17} /* Cn */,
- { 0x1F1E, 0x1F1F} /* Cn */, { 0x1F46, 0x1F47} /* Cn */,
- { 0x1F4E, 0x1F4F} /* Cn */, { 0x1F58, 0x1F58} /* Cn */,
- { 0x1F5A, 0x1F5A} /* Cn */, { 0x1F5C, 0x1F5C} /* Cn */,
- { 0x1F5E, 0x1F5E} /* Cn */, { 0x1F7E, 0x1F7F} /* Cn */,
- { 0x1FB5, 0x1FB5} /* Cn */, { 0x1FC5, 0x1FC5} /* Cn */,
- { 0x1FD4, 0x1FD5} /* Cn */, { 0x1FDC, 0x1FDC} /* Cn */,
- { 0x1FF0, 0x1FF1} /* Cn */, { 0x1FF5, 0x1FF5} /* Cn */,
- { 0x1FFF, 0x1FFF} /* Cn */,
- { 0x200B, 0x200F} /* Cf */,
- { 0x2028, 0x2028} /* Zl */,
- { 0x2029, 0x2029} /* Zp */,
- { 0x202A, 0x202E} /* Cf */,
- { 0x2060, 0x2063} /* Cf */,
- { 0x2064, 0x2069} /* Cn */,
- { 0x206A, 0x206F} /* Cf */,
- { 0x2072, 0x2073} /* Cn */, { 0x208F, 0x208F} /* Cn */,
- { 0x2095, 0x209F} /* Cn */, { 0x20B6, 0x20CF} /* Cn */,
- { 0x20F0, 0x20FF} /* Cn */, { 0x214F, 0x2152} /* Cn */,
- { 0x2185, 0x218F} /* Cn */, { 0x23E8, 0x23FF} /* Cn */,
- { 0x2427, 0x243F} /* Cn */, { 0x244B, 0x245F} /* Cn */,
- { 0x269D, 0x269F} /* Cn */, { 0x26B3, 0x2700} /* Cn */,
- { 0x2705, 0x2705} /* Cn */, { 0x270A, 0x270B} /* Cn */,
- { 0x2728, 0x2728} /* Cn */, { 0x274C, 0x274C} /* Cn */,
- { 0x274E, 0x274E} /* Cn */, { 0x2753, 0x2755} /* Cn */,
- { 0x2757, 0x2757} /* Cn */, { 0x275F, 0x2760} /* Cn */,
- { 0x2795, 0x2797} /* Cn */, { 0x27B0, 0x27B0} /* Cn */,
- { 0x27BF, 0x27BF} /* Cn */, { 0x27CB, 0x27CF} /* Cn */,
- { 0x27EC, 0x27EF} /* Cn */, { 0x2B1B, 0x2B1F} /* Cn */,
- { 0x2B24, 0x2BFF} /* Cn */, { 0x2C2F, 0x2C2F} /* Cn */,
- { 0x2C5F, 0x2C5F} /* Cn */, { 0x2C6D, 0x2C73} /* Cn */,
- { 0x2C78, 0x2C7F} /* Cn */, { 0x2CEB, 0x2CF8} /* Cn */,
- { 0x2D26, 0x2D2F} /* Cn */, { 0x2D66, 0x2D6E} /* Cn */,
- { 0x2D70, 0x2D7F} /* Cn */, { 0x2D97, 0x2D9F} /* Cn */,
- { 0x2DA7, 0x2DA7} /* Cn */, { 0x2DAF, 0x2DAF} /* Cn */,
- { 0x2DB7, 0x2DB7} /* Cn */, { 0x2DBF, 0x2DBF} /* Cn */,
- { 0x2DC7, 0x2DC7} /* Cn */, { 0x2DCF, 0x2DCF} /* Cn */,
- { 0x2DD7, 0x2DD7} /* Cn */, { 0x2DDF, 0x2DFF} /* Cn */,
- { 0x2E18, 0x2E1B} /* Cn */, { 0x2E1E, 0x2E7F} /* Cn */,
- { 0x2E9A, 0x2E9A} /* Cn */, { 0x2EF4, 0x2EFF} /* Cn */,
- { 0x2FD6, 0x2FEF} /* Cn */, { 0x2FFC, 0x2FFF} /* Cn */,
- { 0x3040, 0x3040} /* Cn */, { 0x3097, 0x3098} /* Cn */,
- { 0x3100, 0x3104} /* Cn */, { 0x312D, 0x3130} /* Cn */,
- { 0x318F, 0x318F} /* Cn */, { 0x31B8, 0x31BF} /* Cn */,
- { 0x31D0, 0x31EF} /* Cn */, { 0x321F, 0x321F} /* Cn */,
- { 0x3244, 0x324F} /* Cn */, { 0x32FF, 0x32FF} /* Cn */,
- { 0x4DB6, 0x4DBF} /* Cn */, { 0x9FBC, 0x9FFF} /* Cn */,
- { 0xA48D, 0xA48F} /* Cn */, { 0xA4C7, 0xA6FF} /* Cn */,
- { 0xA71B, 0xA71F} /* Cn */, { 0xA722, 0xA7FF} /* Cn */,
- { 0xA82C, 0xA83F} /* Cn */, { 0xA878, 0xABFF} /* Cn */,
- { 0xD7A4, 0xD7FF} /* Cn */,
- { 0xD800, 0xDFFF} /* Cs */,
- { 0xE000, 0xF8FF} /* Co */,
- { 0xFA2E, 0xFA2F} /* Cn */, { 0xFA6B, 0xFA6F} /* Cn */,
- { 0xFADA, 0xFAFF} /* Cn */, { 0xFB07, 0xFB12} /* Cn */,
- { 0xFB18, 0xFB1C} /* Cn */, { 0xFB37, 0xFB37} /* Cn */,
- { 0xFB3D, 0xFB3D} /* Cn */, { 0xFB3F, 0xFB3F} /* Cn */,
- { 0xFB42, 0xFB42} /* Cn */, { 0xFB45, 0xFB45} /* Cn */,
- { 0xFBB2, 0xFBD2} /* Cn */, { 0xFD40, 0xFD4F} /* Cn */,
- { 0xFD90, 0xFD91} /* Cn */, { 0xFDC8, 0xFDEF} /* Cn */,
- { 0xFDFE, 0xFDFF} /* Cn */, { 0xFE1A, 0xFE1F} /* Cn */,
- { 0xFE24, 0xFE2F} /* Cn */, { 0xFE53, 0xFE53} /* Cn */,
- { 0xFE67, 0xFE67} /* Cn */, { 0xFE6C, 0xFE6F} /* Cn */,
- { 0xFE75, 0xFE75} /* Cn */, { 0xFEFD, 0xFEFE} /* Cn */,
- { 0xFEFF, 0xFEFF} /* Cf */,
- { 0xFF00, 0xFF00} /* Cn */, { 0xFFBF, 0xFFC1} /* Cn */,
- { 0xFFC8, 0xFFC9} /* Cn */, { 0xFFD0, 0xFFD1} /* Cn */,
- { 0xFFD8, 0xFFD9} /* Cn */, { 0xFFDD, 0xFFDF} /* Cn */,
- { 0xFFE7, 0xFFE7} /* Cn */, { 0xFFEF, 0xFFF8} /* Cn */,
- { 0xFFF9, 0xFFFB} /* Cf */,
- { 0xFFFE, 0xFFFF} /* Cn */, { 0x1000C, 0x1000C} /* Cn */,
- { 0x10027, 0x10027} /* Cn */, { 0x1003B, 0x1003B} /* Cn */,
- { 0x1003E, 0x1003E} /* Cn */, { 0x1004E, 0x1004F} /* Cn */,
- { 0x1005E, 0x1007F} /* Cn */, { 0x100FB, 0x100FF} /* Cn */,
- { 0x10103, 0x10106} /* Cn */, { 0x10134, 0x10136} /* Cn */,
- { 0x1018B, 0x102FF} /* Cn */, { 0x1031F, 0x1031F} /* Cn */,
- { 0x10324, 0x1032F} /* Cn */, { 0x1034B, 0x1037F} /* Cn */,
- { 0x1039E, 0x1039E} /* Cn */, { 0x103C4, 0x103C7} /* Cn */,
- { 0x103D6, 0x103FF} /* Cn */,
- { 0x1049E, 0x1049F} /* Cn */, { 0x104AA, 0x107FF} /* Cn */,
- { 0x10806, 0x10807} /* Cn */, { 0x10809, 0x10809} /* Cn */,
- { 0x10836, 0x10836} /* Cn */, { 0x10839, 0x1083B} /* Cn */,
- { 0x1083D, 0x1083E} /* Cn */, { 0x10840, 0x108FF} /* Cn */,
- { 0x1091A, 0x1091E} /* Cn */, { 0x10920, 0x109FF} /* Cn */,
- { 0x10A04, 0x10A04} /* Cn */, { 0x10A07, 0x10A0B} /* Cn */,
- { 0x10A14, 0x10A14} /* Cn */, { 0x10A18, 0x10A18} /* Cn */,
- { 0x10A34, 0x10A37} /* Cn */, { 0x10A3B, 0x10A3E} /* Cn */,
- { 0x10A48, 0x10A4F} /* Cn */, { 0x10A59, 0x11FFF} /* Cn */,
- { 0x1236F, 0x123FF} /* Cn */, { 0x12463, 0x1246F} /* Cn */,
- { 0x12474, 0x1CFFF} /* Cn */, { 0x1D0F6, 0x1D0FF} /* Cn */,
- { 0x1D127, 0x1D129} /* Cn */,
- { 0x1D173, 0x1D17A} /* Cf */,
- { 0x1D1DE, 0x1D1FF} /* Cn */, { 0x1D246, 0x1D2FF} /* Cn */,
- { 0x1D357, 0x1D35F} /* Cn */, { 0x1D372, 0x1D3FF} /* Cn */,
- { 0x1D455, 0x1D455} /* Cn */, { 0x1D49D, 0x1D49D} /* Cn */,
- { 0x1D4A0, 0x1D4A1} /* Cn */, { 0x1D4A3, 0x1D4A4} /* Cn */,
- { 0x1D4A7, 0x1D4A8} /* Cn */, { 0x1D4AD, 0x1D4AD} /* Cn */,
- { 0x1D4BA, 0x1D4BA} /* Cn */, { 0x1D4BC, 0x1D4BC} /* Cn */,
- { 0x1D4C4, 0x1D4C4} /* Cn */, { 0x1D506, 0x1D506} /* Cn */,
- { 0x1D50B, 0x1D50C} /* Cn */, { 0x1D515, 0x1D515} /* Cn */,
- { 0x1D51D, 0x1D51D} /* Cn */, { 0x1D53A, 0x1D53A} /* Cn */,
- { 0x1D53F, 0x1D53F} /* Cn */, { 0x1D545, 0x1D545} /* Cn */,
- { 0x1D547, 0x1D549} /* Cn */, { 0x1D551, 0x1D551} /* Cn */,
- { 0x1D6A6, 0x1D6A7} /* Cn */, { 0x1D7CC, 0x1D7CD} /* Cn */,
- { 0x1D800, 0x1FFFF} /* Cn */, { 0x2A6D7, 0x2F7FF} /* Cn */,
- { 0x2FA1E, 0xE0000} /* Cn */,
- { 0xE0001, 0xE0001} /* Cf */,
- { 0xE0002, 0xE001F} /* Cn */,
- { 0xE0020, 0xE007F} /* Cf */,
- { 0xE0080, 0xE00FF} /* Cn */, { 0xE01F0, 0xEFFFF} /* Cn */,
- { 0xF0000, 0xFFFFD} /* Co */,
- { 0xFFFFE, 0xFFFFF} /* Cn */,
- {0x100000,0x10FFFD} /* Co */,
- {0x10FFFE,0x10FFFF} /* Cn */,
- {0x110000,0x7FFFFFFF} /* ISO 10646?? */
-};
-
-/*
- * Double width characters
- * W: East Asian Wide
- * F: East Asian Full-width
- * Unassigned code points may be included when they allow ranges to be merged.
- * Last synched with
- * <http://www.unicode.org/Public/5.0.0/ucd/EastAsianWidth-5.0.0d2.txt>
- * dated 2005-11-08T01:32:56Z
- */
-static struct wchar_range wide_table[] = {
- { 0x1100, 0x115F} /* W */, { 0x2329, 0x232A} /* W */,
- { 0x2E80, 0x2FFB} /* W */,
- { 0x3000, 0x3000} /* F */,
- { 0x3001, 0x303E} /* W */, { 0x3041, 0x4DB5} /* W */,
- { 0x4E00, 0x9FBB} /* W */, { 0xA000, 0xA4C6} /* W */,
- { 0xAC00, 0xD7A3} /* W */, { 0xF900, 0xFAD9} /* W */,
- { 0xFE10, 0xFE19} /* W */, { 0xFE30, 0xFE6B} /* W */,
- { 0xFF01, 0xFF60} /* F */, { 0xFFE0, 0xFFE6} /* F */,
- { 0x20000, 0x2FFFD} /* W */, { 0x30000, 0x3FFFD} /* W */,
-};
static int
-is_in_table(ch, table, tsize)
+is_in_table(ch, table)
LWCHAR ch;
- struct wchar_range table[];
- int tsize;
+ struct wchar_range_table *table;
{
int hi;
int lo;
/* Binary search in the table. */
- if (ch < table[0].first)
+ if (ch < table->table[0].first)
return 0;
lo = 0;
- hi = tsize - 1;
+ hi = table->count - 1;
while (lo <= hi)
{
int mid = (lo + hi) / 2;
- if (ch > table[mid].last)
+ if (ch > table->table[mid].last)
lo = mid + 1;
- else if (ch < table[mid].first)
+ else if (ch < table->table[mid].first)
hi = mid - 1;
else
return 1;
@@ -1126,7 +777,7 @@ is_in_table(ch, table, tsize)
is_composing_char(ch)
LWCHAR ch;
{
- return is_in_table(ch, comp_table, (sizeof(comp_table) / sizeof(*comp_table)));
+ return is_in_table(ch, &compose_table);
}
/*
@@ -1136,7 +787,7 @@ is_composing_char(ch)
is_ubin_char(ch)
LWCHAR ch;
{
- return is_in_table(ch, ubin_table, (sizeof(ubin_table) / sizeof(*ubin_table)));
+ return is_in_table(ch, &ubin_table);
}
/*
@@ -1146,7 +797,7 @@ is_ubin_char(ch)
is_wide_char(ch)
LWCHAR ch;
{
- return is_in_table(ch, wide_table, (sizeof(wide_table) / sizeof(*wide_table)));
+ return is_in_table(ch, &wide_table);
}
/*
Modified: user/ngie/stable-10-libnv/contrib/less/charset.h
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/charset.h Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/charset.h Thu Jan 21 17:09:38 2016 (r294513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2015 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
Modified: user/ngie/stable-10-libnv/contrib/less/cmd.h
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/cmd.h Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/cmd.h Thu Jan 21 17:09:38 2016 (r294513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2015 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -66,6 +66,7 @@
#define A_PREV_TAG 54
#define A_FILTER 55
#define A_F_UNTIL_HILITE 56
+#define A_GOEND_BUF 57
#define A_INVALID 100
#define A_NOACTION 101
Modified: user/ngie/stable-10-libnv/contrib/less/cmdbuf.c
==============================================================================
--- user/ngie/stable-10-libnv/contrib/less/cmdbuf.c Thu Jan 21 16:50:16 2016 (r294512)
+++ user/ngie/stable-10-libnv/contrib/less/cmdbuf.c Thu Jan 21 17:09:38 2016 (r294513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2012 Mark Nudelman
+ * Copyright (C) 1984-2015 Mark Nudelman
*
* You may distribute under the terms of either the GNU General Public
* License or the Less License, as specified in the README file.
@@ -203,7 +203,7 @@ cmd_step_common(p, ch, len, pwidth, bswi
pr = prchar((int) ch);
if (pwidth != NULL || bswidth != NULL)
{
- int len = strlen(pr);
+ int len = (int) strlen(pr);
if (pwidth != NULL)
*pwidth = len;
if (bswidth != NULL)
@@ -222,7 +222,7 @@ cmd_step_common(p, ch, len, pwidth, bswi
*bswidth = 0;
} else if (is_ubin_char(ch))
{
- int len = strlen(pr);
+ int len = (int) strlen(pr);
if (pwidth != NULL)
*pwidth = len;
if (bswidth != NULL)
@@ -375,7 +375,7 @@ cmd_lshift()
s = ns;
}
- cmd_offset = s - cmdbuf;
+ cmd_offset = (int) (s - cmdbuf);
save_cp = cp;
cmd_home();
cmd_repaint(save_cp);
@@ -405,7 +405,7 @@ cmd_rshift()
cols += width;
}
- cmd_offset = s - cmdbuf;
+ cmd_offset = (int) (s - cmdbuf);
save_cp = cp;
cmd_home();
cmd_repaint(save_cp);
@@ -535,7 +535,7 @@ cmd_erase()
*/
s = cp;
cmd_left();
- clen = s - cp;
+ clen = (int) (s - cp);
/*
* Remove the char from the buffer (shift the buffer left).
@@ -701,7 +701,7 @@ cmd_updown(action)
if (updown_match < 0)
{
- updown_match = cp - cmdbuf;
+ updown_match = (int) (cp - cmdbuf);
}
/*
@@ -744,12 +744,13 @@ cmd_updown(action)
#endif
/*
- * Add a string to a history list.
+ * Add a string to an mlist.
*/
public void
-cmd_addhist(mlist, cmd)
+cmd_addhist(mlist, cmd, modified)
struct mlist *mlist;
char *cmd;
+ int modified;
{
#if CMD_HISTORY
struct mlist *ml;
@@ -773,6 +774,7 @@ cmd_addhist(mlist, cmd)
*/
ml = (struct mlist *) ecalloc(1, sizeof(struct mlist));
ml->string = save(cmd);
+ ml->modified = modified;
ml->next = mlist;
ml->prev = mlist->prev;
mlist->prev->next = ml;
@@ -799,7 +801,7 @@ cmd_accept()
*/
if (curr_mlist == NULL)
return;
- cmd_addhist(curr_mlist, cmdbuf);
+ cmd_addhist(curr_mlist, cmdbuf, 1);
curr_mlist->modified = 1;
#endif
}
@@ -965,7 +967,7 @@ delimit_word()
int delim_quoted = 0;
int meta_quoted = 0;
char *esc = get_meta_escape();
- int esclen = strlen(esc);
+ int esclen = (int) strlen(esc);
#endif
/*
@@ -1262,7 +1264,7 @@ cmd_char(c)
cmd_mbc_buf[cmd_mbc_buf_index++] = c;
if (cmd_mbc_buf_index < cmd_mbc_buf_len)
return (CC_OK);
- if (!is_utf8_well_formed(cmd_mbc_buf))
+ if (!is_utf8_well_formed(cmd_mbc_buf, cmd_mbc_buf_index))
{
/* complete, but not well formed (non-shortest form), sequence */
cmd_mbc_buf_len = 0;
@@ -1359,6 +1361,18 @@ cmd_lastpattern()
#if CMD_HISTORY
/*
+ */
+ static int
+mlist_size(ml)
+ struct mlist *ml;
+{
+ int size = 0;
+ for (ml = ml->next; ml->string != NULL; ml = ml->next)
+ ++size;
+ return size;
+}
+
+/*
* Get the name of the history file.
*/
static char *
@@ -1378,6 +1392,10 @@ histfile_name()
return (save(name));
}
+ /* See if history file is disabled in the build. */
+ if (strcmp(LESSHISTFILE, "") == 0 || strcmp(LESSHISTFILE, "-") == 0)
+ return (NULL);
+
/* Otherwise, file is in $HOME. */
home = lgetenv("HOME");
if (home == NULL || *home == '\0')
@@ -1388,25 +1406,28 @@ histfile_name()
#endif
return (NULL);
}
- len = strlen(home) + strlen(LESSHISTFILE) + 2;
+ len = (int) (strlen(home) + strlen(LESSHISTFILE) + 2);
name = (char *) ecalloc(len, sizeof(char));
SNPRINTF2(name, len, "%s/%s", home, LESSHISTFILE);
return (name);
}
-#endif /* CMD_HISTORY */
/*
- * Initialize history from a .lesshist file.
+ * Read a .lesshst file and call a callback for each line in the file.
*/
- public void
-init_cmdhist()
+ static void
+read_cmdhist2(action, uparam, skip_search, skip_shell)
+ void (*action)(void*,struct mlist*,char*);
+ void *uparam;
+ int skip_search;
+ int skip_shell;
{
-#if CMD_HISTORY
struct mlist *ml = NULL;
char line[CMDBUF_SIZE];
char *filename;
FILE *f;
char *p;
+ int *skip = NULL;
filename = histfile_name();
if (filename == NULL)
@@ -1432,84 +1453,170 @@ init_cmdhist()
}
}
if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0)
+ {
ml = &mlist_search;
- else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0)
+ skip = &skip_search;
+ } else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0)
{
#if SHELL_ESCAPE || PIPEC
ml = &mlist_shell;
+ skip = &skip_shell;
#else
ml = NULL;
+ skip = NULL;
#endif
} else if (*line == '"')
{
if (ml != NULL)
- cmd_addhist(ml, line+1);
+ {
+ if (skip != NULL && *skip > 0)
+ --(*skip);
+ else
+ (*action)(uparam, ml, line+1);
+ }
}
}
fclose(f);
+}
+
+ static void
+read_cmdhist(action, uparam, skip_search, skip_shell)
+ void (*action)(void*,struct mlist*,char*);
+ void *uparam;
+ int skip_search;
+ int skip_shell;
+{
+ read_cmdhist2(action, uparam, skip_search, skip_shell);
+ (*action)(uparam, NULL, NULL); /* signal end of file */
+}
+
+ static void
+addhist_init(void *uparam, struct mlist *ml, char *string)
+{
+ if (ml == NULL || string == NULL)
+ return;
+ cmd_addhist(ml, string, 0);
+}
+#endif /* CMD_HISTORY */
+
+/*
+ * Initialize history from a .lesshist file.
+ */
+ public void
+init_cmdhist()
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Thu Jan 21 17:33:13 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBF9CA8B782
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 21 Jan 2016 17:33:13 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 4961B152C;
Thu, 21 Jan 2016 17:33:13 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LHXCCG015134;
Thu, 21 Jan 2016 17:33:12 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LHXBqI015123;
Thu, 21 Jan 2016 17:33:11 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601211733.u0LHXBqI015123@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 21 Jan 2016 17:33:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294516 - in user/ngie/socket-tests: . bin/sh
contrib/bsnmp/snmp_mibII contrib/mdocml crypto/openssh crypto/openssh/contrib
crypto/openssh/contrib/caldera crypto/openssh/contrib/cygwin ...
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jan 2016 17:33:14 -0000
Author: ngie
Date: Thu Jan 21 17:33:10 2016
New Revision: 294516
URL: https://svnweb.freebsd.org/changeset/base/294516
Log:
MFhead @ r294514
Added:
user/ngie/socket-tests/crypto/openssh/.cvsignore
- copied unchanged from r294514, head/crypto/openssh/.cvsignore
user/ngie/socket-tests/crypto/openssh/bitmap.c
- copied unchanged from r294514, head/crypto/openssh/bitmap.c
user/ngie/socket-tests/crypto/openssh/bitmap.h
- copied unchanged from r294514, head/crypto/openssh/bitmap.h
user/ngie/socket-tests/crypto/openssh/cipher-aesctr.c
- copied unchanged from r294514, head/crypto/openssh/cipher-aesctr.c
user/ngie/socket-tests/crypto/openssh/cipher-aesctr.h
- copied unchanged from r294514, head/crypto/openssh/cipher-aesctr.h
user/ngie/socket-tests/crypto/openssh/opacket.c
- copied unchanged from r294514, head/crypto/openssh/opacket.c
user/ngie/socket-tests/crypto/openssh/opacket.h
- copied unchanged from r294514, head/crypto/openssh/opacket.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/.cvsignore
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/.cvsignore
user/ngie/socket-tests/crypto/openssh/openbsd-compat/kludge-fd_set.c
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/kludge-fd_set.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/md5.c
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/md5.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/md5.h
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/md5.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/reallocarray.c
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/reallocarray.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/.cvsignore
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/regress/.cvsignore
user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/opensslvertest.c
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/regress/opensslvertest.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/rmd160.c
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/rmd160.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/rmd160.h
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/rmd160.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha1.c
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/sha1.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha1.h
- copied unchanged from r294514, head/crypto/openssh/openbsd-compat/sha1.h
user/ngie/socket-tests/crypto/openssh/regress/.cvsignore
- copied unchanged from r294514, head/crypto/openssh/regress/.cvsignore
user/ngie/socket-tests/crypto/openssh/regress/cfgparse.sh
- copied unchanged from r294514, head/crypto/openssh/regress/cfgparse.sh
user/ngie/socket-tests/crypto/openssh/regress/hostkey-agent.sh
- copied unchanged from r294514, head/crypto/openssh/regress/hostkey-agent.sh
user/ngie/socket-tests/crypto/openssh/regress/hostkey-rotate.sh
- copied unchanged from r294514, head/crypto/openssh/regress/hostkey-rotate.sh
user/ngie/socket-tests/crypto/openssh/regress/keygen-knownhosts.sh
- copied unchanged from r294514, head/crypto/openssh/regress/keygen-knownhosts.sh
user/ngie/socket-tests/crypto/openssh/regress/limit-keytype.sh
- copied unchanged from r294514, head/crypto/openssh/regress/limit-keytype.sh
user/ngie/socket-tests/crypto/openssh/regress/multipubkey.sh
- copied unchanged from r294514, head/crypto/openssh/regress/multipubkey.sh
user/ngie/socket-tests/crypto/openssh/regress/netcat.c
- copied unchanged from r294514, head/crypto/openssh/regress/netcat.c
user/ngie/socket-tests/crypto/openssh/regress/principals-command.sh
- copied unchanged from r294514, head/crypto/openssh/regress/principals-command.sh
user/ngie/socket-tests/crypto/openssh/regress/t11.ok
- copied unchanged from r294514, head/crypto/openssh/regress/t11.ok
user/ngie/socket-tests/crypto/openssh/regress/unittests/
- copied from r294514, head/crypto/openssh/regress/unittests/
user/ngie/socket-tests/crypto/openssh/regress/valgrind-unit.sh
- copied unchanged from r294514, head/crypto/openssh/regress/valgrind-unit.sh
user/ngie/socket-tests/crypto/openssh/scard/.cvsignore
- copied unchanged from r294514, head/crypto/openssh/scard/.cvsignore
user/ngie/socket-tests/crypto/openssh/ssh_api.c
- copied unchanged from r294514, head/crypto/openssh/ssh_api.c
user/ngie/socket-tests/crypto/openssh/ssh_api.h
- copied unchanged from r294514, head/crypto/openssh/ssh_api.h
user/ngie/socket-tests/crypto/openssh/sshbuf-getput-basic.c
- copied unchanged from r294514, head/crypto/openssh/sshbuf-getput-basic.c
user/ngie/socket-tests/crypto/openssh/sshbuf-getput-crypto.c
- copied unchanged from r294514, head/crypto/openssh/sshbuf-getput-crypto.c
user/ngie/socket-tests/crypto/openssh/sshbuf-misc.c
- copied unchanged from r294514, head/crypto/openssh/sshbuf-misc.c
user/ngie/socket-tests/crypto/openssh/sshbuf.c
- copied unchanged from r294514, head/crypto/openssh/sshbuf.c
user/ngie/socket-tests/crypto/openssh/sshbuf.h
- copied unchanged from r294514, head/crypto/openssh/sshbuf.h
user/ngie/socket-tests/crypto/openssh/ssherr.c
- copied unchanged from r294514, head/crypto/openssh/ssherr.c
user/ngie/socket-tests/crypto/openssh/ssherr.h
- copied unchanged from r294514, head/crypto/openssh/ssherr.h
user/ngie/socket-tests/crypto/openssh/sshkey.c
- copied unchanged from r294514, head/crypto/openssh/sshkey.c
user/ngie/socket-tests/crypto/openssh/sshkey.h
- copied unchanged from r294514, head/crypto/openssh/sshkey.h
user/ngie/socket-tests/lib/libc/riscv/SYS.h
- copied unchanged from r294514, head/lib/libc/riscv/SYS.h
user/ngie/socket-tests/lib/libc/riscv/Symbol.map
- copied unchanged from r294514, head/lib/libc/riscv/Symbol.map
user/ngie/socket-tests/lib/libc/riscv/_fpmath.h
- copied unchanged from r294514, head/lib/libc/riscv/_fpmath.h
user/ngie/socket-tests/lib/libc/riscv/arith.h
- copied unchanged from r294514, head/lib/libc/riscv/arith.h
user/ngie/socket-tests/lib/libc/riscv/gd_qnan.h
- copied unchanged from r294514, head/lib/libc/riscv/gd_qnan.h
user/ngie/socket-tests/lib/libc/riscv/gen/
- copied from r294514, head/lib/libc/riscv/gen/
user/ngie/socket-tests/lib/libc/riscv/sys/
- copied from r294514, head/lib/libc/riscv/sys/
user/ngie/socket-tests/share/man/man4/cfi.4
- copied unchanged from r294514, head/share/man/man4/cfi.4
user/ngie/socket-tests/sys/arm/at91/at91_ohci.c
- copied unchanged from r294514, head/sys/arm/at91/at91_ohci.c
user/ngie/socket-tests/sys/arm/at91/at91_ohci_fdt.c
- copied unchanged from r294514, head/sys/arm/at91/at91_ohci_fdt.c
user/ngie/socket-tests/sys/arm/conf/ARMADA38X
- copied unchanged from r294514, head/sys/arm/conf/ARMADA38X
user/ngie/socket-tests/sys/arm/mv/armada38x/
- copied from r294514, head/sys/arm/mv/armada38x/
user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-380.dtsi
- copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-380.dtsi
user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-385.dtsi
- copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-385.dtsi
user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-388-gp.dts
- copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-388-gp.dts
user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-388.dtsi
- copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-388.dtsi
user/ngie/socket-tests/sys/boot/fdt/dts/arm/armada-38x.dtsi
- copied unchanged from r294514, head/sys/boot/fdt/dts/arm/armada-38x.dtsi
user/ngie/socket-tests/sys/fs/ext2fs/ext2_hash.c
- copied unchanged from r294514, head/sys/fs/ext2fs/ext2_hash.c
user/ngie/socket-tests/sys/fs/ext2fs/ext2_htree.c
- copied unchanged from r294514, head/sys/fs/ext2fs/ext2_htree.c
Deleted:
user/ngie/socket-tests/crypto/openssh/README.hpn
user/ngie/socket-tests/crypto/openssh/compress.c
user/ngie/socket-tests/crypto/openssh/compress.h
user/ngie/socket-tests/crypto/openssh/config.h.in
user/ngie/socket-tests/crypto/openssh/configure
user/ngie/socket-tests/crypto/openssh/contrib/caldera/
user/ngie/socket-tests/crypto/openssh/moduli.0
user/ngie/socket-tests/crypto/openssh/scp.0
user/ngie/socket-tests/crypto/openssh/sftp-server.0
user/ngie/socket-tests/crypto/openssh/sftp.0
user/ngie/socket-tests/crypto/openssh/ssh-add.0
user/ngie/socket-tests/crypto/openssh/ssh-agent.0
user/ngie/socket-tests/crypto/openssh/ssh-keygen.0
user/ngie/socket-tests/crypto/openssh/ssh-keyscan.0
user/ngie/socket-tests/crypto/openssh/ssh-keysign.0
user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-helper.0
user/ngie/socket-tests/crypto/openssh/ssh.0
user/ngie/socket-tests/crypto/openssh/ssh_config.0
user/ngie/socket-tests/crypto/openssh/sshd.0
user/ngie/socket-tests/crypto/openssh/sshd_config.0
user/ngie/socket-tests/sys/dev/fdt/fdt_arm64.c
user/ngie/socket-tests/sys/dev/fdt/fdt_mips.c
user/ngie/socket-tests/sys/dev/fdt/fdt_x86.c
user/ngie/socket-tests/sys/dev/usb/controller/ohci_atmelarm.c
user/ngie/socket-tests/sys/dev/usb/controller/ohci_fdt.c
Modified:
user/ngie/socket-tests/ObsoleteFiles.inc
user/ngie/socket-tests/UPDATING
user/ngie/socket-tests/bin/sh/options.c
user/ngie/socket-tests/bin/sh/options.h
user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c
user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h
user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
user/ngie/socket-tests/contrib/mdocml/main.c
user/ngie/socket-tests/crypto/openssh/ChangeLog
user/ngie/socket-tests/crypto/openssh/FREEBSD-upgrade
user/ngie/socket-tests/crypto/openssh/INSTALL
user/ngie/socket-tests/crypto/openssh/Makefile.in
user/ngie/socket-tests/crypto/openssh/OVERVIEW
user/ngie/socket-tests/crypto/openssh/PROTOCOL
user/ngie/socket-tests/crypto/openssh/PROTOCOL.agent
user/ngie/socket-tests/crypto/openssh/PROTOCOL.krl
user/ngie/socket-tests/crypto/openssh/PROTOCOL.mux
user/ngie/socket-tests/crypto/openssh/README
user/ngie/socket-tests/crypto/openssh/addrmatch.c
user/ngie/socket-tests/crypto/openssh/atomicio.c
user/ngie/socket-tests/crypto/openssh/auth-bsdauth.c
user/ngie/socket-tests/crypto/openssh/auth-chall.c
user/ngie/socket-tests/crypto/openssh/auth-krb5.c
user/ngie/socket-tests/crypto/openssh/auth-options.c
user/ngie/socket-tests/crypto/openssh/auth-options.h
user/ngie/socket-tests/crypto/openssh/auth-pam.c
user/ngie/socket-tests/crypto/openssh/auth-passwd.c
user/ngie/socket-tests/crypto/openssh/auth-rh-rsa.c
user/ngie/socket-tests/crypto/openssh/auth-rhosts.c
user/ngie/socket-tests/crypto/openssh/auth-rsa.c
user/ngie/socket-tests/crypto/openssh/auth.c
user/ngie/socket-tests/crypto/openssh/auth.h
user/ngie/socket-tests/crypto/openssh/auth1.c
user/ngie/socket-tests/crypto/openssh/auth2-chall.c
user/ngie/socket-tests/crypto/openssh/auth2-gss.c
user/ngie/socket-tests/crypto/openssh/auth2-hostbased.c
user/ngie/socket-tests/crypto/openssh/auth2-kbdint.c
user/ngie/socket-tests/crypto/openssh/auth2-none.c
user/ngie/socket-tests/crypto/openssh/auth2-passwd.c
user/ngie/socket-tests/crypto/openssh/auth2-pubkey.c
user/ngie/socket-tests/crypto/openssh/auth2.c
user/ngie/socket-tests/crypto/openssh/authfd.c
user/ngie/socket-tests/crypto/openssh/authfd.h
user/ngie/socket-tests/crypto/openssh/authfile.c
user/ngie/socket-tests/crypto/openssh/authfile.h
user/ngie/socket-tests/crypto/openssh/bufaux.c
user/ngie/socket-tests/crypto/openssh/bufbn.c
user/ngie/socket-tests/crypto/openssh/bufec.c
user/ngie/socket-tests/crypto/openssh/buffer.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/buffer.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/canohost.c
user/ngie/socket-tests/crypto/openssh/chacha.h
user/ngie/socket-tests/crypto/openssh/channels.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/channels.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/cipher-3des1.c
user/ngie/socket-tests/crypto/openssh/cipher-bf1.c
user/ngie/socket-tests/crypto/openssh/cipher-chachapoly.c
user/ngie/socket-tests/crypto/openssh/cipher-chachapoly.h
user/ngie/socket-tests/crypto/openssh/cipher-ctr.c
user/ngie/socket-tests/crypto/openssh/cipher.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/cipher.h
user/ngie/socket-tests/crypto/openssh/clientloop.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/compat.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/compat.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/config.guess
user/ngie/socket-tests/crypto/openssh/config.h
user/ngie/socket-tests/crypto/openssh/configure.ac (contents, props changed)
user/ngie/socket-tests/crypto/openssh/contrib/Makefile
user/ngie/socket-tests/crypto/openssh/contrib/README
user/ngie/socket-tests/crypto/openssh/contrib/cygwin/README
user/ngie/socket-tests/crypto/openssh/contrib/cygwin/ssh-host-config
user/ngie/socket-tests/crypto/openssh/contrib/cygwin/ssh-user-config
user/ngie/socket-tests/crypto/openssh/contrib/redhat/openssh.spec
user/ngie/socket-tests/crypto/openssh/contrib/suse/openssh.spec
user/ngie/socket-tests/crypto/openssh/deattack.c
user/ngie/socket-tests/crypto/openssh/deattack.h
user/ngie/socket-tests/crypto/openssh/defines.h
user/ngie/socket-tests/crypto/openssh/dh.c
user/ngie/socket-tests/crypto/openssh/dh.h
user/ngie/socket-tests/crypto/openssh/digest-libc.c
user/ngie/socket-tests/crypto/openssh/digest-openssl.c
user/ngie/socket-tests/crypto/openssh/digest.h
user/ngie/socket-tests/crypto/openssh/dispatch.c
user/ngie/socket-tests/crypto/openssh/dispatch.h
user/ngie/socket-tests/crypto/openssh/dns.c
user/ngie/socket-tests/crypto/openssh/dns.h
user/ngie/socket-tests/crypto/openssh/entropy.c
user/ngie/socket-tests/crypto/openssh/freebsd-configure.sh
user/ngie/socket-tests/crypto/openssh/freebsd-post-merge.sh
user/ngie/socket-tests/crypto/openssh/freebsd-pre-merge.sh
user/ngie/socket-tests/crypto/openssh/ge25519.h
user/ngie/socket-tests/crypto/openssh/groupaccess.c
user/ngie/socket-tests/crypto/openssh/gss-genr.c
user/ngie/socket-tests/crypto/openssh/gss-serv-krb5.c
user/ngie/socket-tests/crypto/openssh/gss-serv.c
user/ngie/socket-tests/crypto/openssh/hmac.c
user/ngie/socket-tests/crypto/openssh/hmac.h
user/ngie/socket-tests/crypto/openssh/hostfile.c
user/ngie/socket-tests/crypto/openssh/hostfile.h
user/ngie/socket-tests/crypto/openssh/includes.h
user/ngie/socket-tests/crypto/openssh/kex.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/kex.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/kexc25519.c
user/ngie/socket-tests/crypto/openssh/kexc25519c.c
user/ngie/socket-tests/crypto/openssh/kexc25519s.c
user/ngie/socket-tests/crypto/openssh/kexdh.c
user/ngie/socket-tests/crypto/openssh/kexdhc.c
user/ngie/socket-tests/crypto/openssh/kexdhs.c
user/ngie/socket-tests/crypto/openssh/kexecdh.c
user/ngie/socket-tests/crypto/openssh/kexecdhc.c
user/ngie/socket-tests/crypto/openssh/kexecdhs.c
user/ngie/socket-tests/crypto/openssh/kexgex.c
user/ngie/socket-tests/crypto/openssh/kexgexc.c
user/ngie/socket-tests/crypto/openssh/kexgexs.c
user/ngie/socket-tests/crypto/openssh/key.c
user/ngie/socket-tests/crypto/openssh/key.h
user/ngie/socket-tests/crypto/openssh/krl.c
user/ngie/socket-tests/crypto/openssh/krl.h
user/ngie/socket-tests/crypto/openssh/log.c
user/ngie/socket-tests/crypto/openssh/loginrec.c
user/ngie/socket-tests/crypto/openssh/mac.c
user/ngie/socket-tests/crypto/openssh/mac.h
user/ngie/socket-tests/crypto/openssh/match.c
user/ngie/socket-tests/crypto/openssh/match.h
user/ngie/socket-tests/crypto/openssh/misc.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/misc.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/moduli
user/ngie/socket-tests/crypto/openssh/moduli.c
user/ngie/socket-tests/crypto/openssh/monitor.c
user/ngie/socket-tests/crypto/openssh/monitor.h
user/ngie/socket-tests/crypto/openssh/monitor_fdpass.c
user/ngie/socket-tests/crypto/openssh/monitor_mm.c
user/ngie/socket-tests/crypto/openssh/monitor_wrap.c
user/ngie/socket-tests/crypto/openssh/monitor_wrap.h
user/ngie/socket-tests/crypto/openssh/msg.c
user/ngie/socket-tests/crypto/openssh/msg.h
user/ngie/socket-tests/crypto/openssh/mux.c
user/ngie/socket-tests/crypto/openssh/myproposal.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/Makefile.in
user/ngie/socket-tests/crypto/openssh/openbsd-compat/arc4random.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/bcrypt_pbkdf.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/blowfish.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-cygwin_util.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-misc.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-misc.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/openbsd-compat/bsd-snprintf.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/explicit_bzero.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/fake-rfc2553.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/openbsd-compat.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/openssl-compat.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/openssl-compat.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/port-linux.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/port-tun.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/port-uw.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/readpassphrase.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/realpath.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/Makefile.in
user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha2.c
user/ngie/socket-tests/crypto/openssh/openbsd-compat/sha2.h
user/ngie/socket-tests/crypto/openssh/openbsd-compat/xcrypt.c
user/ngie/socket-tests/crypto/openssh/opensshd.init.in
user/ngie/socket-tests/crypto/openssh/packet.c
user/ngie/socket-tests/crypto/openssh/packet.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/platform.c
user/ngie/socket-tests/crypto/openssh/poly1305.h
user/ngie/socket-tests/crypto/openssh/progressmeter.c
user/ngie/socket-tests/crypto/openssh/progressmeter.h
user/ngie/socket-tests/crypto/openssh/readconf.c
user/ngie/socket-tests/crypto/openssh/readconf.h
user/ngie/socket-tests/crypto/openssh/regress/Makefile
user/ngie/socket-tests/crypto/openssh/regress/README.regress
user/ngie/socket-tests/crypto/openssh/regress/agent-pkcs11.sh
user/ngie/socket-tests/crypto/openssh/regress/agent-timeout.sh
user/ngie/socket-tests/crypto/openssh/regress/agent.sh
user/ngie/socket-tests/crypto/openssh/regress/broken-pipe.sh
user/ngie/socket-tests/crypto/openssh/regress/cert-hostkey.sh
user/ngie/socket-tests/crypto/openssh/regress/cert-userkey.sh
user/ngie/socket-tests/crypto/openssh/regress/cfgmatch.sh
user/ngie/socket-tests/crypto/openssh/regress/cipher-speed.sh
user/ngie/socket-tests/crypto/openssh/regress/connect-privsep.sh
user/ngie/socket-tests/crypto/openssh/regress/connect.sh
user/ngie/socket-tests/crypto/openssh/regress/dhgex.sh
user/ngie/socket-tests/crypto/openssh/regress/dynamic-forward.sh
user/ngie/socket-tests/crypto/openssh/regress/exit-status.sh
user/ngie/socket-tests/crypto/openssh/regress/forcecommand.sh
user/ngie/socket-tests/crypto/openssh/regress/forward-control.sh
user/ngie/socket-tests/crypto/openssh/regress/forwarding.sh
user/ngie/socket-tests/crypto/openssh/regress/host-expand.sh
user/ngie/socket-tests/crypto/openssh/regress/integrity.sh
user/ngie/socket-tests/crypto/openssh/regress/kextype.sh
user/ngie/socket-tests/crypto/openssh/regress/key-options.sh
user/ngie/socket-tests/crypto/openssh/regress/keygen-change.sh
user/ngie/socket-tests/crypto/openssh/regress/keys-command.sh
user/ngie/socket-tests/crypto/openssh/regress/keyscan.sh
user/ngie/socket-tests/crypto/openssh/regress/keytype.sh
user/ngie/socket-tests/crypto/openssh/regress/krl.sh
user/ngie/socket-tests/crypto/openssh/regress/localcommand.sh
user/ngie/socket-tests/crypto/openssh/regress/login-timeout.sh
user/ngie/socket-tests/crypto/openssh/regress/multiplex.sh
user/ngie/socket-tests/crypto/openssh/regress/proto-mismatch.sh
user/ngie/socket-tests/crypto/openssh/regress/proto-version.sh
user/ngie/socket-tests/crypto/openssh/regress/proxy-connect.sh
user/ngie/socket-tests/crypto/openssh/regress/reconfigure.sh
user/ngie/socket-tests/crypto/openssh/regress/reexec.sh
user/ngie/socket-tests/crypto/openssh/regress/rekey.sh
user/ngie/socket-tests/crypto/openssh/regress/ssh-com.sh
user/ngie/socket-tests/crypto/openssh/regress/ssh2putty.sh
user/ngie/socket-tests/crypto/openssh/regress/sshd-log-wrapper.sh
user/ngie/socket-tests/crypto/openssh/regress/stderr-data.sh
user/ngie/socket-tests/crypto/openssh/regress/t4.ok
user/ngie/socket-tests/crypto/openssh/regress/test-exec.sh
user/ngie/socket-tests/crypto/openssh/regress/transfer.sh
user/ngie/socket-tests/crypto/openssh/regress/try-ciphers.sh
user/ngie/socket-tests/crypto/openssh/regress/yes-head.sh
user/ngie/socket-tests/crypto/openssh/rijndael.c
user/ngie/socket-tests/crypto/openssh/rijndael.h
user/ngie/socket-tests/crypto/openssh/roaming_client.c
user/ngie/socket-tests/crypto/openssh/roaming_common.c
user/ngie/socket-tests/crypto/openssh/roaming_dummy.c
user/ngie/socket-tests/crypto/openssh/rsa.c
user/ngie/socket-tests/crypto/openssh/rsa.h
user/ngie/socket-tests/crypto/openssh/sandbox-seccomp-filter.c
user/ngie/socket-tests/crypto/openssh/sandbox-systrace.c
user/ngie/socket-tests/crypto/openssh/scp.1 (contents, props changed)
user/ngie/socket-tests/crypto/openssh/scp.c
user/ngie/socket-tests/crypto/openssh/servconf.c
user/ngie/socket-tests/crypto/openssh/servconf.h (contents, props changed)
user/ngie/socket-tests/crypto/openssh/serverloop.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/session.c
user/ngie/socket-tests/crypto/openssh/sftp-client.c
user/ngie/socket-tests/crypto/openssh/sftp-client.h
user/ngie/socket-tests/crypto/openssh/sftp-common.c
user/ngie/socket-tests/crypto/openssh/sftp-common.h
user/ngie/socket-tests/crypto/openssh/sftp-glob.c
user/ngie/socket-tests/crypto/openssh/sftp-server.8 (contents, props changed)
user/ngie/socket-tests/crypto/openssh/sftp-server.c
user/ngie/socket-tests/crypto/openssh/sftp.1 (contents, props changed)
user/ngie/socket-tests/crypto/openssh/sftp.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/ssh-add.1 (contents, props changed)
user/ngie/socket-tests/crypto/openssh/ssh-add.c
user/ngie/socket-tests/crypto/openssh/ssh-agent.1
user/ngie/socket-tests/crypto/openssh/ssh-agent.c
user/ngie/socket-tests/crypto/openssh/ssh-dss.c
user/ngie/socket-tests/crypto/openssh/ssh-ecdsa.c
user/ngie/socket-tests/crypto/openssh/ssh-ed25519.c
user/ngie/socket-tests/crypto/openssh/ssh-keygen.1 (contents, props changed)
user/ngie/socket-tests/crypto/openssh/ssh-keygen.c
user/ngie/socket-tests/crypto/openssh/ssh-keyscan.1 (contents, props changed)
user/ngie/socket-tests/crypto/openssh/ssh-keyscan.c
user/ngie/socket-tests/crypto/openssh/ssh-keysign.c
user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-client.c
user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-helper.c
user/ngie/socket-tests/crypto/openssh/ssh-pkcs11.c
user/ngie/socket-tests/crypto/openssh/ssh-pkcs11.h
user/ngie/socket-tests/crypto/openssh/ssh-rsa.c
user/ngie/socket-tests/crypto/openssh/ssh.1
user/ngie/socket-tests/crypto/openssh/ssh.c
user/ngie/socket-tests/crypto/openssh/ssh.h
user/ngie/socket-tests/crypto/openssh/ssh_config
user/ngie/socket-tests/crypto/openssh/ssh_config.5
user/ngie/socket-tests/crypto/openssh/ssh_namespace.h
user/ngie/socket-tests/crypto/openssh/sshconnect.c
user/ngie/socket-tests/crypto/openssh/sshconnect1.c
user/ngie/socket-tests/crypto/openssh/sshconnect2.c (contents, props changed)
user/ngie/socket-tests/crypto/openssh/sshd.8
user/ngie/socket-tests/crypto/openssh/sshd.c
user/ngie/socket-tests/crypto/openssh/sshd_config
user/ngie/socket-tests/crypto/openssh/sshd_config.5
user/ngie/socket-tests/crypto/openssh/sshlogin.c
user/ngie/socket-tests/crypto/openssh/sshpty.c
user/ngie/socket-tests/crypto/openssh/uidswap.c
user/ngie/socket-tests/crypto/openssh/umac.c
user/ngie/socket-tests/crypto/openssh/uuencode.c
user/ngie/socket-tests/crypto/openssh/version.h
user/ngie/socket-tests/crypto/openssh/xmalloc.c
user/ngie/socket-tests/crypto/openssh/xmalloc.h
user/ngie/socket-tests/etc/defaults/rc.conf
user/ngie/socket-tests/etc/rc.d/ldconfig
user/ngie/socket-tests/gnu/lib/libgcc/Makefile
user/ngie/socket-tests/lib/clang/clang.lib.mk
user/ngie/socket-tests/lib/libc/Makefile
user/ngie/socket-tests/lib/libc/gen/tls.c
user/ngie/socket-tests/lib/libc/riscv/Makefile.inc
user/ngie/socket-tests/lib/libc/stdlib/jemalloc/Makefile.inc
user/ngie/socket-tests/lib/libc/sys/utimensat.2
user/ngie/socket-tests/lib/libc/sys/utrace.2
user/ngie/socket-tests/lib/libc/xdr/xdr_float.c
user/ngie/socket-tests/lib/libelftc/elftc_version.c
user/ngie/socket-tests/lib/libfetch/common.c
user/ngie/socket-tests/lib/libpam/modules/pam_ssh/pam_ssh.c
user/ngie/socket-tests/lib/libstand/Makefile
user/ngie/socket-tests/libexec/rtld-elf/aarch64/reloc.c
user/ngie/socket-tests/libexec/rtld-elf/amd64/reloc.c
user/ngie/socket-tests/libexec/rtld-elf/arm/reloc.c
user/ngie/socket-tests/libexec/rtld-elf/debug.c
user/ngie/socket-tests/libexec/rtld-elf/i386/reloc.c
user/ngie/socket-tests/libexec/rtld-elf/paths.h
user/ngie/socket-tests/libexec/rtld-elf/powerpc/reloc.c
user/ngie/socket-tests/libexec/rtld-elf/powerpc64/reloc.c
user/ngie/socket-tests/libexec/rtld-elf/riscv/reloc.c
user/ngie/socket-tests/libexec/rtld-elf/rtld.c
user/ngie/socket-tests/libexec/rtld-elf/rtld.h
user/ngie/socket-tests/libexec/rtld-elf/sparc64/reloc.c
user/ngie/socket-tests/sbin/ldconfig/ldconfig.c
user/ngie/socket-tests/secure/lib/libssh/Makefile
user/ngie/socket-tests/secure/usr.sbin/sshd/Makefile
user/ngie/socket-tests/share/man/man4/Makefile
user/ngie/socket-tests/share/man/man4/ddb.4
user/ngie/socket-tests/share/man/man7/tuning.7
user/ngie/socket-tests/share/man/man9/vref.9
user/ngie/socket-tests/share/misc/committers-src.dot
user/ngie/socket-tests/share/misc/organization.dot
user/ngie/socket-tests/share/mk/bsd.dep.mk
user/ngie/socket-tests/share/mk/bsd.lib.mk
user/ngie/socket-tests/share/mk/bsd.subdir.mk
user/ngie/socket-tests/share/mk/local.init.mk
user/ngie/socket-tests/share/mk/local.sys.mk
user/ngie/socket-tests/share/mk/sys.mk
user/ngie/socket-tests/sys/amd64/amd64/fpu.c
user/ngie/socket-tests/sys/arm/arm/gic.c
user/ngie/socket-tests/sys/arm/arm/physmem.c
user/ngie/socket-tests/sys/arm/at91/at91.c
user/ngie/socket-tests/sys/arm/at91/at91_common.c
user/ngie/socket-tests/sys/arm/at91/at91_machdep.c
user/ngie/socket-tests/sys/arm/at91/files.at91
user/ngie/socket-tests/sys/arm/at91/uart_cpu_at91usart.c
user/ngie/socket-tests/sys/arm/conf/DB-78XXX
user/ngie/socket-tests/sys/arm/conf/DB-88F5XXX
user/ngie/socket-tests/sys/arm/conf/DB-88F6XXX
user/ngie/socket-tests/sys/arm/conf/DOCKSTAR
user/ngie/socket-tests/sys/arm/conf/DREAMPLUG-1001
user/ngie/socket-tests/sys/arm/conf/SHEEVAPLUG
user/ngie/socket-tests/sys/arm/conf/TS7800
user/ngie/socket-tests/sys/arm/freescale/imx/imx_sdhci.c
user/ngie/socket-tests/sys/arm/include/sysarch.h
user/ngie/socket-tests/sys/arm/mv/armadaxp/armadaxp.c
user/ngie/socket-tests/sys/arm/mv/files.mv
user/ngie/socket-tests/sys/arm/mv/mv_common.c
user/ngie/socket-tests/sys/arm/mv/mv_machdep.c
user/ngie/socket-tests/sys/arm/mv/mv_pci.c
user/ngie/socket-tests/sys/arm/mv/mvreg.h
user/ngie/socket-tests/sys/arm/mv/mvvar.h
user/ngie/socket-tests/sys/arm/mv/mvwin.h
user/ngie/socket-tests/sys/arm/mv/timer.c
user/ngie/socket-tests/sys/arm/mv/twsi.c
user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie.c
user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie_common.c
user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie_common.h
user/ngie/socket-tests/sys/arm64/cavium/thunder_pcie_pem.c
user/ngie/socket-tests/sys/boot/common/console.c
user/ngie/socket-tests/sys/boot/common/ufsread.c
user/ngie/socket-tests/sys/boot/efi/boot1/Makefile
user/ngie/socket-tests/sys/boot/efi/boot1/boot1.c
user/ngie/socket-tests/sys/boot/efi/boot1/boot_module.h
user/ngie/socket-tests/sys/boot/efi/boot1/ufs_module.c
user/ngie/socket-tests/sys/boot/efi/boot1/zfs_module.c
user/ngie/socket-tests/sys/boot/fdt/dts/arm/db78460.dts
user/ngie/socket-tests/sys/boot/fdt/dts/arm/rk3188.dtsi
user/ngie/socket-tests/sys/boot/fdt/dts/arm/sun4i-a10.dtsi
user/ngie/socket-tests/sys/boot/fdt/dts/arm/sun7i-a20.dtsi
user/ngie/socket-tests/sys/boot/mips/beri/boot2/flashboot.ldscript
user/ngie/socket-tests/sys/boot/mips/beri/boot2/jtagboot.ldscript
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
user/ngie/socket-tests/sys/compat/linux/linux_socket.c
user/ngie/socket-tests/sys/compat/linuxkpi/common/include/linux/idr.h
user/ngie/socket-tests/sys/compat/linuxkpi/common/src/linux_compat.c
user/ngie/socket-tests/sys/compat/linuxkpi/common/src/linux_idr.c
user/ngie/socket-tests/sys/conf/files
user/ngie/socket-tests/sys/conf/files.amd64
user/ngie/socket-tests/sys/conf/files.arm64
user/ngie/socket-tests/sys/conf/files.i386
user/ngie/socket-tests/sys/conf/files.mips
user/ngie/socket-tests/sys/conf/options.arm
user/ngie/socket-tests/sys/dev/cxgb/cxgb_sge.c
user/ngie/socket-tests/sys/dev/cxgbe/iw_cxgbe/cm.c
user/ngie/socket-tests/sys/dev/cxgbe/t4_sge.c
user/ngie/socket-tests/sys/dev/e1000/if_igb.c
user/ngie/socket-tests/sys/dev/fdt/fdt_common.c
user/ngie/socket-tests/sys/dev/fdt/fdt_common.h
user/ngie/socket-tests/sys/dev/hwpmc/hwpmc_e500.c
user/ngie/socket-tests/sys/dev/hwpmc/hwpmc_powerpc.c
user/ngie/socket-tests/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
user/ngie/socket-tests/sys/dev/iwm/if_iwm.c
user/ngie/socket-tests/sys/dev/ixgbe/if_ix.c
user/ngie/socket-tests/sys/dev/ixgbe/if_ixv.c
user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/en.h
user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
user/ngie/socket-tests/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
user/ngie/socket-tests/sys/dev/mxge/if_mxge.c
user/ngie/socket-tests/sys/dev/ofw/ofw_bus_subr.c
user/ngie/socket-tests/sys/dev/ofw/ofw_fdt.c
user/ngie/socket-tests/sys/dev/pci/pcireg.h
user/ngie/socket-tests/sys/dev/sfxge/common/ef10_tlv_layout.h
user/ngie/socket-tests/sys/dev/sfxge/common/efsys.h
user/ngie/socket-tests/sys/dev/sfxge/common/efx.h
user/ngie/socket-tests/sys/dev/sfxge/common/efx_impl.h
user/ngie/socket-tests/sys/dev/sfxge/common/efx_mac.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_nvram.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_regs_ef10.h
user/ngie/socket-tests/sys/dev/sfxge/common/hunt_ev.c
user/ngie/socket-tests/sys/dev/sfxge/common/hunt_impl.h
user/ngie/socket-tests/sys/dev/sfxge/common/hunt_mac.c
user/ngie/socket-tests/sys/dev/sfxge/common/hunt_nic.c
user/ngie/socket-tests/sys/dev/sfxge/common/hunt_nvram.c
user/ngie/socket-tests/sys/dev/sfxge/common/siena_flash.h
user/ngie/socket-tests/sys/dev/sfxge/common/siena_impl.h
user/ngie/socket-tests/sys/dev/sfxge/common/siena_nvram.c
user/ngie/socket-tests/sys/dev/sfxge/sfxge_version.h
user/ngie/socket-tests/sys/dev/uart/uart_cpu_fdt.c
user/ngie/socket-tests/sys/dev/uart/uart_dev_ns8250.c
user/ngie/socket-tests/sys/dev/uart/uart_tty.c
user/ngie/socket-tests/sys/dev/usb/controller/ehci_mv.c
user/ngie/socket-tests/sys/dev/usb/serial/usb_serial.c
user/ngie/socket-tests/sys/dev/usb/wlan/if_urtwn.c
user/ngie/socket-tests/sys/dev/usb/wlan/if_urtwnreg.h
user/ngie/socket-tests/sys/dev/usb/wlan/if_urtwnvar.h
user/ngie/socket-tests/sys/dev/xen/netfront/netfront.c
user/ngie/socket-tests/sys/fs/devfs/devfs_vnops.c
user/ngie/socket-tests/sys/fs/ext2fs/ext2_dir.h
user/ngie/socket-tests/sys/fs/ext2fs/ext2_extern.h
user/ngie/socket-tests/sys/fs/ext2fs/ext2_lookup.c
user/ngie/socket-tests/sys/fs/ext2fs/ext2_vfsops.c
user/ngie/socket-tests/sys/fs/ext2fs/ext2fs.h
user/ngie/socket-tests/sys/fs/nandfs/nandfs_segment.c
user/ngie/socket-tests/sys/i386/isa/npx.c
user/ngie/socket-tests/sys/kern/kern_exit.c
user/ngie/socket-tests/sys/kern/kern_proc.c
user/ngie/socket-tests/sys/kern/tty.c
user/ngie/socket-tests/sys/kern/vfs_aio.c
user/ngie/socket-tests/sys/kern/vfs_cache.c
user/ngie/socket-tests/sys/kern/vfs_subr.c
user/ngie/socket-tests/sys/kern/vfs_vnops.c
user/ngie/socket-tests/sys/mips/include/asm.h
user/ngie/socket-tests/sys/modules/ext2fs/Makefile
user/ngie/socket-tests/sys/modules/i2c/iicbb/Makefile
user/ngie/socket-tests/sys/modules/ix/Makefile
user/ngie/socket-tests/sys/modules/ixlv/Makefile
user/ngie/socket-tests/sys/modules/ixv/Makefile
user/ngie/socket-tests/sys/netinet/igmp.c
user/ngie/socket-tests/sys/netinet/tcp_lro.c
user/ngie/socket-tests/sys/netinet/tcp_lro.h
user/ngie/socket-tests/sys/netinet6/ip6_forward.c
user/ngie/socket-tests/sys/powerpc/booke/pmap.c
user/ngie/socket-tests/sys/powerpc/include/vmparam.h
user/ngie/socket-tests/sys/powerpc/ofw/ofw_pci.c
user/ngie/socket-tests/sys/powerpc/ofw/ofw_pci.h
user/ngie/socket-tests/sys/powerpc/pseries/rtas_pci.c
user/ngie/socket-tests/sys/riscv/include/riscvreg.h
user/ngie/socket-tests/sys/security/audit/audit_worker.c
user/ngie/socket-tests/sys/sys/elf_common.h
user/ngie/socket-tests/sys/sys/fcntl.h
user/ngie/socket-tests/sys/sys/param.h
user/ngie/socket-tests/sys/sys/proc.h
user/ngie/socket-tests/sys/sys/ttydevsw.h
user/ngie/socket-tests/sys/sys/vnode.h
user/ngie/socket-tests/sys/vm/vm_extern.h
user/ngie/socket-tests/sys/vm/vm_map.c
user/ngie/socket-tests/sys/vm/vm_phys.c
user/ngie/socket-tests/tools/build/check-links.sh
user/ngie/socket-tests/tools/tools/nanobsd/embedded/rpi2.cfg
user/ngie/socket-tests/usr.bin/finger/net.c
user/ngie/socket-tests/usr.bin/iscsictl/iscsictl.8
user/ngie/socket-tests/usr.bin/m4/misc.c
user/ngie/socket-tests/usr.bin/truncate/tests/truncate_test.sh
user/ngie/socket-tests/usr.sbin/bsdinstall/scripts/zfsboot
user/ngie/socket-tests/usr.sbin/jail/command.c
user/ngie/socket-tests/usr.sbin/jail/config.c
user/ngie/socket-tests/usr.sbin/jls/jls.8
user/ngie/socket-tests/usr.sbin/vidcontrol/vidcontrol.1
user/ngie/socket-tests/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
user/ngie/socket-tests/ (props changed)
user/ngie/socket-tests/contrib/mdocml/ (props changed)
user/ngie/socket-tests/crypto/openssh/ (props changed)
user/ngie/socket-tests/crypto/openssh/contrib/ssh-copy-id.1 (props changed)
user/ngie/socket-tests/crypto/openssh/moduli.5 (props changed)
user/ngie/socket-tests/crypto/openssh/openbsd-compat/ (props changed)
user/ngie/socket-tests/crypto/openssh/openbsd-compat/regress/ (props changed)
user/ngie/socket-tests/crypto/openssh/ssh-keysign.8 (props changed)
user/ngie/socket-tests/crypto/openssh/ssh-pkcs11-helper.8 (props changed)
user/ngie/socket-tests/gnu/lib/ (props changed)
user/ngie/socket-tests/lib/libc/ (props changed)
user/ngie/socket-tests/sbin/ (props changed)
user/ngie/socket-tests/share/ (props changed)
user/ngie/socket-tests/share/man/man4/ (props changed)
user/ngie/socket-tests/sys/ (props changed)
user/ngie/socket-tests/sys/boot/ (props changed)
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/ (props changed)
user/ngie/socket-tests/sys/conf/ (props changed)
user/ngie/socket-tests/sys/dev/hyperv/ (props changed)
user/ngie/socket-tests/usr.sbin/jail/ (props changed)
Modified: user/ngie/socket-tests/ObsoleteFiles.inc
==============================================================================
--- user/ngie/socket-tests/ObsoleteFiles.inc Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/ObsoleteFiles.inc Thu Jan 21 17:33:10 2016 (r294516)
@@ -39,9 +39,9 @@
# done
# 20160116: Update mandoc to cvs snapshot 20160116
-OLD_FILES+=/usr/share/mdocml/example.style.css
-OLD_FILES+=/usr/share/mdocml/style.css
-OLD_DIRS+=/usr/share/mdocml
+OLD_FILES+=usr/share/mdocml/example.style.css
+OLD_FILES+=usr/share/mdocml/style.css
+OLD_DIRS+=usr/share/mdocml
# 20151225: new clang import which bumps version from 3.7.0 to 3.7.1.
OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
Modified: user/ngie/socket-tests/UPDATING
==============================================================================
--- user/ngie/socket-tests/UPDATING Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/UPDATING Thu Jan 21 17:33:10 2016 (r294516)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20160119:
+ The NONE and HPN patches has been removed from OpenSSH. They are
+ still available in the security/openssh-portable port.
+
20160113:
With the addition of ypldap(8), a new _ypldap user is now required
during installworld. "mergemaster -p" can be used to add the user
Modified: user/ngie/socket-tests/bin/sh/options.c
==============================================================================
--- user/ngie/socket-tests/bin/sh/options.c Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/bin/sh/options.c Thu Jan 21 17:33:10 2016 (r294516)
@@ -74,6 +74,7 @@ static void options(int);
static void minus_o(char *, int);
static void setoption(int, int);
static void setoptionbyindex(int, int);
+static void setparam(int, char **);
static int getopts(char *, char *, char **, char ***, char **);
@@ -224,7 +225,7 @@ end_options1:
end_options2:
if (!cmdline) {
if (*argptr == NULL)
- setparam(argptr);
+ setparam(0, argptr);
return;
}
@@ -318,22 +319,20 @@ setoption(int flag, int val)
* Set the shell parameters.
*/
-void
-setparam(char **argv)
+static void
+setparam(int argc, char **argv)
{
char **newparam;
char **ap;
- int nparam;
- for (nparam = 0 ; argv[nparam] ; nparam++);
- ap = newparam = ckmalloc((nparam + 1) * sizeof *ap);
+ ap = newparam = ckmalloc((argc + 1) * sizeof *ap);
while (*argv) {
*ap++ = savestr(*argv++);
}
*ap = NULL;
freeparam(&shellparam);
shellparam.malloc = 1;
- shellparam.nparam = nparam;
+ shellparam.nparam = argc;
shellparam.p = newparam;
shellparam.optp = NULL;
shellparam.reset = 1;
@@ -371,8 +370,7 @@ freeparam(struct shparam *param)
int
shiftcmd(int argc, char **argv)
{
- int n;
- char **ap1, **ap2;
+ int i, n;
n = 1;
if (argc > 1)
@@ -381,12 +379,11 @@ shiftcmd(int argc, char **argv)
return 1;
INTOFF;
shellparam.nparam -= n;
- for (ap1 = shellparam.p ; --n >= 0 ; ap1++) {
- if (shellparam.malloc)
- ckfree(*ap1);
- }
- ap2 = shellparam.p;
- while ((*ap2++ = *ap1++) != NULL);
+ if (shellparam.malloc)
+ for (i = 0; i < n; i++)
+ ckfree(shellparam.p[i]);
+ memmove(shellparam.p, shellparam.p + n,
+ (shellparam.nparam + 1) * sizeof(shellparam.p[0]));
shellparam.reset = 1;
INTON;
return 0;
@@ -407,7 +404,7 @@ setcmd(int argc, char **argv)
options(0);
optschanged();
if (*argptr != NULL) {
- setparam(argptr);
+ setparam(argc - (argptr - argv), argptr);
}
INTON;
return 0;
Modified: user/ngie/socket-tests/bin/sh/options.h
==============================================================================
--- user/ngie/socket-tests/bin/sh/options.h Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/bin/sh/options.h Thu Jan 21 17:33:10 2016 (r294516)
@@ -108,7 +108,6 @@ extern char *nextopt_optptr; /* used by
void procargs(int, char **);
void optschanged(void);
-void setparam(char **);
void freeparam(struct shparam *);
int nextopt(const char *);
void getoptsreset(const char *);
Modified: user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.c Thu Jan 21 17:33:10 2016 (r294516)
@@ -443,6 +443,7 @@ mib_fetch_ifmib(struct mibif *ifp)
size_t len;
void *newmib;
struct ifmibdata oldmib = ifp->mib;
+ struct ifreq irr;
if (fetch_generic_mib(ifp, &oldmib) == -1)
return (-1);
@@ -514,6 +515,18 @@ mib_fetch_ifmib(struct mibif *ifp)
}
out:
+ strncpy(irr.ifr_name, ifp->name, sizeof(irr.ifr_name));
+ irr.ifr_buffer.buffer = MIBIF_PRIV(ifp)->alias;
+ irr.ifr_buffer.length = sizeof(MIBIF_PRIV(ifp)->alias);
+ if (ioctl(mib_netsock, SIOCGIFDESCR, &irr) == -1) {
+ MIBIF_PRIV(ifp)->alias[0] = 0;
+ if (errno != ENOMSG)
+ syslog(LOG_WARNING, "SIOCGIFDESCR (%s): %m", ifp->name);
+ } else if (irr.ifr_buffer.buffer == NULL) {
+ MIBIF_PRIV(ifp)->alias[0] = 0;
+ syslog(LOG_WARNING, "SIOCGIFDESCR (%s): too long (%zu)",
+ ifp->name, irr.ifr_buffer.length);
+ }
ifp->mibtick = get_ticks();
return (0);
}
Modified: user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h
==============================================================================
--- user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h Thu Jan 21 17:33:10 2016 (r294516)
@@ -57,6 +57,9 @@
#include "snmp_mibII.h"
#include "mibII_tree.h"
+/* maximum size of the interface alias */
+static const u_int MIBIF_ALIAS_SIZE = 64 + 1;
+
/*
* Interface list and flags.
*/
@@ -77,6 +80,9 @@ struct mibif_private {
uint64_t hc_opackets;
uint64_t hc_imcasts;
uint64_t hc_ipackets;
+
+ /* this should be made public */
+ char alias[MIBIF_ALIAS_SIZE];
};
#define MIBIF_PRIV(IFP) ((struct mibif_private *)((IFP)->private))
Modified: user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
==============================================================================
--- user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Thu Jan 21 17:33:10 2016 (r294516)
@@ -528,7 +528,7 @@ op_ifxtable(struct snmp_context *ctx, st
break;
case LEAF_ifAlias:
- ret = string_get(value, "", -1);
+ ret = string_get(value, MIBIF_PRIV(ifp)->alias, -1);
break;
case LEAF_ifCounterDiscontinuityTime:
Modified: user/ngie/socket-tests/contrib/mdocml/main.c
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/main.c Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/contrib/mdocml/main.c Thu Jan 21 17:33:10 2016 (r294516)
@@ -720,7 +720,7 @@ parse(struct curparse *curp, int fd, con
/* Begin by parsing the file itself. */
assert(file);
- assert(fd > 0);
+ assert(fd >= 0);
rctmp = mparse_readfd(curp->mp, fd, file);
if (fd != STDIN_FILENO)
Copied: user/ngie/socket-tests/crypto/openssh/.cvsignore (from r294514, head/crypto/openssh/.cvsignore)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/socket-tests/crypto/openssh/.cvsignore Thu Jan 21 17:33:10 2016 (r294516, copy of r294514, head/crypto/openssh/.cvsignore)
@@ -0,0 +1,28 @@
+*.0
+*.out
+Makefile
+autom4te.cache
+buildit.sh
+buildpkg.sh
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+openssh.xml
+opensshd.init
+scp
+sftp
+sftp-server
+ssh
+ssh-add
+ssh-agent
+ssh-keygen
+ssh-keyscan
+ssh-keysign
+ssh-pkcs11-helper
+sshd
+stamp-h.in
+survey
+survey.sh
Modified: user/ngie/socket-tests/crypto/openssh/ChangeLog
==============================================================================
--- user/ngie/socket-tests/crypto/openssh/ChangeLog Thu Jan 21 17:29:01 2016 (r294515)
+++ user/ngie/socket-tests/crypto/openssh/ChangeLog Thu Jan 21 17:33:10 2016 (r294516)
@@ -1,2887 +1,7615 @@
-20140313
- - (djm) Release OpenSSH 6.6
-
-20140304
- - OpenBSD CVS Sync
- - djm@cvs.openbsd.org 2014/03/03 22:22:30
- [session.c]
- ignore enviornment variables with embedded '=' or '\0' characters;
- spotted by Jann Horn; ok deraadt@
-
-20140301
- - (djm) [regress/Makefile] Disable dhgex regress test; it breaks when
- no moduli file exists at the expected location.
-
-20140228
- - OpenBSD CVS Sync
- - djm@cvs.openbsd.org 2014/02/27 00:41:49
- [bufbn.c]
- fix unsigned overflow that could lead to reading a short ssh protocol
- 1 bignum value; found by Ben Hawkes; ok deraadt@
- - djm@cvs.openbsd.org 2014/02/27 08:25:09
- [bufbn.c]
- off by one in range check
- - djm@cvs.openbsd.org 2014/02/27 22:47:07
- [sshd_config.5]
- bz#2184 clarify behaviour of a keyword that appears in multiple
- matching Match blocks; ok dtucker@
- - djm@cvs.openbsd.org 2014/02/27 22:57:40
- [version.h]
- openssh-6.6
- - dtucker@cvs.openbsd.org 2014/01/19 23:43:02
- [regress/sftp-chroot.sh]
- Don't use -q on sftp as it suppresses logging, instead redirect the
- output to the regress logfile.
- - dtucker@cvs.openbsd.org 2014/01/20 00:00:30
- [sregress/ftp-chroot.sh]
- append to rather than truncating the log file
- - dtucker@cvs.openbsd.org 2014/01/25 04:35:32
- [regress/Makefile regress/dhgex.sh]
- Add a test for DH GEX sizes
- - djm@cvs.openbsd.org 2014/01/26 10:22:10
- [regress/cert-hostkey.sh]
- automatically generate revoked keys from listed keys rather than
- manually specifying each type; from portable
- (Id sync only)
- - djm@cvs.openbsd.org 2014/01/26 10:49:17
- [scp-ssh-wrapper.sh scp.sh]
- make sure $SCP is tested on the remote end rather than whichever one
- happens to be in $PATH; from portable
- (Id sync only)
- - djm@cvs.openbsd.org 2014/02/27 20:04:16
- [login-timeout.sh]
- remove any existing LoginGraceTime from sshd_config before adding
- a specific one for the test back in
- - djm@cvs.openbsd.org 2014/02/27 21:21:25
- [agent-ptrace.sh agent.sh]
- keep return values that are printed in error messages;
- from portable
- (Id sync only)
- - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
- [contrib/suse/openssh.spec] Crank version numbers
- - (djm) [regress/host-expand.sh] Add RCS Id
-
-20140227
- - OpenBSD CVS Sync
- - djm@cvs.openbsd.org 2014/02/26 20:18:37
- [ssh.c]
- bz#2205: avoid early hostname lookups unless canonicalisation is enabled;
- ok dtucker@ markus@
- - djm@cvs.openbsd.org 2014/02/26 20:28:44
- [auth2-gss.c gss-serv.c ssh-gss.h sshd.c]
- bz#2107 - cache OIDs of supported GSSAPI mechanisms before privsep
- sandboxing, as running this code in the sandbox can cause violations;
- ok markus@
- - djm@cvs.openbsd.org 2014/02/26 20:29:29
- [channels.c]
- don't assume that the socks4 username is \0 terminated;
- spotted by Ben Hawkes; ok markus@
- - markus@cvs.openbsd.org 2014/02/26 21:53:37
- [sshd.c]
- ssh_gssapi_prepare_supported_oids needs GSSAPI
-
-20140224
- - OpenBSD CVS Sync
- - djm@cvs.openbsd.org 2014/02/07 06:55:54
- [cipher.c mac.c]
- remove some logging that makes ssh debugging output very verbose;
- ok markus
- - djm@cvs.openbsd.org 2014/02/15 23:05:36
- [channels.c]
- avoid spurious "getsockname failed: Bad file descriptor" errors in ssh -W;
- bz#2200, debian#738692 via Colin Watson; ok dtucker@
- - djm@cvs.openbsd.org 2014/02/22 01:32:19
- [readconf.c]
- when processing Match blocks, skip 'exec' clauses if previous predicates
- failed to match; ok markus@
- - djm@cvs.openbsd.org 2014/02/23 20:03:42
- [ssh-ed25519.c]
- check for unsigned overflow; not reachable in OpenSSH but others might
- copy our code...
- - djm@cvs.openbsd.org 2014/02/23 20:11:36
- [readconf.c readconf.h ssh.c ssh_config.5]
- reparse ssh_config and ~/.ssh/config if hostname canonicalisation changes
- the hostname. This allows users to write configurations that always
- refer to canonical hostnames, e.g.
-
- CanonicalizeHostname yes
- CanonicalDomains int.example.org example.org
- CanonicalizeFallbackLocal no
-
- Host *.int.example.org
- Compression off
- Host *.example.org
- User djm
-
- ok markus@
+commit c88ac102f0eb89f2eaa314cb2e2e0ca3c890c443
+Author: Damien Miller <djm@mindrot.org>
+Date: Thu Jan 14 11:08:19 2016 +1100
+
+ bump version numbers
+
+commit 302bc21e6fadacb04b665868cd69b625ef69df90
+Author: Damien Miller <djm@mindrot.org>
+Date: Thu Jan 14 11:04:04 2016 +1100
+
+ openssh-7.1p2
+
+commit 6b33763242c063e4e0593877e835eeb1fd1b60aa
+Author: Damien Miller <djm@mindrot.org>
+Date: Thu Jan 14 11:02:58 2016 +1100
+
+ forcibly disable roaming support in the client
+
+commit 34d364f0d2e1e30a444009f0e04299bb7c94ba13
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Oct 5 17:11:21 2015 +0000
+
+ upstream commit
+
+ some more bzero->explicit_bzero, from Michael McConville
+
+ Upstream-ID: 17f19545685c33327db2efdc357c1c9225ff00d0
+
+commit 8f5b93026797b9f7fba90d0c717570421ccebbd3
+Author: guenther@openbsd.org <guenther@openbsd.org>
+Date: Fri Sep 11 08:50:04 2015 +0000
+
+ upstream commit
+
+ Use explicit_bzero() when zeroing before free()
+
+ from Michael McConville (mmcconv1 (at) sccs.swarthmore.edu)
+ ok millert@ djm@
+
+ Upstream-ID: 2e3337db046c3fe70c7369ee31515ac73ec00f50
+
+commit d77148e3a3ef6c29b26ec74331455394581aa257
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sun Nov 8 21:59:11 2015 +0000
+
+ upstream commit
+
+ fix OOB read in packet code caused by missing return
+ statement found by Ben Hawkes; ok markus@ deraadt@
+
+ Upstream-ID: a3e3a85434ebfa0690d4879091959591f30efc62
+
+commit 076d849e17ab12603627f87b301e2dca71bae518
+Author: Damien Miller <djm@mindrot.org>
+Date: Sat Nov 14 18:44:49 2015 +1100
+
+ read back from libcrypto RAND when privdropping
+
+ makes certain libcrypto implementations cache a /dev/urandom fd
+ in preparation of sandboxing. Based on patch by Greg Hartman.
+
+commit f72adc0150011a28f177617a8456e1f83733099d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sun Dec 13 22:42:23 2015 +0000
+
+ upstream commit
+
+ unbreak connections with peers that set
+ first_kex_follows; fix from Matt Johnston va bz#2515
+
+ Upstream-ID: decc88ec4fc7515594fdb42b04aa03189a44184b
+
+commit 04bd8d019ccd906cac1a2b362517b8505f3759e6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Tue Jan 12 23:42:54 2016 +0000
+
+ upstream commit
+
+ use explicit_bzero() more liberally in the buffer code; ok
+ deraadt
+
+ Upstream-ID: 0ece37069fd66bc6e4f55eb1321f93df372b65bf
+
+commit e91346dc2bbf460246df2ab591b7613908c1b0ad
+Author: Damien Miller <djm@mindrot.org>
+Date: Fri Aug 21 14:49:03 2015 +1000
+
+ we don't use Github for issues/pull-requests
+
+commit a4f5b507c708cc3dc2c8dd2d02e4416d7514dc23
+Author: Damien Miller <djm@mindrot.org>
+Date: Fri Aug 21 14:43:55 2015 +1000
+
+ fix URL for connect.c
+
+commit d026a8d3da0f8186598442997c7d0a28e7275414
+Author: Damien Miller <djm@mindrot.org>
+Date: Fri Aug 21 13:47:10 2015 +1000
+
+ update version numbers for 7.1
+
+commit 78f8f589f0ca1c9f41e5a9bae3cda5ce8a6b42ed
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Aug 21 03:45:26 2015 +0000
+
+ upstream commit
+
+ openssh-7.1
+
+ Upstream-ID: ff7b1ef4b06caddfb45e08ba998128c88be3d73f
+
+commit 32a181980c62fce94f7f9ffaf6a79d90f0c309cf
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Aug 21 03:42:19 2015 +0000
+
+ upstream commit
+
+ fix inverted logic that broke PermitRootLogin; reported
+ by Mantas Mikulenas; ok markus@
+
+ Upstream-ID: 260dd6a904c1bb7e43267e394b1c9cf70bdd5ea5
+
+commit ce445b0ed927e45bd5bdce8f836eb353998dd65c
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date: Thu Aug 20 22:32:42 2015 +0000
+
+ upstream commit
+
+ Do not cast result of malloc/calloc/realloc* if stdlib.h
+ is in scope ok krw millert
+
+ Upstream-ID: 5e50ded78cadf3841556649a16cc4b1cb6c58667
+
+commit 05291e5288704d1a98bacda269eb5a0153599146
+Author: naddy@openbsd.org <naddy@openbsd.org>
+Date: Thu Aug 20 19:20:06 2015 +0000
+
+ upstream commit
+
+ In the certificates section, be consistent about using
+ "host_key" and "user_key" for the respective key types. ok sthen@ deraadt@
+
+ Upstream-ID: 9e037ea3b15577b238604c5533e082a3947f13cb
+
+commit 8543d4ef6f2e9f98c3e6b77c894ceec30c5e4ae4
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Aug 19 23:21:42 2015 +0000
+
+ upstream commit
+
+ Better compat matching for WinSCP, add compat matching
+ for FuTTY (fork of PuTTY); ok markus@ deraadt@
+
+ Upstream-ID: 24001d1ac115fa3260fbdc329a4b9aeb283c5389
+
+commit ec6eda16ebab771aa3dfc90629b41953b999cb1e
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Aug 19 23:19:01 2015 +0000
+
+ upstream commit
+
+ fix double-free() in error path of DSA key generation
+ reported by Mateusz Kocielski; ok markus@
+
+ Upstream-ID: 4735d8f888b10599a935fa1b374787089116713c
+
+commit 45b0eb752c94954a6de046bfaaf129e518ad4b5b
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Aug 19 23:18:26 2015 +0000
+
+ upstream commit
+
+ fix free() of uninitialised pointer reported by Mateusz
+ Kocielski; ok markus@
+
+ Upstream-ID: 519552b050618501a06b7b023de5cb104e2c5663
+
+commit c837643b93509a3ef538cb6624b678c5fe32ff79
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Aug 19 23:17:51 2015 +0000
+
+ upstream commit
+
+ fixed unlink([uninitialised memory]) reported by Mateusz
+ Kocielski; ok markus@
+
+ Upstream-ID: 14a0c4e7d891f5a8dabc4b89d4f6b7c0d5a20109
+
+commit 1f8d3d629cd553031021068eb9c646a5f1e50994
+Author: jmc@openbsd.org <jmc@openbsd.org>
+Date: Fri Aug 14 15:32:41 2015 +0000
+
+ upstream commit
+
+ match myproposal.h order; from brian conway (i snuck in a
+ tweak while here)
+
+ ok dtucker
+
+ Upstream-ID: 35174a19b5237ea36aa3798f042bf5933b772c67
+
+commit 1dc8d93ce69d6565747eb44446ed117187621b26
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date: Thu Aug 6 14:53:21 2015 +0000
+
+ upstream commit
+
+ add prohibit-password as a synonymn for without-password,
+ since the without-password is causing too many questions. Harden it to ban
+ all but pubkey, hostbased, and GSSAPI auth (when the latter is enabled) from
+ djm, ok markus
+
+ Upstream-ID: d53317d7b28942153e6236d3fd6e12ceb482db7a
+
+commit 90a95a4745a531b62b81ce3b025e892bdc434de5
+Author: Damien Miller <djm@mindrot.org>
+Date: Tue Aug 11 13:53:41 2015 +1000
+
+ update version in README
+
+commit 318c37743534b58124f1bab37a8a0087a3a9bd2f
+Author: Damien Miller <djm@mindrot.org>
+Date: Tue Aug 11 13:53:09 2015 +1000
+
+ update versions in *.spec
+
+commit 5e75f5198769056089fb06c4d738ab0e5abc66f7
+Author: Damien Miller <djm@mindrot.org>
+Date: Tue Aug 11 13:34:12 2015 +1000
+
+ set sshpam_ctxt to NULL after free
+
+ Avoids use-after-free in monitor when privsep child is compromised.
+ Reported by Moritz Jodeit; ok dtucker@
+
+commit d4697fe9a28dab7255c60433e4dd23cf7fce8a8b
+Author: Damien Miller <djm@mindrot.org>
+Date: Tue Aug 11 13:33:24 2015 +1000
+
+ Don't resend username to PAM; it already has it.
+
+ Pointed out by Moritz Jodeit; ok dtucker@
+
+commit 88763a6c893bf3dfe951ba9271bf09715e8d91ca
+Author: Darren Tucker <dtucker@zip.com.au>
+Date: Mon Jul 27 12:14:25 2015 +1000
+
+ Import updated moduli file from OpenBSD.
+
+commit 55b263fb7cfeacb81aaf1c2036e0394c881637da
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Aug 10 11:13:44 2015 +1000
+
+ let principals-command.sh work for noexec /var/run
+
+commit 2651e34cd11b1aac3a0fe23b86d8c2ff35c07897
+Author: Damien Miller <djm@mindrot.org>
+Date: Thu Aug 6 11:43:42 2015 +1000
+
+ work around echo -n / sed behaviour in tests
+
+commit d85dad81778c1aa8106acd46930b25fdf0d15b2a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Aug 5 05:27:33 2015 +0000
+
+ upstream commit
+
+ adjust for RSA minimum modulus switch; ok deraadt@
+
+ Upstream-Regress-ID: 5a72c83431b96224d583c573ca281cd3a3ebfdae
+
+commit 57e8e229bad5fe6056b5f1199665f5f7008192c6
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Tue Aug 4 05:23:06 2015 +0000
+
+ upstream commit
+
+ backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this
+ release; problems spotted by sthen@ ok deraadt@ markus@
+
+ Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822
+
+commit f097d0ea1e0889ca0fa2e53a00214e43ab7fa22a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sun Aug 2 09:56:42 2015 +0000
+
+ upstream commit
+
+ openssh 7.0; ok deraadt@
+
+ Upstream-ID: c63afdef537f57f28ae84145c5a8e29e9250221f
+
+commit 3d5728a0f6874ce4efb16913a12963595070f3a9
+Author: chris@openbsd.org <chris@openbsd.org>
+Date: Fri Jul 31 15:38:09 2015 +0000
+
+ upstream commit
+
+ Allow PermitRootLogin to be overridden by config
+
+ ok markus@ deeradt@
+
+ Upstream-ID: 5cf3e26ed702888de84e2dc9d0054ccf4d9125b4
+
+commit 6f941396b6835ad18018845f515b0c4fe20be21a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Jul 30 23:09:15 2015 +0000
+
+ upstream commit
+
+ fix pty permissions; patch from Nikolay Edigaryev; ok
+ deraadt
+
+ Upstream-ID: 40ff076d2878b916fbfd8e4f45dbe5bec019e550
+
+commit f4373ed1e8fbc7c8ce3fc4ea97d0ba2e0c1d7ef0
+Author: deraadt@openbsd.org <deraadt@openbsd.org>
+Date: Thu Jul 30 19:23:02 2015 +0000
+
+ upstream commit
+
+ change default: PermitRootLogin without-password matching
+ install script changes coming as well ok djm markus
+
+ Upstream-ID: 0e2a6c4441daf5498b47a61767382bead5eb8ea6
+
+commit 0c30ba91f87fcda7e975e6ff8a057f624e87ea1c
+Author: Damien Miller <djm@mindrot.org>
+Date: Thu Jul 30 12:31:39 2015 +1000
+
+ downgrade OOM adjustment logging: verbose -> debug
+
+commit f9eca249d4961f28ae4b09186d7dc91de74b5895
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Thu Jul 30 00:01:34 2015 +0000
+
+ upstream commit
+
+ Allow ssh_config and sshd_config kex parameters options be
+ prefixed by a '+' to indicate that the specified items be appended to the
+ default rather than replacing it.
+
+ approach suggested by dtucker@, feedback dlg@, ok markus@
+
+ Upstream-ID: 0f901137298fc17095d5756ff1561a7028e8882a
+
+commit 5cefe769105a2a2e3ca7479d28d9a325d5ef0163
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 29 08:34:54 2015 +0000
+
+ upstream commit
+
+ fix bug in previous; was printing incorrect string for
+ failed host key algorithms negotiation
+
+ Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e
+
+commit f319912b0d0e1675b8bb051ed8213792c788bcb2
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 29 04:43:06 2015 +0000
+
+ upstream commit
+
+ include the peer's offer when logging a failure to
+ negotiate a mutual set of algorithms (kex, pubkey, ciphers, etc.) ok markus@
+
+ Upstream-ID: bbb8caabf5c01790bb845f5ce135565248d7c796
+
+commit b6ea0e573042eb85d84defb19227c89eb74cf05a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Tue Jul 28 23:20:42 2015 +0000
+
+ upstream commit
+
+ add Cisco to the list of clients that choke on the
+ hostkeys update extension. Pointed out by Howard Kash
+
+ Upstream-ID: c9eadde28ecec056c73d09ee10ba4570dfba7e84
+
+commit 3f628c7b537291c1019ce86af90756fb4e66d0fd
+Author: guenther@openbsd.org <guenther@openbsd.org>
+Date: Mon Jul 27 16:29:23 2015 +0000
+
+ upstream commit
+
+ Permit kbind(2) use in the sandbox now, to ease testing
+ of ld.so work using it
+
+ reminded by miod@, ok deraadt@
+
+ Upstream-ID: 523922e4d1ba7a091e3824e77a8a3c818ee97413
+
+commit ebe27ebe520098bbc0fe58945a87ce8490121edb
+Author: millert@openbsd.org <millert@openbsd.org>
+Date: Mon Jul 20 18:44:12 2015 +0000
+
+ upstream commit
+
+ Move .Pp before .Bl, not after to quiet mandoc -Tlint.
+ Noticed by jmc@
+
+ Upstream-ID: 59fadbf8407cec4e6931e50c53cfa0214a848e23
+
+commit d5d91d0da819611167782c66ab629159169d94d4
+Author: millert@openbsd.org <millert@openbsd.org>
+Date: Mon Jul 20 18:42:35 2015 +0000
+
+ upstream commit
+
+ Sync usage with SYNOPSIS
+
+ Upstream-ID: 7a321a170181a54f6450deabaccb6ef60cf3f0b7
+
+commit 79ec2142fbc68dd2ed9688608da355fc0b1ed743
+Author: millert@openbsd.org <millert@openbsd.org>
+Date: Mon Jul 20 15:39:52 2015 +0000
+
+ upstream commit
+
+ Better desciption of Unix domain socket forwarding.
+ bz#2423; ok jmc@
+
+ Upstream-ID: 85e28874726897e3f26ae50dfa2e8d2de683805d
+
+commit d56fd1828074a4031b18b8faa0bf949669eb18a0
+Author: Damien Miller <djm@mindrot.org>
+Date: Mon Jul 20 11:19:51 2015 +1000
+
+ make realpath.c compile -Wsign-compare clean
+
+commit c63c9a691dca26bb7648827f5a13668832948929
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Jul 20 00:30:01 2015 +0000
+
+ upstream commit
+
+ mention that the default of UseDNS=no implies that
+ hostnames cannot be used for host matching in sshd_config and
+ authorized_keys; bz#2045, ok dtucker@
+
+ Upstream-ID: 0812705d5f2dfa59aab01f2764ee800b1741c4e1
+
+commit 63ebcd0005e9894fcd6871b7b80aeea1fec0ff76
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sat Jul 18 08:02:17 2015 +0000
+
+ upstream commit
+
+ don't ignore PKCS#11 hosted keys that return empty
+ CKA_ID; patch by Jakub Jelen via bz#2429; ok markus
+
+ Upstream-ID: 2f7c94744eb0342f8ee8bf97b2351d4e00116485
+
+commit b15fd989c8c62074397160147a8d5bc34b3f3c63
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sat Jul 18 08:00:21 2015 +0000
+
+ upstream commit
+
+ skip uninitialised PKCS#11 slots; patch from Jakub Jelen
+ in bz#2427 ok markus@
+
+ Upstream-ID: 744c1e7796e237ad32992d0d02148e8a18f27d29
+
+commit 5b64f85bb811246c59ebab70aed331f26ba37b18
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Sat Jul 18 07:57:14 2015 +0000
+
+ upstream commit
+
+ only query each keyboard-interactive device once per
+ authentication request regardless of how many times it is listed; ok markus@
+
+ Upstream-ID: d73fafba6e86030436ff673656ec1f33d9ffeda1
+
+commit cd7324d0667794eb5c236d8a4e0f236251babc2d
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jul 17 03:34:27 2015 +0000
+
+ upstream commit
+
+ remove -u flag to diff (only used for error output) to make
+ things easier for -portable
+
+ Upstream-Regress-ID: a5d6777d2909540d87afec3039d9bb2414ade548
+
+commit deb8d99ecba70b67f4af7880b11ca8768df9ec3a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jul 17 03:09:19 2015 +0000
+
+ upstream commit
+
+ direct-streamlocal@openssh.com Unix domain foward
+ messages do not contain a "reserved for future use" field and in fact,
+ serverloop.c checks that there isn't one. Remove erroneous mention from
+ PROTOCOL description. bz#2421 from Daniel Black
+
+ Upstream-ID: 3d51a19e64f72f764682f1b08f35a8aa810a43ac
+
+commit 356b61f365405b5257f5b2ab446e5d7bd33a7b52
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jul 17 03:04:27 2015 +0000
+
+ upstream commit
+
+ describe magic for setting up Unix domain socket fowards
+ via the mux channel; bz#2422 patch from Daniel Black
+
+ Upstream-ID: 943080fe3864715c423bdeb7c920bb30c4eee861
+
+commit d3e2aee41487d55b8d7d40f538b84ff1db7989bc
+Author: Darren Tucker <dtucker@zip.com.au>
+Date: Fri Jul 17 12:52:34 2015 +1000
+
+ Check if realpath works on nonexistent files.
+
+ On some platforms the native realpath doesn't work with non-existent
+ files (this is actually specified in some versions of POSIX), however
+ the sftp spec says its realpath with "canonicalize any given path name".
+ On those platforms, use realpath from the compat library.
+
+ In addition, when compiling with -DFORTIFY_SOURCE, glibc redefines
+ the realpath symbol to the checked version, so redefine ours to
+ something else so we pick up the compat version we want.
+
+ bz#2428, ok djm@
+
+commit 25b14610dab655646a109db5ef8cb4c4bf2a48a0
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jul 17 02:47:45 2015 +0000
+
+ upstream commit
+
+ fix incorrect test for SSH1 keys when compiled without SSH1
+ support
+
+ Upstream-ID: 6004d720345b8e481c405e8ad05ce2271726e451
+
+commit df56a8035d429b2184ee94aaa7e580c1ff67f73a
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 15 08:00:11 2015 +0000
+
+ upstream commit
+
+ fix NULL-deref when SSH1 reenabled
+
+ Upstream-ID: f22fd805288c92b3e9646782d15b48894b2d5295
+
+commit 41e38c4d49dd60908484e6703316651333f16b93
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 15 07:19:50 2015 +0000
+
+ upstream commit
+
+ regen RSA1 test keys; the last batch was missing their
+ private parts
+
+ Upstream-Regress-ID: 7ccf437305dd63ff0b48dd50c5fd0f4d4230c10a
+
+commit 5bf0933184cb622ca3f96d224bf3299fd2285acc
+Author: markus@openbsd.org <markus@openbsd.org>
+Date: Fri Jul 10 06:23:25 2015 +0000
+
+ upstream commit
+
+ Adapt tests, now that DSA if off by default; use
+ PubkeyAcceptedKeyTypes and PubkeyAcceptedKeyTypes to test DSA.
+
+ Upstream-Regress-ID: 0ff2a3ff5ac1ce5f92321d27aa07b98656efcc5c
+
+commit 7a6e3fd7b41dbd3756b6bf9acd67954c0b1564cc
+Author: markus@openbsd.org <markus@openbsd.org>
+Date: Tue Jul 7 14:54:16 2015 +0000
+
+ upstream commit
+
+ regen test data after mktestdata.sh changes
+
+ Upstream-Regress-ID: 3495ecb082b9a7c048a2d7c5c845d3bf181d25a4
+
+commit 7c8c174c69f681d4910fa41c37646763692b28e2
+Author: markus@openbsd.org <markus@openbsd.org>
+Date: Tue Jul 7 14:53:30 2015 +0000
+
+ upstream commit
+
+ adapt tests to new minimum RSA size and default FP format
+
+ Upstream-Regress-ID: a4b30afd174ce82b96df14eb49fb0b81398ffd0e
+
+commit 6a977a4b68747ade189e43d302f33403fd4a47ac
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Fri Jul 3 04:39:23 2015 +0000
+
+ upstream commit
+
+ legacy v00 certificates are gone; adapt and don't try to
+ test them; "sure" markus@ dtucker@
+
+ Upstream-Regress-ID: c57321e69b3cd4a3b3396dfcc43f0803d047da12
+
+commit 0c4123ad5e93fb90fee9c6635b13a6cdabaac385
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Wed Jul 1 23:11:18 2015 +0000
+
+ upstream commit
+
+ don't expect SSH v.1 in unittests
+
+ Upstream-Regress-ID: f8812b16668ba78e6a698646b2a652b90b653397
+
+commit 3c099845798a817cdde513c39074ec2063781f18
+Author: djm@openbsd.org <djm@openbsd.org>
+Date: Mon Jun 15 06:38:50 2015 +0000
+
+ upstream commit
+
+ turn SSH1 back on to match src/usr.bin/ssh being tested
+
+ Upstream-Regress-ID: 6c4f763a2f0cc6893bf33983919e9030ae638333
+
+commit b1dc2b33689668c75e95f873a42d5aea1f4af1db
+Author: dtucker@openbsd.org <dtucker@openbsd.org>
+Date: Mon Jul 13 04:57:14 2015 +0000
+
+ upstream commit
+
+ Add "PuTTY_Local:" to the clients to which we do not
+ offer DH-GEX. This was the string that was used for development versions
+ prior to September 2014 and they don't do RFC4419 DH-GEX, but unfortunately
+ there are some extant products based on those versions. bx2424 from Jay
+ Rouman, ok markus@ djm@
+
+ Upstream-ID: be34d41e18b966832fe09ca243d275b81882e1d5
+
+commit 3a1638dda19bbc73d0ae02b4c251ce08e564b4b9
+Author: markus@openbsd.org <markus@openbsd.org>
+Date: Fri Jul 10 06:21:53 2015 +0000
+
+ upstream commit
+
+ Turn off DSA by default; add HostKeyAlgorithms to the
+ server and PubkeyAcceptedKeyTypes to the client side, so it still can be
+ tested or turned back on; feedback and ok djm@
+
+ Upstream-ID: 8450a9e6d83f80c9bfed864ff061dfc9323cec21
+
+commit 16db0a7ee9a87945cc594d13863cfcb86038db59
+Author: markus@openbsd.org <markus@openbsd.org>
+Date: Thu Jul 9 09:49:46 2015 +0000
+
+ upstream commit
+
+ re-enable ed25519-certs if compiled w/o openssl; ok djm
+
+ Upstream-ID: e10c90808b001fd2c7a93778418e9b318f5c4c49
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Fri Jan 22 07:35:11 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAC50A8B886
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 22 Jan 2016 07:35:11 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 898B815DA;
Fri, 22 Jan 2016 07:35:11 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0M7ZAwD068261;
Fri, 22 Jan 2016 07:35:10 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0M7ZAx5068260;
Fri, 22 Jan 2016 07:35:10 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601220735.u0M7ZAx5068260@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 22 Jan 2016 07:35:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294555 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2016 07:35:11 -0000
Author: ngie
Date: Fri Jan 22 07:35:10 2016
New Revision: 294555
URL: https://svnweb.freebsd.org/changeset/base/294555
Log:
Use less terse names for bintime (bt), cmesgcred (cmcred),
sockcred (sc), and timeval (tv)
Requested by: bde
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Fri Jan 22 07:32:39 2016 (r294554)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Fri Jan 22 07:35:10 2016 (r294555)
@@ -1031,63 +1031,63 @@ check_xucred(const struct xucred *xucred
static int
check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
{
- const struct cmsgcred *cmsgcred;
+ const struct cmsgcred *cmcred;
int rc;
- if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(*cmsgcred)) < 0)
+ if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(struct cmsgcred)) < 0)
return (-1);
- cmsgcred = (struct cmsgcred *)CMSG_DATA(cmsghdr);
+ cmcred = (struct cmsgcred *)CMSG_DATA(cmsghdr);
- dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmsgcred->cmcred_pid);
- dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmsgcred->cmcred_uid);
- dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmsgcred->cmcred_euid);
- dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred->cmcred_gid);
- dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred->cmcred_ngroups);
+ dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmcred->cmcred_pid);
+ dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmcred->cmcred_uid);
+ dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmcred->cmcred_euid);
+ dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmcred->cmcred_gid);
+ dbgmsg("cmsgcred.cmcred_ngroups %d", cmcred->cmcred_ngroups);
rc = 0;
- if (cmsgcred->cmcred_pid != client_pid) {
+ if (cmcred->cmcred_pid != client_pid) {
logmsgx("cmsgcred.cmcred_pid %ld != %ld",
- (long)cmsgcred->cmcred_pid, (long)client_pid);
+ (long)cmcred->cmcred_pid, (long)client_pid);
rc = -1;
}
- if (cmsgcred->cmcred_uid != proc_cred.uid) {
+ if (cmcred->cmcred_uid != proc_cred.uid) {
logmsgx("cmsgcred.cmcred_uid %lu != %lu",
- (u_long)cmsgcred->cmcred_uid, (u_long)proc_cred.uid);
+ (u_long)cmcred->cmcred_uid, (u_long)proc_cred.uid);
rc = -1;
}
- if (cmsgcred->cmcred_euid != proc_cred.euid) {
+ if (cmcred->cmcred_euid != proc_cred.euid) {
logmsgx("cmsgcred.cmcred_euid %lu != %lu",
- (u_long)cmsgcred->cmcred_euid, (u_long)proc_cred.euid);
+ (u_long)cmcred->cmcred_euid, (u_long)proc_cred.euid);
rc = -1;
}
- if (cmsgcred->cmcred_gid != proc_cred.gid) {
+ if (cmcred->cmcred_gid != proc_cred.gid) {
logmsgx("cmsgcred.cmcred_gid %lu != %lu",
- (u_long)cmsgcred->cmcred_gid, (u_long)proc_cred.gid);
+ (u_long)cmcred->cmcred_gid, (u_long)proc_cred.gid);
rc = -1;
}
- if (cmsgcred->cmcred_ngroups == 0) {
+ if (cmcred->cmcred_ngroups == 0) {
logmsgx("cmsgcred.cmcred_ngroups == 0");
rc = -1;
}
- if (cmsgcred->cmcred_ngroups < 0) {
+ if (cmcred->cmcred_ngroups < 0) {
logmsgx("cmsgcred.cmcred_ngroups %d < 0",
- cmsgcred->cmcred_ngroups);
+ cmcred->cmcred_ngroups);
rc = -1;
}
- if (cmsgcred->cmcred_ngroups > CMGROUP_MAX) {
+ if (cmcred->cmcred_ngroups > CMGROUP_MAX) {
logmsgx("cmsgcred.cmcred_ngroups %d > %d",
- cmsgcred->cmcred_ngroups, CMGROUP_MAX);
+ cmcred->cmcred_ngroups, CMGROUP_MAX);
rc = -1;
}
- if (cmsgcred->cmcred_groups[0] != proc_cred.egid) {
+ if (cmcred->cmcred_groups[0] != proc_cred.egid) {
logmsgx("cmsgcred.cmcred_groups[0] %lu != %lu (EGID)",
- (u_long)cmsgcred->cmcred_groups[0], (u_long)proc_cred.egid);
+ (u_long)cmcred->cmcred_groups[0], (u_long)proc_cred.egid);
rc = -1;
}
- if (check_groups("cmsgcred.cmcred_groups", cmsgcred->cmcred_groups,
- "cmsgcred.cmcred_ngroups", cmsgcred->cmcred_ngroups, false) < 0)
+ if (check_groups("cmsgcred.cmcred_groups", cmcred->cmcred_groups,
+ "cmsgcred.cmcred_ngroups", cmcred->cmcred_ngroups, false) < 0)
rc = -1;
return (rc);
}
@@ -1095,59 +1095,59 @@ check_scm_creds_cmsgcred(struct cmsghdr
static int
check_scm_creds_sockcred(struct cmsghdr *cmsghdr)
{
- const struct sockcred *sockcred;
+ const struct sockcred *sc;
int rc;
if (check_cmsghdr(cmsghdr, SCM_CREDS,
SOCKCREDSIZE(proc_cred.gid_num)) < 0)
return (-1);
- sockcred = (struct sockcred *)CMSG_DATA(cmsghdr);
+ sc = (struct sockcred *)CMSG_DATA(cmsghdr);
rc = 0;
- dbgmsg("sockcred.sc_uid %lu", (u_long)sockcred->sc_uid);
- dbgmsg("sockcred.sc_euid %lu", (u_long)sockcred->sc_euid);
- dbgmsg("sockcred.sc_gid %lu", (u_long)sockcred->sc_gid);
- dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred->sc_egid);
- dbgmsg("sockcred.sc_ngroups %d", sockcred->sc_ngroups);
+ dbgmsg("sockcred.sc_uid %lu", (u_long)sc->sc_uid);
+ dbgmsg("sockcred.sc_euid %lu", (u_long)sc->sc_euid);
+ dbgmsg("sockcred.sc_gid %lu", (u_long)sc->sc_gid);
+ dbgmsg("sockcred.sc_egid %lu", (u_long)sc->sc_egid);
+ dbgmsg("sockcred.sc_ngroups %d", sc->sc_ngroups);
- if (sockcred->sc_uid != proc_cred.uid) {
+ if (sc->sc_uid != proc_cred.uid) {
logmsgx("sockcred.sc_uid %lu != %lu",
- (u_long)sockcred->sc_uid, (u_long)proc_cred.uid);
+ (u_long)sc->sc_uid, (u_long)proc_cred.uid);
rc = -1;
}
- if (sockcred->sc_euid != proc_cred.euid) {
+ if (sc->sc_euid != proc_cred.euid) {
logmsgx("sockcred.sc_euid %lu != %lu",
- (u_long)sockcred->sc_euid, (u_long)proc_cred.euid);
+ (u_long)sc->sc_euid, (u_long)proc_cred.euid);
rc = -1;
}
- if (sockcred->sc_gid != proc_cred.gid) {
+ if (sc->sc_gid != proc_cred.gid) {
logmsgx("sockcred.sc_gid %lu != %lu",
- (u_long)sockcred->sc_gid, (u_long)proc_cred.gid);
+ (u_long)sc->sc_gid, (u_long)proc_cred.gid);
rc = -1;
}
- if (sockcred->sc_egid != proc_cred.egid) {
+ if (sc->sc_egid != proc_cred.egid) {
logmsgx("sockcred.sc_egid %lu != %lu",
- (u_long)sockcred->sc_egid, (u_long)proc_cred.egid);
+ (u_long)sc->sc_egid, (u_long)proc_cred.egid);
rc = -1;
}
- if (sockcred->sc_ngroups == 0) {
+ if (sc->sc_ngroups == 0) {
logmsgx("sockcred.sc_ngroups == 0");
rc = -1;
}
- if (sockcred->sc_ngroups < 0) {
+ if (sc->sc_ngroups < 0) {
logmsgx("sockcred.sc_ngroups %d < 0",
- sockcred->sc_ngroups);
+ sc->sc_ngroups);
rc = -1;
}
- if (sockcred->sc_ngroups != proc_cred.gid_num) {
+ if (sc->sc_ngroups != proc_cred.gid_num) {
logmsgx("sockcred.sc_ngroups %d != %u",
- sockcred->sc_ngroups, proc_cred.gid_num);
+ sc->sc_ngroups, proc_cred.gid_num);
rc = -1;
}
- if (check_groups("sockcred.sc_groups", sockcred->sc_groups,
- "sockcred.sc_ngroups", sockcred->sc_ngroups, true) < 0)
+ if (check_groups("sockcred.sc_groups", sc->sc_groups,
+ "sockcred.sc_ngroups", sc->sc_ngroups, true) < 0)
rc = -1;
return (rc);
}
@@ -1155,15 +1155,15 @@ check_scm_creds_sockcred(struct cmsghdr
static int
check_scm_timestamp(struct cmsghdr *cmsghdr)
{
- const struct timeval *timeval;
+ const struct timeval *tv;
if (check_cmsghdr(cmsghdr, SCM_TIMESTAMP, sizeof(struct timeval)) < 0)
return (-1);
- timeval = (struct timeval *)CMSG_DATA(cmsghdr);
+ tv = (struct timeval *)CMSG_DATA(cmsghdr);
dbgmsg("timeval.tv_sec %"PRIdMAX", timeval.tv_usec %"PRIdMAX,
- (intmax_t)timeval->tv_sec, (intmax_t)timeval->tv_usec);
+ (intmax_t)tv->tv_sec, (intmax_t)tv->tv_usec);
return (0);
}
@@ -1171,15 +1171,15 @@ check_scm_timestamp(struct cmsghdr *cmsg
static int
check_scm_bintime(struct cmsghdr *cmsghdr)
{
- const struct bintime *bintime;
+ const struct bintime *bt;
if (check_cmsghdr(cmsghdr, SCM_BINTIME, sizeof(struct bintime)) < 0)
return (-1);
- bintime = (struct bintime *)CMSG_DATA(cmsghdr);
+ bt = (struct bintime *)CMSG_DATA(cmsghdr);
dbgmsg("bintime.sec %"PRIdMAX", bintime.frac %"PRIu64,
- (intmax_t)bintime->sec, bintime->frac);
+ (intmax_t)bt->sec, bt->frac);
return (0);
}
From owner-svn-src-user@freebsd.org Sat Jan 23 22:26:06 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90E87A8D5CA
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 23 Jan 2016 22:26:06 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 47D471760;
Sat, 23 Jan 2016 22:26:06 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NMQ5Bt081734;
Sat, 23 Jan 2016 22:26:05 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NMQ52d081733;
Sat, 23 Jan 2016 22:26:05 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601232226.u0NMQ52d081733@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 23 Jan 2016 22:26:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294643 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jan 2016 22:26:06 -0000
Author: ngie
Date: Sat Jan 23 22:26:05 2016
New Revision: 294643
URL: https://svnweb.freebsd.org/changeset/base/294643
Log:
Don't run t_cmsg_len on 64-bit architectures; it always fails when
trying to send through the sendit(9) KPI in the kernel due to a size
mismatch between the msghdr and data being sent, that suspiciously
seems like it's related to sizeof pointers instead of scalars, or
something of that ilk
PR: 206543
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sat Jan 23 22:13:31 2016 (r294642)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sat Jan 23 22:26:05 2016 (r294643)
@@ -83,7 +83,13 @@ static int t_sockcred_2(void);
static int t_cmsgcred_sockcred(void);
static int t_timeval(void);
static int t_bintime(void);
+/*
+ * The testcase fails on 64-bit architectures (amd64), but passes on 32-bit
+ * architectures (i386); see bug 206543
+ */
+#ifndef __LP64__
static int t_cmsg_len(void);
+#endif
static int t_peercred(void);
struct test_func {
@@ -120,10 +126,12 @@ static const struct test_func test_strea
.func = t_bintime,
.desc = "Sending, receiving bintime"
},
+#ifndef __LP64__
{
.func = t_cmsg_len,
.desc = "Check cmsghdr.cmsg_len"
},
+#endif
{
.func = t_peercred,
.desc = "Check LOCAL_PEERCRED socket option"
@@ -158,10 +166,12 @@ static const struct test_func test_dgram
.func = t_bintime,
.desc = "Sending, receiving bintime"
},
+#ifndef __LP64__
{
.func = t_cmsg_len,
.desc = "Check cmsghdr.cmsg_len"
}
+#endif
};
#define TEST_DGRAM_TBL_SIZE \
@@ -1825,6 +1835,7 @@ t_bintime(void)
return (t_generic(t_bintime_client, t_bintime_server));
}
+#ifndef __LP64__
static int
t_cmsg_len_client(int fd)
{
@@ -1914,6 +1925,7 @@ t_cmsg_len(void)
{
return (t_generic(t_cmsg_len_client, t_cmsg_len_server));
}
+#endif
static int
t_peercred_client(int fd)
From owner-svn-src-user@freebsd.org Sat Jan 23 22:26:52 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4B03A8D617
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 23 Jan 2016 22:26:52 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 B802A18B1;
Sat, 23 Jan 2016 22:26:52 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NMQp3w081816;
Sat, 23 Jan 2016 22:26:51 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NMQpdX081815;
Sat, 23 Jan 2016 22:26:51 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601232226.u0NMQpdX081815@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 23 Jan 2016 22:26:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294644 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jan 2016 22:26:53 -0000
Author: ngie
Date: Sat Jan 23 22:26:51 2016
New Revision: 294644
URL: https://svnweb.freebsd.org/changeset/base/294644
Log:
Add some more debugging to help aid in figuring out what's going
on in the test program
Sponsored by: EMC / Isilon Storage Division
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sat Jan 23 22:26:05 2016 (r294643)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Sat Jan 23 22:26:51 2016 (r294644)
@@ -1233,6 +1233,10 @@ msghdr_init_client(struct msghdr *msghdr
msghdr_init_generic(msghdr, iov, cmsg_data);
if (cmsg_data != NULL) {
+ if (send_array_flag)
+ dbgmsg("sending an array");
+ else
+ dbgmsg("sending a scalar");
msghdr->msg_controllen = send_array_flag ?
cmsg_size : CMSG_SPACE(0);
cmsghdr = CMSG_FIRSTHDR(msghdr);
@@ -1874,8 +1878,11 @@ t_cmsg_len_client(int fd)
(u_int)msghdr.msg_controllen);
dbgmsg("send: cmsghdr.cmsg_len %u",
(u_int)cmsghdr->cmsg_len);
- if (sendmsg(fd, &msghdr, 0) < 0)
+ if (sendmsg(fd, &msghdr, 0) < 0) {
+ dbgmsg("sendmsg(2) failed: %s; retrying",
+ strerror(errno));
continue;
+ }
logmsgx("sent message with cmsghdr.cmsg_len %u < %u",
(u_int)cmsghdr->cmsg_len, (u_int)CMSG_LEN(0));
break;
From owner-svn-src-user@freebsd.org Sat Jan 23 22:56:30 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEB1DA8E3D7
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 23 Jan 2016 22:56:30 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::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 5EB1C1DC2;
Sat, 23 Jan 2016 22:56:30 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NMuTTc090761;
Sat, 23 Jan 2016 22:56:29 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NMuRxG090740;
Sat, 23 Jan 2016 22:56:27 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601232256.u0NMuRxG090740@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 23 Jan 2016 22:56:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294648 - in user/ngie/socket-tests: bin/setfacl bin/sh
bin/sh/tests/builtins contrib/bsnmp/snmp_mibII
contrib/compiler-rt/lib/builtins contrib/compiler-rt/lib/sanitizer_common
contrib/...
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jan 2016 22:56:30 -0000
Author: ngie
Date: Sat Jan 23 22:56:26 2016
New Revision: 294648
URL: https://svnweb.freebsd.org/changeset/base/294648
Log:
MFhead @ r294647
Added:
user/ngie/socket-tests/bin/sh/tests/builtins/local6.0
- copied unchanged from r294647, head/bin/sh/tests/builtins/local6.0
user/ngie/socket-tests/bin/sh/tests/builtins/local7.0
- copied unchanged from r294647, head/bin/sh/tests/builtins/local7.0
user/ngie/socket-tests/contrib/gcc/config/riscv64/
- copied from r294647, head/contrib/gcc/config/riscv64/
user/ngie/socket-tests/contrib/ntp/include/ntp_keyacc.h
- copied unchanged from r294647, head/contrib/ntp/include/ntp_keyacc.h
user/ngie/socket-tests/contrib/ntp/libntp/is_ip_address.c
- copied unchanged from r294647, head/contrib/ntp/libntp/is_ip_address.c
user/ngie/socket-tests/share/dtrace/watch_execve
- copied unchanged from r294647, head/share/dtrace/watch_execve
user/ngie/socket-tests/share/dtrace/watch_kill
- copied unchanged from r294647, head/share/dtrace/watch_kill
user/ngie/socket-tests/share/dtrace/watch_vop_remove
- copied unchanged from r294647, head/share/dtrace/watch_vop_remove
user/ngie/socket-tests/sys/compat/linuxkpi/common/include/asm/atomic64.h
- copied unchanged from r294647, head/sys/compat/linuxkpi/common/include/asm/atomic64.h
user/ngie/socket-tests/sys/kern/kern_sendfile.c
- copied unchanged from r294647, head/sys/kern/kern_sendfile.c
user/ngie/socket-tests/sys/netinet/tcp_cc.h
- copied unchanged from r294647, head/sys/netinet/tcp_cc.h
user/ngie/socket-tests/usr.bin/xlint/arch/riscv/
- copied from r294647, head/usr.bin/xlint/arch/riscv/
Deleted:
user/ngie/socket-tests/sys/netinet/cc.h
Modified:
user/ngie/socket-tests/bin/setfacl/setfacl.1
user/ngie/socket-tests/bin/sh/tests/builtins/Makefile
user/ngie/socket-tests/bin/sh/var.c
user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h
user/ngie/socket-tests/contrib/compiler-rt/lib/builtins/int_lib.h
user/ngie/socket-tests/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
user/ngie/socket-tests/contrib/llvm/projects/libunwind/include/libunwind.h
user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/Registers.hpp
user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/config.h
user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/libunwind.cpp
user/ngie/socket-tests/contrib/ntp/ChangeLog
user/ngie/socket-tests/contrib/ntp/CommitLog
user/ngie/socket-tests/contrib/ntp/NEWS
user/ngie/socket-tests/contrib/ntp/configure
user/ngie/socket-tests/contrib/ntp/html/miscopt.html
user/ngie/socket-tests/contrib/ntp/include/Makefile.am
user/ngie/socket-tests/contrib/ntp/include/Makefile.in
user/ngie/socket-tests/contrib/ntp/include/ntp.h
user/ngie/socket-tests/contrib/ntp/include/ntp_io.h
user/ngie/socket-tests/contrib/ntp/include/ntp_stdlib.h
user/ngie/socket-tests/contrib/ntp/include/ntp_types.h
user/ngie/socket-tests/contrib/ntp/include/ntp_worker.h
user/ngie/socket-tests/contrib/ntp/include/parse.h
user/ngie/socket-tests/contrib/ntp/libntp/Makefile.am
user/ngie/socket-tests/contrib/ntp/libntp/Makefile.in
user/ngie/socket-tests/contrib/ntp/libntp/authkeys.c
user/ngie/socket-tests/contrib/ntp/libntp/authreadkeys.c
user/ngie/socket-tests/contrib/ntp/libntp/authusekey.c
user/ngie/socket-tests/contrib/ntp/libntp/ntp_worker.c
user/ngie/socket-tests/contrib/ntp/libntp/systime.c
user/ngie/socket-tests/contrib/ntp/libntp/work_thread.c
user/ngie/socket-tests/contrib/ntp/ntpd/invoke-ntp.conf.texi
user/ngie/socket-tests/contrib/ntp/ntpd/invoke-ntp.keys.texi
user/ngie/socket-tests/contrib/ntp/ntpd/invoke-ntpd.texi
user/ngie/socket-tests/contrib/ntp/ntpd/keyword-gen-utd
user/ngie/socket-tests/contrib/ntp/ntpd/keyword-gen.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.conf.5man
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.conf.5mdoc
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.conf.def
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.conf.html
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.conf.man.in
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.conf.mdoc.in
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.keys.5man
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.keys.5mdoc
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.keys.def
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.keys.html
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.keys.man.in
user/ngie/socket-tests/contrib/ntp/ntpd/ntp.keys.mdoc.in
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_config.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_control.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_crypto.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_io.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_keyword.h
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_parser.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_parser.h
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_proto.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_request.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_scanner.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntp_timer.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd-opts.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd-opts.h
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd.1ntpdman
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd.1ntpdmdoc
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd.c
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd.html
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd.man.in
user/ngie/socket-tests/contrib/ntp/ntpd/ntpd.mdoc.in
user/ngie/socket-tests/contrib/ntp/ntpd/refclock_chu.c
user/ngie/socket-tests/contrib/ntp/ntpd/refclock_gpsdjson.c
user/ngie/socket-tests/contrib/ntp/ntpd/refclock_jjy.c
user/ngie/socket-tests/contrib/ntp/ntpd/refclock_shm.c
user/ngie/socket-tests/contrib/ntp/ntpdc/invoke-ntpdc.texi
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc-opts.c
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc-opts.h
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc.1ntpdcman
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc.c
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc.html
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc.man.in
user/ngie/socket-tests/contrib/ntp/ntpdc/ntpdc.mdoc.in
user/ngie/socket-tests/contrib/ntp/ntpq/invoke-ntpq.texi
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq-opts.c
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq-opts.h
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq-subs.c
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq.1ntpqman
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq.1ntpqmdoc
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq.c
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq.html
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq.man.in
user/ngie/socket-tests/contrib/ntp/ntpq/ntpq.mdoc.in
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/ntpsnmpd.html
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
user/ngie/socket-tests/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
user/ngie/socket-tests/contrib/ntp/packageinfo.sh
user/ngie/socket-tests/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
user/ngie/socket-tests/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
user/ngie/socket-tests/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
user/ngie/socket-tests/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
user/ngie/socket-tests/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
user/ngie/socket-tests/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
user/ngie/socket-tests/contrib/ntp/scripts/invoke-plot_summary.texi
user/ngie/socket-tests/contrib/ntp/scripts/invoke-summary.texi
user/ngie/socket-tests/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
user/ngie/socket-tests/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
user/ngie/socket-tests/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
user/ngie/socket-tests/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
user/ngie/socket-tests/contrib/ntp/scripts/ntp-wait/ntp-wait.html
user/ngie/socket-tests/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
user/ngie/socket-tests/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
user/ngie/socket-tests/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
user/ngie/socket-tests/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
user/ngie/socket-tests/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
user/ngie/socket-tests/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
user/ngie/socket-tests/contrib/ntp/scripts/ntpsweep/ntpsweep.html
user/ngie/socket-tests/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
user/ngie/socket-tests/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
user/ngie/socket-tests/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
user/ngie/socket-tests/contrib/ntp/scripts/ntptrace/ntptrace-opts
user/ngie/socket-tests/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
user/ngie/socket-tests/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
user/ngie/socket-tests/contrib/ntp/scripts/ntptrace/ntptrace.html
user/ngie/socket-tests/contrib/ntp/scripts/ntptrace/ntptrace.man.in
user/ngie/socket-tests/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
user/ngie/socket-tests/contrib/ntp/scripts/plot_summary-opts
user/ngie/socket-tests/contrib/ntp/scripts/plot_summary.1plot_summaryman
user/ngie/socket-tests/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
user/ngie/socket-tests/contrib/ntp/scripts/plot_summary.html
user/ngie/socket-tests/contrib/ntp/scripts/plot_summary.man.in
user/ngie/socket-tests/contrib/ntp/scripts/plot_summary.mdoc.in
user/ngie/socket-tests/contrib/ntp/scripts/summary-opts
user/ngie/socket-tests/contrib/ntp/scripts/summary.1summaryman
user/ngie/socket-tests/contrib/ntp/scripts/summary.1summarymdoc
user/ngie/socket-tests/contrib/ntp/scripts/summary.html
user/ngie/socket-tests/contrib/ntp/scripts/summary.man.in
user/ngie/socket-tests/contrib/ntp/scripts/summary.mdoc.in
user/ngie/socket-tests/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
user/ngie/socket-tests/contrib/ntp/scripts/update-leap/update-leap-opts
user/ngie/socket-tests/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
user/ngie/socket-tests/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
user/ngie/socket-tests/contrib/ntp/scripts/update-leap/update-leap.html
user/ngie/socket-tests/contrib/ntp/scripts/update-leap/update-leap.man.in
user/ngie/socket-tests/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
user/ngie/socket-tests/contrib/ntp/sntp/configure
user/ngie/socket-tests/contrib/ntp/sntp/crypto.c
user/ngie/socket-tests/contrib/ntp/sntp/crypto.h
user/ngie/socket-tests/contrib/ntp/sntp/include/copyright.def
user/ngie/socket-tests/contrib/ntp/sntp/include/version.def
user/ngie/socket-tests/contrib/ntp/sntp/include/version.texi
user/ngie/socket-tests/contrib/ntp/sntp/invoke-sntp.texi
user/ngie/socket-tests/contrib/ntp/sntp/libopts/configfile.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/enum.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/find.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/init.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/load.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/makeshell.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/nested.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/parse-duration.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/reset.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/save.c
user/ngie/socket-tests/contrib/ntp/sntp/libopts/tokenize.c
user/ngie/socket-tests/contrib/ntp/sntp/m4/version.m4
user/ngie/socket-tests/contrib/ntp/sntp/main.c
user/ngie/socket-tests/contrib/ntp/sntp/networking.c
user/ngie/socket-tests/contrib/ntp/sntp/sntp-opts.c
user/ngie/socket-tests/contrib/ntp/sntp/sntp-opts.h
user/ngie/socket-tests/contrib/ntp/sntp/sntp.1sntpman
user/ngie/socket-tests/contrib/ntp/sntp/sntp.1sntpmdoc
user/ngie/socket-tests/contrib/ntp/sntp/sntp.html
user/ngie/socket-tests/contrib/ntp/sntp/sntp.man.in
user/ngie/socket-tests/contrib/ntp/sntp/sntp.mdoc.in
user/ngie/socket-tests/contrib/ntp/sntp/tests/crypto.c
user/ngie/socket-tests/contrib/ntp/sntp/tests/fileHandlingTest.c
user/ngie/socket-tests/contrib/ntp/sntp/tests/fileHandlingTest.h.in
user/ngie/socket-tests/contrib/ntp/sntp/tests/keyFile.c
user/ngie/socket-tests/contrib/ntp/sntp/tests/packetHandling.c
user/ngie/socket-tests/contrib/ntp/sntp/tests/packetProcessing.c
user/ngie/socket-tests/contrib/ntp/sntp/tests/run-packetProcessing.c
user/ngie/socket-tests/contrib/ntp/sntp/unity/unity_internals.h
user/ngie/socket-tests/contrib/ntp/sntp/version.c
user/ngie/socket-tests/contrib/ntp/tests/libntp/authkeys.c
user/ngie/socket-tests/contrib/ntp/tests/libntp/decodenetnum.c
user/ngie/socket-tests/contrib/ntp/tests/libntp/run-authkeys.c
user/ngie/socket-tests/contrib/ntp/tests/libntp/run-decodenetnum.c
user/ngie/socket-tests/contrib/ntp/tests/libntp/run-socktoa.c
user/ngie/socket-tests/contrib/ntp/tests/libntp/socktoa.c
user/ngie/socket-tests/contrib/ntp/tests/ntpd/t-ntp_signd.c
user/ngie/socket-tests/contrib/ntp/util/invoke-ntp-keygen.texi
user/ngie/socket-tests/contrib/ntp/util/ntp-keygen-opts.c
user/ngie/socket-tests/contrib/ntp/util/ntp-keygen-opts.h
user/ngie/socket-tests/contrib/ntp/util/ntp-keygen.1ntp-keygenman
user/ngie/socket-tests/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
user/ngie/socket-tests/contrib/ntp/util/ntp-keygen.html
user/ngie/socket-tests/contrib/ntp/util/ntp-keygen.man.in
user/ngie/socket-tests/contrib/ntp/util/ntp-keygen.mdoc.in
user/ngie/socket-tests/crypto/openssh/readconf.c
user/ngie/socket-tests/crypto/openssh/servconf.c
user/ngie/socket-tests/etc/mtree/BSD.include.dist
user/ngie/socket-tests/etc/rc.d/sshd
user/ngie/socket-tests/gnu/lib/libgcc/Makefile
user/ngie/socket-tests/gnu/lib/libreadline/readline/Makefile
user/ngie/socket-tests/include/Makefile
user/ngie/socket-tests/lib/libc/gen/sem_new.c
user/ngie/socket-tests/lib/libc/gmon/gmon.c
user/ngie/socket-tests/lib/libc/mips/SYS.h
user/ngie/socket-tests/lib/libc/string/strtok.3
user/ngie/socket-tests/lib/libelftc/Makefile
user/ngie/socket-tests/libexec/rtld-elf/riscv/rtld_machdep.h
user/ngie/socket-tests/sbin/ifconfig/iflagg.c
user/ngie/socket-tests/sbin/kldstat/Makefile
user/ngie/socket-tests/sbin/kldstat/kldstat.8
user/ngie/socket-tests/sbin/kldstat/kldstat.c
user/ngie/socket-tests/share/dtrace/Makefile
user/ngie/socket-tests/share/man/man4/lagg.4
user/ngie/socket-tests/share/man/man4/mod_cc.4
user/ngie/socket-tests/share/man/man4/tcp.4
user/ngie/socket-tests/share/man/man5/ext2fs.5
user/ngie/socket-tests/share/man/man9/hashinit.9
user/ngie/socket-tests/share/man/man9/mod_cc.9
user/ngie/socket-tests/sys/amd64/include/atomic.h
user/ngie/socket-tests/sys/amd64/linux/linux.h
user/ngie/socket-tests/sys/amd64/linux/linux_machdep.c
user/ngie/socket-tests/sys/arm/ti/ti_common.c
user/ngie/socket-tests/sys/arm64/arm64/gic_fdt.c
user/ngie/socket-tests/sys/arm64/arm64/gic_v3_fdt.c
user/ngie/socket-tests/sys/arm64/arm64/machdep.c
user/ngie/socket-tests/sys/arm64/arm64/nexus.c
user/ngie/socket-tests/sys/boot/kshim/bsd_global.h
user/ngie/socket-tests/sys/boot/kshim/bsd_kernel.c
user/ngie/socket-tests/sys/boot/kshim/bsd_kernel.h
user/ngie/socket-tests/sys/boot/usb/tools/Makefile
user/ngie/socket-tests/sys/cam/ctl/ctl_ha.c
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
user/ngie/socket-tests/sys/compat/linuxkpi/common/include/asm/atomic-long.h
user/ngie/socket-tests/sys/compat/linuxkpi/common/include/asm/atomic.h
user/ngie/socket-tests/sys/compat/linuxkpi/common/include/linux/mutex.h
user/ngie/socket-tests/sys/conf/files
user/ngie/socket-tests/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.h
user/ngie/socket-tests/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
user/ngie/socket-tests/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.h
user/ngie/socket-tests/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
user/ngie/socket-tests/sys/dev/cxgbe/iw_cxgbe/cm.c
user/ngie/socket-tests/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
user/ngie/socket-tests/sys/dev/cxgbe/iw_cxgbe/provider.c
user/ngie/socket-tests/sys/dev/fdt/fdt_common.h
user/ngie/socket-tests/sys/dev/flash/mx25l.c
user/ngie/socket-tests/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
user/ngie/socket-tests/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
user/ngie/socket-tests/sys/dev/hyperv/vmbus/hv_connection.c
user/ngie/socket-tests/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
user/ngie/socket-tests/sys/dev/ixgbe/if_ix.c
user/ngie/socket-tests/sys/dev/pty/pty.c
user/ngie/socket-tests/sys/dev/sound/pci/hdspe.h
user/ngie/socket-tests/sys/fs/devfs/devfs_devs.c
user/ngie/socket-tests/sys/geom/geom_flashmap.c
user/ngie/socket-tests/sys/kern/tty.c
user/ngie/socket-tests/sys/kern/uipc_syscalls.c
user/ngie/socket-tests/sys/kern/vfs_vnops.c
user/ngie/socket-tests/sys/mips/nlm/xlp_machdep.c
user/ngie/socket-tests/sys/net/if_lagg.c
user/ngie/socket-tests/sys/net/if_lagg.h
user/ngie/socket-tests/sys/netinet/cc/cc.c
user/ngie/socket-tests/sys/netinet/cc/cc_cdg.c
user/ngie/socket-tests/sys/netinet/cc/cc_chd.c
user/ngie/socket-tests/sys/netinet/cc/cc_cubic.c
user/ngie/socket-tests/sys/netinet/cc/cc_dctcp.c
user/ngie/socket-tests/sys/netinet/cc/cc_hd.c
user/ngie/socket-tests/sys/netinet/cc/cc_htcp.c
user/ngie/socket-tests/sys/netinet/cc/cc_newreno.c
user/ngie/socket-tests/sys/netinet/cc/cc_vegas.c
user/ngie/socket-tests/sys/netinet/tcp.h
user/ngie/socket-tests/sys/netinet/tcp_input.c
user/ngie/socket-tests/sys/netinet/tcp_output.c
user/ngie/socket-tests/sys/netinet/tcp_stacks/fastpath.c
user/ngie/socket-tests/sys/netinet/tcp_subr.c
user/ngie/socket-tests/sys/netinet/tcp_timer.c
user/ngie/socket-tests/sys/netinet/tcp_usrreq.c
user/ngie/socket-tests/sys/netpfil/ipfw/ip_fw_table_value.c
user/ngie/socket-tests/sys/ofed/drivers/infiniband/core/cma.c
user/ngie/socket-tests/sys/ofed/drivers/infiniband/core/iwcm.c
user/ngie/socket-tests/sys/ofed/include/rdma/iw_cm.h
user/ngie/socket-tests/sys/ofed/include/rdma/rdma_cm.h
user/ngie/socket-tests/sys/sparc64/include/atomic.h
user/ngie/socket-tests/sys/sys/elf_common.h
user/ngie/socket-tests/sys/sys/priv.h
user/ngie/socket-tests/tools/regression/posixsem2/semtest.c
user/ngie/socket-tests/tools/tools/ath/ath_ee_v4k_print/v4k.c
user/ngie/socket-tests/usr.bin/whois/whois.1
user/ngie/socket-tests/usr.bin/whois/whois.c
user/ngie/socket-tests/usr.bin/xlint/lint1/param.h
user/ngie/socket-tests/usr.sbin/ntp/config.h
user/ngie/socket-tests/usr.sbin/ntp/doc/ntp-keygen.8
user/ngie/socket-tests/usr.sbin/ntp/doc/ntp.conf.5
user/ngie/socket-tests/usr.sbin/ntp/doc/ntp.keys.5
user/ngie/socket-tests/usr.sbin/ntp/doc/ntpd.8
user/ngie/socket-tests/usr.sbin/ntp/doc/ntpdc.8
user/ngie/socket-tests/usr.sbin/ntp/doc/ntpq.8
user/ngie/socket-tests/usr.sbin/ntp/doc/sntp.8
user/ngie/socket-tests/usr.sbin/ntp/libntp/Makefile
user/ngie/socket-tests/usr.sbin/ntp/scripts/mkver
user/ngie/socket-tests/usr.sbin/ypldap/yp.c
Directory Properties:
user/ngie/socket-tests/ (props changed)
user/ngie/socket-tests/contrib/compiler-rt/ (props changed)
user/ngie/socket-tests/contrib/gcc/ (props changed)
user/ngie/socket-tests/contrib/llvm/ (props changed)
user/ngie/socket-tests/contrib/llvm/projects/libunwind/ (props changed)
user/ngie/socket-tests/contrib/ntp/ (props changed)
user/ngie/socket-tests/crypto/openssh/ (props changed)
user/ngie/socket-tests/gnu/lib/ (props changed)
user/ngie/socket-tests/include/ (props changed)
user/ngie/socket-tests/lib/libc/ (props changed)
user/ngie/socket-tests/sbin/ (props changed)
user/ngie/socket-tests/share/ (props changed)
user/ngie/socket-tests/share/man/man4/ (props changed)
user/ngie/socket-tests/sys/ (props changed)
user/ngie/socket-tests/sys/boot/ (props changed)
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/ (props changed)
user/ngie/socket-tests/sys/conf/ (props changed)
user/ngie/socket-tests/sys/dev/hyperv/ (props changed)
Modified: user/ngie/socket-tests/bin/setfacl/setfacl.1
==============================================================================
--- user/ngie/socket-tests/bin/setfacl/setfacl.1 Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/bin/setfacl/setfacl.1 Sat Jan 23 22:56:26 2016 (r294648)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 4, 2015
+.Dd January 23, 2016
.Dt SETFACL 1
.Os
.Sh NAME
@@ -62,8 +62,9 @@ starting at position
counting from zero.
This option is only applicable to NFSv4 ACLs.
.It Fl b
-Remove all ACL entries except for the three required entries
-(POSIX.1e ACLs) or six "canonical" entries (NFSv4 ACLs).
+Remove all ACL entries except for the ones synthesized
+from the file mode - the three mandatory entries in case
+of POSIX.1e ACL.
If the POSIX.1e ACL contains a
.Dq Li mask
entry, the permissions of the
Modified: user/ngie/socket-tests/bin/sh/tests/builtins/Makefile
==============================================================================
--- user/ngie/socket-tests/bin/sh/tests/builtins/Makefile Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/bin/sh/tests/builtins/Makefile Sat Jan 23 22:56:26 2016 (r294648)
@@ -112,6 +112,8 @@ FILES+= local2.0
FILES+= local3.0
FILES+= local4.0
FILES+= local5.0
+FILES+= local6.0
+FILES+= local7.0
.if ${MK_NLS} != "no"
FILES+= locale1.0
.endif
Copied: user/ngie/socket-tests/bin/sh/tests/builtins/local6.0 (from r294647, head/bin/sh/tests/builtins/local6.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/socket-tests/bin/sh/tests/builtins/local6.0 Sat Jan 23 22:56:26 2016 (r294648, copy of r294647, head/bin/sh/tests/builtins/local6.0)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+f() {
+ local x
+ readonly x=2
+}
+x=3
+f
+x=4
+[ "$x" = 4 ]
Copied: user/ngie/socket-tests/bin/sh/tests/builtins/local7.0 (from r294647, head/bin/sh/tests/builtins/local7.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/socket-tests/bin/sh/tests/builtins/local7.0 Sat Jan 23 22:56:26 2016 (r294648, copy of r294647, head/bin/sh/tests/builtins/local7.0)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+f() {
+ local x
+ readonly x=2
+}
+unset x
+f
+x=4
+[ "$x" = 4 ]
Modified: user/ngie/socket-tests/bin/sh/var.c
==============================================================================
--- user/ngie/socket-tests/bin/sh/var.c Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/bin/sh/var.c Sat Jan 23 22:56:26 2016 (r294648)
@@ -802,6 +802,7 @@ poplocalvars(void)
ckfree(lvp->text);
optschanged();
} else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
+ vp->flags &= ~VREADONLY;
(void)unsetvar(vp->text);
} else {
islocalevar = (vp->flags | lvp->flags) & VEXPORT &&
Modified: user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h
==============================================================================
--- user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/bsnmp/snmp_mibII/mibII.h Sat Jan 23 22:56:26 2016 (r294648)
@@ -58,7 +58,7 @@
#include "mibII_tree.h"
/* maximum size of the interface alias */
-static const u_int MIBIF_ALIAS_SIZE = 64 + 1;
+#define MIBIF_ALIAS_SIZE (64 + 1)
/*
* Interface list and flags.
Modified: user/ngie/socket-tests/contrib/compiler-rt/lib/builtins/int_lib.h
==============================================================================
--- user/ngie/socket-tests/contrib/compiler-rt/lib/builtins/int_lib.h Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/compiler-rt/lib/builtins/int_lib.h Sat Jan 23 22:56:26 2016 (r294648)
@@ -74,11 +74,13 @@
* global header to prevent other C files from making the detour
* through __c?zdi2() as well.
*
- * This problem has only been observed on FreeBSD for sparc64 and
- * mips64 with GCC 4.2.1.
+ * This problem has been observed on FreeBSD for sparc64 and
+ * mips64 with GCC 4.2.1, and for riscv with GCC 5.2.0.
+ * Presumably it's any version of GCC, and targeting an arch that
+ * does not have dedicated bit counting instructions.
*/
#if defined(__FreeBSD__) && (defined(__sparc64__) || \
- defined(__mips_n64) || defined(__mips_o64))
+ defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__))
si_int __clzsi2(si_int);
si_int __ctzsi2(si_int);
#define __builtin_clz __clzsi2
Modified: user/ngie/socket-tests/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
==============================================================================
--- user/ngie/socket-tests/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h Sat Jan 23 22:56:26 2016 (r294648)
@@ -76,6 +76,10 @@ namespace __sanitizer {
#elif defined(__powerpc64__)
const unsigned struct_kernel_stat_sz = 144;
const unsigned struct_kernel_stat64_sz = 104;
+#elif defined(__riscv__)
+ /* RISCVTODO: check that these values are correct */
+ const unsigned struct_kernel_stat_sz = 128;
+ const unsigned struct_kernel_stat64_sz = 128;
#elif defined(__mips__)
#if SANITIZER_WORDSIZE == 64
const unsigned struct_kernel_stat_sz = 216;
@@ -103,7 +107,7 @@ namespace __sanitizer {
#if SANITIZER_LINUX || SANITIZER_FREEBSD
-#if defined(__powerpc64__)
+#if defined(__powerpc64__) || defined(__riscv__)
const unsigned struct___old_kernel_stat_sz = 0;
#else
const unsigned struct___old_kernel_stat_sz = 32;
@@ -481,7 +485,7 @@ namespace __sanitizer {
typedef long __sanitizer___kernel_off_t;
#endif
-#if defined(__powerpc__) || defined(__mips__)
+#if defined(__powerpc__) || defined(__mips__) || defined(__riscv__)
typedef unsigned int __sanitizer___kernel_old_uid_t;
typedef unsigned int __sanitizer___kernel_old_gid_t;
#else
Modified: user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
==============================================================================
--- user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Sat Jan 23 22:56:26 2016 (r294648)
@@ -253,6 +253,9 @@ typedef unsigned szind_t;
# ifdef __powerpc__
# define LG_QUANTUM 4
# endif
+# ifdef __riscv__
+# define LG_QUANTUM 4
+# endif
# ifdef __s390__
# define LG_QUANTUM 4
# endif
Modified: user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
==============================================================================
--- user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Sat Jan 23 22:56:26 2016 (r294648)
@@ -52,6 +52,9 @@
#elif defined(__powerpc__)
# define LG_SIZEOF_PTR 2
#endif
+#ifdef __riscv__
+# define LG_SIZEOF_PTR 3
+#endif
#ifndef JEMALLOC_TLS_MODEL
# define JEMALLOC_TLS_MODEL /* Default. */
Modified: user/ngie/socket-tests/contrib/llvm/projects/libunwind/include/libunwind.h
==============================================================================
--- user/ngie/socket-tests/contrib/llvm/projects/libunwind/include/libunwind.h Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/llvm/projects/libunwind/include/libunwind.h Sat Jan 23 22:56:26 2016 (r294648)
@@ -295,6 +295,77 @@ enum {
UNW_PPC_SPEFSCR = 112
};
+// 64-bit RISC-V registers
+enum {
+ UNW_RISCV_X0 = 0,
+ UNW_RISCV_X1 = 1,
+ UNW_RISCV_RA = 1,
+ UNW_RISCV_X2 = 2,
+ UNW_RISCV_SP = 2,
+ UNW_RISCV_X3 = 3,
+ UNW_RISCV_X4 = 4,
+ UNW_RISCV_X5 = 5,
+ UNW_RISCV_X6 = 6,
+ UNW_RISCV_X7 = 7,
+ UNW_RISCV_X8 = 8,
+ UNW_RISCV_X9 = 9,
+ UNW_RISCV_X10 = 10,
+ UNW_RISCV_X11 = 11,
+ UNW_RISCV_X12 = 12,
+ UNW_RISCV_X13 = 13,
+ UNW_RISCV_X14 = 14,
+ UNW_RISCV_X15 = 15,
+ UNW_RISCV_X16 = 16,
+ UNW_RISCV_X17 = 17,
+ UNW_RISCV_X18 = 18,
+ UNW_RISCV_X19 = 19,
+ UNW_RISCV_X20 = 20,
+ UNW_RISCV_X21 = 21,
+ UNW_RISCV_X22 = 22,
+ UNW_RISCV_X23 = 23,
+ UNW_RISCV_X24 = 24,
+ UNW_RISCV_X25 = 25,
+ UNW_RISCV_X26 = 26,
+ UNW_RISCV_X27 = 27,
+ UNW_RISCV_X28 = 28,
+ UNW_RISCV_X29 = 29,
+ UNW_RISCV_X30 = 30,
+ UNW_RISCV_X31 = 31,
+ // reserved block
+ UNW_RISCV_D0 = 64,
+ UNW_RISCV_D1 = 65,
+ UNW_RISCV_D2 = 66,
+ UNW_RISCV_D3 = 67,
+ UNW_RISCV_D4 = 68,
+ UNW_RISCV_D5 = 69,
+ UNW_RISCV_D6 = 70,
+ UNW_RISCV_D7 = 71,
+ UNW_RISCV_D8 = 72,
+ UNW_RISCV_D9 = 73,
+ UNW_RISCV_D10 = 74,
+ UNW_RISCV_D11 = 75,
+ UNW_RISCV_D12 = 76,
+ UNW_RISCV_D13 = 77,
+ UNW_RISCV_D14 = 78,
+ UNW_RISCV_D15 = 79,
+ UNW_RISCV_D16 = 80,
+ UNW_RISCV_D17 = 81,
+ UNW_RISCV_D18 = 82,
+ UNW_RISCV_D19 = 83,
+ UNW_RISCV_D20 = 84,
+ UNW_RISCV_D21 = 85,
+ UNW_RISCV_D22 = 86,
+ UNW_RISCV_D23 = 87,
+ UNW_RISCV_D24 = 88,
+ UNW_RISCV_D25 = 89,
+ UNW_RISCV_D26 = 90,
+ UNW_RISCV_D27 = 91,
+ UNW_RISCV_D28 = 92,
+ UNW_RISCV_D29 = 93,
+ UNW_RISCV_D30 = 94,
+ UNW_RISCV_D31 = 95,
+};
+
// 64-bit ARM64 registers
enum {
UNW_ARM64_X0 = 0,
Modified: user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/Registers.hpp
==============================================================================
--- user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/Registers.hpp Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/Registers.hpp Sat Jan 23 22:56:26 2016 (r294648)
@@ -1024,6 +1024,264 @@ inline const char *Registers_ppc::getReg
}
+/// Registers_riscv holds the register state of a thread in a 64-bit RISC-V
+/// process.
+class _LIBUNWIND_HIDDEN Registers_riscv {
+public:
+ Registers_riscv();
+ Registers_riscv(const void *registers);
+
+ bool validRegister(int num) const;
+ uint64_t getRegister(int num) const;
+ void setRegister(int num, uint64_t value);
+ bool validFloatRegister(int num) const;
+ double getFloatRegister(int num) const;
+ void setFloatRegister(int num, double value);
+ bool validVectorRegister(int num) const;
+ v128 getVectorRegister(int num) const;
+ void setVectorRegister(int num, v128 value);
+ const char *getRegisterName(int num);
+ void jumpto();
+ static int lastDwarfRegNum() { return 95; }
+
+ uint64_t getSP() const { return _registers.__x[2]; }
+ void setSP(uint64_t value) { _registers.__x[2] = value; }
+ uint64_t getIP() const { return _registers.__x[1]; }
+ void setIP(uint64_t value) { _registers.__x[1] = value; }
+
+private:
+ struct GPRs {
+ uint64_t __x[32]; // x0-x31
+ };
+
+ GPRs _registers;
+ double _vectorHalfRegisters[32];
+ // Currently only the lower double in 128-bit vectore registers
+ // is perserved during unwinding. We could define new register
+ // numbers (> 96) which mean whole vector registers, then this
+ // struct would need to change to contain whole vector registers.
+};
+
+inline Registers_riscv::Registers_riscv(const void *registers) {
+ static_assert(sizeof(Registers_riscv) < sizeof(unw_context_t),
+ "riscv registers do not fit into unw_context_t");
+ memcpy(&_registers, registers, sizeof(_registers));
+ static_assert(sizeof(GPRs) == 0x100,
+ "expected VFP registers to be at offset 256");
+ memcpy(_vectorHalfRegisters,
+ static_cast<const uint8_t *>(registers) + sizeof(GPRs),
+ sizeof(_vectorHalfRegisters));
+}
+
+inline Registers_riscv::Registers_riscv() {
+ memset(&_registers, 0, sizeof(_registers));
+ memset(&_vectorHalfRegisters, 0, sizeof(_vectorHalfRegisters));
+}
+
+inline bool Registers_riscv::validRegister(int regNum) const {
+ if (regNum == UNW_REG_IP)
+ return true;
+ if (regNum == UNW_REG_SP)
+ return true;
+ if (regNum < 0)
+ return false;
+ if (regNum > 95)
+ return false;
+ if ((regNum > 31) && (regNum < 64))
+ return false;
+ return true;
+}
+
+inline uint64_t Registers_riscv::getRegister(int regNum) const {
+ if (regNum == UNW_REG_IP)
+ return _registers.__x[1];
+ if (regNum == UNW_REG_SP)
+ return _registers.__x[2];
+ if ((regNum >= 0) && (regNum < 32))
+ return _registers.__x[regNum];
+ _LIBUNWIND_ABORT("unsupported riscv register");
+}
+
+inline void Registers_riscv::setRegister(int regNum, uint64_t value) {
+ if (regNum == UNW_REG_IP)
+ _registers.__x[1] = value;
+ else if (regNum == UNW_REG_SP)
+ _registers.__x[2] = value;
+ else if ((regNum >= 0) && (regNum < 32))
+ _registers.__x[regNum] = value;
+ else
+ _LIBUNWIND_ABORT("unsupported riscv register");
+}
+
+inline const char *Registers_riscv::getRegisterName(int regNum) {
+ switch (regNum) {
+ case UNW_REG_IP:
+ return "ra";
+ case UNW_REG_SP:
+ return "sp";
+ case UNW_RISCV_X0:
+ return "x0";
+ case UNW_RISCV_X1:
+ return "ra";
+ case UNW_RISCV_X2:
+ return "sp";
+ case UNW_RISCV_X3:
+ return "x3";
+ case UNW_RISCV_X4:
+ return "x4";
+ case UNW_RISCV_X5:
+ return "x5";
+ case UNW_RISCV_X6:
+ return "x6";
+ case UNW_RISCV_X7:
+ return "x7";
+ case UNW_RISCV_X8:
+ return "x8";
+ case UNW_RISCV_X9:
+ return "x9";
+ case UNW_RISCV_X10:
+ return "x10";
+ case UNW_RISCV_X11:
+ return "x11";
+ case UNW_RISCV_X12:
+ return "x12";
+ case UNW_RISCV_X13:
+ return "x13";
+ case UNW_RISCV_X14:
+ return "x14";
+ case UNW_RISCV_X15:
+ return "x15";
+ case UNW_RISCV_X16:
+ return "x16";
+ case UNW_RISCV_X17:
+ return "x17";
+ case UNW_RISCV_X18:
+ return "x18";
+ case UNW_RISCV_X19:
+ return "x19";
+ case UNW_RISCV_X20:
+ return "x20";
+ case UNW_RISCV_X21:
+ return "x21";
+ case UNW_RISCV_X22:
+ return "x22";
+ case UNW_RISCV_X23:
+ return "x23";
+ case UNW_RISCV_X24:
+ return "x24";
+ case UNW_RISCV_X25:
+ return "x25";
+ case UNW_RISCV_X26:
+ return "x26";
+ case UNW_RISCV_X27:
+ return "x27";
+ case UNW_RISCV_X28:
+ return "x28";
+ case UNW_RISCV_X29:
+ return "x29";
+ case UNW_RISCV_X30:
+ return "x30";
+ case UNW_RISCV_X31:
+ return "x31";
+ case UNW_RISCV_D0:
+ return "d0";
+ case UNW_RISCV_D1:
+ return "d1";
+ case UNW_RISCV_D2:
+ return "d2";
+ case UNW_RISCV_D3:
+ return "d3";
+ case UNW_RISCV_D4:
+ return "d4";
+ case UNW_RISCV_D5:
+ return "d5";
+ case UNW_RISCV_D6:
+ return "d6";
+ case UNW_RISCV_D7:
+ return "d7";
+ case UNW_RISCV_D8:
+ return "d8";
+ case UNW_RISCV_D9:
+ return "d9";
+ case UNW_RISCV_D10:
+ return "d10";
+ case UNW_RISCV_D11:
+ return "d11";
+ case UNW_RISCV_D12:
+ return "d12";
+ case UNW_RISCV_D13:
+ return "d13";
+ case UNW_RISCV_D14:
+ return "d14";
+ case UNW_RISCV_D15:
+ return "d15";
+ case UNW_RISCV_D16:
+ return "d16";
+ case UNW_RISCV_D17:
+ return "d17";
+ case UNW_RISCV_D18:
+ return "d18";
+ case UNW_RISCV_D19:
+ return "d19";
+ case UNW_RISCV_D20:
+ return "d20";
+ case UNW_RISCV_D21:
+ return "d21";
+ case UNW_RISCV_D22:
+ return "d22";
+ case UNW_RISCV_D23:
+ return "d23";
+ case UNW_RISCV_D24:
+ return "d24";
+ case UNW_RISCV_D25:
+ return "d25";
+ case UNW_RISCV_D26:
+ return "d26";
+ case UNW_RISCV_D27:
+ return "d27";
+ case UNW_RISCV_D28:
+ return "d28";
+ case UNW_RISCV_D29:
+ return "d29";
+ case UNW_RISCV_D30:
+ return "d30";
+ case UNW_RISCV_D31:
+ return "d31";
+ default:
+ return "unknown register";
+ }
+}
+
+inline bool Registers_riscv::validFloatRegister(int regNum) const {
+ if (regNum < UNW_RISCV_D0)
+ return false;
+ if (regNum > UNW_RISCV_D31)
+ return false;
+ return true;
+}
+
+inline double Registers_riscv::getFloatRegister(int regNum) const {
+ assert(validFloatRegister(regNum));
+ return _vectorHalfRegisters[regNum - UNW_RISCV_D0];
+}
+
+inline void Registers_riscv::setFloatRegister(int regNum, double value) {
+ assert(validFloatRegister(regNum));
+ _vectorHalfRegisters[regNum - UNW_RISCV_D0] = value;
+}
+
+inline bool Registers_riscv::validVectorRegister(int) const {
+ return false;
+}
+
+inline v128 Registers_riscv::getVectorRegister(int) const {
+ _LIBUNWIND_ABORT("no riscv vector register support yet");
+}
+
+inline void Registers_riscv::setVectorRegister(int, v128) {
+ _LIBUNWIND_ABORT("no riscv vector register support yet");
+}
+
/// Registers_arm64 holds the register state of a thread in a 64-bit arm
/// process.
Modified: user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
==============================================================================
--- user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp Sat Jan 23 22:56:26 2016 (r294648)
@@ -562,6 +562,10 @@ private:
compact_unwind_encoding_t dwarfEncoding(Registers_or1k &) const {
return 0;
}
+
+ compact_unwind_encoding_t dwarfEncoding(Registers_riscv &) const {
+ return 0;
+ }
#endif // _LIBUNWIND_SUPPORT_DWARF_UNWIND
Modified: user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
==============================================================================
--- user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S Sat Jan 23 22:56:26 2016 (r294648)
@@ -478,4 +478,8 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9li
l.jr r9
l.nop
+#elif defined(__riscv__)
+
+/* RISCVTODO */
+
#endif
Modified: user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
==============================================================================
--- user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S Sat Jan 23 22:56:26 2016 (r294648)
@@ -463,4 +463,9 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext
l.sw 116(r3), r29
l.sw 120(r3), r30
l.sw 124(r3), r31
+
+#elif defined(__riscv__)
+
+/* RISCVTODO */
+
#endif
Modified: user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/config.h
==============================================================================
--- user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/config.h Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/config.h Sat Jan 23 22:56:26 2016 (r294648)
@@ -74,7 +74,8 @@
#define _LIBUNWIND_BUILD_ZERO_COST_APIS (defined(__i386__) || \
defined(__x86_64__) || \
defined(__arm__) || \
- defined(__aarch64__))
+ defined(__aarch64__) || \
+ defined(__riscv__))
#define _LIBUNWIND_BUILD_SJLJ_APIS 0
#define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \
defined(__x86_64__))
Modified: user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/libunwind.cpp
==============================================================================
--- user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/libunwind.cpp Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/llvm/projects/libunwind/src/libunwind.cpp Sat Jan 23 22:56:26 2016 (r294648)
@@ -66,6 +66,9 @@ _LIBUNWIND_EXPORT int unw_init_local(unw
context, LocalAddressSpace::sThisAddressSpace);
#elif defined(__mips__)
#warning The MIPS architecture is not supported.
+#elif defined(__riscv__)
+ new ((void *)cursor) UnwindCursor<LocalAddressSpace, Registers_riscv>(
+ context, LocalAddressSpace::sThisAddressSpace);
#else
#error Architecture not supported
#endif
Modified: user/ngie/socket-tests/contrib/ntp/ChangeLog
==============================================================================
--- user/ngie/socket-tests/contrib/ntp/ChangeLog Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/ntp/ChangeLog Sat Jan 23 22:56:26 2016 (r294648)
@@ -1,4 +1,38 @@
---
+(4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>
+
+* [Sec 2935] Deja Vu: Replay attack on authenticated broadcast mode. HStenn.
+* [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
+* [Sec 2937] ntpq: nextvar() missing length check. perlinger@ntp.org
+* [Sec 2938] ntpq saveconfig command allows dangerous characters
+ in filenames. perlinger@ntp.org
+* [Sec 2939] reslist NULL pointer dereference. perlinger@ntp.org
+* [Sec 2940] Stack exhaustion in recursive traversal of restriction
+ list. perlinger@ntp.org
+* [Sec 2942]: Off-path DoS attack on auth broadcast mode. HStenn.
+* [Sec 2945] Zero Origin Timestamp Bypass. perlinger@ntp.org
+* [Sec 2948] Potential Infinite Loop in ntpq ( and ntpdc) perlinger@ntp.org
+* [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org
+* [Bug 2814] msyslog deadlock when signaled. perlinger@ntp.org
+ - applied patch by shenpeng11@huawei.com with minor adjustments
+* [Bug 2882] Look at ntp_request.c:list_peers_sum(). perlinger@ntp.org
+* [Bug 2891] Deadlock in deferred DNS lookup framework. perlinger@ntp.org
+* [Bug 2892] Several test cases assume IPv6 capabilities even when
+ IPv6 is disabled in the build. perlinger@ntp.org
+ - Found this already fixed, but validation led to cleanup actions.
+* [Bug 2905] DNS lookups broken. perlinger@ntp.org
+ - added limits to stack consumption, fixed some return code handling
+* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
+ - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
+* [Bug 2980] reduce number of warnings. perlinger@ntp.org
+ - integrated several patches from Havard Eidnes (he@uninett.no)
+* [Bug 2985] bogus calculation in authkeys.c perlinger@ntp.org
+ - implement 'auth_log2()' using integer bithack instead of float calculation
+* Make leapsec_query debug messages less verbose. Harlan Stenn.
+* Disable incomplete t-ntp_signd.c test. Harlan Stenn.
+
+---
(4.2.8p5) 2016/01/07 Released by Harlan Stenn <stenn@ntp.org>
* [Sec 2956] small-step/big-step. Close the panic gate earlier. HStenn.
@@ -47,6 +81,7 @@
lots of clients. perlinger@ntp.org
* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
- changed stacked/nested handling of CTRL-C. perlinger@ntp.org
+ - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
* Unity cleanup for FreeBSD-6.4. Harlan Stenn.
* Unity test cleanup. Harlan Stenn.
* Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
@@ -55,9 +90,8 @@
* Quiet a warning from clang. Harlan Stenn.
* Update the NEWS file. Harlan Stenn.
* Update scripts/calc_tickadj/Makefile.am. Harlan Stenn.
+
---
-(4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
-(4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
* [Sec 2899] CVE-2014-9297 perlinger@ntp.org
* [Sec 2901] Drop invalid packet before checking KoD. Check for all KoD's.
Modified: user/ngie/socket-tests/contrib/ntp/CommitLog
==============================================================================
--- user/ngie/socket-tests/contrib/ntp/CommitLog Sat Jan 23 22:51:22 2016 (r294647)
+++ user/ngie/socket-tests/contrib/ntp/CommitLog Sat Jan 23 22:56:26 2016 (r294648)
@@ -1,8 +1,633 @@
-ChangeSet@1.3623, 2016-01-07 23:33:11+00:00, stenn@deacon.udel.edu
+ChangeSet@1.3628, 2016-01-20 04:20:12-05:00, stenn@deacon.udel.edu
+ NTP_4_2_8P6
+ TAG: NTP_4_2_8P6
+
+ ChangeLog@1.1793 +1 -0
+ NTP_4_2_8P6
+
+ ntpd/invoke-ntp.conf.texi@1.196 +1 -1
+ NTP_4_2_8P6
+
+ ntpd/invoke-ntp.keys.texi@1.188 +1 -1
+ NTP_4_2_8P6
+
+ ntpd/invoke-ntpd.texi@1.504 +2 -2
+ NTP_4_2_8P6
+
+ ntpd/ntp.conf.5man@1.230 +3 -3
+ NTP_4_2_8P6
+
+ ntpd/ntp.conf.5mdoc@1.230 +2 -3
+ NTP_4_2_8P6
+
+ ntpd/ntp.conf.html@1.183 +60 -2
+ NTP_4_2_8P6
+
+ ntpd/ntp.conf.man.in@1.230 +3 -3
+ NTP_4_2_8P6
+
+ ntpd/ntp.conf.mdoc.in@1.230 +2 -3
+ NTP_4_2_8P6
+
+ ntpd/ntp.keys.5man@1.222 +2 -2
+ NTP_4_2_8P6
+
+ ntpd/ntp.keys.5mdoc@1.222 +3 -3
+ NTP_4_2_8P6
+
+ ntpd/ntp.keys.html@1.184 +21 -33
+ NTP_4_2_8P6
+
+ ntpd/ntp.keys.man.in@1.222 +2 -2
+ NTP_4_2_8P6
+
+ ntpd/ntp.keys.mdoc.in@1.222 +3 -3
+ NTP_4_2_8P6
+
+ ntpd/ntpd-opts.c@1.526 +10 -10
+ NTP_4_2_8P6
+
+ ntpd/ntpd-opts.h@1.525 +4 -4
+ NTP_4_2_8P6
+
+ ntpd/ntpd.1ntpdman@1.333 +4 -4
+ NTP_4_2_8P6
+
+ ntpd/ntpd.1ntpdmdoc@1.333 +3 -3
+ NTP_4_2_8P6
+
+ ntpd/ntpd.html@1.177 +2 -2
+ NTP_4_2_8P6
+
+ ntpd/ntpd.man.in@1.333 +4 -4
+ NTP_4_2_8P6
+
+ ntpd/ntpd.mdoc.in@1.333 +3 -3
+ NTP_4_2_8P6
+
+ ntpdc/invoke-ntpdc.texi@1.501 +2 -2
+ NTP_4_2_8P6
+
+ ntpdc/ntpdc-opts.c@1.519 +10 -10
+ NTP_4_2_8P6
+
+ ntpdc/ntpdc-opts.h@1.518 +4 -4
+ NTP_4_2_8P6
+
+ ntpdc/ntpdc.1ntpdcman@1.332 +4 -4
+ NTP_4_2_8P6
+
+ ntpdc/ntpdc.1ntpdcmdoc@1.332 +3 -3
+ NTP_4_2_8P6
+
+ ntpdc/ntpdc.html@1.345 +2 -2
+ NTP_4_2_8P6
+
+ ntpdc/ntpdc.man.in@1.332 +4 -4
+ NTP_4_2_8P6
+
+ ntpdc/ntpdc.mdoc.in@1.332 +3 -3
+ NTP_4_2_8P6
+
+ ntpq/invoke-ntpq.texi@1.508 +2 -2
+ NTP_4_2_8P6
+
+ ntpq/ntpq-opts.c@1.525 +10 -10
+ NTP_4_2_8P6
+
+ ntpq/ntpq-opts.h@1.523 +4 -4
+ NTP_4_2_8P6
+
+ ntpq/ntpq.1ntpqman@1.336 +4 -4
+ NTP_4_2_8P6
+
+ ntpq/ntpq.1ntpqmdoc@1.336 +3 -3
+ NTP_4_2_8P6
+
+ ntpq/ntpq.html@1.174 +2 -2
+ NTP_4_2_8P6
+
+ ntpq/ntpq.man.in@1.336 +4 -4
+ NTP_4_2_8P6
+
+ ntpq/ntpq.mdoc.in@1.336 +3 -3
+ NTP_4_2_8P6
+
+ ntpsnmpd/invoke-ntpsnmpd.texi@1.503 +2 -2
+ NTP_4_2_8P6
+
+ ntpsnmpd/ntpsnmpd-opts.c@1.521 +10 -10
+ NTP_4_2_8P6
+
+ ntpsnmpd/ntpsnmpd-opts.h@1.520 +4 -4
+ NTP_4_2_8P6
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.332 +4 -4
+ NTP_4_2_8P6
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.332 +3 -3
+ NTP_4_2_8P6
+
+ ntpsnmpd/ntpsnmpd.html@1.172 +1 -1
+ NTP_4_2_8P6
+
+ ntpsnmpd/ntpsnmpd.man.in@1.332 +4 -4
+ NTP_4_2_8P6
+
+ ntpsnmpd/ntpsnmpd.mdoc.in@1.332 +3 -3
+ NTP_4_2_8P6
+
+ packageinfo.sh@1.524 +2 -2
+ NTP_4_2_8P6
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.93 +3 -3
+ NTP_4_2_8P6
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.94 +2 -2
+ NTP_4_2_8P6
+
+ scripts/calc_tickadj/calc_tickadj.html@1.95 +1 -1
+ NTP_4_2_8P6
+
+ scripts/calc_tickadj/calc_tickadj.man.in@1.92 +3 -3
+ NTP_4_2_8P6
+
+ scripts/calc_tickadj/calc_tickadj.mdoc.in@1.94 +2 -2
+ NTP_4_2_8P6
+
+ scripts/calc_tickadj/invoke-calc_tickadj.texi@1.97 +1 -1
+ NTP_4_2_8P6
+
+ scripts/invoke-plot_summary.texi@1.114 +2 -2
+ NTP_4_2_8P6
+
+ scripts/invoke-summary.texi@1.114 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntp-wait/invoke-ntp-wait.texi@1.324 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntp-wait/ntp-wait-opts@1.60 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitman@1.321 +3 -3
+ NTP_4_2_8P6
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.322 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntp-wait/ntp-wait.html@1.341 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntp-wait/ntp-wait.man.in@1.321 +3 -3
+ NTP_4_2_8P6
+
+ scripts/ntp-wait/ntp-wait.mdoc.in@1.322 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntpsweep/invoke-ntpsweep.texi@1.112 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntpsweep/ntpsweep-opts@1.62 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepman@1.100 +3 -3
+ NTP_4_2_8P6
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.100 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntpsweep/ntpsweep.html@1.113 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntpsweep/ntpsweep.man.in@1.100 +3 -3
+ NTP_4_2_8P6
+
+ scripts/ntpsweep/ntpsweep.mdoc.in@1.101 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntptrace/invoke-ntptrace.texi@1.113 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntptrace/ntptrace-opts@1.62 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntptrace/ntptrace.1ntptraceman@1.100 +3 -3
+ NTP_4_2_8P6
+
+ scripts/ntptrace/ntptrace.1ntptracemdoc@1.101 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntptrace/ntptrace.html@1.114 +2 -2
+ NTP_4_2_8P6
+
+ scripts/ntptrace/ntptrace.man.in@1.100 +3 -3
+ NTP_4_2_8P6
+
+ scripts/ntptrace/ntptrace.mdoc.in@1.102 +2 -2
+ NTP_4_2_8P6
+
+ scripts/plot_summary-opts@1.62 +2 -2
+ NTP_4_2_8P6
+
+ scripts/plot_summary.1plot_summaryman@1.112 +3 -3
+ NTP_4_2_8P6
+
+ scripts/plot_summary.1plot_summarymdoc@1.112 +2 -2
+ NTP_4_2_8P6
+
+ scripts/plot_summary.html@1.115 +2 -2
+ NTP_4_2_8P6
+
+ scripts/plot_summary.man.in@1.112 +3 -3
+ NTP_4_2_8P6
+
+ scripts/plot_summary.mdoc.in@1.112 +2 -2
+ NTP_4_2_8P6
+
+ scripts/summary-opts@1.62 +2 -2
+ NTP_4_2_8P6
+
+ scripts/summary.1summaryman@1.112 +3 -3
+ NTP_4_2_8P6
+
+ scripts/summary.1summarymdoc@1.112 +2 -2
+ NTP_4_2_8P6
+
+ scripts/summary.html@1.115 +2 -2
+ NTP_4_2_8P6
+
+ scripts/summary.man.in@1.112 +3 -3
+ NTP_4_2_8P6
+
+ scripts/summary.mdoc.in@1.112 +2 -2
+ NTP_4_2_8P6
+
+ scripts/update-leap/invoke-update-leap.texi@1.13 +1 -1
+ NTP_4_2_8P6
+
+ scripts/update-leap/update-leap-opts@1.13 +2 -2
+ NTP_4_2_8P6
+
+ scripts/update-leap/update-leap.1update-leapman@1.13 +3 -3
+ NTP_4_2_8P6
+
+ scripts/update-leap/update-leap.1update-leapmdoc@1.13 +2 -2
+ NTP_4_2_8P6
+
+ scripts/update-leap/update-leap.html@1.13 +1 -1
+ NTP_4_2_8P6
+
+ scripts/update-leap/update-leap.man.in@1.13 +3 -3
+ NTP_4_2_8P6
+
+ scripts/update-leap/update-leap.mdoc.in@1.13 +2 -2
+ NTP_4_2_8P6
+
+ sntp/invoke-sntp.texi@1.501 +2 -2
+ NTP_4_2_8P6
+
+ sntp/sntp-opts.c@1.520 +10 -10
+ NTP_4_2_8P6
+
+ sntp/sntp-opts.h@1.518 +4 -4
+ NTP_4_2_8P6
+
+ sntp/sntp.1sntpman@1.336 +4 -4
+ NTP_4_2_8P6
+
+ sntp/sntp.1sntpmdoc@1.336 +3 -3
+ NTP_4_2_8P6
+
+ sntp/sntp.html@1.516 +2 -2
+ NTP_4_2_8P6
+
+ sntp/sntp.man.in@1.336 +4 -4
+ NTP_4_2_8P6
+
+ sntp/sntp.mdoc.in@1.336 +3 -3
+ NTP_4_2_8P6
+
+ util/invoke-ntp-keygen.texi@1.504 +2 -2
+ NTP_4_2_8P6
+
+ util/ntp-keygen-opts.c@1.522 +10 -10
+ NTP_4_2_8P6
+
+ util/ntp-keygen-opts.h@1.520 +4 -4
+ NTP_4_2_8P6
+
+ util/ntp-keygen.1ntp-keygenman@1.332 +4 -4
+ NTP_4_2_8P6
+
+ util/ntp-keygen.1ntp-keygenmdoc@1.332 +3 -3
+ NTP_4_2_8P6
+
+ util/ntp-keygen.html@1.178 +2 -2
+ NTP_4_2_8P6
+
+ util/ntp-keygen.man.in@1.332 +4 -4
+ NTP_4_2_8P6
+
+ util/ntp-keygen.mdoc.in@1.332 +3 -3
+ NTP_4_2_8P6
+
+ChangeSet@1.3627, 2016-01-20 04:14:51-05:00, stenn@deacon.udel.edu
+ solaris hack
+
+ libntp/work_thread.c@1.20 +2 -0
+ solaris hack
+
+ChangeSet@1.3626, 2016-01-20 01:50:09-05:00, stenn@deacon.udel.edu
+ 4.2.8p6
+
+ packageinfo.sh@1.523 +1 -1
+ 4.2.8p6
+
+ChangeSet@1.3625, 2016-01-20 00:34:15+00:00, stenn@psp-deb1.ntp.org
+ updates
+
+ NEWS@1.160 +24 -24
+ updates
+
+ChangeSet@1.3624, 2016-01-19 22:28:41+00:00, stenn@psp-deb1.ntp.org
+ typo
+
+ NEWS@1.159 +1 -1
+ typo
+
+ChangeSet@1.3623, 2016-01-18 11:55:56+00:00, stenn@psp-deb1.ntp.org
+ [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
+
+ ChangeLog@1.1792 +1 -0
+ [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
+
+ NEWS@1.158 +40 -0
+ [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
+
+ include/Makefile.am@1.54 +1 -0
+ [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
+
+ include/ntp_io.h@1.23 +2 -1
+ [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn.
+
+ include/ntp_keyacc.h@1.1 +13 -0
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***