From owner-svn-src-user@freebsd.org Sun Jan 10 00:01:04 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 782F2A6A73B
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 10 Jan 2016 00:01:04 +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 48E1A1D10;
Sun, 10 Jan 2016 00:01:04 +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 u0A013To076468;
Sun, 10 Jan 2016 00:01:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0A013Sj076467;
Sun, 10 Jan 2016 00:01:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601100001.u0A013Sj076467@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, 10 Jan 2016 00:01:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293624 -
user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif
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, 10 Jan 2016 00:01:04 -0000
Author: ngie
Date: Sun Jan 10 00:01:03 2016
New Revision: 293624
URL: https://svnweb.freebsd.org/changeset/base/293624
Log:
- Generate opt_inet.h appropriately
- Set MK_INET_SUPPORT, respecting the user knob
- Add in_gif.c to SRCS when MK_INET_SUPPORT != no to unbreak the build
Modified:
user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile
Modified: user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile Sat Jan 9 23:49:11 2016 (r293623)
+++ user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile Sun Jan 10 00:01:03 2016 (r293624)
@@ -5,12 +5,21 @@
.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
KMOD= if_gif
-SRCS= if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
+SRCS= if_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
+.endif
+.else
+OPT_INET!= cat ${KERNBUILDDIR}/opt_inet.h; echo
+.if empty(OPT_INET)
+MK_INET_SUPPORT= no
+.endif
+.endif
+.if !defined(KERNBUILDDIR)
.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h:
echo "#define INET6 1" > ${.TARGET}
@@ -25,6 +34,10 @@ MK_INET6_SUPPORT= no
.endif
.endif
+.if ${MK_INET_SUPPORT} != "no"
+SRCS+= in_gif.c
+.endif
+
.if ${MK_INET6_SUPPORT} != "no"
SRCS+= in6_gif.c
.endif
From owner-svn-src-user@freebsd.org Sun Jan 10 17:44: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 6394EA6915A
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 10 Jan 2016 17:44:03 +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 3AC3117EB;
Sun, 10 Jan 2016 17:44:03 +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 u0AHi2WD097126;
Sun, 10 Jan 2016 17:44:02 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AHi145097122;
Sun, 10 Jan 2016 17:44:01 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601101744.u0AHi145097122@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, 10 Jan 2016 17:44:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293638 - in user/ngie/stable-10-fix-LINT-NOINET:
sbin/geom/class/part sys/boot/common sys/geom/part usr.bin/netstat
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, 10 Jan 2016 17:44:03 -0000
Author: ngie
Date: Sun Jan 10 17:44:01 2016
New Revision: 293638
URL: https://svnweb.freebsd.org/changeset/base/293638
Log:
MFstable/10 @ r293637
Modified:
user/ngie/stable-10-fix-LINT-NOINET/sbin/geom/class/part/gpart.8
user/ngie/stable-10-fix-LINT-NOINET/sys/boot/common/part.c
user/ngie/stable-10-fix-LINT-NOINET/sys/geom/part/g_part_gpt.c
user/ngie/stable-10-fix-LINT-NOINET/usr.bin/netstat/inet.c
Directory Properties:
user/ngie/stable-10-fix-LINT-NOINET/ (props changed)
Modified: user/ngie/stable-10-fix-LINT-NOINET/sbin/geom/class/part/gpart.8
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/sbin/geom/class/part/gpart.8 Sun Jan 10 17:39:49 2016 (r293637)
+++ user/ngie/stable-10-fix-LINT-NOINET/sbin/geom/class/part/gpart.8 Sun Jan 10 17:44:01 2016 (r293638)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 14, 2015
+.Dd December 10, 2015
.Dt GPART 8
.Os
.Sh NAME
@@ -1107,15 +1107,6 @@ and
.Cm recover
are the only operations allowed on corrupt tables.
.Pp
-If the first sector of a provider is corrupt, the kernel can not detect GPT
-even if the partition table itself is not corrupt.
-The protective MBR can be rewritten using the
-.Xr dd 1
-command, to restore the ability to detect the GPT.
-The copy of the protective MBR is usually located in the
-.Pa /boot/pmbr
-file.
-.Pp
If one GPT header appears to be corrupt but the other copy remains intact,
the kernel will log the following:
.Bd -literal -offset indent
@@ -1330,7 +1321,6 @@ and
/sbin/gpart backup ada0 | /sbin/gpart restore -F ada1 ada2
.Ed
.Sh SEE ALSO
-.Xr dd 1 ,
.Xr geom 4 ,
.Xr boot0cfg 8 ,
.Xr geom 8 ,
Modified: user/ngie/stable-10-fix-LINT-NOINET/sys/boot/common/part.c
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/sys/boot/common/part.c Sun Jan 10 17:39:49 2016 (r293637)
+++ user/ngie/stable-10-fix-LINT-NOINET/sys/boot/common/part.c Sun Jan 10 17:44:01 2016 (r293638)
@@ -306,6 +306,7 @@ ptable_gptread(struct ptable *table, voi
table->type = PTABLE_NONE;
goto out;
}
+ DEBUG("GPT detected");
size = MIN(hdr.hdr_entries * hdr.hdr_entsz,
MAXTBLSZ * table->sectorsize);
for (i = 0; i < size / hdr.hdr_entsz; i++) {
@@ -631,6 +632,11 @@ ptable_open(void *dev, off_t sectors, ui
if (buf[DOSMAGICOFFSET] != 0x55 ||
buf[DOSMAGICOFFSET + 1] != 0xaa) {
DEBUG("magic sequence not found");
+#if defined(LOADER_GPT_SUPPORT)
+ /* There is no PMBR, check that we have backup GPT */
+ table->type = PTABLE_GPT;
+ table = ptable_gptread(table, dev, dread);
+#endif
goto out;
}
/* Check that we have PMBR. Also do some validation. */
Modified: user/ngie/stable-10-fix-LINT-NOINET/sys/geom/part/g_part_gpt.c
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/sys/geom/part/g_part_gpt.c Sun Jan 10 17:39:49 2016 (r293637)
+++ user/ngie/stable-10-fix-LINT-NOINET/sys/geom/part/g_part_gpt.c Sun Jan 10 17:44:01 2016 (r293638)
@@ -823,22 +823,23 @@ g_part_gpt_probe(struct g_part_table *ta
return (error);
res = le16dec(buf + DOSMAGICOFFSET);
pri = G_PART_PROBE_PRI_LOW;
- for (index = 0; index < NDOSPART; index++) {
- if (buf[DOSPARTOFF + DOSPARTSIZE * index + 4] == 0xee)
- pri = G_PART_PROBE_PRI_HIGH;
- }
- g_free(buf);
- if (res != DOSMAGIC)
- return (ENXIO);
+ if (res == DOSMAGIC) {
+ for (index = 0; index < NDOSPART; index++) {
+ if (buf[DOSPARTOFF + DOSPARTSIZE * index + 4] == 0xee)
+ pri = G_PART_PROBE_PRI_HIGH;
+ }
+ g_free(buf);
- /* Check that there's a primary header. */
- buf = g_read_data(cp, pp->sectorsize, pp->sectorsize, &error);
- if (buf == NULL)
- return (error);
- res = memcmp(buf, GPT_HDR_SIG, 8);
- g_free(buf);
- if (res == 0)
- return (pri);
+ /* Check that there's a primary header. */
+ buf = g_read_data(cp, pp->sectorsize, pp->sectorsize, &error);
+ if (buf == NULL)
+ return (error);
+ res = memcmp(buf, GPT_HDR_SIG, 8);
+ g_free(buf);
+ if (res == 0)
+ return (pri);
+ } else
+ g_free(buf);
/* No primary? Check that there's a secondary. */
buf = g_read_data(cp, pp->mediasize - pp->sectorsize, pp->sectorsize,
Modified: user/ngie/stable-10-fix-LINT-NOINET/usr.bin/netstat/inet.c
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/usr.bin/netstat/inet.c Sun Jan 10 17:39:49 2016 (r293637)
+++ user/ngie/stable-10-fix-LINT-NOINET/usr.bin/netstat/inet.c Sun Jan 10 17:44:01 2016 (r293638)
@@ -1039,47 +1039,6 @@ icmp_stats(u_long off, const char *name,
}
}
-#ifndef BURN_BRIDGES
-/*
- * Dump IGMP statistics structure (pre 8.x kernel).
- */
-static void
-igmp_stats_live_old(const char *name)
-{
- struct oigmpstat oigmpstat, zerostat;
- size_t len = sizeof(oigmpstat);
-
- if (zflag)
- memset(&zerostat, 0, len);
- if (sysctlbyname("net.inet.igmp.stats", &oigmpstat, &len,
- zflag ? &zerostat : NULL, zflag ? len : 0) < 0) {
- warn("sysctl: net.inet.igmp.stats");
- return;
- }
-
- printf("%s:\n", name);
-
-#define p(f, m) if (oigmpstat.f || sflag <= 1) \
- printf(m, oigmpstat.f, plural(oigmpstat.f))
-#define py(f, m) if (oigmpstat.f || sflag <= 1) \
- printf(m, oigmpstat.f, oigmpstat.f != 1 ? "ies" : "y")
- p(igps_rcv_total, "\t%u message%s received\n");
- p(igps_rcv_tooshort, "\t%u message%s received with too few bytes\n");
- p(igps_rcv_badsum, "\t%u message%s received with bad checksum\n");
- py(igps_rcv_queries, "\t%u membership quer%s received\n");
- py(igps_rcv_badqueries,
- "\t%u membership quer%s received with invalid field(s)\n");
- p(igps_rcv_reports, "\t%u membership report%s received\n");
- p(igps_rcv_badreports,
- "\t%u membership report%s received with invalid field(s)\n");
- p(igps_rcv_ourreports,
-"\t%u membership report%s received for groups to which we belong\n");
- p(igps_snd_reports, "\t%u membership report%s sent\n");
-#undef p
-#undef py
-}
-#endif /* !BURN_BRIDGES */
-
/*
* Dump IGMP statistics structure.
*/
From owner-svn-src-user@freebsd.org Sun Jan 10 17:48:00 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 10493A692AE
for <svn-src-user@mailman.ysv.freebsd.org>;
Sun, 10 Jan 2016 17:48:00 +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 C86741A6E;
Sun, 10 Jan 2016 17:47:59 +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 u0AHlwbA097316;
Sun, 10 Jan 2016 17:47:58 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0AHlvRB097304;
Sun, 10 Jan 2016 17:47:57 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601101747.u0AHlvRB097304@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, 10 Jan 2016 17:47:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293639 - in user/ngie/stable-10-libnv: lib/libdpv
lib/libfigpar sbin/geom/class/part sys/boot/common sys/geom/part sys/sys
usr.bin/netstat
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, 10 Jan 2016 17:48:00 -0000
Author: ngie
Date: Sun Jan 10 17:47:57 2016
New Revision: 293639
URL: https://svnweb.freebsd.org/changeset/base/293639
Log:
MFstable/10 @ r293638
Modified:
user/ngie/stable-10-libnv/lib/libdpv/dialogrc.c
user/ngie/stable-10-libnv/lib/libdpv/dialogrc.h
user/ngie/stable-10-libnv/lib/libdpv/util.h
user/ngie/stable-10-libnv/lib/libfigpar/figpar.3
user/ngie/stable-10-libnv/lib/libfigpar/figpar.c
user/ngie/stable-10-libnv/lib/libfigpar/figpar.h
user/ngie/stable-10-libnv/sbin/geom/class/part/gpart.8
user/ngie/stable-10-libnv/sys/boot/common/part.c
user/ngie/stable-10-libnv/sys/geom/part/g_part_gpt.c
user/ngie/stable-10-libnv/sys/sys/param.h
user/ngie/stable-10-libnv/usr.bin/netstat/inet.c
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
Modified: user/ngie/stable-10-libnv/lib/libdpv/dialogrc.c
==============================================================================
--- user/ngie/stable-10-libnv/lib/libdpv/dialogrc.c Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/lib/libdpv/dialogrc.c Sun Jan 10 17:47:57 2016 (r293639)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013-2014 Devin Teske <dteske@FreeBSD.org>
+ * Copyright (c) 2013-2015 Devin Teske <dteske@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,58 +49,58 @@ char gauge_color[STR_BUFSIZE] = "47b"; /
char separator[STR_BUFSIZE] = "";
/* Function prototypes */
-static int setattr(struct fp_config *, uint32_t, char *, char *);
-static int setbool(struct fp_config *, uint32_t, char *, char *);
-static int setnum(struct fp_config *, uint32_t, char *, char *);
-static int setstr(struct fp_config *, uint32_t, char *, char *);
+static int setattr(struct figpar_config *, uint32_t, char *, char *);
+static int setbool(struct figpar_config *, uint32_t, char *, char *);
+static int setnum(struct figpar_config *, uint32_t, char *, char *);
+static int setstr(struct figpar_config *, uint32_t, char *, char *);
/*
* Anatomy of DIALOGRC (~/.dialogrc by default)
* NOTE: Must appear after private function prototypes (above)
* NB: Brace-initialization of union requires cast to *first* member of union
*/
-static struct fp_config dialogrc_config[] = {
- /* TYPE Directive DEFAULT HANDLER */
- {FP_TYPE_INT, "aspect", {(void *)0}, &setnum},
- {FP_TYPE_STR, "separate_widget", {separator}, &setstr},
- {FP_TYPE_INT, "tab_len", {(void *)0}, &setnum},
- {FP_TYPE_BOOL, "visit_items", {(void *)0}, &setbool},
- {FP_TYPE_BOOL, "use_shadow", {(void *)1}, &setbool},
- {FP_TYPE_BOOL, "use_colors", {(void *)1}, &setbool},
- {FP_TYPE_STR, "screen_color", {NULL}, &setattr},
- {FP_TYPE_STR, "shadow_color", {NULL}, &setattr},
- {FP_TYPE_STR, "dialog_color", {NULL}, &setattr},
- {FP_TYPE_STR, "title_color", {NULL}, &setattr},
- {FP_TYPE_STR, "border_color", {NULL}, &setattr},
- {FP_TYPE_STR, "button_active_color", {NULL}, &setattr},
- {FP_TYPE_STR, "button_inactive_color", {NULL}, &setattr},
- {FP_TYPE_STR, "button_key_active_color", {NULL}, &setattr},
- {FP_TYPE_STR, "button_key_inactive_color", {NULL}, &setattr},
- {FP_TYPE_STR, "button_label_active_color", {NULL}, &setattr},
- {FP_TYPE_STR, "button_label_inactive_color",{NULL}, &setattr},
- {FP_TYPE_STR, "inputbox_color", {NULL}, &setattr},
- {FP_TYPE_STR, "inputbox_border_color", {NULL}, &setattr},
- {FP_TYPE_STR, "searchbox_color", {NULL}, &setattr},
- {FP_TYPE_STR, "searchbox_title_color", {NULL}, &setattr},
- {FP_TYPE_STR, "searchbox_border_color", {NULL}, &setattr},
- {FP_TYPE_STR, "position_indicator_color", {NULL}, &setattr},
- {FP_TYPE_STR, "menubox_color", {NULL}, &setattr},
- {FP_TYPE_STR, "menubox_border_color", {NULL}, &setattr},
- {FP_TYPE_STR, "item_color", {NULL}, &setattr},
- {FP_TYPE_STR, "item_selected_color", {NULL}, &setattr},
- {FP_TYPE_STR, "tag_color", {NULL}, &setattr},
- {FP_TYPE_STR, "tag_selected_color", {NULL}, &setattr},
- {FP_TYPE_STR, "tag_key_color", {NULL}, &setattr},
- {FP_TYPE_STR, "tag_key_selected_color", {NULL}, &setattr},
- {FP_TYPE_STR, "check_color", {NULL}, &setattr},
- {FP_TYPE_STR, "check_selected_color", {NULL}, &setattr},
- {FP_TYPE_STR, "uarrow_color", {NULL}, &setattr},
- {FP_TYPE_STR, "darrow_color", {NULL}, &setattr},
- {FP_TYPE_STR, "itemhelp_color", {NULL}, &setattr},
- {FP_TYPE_STR, "form_active_text_color", {NULL}, &setattr},
- {FP_TYPE_STR, "form_text_color", {NULL}, &setattr},
- {FP_TYPE_STR, "form_item_readonly_color", {NULL}, &setattr},
- {FP_TYPE_STR, "gauge_color", {gauge_color}, &setattr},
+static struct figpar_config dialogrc_config[] = {
+ /* TYPE DIRECTIVE DEFAULT HANDLER */
+ {FIGPAR_TYPE_INT, "aspect", {(void *)0}, &setnum},
+ {FIGPAR_TYPE_STR, "separate_widget", {separator}, &setstr},
+ {FIGPAR_TYPE_INT, "tab_len", {(void *)0}, &setnum},
+ {FIGPAR_TYPE_BOOL, "visit_items", {(void *)0}, &setbool},
+ {FIGPAR_TYPE_BOOL, "use_shadow", {(void *)1}, &setbool},
+ {FIGPAR_TYPE_BOOL, "use_colors", {(void *)1}, &setbool},
+ {FIGPAR_TYPE_STR, "screen_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "shadow_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "dialog_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "title_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "border_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "button_active_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "button_inactive_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "button_key_active_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "button_key_inactive_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "button_label_active_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "button_label_inactive_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "inputbox_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "inputbox_border_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "searchbox_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "searchbox_title_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "searchbox_border_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "position_indicator_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "menubox_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "menubox_border_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "item_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "item_selected_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "tag_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "tag_selected_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "tag_key_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "tag_key_selected_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "check_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "check_selected_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "uarrow_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "darrow_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "itemhelp_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "form_active_text_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "form_text_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "form_item_readonly_color", {NULL}, &setattr},
+ {FIGPAR_TYPE_STR, "gauge_color", {gauge_color}, &setattr},
{0, NULL, {0}, NULL}
};
@@ -108,7 +108,7 @@ static struct fp_config dialogrc_config[
* figpar call-back for interpreting value as .dialogrc `Attribute'
*/
static int
-setattr(struct fp_config *option, uint32_t line __unused,
+setattr(struct figpar_config *option, uint32_t line __unused,
char *directive __unused, char *value)
{
char *cp = value;
@@ -204,7 +204,7 @@ write_attrbuf:
* figpar call-back for interpreting value as .dialogrc `Boolean'
*/
static int
-setbool(struct fp_config *option, uint32_t line __unused,
+setbool(struct figpar_config *option, uint32_t line __unused,
char *directive __unused, char *value)
{
@@ -227,7 +227,7 @@ setbool(struct fp_config *option, uint32
* figpar call-back for interpreting value as .dialogrc `Number'
*/
static int
-setnum(struct fp_config *option, uint32_t line __unused,
+setnum(struct figpar_config *option, uint32_t line __unused,
char *directive __unused, char *value)
{
@@ -247,7 +247,7 @@ setnum(struct fp_config *option, uint32_
* figpar call-back for interpreting value as .dialogrc `String'
*/
static int
-setstr(struct fp_config *option, uint32_t line __unused,
+setstr(struct figpar_config *option, uint32_t line __unused,
char *directive __unused, char *value)
{
size_t len;
@@ -315,7 +315,8 @@ parse_dialogrc(void)
}
/* Process file (either $DIALOGRC if set, or `$HOME/.dialogrc') */
- res = parse_config(dialogrc_config, path, NULL, FP_BREAK_ON_EQUALS);
+ res = parse_config(dialogrc_config,
+ path, NULL, FIGPAR_BREAK_ON_EQUALS);
/* Set some globals based on what we parsed */
use_shadow = dialogrc_config_option("use_shadow")->value.boolean;
@@ -328,10 +329,10 @@ parse_dialogrc(void)
/*
* Return a pointer to the `.dialogrc' config option specific to `directive' or
- * static fp_dummy_config (full of NULLs) if none found (see
+ * static figpar_dummy_config (full of NULLs) if none found (see
* get_config_option(3); part of figpar(3)).
*/
-struct fp_config *
+struct figpar_config *
dialogrc_config_option(const char *directive)
{
return (get_config_option(dialogrc_config, directive));
Modified: user/ngie/stable-10-libnv/lib/libdpv/dialogrc.h
==============================================================================
--- user/ngie/stable-10-libnv/lib/libdpv/dialogrc.h Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/lib/libdpv/dialogrc.h Sun Jan 10 17:47:57 2016 (r293639)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013-2014 Devin Teske <dteske@FreeBSD.org>
+ * Copyright (c) 2013-2015 Devin Teske <dteske@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@ extern char separator[];
__BEGIN_DECLS
void dialogrc_free(void);
int parse_dialogrc(void);
-struct fp_config *dialogrc_config_option(const char *_directive);
+struct figpar_config *dialogrc_config_option(const char *_directive);
__END_DECLS
#endif /* !_DIALOGRC_H_ */
Modified: user/ngie/stable-10-libnv/lib/libdpv/util.h
==============================================================================
--- user/ngie/stable-10-libnv/lib/libdpv/util.h Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/lib/libdpv/util.h Sun Jan 10 17:47:57 2016 (r293639)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2013-2014 Devin Teske <dteske@FreeBSD.org>
+ * Copyright (c) 2013-2016 Devin Teske <dteske@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#define PATH_SHELL "/bin/sh"
#endif
-#define CMDBUFMAX 4096
+#define CMDBUFMAX 65536
__BEGIN_DECLS
int shell_spawn_pipecmd(const char *_cmd, const char *_label, pid_t *_pid);
Modified: user/ngie/stable-10-libnv/lib/libfigpar/figpar.3
==============================================================================
--- user/ngie/stable-10-libnv/lib/libfigpar/figpar.3 Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/lib/libfigpar/figpar.3 Sun Jan 10 17:47:57 2016 (r293639)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd Oct 22, 2015
+.Dd Nov 2, 2015
.Dt FIGPAR 3
.Os
.Sh NAME
@@ -38,13 +38,13 @@
.In figpar.h
.Ft int
.Fo parse_config
-.Fa "struct fp_config options[], const char *path"
-.Fa "int \*[lp]*unknown\*[rp]\*[lp]struct fp_config *option, uint32_t line"
+.Fa "struct figpar_config options[], const char *path"
+.Fa "int \*[lp]*unknown\*[rp]\*[lp]struct figpar_config *option, uint32_t line"
.Fa "char *directive, char *value\*[rp], uint8_t processing_options"
.Fc
-.Ft "struct fp_config *"
+.Ft "struct figpar_config *"
.Fo get_config_option
-.Fa "struct fp_config options[], const char *directive"
+.Fa "struct figpar_config options[], const char *directive"
.Fc
.In string_m.h
.Ft int
@@ -91,32 +91,32 @@ Configuration directives, types, and cal
data structures defined in
.In figpar.h :
.Bd -literal -offset indent
-struct fp_config {
- enum fp_cfgtype type; /* value type */
- const char *directive; /* keyword */
- union fp_cfgvalue value; /* value */
+struct figpar_config {
+ enum figpar_cfgtype type; /* value type */
+ const char *directive; /* keyword */
+ union figpar_cfgvalue value; /* value */
/* Pointer to function used when directive is found */
- int (*action)(struct fp_config *option, uint32_t line,
+ int (*action)(struct figpar_config *option, uint32_t line,
char *directive, char *value);
};
-enum fp_cfgtype {
- FP_TYPE_NONE = 0x0000, /* for directives with no value */
- FP_TYPE_BOOL = 0x0001, /* boolean */
- FP_TYPE_INT = 0x0002, /* signed 32 bit integer */
- FP_TYPE_UINT = 0x0004, /* unsigned 32 bit integer */
- FP_TYPE_STR = 0x0008, /* string pointer */
- FP_TYPE_STRARRAY = 0x0010, /* string array pointer */
- FP_TYPE_DATA1 = 0x0020, /* void data type-1 (whatever) */
- FP_TYPE_DATA2 = 0x0040, /* void data type-2 (whatever) */
- FP_TYPE_DATA3 = 0x0080, /* void data type-3 (whatever) */
- FP_TYPE_RESERVED1 = 0x0100, /* reserved data type-1 (future) */
- FP_TYPE_RESERVED2 = 0x0200, /* reserved data type-2 (future) */
- FP_TYPE_RESERVED3 = 0x0400, /* reserved data type-3 (future) */
+enum figpar_cfgtype {
+ FIGPAR_TYPE_NONE = 0x0000, /* directives with no value */
+ FIGPAR_TYPE_BOOL = 0x0001, /* boolean */
+ FIGPAR_TYPE_INT = 0x0002, /* signed 32 bit integer */
+ FIGPAR_TYPE_UINT = 0x0004, /* unsigned 32 bit integer */
+ FIGPAR_TYPE_STR = 0x0008, /* string pointer */
+ FIGPAR_TYPE_STRARRAY = 0x0010, /* string array pointer */
+ FIGPAR_TYPE_DATA1 = 0x0020, /* void data type-1 (open) */
+ FIGPAR_TYPE_DATA2 = 0x0040, /* void data type-2 (open) */
+ FIGPAR_TYPE_DATA3 = 0x0080, /* void data type-3 (open) */
+ FIGPAR_TYPE_RESERVED1 = 0x0100, /* reserved data type-1 */
+ FIGPAR_TYPE_RESERVED2 = 0x0200, /* reserved data type-2 */
+ FIGPAR_TYPE_RESERVED3 = 0x0400, /* reserved data type-3 */
};
-union fp_cfgvalue {
+union figpar_cfgvalue {
void *data; /* Pointer to NUL-terminated string */
char *str; /* Pointer to NUL-terminated string */
char **strarray; /* Pointer to an array of strings */
@@ -133,26 +133,26 @@ argument to
is a mask of bit fields which indicate various
processing options.
The possible flags are as follows:
-.Bl -tag -width FP_BREAK_ON_SEMICOLON
-.It Dv FP_BREAK_ON_EQUALS
+.Bl -tag -width FIGPAR_BREAK_ON_SEMICOLON
+.It Dv FIGPAR_BREAK_ON_EQUALS
An equals sign
.Pq Ql Li =
is normally considered part of the directive.
This flag enables terminating the directive at the equals sign.
Also makes equals sign optional and transient.
-.It Dv FP_BREAK_ON_SEMICOLON
+.It Dv FIGPAR_BREAK_ON_SEMICOLON
A semicolon
.Pq Ql Li \;
is normally considered part of the value.
This flag enables terminating the value at the semicolon.
Also allows multiple statements on a single line separated by semicolon.
-.It Dv FP_CASE_SENSITIVE
+.It Dv FIGPAR_CASE_SENSITIVE
Normally directives are matched case insensitively using
.Xr fnmatch 3 .
This flag enables directive matching to be case sensitive.
-.It Dv FP_REQUIRE_EQUALS
+.It Dv FIGPAR_REQUIRE_EQUALS
If a directive is not followed by an equals, processing is aborted.
-.It Dv FP_STRICT_EQUALS
+.It Dv FIGPAR_STRICT_EQUALS
Equals must be part of the directive to be considered a delimiter between
directive and value.
.El
@@ -163,14 +163,14 @@ struct array pointer can be NULL and eve
.Fn unknown
function argument.
.Pp
-The directive for each fp_config item in the
+The directive for each figpar_config item in the
.Fn parse_config
options argument is matched against each parsed directive using
.Xr fnmatch 3
until a match is found.
If a match is found, the
.Fn action
-function for that fp_config directive is invoked with the line number,
+function for that figpar_config directive is invoked with the line number,
directive, and value.
Otherwise if no match, the
.Fn unknown
@@ -192,11 +192,11 @@ or if no match a pointer to a static dum
.Pq whose values are all zero or NULL .
.Pp
The use of
-.Fa "struct fp_config"
+.Fa "struct figpar_config"
is entirely optional as-is the use of
-.Fa "enum fp_cfgtype"
+.Fa "enum figpar_cfgtype"
or
-.Fa "union fp_cfgvalue" .
+.Fa "union figpar_cfgvalue" .
For example, you could choose to pass a NULL pointer to
.Fn parse_config
for the first argument and then provide a simple
Modified: user/ngie/stable-10-libnv/lib/libfigpar/figpar.c
==============================================================================
--- user/ngie/stable-10-libnv/lib/libfigpar/figpar.c Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/lib/libfigpar/figpar.c Sun Jan 10 17:47:57 2016 (r293639)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2014 Devin Teske <dteske@FreeBSD.org>
+ * Copyright (c) 2002-2015 Devin Teske <dteske@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -40,24 +40,25 @@ __FBSDID("$FreeBSD$");
#include "figpar.h"
#include "string_m.h"
-struct fp_config fp_dummy_config = {0, NULL, {0}, NULL};
+struct figpar_config figpar_dummy_config = {0, NULL, {0}, NULL};
/*
- * Search for config option (struct fp_config) in the array of config options,
- * returning the struct whose directive matches the given parameter. If no
- * match is found, a pointer to the static dummy array (above) is returned.
+ * Search for config option (struct figpar_config) in the array of config
+ * options, returning the struct whose directive matches the given parameter.
+ * If no match is found, a pointer to the static dummy array (above) is
+ * returned.
*
* This is to eliminate dependency on the index position of an item in the
* array, since the index position is more apt to be changed as code grows.
*/
-struct fp_config *
-get_config_option(struct fp_config options[], const char *directive)
+struct figpar_config *
+get_config_option(struct figpar_config options[], const char *directive)
{
uint32_t n;
/* Check arguments */
if (options == NULL || directive == NULL)
- return (&fp_dummy_config);
+ return (&figpar_dummy_config);
/* Loop through the array, return the index of the first match */
for (n = 0; options[n].directive != NULL; n++)
@@ -65,12 +66,12 @@ get_config_option(struct fp_config optio
return (&(options[n]));
/* Re-initialize the dummy variable in case it was written to */
- fp_dummy_config.directive = NULL;
- fp_dummy_config.type = 0;
- fp_dummy_config.action = NULL;
- fp_dummy_config.value.u_num = 0;
+ figpar_dummy_config.directive = NULL;
+ figpar_dummy_config.type = 0;
+ figpar_dummy_config.action = NULL;
+ figpar_dummy_config.value.u_num = 0;
- return (&fp_dummy_config);
+ return (&figpar_dummy_config);
}
/*
@@ -84,9 +85,9 @@ get_config_option(struct fp_config optio
* Returns zero on success; otherwise returns -1 and errno should be consulted.
*/
int
-parse_config(struct fp_config options[], const char *path,
- int (*unknown)(struct fp_config *option, uint32_t line, char *directive,
- char *value), uint16_t processing_options)
+parse_config(struct figpar_config options[], const char *path,
+ int (*unknown)(struct figpar_config *option, uint32_t line,
+ char *directive, char *value), uint16_t processing_options)
{
uint8_t bequals;
uint8_t bsemicolon;
@@ -119,11 +120,15 @@ parse_config(struct fp_config options[],
return (-1);
/* Processing options */
- bequals = (processing_options & FP_BREAK_ON_EQUALS) == 0 ? 0 : 1;
- bsemicolon = (processing_options & FP_BREAK_ON_SEMICOLON) == 0 ? 0 : 1;
- case_sensitive = (processing_options & FP_CASE_SENSITIVE) == 0 ? 0 : 1;
- require_equals = (processing_options & FP_REQUIRE_EQUALS) == 0 ? 0 : 1;
- strict_equals = (processing_options & FP_STRICT_EQUALS) == 0 ? 0 : 1;
+ bequals = (processing_options & FIGPAR_BREAK_ON_EQUALS) == 0 ? 0 : 1;
+ bsemicolon =
+ (processing_options & FIGPAR_BREAK_ON_SEMICOLON) == 0 ? 0 : 1;
+ case_sensitive =
+ (processing_options & FIGPAR_CASE_SENSITIVE) == 0 ? 0 : 1;
+ require_equals =
+ (processing_options & FIGPAR_REQUIRE_EQUALS) == 0 ? 0 : 1;
+ strict_equals =
+ (processing_options & FIGPAR_STRICT_EQUALS) == 0 ? 0 : 1;
/* Initialize strings */
directive = value = 0;
Modified: user/ngie/stable-10-libnv/lib/libfigpar/figpar.h
==============================================================================
--- user/ngie/stable-10-libnv/lib/libfigpar/figpar.h Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/lib/libfigpar/figpar.h Sun Jan 10 17:47:57 2016 (r293639)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2002-2014 Devin Teske <dteske@FreeBSD.org>
+ * Copyright (c) 2002-2015 Devin Teske <dteske@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
/*
* Union for storing various types of data in a single common container.
*/
-union fp_cfgvalue {
+union figpar_cfgvalue {
void *data; /* Pointer to NUL-terminated string */
char *str; /* Pointer to NUL-terminated string */
char **strarray; /* Pointer to an array of strings */
@@ -46,53 +46,53 @@ union fp_cfgvalue {
/*
* Option types (based on above cfgvalue union)
*/
-enum fp_cfgtype {
- FP_TYPE_NONE = 0x0000, /* for directives with no value */
- FP_TYPE_BOOL = 0x0001, /* boolean */
- FP_TYPE_INT = 0x0002, /* signed 32 bit integer */
- FP_TYPE_UINT = 0x0004, /* unsigned 32 bit integer */
- FP_TYPE_STR = 0x0008, /* string pointer */
- FP_TYPE_STRARRAY = 0x0010, /* string array pointer */
- FP_TYPE_DATA1 = 0x0020, /* void data type-1 (whatever) */
- FP_TYPE_DATA2 = 0x0040, /* void data type-2 (whatever) */
- FP_TYPE_DATA3 = 0x0080, /* void data type-3 (whatever) */
- FP_TYPE_RESERVED1 = 0x0100, /* reserved data type-1 (future) */
- FP_TYPE_RESERVED2 = 0x0200, /* reserved data type-2 (future) */
- FP_TYPE_RESERVED3 = 0x0400, /* reserved data type-3 (future) */
+enum figpar_cfgtype {
+ FIGPAR_TYPE_NONE = 0x0000, /* directives with no value */
+ FIGPAR_TYPE_BOOL = 0x0001, /* boolean */
+ FIGPAR_TYPE_INT = 0x0002, /* signed 32 bit integer */
+ FIGPAR_TYPE_UINT = 0x0004, /* unsigned 32 bit integer */
+ FIGPAR_TYPE_STR = 0x0008, /* string pointer */
+ FIGPAR_TYPE_STRARRAY = 0x0010, /* string array pointer */
+ FIGPAR_TYPE_DATA1 = 0x0020, /* void data type-1 (open) */
+ FIGPAR_TYPE_DATA2 = 0x0040, /* void data type-2 (open) */
+ FIGPAR_TYPE_DATA3 = 0x0080, /* void data type-3 (open) */
+ FIGPAR_TYPE_RESERVED1 = 0x0100, /* reserved data type-1 */
+ FIGPAR_TYPE_RESERVED2 = 0x0200, /* reserved data type-2 */
+ FIGPAR_TYPE_RESERVED3 = 0x0400, /* reserved data type-3 */
};
/*
* Options to parse_config() for processing_options bitmask
*/
-#define FP_BREAK_ON_EQUALS 0x0001 /* stop reading directive at `=' */
-#define FP_BREAK_ON_SEMICOLON 0x0002 /* `;' starts a new line */
-#define FP_CASE_SENSITIVE 0x0004 /* directives are case sensitive */
-#define FP_REQUIRE_EQUALS 0x0008 /* assignment directives only */
-#define FP_STRICT_EQUALS 0x0010 /* `=' must be part of directive */
+#define FIGPAR_BREAK_ON_EQUALS 0x0001 /* stop reading directive at `=' */
+#define FIGPAR_BREAK_ON_SEMICOLON 0x0002 /* `;' starts a new line */
+#define FIGPAR_CASE_SENSITIVE 0x0004 /* directives are case sensitive */
+#define FIGPAR_REQUIRE_EQUALS 0x0008 /* assignment directives only */
+#define FIGPAR_STRICT_EQUALS 0x0010 /* `=' must be part of directive */
/*
* Anatomy of a config file option
*/
-struct fp_config {
- enum fp_cfgtype type; /* Option value type */
+struct figpar_config {
+ enum figpar_cfgtype type; /* Option value type */
const char *directive; /* config file keyword */
- union fp_cfgvalue value; /* NB: set by action */
+ union figpar_cfgvalue value; /* NB: set by action */
/*
* Function pointer; action to be taken when the directive is found
*/
- int (*action)(struct fp_config *option, uint32_t line, char *directive,
- char *value);
+ int (*action)(struct figpar_config *option, uint32_t line,
+ char *directive, char *value);
};
-extern struct fp_config fp_dummy_config;
+extern struct figpar_config figpar_dummy_config;
__BEGIN_DECLS
-int parse_config(struct fp_config _options[],
+int parse_config(struct figpar_config _options[],
const char *_path,
- int (*_unknown)(struct fp_config *_option,
+ int (*_unknown)(struct figpar_config *_option,
uint32_t _line, char *_directive, char *_value),
uint16_t _processing_options);
-struct fp_config *get_config_option(struct fp_config _options[],
+struct figpar_config *get_config_option(struct figpar_config _options[],
const char *_directive);
__END_DECLS
Modified: user/ngie/stable-10-libnv/sbin/geom/class/part/gpart.8
==============================================================================
--- user/ngie/stable-10-libnv/sbin/geom/class/part/gpart.8 Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/sbin/geom/class/part/gpart.8 Sun Jan 10 17:47:57 2016 (r293639)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 14, 2015
+.Dd December 10, 2015
.Dt GPART 8
.Os
.Sh NAME
@@ -1107,15 +1107,6 @@ and
.Cm recover
are the only operations allowed on corrupt tables.
.Pp
-If the first sector of a provider is corrupt, the kernel can not detect GPT
-even if the partition table itself is not corrupt.
-The protective MBR can be rewritten using the
-.Xr dd 1
-command, to restore the ability to detect the GPT.
-The copy of the protective MBR is usually located in the
-.Pa /boot/pmbr
-file.
-.Pp
If one GPT header appears to be corrupt but the other copy remains intact,
the kernel will log the following:
.Bd -literal -offset indent
@@ -1330,7 +1321,6 @@ and
/sbin/gpart backup ada0 | /sbin/gpart restore -F ada1 ada2
.Ed
.Sh SEE ALSO
-.Xr dd 1 ,
.Xr geom 4 ,
.Xr boot0cfg 8 ,
.Xr geom 8 ,
Modified: user/ngie/stable-10-libnv/sys/boot/common/part.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/common/part.c Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/sys/boot/common/part.c Sun Jan 10 17:47:57 2016 (r293639)
@@ -306,6 +306,7 @@ ptable_gptread(struct ptable *table, voi
table->type = PTABLE_NONE;
goto out;
}
+ DEBUG("GPT detected");
size = MIN(hdr.hdr_entries * hdr.hdr_entsz,
MAXTBLSZ * table->sectorsize);
for (i = 0; i < size / hdr.hdr_entsz; i++) {
@@ -631,6 +632,11 @@ ptable_open(void *dev, off_t sectors, ui
if (buf[DOSMAGICOFFSET] != 0x55 ||
buf[DOSMAGICOFFSET + 1] != 0xaa) {
DEBUG("magic sequence not found");
+#if defined(LOADER_GPT_SUPPORT)
+ /* There is no PMBR, check that we have backup GPT */
+ table->type = PTABLE_GPT;
+ table = ptable_gptread(table, dev, dread);
+#endif
goto out;
}
/* Check that we have PMBR. Also do some validation. */
Modified: user/ngie/stable-10-libnv/sys/geom/part/g_part_gpt.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/geom/part/g_part_gpt.c Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/sys/geom/part/g_part_gpt.c Sun Jan 10 17:47:57 2016 (r293639)
@@ -823,22 +823,23 @@ g_part_gpt_probe(struct g_part_table *ta
return (error);
res = le16dec(buf + DOSMAGICOFFSET);
pri = G_PART_PROBE_PRI_LOW;
- for (index = 0; index < NDOSPART; index++) {
- if (buf[DOSPARTOFF + DOSPARTSIZE * index + 4] == 0xee)
- pri = G_PART_PROBE_PRI_HIGH;
- }
- g_free(buf);
- if (res != DOSMAGIC)
- return (ENXIO);
+ if (res == DOSMAGIC) {
+ for (index = 0; index < NDOSPART; index++) {
+ if (buf[DOSPARTOFF + DOSPARTSIZE * index + 4] == 0xee)
+ pri = G_PART_PROBE_PRI_HIGH;
+ }
+ g_free(buf);
- /* Check that there's a primary header. */
- buf = g_read_data(cp, pp->sectorsize, pp->sectorsize, &error);
- if (buf == NULL)
- return (error);
- res = memcmp(buf, GPT_HDR_SIG, 8);
- g_free(buf);
- if (res == 0)
- return (pri);
+ /* Check that there's a primary header. */
+ buf = g_read_data(cp, pp->sectorsize, pp->sectorsize, &error);
+ if (buf == NULL)
+ return (error);
+ res = memcmp(buf, GPT_HDR_SIG, 8);
+ g_free(buf);
+ if (res == 0)
+ return (pri);
+ } else
+ g_free(buf);
/* No primary? Check that there's a secondary. */
buf = g_read_data(cp, pp->mediasize - pp->sectorsize, pp->sectorsize,
Modified: user/ngie/stable-10-libnv/sys/sys/param.h
==============================================================================
--- user/ngie/stable-10-libnv/sys/sys/param.h Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/sys/sys/param.h Sun Jan 10 17:47:57 2016 (r293639)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1002507 /* Master, propagated to newvers */
+#define __FreeBSD_version 1002508 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Modified: user/ngie/stable-10-libnv/usr.bin/netstat/inet.c
==============================================================================
--- user/ngie/stable-10-libnv/usr.bin/netstat/inet.c Sun Jan 10 17:44:01 2016 (r293638)
+++ user/ngie/stable-10-libnv/usr.bin/netstat/inet.c Sun Jan 10 17:47:57 2016 (r293639)
@@ -1039,47 +1039,6 @@ icmp_stats(u_long off, const char *name,
}
}
-#ifndef BURN_BRIDGES
-/*
- * Dump IGMP statistics structure (pre 8.x kernel).
- */
-static void
-igmp_stats_live_old(const char *name)
-{
- struct oigmpstat oigmpstat, zerostat;
- size_t len = sizeof(oigmpstat);
-
- if (zflag)
- memset(&zerostat, 0, len);
- if (sysctlbyname("net.inet.igmp.stats", &oigmpstat, &len,
- zflag ? &zerostat : NULL, zflag ? len : 0) < 0) {
- warn("sysctl: net.inet.igmp.stats");
- return;
- }
-
- printf("%s:\n", name);
-
-#define p(f, m) if (oigmpstat.f || sflag <= 1) \
- printf(m, oigmpstat.f, plural(oigmpstat.f))
-#define py(f, m) if (oigmpstat.f || sflag <= 1) \
- printf(m, oigmpstat.f, oigmpstat.f != 1 ? "ies" : "y")
- p(igps_rcv_total, "\t%u message%s received\n");
- p(igps_rcv_tooshort, "\t%u message%s received with too few bytes\n");
- p(igps_rcv_badsum, "\t%u message%s received with bad checksum\n");
- py(igps_rcv_queries, "\t%u membership quer%s received\n");
- py(igps_rcv_badqueries,
- "\t%u membership quer%s received with invalid field(s)\n");
- p(igps_rcv_reports, "\t%u membership report%s received\n");
- p(igps_rcv_badreports,
- "\t%u membership report%s received with invalid field(s)\n");
- p(igps_rcv_ourreports,
-"\t%u membership report%s received for groups to which we belong\n");
- p(igps_snd_reports, "\t%u membership report%s sent\n");
-#undef p
-#undef py
-}
-#endif /* !BURN_BRIDGES */
-
/*
* Dump IGMP statistics structure.
*/
From owner-svn-src-user@freebsd.org Mon Jan 11 07:44:51 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 15526A6AC6C
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 11 Jan 2016 07:44:51 +0000 (UTC)
(envelope-from glebius@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 D954D135F;
Mon, 11 Jan 2016 07:44:50 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0B7iop3056576;
Mon, 11 Jan 2016 07:44:50 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0B7ioKw056575;
Mon, 11 Jan 2016 07:44:50 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601110744.u0B7ioKw056575@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 11 Jan 2016 07:44:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293655 -
user/cperciva/freebsd-update-build/patches/10.2-RELEASE
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, 11 Jan 2016 07:44:51 -0000
Author: glebius
Date: Mon Jan 11 07:44:49 2016
New Revision: 293655
URL: https://svnweb.freebsd.org/changeset/base/293655
Log:
Filemon EN to be released in 2016.
Added:
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-16:01.filemon
- copied, changed from r293654, user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-15:21.filemon
Deleted:
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-15:21.filemon
Copied and modified: user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-16:01.filemon (from r293654, user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-15:21.filemon)
==============================================================================
--- user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-15:21.filemon Mon Jan 11 04:25:03 2016 (r293654, copy source)
+++ user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-16:01.filemon Mon Jan 11 07:44:49 2016 (r293655)
@@ -1,7 +1,5 @@
-Index: sys/dev/filemon/filemon.c
-===================================================================
---- sys/dev/filemon/filemon.c (revision 292588)
-+++ sys/dev/filemon/filemon.c (working copy)
+--- sys/dev/filemon/filemon.c.orig
++++ sys/dev/filemon/filemon.c
@@ -1,6 +1,7 @@
/*-
* Copyright (c) 2011, David E. O'Brien.
@@ -10,7 +8,7 @@ Index: sys/dev/filemon/filemon.c
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
-@@ -39,6 +40,7 @@ __FBSDID("$FreeBSD$");
+@@ -39,6 +40,7 @@
#include <sys/fcntl.h>
#include <sys/ioccom.h>
#include <sys/kernel.h>
@@ -18,7 +16,7 @@ Index: sys/dev/filemon/filemon.c
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
-@@ -45,6 +47,7 @@ __FBSDID("$FreeBSD$");
+@@ -45,6 +47,7 @@
#include <sys/poll.h>
#include <sys/proc.h>
#include <sys/queue.h>
@@ -26,7 +24,7 @@ Index: sys/dev/filemon/filemon.c
#include <sys/syscall.h>
#include <sys/sysent.h>
#include <sys/sysproto.h>
-@@ -85,12 +88,8 @@ MALLOC_DEFINE(M_FILEMON, "filemon", "File access m
+@@ -85,12 +88,8 @@
struct filemon {
TAILQ_ENTRY(filemon) link; /* Link into the in-use list. */
@@ -40,7 +38,7 @@ Index: sys/dev/filemon/filemon.c
pid_t pid; /* The process ID being monitored. */
char fname1[MAXPATHLEN]; /* Temporary filename buffer. */
char fname2[MAXPATHLEN]; /* Temporary filename buffer. */
-@@ -99,11 +98,7 @@ struct filemon {
+@@ -99,11 +98,7 @@
static TAILQ_HEAD(, filemon) filemons_inuse = TAILQ_HEAD_INITIALIZER(filemons_inuse);
static TAILQ_HEAD(, filemon) filemons_free = TAILQ_HEAD_INITIALIZER(filemons_free);
@@ -53,7 +51,7 @@ Index: sys/dev/filemon/filemon.c
static struct cdev *filemon_dev;
-@@ -203,8 +198,7 @@ filemon_open(struct cdev *dev, int oflags __unused
+@@ -203,8 +198,7 @@
filemon->fp = NULL;
@@ -63,7 +61,7 @@ Index: sys/dev/filemon/filemon.c
}
filemon->pid = curproc->p_pid;
-@@ -234,8 +228,7 @@ filemon_close(struct cdev *dev __unused, int flag
+@@ -234,8 +228,7 @@
static void
filemon_load(void *dummy __unused)
{
@@ -73,7 +71,7 @@ Index: sys/dev/filemon/filemon.c
/* Install the syscall wrappers. */
filemon_wrapper_install();
-@@ -270,14 +263,12 @@ filemon_unload(void)
+@@ -270,14 +263,12 @@
filemon_lock_write();
while ((filemon = TAILQ_FIRST(&filemons_free)) != NULL) {
TAILQ_REMOVE(&filemons_free, filemon, link);
@@ -90,10 +88,8 @@ Index: sys/dev/filemon/filemon.c
}
return (error);
-Index: sys/dev/filemon/filemon_lock.c
-===================================================================
---- sys/dev/filemon/filemon_lock.c (revision 292588)
-+++ sys/dev/filemon/filemon_lock.c (working copy)
+--- sys/dev/filemon/filemon_lock.c.orig
++++ sys/dev/filemon/filemon_lock.c
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2009-2011, Juniper Networks, Inc.
@@ -210,10 +206,8 @@ Index: sys/dev/filemon/filemon_lock.c
- mtx_unlock(&access_mtx);
+ sx_xunlock(&access_lock);
}
-Index: sys/dev/filemon/filemon_wrapper.c
-===================================================================
---- sys/dev/filemon/filemon_wrapper.c (revision 292588)
-+++ sys/dev/filemon/filemon_wrapper.c (working copy)
+--- sys/dev/filemon/filemon_wrapper.c.orig
++++ sys/dev/filemon/filemon_wrapper.c
@@ -1,6 +1,7 @@
/*-
* Copyright (c) 2011, David E. O'Brien.
@@ -222,7 +216,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
-@@ -86,11 +87,18 @@ filemon_pid_check(struct proc *p)
+@@ -86,11 +87,18 @@
{
struct filemon *filemon;
@@ -241,7 +235,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
return (filemon);
}
}
-@@ -97,6 +105,7 @@ filemon_pid_check(struct proc *p)
+@@ -97,6 +105,7 @@
p = proc_realparent(p);
}
sx_sunlock(&proctree_lock);
@@ -249,7 +243,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
return (NULL);
}
-@@ -109,9 +118,6 @@ filemon_comment(struct filemon *filemon)
+@@ -109,9 +118,6 @@
/* Load timestamp before locking. Less accurate but less contention. */
getmicrotime(&now);
@@ -259,7 +253,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
/* Lock the found filemon structure. */
filemon_filemon_lock(filemon);
-@@ -124,9 +130,6 @@ filemon_comment(struct filemon *filemon)
+@@ -124,9 +130,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
@@ -269,7 +263,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
static int
-@@ -138,13 +141,7 @@ filemon_wrapper_chdir(struct thread *td, struct ch
+@@ -138,13 +141,7 @@
struct filemon *filemon;
if ((ret = sys_chdir(td, uap)) == 0) {
@@ -283,7 +277,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
-@@ -157,9 +154,6 @@ filemon_wrapper_chdir(struct thread *td, struct ch
+@@ -157,9 +154,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -293,7 +287,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -177,13 +171,7 @@ filemon_wrapper_execve(struct thread *td, struct e
+@@ -177,13 +171,7 @@
copyinstr(uap->fname, fname, sizeof(fname), &done);
if ((ret = sys_execve(td, uap)) == 0) {
@@ -307,7 +301,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
len = snprintf(filemon->msgbufr,
sizeof(filemon->msgbufr), "E %d %s\n",
curproc->p_pid, fname);
-@@ -193,9 +181,6 @@ filemon_wrapper_execve(struct thread *td, struct e
+@@ -193,9 +181,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -317,7 +311,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -215,13 +200,7 @@ filemon_wrapper_freebsd32_execve(struct thread *td
+@@ -215,13 +200,7 @@
copyinstr(uap->fname, fname, sizeof(fname), &done);
if ((ret = freebsd32_execve(td, uap)) == 0) {
@@ -331,7 +325,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
len = snprintf(filemon->msgbufr,
sizeof(filemon->msgbufr), "E %d %s\n",
curproc->p_pid, fname);
-@@ -231,9 +210,6 @@ filemon_wrapper_freebsd32_execve(struct thread *td
+@@ -231,9 +210,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -341,7 +335,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -248,13 +224,7 @@ filemon_wrapper_fork(struct thread *td, struct for
+@@ -248,13 +224,7 @@
struct filemon *filemon;
if ((ret = sys_fork(td, uap)) == 0) {
@@ -355,7 +349,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
len = snprintf(filemon->msgbufr,
sizeof(filemon->msgbufr), "F %d %ld\n",
curproc->p_pid, (long)curthread->td_retval[0]);
-@@ -264,9 +234,6 @@ filemon_wrapper_fork(struct thread *td, struct for
+@@ -264,9 +234,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -365,7 +359,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -281,13 +248,7 @@ filemon_wrapper_open(struct thread *td, struct ope
+@@ -281,13 +248,7 @@
struct filemon *filemon;
if ((ret = sys_open(td, uap)) == 0) {
@@ -379,7 +373,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
-@@ -313,9 +274,6 @@ filemon_wrapper_open(struct thread *td, struct ope
+@@ -313,9 +274,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -389,7 +383,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -330,13 +288,7 @@ filemon_wrapper_openat(struct thread *td, struct o
+@@ -330,13 +288,7 @@
struct filemon *filemon;
if ((ret = sys_openat(td, uap)) == 0) {
@@ -403,7 +397,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
-@@ -375,9 +327,6 @@ filemon_wrapper_openat(struct thread *td, struct o
+@@ -375,9 +327,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -413,7 +407,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -392,13 +341,7 @@ filemon_wrapper_rename(struct thread *td, struct r
+@@ -392,13 +341,7 @@
struct filemon *filemon;
if ((ret = sys_rename(td, uap)) == 0) {
@@ -427,7 +421,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->from, filemon->fname1,
sizeof(filemon->fname1), &done);
copyinstr(uap->to, filemon->fname2,
-@@ -413,9 +356,6 @@ filemon_wrapper_rename(struct thread *td, struct r
+@@ -413,9 +356,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -437,7 +431,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -430,13 +370,7 @@ filemon_wrapper_link(struct thread *td, struct lin
+@@ -430,13 +370,7 @@
struct filemon *filemon;
if ((ret = sys_link(td, uap)) == 0) {
@@ -451,7 +445,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
copyinstr(uap->link, filemon->fname2,
-@@ -451,9 +385,6 @@ filemon_wrapper_link(struct thread *td, struct lin
+@@ -451,9 +385,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -461,7 +455,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -468,13 +399,7 @@ filemon_wrapper_symlink(struct thread *td, struct
+@@ -468,13 +399,7 @@
struct filemon *filemon;
if ((ret = sys_symlink(td, uap)) == 0) {
@@ -475,7 +469,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
copyinstr(uap->link, filemon->fname2,
-@@ -489,9 +414,6 @@ filemon_wrapper_symlink(struct thread *td, struct
+@@ -489,9 +414,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -485,7 +479,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -507,13 +429,7 @@ filemon_wrapper_linkat(struct thread *td, struct l
+@@ -507,13 +429,7 @@
struct filemon *filemon;
if ((ret = sys_linkat(td, uap)) == 0) {
@@ -499,7 +493,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path1, filemon->fname1,
sizeof(filemon->fname1), &done);
copyinstr(uap->path2, filemon->fname2,
-@@ -528,9 +444,6 @@ filemon_wrapper_linkat(struct thread *td, struct l
+@@ -528,9 +444,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -509,7 +503,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -546,13 +459,7 @@ filemon_wrapper_stat(struct thread *td, struct sta
+@@ -546,13 +459,7 @@
struct filemon *filemon;
if ((ret = sys_stat(td, uap)) == 0) {
@@ -523,7 +517,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
-@@ -565,9 +472,6 @@ filemon_wrapper_stat(struct thread *td, struct sta
+@@ -565,9 +472,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -533,7 +527,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -584,13 +488,7 @@ filemon_wrapper_freebsd32_stat(struct thread *td,
+@@ -584,13 +488,7 @@
struct filemon *filemon;
if ((ret = freebsd32_stat(td, uap)) == 0) {
@@ -547,7 +541,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
-@@ -603,9 +501,6 @@ filemon_wrapper_freebsd32_stat(struct thread *td,
+@@ -603,9 +501,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -557,7 +551,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -622,13 +517,7 @@ filemon_wrapper_sys_exit(struct thread *td, struct
+@@ -622,13 +517,7 @@
/* Get timestamp before locking. */
getmicrotime(&now);
@@ -571,7 +565,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
len = snprintf(filemon->msgbufr, sizeof(filemon->msgbufr),
"X %d %d\n", curproc->p_pid, uap->rval);
-@@ -649,9 +538,6 @@ filemon_wrapper_sys_exit(struct thread *td, struct
+@@ -649,9 +538,6 @@
filemon_filemon_unlock(filemon);
}
@@ -581,7 +575,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
sys_sys_exit(td, uap);
}
-@@ -664,13 +550,7 @@ filemon_wrapper_unlink(struct thread *td, struct u
+@@ -664,13 +550,7 @@
struct filemon *filemon;
if ((ret = sys_unlink(td, uap)) == 0) {
@@ -595,7 +589,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
copyinstr(uap->path, filemon->fname1,
sizeof(filemon->fname1), &done);
-@@ -683,9 +563,6 @@ filemon_wrapper_unlink(struct thread *td, struct u
+@@ -683,9 +563,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
@@ -605,7 +599,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
}
return (ret);
-@@ -699,13 +576,7 @@ filemon_wrapper_vfork(struct thread *td, struct vf
+@@ -699,13 +576,7 @@
struct filemon *filemon;
if ((ret = sys_vfork(td, uap)) == 0) {
@@ -619,7 +613,7 @@ Index: sys/dev/filemon/filemon_wrapper.c
len = snprintf(filemon->msgbufr,
sizeof(filemon->msgbufr), "F %d %ld\n",
curproc->p_pid, (long)curthread->td_retval[0]);
-@@ -715,9 +586,6 @@ filemon_wrapper_vfork(struct thread *td, struct vf
+@@ -715,9 +586,6 @@
/* Unlock the found filemon structure. */
filemon_filemon_unlock(filemon);
}
From owner-svn-src-user@freebsd.org Tue Jan 12 00:48:14 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 0359FA6BE47
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 00:48:14 +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 9EEC118AD;
Tue, 12 Jan 2016 00:48: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 u0C0mCBt062981;
Tue, 12 Jan 2016 00:48:12 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0C0mCub062976;
Tue, 12 Jan 2016 00:48:12 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601120048.u0C0mCub062976@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: Tue, 12 Jan 2016 00:48:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293717 - in user/ngie/stable-10-fix-LINT-NOINET: .
contrib/ntp contrib/ntp/html contrib/ntp/include contrib/ntp/lib/isc
contrib/ntp/lib/isc/win32 contrib/ntp/libntp contrib/ntp/libpars...
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: Tue, 12 Jan 2016 00:48:14 -0000
Author: ngie
Date: Tue Jan 12 00:48:11 2016
New Revision: 293717
URL: https://svnweb.freebsd.org/changeset/base/293717
Log:
MFstable/10 @ r293716
Added:
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/include/safecast.h
- copied unchanged from r293716, stable/10/contrib/ntp/include/safecast.h
user/ngie/stable-10-fix-LINT-NOINET/share/man/man4/ismt.4
- copied unchanged from r293716, stable/10/share/man/man4/ismt.4
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/ismt/
- copied from r293716, stable/10/sys/dev/ismt/
user/ngie/stable-10-fix-LINT-NOINET/sys/modules/i2c/controllers/ismt/
- copied from r293716, stable/10/sys/modules/i2c/controllers/ismt/
Modified:
user/ngie/stable-10-fix-LINT-NOINET/Makefile.inc1
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ChangeLog
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/CommitLog
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/NEWS
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/configure
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/html/miscopt.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/include/Makefile.am
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/include/Makefile.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/include/ntp_refclock.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/include/ntp_stdlib.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/include/ntp_worker.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/include/ntpd.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/backtrace.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/buffer.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/inet_aton.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/inet_pton.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/log.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/netaddr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/sockaddr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/task.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/win32/interfaceiter.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/lib/isc/win32/net.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/a_md5encrypt.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/atolfp.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/authkeys.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/authreadkeys.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/authusekey.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/dolfptoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/hextolfp.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/mstolfp.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/msyslog.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/ntp_crypto_rnd.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/ntp_lineedit.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/ntp_rfc2553.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/ntp_worker.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/snprintf.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/socktohost.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/systime.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libntp/work_thread.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_computime.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_dcf7000.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_hopf6021.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_meinberg.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_rawdcf.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_rcc8000.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_schmid.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_trimtaip.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_varitext.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/clk_wharton.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/libparse/parse.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/invoke-ntp.conf.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/invoke-ntp.keys.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/invoke-ntpd.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.conf.5man
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.conf.5mdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.conf.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.conf.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.conf.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.keys.5man
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.keys.5mdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.keys.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.keys.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp.keys.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_control.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_crypto.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_io.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_loopfilter.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_parser.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_proto.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_refclock.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_request.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_restrict.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_signd.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_timer.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntp_util.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd-opts.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd-opts.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd.1ntpdman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd.1ntpdmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/ntpd.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/refclock_local.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/refclock_parse.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/refclock_shm.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/refclock_true.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpd/refclock_tsyncpci.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdate/ntpdate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/invoke-ntpdc.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc-opts.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc-opts.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc.1ntpdcman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpdc/ntpdc_ops.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/invoke-ntpq.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/libntpq.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/libntpq.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/libntpq_subs.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq-opts.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq-opts.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq-subs.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq.1ntpqman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq.1ntpqmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpq/ntpq.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/ntpsnmpd.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/packageinfo.sh
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/Makefile.am
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/Makefile.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/invoke-plot_summary.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/invoke-summary.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntp-wait/ntp-wait.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntpsweep/ntpsweep.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntptrace/ntptrace-opts
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntptrace/ntptrace.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntptrace/ntptrace.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/plot_summary-opts
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/plot_summary.1plot_summaryman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/plot_summary.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/plot_summary.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/plot_summary.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/summary-opts
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/summary.1summaryman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/summary.1summarymdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/summary.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/summary.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/summary.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/update-leap/update-leap-opts
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/update-leap/update-leap.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/update-leap/update-leap.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/configure
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/include/version.def
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/include/version.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/invoke-sntp.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/m4/ntp_libevent.m4
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/m4/ntp_problemtests.m4
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/m4/version.m4
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/networking.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/sntp-opts.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/sntp-opts.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/sntp.1sntpman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/sntp.1sntpmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/sntp.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/sntp.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/sntp.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/tests/keyFile.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/tests/kodDatabase.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/tests/kodFile.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/tests/run-kodDatabase.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/tests/run-t-log.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/tests/t-log.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/tests/utilities.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/unity/unity_internals.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/sntp/version.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/bug-2803/bug-2803.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/bug-2803/run-bug-2803.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/a_md5encrypt.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/authkeys.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/buftvtots.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/calendar.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/caljulian.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/clocktime.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/decodenetnum.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/humandate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/lfpfunc.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/lfptostr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/modetoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/msyslog.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/netof.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/numtoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/numtohost.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/octtoint.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/prettydate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/recvbuff.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/refidsmear.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/refnumtoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-a_md5encrypt.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-calendar.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-decodenetnum.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-humandate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-lfpfunc.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-lfptostr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-modetoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-msyslog.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-netof.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-numtoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-numtohost.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-prettydate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-refnumtoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-sfptostr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-socktoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-statestr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-strtolfp.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-timespecops.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-timevalops.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/run-uglydate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/sfptostr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/socktoa.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/statestr.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/strtolfp.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/timespecops.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/timevalops.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/libntp/uglydate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/leapsec.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/ntp_prio_q.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/ntp_restrict.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/rc_cmdlength.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/run-leapsec.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/run-ntp_restrict.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/run-rc_cmdlength.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/run-t-ntp_signd.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/t-ntp_scanner.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/ntpd/t-ntp_signd.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/sandbox/run-uglydate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/sandbox/smeartest.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/sandbox/uglydate.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/tests/sec-2853/sec-2853.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/invoke-ntp-keygen.texi
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen-opts.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen-opts.h
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen.1ntp-keygenman
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen.c
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen.html
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen.man.in
user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/util/ntp-keygen.mdoc.in
user/ngie/stable-10-fix-LINT-NOINET/sbin/bsdlabel/bsdlabel.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/devd/devd.cc
user/ngie/stable-10-fix-LINT-NOINET/sbin/dumpfs/dumpfs.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/fdisk/fdisk.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/ffsinfo/ffsinfo.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/mdconfig/mdconfig.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/mdconfig/mdconfig.c
user/ngie/stable-10-fix-LINT-NOINET/sbin/newfs/newfs.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/newfs_msdos/newfs_msdos.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/newfs_nandfs/newfs_nandfs.8
user/ngie/stable-10-fix-LINT-NOINET/sbin/reboot/boot_i386.8
user/ngie/stable-10-fix-LINT-NOINET/share/man/man4/Makefile
user/ngie/stable-10-fix-LINT-NOINET/share/man/man4/da.4
user/ngie/stable-10-fix-LINT-NOINET/share/man/man4/geom_fox.4
user/ngie/stable-10-fix-LINT-NOINET/share/man/man4/md.4
user/ngie/stable-10-fix-LINT-NOINET/share/man/man4/nvme.4
user/ngie/stable-10-fix-LINT-NOINET/share/man/man4/vpo.4
user/ngie/stable-10-fix-LINT-NOINET/share/man/man5/rc.conf.5
user/ngie/stable-10-fix-LINT-NOINET/share/man/man7/tuning.7
user/ngie/stable-10-fix-LINT-NOINET/share/man/man8/picobsd.8
user/ngie/stable-10-fix-LINT-NOINET/sys/boot/efi/Makefile.inc
user/ngie/stable-10-fix-LINT-NOINET/sys/boot/efi/boot1/Makefile
user/ngie/stable-10-fix-LINT-NOINET/sys/compat/linux/linux_futex.c
user/ngie/stable-10-fix-LINT-NOINET/sys/conf/NOTES
user/ngie/stable-10-fix-LINT-NOINET/sys/conf/files
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/mpr/mpr_sas_lsi.c
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/mps/mps_sas_lsi.c
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/nvd/nvd.c
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/nvme/nvme.c
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/nvme/nvme_ctrlr.c
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/nvme/nvme_private.h
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/nvme/nvme_qpair.c
user/ngie/stable-10-fix-LINT-NOINET/sys/dev/nvme/nvme_sysctl.c
user/ngie/stable-10-fix-LINT-NOINET/sys/fs/ext2fs/ext2_bmap.c
user/ngie/stable-10-fix-LINT-NOINET/sys/kern/kern_module.c
user/ngie/stable-10-fix-LINT-NOINET/sys/modules/i2c/controllers/Makefile
user/ngie/stable-10-fix-LINT-NOINET/sys/netinet/cc/cc_cubic.c
user/ngie/stable-10-fix-LINT-NOINET/sys/netinet/cc/cc_newreno.c
user/ngie/stable-10-fix-LINT-NOINET/sys/netinet/tcp_input.c
user/ngie/stable-10-fix-LINT-NOINET/sys/netinet/tcp_sack.c
user/ngie/stable-10-fix-LINT-NOINET/sys/netinet/tcp_var.h
user/ngie/stable-10-fix-LINT-NOINET/usr.bin/rctl/rctl.8
user/ngie/stable-10-fix-LINT-NOINET/usr.bin/rctl/rctl.c
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/boot0cfg/boot0cfg.8
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/iostat/iostat.c
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/config.h
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/doc/ntp-keygen.8
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/doc/ntp.conf.5
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/doc/ntp.keys.5
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/doc/ntpd.8
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/doc/ntpdc.8
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/doc/ntpq.8
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/doc/sntp.8
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/ntp/scripts/mkver
user/ngie/stable-10-fix-LINT-NOINET/usr.sbin/pw/pw_user.c
Directory Properties:
user/ngie/stable-10-fix-LINT-NOINET/ (props changed)
Modified: user/ngie/stable-10-fix-LINT-NOINET/Makefile.inc1
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/Makefile.inc1 Tue Jan 12 00:24:40 2016 (r293716)
+++ user/ngie/stable-10-fix-LINT-NOINET/Makefile.inc1 Tue Jan 12 00:48:11 2016 (r293717)
@@ -1284,8 +1284,11 @@ _mklocale= usr.bin/mklocale
_sed= usr.bin/sed
.endif
-.if ${BOOTSTRAPPING} < 1000002
+.if ${BOOTSTRAPPING} < 1000033
_m4= usr.bin/m4
+_lex= usr.bin/lex
+
+${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
.endif
.if ${BOOTSTRAPPING} < 1001506
@@ -1314,12 +1317,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libne
_cat= bin/cat
.endif
-.if ${BOOTSTRAPPING} < 1000033
-_lex= usr.bin/lex
-
-${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
-.endif
-
.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
_awk= usr.bin/awk
.endif
Modified: user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ChangeLog
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ChangeLog Tue Jan 12 00:24:40 2016 (r293716)
+++ user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/ChangeLog Tue Jan 12 00:48:11 2016 (r293717)
@@ -1,4 +1,61 @@
---
+(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.
+* CID 1339955: Free allocated memory in caljulian test. HStenn.
+* CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+* CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+* CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+* CID 1341534: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341535: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341536: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341537: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+* CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341681: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+* CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+* [Bug 2829] Look at pipe_fds in ntpd.c (did so. perlinger@ntp.org)
+* [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum should only accept values [0..16]. perlinger@ntp.org
+* [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+* [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in. HMurray
+* [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - applied patch by Christos Zoulas. perlinger@ntp.org
+* [Bug 2952] Symmetric active/passive mode is broken. HStenn.
+* [Bug 2954] Version 4.2.8p4 crashes on startup with sig fault
+ - fixed data race conditions in threaded DNS worker. perlinger@ntp.org
+ - limit threading warm-up to linux; FreeBSD bombs on it. perlinger@ntp.org
+* [Bug 2957] 'unsigned int' vs 'size_t' format clash. perlinger@ntp.org
+ - accept key file only if there are no parsing errors
+ - fixed size_t/u_int format clash
+ - fixed wrong use of 'strlcpy'
+* [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+* [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets. perlinger@ntp.org
+ - fixed several other warnings (cast-alignment, missing const, missing prototypes)
+ - promote use of 'size_t' for values that express a size
+ - use ptr-to-const for read-only arguments
+ - make sure SOCKET values are not truncated (win32-specific)
+ - format string fixes
+* [Bug 2965] Local clock didn't work since 4.2.8p4. Martin Burnicki.
+* [Bug 2967] ntpdate command suffers an assertion failure
+ - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
+* [Bug 2969] Seg fault from ntpq/mrulist when looking at server with
+ 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
+* Unity cleanup for FreeBSD-6.4. Harlan Stenn.
+* Unity test cleanup. Harlan Stenn.
+* Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+* Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+* Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+* 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>
Modified: user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/CommitLog
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/CommitLog Tue Jan 12 00:24:40 2016 (r293716)
+++ user/ngie/stable-10-fix-LINT-NOINET/contrib/ntp/CommitLog Tue Jan 12 00:48:11 2016 (r293717)
@@ -1,3 +1,1480 @@
+ChangeSet@1.3623, 2016-01-07 23:33:11+00:00, stenn@deacon.udel.edu
+ NTP_4_2_8P5
+ TAG: NTP_4_2_8P5
+
+ ChangeLog@1.1791 +1 -0
+ NTP_4_2_8P5
+
+ ntpd/invoke-ntp.conf.texi@1.194 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/invoke-ntp.keys.texi@1.186 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/invoke-ntpd.texi@1.503 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.5man@1.228 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.5mdoc@1.228 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.html@1.182 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.man.in@1.228 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.mdoc.in@1.228 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.5man@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.5mdoc@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.html@1.182 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.man.in@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.mdoc.in@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntpd-opts.c@1.525 +7 -7
+ NTP_4_2_8P5
+
+ ntpd/ntpd-opts.h@1.524 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntpd.1ntpdman@1.332 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntpd.1ntpdmdoc@1.332 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntpd.html@1.176 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntpd.man.in@1.332 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntpd.mdoc.in@1.332 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/invoke-ntpdc.texi@1.500 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc-opts.c@1.518 +7 -7
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc-opts.h@1.517 +3 -3
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.1ntpdcman@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.1ntpdcmdoc@1.331 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.html@1.344 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.man.in@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.mdoc.in@1.331 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/invoke-ntpq.texi@1.507 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/ntpq-opts.c@1.524 +7 -7
+ NTP_4_2_8P5
+
+ ntpq/ntpq-opts.h@1.522 +3 -3
+ NTP_4_2_8P5
+
+ ntpq/ntpq.1ntpqman@1.335 +3 -3
+ NTP_4_2_8P5
+
+ ntpq/ntpq.1ntpqmdoc@1.335 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/ntpq.html@1.173 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/ntpq.man.in@1.335 +3 -3
+ NTP_4_2_8P5
+
+ ntpq/ntpq.mdoc.in@1.335 +2 -2
+ NTP_4_2_8P5
+
+ ntpsnmpd/invoke-ntpsnmpd.texi@1.502 +2 -2
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd-opts.c@1.520 +7 -7
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd-opts.h@1.519 +3 -3
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.331 +2 -2
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.html@1.171 +1 -1
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.man.in@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.mdoc.in@1.331 +2 -2
+ NTP_4_2_8P5
+
+ packageinfo.sh@1.522 +2 -2
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.92 +3 -3
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.93 +2 -2
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.html@1.94 +1 -1
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.man.in@1.91 +3 -3
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.mdoc.in@1.93 +2 -2
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/invoke-calc_tickadj.texi@1.96 +1 -1
+ NTP_4_2_8P5
+
+ scripts/invoke-plot_summary.texi@1.113 +2 -2
+ NTP_4_2_8P5
+
+ scripts/invoke-summary.texi@1.113 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/invoke-ntp-wait.texi@1.323 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait-opts@1.59 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitman@1.320 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.321 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.html@1.340 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.man.in@1.320 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.mdoc.in@1.321 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/invoke-ntpsweep.texi@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepman@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.99 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.html@1.112 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.man.in@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.mdoc.in@1.100 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/invoke-ntptrace.texi@1.112 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.1ntptraceman@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.1ntptracemdoc@1.100 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.html@1.113 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.man.in@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.mdoc.in@1.101 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary.1plot_summaryman@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/plot_summary.1plot_summarymdoc@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary.html@1.114 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary.man.in@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/plot_summary.mdoc.in@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary.1summaryman@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/summary.1summarymdoc@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary.html@1.114 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary.man.in@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/summary.mdoc.in@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/update-leap/invoke-update-leap.texi@1.12 +1 -1
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap-opts@1.12 +2 -2
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.1update-leapman@1.12 +3 -3
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.1update-leapmdoc@1.12 +2 -2
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.html@1.12 +1 -1
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.man.in@1.12 +3 -3
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.mdoc.in@1.12 +2 -2
+ NTP_4_2_8P5
+
+ sntp/invoke-sntp.texi@1.500 +2 -2
+ NTP_4_2_8P5
+
+ sntp/sntp-opts.c@1.519 +7 -7
+ NTP_4_2_8P5
+
+ sntp/sntp-opts.h@1.517 +3 -3
+ NTP_4_2_8P5
+
+ sntp/sntp.1sntpman@1.335 +3 -3
+ NTP_4_2_8P5
+
+ sntp/sntp.1sntpmdoc@1.335 +2 -2
+ NTP_4_2_8P5
+
+ sntp/sntp.html@1.515 +2 -2
+ NTP_4_2_8P5
+
+ sntp/sntp.man.in@1.335 +3 -3
+ NTP_4_2_8P5
+
+ sntp/sntp.mdoc.in@1.335 +2 -2
+ NTP_4_2_8P5
+
+ util/invoke-ntp-keygen.texi@1.503 +2 -2
+ NTP_4_2_8P5
+
+ util/ntp-keygen-opts.c@1.521 +7 -7
+ NTP_4_2_8P5
+
+ util/ntp-keygen-opts.h@1.519 +3 -3
+ NTP_4_2_8P5
+
+ util/ntp-keygen.1ntp-keygenman@1.331 +3 -3
+ NTP_4_2_8P5
+
+ util/ntp-keygen.1ntp-keygenmdoc@1.331 +2 -2
+ NTP_4_2_8P5
+
+ util/ntp-keygen.html@1.177 +2 -2
+ NTP_4_2_8P5
+
+ util/ntp-keygen.man.in@1.331 +3 -3
+ NTP_4_2_8P5
+
+ util/ntp-keygen.mdoc.in@1.331 +2 -2
+ NTP_4_2_8P5
+
+ChangeSet@1.3622, 2016-01-07 17:52:24-05:00, stenn@deacon.udel.edu
+ ntp-4.2.8p5
+
+ packageinfo.sh@1.521 +1 -1
+ ntp-4.2.8p5
+
+ChangeSet@1.3621, 2016-01-07 22:20:05+00:00, stenn@psp-at1.ntp.org
+ cleanup
+
+ NEWS@1.152 +2 -2
+ cleanup
+
+ChangeSet@1.3620, 2016-01-07 09:33:11+00:00, stenn@psp-at1.ntp.org
+ typo in ntp_proto.c - leap smear. Reported by Martin Burnicki
+
+ ntpd/ntp_proto.c@1.371 +1 -1
+ typo in ntp_proto.c - leap smear. Reported by Martin Burnicki
+
+ChangeSet@1.3619, 2016-01-07 06:33:08+00:00, stenn@psp-at1.ntp.org
+ Update scripts/calc_tickadj/Makefile.am. Harlan Stenn.
+
+ ChangeLog@1.1790 +1 -0
+ Update scripts/calc_tickadj/Makefile.am. Harlan Stenn.
+
+ scripts/calc_tickadj/Makefile.am@1.11 +2 -0
+ Update scripts/calc_tickadj/Makefile.am. Harlan Stenn.
+
+ChangeSet@1.3616.1.1, 2016-01-05 10:57:45+00:00, stenn@psp-at1.ntp.org
+ Bug 2952 fixes
+
+ ChangeLog@1.1787.1.1 +1 -0
+ Bug 2952 fixes
+
+ ntpd/ntp_proto.c@1.370 +165 -152
+ Bug 2952 fixes
+
+ChangeSet@1.3617, 2016-01-05 09:56:31+00:00, stenn@psp-at1.ntp.org
+ ntp-4.2.8p5 prep
+
+ ChangeLog@1.1788 +2 -1
+ ntp-4.2.8p5 prep
+
+ NEWS@1.151 +104 -3
+ ntp-4.2.8p5 prep
+
+ChangeSet@1.3616, 2015-12-06 11:20:02+00:00, stenn@psp-deb1.ntp.org
+ Quiet a warning from clang. Harlan Stenn.
+
+ ChangeLog@1.1787 +1 -0
+ Quiet a warning from clang. Harlan Stenn.
+
+ libntp/ntp_rfc2553.c@1.50 +3 -2
+ Quiet a warning from clang. Harlan Stenn.
+
+ChangeSet@1.3615, 2015-12-05 10:41:51+00:00, stenn@psp-at1.ntp.org
+ CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1786 +1 -0
+ CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.12 +5 -2
+ CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3614, 2015-12-05 10:38:28+00:00, stenn@psp-at1.ntp.org
+ CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1785 +1 -0
+ CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.11 +5 -1
+ CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3613, 2015-12-05 10:31:39+00:00, stenn@psp-at1.ntp.org
+ CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1784 +1 -0
+ CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.10 +4 -2
+ CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3612, 2015-12-05 10:27:40+00:00, stenn@psp-at1.ntp.org
+ CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1783 +1 -0
+ CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.9 +4 -2
+ CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3611, 2015-12-05 10:21:07+00:00, stenn@psp-at1.ntp.org
+ CID 1341681: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1782 +1 -0
+ CID 1341681: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3610, 2015-12-05 10:18:23+00:00, stenn@psp-at1.ntp.org
+ sntp/tests/keyFile.c lint
+
+ sntp/tests/keyFile.c@1.8 +4 -2
+ sntp/tests/keyFile.c lint
+
+ChangeSet@1.3609, 2015-12-05 10:01:47+00:00, stenn@psp-at1.ntp.org
+ CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+
+ ChangeLog@1.1781 +1 -0
+ CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+
+ libntp/authreadkeys.c@1.24 +3 -4
+ CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+
+ChangeSet@1.3608, 2015-12-05 09:40:44+00:00, stenn@psp-at1.ntp.org
+ CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ ChangeLog@1.1780 +1 -0
+ CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ tests/ntpd/t-ntp_signd.c@1.15 +4 -0
+ CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ChangeSet@1.3607, 2015-12-03 12:07:30+00:00, stenn@psp-at1.ntp.org
+ Update some test runners
+
+ tests/libntp/run-sfptostr.c@1.7 +9 -8
+ update
+
+ tests/sandbox/run-uglydate.c@1.7 +2 -1
+ update
+
+ChangeSet@1.3606, 2015-12-03 03:28:15-08:00, cov-build@cov7.ntfo.org
+ Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+
+ ChangeLog@1.1779 +1 -0
+ Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+
+ tests/libntp/sfptostr.c@1.5 +1 -0
+ Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+
+ChangeSet@1.3605, 2015-12-03 03:26:50-08:00, cov-build@cov7.ntfo.org
+ Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+
+ ChangeLog@1.1778 +1 -0
+ Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+
+ tests/sandbox/uglydate.c@1.6 +2 -1
+ Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+
+ChangeSet@1.3604, 2015-12-03 02:16:02-08:00, cov-build@cov7.ntfo.org
+ CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+
+ ChangeLog@1.1777 +1 -0
+ CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+
+ sntp/tests/t-log.c@1.7 +1 -1
+ CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+
+ChangeSet@1.3603, 2015-12-03 02:00:58-08:00, cov-build@cov7.ntfo.org
+ CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+
+ ChangeLog@1.1776 +1 -0
+ CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+
+ sntp/tests/t-log.c@1.6 +2 -0
+ CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+
+ChangeSet@1.3602, 2015-12-03 01:50:11-08:00, cov-build@cov7.ntfo.org
+ CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ ChangeLog@1.1775 +4 -0
+ CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ tests/ntpd/t-ntp_signd.c@1.14 +9 -0
+ CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ChangeSet@1.3601, 2015-12-03 01:22:22-08:00, cov-build@cov7.ntfo.org
+ CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+
+ ChangeLog@1.1774 +1 -0
+ CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+
+ tests/ntpd/ntp_prio_q.c@1.3 +1 -0
+ CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+
+ChangeSet@1.3597.4.1, 2015-11-30 06:03:47+01:00, jnperlin@hydra.localnet
+ [Bug 2829] Look at pipe_fds in ntpd.c (initial value issue)
+
+ ChangeLog@1.1770.4.1 +1 -0
+ [Bug 2829] Look at pipe_fds in ntpd.c
+
+ ntpd/ntpd.c@1.167 +3 -0
+ [Bug 2829] Look at pipe_fds in ntpd.c (initial value issue)
+
+ChangeSet@1.3597.3.1, 2015-11-29 13:03:58+01:00, jnperlin@hydra.localnet
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16].
+
+ ChangeLog@1.1770.3.1 +2 -0
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16].
+
+ ntpd/ntp_parser.c@1.100 +178 -171
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16]. (file regenerated by bison & trimmed manually)
+
+ ntpd/ntp_parser.y@1.90 +8 -1
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16], gives error otherwise
+
+ChangeSet@1.3597.2.1, 2015-11-28 22:59:39+01:00, jnperlin@hydra.localnet
+ [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - applied patch by Christos Zoulas.
+
+ ChangeLog@1.1770.2.1 +2 -0
+ [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - applied patch by Christos Zoulas.
+
+ libntp/socktohost.c@1.16 +10 -2
+ [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - save errno around calls to getnameinfo/getaddrinfo (patch by Christos Zoulas)
+
+ChangeSet@1.3597.1.4, 2015-11-28 19:09:53+01:00, jnperlin@hydra.localnet
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ChangeLog@1.1770.1.2 +2 -0
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ntpq/ntpq-subs.c@1.114 +11 -8
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ntpq/ntpq.c@1.165 +57 -8
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ntpq/ntpq.h@1.31 +4 -0
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ChangeSet@1.3597.1.3, 2015-11-25 22:10:45-08:00, harlan@max.pfcs.com
+ Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+
+ ChangeLog@1.1770.1.1 +1 -0
+ Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+
+ sntp/m4/ntp_libevent.m4@1.16 +2 -1
+ Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+
+ChangeSet@1.3597.1.2, 2015-11-25 12:23:40+00:00, stenn@psp-at1.ntp.org
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/run-t-ntp_signd.c@1.11 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/t-ntp_signd.c@1.13 +19 -5
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3597.1.1, 2015-11-25 11:50:51+00:00, stenn@psp-at1.ntp.org
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/unity/unity_internals.h@1.5 +13 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/calendar.c@1.12 +8 -3
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/leapsec.c@1.4 +241 -82
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/run-leapsec.c@1.6 +33 -33
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/run-t-ntp_signd.c@1.10 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/t-ntp_signd.c@1.12 +40 -13
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/smeartest.c@1.10 +3 -0
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3598, 2015-11-24 08:06:41+01:00, jnperlin@hydra.localnet
+ [Bug 2967] ntpdate command suffers an assertion failure
+ - fixed ntp_rfc2553.c to return proper address length.
+
+ ChangeLog@1.1771 +2 -0
+ [Bug 2967] ntpdate command suffers an assertion failure
+ - fixed ntp_rfc2553.c to return proper address length.
+
+ libntp/ntp_rfc2553.c@1.49 +2 -1
+ [Bug 2967] ntpdate command suffers an assertion failure
+ - fix do_nodename() to return the proper address length when name is NULL.
+
+ChangeSet@1.3597, 2015-11-23 10:55:16+00:00, stenn@psp-at1.ntp.org
+ ChangeLog, caljulian.c:
+ * CID 1339955: Free allocated memory in caljulian test. HStenn.
+ * CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+
+ ChangeLog@1.1770 +2 -0
+ * CID 1339955: Free allocated memory in caljulian test. HStenn.
+ * CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+
+ tests/libntp/caljulian.c@1.14 +16 -10
+ * CID 1339955: Free allocated memory in caljulian test. HStenn.
+ * CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+
+ChangeSet@1.3596, 2015-11-20 20:16:24-08:00, harlan@hms-mbp11.pfcs.com
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/kodDatabase.c@1.9 +0 -4
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/run-kodDatabase.c@1.9 +5 -5
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3595, 2015-11-20 19:41:16-08:00, harlan@hms-mbp11.pfcs.com
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/kodDatabase.c@1.8 +6 -0
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/kodFile.c@1.9 +1 -0
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/run-kodDatabase.c@1.8 +6 -5
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/run-t-log.c@1.5 +3 -3
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/t-log.c@1.5 +32 -16
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/calendar.c@1.11 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/caljulian.c@1.13 +1 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/decodenetnum.c@1.10 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/humandate.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/lfptostr.c@1.8 +9 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/modetoa.c@1.8 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/msyslog.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/netof.c@1.9 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/numtoa.c@1.7 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/numtohost.c@1.7 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/prettydate.c@1.6 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/recvbuff.c@1.7 +3 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refidsmear.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refnumtoa.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-calendar.c@1.11 +15 -15
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-decodenetnum.c@1.10 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-humandate.c@1.7 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-lfptostr.c@1.8 +11 -11
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-modetoa.c@1.12 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-msyslog.c@1.9 +8 -8
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-netof.c@1.8 +4 -4
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-numtoa.c@1.11 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-numtohost.c@1.11 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-prettydate.c@1.6 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-refidsmear.c@1.8 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-refnumtoa.c@1.9 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-sfptostr.c@1.6 +8 -8
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-socktoa.c@1.13 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-statestr.c@1.11 +4 -4
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-strtolfp.c@1.6 +7 -7
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-timespecops.c@1.11 +28 -28
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-timevalops.c@1.13 +28 -28
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-uglydate.c@1.11 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/sfptostr.c@1.4 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/socktoa.c@1.11 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/statestr.c@1.6 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/strtolfp.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timespecops.c@1.10 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timevalops.c@1.13 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/uglydate.c@1.10 +13 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/run-uglydate.c@1.6 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/smeartest.c@1.9 +2 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/uglydate.c@1.5 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3594, 2015-11-20 07:40:57+00:00, stenn@psp-at1.ntp.org
+ [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+ ChangeLog@1.1769 +1 -0
+ [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+ ntpq/ntpq.c@1.164 +1 -1
+ [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+ChangeSet@1.3593, 2015-11-20 07:27:27+00:00, stenn@psp-at1.ntp.org
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/authkeys.c@1.13 +36 -10
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/buftvtots.c@1.6 +18 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/calendar.c@1.10 +100 -47
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/caljulian.c@1.12 +27 -9
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/clocktime.c@1.9 +48 -24
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/humandate.c@1.6 +6 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/lfpfunc.c@1.15 +113 -69
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/netof.c@1.8 +22 -7
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/numtohost.c@1.6 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/octtoint.c@1.7 +36 -14
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refidsmear.c@1.6 +1 -4
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refnumtoa.c@1.6 +5 -5
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-lfpfunc.c@1.18 +9 -9
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-refidsmear.c@1.7 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timespecops.c@1.9 +173 -48
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timestructs.h@1.3 +22 -22
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timevalops.c@1.12 +168 -52
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3592, 2015-11-20 02:57:37+01:00, jnperlin@nemesis.localnet
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+
+ ChangeLog@1.1768 +2 -0
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+
+ lib/isc/sockaddr.c@1.14 +1 -1
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+ - cast fro size_t to u_int (no overflow danger); not related the bug, found while double-checking changes
+
+ ntpq/ntpq-subs.c@1.113 +1 -1
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+ - make end-of-buffer test unsigned-safe
+
+ChangeSet@1.3591, 2015-11-17 11:12:02+00:00, stenn@psp-at1.ntp.org
+ [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+
+ ChangeLog@1.1767 +1 -0
+ [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+
+ html/miscopt.html@1.84 +3 -3
+ [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+
+ChangeSet@1.3588, 2015-11-17 05:02:10+00:00, stenn@psp-at1.ntp.org
+ Credit Martin for 2965
+
+ ChangeLog@1.1764.1.3 +1 -1
+ Credit Martin for 2965
+
+ChangeSet@1.3587, 2015-11-17 04:53:39+00:00, stenn@psp-at1.ntp.org
+ cleanup
+
+ ChangeLog@1.1764.1.2 +1 -1
+ cleanup
+
+ChangeSet@1.3584.2.1, 2015-11-16 11:59:55+01:00, burnicki@pc-martin4.
+ [Bug 2965] Local clock didn't work since 4.2.8p4
+
+ ChangeLog@1.1764.1.1 +1 -0
+ [Bug 2965] Local clock didn't work since 4.2.8p4
+
+ ntpd/refclock_local.c@1.22 +1 -0
+ [Bug 2965] Local clock didn't work since 4.2.8p4
+
+ChangeSet@1.3584.1.2, 2015-11-14 01:01:05+01:00, jnperlin@hydra.localnet
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Tue Jan 12 18:06:08 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 B4AC9A6CA9E
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 18:06:08 +0000 (UTC)
(envelope-from glebius@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 7F4FE1191;
Tue, 12 Jan 2016 18:06:08 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CI67tk009532;
Tue, 12 Jan 2016 18:06:07 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CI67gI009531;
Tue, 12 Jan 2016 18:06:07 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601121806.u0CI67gI009531@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 12 Jan 2016 18:06:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
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: Tue, 12 Jan 2016 18:06:08 -0000
Author: glebius
Date: Tue Jan 12 18:06:07 2016
New Revision: 293777
URL: https://svnweb.freebsd.org/changeset/base/293777
Log:
Adjust script removing .orig files and empty files:
- Adopt the regexp to cleaned patches, that don't have
diff or subversion header.
- Switch from awk to sed, due to bugs in awk regexps.
Modified:
user/cperciva/freebsd-update-build/scripts/build.subr
Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 16:38:09 2016 (r293776)
+++ user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 18:06:07 2016 (r293777)
@@ -401,7 +401,8 @@ applypatches () {
while read PATCH; do
patch -p0 < ${PATCHDIR}/${PATCH}
# Remove ".orig" files created by patch(1) and empty files
- for file in $(awk '$1 ~ /^(Index:|diff)/ { print $NF }' < \
+ for file in $(sed -Ene \
+ 's/^--- (.*)(\.orig$|[[:space:]]*)?/\1/p' < \
${PATCHDIR}/${PATCH}); do
echo ${file}.orig
if [ ! -s ${file} ]; then
From owner-svn-src-user@freebsd.org Tue Jan 12 18:08:09 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 26C40A6CB14
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 18:08:09 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (glebi.us [96.95.210.25])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 0D28D1311;
Tue, 12 Jan 2016 18:08:05 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (localhost [127.0.0.1])
by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id u0CI85rJ041686
(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Tue, 12 Jan 2016 10:08:05 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by cell.glebi.us (8.15.2/8.15.2/Submit) id u0CI856b041685;
Tue, 12 Jan 2016 10:08:05 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebi.us: glebius set sender to
glebius@FreeBSD.org using -f
Date: Tue, 12 Jan 2016 10:08:05 -0800
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
Message-ID: <20160112180805.GP1906@FreeBSD.org>
References: <201601121806.u0CI67gI009531@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201601121806.u0CI67gI009531@repo.freebsd.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
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: Tue, 12 Jan 2016 18:08:09 -0000
On Tue, Jan 12, 2016 at 06:06:07PM +0000, Gleb Smirnoff wrote:
T> Author: glebius
T> Date: Tue Jan 12 18:06:07 2016
T> New Revision: 293777
T> URL: https://svnweb.freebsd.org/changeset/base/293777
T>
T> Log:
T> Adjust script removing .orig files and empty files:
T> - Adopt the regexp to cleaned patches, that don't have
T> diff or subversion header.
T> - Switch from awk to sed, due to bugs in awk regexps.
If anyone interested, in our awk regexp "^diff" would match
" diff", any amount of whitespace. Since ntp has a lot
variables named diff, running the script over ntp patches
produce a lot of garbage.
--
Totus tuus, Glebius.
From owner-svn-src-user@freebsd.org Tue Jan 12 18:19:31 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 85F22A801EC
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 18:19:31 +0000 (UTC) (envelope-from devin@shxd.cx)
Received: from shxd.cx (mail.shxd.cx [64.201.244.140])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 76E861C82;
Tue, 12 Jan 2016 18:19:31 +0000 (UTC) (envelope-from devin@shxd.cx)
Received: from [64.201.244.132] (port=28162 helo=[10.0.0.113])
by shxd.cx with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.77 (FreeBSD))
(envelope-from <devin@shxd.cx>)
id 1aIv4m-000NXR-HJ; Tue, 12 Jan 2016 01:17:16 -0800
Message-ID: <1452622770.11054.1.camel@FrauBSD.org>
Subject: Re: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
From: Devin Teske <dteske@FreeBSD.org>
To: Gleb Smirnoff <glebius@FreeBSD.org>, src-committers@freebsd.org,
svn-src-user@freebsd.org
Cc: dteske@FreeBSD.org
Date: Tue, 12 Jan 2016 10:19:30 -0800
In-Reply-To: <20160112180805.GP1906@FreeBSD.org>
References: <201601121806.u0CI67gI009531@repo.freebsd.org>
<20160112180805.GP1906@FreeBSD.org>
Content-Type: text/plain; charset="us-ascii"
X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: devin@shxd.cx
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: Tue, 12 Jan 2016 18:19:31 -0000
On Tue, 2016-01-12 at 10:08 -0800, Gleb Smirnoff wrote:
> On Tue, Jan 12, 2016 at 06:06:07PM +0000, Gleb Smirnoff wrote:
> T> Author: glebius
> T> Date: Tue Jan 12 18:06:07 2016
> T> New Revision: 293777
> T> URL: https://svnweb.freebsd.org/changeset/base/293777
> T>
> T> Log:
> T> Adjust script removing .orig files and empty files:
> T> - Adopt the regexp to cleaned patches, that don't have
> T> diff or subversion header.
> T> - Switch from awk to sed, due to bugs in awk regexps.
>
> If anyone interested, in our awk regexp "^diff" would match
> " diff", any amount of whitespace. Since ntp has a lot
> variables named diff, running the script over ntp patches
> produce a lot of garbage.
>
Gleb, I can't seem to reproduce what you're saying.
$ echo " diff" | awk '/^diff/'
$ echo " diff" | awk '!/^diff/'
diff
--
Devin
From owner-svn-src-user@freebsd.org Tue Jan 12 18:28:49 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 D1657A8057A
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 18:28:49 +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 82940180F;
Tue, 12 Jan 2016 18:28:49 +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 u0CISmmT015622;
Tue, 12 Jan 2016 18:28:48 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CISmfG015621;
Tue, 12 Jan 2016 18:28:48 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601121828.u0CISmfG015621@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: Tue, 12 Jan 2016 18:28:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293779 - user/ngie/stable-10-fix-LINT-NOINET
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: Tue, 12 Jan 2016 18:28:49 -0000
Author: ngie
Date: Tue Jan 12 18:28:48 2016
New Revision: 293779
URL: https://svnweb.freebsd.org/changeset/base/293779
Log:
Close branch after r293778
Deleted:
user/ngie/stable-10-fix-LINT-NOINET/
From owner-svn-src-user@freebsd.org Tue Jan 12 18:33:55 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 5D883A8071D
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 18:33:55 +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 15AC81BA5;
Tue, 12 Jan 2016 18:33:55 +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 u0CIXsu4018306;
Tue, 12 Jan 2016 18:33:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CIXrnW018302;
Tue, 12 Jan 2016 18:33:53 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601121833.u0CIXrnW018302@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: Tue, 12 Jan 2016 18:33:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293780 - in user/ngie/stable-10-libnv: . contrib/ntp
contrib/ntp/html contrib/ntp/include contrib/ntp/lib/isc
contrib/ntp/lib/isc/win32 contrib/ntp/libntp contrib/ntp/libparse 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: Tue, 12 Jan 2016 18:33:55 -0000
Author: ngie
Date: Tue Jan 12 18:33:53 2016
New Revision: 293780
URL: https://svnweb.freebsd.org/changeset/base/293780
Log:
MFstable/10 @ r293779
Added:
user/ngie/stable-10-libnv/contrib/ntp/include/safecast.h
- copied unchanged from r293779, stable/10/contrib/ntp/include/safecast.h
user/ngie/stable-10-libnv/share/man/man4/ismt.4
- copied unchanged from r293779, stable/10/share/man/man4/ismt.4
user/ngie/stable-10-libnv/sys/dev/ismt/
- copied from r293779, stable/10/sys/dev/ismt/
user/ngie/stable-10-libnv/sys/modules/i2c/controllers/ismt/
- copied from r293779, stable/10/sys/modules/i2c/controllers/ismt/
user/ngie/stable-10-libnv/usr.bin/xargs/tests/regress.0P1.out
- copied unchanged from r293779, stable/10/usr.bin/xargs/tests/regress.0P1.out
user/ngie/stable-10-libnv/usr.bin/xargs/tests/regress.P1.out
- copied unchanged from r293779, stable/10/usr.bin/xargs/tests/regress.P1.out
user/ngie/stable-10-libnv/usr.bin/xargs/tests/regress.n2P0.out
- copied unchanged from r293779, stable/10/usr.bin/xargs/tests/regress.n2P0.out
user/ngie/stable-10-libnv/usr.sbin/fstyp/geli.c
- copied unchanged from r293779, stable/10/usr.sbin/fstyp/geli.c
user/ngie/stable-10-libnv/usr.sbin/fstyp/zfs.c
- copied unchanged from r293779, stable/10/usr.sbin/fstyp/zfs.c
Deleted:
user/ngie/stable-10-libnv/lib/libc/amd64/sys/reboot.S
user/ngie/stable-10-libnv/lib/libc/i386/sys/reboot.S
Modified:
user/ngie/stable-10-libnv/Makefile.inc1
user/ngie/stable-10-libnv/contrib/ntp/ChangeLog
user/ngie/stable-10-libnv/contrib/ntp/CommitLog
user/ngie/stable-10-libnv/contrib/ntp/NEWS
user/ngie/stable-10-libnv/contrib/ntp/configure
user/ngie/stable-10-libnv/contrib/ntp/html/miscopt.html
user/ngie/stable-10-libnv/contrib/ntp/include/Makefile.am
user/ngie/stable-10-libnv/contrib/ntp/include/Makefile.in
user/ngie/stable-10-libnv/contrib/ntp/include/ntp_refclock.h
user/ngie/stable-10-libnv/contrib/ntp/include/ntp_stdlib.h
user/ngie/stable-10-libnv/contrib/ntp/include/ntp_worker.h
user/ngie/stable-10-libnv/contrib/ntp/include/ntpd.h
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/backtrace.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/buffer.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/inet_aton.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/inet_pton.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/log.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/netaddr.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/sockaddr.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/task.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/win32/interfaceiter.c
user/ngie/stable-10-libnv/contrib/ntp/lib/isc/win32/net.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/a_md5encrypt.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/atolfp.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/authkeys.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/authreadkeys.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/authusekey.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/dolfptoa.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/hextolfp.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/mstolfp.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/msyslog.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/ntp_crypto_rnd.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/ntp_lineedit.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/ntp_rfc2553.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/ntp_worker.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/snprintf.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/socktohost.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/systime.c
user/ngie/stable-10-libnv/contrib/ntp/libntp/work_thread.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_computime.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_dcf7000.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_hopf6021.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_meinberg.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_rawdcf.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_rcc8000.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_schmid.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_trimtaip.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_varitext.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/clk_wharton.c
user/ngie/stable-10-libnv/contrib/ntp/libparse/parse.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/invoke-ntp.conf.texi
user/ngie/stable-10-libnv/contrib/ntp/ntpd/invoke-ntp.keys.texi
user/ngie/stable-10-libnv/contrib/ntp/ntpd/invoke-ntpd.texi
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.conf.5man
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.conf.5mdoc
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.conf.html
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.conf.man.in
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.conf.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.keys.5man
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.keys.5mdoc
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.keys.html
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.keys.man.in
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp.keys.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_control.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_crypto.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_io.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_loopfilter.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_parser.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_proto.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_refclock.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_request.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_restrict.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_signd.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_timer.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntp_util.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd-opts.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd-opts.h
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd.1ntpdman
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd.1ntpdmdoc
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd.html
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd.man.in
user/ngie/stable-10-libnv/contrib/ntp/ntpd/ntpd.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/ntpd/refclock_local.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/refclock_parse.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/refclock_shm.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/refclock_true.c
user/ngie/stable-10-libnv/contrib/ntp/ntpd/refclock_tsyncpci.c
user/ngie/stable-10-libnv/contrib/ntp/ntpdate/ntpdate.c
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/invoke-ntpdc.texi
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc-opts.c
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc-opts.h
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc.1ntpdcman
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc.c
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc.h
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc.html
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc.man.in
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/ntpdc/ntpdc_ops.c
user/ngie/stable-10-libnv/contrib/ntp/ntpq/invoke-ntpq.texi
user/ngie/stable-10-libnv/contrib/ntp/ntpq/libntpq.c
user/ngie/stable-10-libnv/contrib/ntp/ntpq/libntpq.h
user/ngie/stable-10-libnv/contrib/ntp/ntpq/libntpq_subs.c
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq-opts.c
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq-opts.h
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq-subs.c
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq.1ntpqman
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq.1ntpqmdoc
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq.c
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq.h
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq.html
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq.man.in
user/ngie/stable-10-libnv/contrib/ntp/ntpq/ntpq.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/ntpsnmpd.html
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
user/ngie/stable-10-libnv/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/packageinfo.sh
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/Makefile.am
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/Makefile.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
user/ngie/stable-10-libnv/contrib/ntp/scripts/invoke-plot_summary.texi
user/ngie/stable-10-libnv/contrib/ntp/scripts/invoke-summary.texi
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntp-wait/ntp-wait.html
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntpsweep/ntpsweep.html
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntptrace/ntptrace-opts
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntptrace/ntptrace.html
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntptrace/ntptrace.man.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/plot_summary-opts
user/ngie/stable-10-libnv/contrib/ntp/scripts/plot_summary.1plot_summaryman
user/ngie/stable-10-libnv/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
user/ngie/stable-10-libnv/contrib/ntp/scripts/plot_summary.html
user/ngie/stable-10-libnv/contrib/ntp/scripts/plot_summary.man.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/plot_summary.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/summary-opts
user/ngie/stable-10-libnv/contrib/ntp/scripts/summary.1summaryman
user/ngie/stable-10-libnv/contrib/ntp/scripts/summary.1summarymdoc
user/ngie/stable-10-libnv/contrib/ntp/scripts/summary.html
user/ngie/stable-10-libnv/contrib/ntp/scripts/summary.man.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/summary.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
user/ngie/stable-10-libnv/contrib/ntp/scripts/update-leap/update-leap-opts
user/ngie/stable-10-libnv/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
user/ngie/stable-10-libnv/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
user/ngie/stable-10-libnv/contrib/ntp/scripts/update-leap/update-leap.html
user/ngie/stable-10-libnv/contrib/ntp/scripts/update-leap/update-leap.man.in
user/ngie/stable-10-libnv/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/sntp/configure
user/ngie/stable-10-libnv/contrib/ntp/sntp/include/version.def
user/ngie/stable-10-libnv/contrib/ntp/sntp/include/version.texi
user/ngie/stable-10-libnv/contrib/ntp/sntp/invoke-sntp.texi
user/ngie/stable-10-libnv/contrib/ntp/sntp/m4/ntp_libevent.m4
user/ngie/stable-10-libnv/contrib/ntp/sntp/m4/ntp_problemtests.m4
user/ngie/stable-10-libnv/contrib/ntp/sntp/m4/version.m4
user/ngie/stable-10-libnv/contrib/ntp/sntp/networking.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/sntp-opts.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/sntp-opts.h
user/ngie/stable-10-libnv/contrib/ntp/sntp/sntp.1sntpman
user/ngie/stable-10-libnv/contrib/ntp/sntp/sntp.1sntpmdoc
user/ngie/stable-10-libnv/contrib/ntp/sntp/sntp.html
user/ngie/stable-10-libnv/contrib/ntp/sntp/sntp.man.in
user/ngie/stable-10-libnv/contrib/ntp/sntp/sntp.mdoc.in
user/ngie/stable-10-libnv/contrib/ntp/sntp/tests/keyFile.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/tests/kodDatabase.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/tests/kodFile.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/tests/run-kodDatabase.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/tests/run-t-log.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/tests/t-log.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/tests/utilities.c
user/ngie/stable-10-libnv/contrib/ntp/sntp/unity/unity_internals.h
user/ngie/stable-10-libnv/contrib/ntp/sntp/version.c
user/ngie/stable-10-libnv/contrib/ntp/tests/bug-2803/bug-2803.c
user/ngie/stable-10-libnv/contrib/ntp/tests/bug-2803/run-bug-2803.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/a_md5encrypt.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/authkeys.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/buftvtots.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/calendar.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/caljulian.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/clocktime.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/decodenetnum.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/humandate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/lfpfunc.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/lfptostr.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/modetoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/msyslog.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/netof.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/numtoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/numtohost.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/octtoint.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/prettydate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/recvbuff.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/refidsmear.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/refnumtoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-a_md5encrypt.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-calendar.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-decodenetnum.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-humandate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-lfpfunc.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-lfptostr.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-modetoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-msyslog.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-netof.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-numtoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-numtohost.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-prettydate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-refnumtoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-sfptostr.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-socktoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-statestr.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-strtolfp.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-timespecops.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-timevalops.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/run-uglydate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/sfptostr.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/socktoa.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/statestr.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/strtolfp.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/timespecops.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/timevalops.c
user/ngie/stable-10-libnv/contrib/ntp/tests/libntp/uglydate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/leapsec.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/ntp_prio_q.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/ntp_restrict.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/rc_cmdlength.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/run-leapsec.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/run-ntp_restrict.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/run-rc_cmdlength.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/run-t-ntp_signd.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/t-ntp_scanner.c
user/ngie/stable-10-libnv/contrib/ntp/tests/ntpd/t-ntp_signd.c
user/ngie/stable-10-libnv/contrib/ntp/tests/sandbox/run-uglydate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/sandbox/smeartest.c
user/ngie/stable-10-libnv/contrib/ntp/tests/sandbox/uglydate.c
user/ngie/stable-10-libnv/contrib/ntp/tests/sec-2853/sec-2853.c
user/ngie/stable-10-libnv/contrib/ntp/util/invoke-ntp-keygen.texi
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen-opts.c
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen-opts.h
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen.1ntp-keygenman
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen.c
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen.html
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen.man.in
user/ngie/stable-10-libnv/contrib/ntp/util/ntp-keygen.mdoc.in
user/ngie/stable-10-libnv/lib/libc/amd64/sys/Makefile.inc
user/ngie/stable-10-libnv/lib/libc/i386/sys/Makefile.inc
user/ngie/stable-10-libnv/lib/libc/sys/reboot.2
user/ngie/stable-10-libnv/release/amd64/make-memstick.sh
user/ngie/stable-10-libnv/release/amd64/make-uefi-memstick.sh
user/ngie/stable-10-libnv/release/i386/make-memstick.sh
user/ngie/stable-10-libnv/release/powerpc/make-memstick.sh
user/ngie/stable-10-libnv/sbin/bsdlabel/bsdlabel.8
user/ngie/stable-10-libnv/sbin/devd/devd.cc
user/ngie/stable-10-libnv/sbin/dumpfs/dumpfs.8
user/ngie/stable-10-libnv/sbin/fdisk/fdisk.8
user/ngie/stable-10-libnv/sbin/ffsinfo/ffsinfo.8
user/ngie/stable-10-libnv/sbin/geom/class/nop/gnop.8
user/ngie/stable-10-libnv/sbin/ifconfig/ifconfig.c
user/ngie/stable-10-libnv/sbin/init/Makefile
user/ngie/stable-10-libnv/sbin/init/init.c
user/ngie/stable-10-libnv/sbin/init/pathnames.h
user/ngie/stable-10-libnv/sbin/mdconfig/mdconfig.8
user/ngie/stable-10-libnv/sbin/mdconfig/mdconfig.c
user/ngie/stable-10-libnv/sbin/newfs/newfs.8
user/ngie/stable-10-libnv/sbin/newfs_msdos/newfs_msdos.8
user/ngie/stable-10-libnv/sbin/newfs_nandfs/newfs_nandfs.8
user/ngie/stable-10-libnv/sbin/reboot/boot_i386.8
user/ngie/stable-10-libnv/sbin/reboot/reboot.8
user/ngie/stable-10-libnv/sbin/reboot/reboot.c
user/ngie/stable-10-libnv/share/man/man4/Makefile
user/ngie/stable-10-libnv/share/man/man4/blackhole.4
user/ngie/stable-10-libnv/share/man/man4/da.4
user/ngie/stable-10-libnv/share/man/man4/geom_fox.4
user/ngie/stable-10-libnv/share/man/man4/md.4
user/ngie/stable-10-libnv/share/man/man4/nvme.4
user/ngie/stable-10-libnv/share/man/man4/vpo.4
user/ngie/stable-10-libnv/share/man/man5/rc.conf.5
user/ngie/stable-10-libnv/share/man/man7/tuning.7
user/ngie/stable-10-libnv/share/man/man8/picobsd.8
user/ngie/stable-10-libnv/sys/boot/efi/Makefile.inc
user/ngie/stable-10-libnv/sys/boot/efi/boot1/Makefile
user/ngie/stable-10-libnv/sys/compat/linux/linux_futex.c
user/ngie/stable-10-libnv/sys/conf/NOTES
user/ngie/stable-10-libnv/sys/conf/files
user/ngie/stable-10-libnv/sys/dev/mpr/mpr_sas_lsi.c
user/ngie/stable-10-libnv/sys/dev/mps/mps_sas_lsi.c
user/ngie/stable-10-libnv/sys/dev/nvd/nvd.c
user/ngie/stable-10-libnv/sys/dev/nvme/nvme.c
user/ngie/stable-10-libnv/sys/dev/nvme/nvme_ctrlr.c
user/ngie/stable-10-libnv/sys/dev/nvme/nvme_private.h
user/ngie/stable-10-libnv/sys/dev/nvme/nvme_qpair.c
user/ngie/stable-10-libnv/sys/dev/nvme/nvme_sysctl.c
user/ngie/stable-10-libnv/sys/dev/usb/controller/dwc_otg.c
user/ngie/stable-10-libnv/sys/fs/ext2fs/ext2_bmap.c
user/ngie/stable-10-libnv/sys/geom/nop/g_nop.c
user/ngie/stable-10-libnv/sys/geom/nop/g_nop.h
user/ngie/stable-10-libnv/sys/kern/kern_module.c
user/ngie/stable-10-libnv/sys/kern/kern_shutdown.c
user/ngie/stable-10-libnv/sys/kern/vfs_mount.c
user/ngie/stable-10-libnv/sys/kern/vfs_mountroot.c
user/ngie/stable-10-libnv/sys/kern/vfs_subr.c
user/ngie/stable-10-libnv/sys/modules/i2c/controllers/Makefile
user/ngie/stable-10-libnv/sys/modules/if_gif/Makefile
user/ngie/stable-10-libnv/sys/netinet/cc/cc_cubic.c
user/ngie/stable-10-libnv/sys/netinet/cc/cc_newreno.c
user/ngie/stable-10-libnv/sys/netinet/tcp_input.c
user/ngie/stable-10-libnv/sys/netinet/tcp_sack.c
user/ngie/stable-10-libnv/sys/netinet/tcp_var.h
user/ngie/stable-10-libnv/sys/ofed/include/linux/file.h
user/ngie/stable-10-libnv/sys/sys/reboot.h
user/ngie/stable-10-libnv/sys/sys/vnode.h
user/ngie/stable-10-libnv/usr.bin/rctl/rctl.8
user/ngie/stable-10-libnv/usr.bin/rctl/rctl.c
user/ngie/stable-10-libnv/usr.bin/xargs/tests/Makefile
user/ngie/stable-10-libnv/usr.bin/xargs/tests/regress.sh
user/ngie/stable-10-libnv/usr.bin/xargs/xargs.1
user/ngie/stable-10-libnv/usr.bin/xargs/xargs.c
user/ngie/stable-10-libnv/usr.sbin/boot0cfg/boot0cfg.8
user/ngie/stable-10-libnv/usr.sbin/fstyp/Makefile
user/ngie/stable-10-libnv/usr.sbin/fstyp/fstyp.8
user/ngie/stable-10-libnv/usr.sbin/fstyp/fstyp.c
user/ngie/stable-10-libnv/usr.sbin/fstyp/fstyp.h
user/ngie/stable-10-libnv/usr.sbin/iostat/iostat.c
user/ngie/stable-10-libnv/usr.sbin/ntp/config.h
user/ngie/stable-10-libnv/usr.sbin/ntp/doc/ntp-keygen.8
user/ngie/stable-10-libnv/usr.sbin/ntp/doc/ntp.conf.5
user/ngie/stable-10-libnv/usr.sbin/ntp/doc/ntp.keys.5
user/ngie/stable-10-libnv/usr.sbin/ntp/doc/ntpd.8
user/ngie/stable-10-libnv/usr.sbin/ntp/doc/ntpdc.8
user/ngie/stable-10-libnv/usr.sbin/ntp/doc/ntpq.8
user/ngie/stable-10-libnv/usr.sbin/ntp/doc/sntp.8
user/ngie/stable-10-libnv/usr.sbin/ntp/scripts/mkver
user/ngie/stable-10-libnv/usr.sbin/pw/pw_user.c
user/ngie/stable-10-libnv/usr.sbin/service/service.sh
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
Modified: user/ngie/stable-10-libnv/Makefile.inc1
==============================================================================
--- user/ngie/stable-10-libnv/Makefile.inc1 Tue Jan 12 18:28:48 2016 (r293779)
+++ user/ngie/stable-10-libnv/Makefile.inc1 Tue Jan 12 18:33:53 2016 (r293780)
@@ -1284,8 +1284,11 @@ _mklocale= usr.bin/mklocale
_sed= usr.bin/sed
.endif
-.if ${BOOTSTRAPPING} < 1000002
+.if ${BOOTSTRAPPING} < 1000033
_m4= usr.bin/m4
+_lex= usr.bin/lex
+
+${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
.endif
.if ${BOOTSTRAPPING} < 1001506
@@ -1314,12 +1317,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libne
_cat= bin/cat
.endif
-.if ${BOOTSTRAPPING} < 1000033
-_lex= usr.bin/lex
-
-${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
-.endif
-
.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
_awk= usr.bin/awk
.endif
Modified: user/ngie/stable-10-libnv/contrib/ntp/ChangeLog
==============================================================================
--- user/ngie/stable-10-libnv/contrib/ntp/ChangeLog Tue Jan 12 18:28:48 2016 (r293779)
+++ user/ngie/stable-10-libnv/contrib/ntp/ChangeLog Tue Jan 12 18:33:53 2016 (r293780)
@@ -1,4 +1,61 @@
---
+(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.
+* CID 1339955: Free allocated memory in caljulian test. HStenn.
+* CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+* CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+* CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+* CID 1341534: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341535: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341536: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341537: Resource leak in tests/ntpd/t-ntp_signd.c. HStenn.
+* CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+* CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341681: Nits in sntp/tests/keyFile.c. HStenn.
+* CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+* CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+* [Bug 2829] Look at pipe_fds in ntpd.c (did so. perlinger@ntp.org)
+* [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum should only accept values [0..16]. perlinger@ntp.org
+* [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+* [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in. HMurray
+* [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - applied patch by Christos Zoulas. perlinger@ntp.org
+* [Bug 2952] Symmetric active/passive mode is broken. HStenn.
+* [Bug 2954] Version 4.2.8p4 crashes on startup with sig fault
+ - fixed data race conditions in threaded DNS worker. perlinger@ntp.org
+ - limit threading warm-up to linux; FreeBSD bombs on it. perlinger@ntp.org
+* [Bug 2957] 'unsigned int' vs 'size_t' format clash. perlinger@ntp.org
+ - accept key file only if there are no parsing errors
+ - fixed size_t/u_int format clash
+ - fixed wrong use of 'strlcpy'
+* [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+* [Bug 2962] truncation of size_t/ptrdiff_t on 64bit targets. perlinger@ntp.org
+ - fixed several other warnings (cast-alignment, missing const, missing prototypes)
+ - promote use of 'size_t' for values that express a size
+ - use ptr-to-const for read-only arguments
+ - make sure SOCKET values are not truncated (win32-specific)
+ - format string fixes
+* [Bug 2965] Local clock didn't work since 4.2.8p4. Martin Burnicki.
+* [Bug 2967] ntpdate command suffers an assertion failure
+ - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
+* [Bug 2969] Seg fault from ntpq/mrulist when looking at server with
+ 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
+* Unity cleanup for FreeBSD-6.4. Harlan Stenn.
+* Unity test cleanup. Harlan Stenn.
+* Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+* Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+* Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+* 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>
Modified: user/ngie/stable-10-libnv/contrib/ntp/CommitLog
==============================================================================
--- user/ngie/stable-10-libnv/contrib/ntp/CommitLog Tue Jan 12 18:28:48 2016 (r293779)
+++ user/ngie/stable-10-libnv/contrib/ntp/CommitLog Tue Jan 12 18:33:53 2016 (r293780)
@@ -1,3 +1,1480 @@
+ChangeSet@1.3623, 2016-01-07 23:33:11+00:00, stenn@deacon.udel.edu
+ NTP_4_2_8P5
+ TAG: NTP_4_2_8P5
+
+ ChangeLog@1.1791 +1 -0
+ NTP_4_2_8P5
+
+ ntpd/invoke-ntp.conf.texi@1.194 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/invoke-ntp.keys.texi@1.186 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/invoke-ntpd.texi@1.503 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.5man@1.228 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.5mdoc@1.228 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.html@1.182 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.man.in@1.228 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntp.conf.mdoc.in@1.228 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.5man@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.5mdoc@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.html@1.182 +1 -1
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.man.in@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntp.keys.mdoc.in@1.220 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntpd-opts.c@1.525 +7 -7
+ NTP_4_2_8P5
+
+ ntpd/ntpd-opts.h@1.524 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntpd.1ntpdman@1.332 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntpd.1ntpdmdoc@1.332 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntpd.html@1.176 +2 -2
+ NTP_4_2_8P5
+
+ ntpd/ntpd.man.in@1.332 +3 -3
+ NTP_4_2_8P5
+
+ ntpd/ntpd.mdoc.in@1.332 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/invoke-ntpdc.texi@1.500 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc-opts.c@1.518 +7 -7
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc-opts.h@1.517 +3 -3
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.1ntpdcman@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.1ntpdcmdoc@1.331 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.html@1.344 +2 -2
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.man.in@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpdc/ntpdc.mdoc.in@1.331 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/invoke-ntpq.texi@1.507 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/ntpq-opts.c@1.524 +7 -7
+ NTP_4_2_8P5
+
+ ntpq/ntpq-opts.h@1.522 +3 -3
+ NTP_4_2_8P5
+
+ ntpq/ntpq.1ntpqman@1.335 +3 -3
+ NTP_4_2_8P5
+
+ ntpq/ntpq.1ntpqmdoc@1.335 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/ntpq.html@1.173 +2 -2
+ NTP_4_2_8P5
+
+ ntpq/ntpq.man.in@1.335 +3 -3
+ NTP_4_2_8P5
+
+ ntpq/ntpq.mdoc.in@1.335 +2 -2
+ NTP_4_2_8P5
+
+ ntpsnmpd/invoke-ntpsnmpd.texi@1.502 +2 -2
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd-opts.c@1.520 +7 -7
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd-opts.h@1.519 +3 -3
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.331 +2 -2
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.html@1.171 +1 -1
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.man.in@1.331 +3 -3
+ NTP_4_2_8P5
+
+ ntpsnmpd/ntpsnmpd.mdoc.in@1.331 +2 -2
+ NTP_4_2_8P5
+
+ packageinfo.sh@1.522 +2 -2
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.92 +3 -3
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.93 +2 -2
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.html@1.94 +1 -1
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.man.in@1.91 +3 -3
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/calc_tickadj.mdoc.in@1.93 +2 -2
+ NTP_4_2_8P5
+
+ scripts/calc_tickadj/invoke-calc_tickadj.texi@1.96 +1 -1
+ NTP_4_2_8P5
+
+ scripts/invoke-plot_summary.texi@1.113 +2 -2
+ NTP_4_2_8P5
+
+ scripts/invoke-summary.texi@1.113 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/invoke-ntp-wait.texi@1.323 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait-opts@1.59 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitman@1.320 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.321 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.html@1.340 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.man.in@1.320 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntp-wait/ntp-wait.mdoc.in@1.321 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/invoke-ntpsweep.texi@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepman@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.99 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.html@1.112 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.man.in@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntpsweep/ntpsweep.mdoc.in@1.100 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/invoke-ntptrace.texi@1.112 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.1ntptraceman@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.1ntptracemdoc@1.100 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.html@1.113 +2 -2
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.man.in@1.99 +3 -3
+ NTP_4_2_8P5
+
+ scripts/ntptrace/ntptrace.mdoc.in@1.101 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary.1plot_summaryman@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/plot_summary.1plot_summarymdoc@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary.html@1.114 +2 -2
+ NTP_4_2_8P5
+
+ scripts/plot_summary.man.in@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/plot_summary.mdoc.in@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary-opts@1.61 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary.1summaryman@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/summary.1summarymdoc@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary.html@1.114 +2 -2
+ NTP_4_2_8P5
+
+ scripts/summary.man.in@1.111 +3 -3
+ NTP_4_2_8P5
+
+ scripts/summary.mdoc.in@1.111 +2 -2
+ NTP_4_2_8P5
+
+ scripts/update-leap/invoke-update-leap.texi@1.12 +1 -1
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap-opts@1.12 +2 -2
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.1update-leapman@1.12 +3 -3
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.1update-leapmdoc@1.12 +2 -2
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.html@1.12 +1 -1
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.man.in@1.12 +3 -3
+ NTP_4_2_8P5
+
+ scripts/update-leap/update-leap.mdoc.in@1.12 +2 -2
+ NTP_4_2_8P5
+
+ sntp/invoke-sntp.texi@1.500 +2 -2
+ NTP_4_2_8P5
+
+ sntp/sntp-opts.c@1.519 +7 -7
+ NTP_4_2_8P5
+
+ sntp/sntp-opts.h@1.517 +3 -3
+ NTP_4_2_8P5
+
+ sntp/sntp.1sntpman@1.335 +3 -3
+ NTP_4_2_8P5
+
+ sntp/sntp.1sntpmdoc@1.335 +2 -2
+ NTP_4_2_8P5
+
+ sntp/sntp.html@1.515 +2 -2
+ NTP_4_2_8P5
+
+ sntp/sntp.man.in@1.335 +3 -3
+ NTP_4_2_8P5
+
+ sntp/sntp.mdoc.in@1.335 +2 -2
+ NTP_4_2_8P5
+
+ util/invoke-ntp-keygen.texi@1.503 +2 -2
+ NTP_4_2_8P5
+
+ util/ntp-keygen-opts.c@1.521 +7 -7
+ NTP_4_2_8P5
+
+ util/ntp-keygen-opts.h@1.519 +3 -3
+ NTP_4_2_8P5
+
+ util/ntp-keygen.1ntp-keygenman@1.331 +3 -3
+ NTP_4_2_8P5
+
+ util/ntp-keygen.1ntp-keygenmdoc@1.331 +2 -2
+ NTP_4_2_8P5
+
+ util/ntp-keygen.html@1.177 +2 -2
+ NTP_4_2_8P5
+
+ util/ntp-keygen.man.in@1.331 +3 -3
+ NTP_4_2_8P5
+
+ util/ntp-keygen.mdoc.in@1.331 +2 -2
+ NTP_4_2_8P5
+
+ChangeSet@1.3622, 2016-01-07 17:52:24-05:00, stenn@deacon.udel.edu
+ ntp-4.2.8p5
+
+ packageinfo.sh@1.521 +1 -1
+ ntp-4.2.8p5
+
+ChangeSet@1.3621, 2016-01-07 22:20:05+00:00, stenn@psp-at1.ntp.org
+ cleanup
+
+ NEWS@1.152 +2 -2
+ cleanup
+
+ChangeSet@1.3620, 2016-01-07 09:33:11+00:00, stenn@psp-at1.ntp.org
+ typo in ntp_proto.c - leap smear. Reported by Martin Burnicki
+
+ ntpd/ntp_proto.c@1.371 +1 -1
+ typo in ntp_proto.c - leap smear. Reported by Martin Burnicki
+
+ChangeSet@1.3619, 2016-01-07 06:33:08+00:00, stenn@psp-at1.ntp.org
+ Update scripts/calc_tickadj/Makefile.am. Harlan Stenn.
+
+ ChangeLog@1.1790 +1 -0
+ Update scripts/calc_tickadj/Makefile.am. Harlan Stenn.
+
+ scripts/calc_tickadj/Makefile.am@1.11 +2 -0
+ Update scripts/calc_tickadj/Makefile.am. Harlan Stenn.
+
+ChangeSet@1.3616.1.1, 2016-01-05 10:57:45+00:00, stenn@psp-at1.ntp.org
+ Bug 2952 fixes
+
+ ChangeLog@1.1787.1.1 +1 -0
+ Bug 2952 fixes
+
+ ntpd/ntp_proto.c@1.370 +165 -152
+ Bug 2952 fixes
+
+ChangeSet@1.3617, 2016-01-05 09:56:31+00:00, stenn@psp-at1.ntp.org
+ ntp-4.2.8p5 prep
+
+ ChangeLog@1.1788 +2 -1
+ ntp-4.2.8p5 prep
+
+ NEWS@1.151 +104 -3
+ ntp-4.2.8p5 prep
+
+ChangeSet@1.3616, 2015-12-06 11:20:02+00:00, stenn@psp-deb1.ntp.org
+ Quiet a warning from clang. Harlan Stenn.
+
+ ChangeLog@1.1787 +1 -0
+ Quiet a warning from clang. Harlan Stenn.
+
+ libntp/ntp_rfc2553.c@1.50 +3 -2
+ Quiet a warning from clang. Harlan Stenn.
+
+ChangeSet@1.3615, 2015-12-05 10:41:51+00:00, stenn@psp-at1.ntp.org
+ CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1786 +1 -0
+ CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.12 +5 -2
+ CID 1341677: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3614, 2015-12-05 10:38:28+00:00, stenn@psp-at1.ntp.org
+ CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1785 +1 -0
+ CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.11 +5 -1
+ CID 1341678: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3613, 2015-12-05 10:31:39+00:00, stenn@psp-at1.ntp.org
+ CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1784 +1 -0
+ CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.10 +4 -2
+ CID 1341679: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3612, 2015-12-05 10:27:40+00:00, stenn@psp-at1.ntp.org
+ CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1783 +1 -0
+ CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+
+ sntp/tests/keyFile.c@1.9 +4 -2
+ CID 1341680: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3611, 2015-12-05 10:21:07+00:00, stenn@psp-at1.ntp.org
+ CID 1341681: Nits in sntp/tests/keyFile.c. HStenn.
+
+ ChangeLog@1.1782 +1 -0
+ CID 1341681: Nits in sntp/tests/keyFile.c. HStenn.
+
+ChangeSet@1.3610, 2015-12-05 10:18:23+00:00, stenn@psp-at1.ntp.org
+ sntp/tests/keyFile.c lint
+
+ sntp/tests/keyFile.c@1.8 +4 -2
+ sntp/tests/keyFile.c lint
+
+ChangeSet@1.3609, 2015-12-05 10:01:47+00:00, stenn@psp-at1.ntp.org
+ CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+
+ ChangeLog@1.1781 +1 -0
+ CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+
+ libntp/authreadkeys.c@1.24 +3 -4
+ CID 1341682: Nit in libntp/authreadkeys.c. HStenn.
+
+ChangeSet@1.3608, 2015-12-05 09:40:44+00:00, stenn@psp-at1.ntp.org
+ CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ ChangeLog@1.1780 +1 -0
+ CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ tests/ntpd/t-ntp_signd.c@1.15 +4 -0
+ CID 1341684: Nit in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ChangeSet@1.3607, 2015-12-03 12:07:30+00:00, stenn@psp-at1.ntp.org
+ Update some test runners
+
+ tests/libntp/run-sfptostr.c@1.7 +9 -8
+ update
+
+ tests/sandbox/run-uglydate.c@1.7 +2 -1
+ update
+
+ChangeSet@1.3606, 2015-12-03 03:28:15-08:00, cov-build@cov7.ntfo.org
+ Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+
+ ChangeLog@1.1779 +1 -0
+ Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+
+ tests/libntp/sfptostr.c@1.5 +1 -0
+ Header cleanup in tests/libntp/sfptostr.c. Harlan Stenn.
+
+ChangeSet@1.3605, 2015-12-03 03:26:50-08:00, cov-build@cov7.ntfo.org
+ Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+
+ ChangeLog@1.1778 +1 -0
+ Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+
+ tests/sandbox/uglydate.c@1.6 +2 -1
+ Header cleanup in tests/sandbox/uglydate.c. Harlan Stenn.
+
+ChangeSet@1.3604, 2015-12-03 02:16:02-08:00, cov-build@cov7.ntfo.org
+ CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+
+ ChangeLog@1.1777 +1 -0
+ CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+
+ sntp/tests/t-log.c@1.7 +1 -1
+ CID 1341527: Quiet a CHECKED_RETURN in sntp/tests/t-log.c. HStenn.
+
+ChangeSet@1.3603, 2015-12-03 02:00:58-08:00, cov-build@cov7.ntfo.org
+ CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+
+ ChangeLog@1.1776 +1 -0
+ CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+
+ sntp/tests/t-log.c@1.6 +2 -0
+ CID 1341533: Missing assertion in sntp/tests/t-log.c. HStenn.
+
+ChangeSet@1.3602, 2015-12-03 01:50:11-08:00, cov-build@cov7.ntfo.org
+ CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ ChangeLog@1.1775 +4 -0
+ CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ tests/ntpd/t-ntp_signd.c@1.14 +9 -0
+ CID 134534-134537: Resource leaks in tests/ntpd/t-ntp_signd.c. HStenn.
+
+ChangeSet@1.3601, 2015-12-03 01:22:22-08:00, cov-build@cov7.ntfo.org
+ CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+
+ ChangeLog@1.1774 +1 -0
+ CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+
+ tests/ntpd/ntp_prio_q.c@1.3 +1 -0
+ CID 1341538: Memory leak in tests/ntpd/ntp_prio_q.c:262. HStenn.
+
+ChangeSet@1.3597.4.1, 2015-11-30 06:03:47+01:00, jnperlin@hydra.localnet
+ [Bug 2829] Look at pipe_fds in ntpd.c (initial value issue)
+
+ ChangeLog@1.1770.4.1 +1 -0
+ [Bug 2829] Look at pipe_fds in ntpd.c
+
+ ntpd/ntpd.c@1.167 +3 -0
+ [Bug 2829] Look at pipe_fds in ntpd.c (initial value issue)
+
+ChangeSet@1.3597.3.1, 2015-11-29 13:03:58+01:00, jnperlin@hydra.localnet
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16].
+
+ ChangeLog@1.1770.3.1 +2 -0
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16].
+
+ ntpd/ntp_parser.c@1.100 +178 -171
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16]. (file regenerated by bison & trimmed manually)
+
+ ntpd/ntp_parser.y@1.90 +8 -1
+ [Bug 2887] stratum -1 config results as showing value 99
+ - fudge stratum only accepts values [0..16], gives error otherwise
+
+ChangeSet@1.3597.2.1, 2015-11-28 22:59:39+01:00, jnperlin@hydra.localnet
+ [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - applied patch by Christos Zoulas.
+
+ ChangeLog@1.1770.2.1 +2 -0
+ [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - applied patch by Christos Zoulas.
+
+ libntp/socktohost.c@1.16 +10 -2
+ [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
+ - save errno around calls to getnameinfo/getaddrinfo (patch by Christos Zoulas)
+
+ChangeSet@1.3597.1.4, 2015-11-28 19:09:53+01:00, jnperlin@hydra.localnet
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ChangeLog@1.1770.1.2 +2 -0
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ntpq/ntpq-subs.c@1.114 +11 -8
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ntpq/ntpq.c@1.165 +57 -8
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ ntpq/ntpq.h@1.31 +4 -0
+ Bug 2971 - ntpq bails on ^C: select fails: Interrupted system call
+ - changed stacked/nested handling of CTRL-C.
+
+ChangeSet@1.3597.1.3, 2015-11-25 22:10:45-08:00, harlan@max.pfcs.com
+ Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+
+ ChangeLog@1.1770.1.1 +1 -0
+ Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+
+ sntp/m4/ntp_libevent.m4@1.16 +2 -1
+ Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn.
+
+ChangeSet@1.3597.1.2, 2015-11-25 12:23:40+00:00, stenn@psp-at1.ntp.org
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/run-t-ntp_signd.c@1.11 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/t-ntp_signd.c@1.13 +19 -5
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3597.1.1, 2015-11-25 11:50:51+00:00, stenn@psp-at1.ntp.org
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/unity/unity_internals.h@1.5 +13 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/calendar.c@1.12 +8 -3
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/leapsec.c@1.4 +241 -82
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/run-leapsec.c@1.6 +33 -33
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/run-t-ntp_signd.c@1.10 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/ntpd/t-ntp_signd.c@1.12 +40 -13
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/smeartest.c@1.10 +3 -0
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3598, 2015-11-24 08:06:41+01:00, jnperlin@hydra.localnet
+ [Bug 2967] ntpdate command suffers an assertion failure
+ - fixed ntp_rfc2553.c to return proper address length.
+
+ ChangeLog@1.1771 +2 -0
+ [Bug 2967] ntpdate command suffers an assertion failure
+ - fixed ntp_rfc2553.c to return proper address length.
+
+ libntp/ntp_rfc2553.c@1.49 +2 -1
+ [Bug 2967] ntpdate command suffers an assertion failure
+ - fix do_nodename() to return the proper address length when name is NULL.
+
+ChangeSet@1.3597, 2015-11-23 10:55:16+00:00, stenn@psp-at1.ntp.org
+ ChangeLog, caljulian.c:
+ * CID 1339955: Free allocated memory in caljulian test. HStenn.
+ * CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+
+ ChangeLog@1.1770 +2 -0
+ * CID 1339955: Free allocated memory in caljulian test. HStenn.
+ * CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+
+ tests/libntp/caljulian.c@1.14 +16 -10
+ * CID 1339955: Free allocated memory in caljulian test. HStenn.
+ * CID 1339962: Explicitly initialize variable in caljulian test. HStenn.
+
+ChangeSet@1.3596, 2015-11-20 20:16:24-08:00, harlan@hms-mbp11.pfcs.com
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/kodDatabase.c@1.9 +0 -4
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/run-kodDatabase.c@1.9 +5 -5
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3595, 2015-11-20 19:41:16-08:00, harlan@hms-mbp11.pfcs.com
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/kodDatabase.c@1.8 +6 -0
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/kodFile.c@1.9 +1 -0
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/run-kodDatabase.c@1.8 +6 -5
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/run-t-log.c@1.5 +3 -3
+ Unity test cleanup. Harlan Stenn.
+
+ sntp/tests/t-log.c@1.5 +32 -16
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/calendar.c@1.11 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/caljulian.c@1.13 +1 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/decodenetnum.c@1.10 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/humandate.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/lfptostr.c@1.8 +9 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/modetoa.c@1.8 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/msyslog.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/netof.c@1.9 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/numtoa.c@1.7 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/numtohost.c@1.7 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/prettydate.c@1.6 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/recvbuff.c@1.7 +3 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refidsmear.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refnumtoa.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-calendar.c@1.11 +15 -15
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-decodenetnum.c@1.10 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-humandate.c@1.7 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-lfptostr.c@1.8 +11 -11
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-modetoa.c@1.12 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-msyslog.c@1.9 +8 -8
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-netof.c@1.8 +4 -4
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-numtoa.c@1.11 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-numtohost.c@1.11 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-prettydate.c@1.6 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-refidsmear.c@1.8 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-refnumtoa.c@1.9 +2 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-sfptostr.c@1.6 +8 -8
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-socktoa.c@1.13 +6 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-statestr.c@1.11 +4 -4
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-strtolfp.c@1.6 +7 -7
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-timespecops.c@1.11 +28 -28
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-timevalops.c@1.13 +28 -28
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-uglydate.c@1.11 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/sfptostr.c@1.4 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/socktoa.c@1.11 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/statestr.c@1.6 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/strtolfp.c@1.7 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timespecops.c@1.10 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timevalops.c@1.13 +10 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/uglydate.c@1.10 +13 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/run-uglydate.c@1.6 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/smeartest.c@1.9 +2 -0
+ Unity test cleanup. Harlan Stenn.
+
+ tests/sandbox/uglydate.c@1.5 +11 -0
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3594, 2015-11-20 07:40:57+00:00, stenn@psp-at1.ntp.org
+ [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+ ChangeLog@1.1769 +1 -0
+ [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+ ntpq/ntpq.c@1.164 +1 -1
+ [Bug 2958] ntpq: fatal error messages need a final newline. Craig Leres.
+
+ChangeSet@1.3593, 2015-11-20 07:27:27+00:00, stenn@psp-at1.ntp.org
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/authkeys.c@1.13 +36 -10
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/buftvtots.c@1.6 +18 -6
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/calendar.c@1.10 +100 -47
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/caljulian.c@1.12 +27 -9
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/clocktime.c@1.9 +48 -24
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/humandate.c@1.6 +6 -2
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/lfpfunc.c@1.15 +113 -69
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/netof.c@1.8 +22 -7
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/numtohost.c@1.6 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/octtoint.c@1.7 +36 -14
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refidsmear.c@1.6 +1 -4
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/refnumtoa.c@1.6 +5 -5
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-lfpfunc.c@1.18 +9 -9
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/run-refidsmear.c@1.7 +1 -1
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timespecops.c@1.9 +173 -48
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timestructs.h@1.3 +22 -22
+ Unity test cleanup. Harlan Stenn.
+
+ tests/libntp/timevalops.c@1.12 +168 -52
+ Unity test cleanup. Harlan Stenn.
+
+ChangeSet@1.3592, 2015-11-20 02:57:37+01:00, jnperlin@nemesis.localnet
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+
+ ChangeLog@1.1768 +2 -0
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+
+ lib/isc/sockaddr.c@1.14 +1 -1
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+ - cast fro size_t to u_int (no overflow danger); not related the bug, found while double-checking changes
+
+ ntpq/ntpq-subs.c@1.113 +1 -1
+ [Bug 2969] Seg fault from ntpq/mrulist when looking at server with lots of clients
+ - make end-of-buffer test unsigned-safe
+
+ChangeSet@1.3591, 2015-11-17 11:12:02+00:00, stenn@psp-at1.ntp.org
+ [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+
+ ChangeLog@1.1767 +1 -0
+ [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+
+ html/miscopt.html@1.84 +3 -3
+ [Bug 2932] Update leapsecond file info in miscopt.html. CWoodbury, HStenn.
+
+ChangeSet@1.3588, 2015-11-17 05:02:10+00:00, stenn@psp-at1.ntp.org
+ Credit Martin for 2965
+
+ ChangeLog@1.1764.1.3 +1 -1
+ Credit Martin for 2965
+
+ChangeSet@1.3587, 2015-11-17 04:53:39+00:00, stenn@psp-at1.ntp.org
+ cleanup
+
+ ChangeLog@1.1764.1.2 +1 -1
+ cleanup
+
+ChangeSet@1.3584.2.1, 2015-11-16 11:59:55+01:00, burnicki@pc-martin4.
+ [Bug 2965] Local clock didn't work since 4.2.8p4
+
+ ChangeLog@1.1764.1.1 +1 -0
+ [Bug 2965] Local clock didn't work since 4.2.8p4
+
+ ntpd/refclock_local.c@1.22 +1 -0
+ [Bug 2965] Local clock didn't work since 4.2.8p4
+
+ChangeSet@1.3584.1.2, 2015-11-14 01:01:05+01:00, jnperlin@hydra.localnet
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Tue Jan 12 22:36:42 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 BAAC4A6D011
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 22:36:42 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (glebi.us [96.95.210.25])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id A7FFB1310;
Tue, 12 Jan 2016 22:36:42 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (localhost [127.0.0.1])
by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id u0CMafIu042867
(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Tue, 12 Jan 2016 14:36:42 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by cell.glebi.us (8.15.2/8.15.2/Submit) id u0CMafLa042866;
Tue, 12 Jan 2016 14:36:41 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebi.us: glebius set sender to
glebius@FreeBSD.org using -f
Date: Tue, 12 Jan 2016 14:36:41 -0800
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Devin Teske <dteske@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: Re: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
Message-ID: <20160112223641.GU1906@FreeBSD.org>
References: <201601121806.u0CI67gI009531@repo.freebsd.org>
<20160112180805.GP1906@FreeBSD.org>
<1452622770.11054.1.camel@FrauBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1452622770.11054.1.camel@FrauBSD.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
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: Tue, 12 Jan 2016 22:36:42 -0000
On Tue, Jan 12, 2016 at 10:19:30AM -0800, Devin Teske wrote:
D> On Tue, 2016-01-12 at 10:08 -0800, Gleb Smirnoff wrote:
D> > On Tue, Jan 12, 2016 at 06:06:07PM +0000, Gleb Smirnoff wrote:
D> > T> Author: glebius
D> > T> Date: Tue Jan 12 18:06:07 2016
D> > T> New Revision: 293777
D> > T> URL: https://svnweb.freebsd.org/changeset/base/293777
D> > T>
D> > T> Log:
D> > T> Adjust script removing .orig files and empty files:
D> > T> - Adopt the regexp to cleaned patches, that don't have
D> > T> diff or subversion header.
D> > T> - Switch from awk to sed, due to bugs in awk regexps.
D> >
D> > If anyone interested, in our awk regexp "^diff" would match
D> > " diff", any amount of whitespace. Since ntp has a lot
D> > variables named diff, running the script over ntp patches
D> > produce a lot of garbage.
D> >
D>
D> Gleb, I can't seem to reproduce what you're saying.
D>
D> $ echo " diff" | awk '/^diff/'
D> $ echo " diff" | awk '!/^diff/'
D> diff
echo " diff" | awk '$1 ~ /^diff/ { print $NF }'
--
Totus tuus, Glebius.
From owner-svn-src-user@freebsd.org Tue Jan 12 22:42:14 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 2EAE0A6D325
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 22:42:14 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
[IPv6:2001:1900:2254:206c::16:87])
by mx1.freebsd.org (Postfix) with ESMTP id 2030D185E;
Tue, 12 Jan 2016 22:42:14 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [IPv6:::1])
by freefall.freebsd.org (Postfix) with ESMTP id 188E117FE;
Tue, 12 Jan 2016 22:42:14 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [172.31.3.2])
by mail.xzibition.com (Postfix) with ESMTP id A3BD914F83;
Tue, 12 Jan 2016 22:42:13 +0000 (UTC)
X-Virus-Scanned: amavisd-new at mail.xzibition.com
Received: from mail.xzibition.com ([172.31.3.2])
by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new,
port 10026)
with LMTP id HEKeBkatLW9j; Tue, 12 Jan 2016 22:42:11 +0000 (UTC)
Subject: Re: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 875C514F7B
To: Gleb Smirnoff <glebius@FreeBSD.org>, Devin Teske <dteske@FreeBSD.org>
References: <201601121806.u0CI67gI009531@repo.freebsd.org>
<20160112180805.GP1906@FreeBSD.org> <1452622770.11054.1.camel@FrauBSD.org>
<20160112223641.GU1906@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-user@freebsd.org
From: Bryan Drewery <bdrewery@FreeBSD.org>
Organization: FreeBSD
Message-ID: <5695813F.9090803@FreeBSD.org>
Date: Tue, 12 Jan 2016 14:42:07 -0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0)
Gecko/20100101 Thunderbird/38.5.0
MIME-Version: 1.0
In-Reply-To: <20160112223641.GU1906@FreeBSD.org>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
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: Tue, 12 Jan 2016 22:42:14 -0000
On 1/12/16 2:36 PM, Gleb Smirnoff wrote:
> On Tue, Jan 12, 2016 at 10:19:30AM -0800, Devin Teske wrote:
> D> On Tue, 2016-01-12 at 10:08 -0800, Gleb Smirnoff wrote:
> D> > On Tue, Jan 12, 2016 at 06:06:07PM +0000, Gleb Smirnoff wrote:
> D> > T> Author: glebius
> D> > T> Date: Tue Jan 12 18:06:07 2016
> D> > T> New Revision: 293777
> D> > T> URL: https://svnweb.freebsd.org/changeset/base/293777
> D> > T>
> D> > T> Log:
> D> > T> Adjust script removing .orig files and empty files:
> D> > T> - Adopt the regexp to cleaned patches, that don't have
> D> > T> diff or subversion header.
> D> > T> - Switch from awk to sed, due to bugs in awk regexps.
> D> >
> D> > If anyone interested, in our awk regexp "^diff" would match
> D> > " diff", any amount of whitespace. Since ntp has a lot
> D> > variables named diff, running the script over ntp patches
> D> > produce a lot of garbage.
> D> >
> D>
> D> Gleb, I can't seem to reproduce what you're saying.
> D>
> D> $ echo " diff" | awk '/^diff/'
> D> $ echo " diff" | awk '!/^diff/'
> D> diff
>
> echo " diff" | awk '$1 ~ /^diff/ { print $NF }'
>
That's not a bug. $1 is "diff".
--
Regards,
Bryan Drewery
From owner-svn-src-user@freebsd.org Tue Jan 12 22:42: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 987A3A6D372
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 22:42:52 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
[IPv6:2001:1900:2254:206c::16:87])
by mx1.freebsd.org (Postfix) with ESMTP id 89B4C19F2;
Tue, 12 Jan 2016 22:42:52 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [IPv6:::1])
by freefall.freebsd.org (Postfix) with ESMTP id 818F1191C;
Tue, 12 Jan 2016 22:42:52 +0000 (UTC)
(envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [172.31.3.2])
by mail.xzibition.com (Postfix) with ESMTP id 4ABC314F92;
Tue, 12 Jan 2016 22:42:52 +0000 (UTC)
X-Virus-Scanned: amavisd-new at mail.xzibition.com
Received: from mail.xzibition.com ([172.31.3.2])
by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new,
port 10026)
with LMTP id 83NBGLu7ZxsL; Tue, 12 Jan 2016 22:42:49 +0000 (UTC)
Subject: Re: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 5AFD214F8C
To: Gleb Smirnoff <glebius@FreeBSD.org>, Devin Teske <dteske@FreeBSD.org>
References: <201601121806.u0CI67gI009531@repo.freebsd.org>
<20160112180805.GP1906@FreeBSD.org> <1452622770.11054.1.camel@FrauBSD.org>
<20160112223641.GU1906@FreeBSD.org> <5695813F.9090803@FreeBSD.org>
Cc: src-committers@freebsd.org, svn-src-user@freebsd.org
From: Bryan Drewery <bdrewery@FreeBSD.org>
Organization: FreeBSD
Message-ID: <56958168.8090503@FreeBSD.org>
Date: Tue, 12 Jan 2016 14:42:48 -0800
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0)
Gecko/20100101 Thunderbird/38.5.0
MIME-Version: 1.0
In-Reply-To: <5695813F.9090803@FreeBSD.org>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
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: Tue, 12 Jan 2016 22:42:52 -0000
On 1/12/16 2:42 PM, Bryan Drewery wrote:
> On 1/12/16 2:36 PM, Gleb Smirnoff wrote:
>> On Tue, Jan 12, 2016 at 10:19:30AM -0800, Devin Teske wrote:
>> D> On Tue, 2016-01-12 at 10:08 -0800, Gleb Smirnoff wrote:
>> D> > On Tue, Jan 12, 2016 at 06:06:07PM +0000, Gleb Smirnoff wrote:
>> D> > T> Author: glebius
>> D> > T> Date: Tue Jan 12 18:06:07 2016
>> D> > T> New Revision: 293777
>> D> > T> URL: https://svnweb.freebsd.org/changeset/base/293777
>> D> > T>
>> D> > T> Log:
>> D> > T> Adjust script removing .orig files and empty files:
>> D> > T> - Adopt the regexp to cleaned patches, that don't have
>> D> > T> diff or subversion header.
>> D> > T> - Switch from awk to sed, due to bugs in awk regexps.
>> D> >
>> D> > If anyone interested, in our awk regexp "^diff" would match
>> D> > " diff", any amount of whitespace. Since ntp has a lot
>> D> > variables named diff, running the script over ntp patches
>> D> > produce a lot of garbage.
>> D> >
>> D>
>> D> Gleb, I can't seem to reproduce what you're saying.
>> D>
>> D> $ echo " diff" | awk '/^diff/'
>> D> $ echo " diff" | awk '!/^diff/'
>> D> diff
>>
>> echo " diff" | awk '$1 ~ /^diff/ { print $NF }'
>>
>
> That's not a bug. $1 is "diff".
>
$0 is the whole line:
# echo " blah"|awk '{print $1}'
blah
# echo " blah"|awk '{print $0}'
blah
--
Regards,
Bryan Drewery
From owner-svn-src-user@freebsd.org Tue Jan 12 22:44:25 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 1C177A6D43D
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 22:44:25 +0000 (UTC)
(envelope-from glebius@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 DE86E1B66;
Tue, 12 Jan 2016 22:44:24 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CMiNsd099654;
Tue, 12 Jan 2016 22:44:23 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CMiNeb099653;
Tue, 12 Jan 2016 22:44:23 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601122244.u0CMiNeb099653@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 12 Jan 2016 22:44:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293784 - user/cperciva/freebsd-update-build/scripts
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: Tue, 12 Jan 2016 22:44:25 -0000
Author: glebius
Date: Tue Jan 12 22:44:23 2016
New Revision: 293784
URL: https://svnweb.freebsd.org/changeset/base/293784
Log:
- Instead of dumping patch(1) stdout to console, save it in $1-patch.log,
like rest of the build stages do.
- Report the patching stage with log().
Modified:
user/cperciva/freebsd-update-build/scripts/build.subr
Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 20:53:57 2016 (r293783)
+++ user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 22:44:23 2016 (r293784)
@@ -409,7 +409,7 @@ applypatches () {
echo ${file}
fi
done | xargs rm -f
- done < $2 2> ${WORKDIR}/$1-patch.log
+ done < $2 > ${WORKDIR}/$1-patch.log 2>&1
cd -
}
@@ -446,6 +446,7 @@ patchworld () {
# Apply patches, in order of increasing patch level. The
# order matters in case we have multiple security advisories
# affecting the same code.
+ log "Patching world+src"
ls ${PATCHDIR} |
sort -n > ${WORKDIR}/patchlist.tmp
applypatches $1 ${WORKDIR}/patchlist.tmp
From owner-svn-src-user@freebsd.org Tue Jan 12 22:47:17 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 E2839A6D607
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 22:47:17 +0000 (UTC)
(envelope-from glebius@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 B78231D62;
Tue, 12 Jan 2016 22:47:17 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CMlGri099803;
Tue, 12 Jan 2016 22:47:16 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CMlGZw099802;
Tue, 12 Jan 2016 22:47:16 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601122247.u0CMlGZw099802@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 12 Jan 2016 22:47:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293785 - user/cperciva/freebsd-update-build/scripts
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: Tue, 12 Jan 2016 22:47:18 -0000
Author: glebius
Date: Tue Jan 12 22:47:16 2016
New Revision: 293785
URL: https://svnweb.freebsd.org/changeset/base/293785
Log:
Switch to perl regexps in applypatches(). We need to match +++ lines from
diffs generated by different sources. At the security officer repo, there
is already a script that has a good regexp to match that by des@. Take the
regexp from there and adjust it a little bit.
Modified:
user/cperciva/freebsd-update-build/scripts/build.subr
Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 22:44:23 2016 (r293784)
+++ user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 22:47:16 2016 (r293785)
@@ -401,8 +401,8 @@ applypatches () {
while read PATCH; do
patch -p0 < ${PATCHDIR}/${PATCH}
# Remove ".orig" files created by patch(1) and empty files
- for file in $(sed -Ene \
- 's/^--- (.*)(\.orig$|[[:space:]]*)?/\1/p' < \
+ for file in $(perl -ne \
+ 'print("$1\n") if /^\+\+\+ (?:b\/|\.\/)?(\S+)(?:\s+[(0-9].*)?$/' < \
${PATCHDIR}/${PATCH}); do
echo ${file}.orig
if [ ! -s ${file} ]; then
From owner-svn-src-user@freebsd.org Tue Jan 12 22:55:32 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 1B6B0A6DB77
for <svn-src-user@mailman.ysv.freebsd.org>;
Tue, 12 Jan 2016 22:55:32 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (glebi.us [96.95.210.25])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id E11A8180E;
Tue, 12 Jan 2016 22:55:30 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (localhost [127.0.0.1])
by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id u0CMtULv042991
(version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Tue, 12 Jan 2016 14:55:30 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by cell.glebi.us (8.15.2/8.15.2/Submit) id u0CMtUU0042990;
Tue, 12 Jan 2016 14:55:30 -0800 (PST)
(envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebi.us: glebius set sender to
glebius@FreeBSD.org using -f
Date: Tue, 12 Jan 2016 14:55:29 -0800
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Bryan Drewery <bdrewery@FreeBSD.org>
Cc: Devin Teske <dteske@FreeBSD.org>, src-committers@freebsd.org,
svn-src-user@freebsd.org
Subject: Re: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
Message-ID: <20160112225529.GV1906@FreeBSD.org>
References: <201601121806.u0CI67gI009531@repo.freebsd.org>
<20160112180805.GP1906@FreeBSD.org>
<1452622770.11054.1.camel@FrauBSD.org>
<20160112223641.GU1906@FreeBSD.org> <5695813F.9090803@FreeBSD.org>
<56958168.8090503@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <56958168.8090503@FreeBSD.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
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: Tue, 12 Jan 2016 22:55:32 -0000
On Tue, Jan 12, 2016 at 02:42:48PM -0800, Bryan Drewery wrote:
B> On 1/12/16 2:42 PM, Bryan Drewery wrote:
B> > On 1/12/16 2:36 PM, Gleb Smirnoff wrote:
B> >> On Tue, Jan 12, 2016 at 10:19:30AM -0800, Devin Teske wrote:
B> >> D> On Tue, 2016-01-12 at 10:08 -0800, Gleb Smirnoff wrote:
B> >> D> > On Tue, Jan 12, 2016 at 06:06:07PM +0000, Gleb Smirnoff wrote:
B> >> D> > T> Author: glebius
B> >> D> > T> Date: Tue Jan 12 18:06:07 2016
B> >> D> > T> New Revision: 293777
B> >> D> > T> URL: https://svnweb.freebsd.org/changeset/base/293777
B> >> D> > T>
B> >> D> > T> Log:
B> >> D> > T> Adjust script removing .orig files and empty files:
B> >> D> > T> - Adopt the regexp to cleaned patches, that don't have
B> >> D> > T> diff or subversion header.
B> >> D> > T> - Switch from awk to sed, due to bugs in awk regexps.
B> >> D> >
B> >> D> > If anyone interested, in our awk regexp "^diff" would match
B> >> D> > " diff", any amount of whitespace. Since ntp has a lot
B> >> D> > variables named diff, running the script over ntp patches
B> >> D> > produce a lot of garbage.
B> >> D> >
B> >> D>
B> >> D> Gleb, I can't seem to reproduce what you're saying.
B> >> D>
B> >> D> $ echo " diff" | awk '/^diff/'
B> >> D> $ echo " diff" | awk '!/^diff/'
B> >> D> diff
B> >>
B> >> echo " diff" | awk '$1 ~ /^diff/ { print $NF }'
B> >>
B> >
B> > That's not a bug. $1 is "diff".
B> >
B>
B> $0 is the whole line:
B>
B> # echo " blah"|awk '{print $1}'
B> blah
B>
B> # echo " blah"|awk '{print $0}'
B> blah
Oh, my failure :(
--
Totus tuus, Glebius.
From owner-svn-src-user@freebsd.org Wed Jan 13 07:45: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 4B144A6C319
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 13 Jan 2016 07:45:03 +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 B4A031C5F;
Wed, 13 Jan 2016 07:45:02 +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 u0D7j1MZ065690;
Wed, 13 Jan 2016 07:45:01 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0D7ixUs065658;
Wed, 13 Jan 2016 07:44:59 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601130744.u0D7ixUs065658@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: Wed, 13 Jan 2016 07:44:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293816 - in user/ngie/more-tests2: . bin/sh
bin/sh/tests/builtins contrib/hyperv/tools contrib/less
contrib/llvm/projects/libunwind/src contrib/ntp contrib/ntp/html
contrib/ntp/include...
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: Wed, 13 Jan 2016 07:45:03 -0000
Author: ngie
Date: Wed Jan 13 07:44:58 2016
New Revision: 293816
URL: https://svnweb.freebsd.org/changeset/base/293816
Log:
MFhead @ r293815
Added:
user/ngie/more-tests2/bin/sh/tests/builtins/cd9.0
- copied unchanged from r293815, head/bin/sh/tests/builtins/cd9.0
user/ngie/more-tests2/bin/sh/tests/builtins/cd9.0.stdout
- copied unchanged from r293815, head/bin/sh/tests/builtins/cd9.0.stdout
user/ngie/more-tests2/bin/sh/tests/builtins/getopts10.0
- copied unchanged from r293815, head/bin/sh/tests/builtins/getopts10.0
user/ngie/more-tests2/bin/sh/tests/builtins/local5.0
- copied unchanged from r293815, head/bin/sh/tests/builtins/local5.0
user/ngie/more-tests2/contrib/less/compose.uni
- copied unchanged from r293815, head/contrib/less/compose.uni
user/ngie/more-tests2/contrib/less/mkutable
- copied unchanged from r293815, head/contrib/less/mkutable
user/ngie/more-tests2/contrib/less/ubin.uni
- copied unchanged from r293815, head/contrib/less/ubin.uni
user/ngie/more-tests2/contrib/less/wide.uni
- copied unchanged from r293815, head/contrib/less/wide.uni
user/ngie/more-tests2/contrib/ntp/include/safecast.h
- copied unchanged from r293815, head/contrib/ntp/include/safecast.h
user/ngie/more-tests2/etc/mtree/BSD.libsoft.dist
- copied unchanged from r293815, head/etc/mtree/BSD.libsoft.dist
user/ngie/more-tests2/lib/libsysdecode/Makefile.depend
- copied unchanged from r293815, head/lib/libsysdecode/Makefile.depend
user/ngie/more-tests2/share/examples/ypldap/
- copied from r293815, head/share/examples/ypldap/
user/ngie/more-tests2/share/man/man4/rtwn.4
- copied unchanged from r293815, head/share/man/man4/rtwn.4
user/ngie/more-tests2/share/man/man4/rtwnfw.4
- copied unchanged from r293815, head/share/man/man4/rtwnfw.4
user/ngie/more-tests2/sys/arm64/arm64/ofw_machdep.c
- copied unchanged from r293815, head/sys/arm64/arm64/ofw_machdep.c
user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/rcupdate.h
- copied unchanged from r293815, head/sys/compat/linuxkpi/common/include/linux/rcupdate.h
user/ngie/more-tests2/sys/contrib/dev/rtwn/
- copied from r293815, head/sys/contrib/dev/rtwn/
user/ngie/more-tests2/sys/dev/rtwn/
- copied from r293815, head/sys/dev/rtwn/
user/ngie/more-tests2/sys/dev/sfxge/common/ef10_impl.h
- copied unchanged from r293815, head/sys/dev/sfxge/common/ef10_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/medford_impl.h
- copied unchanged from r293815, head/sys/dev/sfxge/common/medford_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/medford_nic.c
- copied unchanged from r293815, head/sys/dev/sfxge/common/medford_nic.c
user/ngie/more-tests2/sys/dev/syscons/plasma/
- copied from r293815, head/sys/dev/syscons/plasma/
user/ngie/more-tests2/sys/dev/uart/uart_ppstypes.h
- copied unchanged from r293815, head/sys/dev/uart/uart_ppstypes.h
user/ngie/more-tests2/sys/geom/eli/g_eli_hmac.c
- copied unchanged from r293815, head/sys/geom/eli/g_eli_hmac.c
user/ngie/more-tests2/sys/modules/rtwn/
- copied from r293815, head/sys/modules/rtwn/
user/ngie/more-tests2/sys/modules/rtwnfw/
- copied from r293815, head/sys/modules/rtwnfw/
user/ngie/more-tests2/sys/modules/syscons/plasma/
- copied from r293815, head/sys/modules/syscons/plasma/
user/ngie/more-tests2/sys/x86/include/metadata.h
- copied unchanged from r293815, head/sys/x86/include/metadata.h
user/ngie/more-tests2/tools/build/options/WITHOUT_LLVM_LIBUNWIND
- copied unchanged from r293815, head/tools/build/options/WITHOUT_LLVM_LIBUNWIND
user/ngie/more-tests2/tools/build/options/WITH_LLVM_LIBUNWIND
- copied unchanged from r293815, head/tools/build/options/WITH_LLVM_LIBUNWIND
user/ngie/more-tests2/usr.sbin/bhyvectl/bhyvectl.8
- copied unchanged from r293815, head/usr.sbin/bhyvectl/bhyvectl.8
user/ngie/more-tests2/usr.sbin/rpcbind/tests/
- copied from r293815, head/usr.sbin/rpcbind/tests/
Replaced:
user/ngie/more-tests2/sys/amd64/include/metadata.h
- copied unchanged from r293815, head/sys/amd64/include/metadata.h
Deleted:
user/ngie/more-tests2/sys/ofed/include/rdma/Kbuild
Modified:
user/ngie/more-tests2/Makefile
user/ngie/more-tests2/Makefile.inc1
user/ngie/more-tests2/UPDATING
user/ngie/more-tests2/bin/sh/eval.c
user/ngie/more-tests2/bin/sh/exec.c
user/ngie/more-tests2/bin/sh/expand.c
user/ngie/more-tests2/bin/sh/mkbuiltins
user/ngie/more-tests2/bin/sh/options.c
user/ngie/more-tests2/bin/sh/options.h
user/ngie/more-tests2/bin/sh/tests/builtins/Makefile
user/ngie/more-tests2/bin/sh/var.c
user/ngie/more-tests2/contrib/hyperv/tools/hv_kvp_daemon.c
user/ngie/more-tests2/contrib/less/LICENSE
user/ngie/more-tests2/contrib/less/NEWS
user/ngie/more-tests2/contrib/less/README
user/ngie/more-tests2/contrib/less/brac.c
user/ngie/more-tests2/contrib/less/ch.c
user/ngie/more-tests2/contrib/less/charset.c
user/ngie/more-tests2/contrib/less/charset.h
user/ngie/more-tests2/contrib/less/cmd.h
user/ngie/more-tests2/contrib/less/cmdbuf.c
user/ngie/more-tests2/contrib/less/command.c
user/ngie/more-tests2/contrib/less/cvt.c
user/ngie/more-tests2/contrib/less/decode.c
user/ngie/more-tests2/contrib/less/edit.c
user/ngie/more-tests2/contrib/less/filename.c
user/ngie/more-tests2/contrib/less/forwback.c
user/ngie/more-tests2/contrib/less/funcs.h
user/ngie/more-tests2/contrib/less/help.c
user/ngie/more-tests2/contrib/less/ifile.c
user/ngie/more-tests2/contrib/less/input.c
user/ngie/more-tests2/contrib/less/jump.c
user/ngie/more-tests2/contrib/less/less.h
user/ngie/more-tests2/contrib/less/less.hlp
user/ngie/more-tests2/contrib/less/less.nro
user/ngie/more-tests2/contrib/less/lessecho.c
user/ngie/more-tests2/contrib/less/lessecho.nro
user/ngie/more-tests2/contrib/less/lesskey.c
user/ngie/more-tests2/contrib/less/lesskey.h
user/ngie/more-tests2/contrib/less/lesskey.nro
user/ngie/more-tests2/contrib/less/lglob.h
user/ngie/more-tests2/contrib/less/line.c
user/ngie/more-tests2/contrib/less/linenum.c
user/ngie/more-tests2/contrib/less/lsystem.c
user/ngie/more-tests2/contrib/less/main.c
user/ngie/more-tests2/contrib/less/mark.c
user/ngie/more-tests2/contrib/less/mkhelp.c
user/ngie/more-tests2/contrib/less/optfunc.c
user/ngie/more-tests2/contrib/less/option.c
user/ngie/more-tests2/contrib/less/option.h
user/ngie/more-tests2/contrib/less/opttbl.c
user/ngie/more-tests2/contrib/less/os.c
user/ngie/more-tests2/contrib/less/output.c
user/ngie/more-tests2/contrib/less/pattern.c
user/ngie/more-tests2/contrib/less/pattern.h
user/ngie/more-tests2/contrib/less/pckeys.h
user/ngie/more-tests2/contrib/less/position.c
user/ngie/more-tests2/contrib/less/position.h
user/ngie/more-tests2/contrib/less/prompt.c
user/ngie/more-tests2/contrib/less/regexp.c
user/ngie/more-tests2/contrib/less/screen.c
user/ngie/more-tests2/contrib/less/scrsize.c
user/ngie/more-tests2/contrib/less/search.c
user/ngie/more-tests2/contrib/less/signal.c
user/ngie/more-tests2/contrib/less/tags.c
user/ngie/more-tests2/contrib/less/ttyin.c
user/ngie/more-tests2/contrib/less/version.c
user/ngie/more-tests2/contrib/llvm/projects/libunwind/src/AddressSpace.hpp
user/ngie/more-tests2/contrib/llvm/projects/libunwind/src/DwarfParser.hpp
user/ngie/more-tests2/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
user/ngie/more-tests2/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
user/ngie/more-tests2/contrib/llvm/projects/libunwind/src/config.h
user/ngie/more-tests2/contrib/llvm/projects/libunwind/src/libunwind.cpp
user/ngie/more-tests2/contrib/ntp/ChangeLog
user/ngie/more-tests2/contrib/ntp/CommitLog
user/ngie/more-tests2/contrib/ntp/NEWS
user/ngie/more-tests2/contrib/ntp/configure
user/ngie/more-tests2/contrib/ntp/html/miscopt.html
user/ngie/more-tests2/contrib/ntp/include/Makefile.am
user/ngie/more-tests2/contrib/ntp/include/Makefile.in
user/ngie/more-tests2/contrib/ntp/include/ntp_refclock.h
user/ngie/more-tests2/contrib/ntp/include/ntp_stdlib.h
user/ngie/more-tests2/contrib/ntp/include/ntp_worker.h
user/ngie/more-tests2/contrib/ntp/include/ntpd.h
user/ngie/more-tests2/contrib/ntp/lib/isc/backtrace.c
user/ngie/more-tests2/contrib/ntp/lib/isc/buffer.c
user/ngie/more-tests2/contrib/ntp/lib/isc/inet_aton.c
user/ngie/more-tests2/contrib/ntp/lib/isc/inet_pton.c
user/ngie/more-tests2/contrib/ntp/lib/isc/log.c
user/ngie/more-tests2/contrib/ntp/lib/isc/netaddr.c
user/ngie/more-tests2/contrib/ntp/lib/isc/sockaddr.c
user/ngie/more-tests2/contrib/ntp/lib/isc/task.c
user/ngie/more-tests2/contrib/ntp/lib/isc/win32/interfaceiter.c
user/ngie/more-tests2/contrib/ntp/lib/isc/win32/net.c
user/ngie/more-tests2/contrib/ntp/libntp/a_md5encrypt.c
user/ngie/more-tests2/contrib/ntp/libntp/atolfp.c
user/ngie/more-tests2/contrib/ntp/libntp/authkeys.c
user/ngie/more-tests2/contrib/ntp/libntp/authreadkeys.c
user/ngie/more-tests2/contrib/ntp/libntp/authusekey.c
user/ngie/more-tests2/contrib/ntp/libntp/dolfptoa.c
user/ngie/more-tests2/contrib/ntp/libntp/hextolfp.c
user/ngie/more-tests2/contrib/ntp/libntp/mstolfp.c
user/ngie/more-tests2/contrib/ntp/libntp/msyslog.c
user/ngie/more-tests2/contrib/ntp/libntp/ntp_crypto_rnd.c
user/ngie/more-tests2/contrib/ntp/libntp/ntp_lineedit.c
user/ngie/more-tests2/contrib/ntp/libntp/ntp_rfc2553.c
user/ngie/more-tests2/contrib/ntp/libntp/ntp_worker.c
user/ngie/more-tests2/contrib/ntp/libntp/snprintf.c
user/ngie/more-tests2/contrib/ntp/libntp/socktohost.c
user/ngie/more-tests2/contrib/ntp/libntp/systime.c
user/ngie/more-tests2/contrib/ntp/libntp/work_thread.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_computime.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_dcf7000.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_hopf6021.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_meinberg.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_rawdcf.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_rcc8000.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_schmid.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_trimtaip.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_varitext.c
user/ngie/more-tests2/contrib/ntp/libparse/clk_wharton.c
user/ngie/more-tests2/contrib/ntp/libparse/parse.c
user/ngie/more-tests2/contrib/ntp/ntpd/invoke-ntp.conf.texi
user/ngie/more-tests2/contrib/ntp/ntpd/invoke-ntp.keys.texi
user/ngie/more-tests2/contrib/ntp/ntpd/invoke-ntpd.texi
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.conf.5man
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.conf.5mdoc
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.conf.html
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.conf.man.in
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.conf.mdoc.in
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.keys.5man
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.keys.5mdoc
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.keys.html
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.keys.man.in
user/ngie/more-tests2/contrib/ntp/ntpd/ntp.keys.mdoc.in
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_control.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_crypto.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_io.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_loopfilter.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_parser.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_proto.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_refclock.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_request.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_restrict.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_signd.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_timer.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntp_util.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd-opts.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd-opts.h
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd.1ntpdman
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd.1ntpdmdoc
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd.c
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd.html
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd.man.in
user/ngie/more-tests2/contrib/ntp/ntpd/ntpd.mdoc.in
user/ngie/more-tests2/contrib/ntp/ntpd/refclock_local.c
user/ngie/more-tests2/contrib/ntp/ntpd/refclock_parse.c
user/ngie/more-tests2/contrib/ntp/ntpd/refclock_shm.c
user/ngie/more-tests2/contrib/ntp/ntpd/refclock_true.c
user/ngie/more-tests2/contrib/ntp/ntpd/refclock_tsyncpci.c
user/ngie/more-tests2/contrib/ntp/ntpdate/ntpdate.c
user/ngie/more-tests2/contrib/ntp/ntpdc/invoke-ntpdc.texi
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc-opts.c
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc-opts.h
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc.1ntpdcman
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc.c
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc.h
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc.html
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc.man.in
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc.mdoc.in
user/ngie/more-tests2/contrib/ntp/ntpdc/ntpdc_ops.c
user/ngie/more-tests2/contrib/ntp/ntpq/invoke-ntpq.texi
user/ngie/more-tests2/contrib/ntp/ntpq/libntpq.c
user/ngie/more-tests2/contrib/ntp/ntpq/libntpq.h
user/ngie/more-tests2/contrib/ntp/ntpq/libntpq_subs.c
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq-opts.c
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq-opts.h
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq-subs.c
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq.1ntpqman
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq.1ntpqmdoc
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq.c
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq.h
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq.html
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq.man.in
user/ngie/more-tests2/contrib/ntp/ntpq/ntpq.mdoc.in
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/ntpsnmpd.html
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
user/ngie/more-tests2/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
user/ngie/more-tests2/contrib/ntp/packageinfo.sh
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/Makefile.am
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/Makefile.in
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
user/ngie/more-tests2/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
user/ngie/more-tests2/contrib/ntp/scripts/invoke-plot_summary.texi
user/ngie/more-tests2/contrib/ntp/scripts/invoke-summary.texi
user/ngie/more-tests2/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
user/ngie/more-tests2/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
user/ngie/more-tests2/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
user/ngie/more-tests2/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
user/ngie/more-tests2/contrib/ntp/scripts/ntp-wait/ntp-wait.html
user/ngie/more-tests2/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
user/ngie/more-tests2/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
user/ngie/more-tests2/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
user/ngie/more-tests2/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
user/ngie/more-tests2/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
user/ngie/more-tests2/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
user/ngie/more-tests2/contrib/ntp/scripts/ntpsweep/ntpsweep.html
user/ngie/more-tests2/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
user/ngie/more-tests2/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
user/ngie/more-tests2/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
user/ngie/more-tests2/contrib/ntp/scripts/ntptrace/ntptrace-opts
user/ngie/more-tests2/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
user/ngie/more-tests2/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
user/ngie/more-tests2/contrib/ntp/scripts/ntptrace/ntptrace.html
user/ngie/more-tests2/contrib/ntp/scripts/ntptrace/ntptrace.man.in
user/ngie/more-tests2/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
user/ngie/more-tests2/contrib/ntp/scripts/plot_summary-opts
user/ngie/more-tests2/contrib/ntp/scripts/plot_summary.1plot_summaryman
user/ngie/more-tests2/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
user/ngie/more-tests2/contrib/ntp/scripts/plot_summary.html
user/ngie/more-tests2/contrib/ntp/scripts/plot_summary.man.in
user/ngie/more-tests2/contrib/ntp/scripts/plot_summary.mdoc.in
user/ngie/more-tests2/contrib/ntp/scripts/summary-opts
user/ngie/more-tests2/contrib/ntp/scripts/summary.1summaryman
user/ngie/more-tests2/contrib/ntp/scripts/summary.1summarymdoc
user/ngie/more-tests2/contrib/ntp/scripts/summary.html
user/ngie/more-tests2/contrib/ntp/scripts/summary.man.in
user/ngie/more-tests2/contrib/ntp/scripts/summary.mdoc.in
user/ngie/more-tests2/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
user/ngie/more-tests2/contrib/ntp/scripts/update-leap/update-leap-opts
user/ngie/more-tests2/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
user/ngie/more-tests2/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
user/ngie/more-tests2/contrib/ntp/scripts/update-leap/update-leap.html
user/ngie/more-tests2/contrib/ntp/scripts/update-leap/update-leap.man.in
user/ngie/more-tests2/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
user/ngie/more-tests2/contrib/ntp/sntp/configure
user/ngie/more-tests2/contrib/ntp/sntp/include/version.def
user/ngie/more-tests2/contrib/ntp/sntp/include/version.texi
user/ngie/more-tests2/contrib/ntp/sntp/invoke-sntp.texi
user/ngie/more-tests2/contrib/ntp/sntp/m4/ntp_libevent.m4
user/ngie/more-tests2/contrib/ntp/sntp/m4/ntp_problemtests.m4
user/ngie/more-tests2/contrib/ntp/sntp/m4/version.m4
user/ngie/more-tests2/contrib/ntp/sntp/networking.c
user/ngie/more-tests2/contrib/ntp/sntp/sntp-opts.c
user/ngie/more-tests2/contrib/ntp/sntp/sntp-opts.h
user/ngie/more-tests2/contrib/ntp/sntp/sntp.1sntpman
user/ngie/more-tests2/contrib/ntp/sntp/sntp.1sntpmdoc
user/ngie/more-tests2/contrib/ntp/sntp/sntp.html
user/ngie/more-tests2/contrib/ntp/sntp/sntp.man.in
user/ngie/more-tests2/contrib/ntp/sntp/sntp.mdoc.in
user/ngie/more-tests2/contrib/ntp/sntp/tests/keyFile.c
user/ngie/more-tests2/contrib/ntp/sntp/tests/kodDatabase.c
user/ngie/more-tests2/contrib/ntp/sntp/tests/kodFile.c
user/ngie/more-tests2/contrib/ntp/sntp/tests/run-kodDatabase.c
user/ngie/more-tests2/contrib/ntp/sntp/tests/run-t-log.c
user/ngie/more-tests2/contrib/ntp/sntp/tests/t-log.c
user/ngie/more-tests2/contrib/ntp/sntp/tests/utilities.c
user/ngie/more-tests2/contrib/ntp/sntp/unity/unity_internals.h
user/ngie/more-tests2/contrib/ntp/sntp/version.c
user/ngie/more-tests2/contrib/ntp/tests/bug-2803/bug-2803.c
user/ngie/more-tests2/contrib/ntp/tests/bug-2803/run-bug-2803.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/a_md5encrypt.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/authkeys.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/buftvtots.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/calendar.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/caljulian.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/clocktime.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/decodenetnum.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/humandate.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/lfpfunc.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/lfptostr.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/modetoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/msyslog.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/netof.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/numtoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/numtohost.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/octtoint.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/prettydate.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/recvbuff.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/refidsmear.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/refnumtoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-a_md5encrypt.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-calendar.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-decodenetnum.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-humandate.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-lfpfunc.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-lfptostr.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-modetoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-msyslog.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-netof.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-numtoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-numtohost.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-prettydate.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-refnumtoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-sfptostr.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-socktoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-statestr.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-strtolfp.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-timespecops.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-timevalops.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/run-uglydate.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/sfptostr.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/socktoa.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/statestr.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/strtolfp.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/timespecops.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/timevalops.c
user/ngie/more-tests2/contrib/ntp/tests/libntp/uglydate.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/leapsec.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/ntp_prio_q.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/ntp_restrict.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/rc_cmdlength.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/run-leapsec.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/run-ntp_restrict.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/run-rc_cmdlength.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/run-t-ntp_signd.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/t-ntp_scanner.c
user/ngie/more-tests2/contrib/ntp/tests/ntpd/t-ntp_signd.c
user/ngie/more-tests2/contrib/ntp/tests/sandbox/run-uglydate.c
user/ngie/more-tests2/contrib/ntp/tests/sandbox/smeartest.c
user/ngie/more-tests2/contrib/ntp/tests/sandbox/uglydate.c
user/ngie/more-tests2/contrib/ntp/tests/sec-2853/sec-2853.c
user/ngie/more-tests2/contrib/ntp/util/invoke-ntp-keygen.texi
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen-opts.c
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen-opts.h
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen.1ntp-keygenman
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen.c
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen.html
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen.man.in
user/ngie/more-tests2/contrib/ntp/util/ntp-keygen.mdoc.in
user/ngie/more-tests2/contrib/pf/pflogd/pflogd.c
user/ngie/more-tests2/etc/Makefile
user/ngie/more-tests2/etc/master.passwd
user/ngie/more-tests2/etc/mtree/BSD.tests.dist
user/ngie/more-tests2/etc/mtree/Makefile
user/ngie/more-tests2/etc/ntp/leap-seconds
user/ngie/more-tests2/etc/rc
user/ngie/more-tests2/gnu/lib/libgcc/Makefile
user/ngie/more-tests2/gnu/usr.bin/binutils/ld/Makefile
user/ngie/more-tests2/include/limits.h
user/ngie/more-tests2/include/paths.h
user/ngie/more-tests2/lib/csu/arm/Makefile
user/ngie/more-tests2/lib/libc/gen/exec.3
user/ngie/more-tests2/lib/libc/gen/posix_spawn.3
user/ngie/more-tests2/lib/libc/rpc/rpc_soc.c
user/ngie/more-tests2/lib/libc/rpc/rpcb_clnt.c
user/ngie/more-tests2/lib/libc/rpc/rpcb_prot.c
user/ngie/more-tests2/lib/libc/sys/futimens.c
user/ngie/more-tests2/lib/libc/sys/sendfile.2
user/ngie/more-tests2/lib/libc/sys/utimensat.2
user/ngie/more-tests2/lib/libc/sys/utimensat.c
user/ngie/more-tests2/lib/libdpv/util.h
user/ngie/more-tests2/lib/libgssapi/gss_release_oid_set.c
user/ngie/more-tests2/lib/libmd/Makefile.depend
user/ngie/more-tests2/lib/libnv/tests/dnv_tests.cc
user/ngie/more-tests2/lib/libnv/tests/nv_array_tests.cc
user/ngie/more-tests2/lib/libstand/Makefile
user/ngie/more-tests2/lib/libstand/uuid_to_string.c
user/ngie/more-tests2/libexec/rtld-elf/aarch64/rtld_machdep.h
user/ngie/more-tests2/libexec/rtld-elf/amd64/reloc.c
user/ngie/more-tests2/libexec/rtld-elf/amd64/rtld_machdep.h
user/ngie/more-tests2/libexec/rtld-elf/arm/reloc.c
user/ngie/more-tests2/libexec/rtld-elf/arm/rtld_machdep.h
user/ngie/more-tests2/libexec/rtld-elf/i386/rtld_machdep.h
user/ngie/more-tests2/libexec/rtld-elf/mips/rtld_machdep.h
user/ngie/more-tests2/libexec/rtld-elf/paths.h
user/ngie/more-tests2/libexec/rtld-elf/powerpc/rtld_machdep.h
user/ngie/more-tests2/libexec/rtld-elf/powerpc64/reloc.c
user/ngie/more-tests2/libexec/rtld-elf/powerpc64/rtld_machdep.h
user/ngie/more-tests2/libexec/rtld-elf/powerpc64/rtld_start.S
user/ngie/more-tests2/libexec/rtld-elf/rtld.c
user/ngie/more-tests2/libexec/rtld-elf/sparc64/rtld_machdep.h
user/ngie/more-tests2/release/Makefile
user/ngie/more-tests2/release/Makefile.ec2
user/ngie/more-tests2/release/amd64/make-memstick.sh
user/ngie/more-tests2/release/amd64/mkisoimages.sh
user/ngie/more-tests2/release/arm64/make-memstick.sh
user/ngie/more-tests2/release/doc/en_US.ISO8859-1/hardware/article.xml
user/ngie/more-tests2/release/i386/make-memstick.sh
user/ngie/more-tests2/release/i386/mkisoimages.sh
user/ngie/more-tests2/release/pc98/mkisoimages.sh
user/ngie/more-tests2/release/powerpc/make-memstick.sh
user/ngie/more-tests2/release/powerpc/mkisoimages.sh
user/ngie/more-tests2/release/release.sh
user/ngie/more-tests2/release/scripts/make-manifest.sh
user/ngie/more-tests2/release/sparc64/mkisoimages.sh
user/ngie/more-tests2/sbin/geom/class/eli/Makefile
user/ngie/more-tests2/share/man/man4/Makefile
user/ngie/more-tests2/share/man/man4/ioat.4
user/ngie/more-tests2/share/man/man4/ismt.4
user/ngie/more-tests2/share/man/man4/nvme.4
user/ngie/more-tests2/share/man/man4/splash.4
user/ngie/more-tests2/share/man/man4/uart.4
user/ngie/more-tests2/share/man/man5/src.conf.5
user/ngie/more-tests2/share/man/man7/ascii.7
user/ngie/more-tests2/share/man/man9/DEVICE_PROBE.9
user/ngie/more-tests2/share/man/man9/Makefile
user/ngie/more-tests2/share/man/man9/kern_testfrwk.9
user/ngie/more-tests2/share/man/man9/make_dev.9
user/ngie/more-tests2/share/man/man9/malloc.9
user/ngie/more-tests2/share/man/man9/timeout.9
user/ngie/more-tests2/share/misc/ascii (contents, props changed)
user/ngie/more-tests2/share/misc/committers-src.dot
user/ngie/more-tests2/share/mk/bsd.compiler.mk
user/ngie/more-tests2/share/mk/src.opts.mk
user/ngie/more-tests2/share/vt/keymaps/gr.101.acc.kbd
user/ngie/more-tests2/share/vt/keymaps/gr.elot.acc.kbd
user/ngie/more-tests2/share/vt/keymaps/hu.101.kbd
user/ngie/more-tests2/share/vt/keymaps/hu.102.kbd
user/ngie/more-tests2/share/vt/keymaps/lt.kbd
user/ngie/more-tests2/share/vt/keymaps/pt.acc.kbd
user/ngie/more-tests2/share/vt/keymaps/pt.kbd
user/ngie/more-tests2/share/vt/keymaps/ua.kbd
user/ngie/more-tests2/share/vt/keymaps/ua.shift.alt.kbd
user/ngie/more-tests2/sys/amd64/amd64/elf_machdep.c
user/ngie/more-tests2/sys/amd64/amd64/machdep.c
user/ngie/more-tests2/sys/amd64/amd64/trap.c
user/ngie/more-tests2/sys/amd64/linux/linux_sysvec.c
user/ngie/more-tests2/sys/amd64/linux32/linux32_sysvec.c
user/ngie/more-tests2/sys/arm/arm/db_interface.c
user/ngie/more-tests2/sys/arm/arm/elf_machdep.c
user/ngie/more-tests2/sys/arm/arm/machdep.c
user/ngie/more-tests2/sys/arm/arm/physmem.c
user/ngie/more-tests2/sys/arm/arm/pmap-v6-new.c
user/ngie/more-tests2/sys/arm/xscale/ixp425/avila_machdep.c
user/ngie/more-tests2/sys/arm64/arm64/elf_machdep.c
user/ngie/more-tests2/sys/arm64/arm64/machdep.c
user/ngie/more-tests2/sys/arm64/include/ofw_machdep.h
user/ngie/more-tests2/sys/boot/arm64/libarm64/cache.c
user/ngie/more-tests2/sys/boot/common/load_elf.c
user/ngie/more-tests2/sys/boot/common/load_elf_obj.c
user/ngie/more-tests2/sys/boot/common/misc.c
user/ngie/more-tests2/sys/boot/common/module.c
user/ngie/more-tests2/sys/boot/common/part.c
user/ngie/more-tests2/sys/boot/common/self_reloc.c
user/ngie/more-tests2/sys/boot/common/ufsread.c
user/ngie/more-tests2/sys/boot/efi/boot1/Makefile
user/ngie/more-tests2/sys/boot/efi/boot1/boot1.c
user/ngie/more-tests2/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu
user/ngie/more-tests2/sys/boot/efi/boot1/fat-arm.tmpl.bz2.uu
user/ngie/more-tests2/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu
user/ngie/more-tests2/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu
user/ngie/more-tests2/sys/boot/efi/boot1/generate-fat.sh
user/ngie/more-tests2/sys/boot/efi/fdt/Makefile
user/ngie/more-tests2/sys/boot/efi/fdt/efi_fdt.c
user/ngie/more-tests2/sys/boot/efi/include/amd64/efibind.h
user/ngie/more-tests2/sys/boot/efi/include/arm64/efibind.h
user/ngie/more-tests2/sys/boot/efi/include/efi_nii.h
user/ngie/more-tests2/sys/boot/efi/include/efiapi.h
user/ngie/more-tests2/sys/boot/efi/include/eficon.h
user/ngie/more-tests2/sys/boot/efi/include/eficonsctl.h
user/ngie/more-tests2/sys/boot/efi/include/efidevp.h
user/ngie/more-tests2/sys/boot/efi/include/efierr.h
user/ngie/more-tests2/sys/boot/efi/include/efifpswa.h
user/ngie/more-tests2/sys/boot/efi/include/efigop.h
user/ngie/more-tests2/sys/boot/efi/include/efilib.h
user/ngie/more-tests2/sys/boot/efi/include/efinet.h
user/ngie/more-tests2/sys/boot/efi/include/efipciio.h
user/ngie/more-tests2/sys/boot/efi/include/efiprot.h
user/ngie/more-tests2/sys/boot/efi/include/efipxebc.h
user/ngie/more-tests2/sys/boot/efi/include/efiser.h
user/ngie/more-tests2/sys/boot/efi/include/efiuga.h
user/ngie/more-tests2/sys/boot/efi/include/i386/efibind.h
user/ngie/more-tests2/sys/boot/efi/libefi/Makefile
user/ngie/more-tests2/sys/boot/efi/libefi/efi_console.c
user/ngie/more-tests2/sys/boot/efi/libefi/efipart.c
user/ngie/more-tests2/sys/boot/efi/libefi/libefi.c
user/ngie/more-tests2/sys/boot/efi/loader/Makefile
user/ngie/more-tests2/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c
user/ngie/more-tests2/sys/boot/efi/loader/arch/amd64/framebuffer.c
user/ngie/more-tests2/sys/boot/efi/loader/arch/arm/exec.c
user/ngie/more-tests2/sys/boot/efi/loader/arch/arm64/exec.c
user/ngie/more-tests2/sys/boot/efi/loader/autoload.c
user/ngie/more-tests2/sys/boot/efi/loader/bootinfo.c
user/ngie/more-tests2/sys/boot/efi/loader/copy.c
user/ngie/more-tests2/sys/boot/efi/loader/devicename.c
user/ngie/more-tests2/sys/boot/efi/loader/loader_efi.h
user/ngie/more-tests2/sys/boot/efi/loader/main.c
user/ngie/more-tests2/sys/boot/ficl/amd64/sysdep.c
user/ngie/more-tests2/sys/boot/forth/beastie.4th
user/ngie/more-tests2/sys/boot/forth/beastie.4th.8
user/ngie/more-tests2/sys/boot/forth/loader.conf.5
user/ngie/more-tests2/sys/boot/i386/libi386/smbios.c
user/ngie/more-tests2/sys/boot/i386/loader/main.c
user/ngie/more-tests2/sys/boot/libstand32/Makefile
user/ngie/more-tests2/sys/boot/libstand32/Makefile.depend
user/ngie/more-tests2/sys/boot/powerpc/boot1.chrp/boot1.c
user/ngie/more-tests2/sys/boot/uboot/lib/copy.c
user/ngie/more-tests2/sys/boot/userboot/libstand/Makefile
user/ngie/more-tests2/sys/boot/userboot/libstand/Makefile.depend
user/ngie/more-tests2/sys/boot/userboot/test/Makefile.depend
user/ngie/more-tests2/sys/boot/userboot/userboot/main.c
user/ngie/more-tests2/sys/boot/zfs/zfs.c
user/ngie/more-tests2/sys/cam/ctl/ctl.c
user/ngie/more-tests2/sys/cam/scsi/scsi_ch.c
user/ngie/more-tests2/sys/cam/scsi/scsi_enc.c
user/ngie/more-tests2/sys/cam/scsi/scsi_pass.c
user/ngie/more-tests2/sys/cam/scsi/scsi_pt.c
user/ngie/more-tests2/sys/cam/scsi/scsi_sa.c
user/ngie/more-tests2/sys/cam/scsi/scsi_sg.c
user/ngie/more-tests2/sys/cddl/boot/zfs/lz4.c
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
user/ngie/more-tests2/sys/compat/ia32/ia32_sysvec.c
user/ngie/more-tests2/sys/compat/linux/linux_futex.c
user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/gfp.h
user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/interrupt.h
user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/kthread.h
user/ngie/more-tests2/sys/compat/linuxkpi/common/include/linux/netdevice.h
user/ngie/more-tests2/sys/compat/linuxkpi/common/src/linux_compat.c
user/ngie/more-tests2/sys/compat/svr4/svr4_sysvec.c
user/ngie/more-tests2/sys/conf/NOTES
user/ngie/more-tests2/sys/conf/files
user/ngie/more-tests2/sys/conf/files.arm64
user/ngie/more-tests2/sys/conf/kmod.mk
user/ngie/more-tests2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed)
user/ngie/more-tests2/sys/contrib/rdma/krping/krping.c
user/ngie/more-tests2/sys/dev/asmc/asmc.c
user/ngie/more-tests2/sys/dev/ath/ah_osdep.c
user/ngie/more-tests2/sys/dev/ath/ah_osdep.h
user/ngie/more-tests2/sys/dev/bwi/if_bwi.c
user/ngie/more-tests2/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
user/ngie/more-tests2/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
user/ngie/more-tests2/sys/dev/cxgb/ulp/tom/cxgb_listen.c
user/ngie/more-tests2/sys/dev/cxgbe/iw_cxgbe/cm.c
user/ngie/more-tests2/sys/dev/cxgbe/t4_main.c
user/ngie/more-tests2/sys/dev/cxgbe/tom/t4_cpl_io.c
user/ngie/more-tests2/sys/dev/cxgbe/tom/t4_listen.c
user/ngie/more-tests2/sys/dev/e1000/if_em.c
user/ngie/more-tests2/sys/dev/e1000/if_em.h
user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_net_vsc.c
user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_net_vsc.h
user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_rndis.h
user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_rndis_filter.c
user/ngie/more-tests2/sys/dev/hyperv/netvsc/hv_rndis_filter.h
user/ngie/more-tests2/sys/dev/ic/ns16550.h
user/ngie/more-tests2/sys/dev/if_ndis/if_ndis.c
user/ngie/more-tests2/sys/dev/ioat/ioat.c
user/ngie/more-tests2/sys/dev/ioat/ioat.h
user/ngie/more-tests2/sys/dev/iscsi/iscsi.c
user/ngie/more-tests2/sys/dev/iscsi/iscsi.h
user/ngie/more-tests2/sys/dev/ismt/ismt.c
user/ngie/more-tests2/sys/dev/iwi/if_iwi.c
user/ngie/more-tests2/sys/dev/iwm/if_iwm.c
user/ngie/more-tests2/sys/dev/iwm/if_iwm_mac_ctxt.c
user/ngie/more-tests2/sys/dev/iwm/if_iwmvar.h
user/ngie/more-tests2/sys/dev/iwn/if_iwn.c
user/ngie/more-tests2/sys/dev/ixgbe/if_ix.c
user/ngie/more-tests2/sys/dev/ixgbe/if_ixv.c
user/ngie/more-tests2/sys/dev/ixl/if_ixl.c
user/ngie/more-tests2/sys/dev/malo/if_malo.c
user/ngie/more-tests2/sys/dev/netmap/if_em_netmap.h
user/ngie/more-tests2/sys/dev/nvd/nvd.c
user/ngie/more-tests2/sys/dev/nvme/nvme.c
user/ngie/more-tests2/sys/dev/nvme/nvme_ctrlr.c
user/ngie/more-tests2/sys/dev/nvme/nvme_private.h
user/ngie/more-tests2/sys/dev/nvme/nvme_qpair.c
user/ngie/more-tests2/sys/dev/nvme/nvme_sysctl.c
user/ngie/more-tests2/sys/dev/ofw/ofw_bus_subr.c
user/ngie/more-tests2/sys/dev/otus/if_otus.c
user/ngie/more-tests2/sys/dev/puc/pucdata.c
user/ngie/more-tests2/sys/dev/ral/rt2560.c
user/ngie/more-tests2/sys/dev/ral/rt2661.c
user/ngie/more-tests2/sys/dev/ral/rt2860.c
user/ngie/more-tests2/sys/dev/rt/if_rt.c
user/ngie/more-tests2/sys/dev/sec/sec.c
user/ngie/more-tests2/sys/dev/sfxge/common/ef10_tlv_layout.h
user/ngie/more-tests2/sys/dev/sfxge/common/efsys.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_bootcfg.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_check.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_crc32.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_ev.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_hash.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_intr.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_mac.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_mon.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_nic.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_nvram.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_phy.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_port.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_regs_ef10.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_regs_mcdi.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_rx.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_sram.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_tx.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_vpd.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_wol.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_ev.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_filter.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_intr.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mac.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nic.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_phy.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_rx.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_sram.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_tx.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_vpd.c
user/ngie/more-tests2/sys/dev/sfxge/common/mcdi_mon.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_flash.h
user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/siena_mac.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_nic.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_nvram.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_phy.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_sram.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_vpd.c
user/ngie/more-tests2/sys/dev/ti/if_ti.c
user/ngie/more-tests2/sys/dev/tsec/if_tsec.c
user/ngie/more-tests2/sys/dev/uart/uart_bus.h
user/ngie/more-tests2/sys/dev/uart/uart_core.c
user/ngie/more-tests2/sys/dev/uart/uart_dev_ns8250.c
user/ngie/more-tests2/sys/dev/usb/controller/dwc_otg.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_rsu.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_rum.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_run.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_uath.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_upgt.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_ural.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_urtw.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwn.c
user/ngie/more-tests2/sys/dev/usb/wlan/if_urtwnreg.h
user/ngie/more-tests2/sys/dev/usb/wlan/if_zyd.c
user/ngie/more-tests2/sys/dev/vt/hw/ofwfb/ofwfb.c
user/ngie/more-tests2/sys/dev/wpi/if_wpi.c
user/ngie/more-tests2/sys/dev/xen/blkfront/blkfront.c
user/ngie/more-tests2/sys/fs/devfs/devfs_vnops.c
user/ngie/more-tests2/sys/fs/ext2fs/ext2_bmap.c
user/ngie/more-tests2/sys/fs/ext2fs/ext2_extents.c
user/ngie/more-tests2/sys/fs/ext2fs/ext2_extents.h
user/ngie/more-tests2/sys/fs/ext2fs/ext2_vfsops.c
user/ngie/more-tests2/sys/fs/ext2fs/ext2_vnops.c
user/ngie/more-tests2/sys/fs/smbfs/smbfs_smb.c
user/ngie/more-tests2/sys/fs/smbfs/smbfs_subr.h
user/ngie/more-tests2/sys/fs/smbfs/smbfs_vnops.c
user/ngie/more-tests2/sys/geom/eli/g_eli.c
user/ngie/more-tests2/sys/geom/eli/g_eli.h
user/ngie/more-tests2/sys/geom/eli/g_eli_crypto.c
user/ngie/more-tests2/sys/geom/eli/g_eli_key_cache.c
user/ngie/more-tests2/sys/geom/eli/pkcs5v2.c
user/ngie/more-tests2/sys/i386/i386/elf_machdep.c
user/ngie/more-tests2/sys/i386/i386/machdep.c
user/ngie/more-tests2/sys/i386/ibcs2/ibcs2_sysvec.c
user/ngie/more-tests2/sys/i386/include/metadata.h
user/ngie/more-tests2/sys/i386/linux/linux_sysvec.c
user/ngie/more-tests2/sys/kern/imgact_aout.c
user/ngie/more-tests2/sys/kern/init_main.c
user/ngie/more-tests2/sys/kern/kern_condvar.c
user/ngie/more-tests2/sys/kern/kern_conf.c
user/ngie/more-tests2/sys/kern/kern_environment.c
user/ngie/more-tests2/sys/kern/subr_bus_dma.c
user/ngie/more-tests2/sys/kern/tty.c
user/ngie/more-tests2/sys/kern/uipc_mbuf.c
user/ngie/more-tests2/sys/kern/uipc_sockbuf.c
user/ngie/more-tests2/sys/kern/uipc_syscalls.c
user/ngie/more-tests2/sys/kern/uipc_usrreq.c
user/ngie/more-tests2/sys/kern/vfs_cache.c
user/ngie/more-tests2/sys/kern/vfs_default.c
user/ngie/more-tests2/sys/kern/vfs_subr.c
user/ngie/more-tests2/sys/kgssapi/gss_impl.c
user/ngie/more-tests2/sys/mips/beri/beri_machdep.c
user/ngie/more-tests2/sys/mips/mips/elf_machdep.c
user/ngie/more-tests2/sys/mips/mips/freebsd32_machdep.c
user/ngie/more-tests2/sys/modules/Makefile
user/ngie/more-tests2/sys/modules/geom/geom_eli/Makefile
user/ngie/more-tests2/sys/modules/sfxge/Makefile
user/ngie/more-tests2/sys/modules/syscons/Makefile
user/ngie/more-tests2/sys/net/if_arcsubr.c
user/ngie/more-tests2/sys/net/if_ethersubr.c
user/ngie/more-tests2/sys/net/if_fddisubr.c
user/ngie/more-tests2/sys/net/if_fwsubr.c
user/ngie/more-tests2/sys/net/if_iso88025subr.c
user/ngie/more-tests2/sys/net/if_loop.c
user/ngie/more-tests2/sys/net/radix_mpath.c
user/ngie/more-tests2/sys/net/radix_mpath.h
user/ngie/more-tests2/sys/net/route.c
user/ngie/more-tests2/sys/net/route.h
user/ngie/more-tests2/sys/net/rtsock.c
user/ngie/more-tests2/sys/net80211/ieee80211_freebsd.c
user/ngie/more-tests2/sys/net80211/ieee80211_freebsd.h
user/ngie/more-tests2/sys/net80211/ieee80211_scan_sw.c
user/ngie/more-tests2/sys/net80211/ieee80211_var.h
user/ngie/more-tests2/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
user/ngie/more-tests2/sys/netgraph/netflow/netflow.c
user/ngie/more-tests2/sys/netgraph/netflow/netflow_v9.c
user/ngie/more-tests2/sys/netgraph/netflow/ng_netflow.c
user/ngie/more-tests2/sys/netinet/if_ether.c
user/ngie/more-tests2/sys/netinet/in.c
user/ngie/more-tests2/sys/netinet/in_fib.c
user/ngie/more-tests2/sys/netinet/in_pcb.c
user/ngie/more-tests2/sys/netinet/ip_encap.c
user/ngie/more-tests2/sys/netinet/ip_mroute.c
user/ngie/more-tests2/sys/netinet/ip_output.c
user/ngie/more-tests2/sys/netinet/raw_ip.c
user/ngie/more-tests2/sys/netinet/sctp_structs.h
user/ngie/more-tests2/sys/netinet/tcp_input.c
user/ngie/more-tests2/sys/netinet/tcp_output.c
user/ngie/more-tests2/sys/netinet/tcp_reass.c
user/ngie/more-tests2/sys/netinet/tcp_stacks/fastpath.c
user/ngie/more-tests2/sys/netinet/tcp_subr.c
user/ngie/more-tests2/sys/netinet/tcp_timer.c
user/ngie/more-tests2/sys/netinet/tcp_usrreq.c
user/ngie/more-tests2/sys/netinet/tcp_var.h
user/ngie/more-tests2/sys/netinet/toecore.c
user/ngie/more-tests2/sys/netinet6/frag6.c
user/ngie/more-tests2/sys/netinet6/icmp6.c
user/ngie/more-tests2/sys/netinet6/in6.h
user/ngie/more-tests2/sys/netinet6/in6_fib.c
user/ngie/more-tests2/sys/netinet6/in6_pcb.c
user/ngie/more-tests2/sys/netinet6/in6_rmx.c
user/ngie/more-tests2/sys/netinet6/in6_src.c
user/ngie/more-tests2/sys/netinet6/ip6_output.c
user/ngie/more-tests2/sys/netinet6/ip6_var.h
user/ngie/more-tests2/sys/netinet6/nd6.c
user/ngie/more-tests2/sys/netinet6/nd6_nbr.c
user/ngie/more-tests2/sys/netinet6/raw_ip6.c
user/ngie/more-tests2/sys/netinet6/udp6_usrreq.c
user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw_table.c
user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw_table_algo.c
user/ngie/more-tests2/sys/netpfil/pf/pf.c
user/ngie/more-tests2/sys/netpfil/pf/pf_if.c
user/ngie/more-tests2/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
user/ngie/more-tests2/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c
user/ngie/more-tests2/sys/powerpc/aim/aim_machdep.c
user/ngie/more-tests2/sys/powerpc/aim/locore32.S
user/ngie/more-tests2/sys/powerpc/aim/locore64.S
user/ngie/more-tests2/sys/powerpc/aim/mp_cpudep.c
user/ngie/more-tests2/sys/powerpc/aim/trap_subr64.S
user/ngie/more-tests2/sys/powerpc/booke/booke_machdep.c
user/ngie/more-tests2/sys/powerpc/booke/locore.S
user/ngie/more-tests2/sys/powerpc/include/cpu.h
user/ngie/more-tests2/sys/powerpc/include/intr_machdep.h
user/ngie/more-tests2/sys/powerpc/include/pcb.h
user/ngie/more-tests2/sys/powerpc/include/platform.h
user/ngie/more-tests2/sys/powerpc/include/setjmp.h
user/ngie/more-tests2/sys/powerpc/mpc85xx/lbc.c
user/ngie/more-tests2/sys/powerpc/mpc85xx/mpc85xx.h
user/ngie/more-tests2/sys/powerpc/mpc85xx/pci_mpc85xx.c
user/ngie/more-tests2/sys/powerpc/mpc85xx/platform_mpc85xx.c
user/ngie/more-tests2/sys/powerpc/ofw/rtas.c
user/ngie/more-tests2/sys/powerpc/powermac/grackle.c
user/ngie/more-tests2/sys/powerpc/powerpc/copyinout.c
user/ngie/more-tests2/sys/powerpc/powerpc/cpu.c
user/ngie/more-tests2/sys/powerpc/powerpc/elf32_machdep.c
user/ngie/more-tests2/sys/powerpc/powerpc/elf64_machdep.c
user/ngie/more-tests2/sys/powerpc/powerpc/intr_machdep.c
user/ngie/more-tests2/sys/powerpc/powerpc/machdep.c
user/ngie/more-tests2/sys/powerpc/powerpc/mp_machdep.c
user/ngie/more-tests2/sys/powerpc/powerpc/platform.c
user/ngie/more-tests2/sys/powerpc/powerpc/platform_if.m
user/ngie/more-tests2/sys/powerpc/powerpc/setjmp.S
user/ngie/more-tests2/sys/powerpc/powerpc/trap.c
user/ngie/more-tests2/sys/sparc64/include/ofw_machdep.h
user/ngie/more-tests2/sys/sparc64/sparc64/elf_machdep.c
user/ngie/more-tests2/sys/sparc64/sparc64/machdep.c
user/ngie/more-tests2/sys/sys/conf.h
user/ngie/more-tests2/sys/sys/mbuf.h
user/ngie/more-tests2/sys/sys/nv.h
user/ngie/more-tests2/sys/sys/sf_buf.h
user/ngie/more-tests2/sys/sys/sockbuf.h
user/ngie/more-tests2/sys/sys/socket.h
user/ngie/more-tests2/sys/sys/sysent.h
user/ngie/more-tests2/sys/vm/vm_domain.c
user/ngie/more-tests2/sys/x86/xen/pv.c
user/ngie/more-tests2/targets/pseudo/userland/lib/Makefile.depend
user/ngie/more-tests2/tools/build/mk/OptionalObsoleteFiles.inc
user/ngie/more-tests2/tools/tools/nanobsd/defaults.sh
user/ngie/more-tests2/tools/tools/nanobsd/embedded/common
user/ngie/more-tests2/usr.bin/cap_mkdb/cap_mkdb.c
user/ngie/more-tests2/usr.bin/kdump/Makefile.depend
user/ngie/more-tests2/usr.bin/less/defines.h
user/ngie/more-tests2/usr.bin/netstat/mbuf.c
user/ngie/more-tests2/usr.bin/nfsstat/Makefile.depend
user/ngie/more-tests2/usr.bin/truss/Makefile.depend.amd64
user/ngie/more-tests2/usr.sbin/bhyve/pci_virtio_net.c
user/ngie/more-tests2/usr.sbin/bhyvectl/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/share/dialog.subr
user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/auto
user/ngie/more-tests2/usr.sbin/cron/crontab/crontab.5
user/ngie/more-tests2/usr.sbin/gssd/gssd.c
user/ngie/more-tests2/usr.sbin/jls/Makefile.depend
user/ngie/more-tests2/usr.sbin/kbdcontrol/kbdmap.5
user/ngie/more-tests2/usr.sbin/mountd/exports.5
user/ngie/more-tests2/usr.sbin/mountd/mountd.c
user/ngie/more-tests2/usr.sbin/ntp/config.h
user/ngie/more-tests2/usr.sbin/ntp/doc/ntp-keygen.8
user/ngie/more-tests2/usr.sbin/ntp/doc/ntp.conf.5
user/ngie/more-tests2/usr.sbin/ntp/doc/ntp.keys.5
user/ngie/more-tests2/usr.sbin/ntp/doc/ntpd.8
user/ngie/more-tests2/usr.sbin/ntp/doc/ntpdc.8
user/ngie/more-tests2/usr.sbin/ntp/doc/ntpq.8
user/ngie/more-tests2/usr.sbin/ntp/doc/sntp.8
user/ngie/more-tests2/usr.sbin/ntp/scripts/mkver
user/ngie/more-tests2/usr.sbin/rpcbind/Makefile
user/ngie/more-tests2/usr.sbin/rpcbind/check_bound.c
user/ngie/more-tests2/usr.sbin/rpcbind/rpcbind.h
user/ngie/more-tests2/usr.sbin/rpcbind/util.c
user/ngie/more-tests2/usr.sbin/services_mkdb/services_mkdb.c
user/ngie/more-tests2/usr.sbin/sesutil/Makefile.depend
user/ngie/more-tests2/usr.sbin/ypldap/yp.c
user/ngie/more-tests2/usr.sbin/ypldap/ypldap.conf.5
Directory Properties:
user/ngie/more-tests2/ (props changed)
user/ngie/more-tests2/contrib/less/ (props changed)
user/ngie/more-tests2/contrib/llvm/ (props changed)
user/ngie/more-tests2/contrib/llvm/projects/libunwind/ (props changed)
user/ngie/more-tests2/contrib/ntp/ (props changed)
user/ngie/more-tests2/contrib/pf/ (props changed)
user/ngie/more-tests2/gnu/lib/ (props changed)
user/ngie/more-tests2/gnu/usr.bin/binutils/ (props changed)
user/ngie/more-tests2/include/ (props changed)
user/ngie/more-tests2/lib/libc/ (props changed)
user/ngie/more-tests2/sbin/ (props changed)
user/ngie/more-tests2/share/ (props changed)
user/ngie/more-tests2/share/man/man4/ (props changed)
user/ngie/more-tests2/sys/ (props changed)
user/ngie/more-tests2/sys/boot/ (props changed)
user/ngie/more-tests2/sys/boot/powerpc/boot1.chrp/ (props changed)
user/ngie/more-tests2/sys/cddl/contrib/opensolaris/ (props changed)
user/ngie/more-tests2/sys/conf/ (props changed)
user/ngie/more-tests2/sys/contrib/ipfilter/ (props changed)
user/ngie/more-tests2/sys/dev/hyperv/ (props changed)
user/ngie/more-tests2/targets/ (props changed)
user/ngie/more-tests2/usr.sbin/bhyve/ (props changed)
user/ngie/more-tests2/usr.sbin/bhyvectl/ (props changed)
Modified: user/ngie/more-tests2/Makefile
==============================================================================
--- user/ngie/more-tests2/Makefile Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/Makefile Wed Jan 13 07:44:58 2016 (r293816)
@@ -205,7 +205,7 @@ _TARGET_ARCH?= ${MACHINE_ARCH}
# The user can define ALWAYS_CHECK_MAKE to have this check performed
# for all targets.
#
-.if defined(ALWAYS_CHECK_MAKE)
+.if defined(ALWAYS_CHECK_MAKE) || !defined(.PARSEDIR)
${TGTS}: upgrade_checks
.else
buildworld: upgrade_checks
Modified: user/ngie/more-tests2/Makefile.inc1
==============================================================================
--- user/ngie/more-tests2/Makefile.inc1 Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/Makefile.inc1 Wed Jan 13 07:44:58 2016 (r293816)
@@ -569,10 +569,9 @@ _worldtmp: .PHONY
.endif
.else
rm -rf ${WORLDTMP}/legacy/usr/include
-# XXX - These three can depend on any header file.
- rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
+# XXX - These can depend on any header file.
+ rm -f ${OBJTREE}${.CURDIR}/lib/libsysdecode/ioctl.c
rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
- rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
.endif
.for _dir in \
lib usr legacy/bin legacy/usr
@@ -1230,7 +1229,7 @@ reinstallkernel reinstallkernel.debug: _
${CROSSENV} PATH=${TMPPATH} \
${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
.endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
@echo "--------------------------------------------------------------"
@echo ">>> Installing kernel ${_kernel}"
@@ -1261,7 +1260,7 @@ distributekernel distributekernel.debug:
${DESTDIR}/${DISTDIR}/kernel.meta
.endif
.endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
.if defined(NO_ROOT)
echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
@@ -1284,27 +1283,43 @@ packagekernel:
.if defined(NO_ROOT)
.if !defined(NO_INSTALLKERNEL)
cd ${DESTDIR}/${DISTDIR}/kernel; \
- tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
+ tar cvf - --exclude '*.debug' \
+ @${DESTDIR}/${DISTDIR}/kernel.meta | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
.endif
-.if ${BUILDKERNELS:[#]} > 1
+ cd ${DESTDIR}/${DISTDIR}/kernel; \
+ tar cvf - --include '*/*/*.debug' \
+ @${DESTDIR}/${DISTDIR}/kernel.meta | \
+ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
- tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
+ tar cvf - --exclude '*.debug' \
+ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
+ cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ tar cvf - --include '*/*/*.debug' \
+ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
+ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
.endfor
.endif
.else
.if !defined(NO_INSTALLKERNEL)
cd ${DESTDIR}/${DISTDIR}/kernel; \
- tar cvf - . | \
+ tar cvf - --exclude '*.debug' . | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
.endif
-.if ${BUILDKERNELS:[#]} > 1
+ cd ${DESTDIR}/${DISTDIR}/kernel; \
+ tar cvf - --include '*/*/*.debug' $$(eval find .) | \
+ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
.for _kernel in ${BUILDKERNELS:[2..-1]}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
- tar cvf - . | \
+ tar cvf - --exclude '*.debug' . | \
${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
+ cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ tar cvf - --include '*/*/*.debug' $$(eval find .) | \
+ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
.endfor
.endif
.endif
@@ -1409,11 +1424,13 @@ _vtfontcvt= usr.bin/vtfontcvt
_sed= usr.bin/sed
.endif
-.if ${BOOTSTRAPPING} < 1000002
+.if ${BOOTSTRAPPING} < 1000033
_libopenbsd= lib/libopenbsd
_m4= usr.bin/m4
+_lex= usr.bin/lex
${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd
+${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
.endif
.if ${BOOTSTRAPPING} < 1000026
@@ -1427,12 +1444,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libne
_cat= bin/cat
.endif
-.if ${BOOTSTRAPPING} < 1000033
-_lex= usr.bin/lex
-
-${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
-.endif
-
# r277259 crunchide: Correct 64-bit section header offset
# r281674 crunchide: always include both 32- and 64-bit ELF support
# r285986 crunchen: use STRIPBIN rather than STRIP
Modified: user/ngie/more-tests2/UPDATING
==============================================================================
--- user/ngie/more-tests2/UPDATING Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/UPDATING Wed Jan 13 07:44:58 2016 (r293816)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+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
+ prior to installworld, as documented in the handbook.
+
20151216:
The tftp loader (pxeboot) now uses the option root-path directive. As a
consequence it no longer looks for a pxeboot.4th file on the tftp
Modified: user/ngie/more-tests2/bin/sh/eval.c
==============================================================================
--- user/ngie/more-tests2/bin/sh/eval.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/eval.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -496,10 +496,12 @@ exphere(union node *redir, struct arglis
struct jmploc *savehandler;
struct localvar *savelocalvars;
int need_longjmp = 0;
+ unsigned char saveoptreset;
redir->nhere.expdoc = "";
savelocalvars = localvars;
localvars = NULL;
+ saveoptreset = shellparam.reset;
forcelocal++;
savehandler = handler;
if (setjmp(jmploc.loc))
@@ -514,6 +516,7 @@ exphere(union node *redir, struct arglis
forcelocal--;
poplocalvars();
localvars = savelocalvars;
+ shellparam.reset = saveoptreset;
if (need_longjmp)
longjmp(handler->loc, 1);
INTON;
@@ -647,6 +650,7 @@ evalbackcmd(union node *n, struct backcm
struct jmploc jmploc;
struct jmploc *savehandler;
struct localvar *savelocalvars;
+ unsigned char saveoptreset;
result->fd = -1;
result->buf = NULL;
@@ -661,6 +665,7 @@ evalbackcmd(union node *n, struct backcm
if (is_valid_fast_cmdsubst(n)) {
savelocalvars = localvars;
localvars = NULL;
+ saveoptreset = shellparam.reset;
forcelocal++;
savehandler = handler;
if (setjmp(jmploc.loc)) {
@@ -671,6 +676,7 @@ evalbackcmd(union node *n, struct backcm
forcelocal--;
poplocalvars();
localvars = savelocalvars;
+ shellparam.reset = saveoptreset;
longjmp(handler->loc, 1);
}
} else {
@@ -681,6 +687,7 @@ evalbackcmd(union node *n, struct backcm
forcelocal--;
poplocalvars();
localvars = savelocalvars;
+ shellparam.reset = saveoptreset;
} else {
if (pipe(pip) < 0)
error("Pipe call failed: %s", strerror(errno));
@@ -1032,12 +1039,12 @@ evalcommand(union node *cmd, int flags,
reffunc(cmdentry.u.func);
savehandler = handler;
if (setjmp(jmploc.loc)) {
- freeparam(&shellparam);
- shellparam = saveparam;
popredir();
unreffunc(cmdentry.u.func);
poplocalvars();
localvars = savelocalvars;
+ freeparam(&shellparam);
+ shellparam = saveparam;
funcnest--;
handler = savehandler;
longjmp(handler->loc, 1);
Modified: user/ngie/more-tests2/bin/sh/exec.c
==============================================================================
--- user/ngie/more-tests2/bin/sh/exec.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/exec.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -439,12 +439,14 @@ success:
int
find_builtin(const char *name, int *special)
{
- const struct builtincmd *bp;
+ const unsigned char *bp;
+ size_t len;
- for (bp = builtincmd ; bp->name ; bp++) {
- if (*bp->name == *name && equal(bp->name, name)) {
- *special = bp->special;
- return bp->code;
+ len = strlen(name);
+ for (bp = builtincmd ; *bp ; bp += 2 + bp[0]) {
+ if (bp[0] == len && memcmp(bp + 2, name, len) == 0) {
+ *special = (bp[1] & BUILTIN_SPECIAL) != 0;
+ return bp[1] & ~BUILTIN_SPECIAL;
}
}
return -1;
Modified: user/ngie/more-tests2/bin/sh/expand.c
==============================================================================
--- user/ngie/more-tests2/bin/sh/expand.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/expand.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -951,8 +951,8 @@ varvalue(const char *name, int quoted, i
case '-':
p = buf;
for (i = 0 ; i < NSHORTOPTS ; i++) {
- if (optlist[i].val)
- *p++ = optlist[i].letter;
+ if (optval[i])
+ *p++ = optletter[i];
}
*p = '\0';
strtodest(buf, flag, subtype, quoted, dst);
Modified: user/ngie/more-tests2/bin/sh/mkbuiltins
==============================================================================
--- user/ngie/more-tests2/bin/sh/mkbuiltins Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/mkbuiltins Wed Jan 13 07:44:58 2016 (r293816)
@@ -62,17 +62,16 @@ echo 'int (*const builtinfunc[])(int, ch
awk '/^[^#]/ { printf "\t%s,\n", $1}' $temp
echo '};
-const struct builtincmd builtincmd[] = {'
+const unsigned char builtincmd[] = {'
awk '{ for (i = 2 ; i <= NF ; i++) {
if ($i == "-s") {
spc = 1;
} else {
- printf "\t{ \"%s\", %d, %d },\n", $i, NR-1, spc
+ printf "\t\"\\%03o\\%03o%s\"\n", length($i), (spc ? 128 : 0) + NR-1, $i
spc = 0;
}
}}' $temp
-echo ' { NULL, 0, 0 }
-};'
+echo '};'
exec > builtins.h
cat <<\!
@@ -85,14 +84,10 @@ cat <<\!
tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ < $temp |
awk '{ printf "#define %s %d\n", $1, NR-1}'
echo '
-struct builtincmd {
- const char *name;
- int code;
- int special;
-};
+#define BUILTIN_SPECIAL 0x80
extern int (*const builtinfunc[])(int, char **);
-extern const struct builtincmd builtincmd[];
+extern const unsigned char builtincmd[];
'
awk '{ printf "int %s(int, char **);\n", $1}' $temp
rm -f $temp
Modified: user/ngie/more-tests2/bin/sh/options.c
==============================================================================
--- user/ngie/more-tests2/bin/sh/options.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/options.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -91,7 +91,7 @@ procargs(int argc, char **argv)
if (argc > 0)
argptr++;
for (i = 0; i < NOPTS; i++)
- optlist[i].val = 2;
+ optval[i] = 2;
privileged = (getuid() != geteuid() || getgid() != getegid());
options(1);
if (*argptr == NULL && minusc == NULL)
@@ -104,8 +104,8 @@ procargs(int argc, char **argv)
if (mflag == 2)
mflag = iflag;
for (i = 0; i < NOPTS; i++)
- if (optlist[i].val == 2)
- optlist[i].val = 0;
+ if (optval[i] == 2)
+ optval[i] = 0;
arg0 = argv[0];
if (sflag == 0 && minusc == NULL) {
scriptname = *argptr++;
@@ -250,26 +250,29 @@ static void
minus_o(char *name, int val)
{
int i;
+ const unsigned char *on;
+ size_t len;
if (name == NULL) {
if (val) {
/* "Pretty" output. */
out1str("Current option settings\n");
- for (i = 0; i < NOPTS; i++)
- out1fmt("%-16s%s\n", optlist[i].name,
- optlist[i].val ? "on" : "off");
+ for (i = 0, on = optname; i < NOPTS; i++, on += *on + 1)
+ out1fmt("%-16.*s%s\n", *on, on + 1,
+ optval[i] ? "on" : "off");
} else {
/* Output suitable for re-input to shell. */
- for (i = 0; i < NOPTS; i++)
- out1fmt("%s %co %s%s",
+ for (i = 0, on = optname; i < NOPTS; i++, on += *on + 1)
+ out1fmt("%s %co %.*s%s",
i % 6 == 0 ? "set" : "",
- optlist[i].val ? '-' : '+',
- optlist[i].name,
+ optval[i] ? '-' : '+',
+ *on, on + 1,
i % 6 == 5 || i == NOPTS - 1 ? "\n" : "");
}
} else {
- for (i = 0; i < NOPTS; i++)
- if (equal(name, optlist[i].name)) {
+ len = strlen(name);
+ for (i = 0, on = optname; i < NOPTS; i++, on += *on + 1)
+ if (*on == len && memcmp(on + 1, name, len) == 0) {
setoptionbyindex(i, val);
return;
}
@@ -281,18 +284,18 @@ minus_o(char *name, int val)
static void
setoptionbyindex(int idx, int val)
{
- if (optlist[idx].letter == 'p' && !val && privileged) {
+ if (optletter[idx] == 'p' && !val && privileged) {
if (setgid(getgid()) == -1)
error("setgid");
if (setuid(getuid()) == -1)
error("setuid");
}
- optlist[idx].val = val;
+ optval[idx] = val;
if (val) {
/* #%$ hack for ksh semantics */
- if (optlist[idx].letter == 'V')
+ if (optletter[idx] == 'V')
Eflag = 0;
- else if (optlist[idx].letter == 'E')
+ else if (optletter[idx] == 'E')
Vflag = 0;
}
}
@@ -303,7 +306,7 @@ setoption(int flag, int val)
int i;
for (i = 0; i < NSHORTOPTS; i++)
- if (optlist[i].letter == flag) {
+ if (optletter[i] == flag) {
setoptionbyindex(i, val);
return;
}
Modified: user/ngie/more-tests2/bin/sh/options.h
==============================================================================
--- user/ngie/more-tests2/bin/sh/options.h Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/options.h Wed Jan 13 07:44:58 2016 (r293816)
@@ -45,60 +45,57 @@ struct shparam {
-#define eflag optlist[0].val
-#define fflag optlist[1].val
-#define Iflag optlist[2].val
-#define iflag optlist[3].val
-#define mflag optlist[4].val
-#define nflag optlist[5].val
-#define sflag optlist[6].val
-#define xflag optlist[7].val
-#define vflag optlist[8].val
-#define Vflag optlist[9].val
-#define Eflag optlist[10].val
-#define Cflag optlist[11].val
-#define aflag optlist[12].val
-#define bflag optlist[13].val
-#define uflag optlist[14].val
-#define privileged optlist[15].val
-#define Tflag optlist[16].val
-#define Pflag optlist[17].val
-#define hflag optlist[18].val
-#define nologflag optlist[19].val
+#define eflag optval[0]
+#define fflag optval[1]
+#define Iflag optval[2]
+#define iflag optval[3]
+#define mflag optval[4]
+#define nflag optval[5]
+#define sflag optval[6]
+#define xflag optval[7]
+#define vflag optval[8]
+#define Vflag optval[9]
+#define Eflag optval[10]
+#define Cflag optval[11]
+#define aflag optval[12]
+#define bflag optval[13]
+#define uflag optval[14]
+#define privileged optval[15]
+#define Tflag optval[16]
+#define Pflag optval[17]
+#define hflag optval[18]
+#define nologflag optval[19]
#define NSHORTOPTS 19
#define NOPTS 20
-struct optent {
- const char *name;
- const char letter;
- char val;
-};
-
-extern struct optent optlist[NOPTS];
+extern char optval[NOPTS];
+extern const char optletter[NSHORTOPTS];
#ifdef DEFINE_OPTIONS
-struct optent optlist[NOPTS] = {
- { "errexit", 'e', 0 },
- { "noglob", 'f', 0 },
- { "ignoreeof", 'I', 0 },
- { "interactive",'i', 0 },
- { "monitor", 'm', 0 },
- { "noexec", 'n', 0 },
- { "stdin", 's', 0 },
- { "xtrace", 'x', 0 },
- { "verbose", 'v', 0 },
- { "vi", 'V', 0 },
- { "emacs", 'E', 0 },
- { "noclobber", 'C', 0 },
- { "allexport", 'a', 0 },
- { "notify", 'b', 0 },
- { "nounset", 'u', 0 },
- { "privileged", 'p', 0 },
- { "trapsasync", 'T', 0 },
- { "physical", 'P', 0 },
- { "trackall", 'h', 0 },
- { "nolog", '\0', 0 },
-};
+char optval[NOPTS];
+const char optletter[NSHORTOPTS] = "efIimnsxvVECabupTPh";
+static const unsigned char optname[] =
+ "\007errexit"
+ "\006noglob"
+ "\011ignoreeof"
+ "\013interactive"
+ "\007monitor"
+ "\006noexec"
+ "\005stdin"
+ "\006xtrace"
+ "\007verbose"
+ "\002vi"
+ "\005emacs"
+ "\011noclobber"
+ "\011allexport"
+ "\006notify"
+ "\007nounset"
+ "\012privileged"
+ "\012trapsasync"
+ "\010physical"
+ "\010trackall"
+ "\005nolog"
+;
#endif
Modified: user/ngie/more-tests2/bin/sh/tests/builtins/Makefile
==============================================================================
--- user/ngie/more-tests2/bin/sh/tests/builtins/Makefile Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/tests/builtins/Makefile Wed Jan 13 07:44:58 2016 (r293816)
@@ -48,6 +48,7 @@ FILES+= cd5.0
FILES+= cd6.0
FILES+= cd7.0
FILES+= cd8.0
+FILES+= cd9.0 cd9.0.stdout
FILES+= command1.0
FILES+= command2.0
FILES+= command3.0
@@ -94,6 +95,8 @@ FILES+= getopts5.0
FILES+= getopts6.0
FILES+= getopts7.0
FILES+= getopts8.0 getopts8.0.stdout
+FILES+= getopts9.0 getopts9.0.stdout
+FILES+= getopts10.0
FILES+= hash1.0 hash1.0.stdout
FILES+= hash2.0 hash2.0.stdout
FILES+= hash3.0 hash3.0.stdout
@@ -108,6 +111,7 @@ FILES+= local1.0
FILES+= local2.0
FILES+= local3.0
FILES+= local4.0
+FILES+= local5.0
.if ${MK_NLS} != "no"
FILES+= locale1.0
.endif
Copied: user/ngie/more-tests2/bin/sh/tests/builtins/cd9.0 (from r293815, head/bin/sh/tests/builtins/cd9.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/bin/sh/tests/builtins/cd9.0 Wed Jan 13 07:44:58 2016 (r293816, copy of r293815, head/bin/sh/tests/builtins/cd9.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+cd /dev
+cd /bin
+cd - >/dev/null
+pwd
+cd - >/dev/null
+pwd
Copied: user/ngie/more-tests2/bin/sh/tests/builtins/cd9.0.stdout (from r293815, head/bin/sh/tests/builtins/cd9.0.stdout)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/bin/sh/tests/builtins/cd9.0.stdout Wed Jan 13 07:44:58 2016 (r293816, copy of r293815, head/bin/sh/tests/builtins/cd9.0.stdout)
@@ -0,0 +1,2 @@
+/dev
+/bin
Copied: user/ngie/more-tests2/bin/sh/tests/builtins/getopts10.0 (from r293815, head/bin/sh/tests/builtins/getopts10.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/bin/sh/tests/builtins/getopts10.0 Wed Jan 13 07:44:58 2016 (r293816, copy of r293815, head/bin/sh/tests/builtins/getopts10.0)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+set -- -x arg
+opt=not
+getopts x opt
+r1=$? OPTIND1=$OPTIND opt1=$opt
+: $(: $((OPTIND = 1)))
+getopts x opt
+r2=$? OPTIND2=$OPTIND
+[ "$r1" = 0 ] && [ "$OPTIND1" = 2 ] && [ "$opt1" = x ] && [ "$r2" != 0 ] &&
+ [ "$OPTIND2" = 2 ]
Copied: user/ngie/more-tests2/bin/sh/tests/builtins/local5.0 (from r293815, head/bin/sh/tests/builtins/local5.0)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/ngie/more-tests2/bin/sh/tests/builtins/local5.0 Wed Jan 13 07:44:58 2016 (r293816, copy of r293815, head/bin/sh/tests/builtins/local5.0)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+f() {
+ local PATH IFS elem
+ IFS=:
+ for elem in ''$PATH''; do
+ PATH=/var/empty/$elem:$PATH
+ done
+ ls -d / >/dev/null
+}
+
+p1=$(command -v ls)
+f
+p2=$(command -v ls)
+[ "$p1" = "$p2" ]
Modified: user/ngie/more-tests2/bin/sh/var.c
==============================================================================
--- user/ngie/more-tests2/bin/sh/var.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/bin/sh/var.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -754,8 +754,8 @@ mklocal(char *name)
INTOFF;
lvp = ckmalloc(sizeof (struct localvar));
if (name[0] == '-' && name[1] == '\0') {
- lvp->text = ckmalloc(sizeof optlist);
- memcpy(lvp->text, optlist, sizeof optlist);
+ lvp->text = ckmalloc(sizeof optval);
+ memcpy(lvp->text, optval, sizeof optval);
vp = NULL;
} else {
vp = find_var(name, &vpp, NULL);
@@ -791,22 +791,33 @@ poplocalvars(void)
{
struct localvar *lvp;
struct var *vp;
+ int islocalevar;
INTOFF;
while ((lvp = localvars) != NULL) {
localvars = lvp->next;
vp = lvp->vp;
if (vp == NULL) { /* $- saved */
- memcpy(optlist, lvp->text, sizeof optlist);
+ memcpy(optval, lvp->text, sizeof optval);
ckfree(lvp->text);
optschanged();
} else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
(void)unsetvar(vp->text);
} else {
+ islocalevar = (vp->flags | lvp->flags) & VEXPORT &&
+ localevar(lvp->text);
if ((vp->flags & VTEXTFIXED) == 0)
ckfree(vp->text);
vp->flags = lvp->flags;
vp->text = lvp->text;
+ if (vp->func)
+ (*vp->func)(vp->text + vp->name_len + 1);
+ if (islocalevar) {
+ change_env(vp->text, vp->flags & VEXPORT &&
+ (vp->flags & VUNSET) == 0);
+ setlocale(LC_ALL, "");
+ updatecharset();
+ }
}
ckfree(lvp);
}
Modified: user/ngie/more-tests2/contrib/hyperv/tools/hv_kvp_daemon.c
==============================================================================
--- user/ngie/more-tests2/contrib/hyperv/tools/hv_kvp_daemon.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/contrib/hyperv/tools/hv_kvp_daemon.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -1437,7 +1437,7 @@ main(int argc, char *argv[])
for (;;) {
- r = poll (hv_kvp_poll_fd, 1, 100);
+ r = poll (hv_kvp_poll_fd, 1, INFTIM);
KVP_LOG(LOG_DEBUG, "poll returned r = %d, revent = 0x%x\n",
r, hv_kvp_poll_fd[0].revents);
Modified: user/ngie/more-tests2/contrib/less/LICENSE
==============================================================================
--- user/ngie/more-tests2/contrib/less/LICENSE Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/contrib/less/LICENSE Wed Jan 13 07:44:58 2016 (r293816)
@@ -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/more-tests2/contrib/less/NEWS
==============================================================================
--- user/ngie/more-tests2/contrib/less/NEWS Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/contrib/less/NEWS Wed Jan 13 07:44:58 2016 (r293816)
@@ -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/more-tests2/contrib/less/README
==============================================================================
--- user/ngie/more-tests2/contrib/less/README Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/contrib/less/README Wed Jan 13 07:44:58 2016 (r293816)
@@ -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/more-tests2/contrib/less/brac.c
==============================================================================
--- user/ngie/more-tests2/contrib/less/brac.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/contrib/less/brac.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -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/more-tests2/contrib/less/ch.c
==============================================================================
--- user/ngie/more-tests2/contrib/less/ch.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/contrib/less/ch.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -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/more-tests2/contrib/less/charset.c
==============================================================================
--- user/ngie/more-tests2/contrib/less/charset.c Wed Jan 13 07:31:59 2016 (r293815)
+++ user/ngie/more-tests2/contrib/less/charset.c Wed Jan 13 07:44:58 2016 (r293816)
@@ -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)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Wed Jan 13 09:19:15 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 27A6AA8081C
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 13 Jan 2016 09:19:15 +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 D362112BF;
Wed, 13 Jan 2016 09:19:14 +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 u0D9JDRl093667;
Wed, 13 Jan 2016 09:19:13 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0D9JDo5093665;
Wed, 13 Jan 2016 09:19:13 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601130919.u0D9JDo5093665@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: Wed, 13 Jan 2016 09:19:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293822 - user/ngie/more-tests2/tests/sys/geom
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: Wed, 13 Jan 2016 09:19:15 -0000
Author: ngie
Date: Wed Jan 13 09:19:13 2016
New Revision: 293822
URL: https://svnweb.freebsd.org/changeset/base/293822
Log:
Replace tests/sys/geom with copy from head
Replaced:
user/ngie/more-tests2/tests/sys/geom/
- copied from r293821, head/tests/sys/geom/
From owner-svn-src-user@freebsd.org Wed Jan 13 09:25:04 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 630DDA80BA8
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 13 Jan 2016 09:25:04 +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 3F133194B;
Wed, 13 Jan 2016 09:25:04 +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 u0D9P3Ts096800;
Wed, 13 Jan 2016 09:25:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0D9P2lt096788;
Wed, 13 Jan 2016 09:25:02 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601130925.u0D9P2lt096788@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: Wed, 13 Jan 2016 09:25:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293823 - in user/ngie/more-tests2: sbin/geom
sbin/geom/class sbin/geom/core/tests sys/dev/sfxge/common
tools/regression/geom tools/regression/geom_gpt
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: Wed, 13 Jan 2016 09:25:04 -0000
Author: ngie
Date: Wed Jan 13 09:25:01 2016
New Revision: 293823
URL: https://svnweb.freebsd.org/changeset/base/293823
Log:
MFhead @ r293822 changes for posterity's sake (and diff reduce)
Added:
user/ngie/more-tests2/tools/regression/geom/
- copied from r293822, head/tools/regression/geom/
user/ngie/more-tests2/tools/regression/geom_gpt/
- copied from r293822, head/tools/regression/geom_gpt/
Deleted:
user/ngie/more-tests2/sbin/geom/core/tests/
Modified:
user/ngie/more-tests2/sbin/geom/Makefile
user/ngie/more-tests2/sbin/geom/class/Makefile
user/ngie/more-tests2/sys/dev/sfxge/common/efx.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c
user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h
user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c
user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c
user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h
user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c
Directory Properties:
user/ngie/more-tests2/ (props changed)
user/ngie/more-tests2/sys/ (props changed)
Modified: user/ngie/more-tests2/sbin/geom/Makefile
==============================================================================
--- user/ngie/more-tests2/sbin/geom/Makefile Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sbin/geom/Makefile Wed Jan 13 09:25:01 2016 (r293823)
@@ -20,14 +20,8 @@ LIBADD= geom util
.else
-.include <src.opts.mk>
-
SUBDIR= core class
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
.include <bsd.subdir.mk>
.endif
Modified: user/ngie/more-tests2/sbin/geom/class/Makefile
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/Makefile Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sbin/geom/class/Makefile Wed Jan 13 09:25:01 2016 (r293823)
@@ -21,8 +21,4 @@ SUBDIR+=shsec
SUBDIR+=stripe
SUBDIR+=virstor
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
.include <bsd.subdir.mk>
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -2235,14 +2235,14 @@ efx_filter_supported_filters(
extern void
efx_filter_spec_init_rx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_filter_priority_t priority,
__in efx_filter_flag_t flags,
__in efx_rxq_t *erp);
extern void
efx_filter_spec_init_tx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_txq_t *etp);
extern __checkReturn efx_rc_t
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_filter.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -292,7 +292,7 @@ fail1:
void
efx_filter_spec_init_rx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_filter_priority_t priority,
__in efx_filter_flag_t flags,
__in efx_rxq_t *erp)
@@ -311,7 +311,7 @@ efx_filter_spec_init_rx(
void
efx_filter_spec_init_tx(
- __inout efx_filter_spec_t *spec,
+ __out efx_filter_spec_t *spec,
__in efx_txq_t *etp)
{
EFSYS_ASSERT3P(spec, !=, NULL);
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_impl.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -1120,7 +1120,7 @@ efx_vpd_hunk_next(
__in size_t size,
__out efx_vpd_tag_t *tagp,
__out efx_vpd_keyword_t *keyword,
- __out_bcount_opt(*paylenp) unsigned int *payloadp,
+ __out_opt unsigned int *payloadp,
__out_opt uint8_t *paylenp,
__inout unsigned int *contp);
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_mcdi.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -54,7 +54,7 @@ struct efx_mcdi_req_s {
uint8_t *emr_in_buf;
size_t emr_in_length;
/* Outputs: retcode, buffer, length, and length used*/
- int emr_rc;
+ efx_rc_t emr_rc;
uint8_t *emr_out_buf;
size_t emr_out_length;
size_t emr_out_length_used;
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/efx_types.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -536,7 +536,7 @@ extern int fix_lint;
(_oword).eo_u32[3]) == ~((uint32_t)0))
#define EFX_QWORD_IS_SET64(_qword) \
- (((_qword).eq_u64[0]) == ~((uint32_t)0))
+ (((_qword).eq_u64[0]) == ~((uint64_t)0))
#define EFX_QWORD_IS_SET32(_qword) \
(((_qword).eq_u32[0] & \
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/hunt_impl.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -289,10 +289,10 @@ ef10_mcdi_poll_response(
extern void
ef10_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length);
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length);
extern void
ef10_mcdi_request_copyout(
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/hunt_mcdi.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -307,10 +307,10 @@ ef10_mcdi_poll_response(
void
ef10_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length)
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length)
{
const efx_mcdi_transport_t *emtp = enp->en_mcdi.em_emtp;
efsys_mem_t *esmp = emtp->emt_dma_mem;
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/hunt_nvram.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -240,7 +240,7 @@ fail1:
static efx_rc_t
tlv_init_cursor(
- __in tlv_cursor_t *cursor,
+ __out tlv_cursor_t *cursor,
__in uint32_t *block,
__in uint32_t *limit)
{
@@ -255,7 +255,7 @@ tlv_init_cursor(
static efx_rc_t
tlv_init_cursor_from_size(
- __in tlv_cursor_t *cursor,
+ __out tlv_cursor_t *cursor,
__in uint8_t *block,
__in size_t size)
{
@@ -1103,7 +1103,7 @@ ef10_nvram_segment_write_tlv(
__in boolean_t write)
{
efx_rc_t rc;
- int status;
+ efx_rc_t status;
size_t original_segment_size;
size_t modified_segment_size;
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/siena_impl.h Wed Jan 13 09:25:01 2016 (r293823)
@@ -127,10 +127,10 @@ siena_mcdi_poll_response(
extern void
siena_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length);
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length);
extern void
siena_mcdi_request_copyout(
Modified: user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c
==============================================================================
--- user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c Wed Jan 13 09:19:13 2016 (r293822)
+++ user/ngie/more-tests2/sys/dev/sfxge/common/siena_mcdi.c Wed Jan 13 09:25:01 2016 (r293823)
@@ -216,10 +216,10 @@ siena_mcdi_poll_response(
void
siena_mcdi_read_response(
- __in efx_nic_t *enp,
- __out void *bufferp,
- __in size_t offset,
- __in size_t length)
+ __in efx_nic_t *enp,
+ __out_bcount(length) void *bufferp,
+ __in size_t offset,
+ __in size_t length)
{
efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
unsigned int pdur;
From owner-svn-src-user@freebsd.org Wed Jan 13 09:26: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 A4DDCA80C1E
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 13 Jan 2016 09:26: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 5BC7C1ACE;
Wed, 13 Jan 2016 09:26: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 u0D9Qiar096915;
Wed, 13 Jan 2016 09:26:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0D9Qic2096914;
Wed, 13 Jan 2016 09:26:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601130926.u0D9Qic2096914@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: Wed, 13 Jan 2016 09:26:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293824 - in user/ngie: more-tests more-tests.broken
more-tests2
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: Wed, 13 Jan 2016 09:26:45 -0000
Author: ngie
Date: Wed Jan 13 09:26:44 2016
New Revision: 293824
URL: https://svnweb.freebsd.org/changeset/base/293824
Log:
Close ^/user/ngie/more-tests* branches
Further integration work will be done in other branches, e.g.
^/user/ngie/make_check
Deleted:
user/ngie/more-tests/
user/ngie/more-tests.broken/
user/ngie/more-tests2/
From owner-svn-src-user@freebsd.org Thu Jan 14 07:50:04 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 18D29A812AE
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 14 Jan 2016 07:50:04 +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 C66151618;
Thu, 14 Jan 2016 07:50:03 +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 u0E7o2OP095312;
Thu, 14 Jan 2016 07:50:02 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0E7o2ae095311;
Thu, 14 Jan 2016 07:50:02 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601140750.u0E7o2ae095311@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, 14 Jan 2016 07:50:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293881 - user/ngie/socket-tests
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, 14 Jan 2016 07:50:04 -0000
Author: ngie
Date: Thu Jan 14 07:50:02 2016
New Revision: 293881
URL: https://svnweb.freebsd.org/changeset/base/293881
Log:
Create a project branch for integrating the rest of tools/regression/sockets
in to the FreeBSD test suite
Added:
- copied from r293880, head/
Directory Properties:
user/ngie/socket-tests/ (props changed)
From owner-svn-src-user@freebsd.org Thu Jan 14 08:16:28 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 904A8A81F53
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 14 Jan 2016 08:16:28 +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 61414188F;
Thu, 14 Jan 2016 08:16:28 +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 u0E8GRDE004621;
Thu, 14 Jan 2016 08:16:27 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0E8GRwq004620;
Thu, 14 Jan 2016 08:16:27 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601140816.u0E8GRwq004620@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, 14 Jan 2016 08:16:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293882 -
user/ngie/socket-tests/tools/regression/sockets/sendfile
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, 14 Jan 2016 08:16:28 -0000
Author: ngie
Date: Thu Jan 14 08:16:27 2016
New Revision: 293882
URL: https://svnweb.freebsd.org/changeset/base/293882
Log:
Fix a -Wunused-but-set warning with gcc 5.0 with pagesize in main(..)
Modified:
user/ngie/socket-tests/tools/regression/sockets/sendfile/sendfile.c
Modified: user/ngie/socket-tests/tools/regression/sockets/sendfile/sendfile.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/sendfile/sendfile.c Thu Jan 14 07:50:02 2016 (r293881)
+++ user/ngie/socket-tests/tools/regression/sockets/sendfile/sendfile.c Thu Jan 14 08:16:27 2016 (r293882)
@@ -459,12 +459,9 @@ cleanup(void)
int
main(int argc, char *argv[])
{
- int pagesize;
path[0] = '\0';
- pagesize = getpagesize();
-
if (argc == 1) {
snprintf(path, sizeof(path), "sendfile.XXXXXXXXXXXX");
file_fd = mkstemp(path);
From owner-svn-src-user@freebsd.org Thu Jan 14 08:18:48 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 9B49DA82009
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 14 Jan 2016 08:18:48 +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 6C7A319DE;
Thu, 14 Jan 2016 08:18:48 +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 u0E8IlM4004735;
Thu, 14 Jan 2016 08:18:47 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0E8IlT0004734;
Thu, 14 Jan 2016 08:18:47 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601140818.u0E8IlT0004734@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, 14 Jan 2016 08:18:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293883 -
user/ngie/socket-tests/tools/regression/sockets/reconnect
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, 14 Jan 2016 08:18:48 -0000
Author: ngie
Date: Thu Jan 14 08:18:47 2016
New Revision: 293883
URL: https://svnweb.freebsd.org/changeset/base/293883
Log:
- Convert the K&R prototype of main to an ANSI prototype to mute a
warning from gcc 4.2.1
- Close s_sock2 after finishing off the last test to plug a leak and
mute a warning from gcc 5.0 about a -Wunused-but-set variable
Modified:
user/ngie/socket-tests/tools/regression/sockets/reconnect/reconnect.c
Modified: user/ngie/socket-tests/tools/regression/sockets/reconnect/reconnect.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/reconnect/reconnect.c Thu Jan 14 08:16:27 2016 (r293882)
+++ user/ngie/socket-tests/tools/regression/sockets/reconnect/reconnect.c Thu Jan 14 08:18:47 2016 (r293883)
@@ -104,7 +104,7 @@ cleanup(void)
}
int
-main()
+main(void)
{
int s_sock1, s_sock2, c_sock;
@@ -127,6 +127,7 @@ main()
connect_uds_server(c_sock, uds_name1);
close(s_sock1);
connect_uds_server(c_sock, uds_name2);
+ close(s_sock2);
exit (0);
}
From owner-svn-src-user@freebsd.org Thu Jan 14 08:49:31 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 3D810A82FB9
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 14 Jan 2016 08:49:31 +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 0DC6518A8;
Thu, 14 Jan 2016 08:49: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 u0E8nUri013434;
Thu, 14 Jan 2016 08:49:30 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0E8nT7D013432;
Thu, 14 Jan 2016 08:49:29 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601140849.u0E8nT7D013432@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, 14 Jan 2016 08:49:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293884 -
user/ngie/socket-tests/tools/regression/sockets/unix_gc
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, 14 Jan 2016 08:49:31 -0000
Author: ngie
Date: Thu Jan 14 08:49:29 2016
New Revision: 293884
URL: https://svnweb.freebsd.org/changeset/base/293884
Log:
- Get rid of unused argc/argv variables in main
- Bump WARNS to 6
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_gc/Makefile
user/ngie/socket-tests/tools/regression/sockets/unix_gc/unix_gc.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_gc/Makefile
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_gc/Makefile Thu Jan 14 08:18:47 2016 (r293883)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_gc/Makefile Thu Jan 14 08:49:29 2016 (r293884)
@@ -2,6 +2,6 @@
PROG= unix_gc
MAN=
-WARNS?= 3
+WARNS?= 6
.include <bsd.prog.mk>
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_gc/unix_gc.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_gc/unix_gc.c Thu Jan 14 08:18:47 2016 (r293883)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_gc/unix_gc.c Thu Jan 14 08:49:29 2016 (r293884)
@@ -752,7 +752,7 @@ recursion(void)
#define RMDIR "rm -Rf "
int
-main(int argc, char *argv[])
+main(void)
{
char cmd[sizeof(RMDIR) + PATH_MAX];
int serrno;
From owner-svn-src-user@freebsd.org Thu Jan 14 08:51: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 482EBA811BD
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 14 Jan 2016 08:51: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 1D74E1B2E;
Thu, 14 Jan 2016 08:51: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 u0E8pTR0016100;
Thu, 14 Jan 2016 08:51:29 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0E8pTHl016098;
Thu, 14 Jan 2016 08:51:29 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601140851.u0E8pTHl016098@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, 14 Jan 2016 08:51:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293885 -
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: Thu, 14 Jan 2016 08:51:30 -0000
Author: ngie
Date: Thu Jan 14 08:51:28 2016
New Revision: 293885
URL: https://svnweb.freebsd.org/changeset/base/293885
Log:
- Get rid of unused argc/argv variables in main
- Exit on failure with a return code of 1 instead of -1 with err/errx as a
return code of -1 is implementation dependent
- Bump WARNS to 6
Modified:
user/ngie/socket-tests/tools/regression/sockets/zerosend/Makefile
user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c
Modified: user/ngie/socket-tests/tools/regression/sockets/zerosend/Makefile
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/zerosend/Makefile Thu Jan 14 08:49:29 2016 (r293884)
+++ user/ngie/socket-tests/tools/regression/sockets/zerosend/Makefile Thu Jan 14 08:51:28 2016 (r293885)
@@ -2,6 +2,6 @@
PROG= zerosend
MAN=
-WARNS?= 2
+WARNS?= 6
.include <bsd.prog.mk>
Modified: user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c Thu Jan 14 08:49:29 2016 (r293884)
+++ user/ngie/socket-tests/tools/regression/sockets/zerosend/zerosend.c Thu Jan 14 08:51:28 2016 (r293885)
@@ -54,9 +54,9 @@ try_0send(const char *test, int fd)
ch = 0;
len = send(fd, &ch, 0, 0);
if (len < 0)
- err(-1, "%s: try_0send", test);
+ err(1, "%s: try_0send", test);
if (len != 0)
- errx(-1, "%s: try_0send: returned %zd", test, len);
+ errx(1, "%s: try_0send: returned %zd", test, len);
}
static void
@@ -68,9 +68,9 @@ try_0write(const char *test, int fd)
ch = 0;
len = write(fd, &ch, 0);
if (len < 0)
- err(-1, "%s: try_0write", test);
+ err(1, "%s: try_0write", test);
if (len != 0)
- errx(-1, "%s: try_0write: returned %zd", test, len);
+ errx(1, "%s: try_0write: returned %zd", test, len);
}
static void
@@ -87,24 +87,24 @@ setup_udp(const char *test, int *fdp)
sin.sin_port = htons(PORT1);
sock1 = socket(PF_INET, SOCK_DGRAM, 0);
if (sock1 < 0)
- err(-1, "%s: setup_udp: socket", test);
+ 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,
+ err(1, "%s: setup_udp: bind(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT1);
sin.sin_port = htons(PORT2);
if (connect(sock1, (struct sockaddr *)&sin, sizeof(sin)) < 0)
- err(-1, "%s: setup_udp: connect(%s, %d)", test,
+ err(1, "%s: setup_udp: connect(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT2);
sock2 = socket(PF_INET, SOCK_DGRAM, 0);
if (sock2 < 0)
- err(-1, "%s: setup_udp: socket", test);
+ err(1, "%s: setup_udp: socket", test);
if (bind(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0)
- err(-1, "%s: setup_udp: bind(%s, %d)", test,
+ err(1, "%s: setup_udp: bind(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT2);
sin.sin_port = htons(PORT1);
if (connect(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0)
- err(-1, "%s: setup_udp: connect(%s, %d)", test,
+ err(1, "%s: setup_udp: connect(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT1);
fdp[0] = sock1;
@@ -130,12 +130,12 @@ setup_tcp(const char *test, int *fdp)
sin.sin_port = htons(PORT1);
sock1 = socket(PF_INET, SOCK_STREAM, 0);
if (sock1 < 0)
- err(-1, "%s: setup_tcp: socket", test);
+ err(1, "%s: setup_tcp: socket", test);
if (bind(sock1, (struct sockaddr *)&sin, sizeof(sin)) < 0)
- err(-1, "%s: bind(%s, %d)", test, inet_ntoa(sin.sin_addr),
+ err(1, "%s: bind(%s, %d)", test, inet_ntoa(sin.sin_addr),
PORT1);
if (listen(sock1, -1) < 0)
- err(-1, "%s: listen", test);
+ err(1, "%s: listen", test);
/*
* Now connect to it, non-blocking so that we don't deadlock against
@@ -143,25 +143,25 @@ setup_tcp(const char *test, int *fdp)
*/
sock2 = socket(PF_INET, SOCK_STREAM, 0);
if (sock2 < 0)
- err(-1, "%s: setup_tcp: socket", test);
+ err(1, "%s: setup_tcp: socket", test);
if (fcntl(sock2, F_SETFL, O_NONBLOCK) < 0)
- err(-1, "%s: setup_tcp: fcntl(O_NONBLOCK)", test);
+ err(1, "%s: setup_tcp: fcntl(O_NONBLOCK)", test);
if (connect(sock2, (struct sockaddr *)&sin, sizeof(sin)) < 0 &&
errno != EINPROGRESS)
- err(-1, "%s: setup_tcp: connect(%s, %d)", test,
+ err(1, "%s: setup_tcp: connect(%s, %d)", test,
inet_ntoa(sin.sin_addr), PORT1);
/*
* Now pick up the connection after sleeping a moment to make sure
* there's been time for some packets to go back and forth.
*/
- if (sleep(1) < 0)
- err(-1, "%s: sleep(1)", test);
+ if (sleep(1) != 0)
+ err(1, "%s: sleep(1)", test);
sock3 = accept(sock1, NULL, NULL);
if (sock3 < 0)
- err(-1, "%s: accept", test);
- if (sleep(1) < 0)
- err(-1, "%s: sleep(1)", test);
+ err(1, "%s: accept", test);
+ if (sleep(1) != 0)
+ err(1, "%s: sleep(1)", test);
FD_ZERO(&writefds);
FD_SET(sock2, &writefds);
@@ -171,11 +171,11 @@ setup_tcp(const char *test, int *fdp)
tv.tv_usec = 0;
ret = select(sock2 + 1, NULL, &writefds, &exceptfds, &tv);
if (ret < 0)
- err(-1, "%s: setup_tcp: select", test);
+ err(1, "%s: setup_tcp: select", test);
if (FD_ISSET(sock2, &exceptfds))
- errx(-1, "%s: setup_tcp: select: exception", test);
+ errx(1, "%s: setup_tcp: select: exception", test);
if (!FD_ISSET(sock2, &writefds))
- errx(-1, "%s: setup_tcp: select: not writable", test);
+ errx(1, "%s: setup_tcp: select: not writable", test);
close(sock1);
fdp[0] = sock2;
@@ -187,7 +187,7 @@ setup_udsstream(const char *test, int *f
{
if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fdp) < 0)
- err(-1, "%s: setup_udsstream: socketpair", test);
+ err(1, "%s: setup_udsstream: socketpair", test);
}
static void
@@ -195,7 +195,7 @@ setup_udsdgram(const char *test, int *fd
{
if (socketpair(PF_LOCAL, SOCK_DGRAM, 0, fdp) < 0)
- err(-1, "%s: setup_udsdgram: socketpair", test);
+ err(1, "%s: setup_udsdgram: socketpair", test);
}
static void
@@ -203,7 +203,7 @@ setup_pipe(const char *test, int *fdp)
{
if (pipe(fdp) < 0)
- err(-1, "%s: setup_pipe: pipe", test);
+ err(1, "%s: setup_pipe: pipe", test);
}
static void
@@ -213,19 +213,19 @@ setup_fifo(const char *test, int *fdp)
int fd1, fd2;
if (mkstemp(path) == -1)
- err(-1, "%s: setup_fifo: mktemp", test);
+ err(1, "%s: setup_fifo: mktemp", test);
unlink(path);
if (mkfifo(path, 0600) < 0)
- err(-1, "%s: setup_fifo: mkfifo(%s)", test, path);
+ err(1, "%s: setup_fifo: mkfifo(%s)", test, path);
fd1 = open(path, O_RDONLY | O_NONBLOCK);
if (fd1 < 0)
- err(-1, "%s: setup_fifo: open(%s, O_RDONLY)", test, path);
+ err(1, "%s: setup_fifo: open(%s, O_RDONLY)", test, path);
fd2 = open(path, O_WRONLY | O_NONBLOCK);
if (fd2 < 0)
- err(-1, "%s: setup_fifo: open(%s, O_WRONLY)", test, path);
+ err(1, "%s: setup_fifo: open(%s, O_WRONLY)", test, path);
fdp[0] = fd2;
fdp[1] = fd1;
@@ -242,7 +242,7 @@ close_both(int *fdp)
}
int
-main(int argc, char *argv[])
+main(void)
{
int fd[2];
From owner-svn-src-user@freebsd.org Thu Jan 14 10:09:00 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 1711BA8196A
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 14 Jan 2016 10:09:00 +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 D4E521C4E;
Thu, 14 Jan 2016 10:08:59 +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 u0EA8wHg037594;
Thu, 14 Jan 2016 10:08:58 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EA8wc2037593;
Thu, 14 Jan 2016 10:08:58 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601141008.u0EA8wc2037593@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, 14 Jan 2016 10:08:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293904 -
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, 14 Jan 2016 10:09:00 -0000
Author: ngie
Date: Thu Jan 14 10:08:58 2016
New Revision: 293904
URL: https://svnweb.freebsd.org/changeset/base/293904
Log:
Use nitems(x) instead of handrolling sizeof(x) / sizeof(*x)
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 Thu Jan 14 09:22:01 2016 (r293903)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Thu Jan 14 10:08:58 2016 (r293904)
@@ -131,7 +131,7 @@ static const struct test_func test_strea
};
#define TEST_STREAM_TBL_SIZE \
- (sizeof(test_stream_tbl) / sizeof(test_stream_tbl[0]))
+ nitems(test_stream_tbl)
static const struct test_func test_dgram_tbl[] = {
{
From owner-svn-src-user@freebsd.org Thu Jan 14 21:29:40 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 5C5E4A82ED5
for <svn-src-user@mailman.ysv.freebsd.org>;
Thu, 14 Jan 2016 21:29:40 +0000 (UTC)
(envelope-from glebius@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 F39391787;
Thu, 14 Jan 2016 21:29:39 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0ELTcKE052898;
Thu, 14 Jan 2016 21:29:38 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0ELTcMP052893;
Thu, 14 Jan 2016 21:29:38 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601142129.u0ELTcMP052893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 14 Jan 2016 21:29:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294039 - in user/cperciva/freebsd-update-build/patches:
10.1-RELEASE 10.2-RELEASE 9.3-RELEASE
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, 14 Jan 2016 21:29:40 -0000
Author: glebius
Date: Thu Jan 14 21:29:38 2016
New Revision: 294039
URL: https://svnweb.freebsd.org/changeset/base/294039
Log:
Commit todays patch queue.
Added:
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-EN-16:02.pf
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-EN-16:03.yplib
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:01.sctp
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:02.ntp
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:03.linux
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:04.linux
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:05.tcp
user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:06.bsnmpd
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-16:02.pf
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-EN-16:03.yplib
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-SA-16:01.sctp
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-SA-16:02.ntp
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-SA-16:03.linux
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-SA-16:04.linux
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-SA-16:05.tcp
user/cperciva/freebsd-update-build/patches/10.2-RELEASE/9-SA-16:06.bsnmpd
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-EN-16:02.pf
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-EN-16:03.yplib
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-SA-16:01.sctp
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-SA-16:02.ntp
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-SA-16:03.linux
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-SA-16:04.linux
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-SA-16:05.tcp
user/cperciva/freebsd-update-build/patches/9.3-RELEASE/33-SA-16:06.bsnmpd
Added: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-EN-16:02.pf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-EN-16:02.pf Thu Jan 14 21:29:38 2016 (r294039)
@@ -0,0 +1,392 @@
+--- sys/net/pfvar.h.orig
++++ sys/net/pfvar.h
+@@ -1558,6 +1558,8 @@
+ extern void pf_print_flags(u_int8_t);
+ extern u_int16_t pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t,
+ u_int8_t);
++extern u_int16_t pf_proto_cksum_fixup(struct mbuf *, u_int16_t,
++ u_int16_t, u_int16_t, u_int8_t);
+
+ VNET_DECLARE(struct ifnet *, sync_ifp);
+ #define V_sync_ifp VNET(sync_ifp);
+@@ -1582,6 +1584,9 @@
+ void *pf_pull_hdr(struct mbuf *, int, void *, int, u_short *, u_short *,
+ sa_family_t);
+ void pf_change_a(void *, u_int16_t *, u_int32_t, u_int8_t);
++void pf_change_proto_a(struct mbuf *, void *, u_int16_t *, u_int32_t,
++ u_int8_t);
++void pf_change_tcp_a(struct mbuf *, void *, u_int16_t *, u_int32_t);
+ void pf_send_deferred_syn(struct pf_state *);
+ int pf_match_addr(u_int8_t, struct pf_addr *, struct pf_addr *,
+ struct pf_addr *, sa_family_t);
+--- sys/netinet6/ip6_output.c.orig
++++ sys/netinet6/ip6_output.c
+@@ -184,7 +184,7 @@
+ }\
+ } while (/*CONSTCOND*/ 0)
+
+-static void
++void
+ in6_delayed_cksum(struct mbuf *m, uint32_t plen, u_short offset)
+ {
+ u_short csum;
+--- sys/netinet6/ip6_var.h.orig
++++ sys/netinet6/ip6_var.h
+@@ -456,6 +456,7 @@
+ struct rtentry **, u_int);
+ u_int32_t ip6_randomid(void);
+ u_int32_t ip6_randomflowlabel(void);
++void in6_delayed_cksum(struct mbuf *m, uint32_t plen, u_short offset);
+ #endif /* _KERNEL */
+
+ #endif /* !_NETINET6_IP6_VAR_H_ */
+--- sys/netpfil/pf/pf.c.orig
++++ sys/netpfil/pf/pf.c
+@@ -203,7 +203,7 @@
+ static void pf_add_threshold(struct pf_threshold *);
+ static int pf_check_threshold(struct pf_threshold *);
+
+-static void pf_change_ap(struct pf_addr *, u_int16_t *,
++static void pf_change_ap(struct mbuf *, struct pf_addr *, u_int16_t *,
+ u_int16_t *, u_int16_t *, struct pf_addr *,
+ u_int16_t, u_int8_t, sa_family_t);
+ static int pf_modulate_sack(struct mbuf *, int, struct pf_pdesc *,
+@@ -1966,6 +1966,22 @@
+ }
+ }
+
++/**
++ * Checksum updates are a little complicated because the checksum in the TCP/UDP
++ * header isn't always a full checksum. In some cases (i.e. output) it's a
++ * pseudo-header checksum, which is a partial checksum over src/dst IP
++ * addresses, protocol number and length.
++ *
++ * That means we have the following cases:
++ * * Input or forwarding: we don't have TSO, the checksum fields are full
++ * checksums, we need to update the checksum whenever we change anything.
++ * * Output (i.e. the checksum is a pseudo-header checksum):
++ * x The field being updated is src/dst address or affects the length of
++ * the packet. We need to update the pseudo-header checksum (note that this
++ * checksum is not ones' complement).
++ * x Some other field is being modified (e.g. src/dst port numbers): We
++ * don't have to update anything.
++ **/
+ u_int16_t
+ pf_cksum_fixup(u_int16_t cksum, u_int16_t old, u_int16_t new, u_int8_t udp)
+ {
+@@ -1981,9 +1997,20 @@
+ return (l);
+ }
+
++u_int16_t
++pf_proto_cksum_fixup(struct mbuf *m, u_int16_t cksum, u_int16_t old,
++ u_int16_t new, u_int8_t udp)
++{
++ if (m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6))
++ return (cksum);
++
++ return (pf_cksum_fixup(cksum, old, new, udp));
++}
++
+ static void
+-pf_change_ap(struct pf_addr *a, u_int16_t *p, u_int16_t *ic, u_int16_t *pc,
+- struct pf_addr *an, u_int16_t pn, u_int8_t u, sa_family_t af)
++pf_change_ap(struct mbuf *m, struct pf_addr *a, u_int16_t *p, u_int16_t *ic,
++ u_int16_t *pc, struct pf_addr *an, u_int16_t pn, u_int8_t u,
++ sa_family_t af)
+ {
+ struct pf_addr ao;
+ u_int16_t po = *p;
+@@ -1991,6 +2018,9 @@
+ PF_ACPY(&ao, a, af);
+ PF_ACPY(a, an, af);
+
++ if (m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_DELAY_DATA_IPV6))
++ *pc = ~*pc;
++
+ *p = pn;
+
+ switch (af) {
+@@ -2000,10 +2030,12 @@
+ ao.addr16[0], an->addr16[0], 0),
+ ao.addr16[1], an->addr16[1], 0);
+ *p = pn;
+- *pc = pf_cksum_fixup(pf_cksum_fixup(pf_cksum_fixup(*pc,
++
++ *pc = pf_cksum_fixup(pf_cksum_fixup(*pc,
+ ao.addr16[0], an->addr16[0], u),
+- ao.addr16[1], an->addr16[1], u),
+- po, pn, u);
++ ao.addr16[1], an->addr16[1], u);
++
++ *pc = pf_proto_cksum_fixup(m, *pc, po, pn, u);
+ break;
+ #endif /* INET */
+ #ifdef INET6
+@@ -2010,7 +2042,7 @@
+ case AF_INET6:
+ *pc = pf_cksum_fixup(pf_cksum_fixup(pf_cksum_fixup(
+ pf_cksum_fixup(pf_cksum_fixup(pf_cksum_fixup(
+- pf_cksum_fixup(pf_cksum_fixup(pf_cksum_fixup(*pc,
++ pf_cksum_fixup(pf_cksum_fixup(*pc,
+ ao.addr16[0], an->addr16[0], u),
+ ao.addr16[1], an->addr16[1], u),
+ ao.addr16[2], an->addr16[2], u),
+@@ -2018,14 +2050,21 @@
+ ao.addr16[4], an->addr16[4], u),
+ ao.addr16[5], an->addr16[5], u),
+ ao.addr16[6], an->addr16[6], u),
+- ao.addr16[7], an->addr16[7], u),
+- po, pn, u);
++ ao.addr16[7], an->addr16[7], u);
++
++ *pc = pf_proto_cksum_fixup(m, *pc, po, pn, u);
+ break;
+ #endif /* INET6 */
+ }
++
++ if (m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA |
++ CSUM_DELAY_DATA_IPV6)) {
++ *pc = ~*pc;
++ if (! *pc)
++ *pc = 0xffff;
++ }
+ }
+
+-
+ /* Changes a u_int32_t. Uses a void * so there are no align restrictions */
+ void
+ pf_change_a(void *a, u_int16_t *c, u_int32_t an, u_int8_t u)
+@@ -2038,6 +2077,19 @@
+ ao % 65536, an % 65536, u);
+ }
+
++void
++pf_change_proto_a(struct mbuf *m, void *a, u_int16_t *c, u_int32_t an, u_int8_t udp)
++{
++ u_int32_t ao;
++
++ memcpy(&ao, a, sizeof(ao));
++ memcpy(a, &an, sizeof(u_int32_t));
++
++ *c = pf_proto_cksum_fixup(m,
++ pf_proto_cksum_fixup(m, *c, ao / 65536, an / 65536, udp),
++ ao % 65536, an % 65536, udp);
++}
++
+ #ifdef INET6
+ static void
+ pf_change_a6(struct pf_addr *a, u_int16_t *c, struct pf_addr *an, u_int8_t u)
+@@ -2183,12 +2235,10 @@
+ for (i = 2; i + TCPOLEN_SACK <= olen;
+ i += TCPOLEN_SACK) {
+ memcpy(&sack, &opt[i], sizeof(sack));
+- pf_change_a(&sack.start, &th->th_sum,
+- htonl(ntohl(sack.start) -
+- dst->seqdiff), 0);
+- pf_change_a(&sack.end, &th->th_sum,
+- htonl(ntohl(sack.end) -
+- dst->seqdiff), 0);
++ pf_change_proto_a(m, &sack.start, &th->th_sum,
++ htonl(ntohl(sack.start) - dst->seqdiff), 0);
++ pf_change_proto_a(m, &sack.end, &th->th_sum,
++ htonl(ntohl(sack.end) - dst->seqdiff), 0);
+ memcpy(&opt[i], &sack, sizeof(sack));
+ }
+ copyback = 1;
+@@ -3092,7 +3142,7 @@
+
+ if (PF_ANEQ(saddr, &nk->addr[pd->sidx], af) ||
+ nk->port[pd->sidx] != sport) {
+- pf_change_ap(saddr, &th->th_sport, pd->ip_sum,
++ pf_change_ap(m, saddr, &th->th_sport, pd->ip_sum,
+ &th->th_sum, &nk->addr[pd->sidx],
+ nk->port[pd->sidx], 0, af);
+ pd->sport = &th->th_sport;
+@@ -3101,7 +3151,7 @@
+
+ if (PF_ANEQ(daddr, &nk->addr[pd->didx], af) ||
+ nk->port[pd->didx] != dport) {
+- pf_change_ap(daddr, &th->th_dport, pd->ip_sum,
++ pf_change_ap(m, daddr, &th->th_dport, pd->ip_sum,
+ &th->th_sum, &nk->addr[pd->didx],
+ nk->port[pd->didx], 0, af);
+ dport = th->th_dport;
+@@ -3115,7 +3165,7 @@
+
+ if (PF_ANEQ(saddr, &nk->addr[pd->sidx], af) ||
+ nk->port[pd->sidx] != sport) {
+- pf_change_ap(saddr, &pd->hdr.udp->uh_sport,
++ pf_change_ap(m, saddr, &pd->hdr.udp->uh_sport,
+ pd->ip_sum, &pd->hdr.udp->uh_sum,
+ &nk->addr[pd->sidx],
+ nk->port[pd->sidx], 1, af);
+@@ -3125,7 +3175,7 @@
+
+ if (PF_ANEQ(daddr, &nk->addr[pd->didx], af) ||
+ nk->port[pd->didx] != dport) {
+- pf_change_ap(daddr, &pd->hdr.udp->uh_dport,
++ pf_change_ap(m, daddr, &pd->hdr.udp->uh_dport,
+ pd->ip_sum, &pd->hdr.udp->uh_sum,
+ &nk->addr[pd->didx],
+ nk->port[pd->didx], 1, af);
+@@ -3477,7 +3527,7 @@
+ if ((s->src.seqdiff = pf_tcp_iss(pd) - s->src.seqlo) ==
+ 0)
+ s->src.seqdiff = 1;
+- pf_change_a(&th->th_seq, &th->th_sum,
++ pf_change_proto_a(m, &th->th_seq, &th->th_sum,
+ htonl(s->src.seqlo + s->src.seqdiff), 0);
+ *rewrite = 1;
+ } else
+@@ -3786,9 +3836,9 @@
+ while ((src->seqdiff = arc4random() - seq) == 0)
+ ;
+ ack = ntohl(th->th_ack) - dst->seqdiff;
+- pf_change_a(&th->th_seq, &th->th_sum, htonl(seq +
++ pf_change_proto_a(m, &th->th_seq, &th->th_sum, htonl(seq +
+ src->seqdiff), 0);
+- pf_change_a(&th->th_ack, &th->th_sum, htonl(ack), 0);
++ pf_change_proto_a(m, &th->th_ack, &th->th_sum, htonl(ack), 0);
+ *copyback = 1;
+ } else {
+ ack = ntohl(th->th_ack);
+@@ -3838,9 +3888,9 @@
+ ack = ntohl(th->th_ack) - dst->seqdiff;
+ if (src->seqdiff) {
+ /* Modulate sequence numbers */
+- pf_change_a(&th->th_seq, &th->th_sum, htonl(seq +
++ pf_change_proto_a(m, &th->th_seq, &th->th_sum, htonl(seq +
+ src->seqdiff), 0);
+- pf_change_a(&th->th_ack, &th->th_sum, htonl(ack), 0);
++ pf_change_proto_a(m, &th->th_ack, &th->th_sum, htonl(ack), 0);
+ *copyback = 1;
+ }
+ end = seq + pd->p_len;
+@@ -4294,14 +4344,14 @@
+
+ if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], pd->af) ||
+ nk->port[pd->sidx] != th->th_sport)
+- pf_change_ap(pd->src, &th->th_sport, pd->ip_sum,
+- &th->th_sum, &nk->addr[pd->sidx],
++ pf_change_ap(m, pd->src, &th->th_sport,
++ pd->ip_sum, &th->th_sum, &nk->addr[pd->sidx],
+ nk->port[pd->sidx], 0, pd->af);
+
+ if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], pd->af) ||
+ nk->port[pd->didx] != th->th_dport)
+- pf_change_ap(pd->dst, &th->th_dport, pd->ip_sum,
+- &th->th_sum, &nk->addr[pd->didx],
++ pf_change_ap(m, pd->dst, &th->th_dport,
++ pd->ip_sum, &th->th_sum, &nk->addr[pd->didx],
+ nk->port[pd->didx], 0, pd->af);
+ copyback = 1;
+ }
+@@ -4365,13 +4415,13 @@
+
+ if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], pd->af) ||
+ nk->port[pd->sidx] != uh->uh_sport)
+- pf_change_ap(pd->src, &uh->uh_sport, pd->ip_sum,
++ pf_change_ap(m, pd->src, &uh->uh_sport, pd->ip_sum,
+ &uh->uh_sum, &nk->addr[pd->sidx],
+ nk->port[pd->sidx], 1, pd->af);
+
+ if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], pd->af) ||
+ nk->port[pd->didx] != uh->uh_dport)
+- pf_change_ap(pd->dst, &uh->uh_dport, pd->ip_sum,
++ pf_change_ap(m, pd->dst, &uh->uh_dport, pd->ip_sum,
+ &uh->uh_sum, &nk->addr[pd->didx],
+ nk->port[pd->didx], 1, pd->af);
+ m_copyback(m, off, sizeof(*uh), (caddr_t)uh);
+@@ -5487,6 +5537,13 @@
+ if (ifp->if_flags & IFF_LOOPBACK)
+ m0->m_flags |= M_SKIP_FIREWALL;
+
++ if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6 &
++ ~ifp->if_hwassist) {
++ uint32_t plen = m0->m_pkthdr.len - sizeof(*ip6);
++ in6_delayed_cksum(m0, plen, sizeof(struct ip6_hdr));
++ m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6;
++ }
++
+ /*
+ * If the packet is too large for the outgoing interface,
+ * send back an icmp6 error.
+--- sys/netpfil/pf/pf_ioctl.c.orig
++++ sys/netpfil/pf/pf_ioctl.c
+@@ -3571,12 +3571,6 @@
+ {
+ int chk;
+
+- /* We need a proper CSUM befor we start (s. OpenBSD ip_output) */
+- if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
+- in_delayed_cksum(*m);
+- (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
+- }
+-
+ chk = pf_test(PF_OUT, ifp, m, inp);
+ if (chk && *m) {
+ m_freem(*m);
+@@ -3615,14 +3609,6 @@
+ {
+ int chk;
+
+- /* We need a proper CSUM before we start (s. OpenBSD ip_output) */
+- if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
+-#ifdef INET
+- /* XXX-BZ copy&paste error from r126261? */
+- in_delayed_cksum(*m);
+-#endif
+- (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
+- }
+ CURVNET_SET(ifp->if_vnet);
+ chk = pf_test6(PF_OUT, ifp, m, inp);
+ CURVNET_RESTORE();
+--- sys/netpfil/pf/pf_norm.c.orig
++++ sys/netpfil/pf/pf_norm.c
+@@ -1374,13 +1374,14 @@
+ th->th_x2 = 0;
+ nv = *(u_int16_t *)(&th->th_ack + 1);
+
+- th->th_sum = pf_cksum_fixup(th->th_sum, ov, nv, 0);
++ th->th_sum = pf_proto_cksum_fixup(m, th->th_sum, ov, nv, 0);
+ rewrite = 1;
+ }
+
+ /* Remove urgent pointer, if TH_URG is not set */
+ if (!(flags & TH_URG) && th->th_urp) {
+- th->th_sum = pf_cksum_fixup(th->th_sum, th->th_urp, 0, 0);
++ th->th_sum = pf_proto_cksum_fixup(m, th->th_sum, th->th_urp,
++ 0, 0);
+ th->th_urp = 0;
+ rewrite = 1;
+ }
+@@ -1581,7 +1582,7 @@
+ (src->scrub->pfss_flags &
+ PFSS_TIMESTAMP)) {
+ tsval = ntohl(tsval);
+- pf_change_a(&opt[2],
++ pf_change_proto_a(m, &opt[2],
+ &th->th_sum,
+ htonl(tsval +
+ src->scrub->pfss_ts_mod),
+@@ -1597,7 +1598,7 @@
+ PFSS_TIMESTAMP)) {
+ tsecr = ntohl(tsecr)
+ - dst->scrub->pfss_ts_mod;
+- pf_change_a(&opt[6],
++ pf_change_proto_a(m, &opt[6],
+ &th->th_sum, htonl(tsecr),
+ 0);
+ copyback = 1;
+@@ -1924,8 +1925,8 @@
+ case TCPOPT_MAXSEG:
+ mss = (u_int16_t *)(optp + 2);
+ if ((ntohs(*mss)) > r->max_mss) {
+- th->th_sum = pf_cksum_fixup(th->th_sum,
+- *mss, htons(r->max_mss), 0);
++ th->th_sum = pf_proto_cksum_fixup(m,
++ th->th_sum, *mss, htons(r->max_mss), 0);
+ *mss = htons(r->max_mss);
+ rewrite = 1;
+ }
Added: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-EN-16:03.yplib
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-EN-16:03.yplib Thu Jan 14 21:29:38 2016 (r294039)
@@ -0,0 +1,121 @@
+--- lib/libc/yp/yplib.c.orig
++++ lib/libc/yp/yplib.c
+@@ -655,7 +655,7 @@
+ struct timeval tv;
+ struct ypreq_key yprk;
+ int r;
+-
++ int retries = 0;
+ *outval = NULL;
+ *outvallen = 0;
+
+@@ -700,6 +700,11 @@
+ #endif
+
+ again:
++ if (retries > MAX_RETRIES) {
++ YPUNLOCK();
++ return (YPERR_RPC);
++ }
++
+ if (_yp_dobind(indomain, &ysd) != 0) {
+ YPUNLOCK();
+ return (YPERR_DOMAIN);
+@@ -716,6 +721,7 @@
+ if (r != RPC_SUCCESS) {
+ clnt_perror(ysd->dom_client, "yp_match: clnt_call");
+ _yp_unbind(ysd);
++ retries++;
+ goto again;
+ }
+
+@@ -772,7 +778,7 @@
+ struct dom_binding *ysd;
+ struct timeval tv;
+ int r;
+-
++ int retries = 0;
+ /* Sanity check */
+
+ if (indomain == NULL || !strlen(indomain) ||
+@@ -784,6 +790,11 @@
+
+ YPLOCK();
+ again:
++ if (retries > MAX_RETRIES) {
++ YPUNLOCK();
++ return (YPERR_RPC);
++ }
++
+ if (_yp_dobind(indomain, &ysd) != 0) {
+ YPUNLOCK();
+ return (YPERR_DOMAIN);
+@@ -802,6 +813,7 @@
+ if (r != RPC_SUCCESS) {
+ clnt_perror(ysd->dom_client, "yp_first: clnt_call");
+ _yp_unbind(ysd);
++ retries++;
+ goto again;
+ }
+ if (!(r = ypprot_err(yprkv.stat))) {
+@@ -844,7 +856,7 @@
+ struct dom_binding *ysd;
+ struct timeval tv;
+ int r;
+-
++ int retries = 0;
+ /* Sanity check */
+
+ if (inkey == NULL || !strlen(inkey) || inkeylen <= 0 ||
+@@ -857,6 +869,11 @@
+
+ YPLOCK();
+ again:
++ if (retries > MAX_RETRIES) {
++ YPUNLOCK();
++ return (YPERR_RPC);
++ }
++
+ if (_yp_dobind(indomain, &ysd) != 0) {
+ YPUNLOCK();
+ return (YPERR_DOMAIN);
+@@ -877,6 +894,7 @@
+ if (r != RPC_SUCCESS) {
+ clnt_perror(ysd->dom_client, "yp_next: clnt_call");
+ _yp_unbind(ysd);
++ retries++;
+ goto again;
+ }
+ if (!(r = ypprot_err(yprkv.stat))) {
+@@ -920,7 +938,7 @@
+ CLIENT *clnt;
+ u_long status, savstat;
+ int clnt_sock;
+-
++ int retries = 0;
+ /* Sanity check */
+
+ if (indomain == NULL || !strlen(indomain) ||
+@@ -929,6 +947,10 @@
+
+ YPLOCK();
+ again:
++ if (retries > MAX_RETRIES) {
++ YPUNLOCK();
++ return (YPERR_RPC);
++ }
+
+ if (_yp_dobind(indomain, &ysd) != 0) {
+ YPUNLOCK();
+@@ -958,9 +980,10 @@
+ if (clnt_call(clnt, YPPROC_ALL,
+ (xdrproc_t)xdr_ypreq_nokey, &yprnk,
+ (xdrproc_t)xdr_ypresp_all_seq, &status, tv) != RPC_SUCCESS) {
+- clnt_perror(ysd->dom_client, "yp_all: clnt_call");
++ clnt_perror(clnt, "yp_all: clnt_call");
+ clnt_destroy(clnt);
+ _yp_unbind(ysd);
++ retries++;
+ goto again;
+ }
+
Added: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:01.sctp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:01.sctp Thu Jan 14 21:29:38 2016 (r294039)
@@ -0,0 +1,21 @@
+--- sys/netinet6/sctp6_usrreq.c.orig
++++ sys/netinet6/sctp6_usrreq.c
+@@ -379,7 +379,6 @@
+ * XXX: We assume that when IPV6 is non NULL, M and OFF are
+ * valid.
+ */
+- /* check if we can safely examine src and dst ports */
+ struct sctp_inpcb *inp = NULL;
+ struct sctp_tcb *stcb = NULL;
+ struct sctp_nets *net = NULL;
+@@ -388,6 +387,10 @@
+ if (ip6cp->ip6c_m == NULL)
+ return;
+
++ /* Check if we can safely examine the SCTP header. */
++ if (ip6cp->ip6c_m->m_pkthdr.len < ip6cp->ip6c_off + sizeof(sh))
++ return;
++
+ bzero(&sh, sizeof(sh));
+ bzero(&final, sizeof(final));
+ inp = NULL;
Added: user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:02.ntp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/cperciva/freebsd-update-build/patches/10.1-RELEASE/26-SA-16:02.ntp Thu Jan 14 21:29:38 2016 (r294039)
@@ -0,0 +1,15927 @@
+--- contrib/ntp/html/miscopt.html.orig
++++ contrib/ntp/html/miscopt.html
+@@ -3,7 +3,7 @@
+ <head>
+ <meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
+ <title>Miscellaneous Commands and Options</title>
+-<!-- Changed by: Harlan Stenn, 29-Jun-2015 -->
++<!-- Changed by: Harlan Stenn, 17-Nov-2015 -->
+ <link href="scripts/style.css" type="text/css" rel="stylesheet">
+ </head>
+ <body>
+@@ -11,7 +11,7 @@
+ <img src="pic/boom3.gif" alt="gif" align="left"><a href="http://www.eecis.udel.edu/~mills/pictures.html">from <i>Pogo</i>, Walt Kelly</a>
+ <p>We have three, now looking for more.</p>
+ <p>Last update:
+- <!-- #BeginDate format:En2m -->23-Sep-2015 10:20<!-- #EndDate -->
++ <!-- #BeginDate format:En2m -->17-Nov-2015 11:06<!-- #EndDate -->
+ UTC</p>
+ <br clear="left">
+ <h4>Related Links</h4>
+@@ -57,7 +57,7 @@
+ <dt id="interface"><tt>interface [listen | ignore | drop] [all | ipv4 | ipv6 | wildcard | <i>name</i> | <i>address</i>[/<i>prefixlen</i>]]</tt></dt>
+ <dd>This command controls which network addresses <tt>ntpd</tt> opens, and whether input is dropped without processing. The first parameter determines the action for addresses which match the second parameter. That parameter specifies a class of addresses, or a specific interface name, or an address. In the address case, <tt><i>prefixlen</i></tt> determines how many bits must match for this rule to apply. <tt>ignore</tt> prevents opening matching addresses, <tt>drop</tt> causes <tt>ntpd</tt> to open the address and drop all received packets without examination. Multiple <tt>interface</tt> commands can be used. The last rule which matches a particular address determines the action for it. <tt>interface</tt> commands are disabled if any <a href="ntpd.html#--interface"><tt>-I</tt></a>, <a href="ntpd.html#--interface"><tt>--interface</tt></a>, <a href="ntpd.html#--novirtualips"><tt>-L</tt></a>, or <a href="ntpd.html#--novirtualips"><tt>--novirtualips</tt></a> command-line options are
used. If none of those options are used and no <tt>interface</tt> actions are specified in the configuration file, all available network addresses are opened. The <tt>nic</tt> command is an alias for <tt>interface</tt>.</dd>
+ <dt id="leapfile"><tt>leapfile <i>leapfile</i></tt></dt>
+- <dd>This command loads the NIST leapseconds file and initializes the leapsecond values for the next leapsecond time, expiration time and TAI offset. The file can be obtained directly from NIST national time servers using <tt>ftp</tt> as the ASCII file <tt>pub/leap-seconds</tt>.</dd>
++ <dd>This command loads the IERS leapseconds file and initializes the leapsecond values for the next leapsecond time, expiration time and TAI offset. The file can be obtained directly from the IERS at <a href="https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list">https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list</a> or <a href="ftp://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list">ftp://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list</a>.</dd>
+ <dd>The <i>leapfile</i> is scanned when <tt>ntpd</tt> processes the <tt>leapfile</tt> directive or when <tt>ntpd</tt> detects that <i>leapfile</i> has changed. <tt>ntpd</tt> checks once a day to see if the <i>leapfile</i> has changed.</dd>
+ <dd>While not strictly a security function, the Autokey protocol provides means to securely retrieve the current or updated leapsecond values from a server.</dd>
+ <dt id="leapsmearinterval"><tt>leapsmearinterval <i>seconds</i></tt></dt>
+--- contrib/ntp/include/Makefile.am.orig
++++ contrib/ntp/include/Makefile.am
+@@ -66,6 +66,7 @@
+ recvbuff.h \
+ refclock_atom.h \
+ refidsmear.h \
++ safecast.h \
+ ssl_applink.c \
+ timepps-SCO.h \
+ timepps-Solaris.h \
+--- contrib/ntp/include/Makefile.in.orig
++++ contrib/ntp/include/Makefile.in
+@@ -551,6 +551,7 @@
+ recvbuff.h \
+ refclock_atom.h \
+ refidsmear.h \
++ safecast.h \
+ ssl_applink.c \
+ timepps-SCO.h \
+ timepps-Solaris.h \
+--- contrib/ntp/include/ntp_refclock.h.orig
++++ contrib/ntp/include/ntp_refclock.h
+@@ -220,7 +220,7 @@
+ extern void refclock_control(sockaddr_u *,
+ const struct refclockstat *,
+ struct refclockstat *);
+-extern int refclock_open (char *, u_int, u_int);
++extern int refclock_open (const char *, u_int, u_int);
+ extern int refclock_setup (int, u_int, u_int);
+ extern void refclock_timer (struct peer *);
+ extern void refclock_transmit(struct peer *);
+--- contrib/ntp/include/ntp_stdlib.h.orig
++++ contrib/ntp/include/ntp_stdlib.h
+@@ -65,8 +65,8 @@
+ /* authkeys.c */
+ extern void auth_delkeys (void);
+ extern int auth_havekey (keyid_t);
+-extern int authdecrypt (keyid_t, u_int32 *, int, int);
+-extern int authencrypt (keyid_t, u_int32 *, int);
++extern int authdecrypt (keyid_t, u_int32 *, size_t, size_t);
++extern size_t authencrypt (keyid_t, u_int32 *, size_t);
+ extern int authhavekey (keyid_t);
+ extern int authistrusted (keyid_t);
+ extern int authreadkeys (const char *);
+@@ -95,8 +95,8 @@
+ extern int ymd2yd (int, int, int);
+
+ /* a_md5encrypt.c */
+-extern int MD5authdecrypt (int, u_char *, u_int32 *, int, int);
+-extern int MD5authencrypt (int, u_char *, u_int32 *, int);
++extern int MD5authdecrypt (int, const u_char *, u_int32 *, size_t, size_t);
++extern size_t MD5authencrypt (int, const u_char *, u_int32 *, size_t);
+ extern void MD5auth_setkey (keyid_t, int, const u_char *, size_t);
+ extern u_int32 addr2refid (sockaddr_u *);
+
+--- contrib/ntp/include/ntp_worker.h.orig
++++ contrib/ntp/include/ntp_worker.h
+@@ -43,19 +43,22 @@
+ } blocking_pipe_header;
+
+ # ifdef WORK_THREAD
+-# ifdef WORK_PIPE
+-typedef pthread_t * thr_ref;
+-typedef sem_t * sem_ref;
++# ifdef SYS_WINNT
++typedef struct { HANDLE thnd; } thread_type;
++typedef struct { HANDLE shnd; } sema_type;
+ # else
+-typedef HANDLE thr_ref;
+-typedef HANDLE sem_ref;
++typedef pthread_t thread_type;
++typedef sem_t sema_type;
+ # endif
++typedef thread_type *thr_ref;
++typedef sema_type *sem_ref;
+ # endif
+
+ /*
+ *
+ */
+-#ifdef WORK_FORK
++#if defined(WORK_FORK)
++
+ typedef struct blocking_child_tag {
+ int reusable;
+ int pid;
+@@ -66,38 +69,59 @@
+ int resp_write_pipe;
+ int ispipe;
+ } blocking_child;
++
+ #elif defined(WORK_THREAD)
++
+ typedef struct blocking_child_tag {
+ /*
+ * blocking workitems and blocking_responses are dynamically-sized
+ * one-dimensional arrays of pointers to blocking worker requests and
+ * responses.
++ *
++ * IMPORTANT: This structure is shared between threads, and all access
++ * that is not atomic (especially queue operations) must hold the
++ * 'accesslock' semaphore to avoid data races.
++ *
++ * The resource management (thread/semaphore creation/destruction)
++ * functions and functions just testing a handle are safe because these
++ * are only changed by the main thread when no worker is running on the
++ * same data structure.
+ */
+ int reusable;
+- thr_ref thread_ref;
+- u_int thread_id;
+- blocking_pipe_header * volatile * volatile
++ sem_ref accesslock; /* shared access lock */
++ thr_ref thread_ref; /* thread 'handle' */
++
++ /* the reuest queue */
++ blocking_pipe_header ** volatile
+ workitems;
+ volatile size_t workitems_alloc;
+- size_t next_workitem; /* parent */
+- size_t next_workeritem; /* child */
+- blocking_pipe_header * volatile * volatile
++ size_t head_workitem; /* parent */
++ size_t tail_workitem; /* child */
++ sem_ref workitems_pending; /* signalling */
++
++ /* the response queue */
++ blocking_pipe_header ** volatile
+ responses;
+ volatile size_t responses_alloc;
+- size_t next_response; /* child */
+- size_t next_workresp; /* parent */
++ size_t head_response; /* child */
++ size_t tail_response; /* parent */
++
+ /* event handles / sem_t pointers */
+- /* sem_ref child_is_blocking; */
+- sem_ref blocking_req_ready;
+ sem_ref wake_scheduled_sleep;
++
++ /* some systems use a pipe for notification, others a semaphore.
++ * Both employ the queue above for the actual data transfer.
++ */
+ #ifdef WORK_PIPE
+- int resp_read_pipe; /* parent */
+- int resp_write_pipe;/* child */
++ int resp_read_pipe; /* parent */
++ int resp_write_pipe; /* child */
+ int ispipe;
+- void * resp_read_ctx; /* child */
++ void * resp_read_ctx; /* child */
+ #else
+- sem_ref blocking_response_ready;
++ sem_ref responses_pending; /* signalling */
+ #endif
++ sema_type sem_table[4];
++ thread_type thr_table[1];
+ } blocking_child;
+
+ #endif /* WORK_THREAD */
+@@ -111,7 +135,7 @@
+ extern int queue_blocking_request(blocking_work_req, void *,
+ size_t, blocking_work_callback,
+ void *);
+-extern int queue_blocking_response(blocking_child *,
++extern int queue_blocking_response(blocking_child *,
+ blocking_pipe_header *, size_t,
+ const blocking_pipe_header *);
+ extern void process_blocking_resp(blocking_child *);
+--- contrib/ntp/include/ntpd.h.orig
++++ contrib/ntp/include/ntpd.h
+@@ -156,7 +156,7 @@
+ extern int freq_cnt;
+
+ /* ntp_monitor.c */
+-#define MON_HASH_SIZE (1U << mon_hash_bits)
++#define MON_HASH_SIZE ((size_t)1U << mon_hash_bits)
+ #define MON_HASH_MASK (MON_HASH_SIZE - 1)
+ #define MON_HASH(addr) (sock_hash(addr) & MON_HASH_MASK)
+ extern void init_mon (void);
+@@ -408,6 +408,7 @@
+ extern int ext_enable; /* external clock enabled */
+ extern int cal_enable; /* refclock calibrate enable */
+ extern int allow_panic; /* allow panic correction (-g) */
++extern int enable_panic_check; /* Can we check allow_panic's state? */
+ extern int force_step_once; /* always step time once at startup (-G) */
+ extern int mode_ntpdate; /* exit on first clock set (-q) */
+ extern int peer_ntpdate; /* count of ntpdate peers */
+--- contrib/ntp/include/safecast.h.orig
++++ contrib/ntp/include/safecast.h
+@@ -0,0 +1,34 @@
++#ifndef SAFECAST_H
++#define SAFECAST_H
++
++#include <limits.h>
++static inline int size2int_chk(size_t v)
++{
++ if (v > INT_MAX)
++ abort();
++ return (int)(v);
++}
++
++static inline int size2int_sat(size_t v)
++{
++ return (v > INT_MAX) ? INT_MAX : (int)v;
++}
++
++/* Compilers can emit warning about increased alignment requirements
++ * when casting pointers. The impact is tricky: on machines where
++ * alignment is just a performance issue (x86,x64,...) this might just
++ * cause a performance penalty. On others, an address error can occur
++ * and the process dies...
++ *
++ * Still, there are many cases where the pointer arithmetic and the
++ * buffer alignment make sure this does not happen. OTOH, the compiler
++ * doesn't know this and still emits warnings.
++ *
++ * The following cast macros are going through void pointers to tell
++ * the compiler that there is no alignment requirement to watch.
++ */
++#define UA_PTR(ptype,pval) ((ptype *)(void*)(pval))
++#define UAC_PTR(ptype,pval) ((const ptype *)(const void*)(pval))
++#define UAV_PTR(ptype,pval) ((volatile ptype *)(volatile void*)(pval))
++
++#endif
+--- contrib/ntp/lib/isc/win32/interfaceiter.c.orig
++++ contrib/ntp/lib/isc/win32/interfaceiter.c
+@@ -54,7 +54,7 @@
+ IP_ADAPTER_ADDRESSES * ipaaCur; /* enumeration position */
+ IP_ADAPTER_UNICAST_ADDRESS *ipuaCur; /* enumeration subposition */
+ /* fields used for the older address enumeration ioctls */
+- int socket;
++ SOCKET socket;
+ INTERFACE_INFO IFData; /* Current Interface Info */
+ int numIF; /* Current Interface count */
+ int v4IF; /* Number of IPv4 Interfaces */
+--- contrib/ntp/lib/isc/win32/net.c.orig
++++ contrib/ntp/lib/isc/win32/net.c
+@@ -216,7 +216,8 @@
+
+ static void
+ try_ipv6pktinfo(void) {
+- int s, on;
++ SOCKET s;
++ int on;
+ char strbuf[ISC_STRERRORSIZE];
+ isc_result_t result;
+ int optname;
+--- contrib/ntp/lib/isc/backtrace.c.orig
++++ contrib/ntp/lib/isc/backtrace.c
+@@ -278,7 +278,7 @@
+ result = ISC_R_NOTFOUND;
+ else {
+ *symbolp = found->symbol;
+- *offsetp = (const char *)addr - (char *)found->addr;
++ *offsetp = (u_long)((const char *)addr - (char *)found->addr);
+ }
+
+ return (result);
+--- contrib/ntp/lib/isc/buffer.c.orig
++++ contrib/ntp/lib/isc/buffer.c
+@@ -406,7 +406,7 @@
+
+ void
+ isc__buffer_putstr(isc_buffer_t *b, const char *source) {
+- unsigned int l;
++ size_t l;
+ unsigned char *cp;
+
+ REQUIRE(ISC_BUFFER_VALID(b));
+@@ -421,7 +421,7 @@
+
+ cp = isc_buffer_used(b);
+ memcpy(cp, source, l);
+- b->used += l;
++ b->used += (u_int)l; /* checked above - no overflow here */
+ }
+
+ isc_result_t
+--- contrib/ntp/lib/isc/inet_aton.c.orig
++++ contrib/ntp/lib/isc/inet_aton.c
+@@ -92,7 +92,7 @@
+ int
+ isc_net_aton(const char *cp, struct in_addr *addr) {
+ unsigned long val;
+- int base, n;
++ int base;
+ unsigned char c;
+ isc_uint8_t parts[4];
+ isc_uint8_t *pp = parts;
+@@ -166,8 +166,7 @@
+ * Concoct the address according to
+ * the number of parts specified.
+ */
+- n = pp - parts + 1;
+- switch (n) {
++ switch (pp - parts + 1) {
+ case 1: /* a -- 32 bits */
+ break;
+
+--- contrib/ntp/lib/isc/inet_pton.c.orig
++++ contrib/ntp/lib/isc/inet_pton.c
+@@ -92,7 +92,7 @@
+ const char *pch;
+
+ if ((pch = strchr(digits, ch)) != NULL) {
+- unsigned int newv = *tp * 10 + (pch - digits);
++ size_t newv = *tp * 10 + (pch - digits);
+
+ if (saw_digit && *tp == 0)
+ return (0);
+@@ -197,12 +197,12 @@
+ * Since some memmove()'s erroneously fail to handle
+ * overlapping regions, we'll do the shift by hand.
+ */
+- const int n = tp - colonp;
++ const size_t n = tp - colonp;
+ int i;
+
+ if (tp == endp)
+ return (0);
+- for (i = 1; i <= n; i++) {
++ for (i = 1; (size_t)i <= n; i++) {
+ endp[- i] = colonp[n - i];
+ colonp[n - i] = 0;
+ }
+--- contrib/ntp/lib/isc/log.c.orig
++++ contrib/ntp/lib/isc/log.c
+@@ -1146,7 +1146,7 @@
+ char *basenam, *digit_end;
+ const char *dirname;
+ int version, greatest = -1;
+- unsigned int basenamelen;
++ size_t basenamelen;
+ isc_dir_t dir;
+ isc_result_t result;
+ char sep = '/';
+--- contrib/ntp/lib/isc/netaddr.c.orig
++++ contrib/ntp/lib/isc/netaddr.c
+@@ -159,7 +159,7 @@
+ if (r == NULL)
+ return (ISC_R_FAILURE);
+
+- alen = strlen(abuf);
++ alen = (unsigned int)strlen(abuf); /* no overflow possible */
+ INSIST(alen < sizeof(abuf));
+
+ zlen = 0;
+--- contrib/ntp/lib/isc/sockaddr.c.orig
++++ contrib/ntp/lib/isc/sockaddr.c
+@@ -134,7 +134,7 @@
+ break;
+ #ifdef ISC_PLAFORM_HAVESYSUNH
+ case AF_UNIX:
+- plen = strlen(sockaddr->type.sunix.sun_path);
++ plen = (unsigned int)strlen(sockaddr->type.sunix.sun_path);
+ if (plen >= isc_buffer_availablelength(target))
+ return (ISC_R_NOSPACE);
+
+@@ -153,7 +153,7 @@
+ return (ISC_R_FAILURE);
+ }
+
+- plen = strlen(pbuf);
++ plen = (unsigned int)strlen(pbuf);
+ INSIST(plen < sizeof(pbuf));
+
+ isc_netaddr_fromsockaddr(&netaddr, sockaddr);
+--- contrib/ntp/lib/isc/task.c.orig
++++ contrib/ntp/lib/isc/task.c
+@@ -329,7 +329,7 @@
+ isc__task_create(isc_taskmgr_t *manager0, unsigned int quantum,
+ isc_task_t **taskp)
+ {
+- isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0;
++ isc__taskmgr_t *manager = (void*)manager0;
+ isc__task_t *task;
+ isc_boolean_t exiting;
+ isc_result_t result;
+@@ -1463,7 +1463,7 @@
+ */
+
+ REQUIRE(managerp != NULL);
+- manager = (isc__taskmgr_t *)*managerp;
++ manager = (void*)(*managerp);
+ REQUIRE(VALID_MANAGER(manager));
+
+ #ifndef USE_WORKER_THREADS
+@@ -1559,7 +1559,7 @@
+
+ ISC_TASKFUNC_SCOPE void
+ isc__taskmgr_setmode(isc_taskmgr_t *manager0, isc_taskmgrmode_t mode) {
+- isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0;
++ isc__taskmgr_t *manager = (void*)manager0;
+
+ LOCK(&manager->lock);
+ manager->mode = mode;
+@@ -1568,7 +1568,7 @@
+
+ ISC_TASKFUNC_SCOPE isc_taskmgrmode_t
+ isc__taskmgr_mode(isc_taskmgr_t *manager0) {
+- isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0;
++ isc__taskmgr_t *manager = (void*)manager0;
+ isc_taskmgrmode_t mode;
+ LOCK(&manager->lock);
+ mode = manager->mode;
+@@ -1579,7 +1579,7 @@
+ #ifndef USE_WORKER_THREADS
+ isc_boolean_t
+ isc__taskmgr_ready(isc_taskmgr_t *manager0) {
+- isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0;
++ isc__taskmgr_t *manager = (void*)manager0;
+ isc_boolean_t is_ready;
+
+ #ifdef USE_SHARED_MANAGER
+@@ -1598,7 +1598,7 @@
+
+ isc_result_t
+ isc__taskmgr_dispatch(isc_taskmgr_t *manager0) {
+- isc__taskmgr_t *manager = (isc__taskmgr_t *)manager0;
++ isc__taskmgr_t *manager = (void*)manager0;
+
+ #ifdef USE_SHARED_MANAGER
+ if (manager == NULL)
+@@ -1615,7 +1615,7 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Fri Jan 15 02:58:24 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 A6746A83540
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 15 Jan 2016 02:58:24 +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 5A9A21DEE;
Fri, 15 Jan 2016 02:58:24 +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 u0F2wNLD050825;
Fri, 15 Jan 2016 02:58:23 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0F2wKPN050797;
Fri, 15 Jan 2016 02:58:20 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601150258.u0F2wKPN050797@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, 15 Jan 2016 02:58:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294069 - in user/ngie/stable-10-libnv: .
contrib/llvm/patches contrib/llvm/tools/clang/tools/driver crypto/openssh etc
gnu/usr.bin/groff/tmac include lib/clang lib/libpmc release relea...
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, 15 Jan 2016 02:58:24 -0000
Author: ngie
Date: Fri Jan 15 02:58:20 2016
New Revision: 294069
URL: https://svnweb.freebsd.org/changeset/base/294069
Log:
MFstable/10 @ r294068
Added:
user/ngie/stable-10-libnv/sys/dev/bxe/bxe_dump.h
- copied unchanged from r294068, stable/10/sys/dev/bxe/bxe_dump.h
user/ngie/stable-10-libnv/sys/dev/bxe/bxe_ioctl.h
- copied unchanged from r294068, stable/10/sys/dev/bxe/bxe_ioctl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/ef10_impl.h
- copied unchanged from r294068, stable/10/sys/dev/sfxge/common/ef10_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/medford_impl.h
- copied unchanged from r294068, stable/10/sys/dev/sfxge/common/medford_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/medford_nic.c
- copied unchanged from r294068, stable/10/sys/dev/sfxge/common/medford_nic.c
user/ngie/stable-10-libnv/usr.bin/clang/clang/CC.sh
- copied unchanged from r294068, stable/10/usr.bin/clang/clang/CC.sh
user/ngie/stable-10-libnv/usr.sbin/sesutil/eltsub.c
- copied unchanged from r294068, stable/10/usr.sbin/sesutil/eltsub.c
user/ngie/stable-10-libnv/usr.sbin/sesutil/eltsub.h
- copied unchanged from r294068, stable/10/usr.sbin/sesutil/eltsub.h
Deleted:
user/ngie/stable-10-libnv/contrib/llvm/patches/patch-r257109-add-CC-aliases.diff
Modified:
user/ngie/stable-10-libnv/Makefile
user/ngie/stable-10-libnv/contrib/llvm/tools/clang/tools/driver/driver.cpp
user/ngie/stable-10-libnv/crypto/openssh/readconf.c
user/ngie/stable-10-libnv/etc/Makefile
user/ngie/stable-10-libnv/gnu/usr.bin/groff/tmac/mdoc.local.in
user/ngie/stable-10-libnv/include/limits.h
user/ngie/stable-10-libnv/lib/clang/clang.build.mk
user/ngie/stable-10-libnv/lib/libpmc/pmc.h
user/ngie/stable-10-libnv/release/doc/en_US.ISO8859-1/errata/article.xml
user/ngie/stable-10-libnv/release/doc/share/xml/errata.xml
user/ngie/stable-10-libnv/release/doc/share/xml/security.xml
user/ngie/stable-10-libnv/release/release.sh
user/ngie/stable-10-libnv/share/man/man4/sfxge.4
user/ngie/stable-10-libnv/share/mk/local.sys.mk
user/ngie/stable-10-libnv/share/mk/sys.mk
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_proto.h
user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_systrace_args.c
user/ngie/stable-10-libnv/sys/amd64/linux32/syscalls.master
user/ngie/stable-10-libnv/sys/boot/forth/loader.conf
user/ngie/stable-10-libnv/sys/boot/forth/menu-commands.4th
user/ngie/stable-10-libnv/sys/boot/forth/menu.rc
user/ngie/stable-10-libnv/sys/boot/forth/support.4th
user/ngie/stable-10-libnv/sys/boot/i386/loader/main.c
user/ngie/stable-10-libnv/sys/boot/userboot/userboot/main.c
user/ngie/stable-10-libnv/sys/boot/zfs/libzfs.h
user/ngie/stable-10-libnv/sys/boot/zfs/zfs.c
user/ngie/stable-10-libnv/sys/boot/zfs/zfsimpl.c
user/ngie/stable-10-libnv/sys/compat/linux/linux_futex.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/conf/newvers.sh
user/ngie/stable-10-libnv/sys/dev/bxe/bxe.c
user/ngie/stable-10-libnv/sys/dev/bxe/bxe.h
user/ngie/stable-10-libnv/sys/dev/bxe/bxe_stats.c
user/ngie/stable-10-libnv/sys/dev/bxe/bxe_stats.h
user/ngie/stable-10-libnv/sys/dev/bxe/ecore_init.h
user/ngie/stable-10-libnv/sys/dev/drm2/i915/i915_gem.c
user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.c
user/ngie/stable-10-libnv/sys/dev/e1000/if_igb.h
user/ngie/stable-10-libnv/sys/dev/hwpmc/hwpmc_mod.c
user/ngie/stable-10-libnv/sys/dev/hyperv/include/hyperv.h
user/ngie/stable-10-libnv/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
user/ngie/stable-10-libnv/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
user/ngie/stable-10-libnv/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ix.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ixv.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/ix_txrx.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe.h
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_mbx.h
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_vf.c
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_bootcfg.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_check.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_crc32.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_ev.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_filter.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_hash.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_intr.c
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_mon.c
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_port.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_regs_ef10.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_regs_mcdi.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_rx.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_sram.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_tx.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_types.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_vpd.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/efx_wol.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_ev.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_filter.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_impl.h
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_intr.c
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_rx.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/hunt_sram.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/mcdi_mon.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/mcdi_mon.h
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_mac.c
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_phy.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_sram.c
user/ngie/stable-10-libnv/sys/dev/sfxge/common/siena_vpd.c
user/ngie/stable-10-libnv/sys/dev/sfxge/sfxge.c
user/ngie/stable-10-libnv/sys/dev/sfxge/sfxge.h
user/ngie/stable-10-libnv/sys/dev/sfxge/sfxge_mcdi.c
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/fs/ext2fs/ext2_vfsops.c
user/ngie/stable-10-libnv/sys/i386/linux/syscalls.master
user/ngie/stable-10-libnv/sys/kern/kern_ktr.c
user/ngie/stable-10-libnv/sys/kern/kern_prot.c
user/ngie/stable-10-libnv/sys/modules/if_gif/Makefile
user/ngie/stable-10-libnv/sys/modules/sfxge/Makefile
user/ngie/stable-10-libnv/sys/netinet/tcp_output.c
user/ngie/stable-10-libnv/sys/netinet6/sctp6_usrreq.c
user/ngie/stable-10-libnv/sys/sparc64/include/ktr.h
user/ngie/stable-10-libnv/sys/sparc64/sparc64/exception.S
user/ngie/stable-10-libnv/sys/sparc64/sparc64/mp_exception.S
user/ngie/stable-10-libnv/sys/sparc64/sparc64/pmap.c
user/ngie/stable-10-libnv/sys/sparc64/sparc64/swtch.S
user/ngie/stable-10-libnv/sys/sys/pmc.h
user/ngie/stable-10-libnv/sys/sys/ucred.h
user/ngie/stable-10-libnv/tools/build/mk/OptionalObsoleteFiles.inc
user/ngie/stable-10-libnv/tools/regression/geom_concat/conf.sh
user/ngie/stable-10-libnv/tools/regression/geom_mirror/conf.sh
user/ngie/stable-10-libnv/tools/regression/geom_raid3/conf.sh
user/ngie/stable-10-libnv/tools/regression/geom_shsec/conf.sh
user/ngie/stable-10-libnv/tools/regression/geom_stripe/conf.sh
user/ngie/stable-10-libnv/tools/regression/geom_subr.sh
user/ngie/stable-10-libnv/usr.bin/cap_mkdb/cap_mkdb.c
user/ngie/stable-10-libnv/usr.bin/clang/clang/Makefile
user/ngie/stable-10-libnv/usr.bin/truss/syscall.h
user/ngie/stable-10-libnv/usr.bin/truss/syscalls.c
user/ngie/stable-10-libnv/usr.sbin/pmcstat/pmcpl_gprof.c
user/ngie/stable-10-libnv/usr.sbin/pmcstat/pmcstat.8
user/ngie/stable-10-libnv/usr.sbin/pmcstat/pmcstat.c
user/ngie/stable-10-libnv/usr.sbin/pmcstat/pmcstat.h
user/ngie/stable-10-libnv/usr.sbin/services_mkdb/services_mkdb.c
user/ngie/stable-10-libnv/usr.sbin/sesutil/Makefile
user/ngie/stable-10-libnv/usr.sbin/sesutil/sesutil.8
user/ngie/stable-10-libnv/usr.sbin/sesutil/sesutil.c
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
Modified: user/ngie/stable-10-libnv/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/Makefile Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/Makefile Fri Jan 15 02:58:20 2016 (r294069)
@@ -203,7 +203,7 @@ _TARGET_ARCH?= ${MACHINE_ARCH}
# The user can define ALWAYS_CHECK_MAKE to have this check performed
# for all targets.
#
-.if defined(ALWAYS_CHECK_MAKE)
+.if defined(ALWAYS_CHECK_MAKE) || !defined(.PARSEDIR)
${TGTS}: upgrade_checks
.else
buildworld: upgrade_checks
@@ -358,7 +358,7 @@ MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR \
- DESTDIR= MK_TESTS=no PROGNAME=${MYMAKE:T}
+ DESTDIR= -DNO_TESTS PROGNAME=${MYMAKE:T}
make bmake: .PHONY
@echo
Modified: user/ngie/stable-10-libnv/contrib/llvm/tools/clang/tools/driver/driver.cpp
==============================================================================
--- user/ngie/stable-10-libnv/contrib/llvm/tools/clang/tools/driver/driver.cpp Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/contrib/llvm/tools/clang/tools/driver/driver.cpp Fri Jan 15 02:58:20 2016 (r294069)
@@ -215,14 +215,12 @@ static void ParseProgName(SmallVectorImp
} suffixes [] = {
{ "clang", 0 },
{ "clang++", "--driver-mode=g++" },
- { "clang-CC", "--driver-mode=g++" },
{ "clang-c++", "--driver-mode=g++" },
{ "clang-cc", 0 },
{ "clang-cpp", "--driver-mode=cpp" },
{ "clang-g++", "--driver-mode=g++" },
{ "clang-gcc", 0 },
{ "clang-cl", "--driver-mode=cl" },
- { "CC", "--driver-mode=g++" },
{ "cc", 0 },
{ "cpp", "--driver-mode=cpp" },
{ "cl" , "--driver-mode=cl" },
Modified: user/ngie/stable-10-libnv/crypto/openssh/readconf.c
==============================================================================
--- user/ngie/stable-10-libnv/crypto/openssh/readconf.c Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/crypto/openssh/readconf.c Fri Jan 15 02:58:20 2016 (r294069)
@@ -1643,7 +1643,7 @@ initialize_options(Options * options)
options->tun_remote = -1;
options->local_command = NULL;
options->permit_local_command = -1;
- options->use_roaming = -1;
+ options->use_roaming = 0;
options->visual_host_key = -1;
options->ip_qos_interactive = -1;
options->ip_qos_bulk = -1;
@@ -1825,8 +1825,7 @@ fill_default_options(Options * options)
options->tun_remote = SSH_TUNID_ANY;
if (options->permit_local_command == -1)
options->permit_local_command = 0;
- if (options->use_roaming == -1)
- options->use_roaming = 1;
+ options->use_roaming = 0;
if (options->visual_host_key == -1)
options->visual_host_key = 0;
if (options->ip_qos_interactive == -1)
Modified: user/ngie/stable-10-libnv/etc/Makefile
==============================================================================
--- user/ngie/stable-10-libnv/etc/Makefile Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/etc/Makefile Fri Jan 15 02:58:20 2016 (r294069)
@@ -86,10 +86,6 @@ BIN1+= apmd.conf
BIN1+= auto_master
.endif
-.if ${MK_BSNMP} != "no"
-BIN1+= snmpd.config
-.endif
-
.if ${MK_FREEBSD_UPDATE} != "no"
BIN1+= freebsd-update.conf
.endif
@@ -218,6 +214,11 @@ distribution:
${BIN2} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+.if ${MK_BSNMP} != "no"
+ cd ${.CURDIR}; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+ snmpd.config ${DESTDIR}/etc;
+.endif
.if ${MK_AT} == "no"
sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab
.endif
Modified: user/ngie/stable-10-libnv/gnu/usr.bin/groff/tmac/mdoc.local.in
==============================================================================
--- user/ngie/stable-10-libnv/gnu/usr.bin/groff/tmac/mdoc.local.in Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/gnu/usr.bin/groff/tmac/mdoc.local.in Fri Jan 15 02:58:20 2016 (r294069)
@@ -50,7 +50,7 @@
.ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
.
.\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.2
+.ds doc-default-operating-system FreeBSD\~10.3
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-7.4 7.4
@@ -62,6 +62,7 @@
.ds doc-operating-system-FreeBSD-10.0 10.0
.ds doc-operating-system-FreeBSD-10.1 10.1
.ds doc-operating-system-FreeBSD-10.2 10.2
+.ds doc-operating-system-FreeBSD-10.3 10.3
.ds doc-operating-system-FreeBSD-11.0 11.0
.
.\" Definitions for other *BSDs not (yet) in doc-common
Modified: user/ngie/stable-10-libnv/include/limits.h
==============================================================================
--- user/ngie/stable-10-libnv/include/limits.h Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/include/limits.h Fri Jan 15 02:58:20 2016 (r294069)
@@ -59,11 +59,13 @@
#define _POSIX_TZNAME_MAX 3
#endif
+#if __POSIX_VISIBLE >= 200112
#define BC_BASE_MAX 99 /* max ibase/obase values in bc(1) */
#define BC_DIM_MAX 2048 /* max array elements in bc(1) */
#define BC_SCALE_MAX 99 /* max scale value in bc(1) */
#define BC_STRING_MAX 1000 /* max const string length in bc(1) */
-#define COLL_WEIGHTS_MAX 0 /* max weights for order keyword */
+#define CHARCLASS_NAME_MAX 14 /* max character class name size */
+#define COLL_WEIGHTS_MAX 10 /* max weights for order keyword */
#define EXPR_NEST_MAX 32 /* max expressions nested in expr(1) */
#define LINE_MAX 2048 /* max bytes in an input line */
#define RE_DUP_MAX 255 /* max RE's in interval notation */
@@ -72,11 +74,14 @@
#define _POSIX2_BC_DIM_MAX 2048
#define _POSIX2_BC_SCALE_MAX 99
#define _POSIX2_BC_STRING_MAX 1000
+#define _POSIX2_CHARCLASS_NAME_MAX 14
+#define _POSIX2_COLL_WEIGHTS_MAX 2
#define _POSIX2_EQUIV_CLASS_MAX 2
#define _POSIX2_EXPR_NEST_MAX 32
#define _POSIX2_LINE_MAX 2048
#define _POSIX2_RE_DUP_MAX 255
#endif
+#endif
#if __POSIX_VISIBLE >= 199309
#define _POSIX_AIO_LISTIO_MAX 2
@@ -110,8 +115,6 @@
#define _POSIX_TRACE_SYS_MAX 8
#define _POSIX_TRACE_USER_EVENT_MAX 32
#define _POSIX_TTY_NAME_MAX 9
-#define _POSIX2_CHARCLASS_NAME_MAX 14
-#define _POSIX2_COLL_WEIGHTS_MAX 2
#define _POSIX_RE_DUP_MAX _POSIX2_RE_DUP_MAX
#endif
Modified: user/ngie/stable-10-libnv/lib/clang/clang.build.mk
==============================================================================
--- user/ngie/stable-10-libnv/lib/clang/clang.build.mk Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/lib/clang/clang.build.mk Fri Jan 15 02:58:20 2016 (r294069)
@@ -27,8 +27,8 @@ TARGET_ABI= gnueabi
TARGET_ABI= unknown
.endif
-TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.2
-BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.2
+TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.3
+BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.3
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
Modified: user/ngie/stable-10-libnv/lib/libpmc/pmc.h
==============================================================================
--- user/ngie/stable-10-libnv/lib/libpmc/pmc.h Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/lib/libpmc/pmc.h Fri Jan 15 02:58:20 2016 (r294069)
@@ -36,14 +36,15 @@
* Driver statistics.
*/
struct pmc_driverstats {
- int pm_intr_ignored; /* #interrupts ignored */
- int pm_intr_processed; /* #interrupts processed */
- int pm_intr_bufferfull; /* #interrupts with ENOSPC */
- int pm_syscalls; /* #syscalls */
- int pm_syscall_errors; /* #syscalls with errors */
- int pm_buffer_requests; /* #buffer requests */
- int pm_buffer_requests_failed; /* #failed buffer requests */
- int pm_log_sweeps; /* #sample buffer processing passes */
+ unsigned int pm_intr_ignored; /* #interrupts ignored */
+ unsigned int pm_intr_processed; /* #interrupts processed */
+ unsigned int pm_intr_bufferfull; /* #interrupts with ENOSPC */
+ unsigned int pm_syscalls; /* #syscalls */
+ unsigned int pm_syscall_errors; /* #syscalls with errors */
+ unsigned int pm_buffer_requests; /* #buffer requests */
+ unsigned int pm_buffer_requests_failed; /* #failed buffer requests */
+ unsigned int pm_log_sweeps; /* #sample buffer processing
+ passes */
};
/*
Modified: user/ngie/stable-10-libnv/release/doc/en_US.ISO8859-1/errata/article.xml
==============================================================================
--- user/ngie/stable-10-libnv/release/doc/en_US.ISO8859-1/errata/article.xml Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/release/doc/en_US.ISO8859-1/errata/article.xml Fri Jan 15 02:58:20 2016 (r294069)
@@ -19,7 +19,7 @@
<pubdate>$FreeBSD$</pubdate>
<copyright>
- <year>2015</year>
+ <year>2016</year>
<holder role="mailto:doc@FreeBSD.org">The &os; Documentation
Project</holder>
Modified: user/ngie/stable-10-libnv/release/doc/share/xml/errata.xml
==============================================================================
--- user/ngie/stable-10-libnv/release/doc/share/xml/errata.xml Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/release/doc/share/xml/errata.xml Fri Jan 15 02:58:20 2016 (r294069)
@@ -89,6 +89,29 @@
<entry><para>Applications exiting due to segmentation
violation on a correct memory address.</para></entry>
</row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-16:01.filemon.asc">FreeBSD-EN-16:01.filemon</link></entry>
+ <entry>14 January 2016</entry>
+ <entry><para><application>bmake</application> and
+ &man.filemon.4; stability issues.</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-16:02.pf.asc">FreeBSD-EN-16:02.pf</link></entry>
+ <entry>14 January 2016</entry>
+ <entry><para>Invalid TCP checksum issue.</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-EN-16:03.yplib.asc">FreeBSD-EN-16:03.yplib</link></entry>
+ <entry>14 January 2016</entry>
+ <entry><para><application>YP/NIS</application> library
+ bug.</para></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
Modified: user/ngie/stable-10-libnv/release/doc/share/xml/security.xml
==============================================================================
--- user/ngie/stable-10-libnv/release/doc/share/xml/security.xml Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/release/doc/share/xml/security.xml Fri Jan 15 02:58:20 2016 (r294069)
@@ -53,6 +53,52 @@
<entry>5 December 2015</entry>
<entry><para>Multiple vulnerabilities</para></entry>
</row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:01.sctp.asc">FreeBSD-SA-16:01.sctp</link></entry>
+ <entry>15 January 2016</entry>
+ <entry><para>ICMPv6 error message vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:02.ntp.asc">FreeBSD-SA-16:02.ntp</link></entry>
+ <entry>15 January 2016</entry>
+ <entry><para>Panic threshold bypass
+ vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:03.linux.asc">FreeBSD-SA-16:03.linux</link></entry>
+ <entry>15 January 2016</entry>
+ <entry><para>Incorrect <literal>futex</literal>
+ handling</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:04.linux.asc">FreeBSD-SA-16:04.linux</link></entry>
+ <entry>15 January 2016</entry>
+ <entry><para>&man.setgroups.2; system call
+ vulnerability</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:05.tcp.asc">FreeBSD-SA-16:05.tcp</link></entry>
+ <entry>15 January 2016</entry>
+ <entry><para>MD5 signature denial of service</para></entry>
+ </row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:06.bsnmpd.asc">FreeBSD-SA-16:06.bsnmpd</link></entry>
+ <entry>15 January 2016</entry>
+ <entry><para>Insecure default configuration file
+ permissions</para></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
Modified: user/ngie/stable-10-libnv/release/release.sh
==============================================================================
--- user/ngie/stable-10-libnv/release/release.sh Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/release/release.sh Fri Jan 15 02:58:20 2016 (r294069)
@@ -275,6 +275,7 @@ extra_chroot_setup() {
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" \
+ FORCE_PKG_REGISTER=1 \
install clean distclean
fi
fi
Modified: user/ngie/stable-10-libnv/share/man/man4/sfxge.4
==============================================================================
--- user/ngie/stable-10-libnv/share/man/man4/sfxge.4 Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/share/man/man4/sfxge.4 Fri Jan 15 02:58:20 2016 (r294069)
@@ -148,6 +148,14 @@ Number of packets with payload that must
before a connection is eligible for LRO.
The idea is we should avoid coalescing segments when the sender is recovering
from loss, because reducing the ACK rate can damage performance.
+.It Va hw.sfxge.mcdi_logging
+Enable logging of MCDI protocol messages (only available if enabled at compile-time).
+.It Va hw.sfxge.N.mcdi_logging
+Enable or disable logging of MCDI protocol messages on a per-port basis. The default for each
+port will be the value of
+.Va hw.sfxge.mcdi_logging.
+The logging may also be enabled or disabled after the driver is loaded using the sysctl
+.Va dev.sfxge.%d.mcdi_logging.
.El
.Sh SUPPORT
For general information and support,
Modified: user/ngie/stable-10-libnv/share/mk/local.sys.mk
==============================================================================
--- user/ngie/stable-10-libnv/share/mk/local.sys.mk Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/share/mk/local.sys.mk Fri Jan 15 02:58:20 2016 (r294069)
@@ -3,7 +3,7 @@
.if defined(.PARSEDIR)
SRCTOP:= ${.PARSEDIR:tA:H:H}
.else
-SRCTOP:= ${.MAKE.MAKEFILES:M*/local.sys.mk:H:H:H}
+SRCTOP:= ${.MAKEFILE_LIST:M*/local.sys.mk:H:H:H}
.endif
.if ${.CURDIR} == ${SRCTOP}
Modified: user/ngie/stable-10-libnv/share/mk/sys.mk
==============================================================================
--- user/ngie/stable-10-libnv/share/mk/sys.mk Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/share/mk/sys.mk Fri Jan 15 02:58:20 2016 (r294069)
@@ -144,6 +144,8 @@ OBJCFLAGS ?= ${OBJCINCLUDES} ${CFLAGS} -
OBJCOPY ?= objcopy
+OBJDUMP ?= objdump
+
PC ?= pc
PFLAGS ?=
Modified: user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_proto.h Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_proto.h Fri Jan 15 02:58:20 2016 (r294069)
@@ -1023,7 +1023,7 @@ struct linux_set_robust_list_args {
};
struct linux_get_robust_list_args {
char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
- char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
+ char head_l_[PADL_(struct linux_robust_list_head **)]; struct linux_robust_list_head ** head; char head_r_[PADR_(struct linux_robust_list_head **)];
char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)];
};
struct linux_splice_args {
Modified: user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_systrace_args.c Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/amd64/linux32/linux32_systrace_args.c Fri Jan 15 02:58:20 2016 (r294069)
@@ -2122,7 +2122,7 @@ systrace_args(int sysnum, void *params,
case 312: {
struct linux_get_robust_list_args *p = params;
iarg[0] = p->pid; /* l_int */
- uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head * */
+ uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head ** */
uarg[2] = (intptr_t) p->len; /* l_size_t * */
*n_args = 3;
break;
@@ -5551,7 +5551,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_int";
break;
case 1:
- p = "struct linux_robust_list_head *";
+ p = "struct linux_robust_list_head **";
break;
case 2:
p = "l_size_t *";
Modified: user/ngie/stable-10-libnv/sys/amd64/linux32/syscalls.master
==============================================================================
--- user/ngie/stable-10-libnv/sys/amd64/linux32/syscalls.master Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/amd64/linux32/syscalls.master Fri Jan 15 02:58:20 2016 (r294069)
@@ -520,8 +520,8 @@
; linux 2.6.17:
311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
l_size_t len); }
-312 AUE_NULL STD { int linux_get_robust_list(l_int pid, struct linux_robust_list_head *head, \
- l_size_t *len); }
+312 AUE_NULL STD { int linux_get_robust_list(l_int pid, \
+ struct linux_robust_list_head **head, l_size_t *len); }
313 AUE_NULL STD { int linux_splice(void); }
314 AUE_NULL STD { int linux_sync_file_range(void); }
315 AUE_NULL STD { int linux_tee(void); }
Modified: user/ngie/stable-10-libnv/sys/boot/forth/loader.conf
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/forth/loader.conf Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/forth/loader.conf Fri Jan 15 02:58:20 2016 (r294069)
@@ -73,6 +73,7 @@ entropy_cache_type="/boot/entropy"
#password="" # Prevent changes to boot options
#bootlock_password="" # Prevent booting (see check-password.4th(8))
#geom_eli_passphrase_prompt="NO" # Prompt for geli(8) passphrase to mount root
+bootenv_autolist="YES" # Auto populate the list of ZFS Boot Environments
#beastie_disable="NO" # Turn the beastie boot menu on and off
#kernels="kernel kernel.old" # Kernels to display in the boot menu
#loader_logo="orbbw" # Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none
Modified: user/ngie/stable-10-libnv/sys/boot/forth/menu-commands.4th
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/forth/menu-commands.4th Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/forth/menu-commands.4th Fri Jan 15 02:58:20 2016 (r294069)
@@ -351,4 +351,68 @@ also menu-namespace also menu-command-he
2 goto_menu
;
+\
+\ Set boot environment defaults
+\
+
+: init_bootenv ( -- )
+ s" set menu_caption[1]=${bemenu_current}${vfs.root.mountfrom}" evaluate
+ s" set ansi_caption[1]=${beansi_current}${vfs.root.mountfrom}" evaluate
+ s" set menu_caption[2]=${bemenu_bootfs}${zfs_be_active}" evaluate
+ s" set ansi_caption[2]=${beansi_bootfs}${zfs_be_active}" evaluate
+ s" set menu_caption[3]=${bemenu_page}${zfs_be_currpage}${bemenu_pageof}${zfs_be_pages}" evaluate
+ s" set ansi_caption[3]=${beansi_page}${zfs_be_currpage}${bemenu_pageof}${zfs_be_pages}" evaluate
+;
+
+\
+\ Redraw the entire screen. A long BE name can corrupt the menu
+\
+
+: be_draw_screen
+ clear \ Clear the screen (in screen.4th)
+ print_version \ print version string (bottom-right; see version.4th)
+ draw-beastie \ Draw FreeBSD logo at right (in beastie.4th)
+ draw-brand \ Draw brand.4th logo at top (in brand.4th)
+ menu-init \ Initialize menu and draw bounding box (in menu.4th)
+;
+
+\
+\ Select a boot environment
+\
+
+: set_bootenv ( N -- N TRUE )
+ dup s" set vfs.root.mountfrom=${bootenv_root[E]}" 38 +c! evaluate
+ s" set currdev=${vfs.root.mountfrom}:" evaluate
+ s" unload" evaluate
+ free-module-options
+ s" /boot/defaults/loader.conf" read-conf
+ s" /boot/loader.conf" read-conf
+ s" /boot/loader.conf.local" read-conf
+ init_bootenv
+ be_draw_screen
+ menu-redraw
+ TRUE
+;
+
+\
+\ Switch to the next page of boot environments
+\
+
+: set_be_page ( N -- N TRUE )
+ s" zfs_be_currpage" getenv dup -1 = if
+ drop s" 1"
+ else
+ 0 s>d 2swap
+ >number ( ud caddr/u -- ud' caddr'/u' ) \ convert string to numbers
+ 2drop \ drop the string
+ 1 um/mod ( ud u1 -- u2 u3 ) \ convert double ud' to single u3' and remainder u2
+ swap drop ( ud2 u3 -- u3 ) \ drop the remainder u2
+ 1+ \ increment the page number
+ s>d <# #s #> \ convert back to a string
+ then
+ s" zfs_be_currpage" setenv
+ s" reloadbe" evaluate
+ 3 goto_menu
+;
+
only forth definitions
Modified: user/ngie/stable-10-libnv/sys/boot/forth/menu.rc
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/forth/menu.rc Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/forth/menu.rc Fri Jan 15 02:58:20 2016 (r294069)
@@ -68,6 +68,13 @@ set mainmenu_command[6]="2 goto_menu"
set mainmenu_keycode[6]=111
set mainansi_caption[6]="Configure Boot ^[1mO^[mptions..."
+s" currdev" getenv dup 0> [if] drop 4 s" zfs:" compare 0= [if]
+ set mainmenu_caption[7]="Select Boot [E]nvironment..."
+ set mainmenu_command[7]="3 goto_menu"
+ set mainmenu_keycode[7]=101
+ set mainansi_caption[7]="Select Boot ^[1mE^[37mnvironment..."
+[then] [else] drop [then]
+
\
\ BOOT OPTIONS MENU
\
@@ -119,6 +126,37 @@ set optionsmenu_keycode[6]=118
set optionsansi_caption[6]="^[1mV^[merbose..... ^[34;1mOff^[m"
set optionstoggled_ansi[6]="^[1mV^[merbose..... ^[32;7mOn^[m"
+\
+\ BOOT ENVIRONMENT MENU
+\
+
+set menuset_name3="bootenv"
+
+set bemenu_current="Active: "
+set beansi_current="^[1m${bemenu_current}^[m"
+set bemenu_bootfs="bootfs: "
+set beansi_bootfs="^[1m${bemenu_bootfs}^[m"
+set bemenu_page="[P]age: "
+set beansi_page="^[1mP^[mage: "
+set bemenu_pageof=" of "
+set beansi_pageof="${bemenu_pageof}"
+set zfs_be_currpage=1
+
+set bootenvmenu_init="init_bootenv"
+
+set bootenvmenu_command[1]="be_draw_screen 1 goto_menu"
+set bootenvmenu_keycode[1]=8
+
+set bootenvmenu_command[2]="set_bootenv"
+set bootenvmenu_keycode[2]=97
+set bootenv_root[2]="${zfs_be_active}"
+
+set bootenvmenu_command[3]="set_be_page"
+set bootenvmenu_keycode[3]=112
+
+set bootenvmenu_options=4
+set bootenvmenu_optionstext="Boot Environments:"
+
\ Enable automatic booting (add ``autoboot_delay=N'' to loader.conf(5) to
\ customize the timeout; default is 10-seconds)
\
@@ -128,6 +166,21 @@ set menu_timeout_command="boot"
\
try-include /boot/menu.rc.local
+\ Initialize boot environment variables
+\
+s" reloadbe" sfind ( xt|0 bool ) [if]
+ s" bootenv_autolist" getenv dup -1 = [if]
+ drop s" execute" evaluate \ Use evaluate to avoid passing
+ \ reloadbe an optional parameter
+ [else]
+ s" YES" compare-insensitive 0= [if]
+ s" execute" evaluate
+ [then]
+ [then]
+[else]
+ drop ( xt=0 )
+[then]
+
\ Display the main menu (see `menu.4th')
set menuset_initial=1
menuset-loadinitial
Modified: user/ngie/stable-10-libnv/sys/boot/forth/support.4th
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/forth/support.4th Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/forth/support.4th Fri Jan 15 02:58:20 2016 (r294069)
@@ -930,6 +930,30 @@ only forth definitions also support-func
repeat
;
+: free-one-module { addr -- addr }
+ addr module.name strfree
+ addr module.loadname strfree
+ addr module.type strfree
+ addr module.args strfree
+ addr module.beforeload strfree
+ addr module.afterload strfree
+ addr module.loaderror strfree
+ addr
+;
+
+: free-module-options
+ module_options @
+ begin
+ ?dup
+ while
+ free-one-module
+ dup module.next @
+ swap free-memory
+ repeat
+ 0 module_options !
+ 0 last_module_option !
+;
+
only forth also support-functions definitions
\ Variables used for processing multiple conf files
Modified: user/ngie/stable-10-libnv/sys/boot/i386/loader/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/i386/loader/main.c Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/i386/loader/main.c Fri Jan 15 02:58:20 2016 (r294069)
@@ -69,6 +69,7 @@ static int isa_inb(int port);
static void isa_outb(int port, int value);
void exit(int code);
#ifdef LOADER_ZFS_SUPPORT
+static void init_zfs_bootenv(char *currdev);
static void i386_zfs_probe(void);
#endif
@@ -291,12 +292,45 @@ extract_currdev(void)
new_currdev.d_unit = 0;
}
+#ifdef LOADER_ZFS_SUPPORT
+ if (new_currdev.d_type == DEVT_ZFS)
+ init_zfs_bootenv(zfs_fmtdev(&new_currdev));
+#endif
+
env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev),
i386_setcurrdev, env_nounset);
env_setenv("loaddev", EV_VOLATILE, i386_fmtdev(&new_currdev), env_noset,
env_nounset);
}
+#ifdef LOADER_ZFS_SUPPORT
+static void
+init_zfs_bootenv(char *currdev)
+{
+ char *beroot;
+
+ if (strlen(currdev) == 0)
+ return;
+ if(strncmp(currdev, "zfs:", 4) != 0)
+ return;
+ /* Remove the trailing : */
+ currdev[strlen(currdev) - 1] = '\0';
+ setenv("zfs_be_active", currdev, 1);
+ setenv("zfs_be_currpage", "1", 1);
+ /* Do not overwrite if already set */
+ setenv("vfs.root.mountfrom", currdev, 0);
+ /* Forward past zfs: */
+ currdev = strchr(currdev, ':');
+ currdev++;
+ /* Remove the last element (current bootenv) */
+ beroot = strrchr(currdev, '/');
+ if (beroot != NULL)
+ beroot[0] = '\0';
+ beroot = currdev;
+ setenv("zfs_be_root", beroot, 1);
+}
+#endif
+
COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot);
static int
@@ -350,6 +384,40 @@ command_lszfs(int argc, char *argv[])
command_errmsg = strerror(err);
return (CMD_ERROR);
}
+
+ return (CMD_OK);
+}
+
+COMMAND_SET(reloadbe, "reloadbe", "refresh the list of ZFS Boot Environments",
+ command_reloadbe);
+
+static int
+command_reloadbe(int argc, char *argv[])
+{
+ int err;
+ char *root;
+
+ if (argc > 2) {
+ command_errmsg = "wrong number of arguments";
+ return (CMD_ERROR);
+ }
+
+ if (argc == 2) {
+ err = zfs_bootenv(argv[1]);
+ } else {
+ root = getenv("zfs_be_root");
+ if (root == NULL) {
+ /* There does not appear to be a ZFS pool here, exit without error */
+ return (CMD_OK);
+ }
+ err = zfs_bootenv(getenv("zfs_be_root"));
+ }
+
+ if (err != 0) {
+ command_errmsg = strerror(err);
+ return (CMD_ERROR);
+ }
+
return (CMD_OK);
}
#endif
Modified: user/ngie/stable-10-libnv/sys/boot/userboot/userboot/main.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/userboot/userboot/main.c Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/userboot/userboot/main.c Fri Jan 15 02:58:20 2016 (r294069)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
static void userboot_zfs_probe(void);
static int userboot_zfs_found;
+static void init_zfs_bootenv(char *currdev);
#endif
#define USERBOOT_VERSION USERBOOT_VERSION_3
@@ -167,6 +168,7 @@ extract_currdev(void)
zdev.d_type = zdev.d_dev->dv_type;
dev = *(struct disk_devdesc *)&zdev;
+ init_zfs_bootenv(zfs_fmtdev(&dev));
} else
#endif
@@ -198,6 +200,32 @@ extract_currdev(void)
#if defined(USERBOOT_ZFS_SUPPORT)
static void
+init_zfs_bootenv(char *currdev)
+{
+ char *beroot;
+
+ if (strlen(currdev) == 0)
+ return;
+ if(strncmp(currdev, "zfs:", 4) != 0)
+ return;
+ /* Remove the trailing : */
+ currdev[strlen(currdev) - 1] = '\0';
+ setenv("zfs_be_active", currdev, 1);
+ setenv("zfs_be_currpage", "1", 1);
+ /* Do not overwrite if already set */
+ setenv("vfs.root.mountfrom", currdev, 0);
+ /* Forward past zfs: */
+ currdev = strchr(currdev, ':');
+ currdev++;
+ /* Remove the last element (current bootenv) */
+ beroot = strrchr(currdev, '/');
+ if (beroot != NULL)
+ beroot[0] = '\0';
+ beroot = currdev;
+ setenv("zfs_be_root", beroot, 1);
+}
+
+static void
userboot_zfs_probe(void)
{
char devname[32];
@@ -237,6 +265,38 @@ command_lszfs(int argc, char *argv[])
}
return (CMD_OK);
}
+
+COMMAND_SET(reloadbe, "reloadbe", "refresh the list of ZFS Boot Environments",
+ command_reloadbe);
+
+static int
+command_reloadbe(int argc, char *argv[])
+{
+ int err;
+ char *root;
+
+ if (argc > 2) {
+ command_errmsg = "wrong number of arguments";
+ return (CMD_ERROR);
+ }
+
+ if (argc == 2) {
+ err = zfs_bootenv(argv[1]);
+ } else {
+ root = getenv("zfs_be_root");
+ if (root == NULL) {
+ return (CMD_OK);
+ }
+ err = zfs_bootenv(root);
+ }
+
+ if (err != 0) {
+ command_errmsg = strerror(err);
+ return (CMD_ERROR);
+ }
+
+ return (CMD_OK);
+}
#endif /* USERBOOT_ZFS_SUPPORT */
COMMAND_SET(quit, "quit", "exit the loader", command_quit);
Modified: user/ngie/stable-10-libnv/sys/boot/zfs/libzfs.h
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/zfs/libzfs.h Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/zfs/libzfs.h Fri Jan 15 02:58:20 2016 (r294069)
@@ -62,6 +62,9 @@ int zfs_parsedev(struct zfs_devdesc *dev
char *zfs_fmtdev(void *vdev);
int zfs_probe_dev(const char *devname, uint64_t *pool_guid);
int zfs_list(const char *name);
+int zfs_bootenv(const char *name);
+int zfs_belist_add(const char *name);
+int zfs_set_env(void);
extern struct devsw zfs_dev;
extern struct fs_ops zfs_fsops;
Modified: user/ngie/stable-10-libnv/sys/boot/zfs/zfs.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/zfs/zfs.c Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/zfs/zfs.c Fri Jan 15 02:58:20 2016 (r294069)
@@ -48,6 +48,10 @@ __FBSDID("$FreeBSD$");
#include "zfsimpl.c"
+/* Define the range of indexes to be populated with ZFS Boot Environments */
+#define ZFS_BE_FIRST 4
+#define ZFS_BE_LAST 8
+
static int zfs_open(const char *path, struct open_file *f);
static int zfs_write(struct open_file *f, void *buf, size_t size, size_t *resid);
static int zfs_close(struct open_file *f);
@@ -80,6 +84,16 @@ struct file {
zap_leaf_phys_t *f_zap_leaf; /* zap leaf buffer */
};
+static int zfs_env_index;
+static int zfs_env_count;
+
+SLIST_HEAD(zfs_be_list, zfs_be_entry) zfs_be_head = SLIST_HEAD_INITIALIZER(zfs_be_head);
+struct zfs_be_list *zfs_be_headp;
+struct zfs_be_entry {
+ const char *name;
+ SLIST_ENTRY(zfs_be_entry) entries;
+} *zfs_be, *zfs_be_tmp;
+
/*
* Open a file.
*/
@@ -691,6 +705,161 @@ zfs_list(const char *name)
rv = zfs_lookup_dataset(spa, dsname, &objid);
if (rv != 0)
return (rv);
- rv = zfs_list_dataset(spa, objid);
+
+ return (zfs_list_dataset(spa, objid));
+}
+
+int
+zfs_bootenv(const char *name)
+{
+ static char poolname[ZFS_MAXNAMELEN], *dsname, *root;
+ char becount[4];
+ uint64_t objid;
+ spa_t *spa;
+ int len, rv, pages, perpage, currpage;
+
+ if (name == NULL)
+ return (EINVAL);
+ if ((root = getenv("zfs_be_root")) == NULL)
+ return (EINVAL);
+
+ if (strcmp(name, root) != 0) {
+ if (setenv("zfs_be_root", name, 1) != 0)
+ return (ENOMEM);
+ }
+
+ SLIST_INIT(&zfs_be_head);
+ zfs_env_count = 0;
+ len = strlen(name);
+ dsname = strchr(name, '/');
+ if (dsname != NULL) {
+ len = dsname - name;
+ dsname++;
+ } else
+ dsname = "";
+ memcpy(poolname, name, len);
+ poolname[len] = '\0';
+
+ spa = spa_find_by_name(poolname);
+ if (!spa)
+ return (ENXIO);
+ rv = zfs_lookup_dataset(spa, dsname, &objid);
+ if (rv != 0)
+ return (rv);
+ rv = zfs_callback_dataset(spa, objid, zfs_belist_add);
+
+ /* Calculate and store the number of pages of BEs */
+ perpage = (ZFS_BE_LAST - ZFS_BE_FIRST + 1);
+ pages = (zfs_env_count / perpage) + ((zfs_env_count % perpage) > 0 ? 1 : 0);
+ snprintf(becount, 4, "%d", pages);
+ if (setenv("zfs_be_pages", becount, 1) != 0)
+ return (ENOMEM);
+
+ /* Roll over the page counter if it has exceeded the maximum */
+ currpage = strtol(getenv("zfs_be_currpage"), NULL, 10);
+ if (currpage > pages) {
+ if (setenv("zfs_be_currpage", "1", 1) != 0)
+ return (ENOMEM);
+ }
+
+ /* Populate the menu environment variables */
+ zfs_set_env();
+
+ /* Clean up the SLIST of ZFS BEs */
+ while (!SLIST_EMPTY(&zfs_be_head)) {
+ zfs_be = SLIST_FIRST(&zfs_be_head);
+ SLIST_REMOVE_HEAD(&zfs_be_head, entries);
+ free(zfs_be);
+ }
+
return (rv);
}
+
+int
+zfs_belist_add(const char *name)
+{
+
+ /* Add the boot environment to the head of the SLIST */
+ zfs_be = malloc(sizeof(struct zfs_be_entry));
+ zfs_be->name = name;
+ SLIST_INSERT_HEAD(&zfs_be_head, zfs_be, entries);
+ zfs_env_count++;
+
+ return (0);
+}
+
+int
+zfs_set_env(void)
+{
+ char envname[32], envval[256];
+ char *beroot, *pagenum;
+ int rv, page, ctr;
+
+ beroot = getenv("zfs_be_root");
+ if (beroot == NULL) {
+ return (1);
+ }
+
+ pagenum = getenv("zfs_be_currpage");
+ if (pagenum != NULL) {
+ page = strtol(pagenum, NULL, 10);
+ } else {
+ page = 1;
+ }
+
+ ctr = 1;
+ rv = 0;
+ zfs_env_index = ZFS_BE_FIRST;
+ SLIST_FOREACH_SAFE(zfs_be, &zfs_be_head, entries, zfs_be_tmp) {
+ /* Skip to the requested page number */
+ if (ctr <= ((ZFS_BE_LAST - ZFS_BE_FIRST + 1) * (page - 1))) {
+ ctr++;
+ continue;
+ }
+
+ snprintf(envname, sizeof(envname), "bootenvmenu_caption[%d]", zfs_env_index);
+ snprintf(envval, sizeof(envval), "%s", zfs_be->name);
+ rv = setenv(envname, envval, 1);
+ if (rv != 0) {
+ break;
+ }
+
+ snprintf(envname, sizeof(envname), "bootenvansi_caption[%d]", zfs_env_index);
+ rv = setenv(envname, envval, 1);
+ if (rv != 0){
+ break;
+ }
+
+ snprintf(envname, sizeof(envname), "bootenvmenu_command[%d]", zfs_env_index);
+ rv = setenv(envname, "set_bootenv", 1);
+ if (rv != 0){
+ break;
+ }
+
+ snprintf(envname, sizeof(envname), "bootenv_root[%d]", zfs_env_index);
+ snprintf(envval, sizeof(envval), "zfs:%s/%s", beroot, zfs_be->name);
+ rv = setenv(envname, envval, 1);
+ if (rv != 0){
+ break;
+ }
+
+ zfs_env_index++;
+ if (zfs_env_index > ZFS_BE_LAST) {
+ break;
+ }
+
+ }
+
+ for (; zfs_env_index <= ZFS_BE_LAST; zfs_env_index++) {
+ snprintf(envname, sizeof(envname), "bootenvmenu_caption[%d]", zfs_env_index);
+ (void)unsetenv(envname);
+ snprintf(envname, sizeof(envname), "bootenvansi_caption[%d]", zfs_env_index);
+ (void)unsetenv(envname);
+ snprintf(envname, sizeof(envname), "bootenvmenu_command[%d]", zfs_env_index);
+ (void)unsetenv(envname);
+ snprintf(envname, sizeof(envname), "bootenv_root[%d]", zfs_env_index);
+ (void)unsetenv(envname);
+ }
+
+ return (rv);
+}
\ No newline at end of file
Modified: user/ngie/stable-10-libnv/sys/boot/zfs/zfsimpl.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/boot/zfs/zfsimpl.c Fri Jan 15 02:33:47 2016 (r294068)
+++ user/ngie/stable-10-libnv/sys/boot/zfs/zfsimpl.c Fri Jan 15 02:58:20 2016 (r294069)
@@ -1473,7 +1473,7 @@ zap_lookup(const spa_t *spa, const dnode
* the directory contents.
*/
static int
-mzap_list(const dnode_phys_t *dnode)
+mzap_list(const dnode_phys_t *dnode, int (*callback)(const char *))
{
const mzap_phys_t *mz;
const mzap_ent_phys_t *mze;
@@ -1492,7 +1492,7 @@ mzap_list(const dnode_phys_t *dnode)
mze = &mz->mz_chunk[i];
if (mze->mze_name[0])
//printf("%-32s 0x%jx\n", mze->mze_name, (uintmax_t)mze->mze_value);
- printf("%s\n", mze->mze_name);
+ callback(mze->mze_name);
}
return (0);
@@ -1503,7 +1503,7 @@ mzap_list(const dnode_phys_t *dnode)
* the directory header.
*/
static int
-fzap_list(const spa_t *spa, const dnode_phys_t *dnode)
+fzap_list(const spa_t *spa, const dnode_phys_t *dnode, int (*callback)(const char *))
{
int bsize = dnode->dn_datablkszsec << SPA_MINBLOCKSHIFT;
zap_phys_t zh = *(zap_phys_t *) zap_scratch;
@@ -1566,13 +1566,21 @@ fzap_list(const spa_t *spa, const dnode_
value = fzap_leaf_value(&zl, zc);
//printf("%s 0x%jx\n", name, (uintmax_t)value);
- printf("%s\n", name);
+ callback((const char *)name);
}
}
return (0);
}
+static int zfs_printf(const char *name)
+{
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Fri Jan 15 09:01:55 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 801C2A839CC
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 15 Jan 2016 09:01:55 +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 2C79112AC;
Fri, 15 Jan 2016 09:01:55 +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 u0F91sHA061089;
Fri, 15 Jan 2016 09:01:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0F91sCM061088;
Fri, 15 Jan 2016 09:01:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601150901.u0F91sCM061088@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, 15 Jan 2016 09:01:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294083 - user/ngie/stable-10-ixgbe-upgrade
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, 15 Jan 2016 09:01:55 -0000
Author: ngie
Date: Fri Jan 15 09:01:53 2016
New Revision: 294083
URL: https://svnweb.freebsd.org/changeset/base/294083
Log:
Copy ^/stable/10 to a branch to test the ixgbe upgrade for stable/10
Added:
- copied from r294082, stable/10/
Directory Properties:
user/ngie/stable-10-ixgbe-upgrade/ (props changed)
From owner-svn-src-user@freebsd.org Fri Jan 15 09:23: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 AE826A840CF
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 15 Jan 2016 09:23: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 73F111220;
Fri, 15 Jan 2016 09:23: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 u0F9NC9M067473;
Fri, 15 Jan 2016 09:23:12 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0F9NCiM067470;
Fri, 15 Jan 2016 09:23:12 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601150923.u0F9NCiM067470@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, 15 Jan 2016 09:23:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294085 - in user/ngie/stable-10-libnv:
release/doc/share/xml sys/dev/ixgbe sys/net
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, 15 Jan 2016 09:23:13 -0000
Author: ngie
Date: Fri Jan 15 09:23:12 2016
New Revision: 294085
URL: https://svnweb.freebsd.org/changeset/base/294085
Log:
MFstable/10 @ r294084
Modified:
user/ngie/stable-10-libnv/release/doc/share/xml/security.xml
user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ix.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ixv.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/ix_txrx.c
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe.h
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_mbx.h
user/ngie/stable-10-libnv/sys/dev/ixgbe/ixgbe_vf.c
user/ngie/stable-10-libnv/sys/net/if_lagg.c
Directory Properties:
user/ngie/stable-10-libnv/ (props changed)
Modified: user/ngie/stable-10-libnv/release/doc/share/xml/security.xml
==============================================================================
--- user/ngie/stable-10-libnv/release/doc/share/xml/security.xml Fri Jan 15 09:05:14 2016 (r294084)
+++ user/ngie/stable-10-libnv/release/doc/share/xml/security.xml Fri Jan 15 09:23:12 2016 (r294085)
@@ -57,14 +57,14 @@
<row>
<entry><link
xlink:href="&security.url;/FreeBSD-SA-16:01.sctp.asc">FreeBSD-SA-16:01.sctp</link></entry>
- <entry>15 January 2016</entry>
+ <entry>14 January 2016</entry>
<entry><para>ICMPv6 error message vulnerability</para></entry>
</row>
<row>
<entry><link
xlink:href="&security.url;/FreeBSD-SA-16:02.ntp.asc">FreeBSD-SA-16:02.ntp</link></entry>
- <entry>15 January 2016</entry>
+ <entry>14 January 2016</entry>
<entry><para>Panic threshold bypass
vulnerability</para></entry>
</row>
@@ -72,7 +72,7 @@
<row>
<entry><link
xlink:href="&security.url;/FreeBSD-SA-16:03.linux.asc">FreeBSD-SA-16:03.linux</link></entry>
- <entry>15 January 2016</entry>
+ <entry>14 January 2016</entry>
<entry><para>Incorrect <literal>futex</literal>
handling</para></entry>
</row>
@@ -80,7 +80,7 @@
<row>
<entry><link
xlink:href="&security.url;/FreeBSD-SA-16:04.linux.asc">FreeBSD-SA-16:04.linux</link></entry>
- <entry>15 January 2016</entry>
+ <entry>14 January 2016</entry>
<entry><para>&man.setgroups.2; system call
vulnerability</para></entry>
</row>
@@ -88,17 +88,25 @@
<row>
<entry><link
xlink:href="&security.url;/FreeBSD-SA-16:05.tcp.asc">FreeBSD-SA-16:05.tcp</link></entry>
- <entry>15 January 2016</entry>
+ <entry>14 January 2016</entry>
<entry><para>MD5 signature denial of service</para></entry>
</row>
<row>
<entry><link
xlink:href="&security.url;/FreeBSD-SA-16:06.bsnmpd.asc">FreeBSD-SA-16:06.bsnmpd</link></entry>
- <entry>15 January 2016</entry>
+ <entry>14 January 2016</entry>
<entry><para>Insecure default configuration file
permissions</para></entry>
</row>
+
+ <row>
+ <entry><link
+ xlink:href="&security.url;/FreeBSD-SA-16:07.openssh.asc">FreeBSD-SA-16:07.openssh</link></entry>
+ <entry>14 January 2016</entry>
+ <entry><para><application>OpenSSH</application> client
+ information leak</para></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
Modified: user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ix.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ix.c Fri Jan 15 09:05:14 2016 (r294084)
+++ user/ngie/stable-10-libnv/sys/dev/ixgbe/if_ix.c Fri Jan 15 09:23:12 2016 (r294085)
@@ -40,11 +40,6 @@
#include "ixgbe.h"
-#ifdef RSS
-#include <net/rss_config.h>
-#include <netinet/in_rss.h>
-#endif
-
/*********************************************************************
* Set this to one to display debug statistics
*********************************************************************/
@@ -53,7 +48,7 @@ int ixgbe_display_debug_stat
/*********************************************************************
* Driver version
*********************************************************************/
-char ixgbe_driver_version[] = "3.1.0";
+char ixgbe_driver_version[] = "2.8.3";
/*********************************************************************
* PCI Device ID Table
@@ -137,7 +132,6 @@ static int ixgbe_setup_msix(struct adapt
static void ixgbe_free_pci_resources(struct adapter *);
static void ixgbe_local_timer(void *);
static int ixgbe_setup_interface(device_t, struct adapter *);
-static void ixgbe_config_gpie(struct adapter *);
static void ixgbe_config_dmac(struct adapter *);
static void ixgbe_config_delay_values(struct adapter *);
static void ixgbe_config_link(struct adapter *);
@@ -206,18 +200,6 @@ static void ixgbe_handle_phy(void *, int
static void ixgbe_reinit_fdir(void *, int);
#endif
-#ifdef PCI_IOV
-static void ixgbe_ping_all_vfs(struct adapter *);
-static void ixgbe_handle_mbx(void *, int);
-static int ixgbe_init_iov(device_t, u16, const nvlist_t *);
-static void ixgbe_uninit_iov(device_t);
-static int ixgbe_add_vf(device_t, u16, const nvlist_t *);
-static void ixgbe_initialize_iov(struct adapter *);
-static void ixgbe_recalculate_max_frame(struct adapter *);
-static void ixgbe_init_vf(struct adapter *, struct ixgbe_vf *);
-#endif /* PCI_IOV */
-
-
/*********************************************************************
* FreeBSD Device Interface Entry Points
*********************************************************************/
@@ -230,11 +212,6 @@ static device_method_t ix_methods[] = {
DEVMETHOD(device_shutdown, ixgbe_shutdown),
DEVMETHOD(device_suspend, ixgbe_suspend),
DEVMETHOD(device_resume, ixgbe_resume),
-#ifdef PCI_IOV
- DEVMETHOD(pci_iov_init, ixgbe_init_iov),
- DEVMETHOD(pci_iov_uninit, ixgbe_uninit_iov),
- DEVMETHOD(pci_iov_add_vf, ixgbe_add_vf),
-#endif /* PCI_IOV */
DEVMETHOD_END
};
@@ -247,9 +224,6 @@ DRIVER_MODULE(ix, pci, ix_driver, ix_dev
MODULE_DEPEND(ix, pci, 1, 1, 1);
MODULE_DEPEND(ix, ether, 1, 1, 1);
-#ifdef DEV_NETMAP
-MODULE_DEPEND(ix, netmap, 1, 1, 1);
-#endif /* DEV_NETMAP */
/*
** TUNEABLE PARAMETERS:
@@ -317,7 +291,8 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix
static int ixgbe_num_queues = 0;
TUNABLE_INT("hw.ix.num_queues", &ixgbe_num_queues);
SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, &ixgbe_num_queues, 0,
- "Number of queues to configure, 0 indicates autoconfigure");
+ "Number of queues to configure up to a maximum of 8; "
+ "0 indicates autoconfigure");
/*
** Number of TX descriptors per ring,
@@ -369,8 +344,6 @@ static int fdir_pballoc = 1;
#include <dev/netmap/ixgbe_netmap.h>
#endif /* DEV_NETMAP */
-static MALLOC_DEFINE(M_IXGBE, "ix", "ix driver allocations");
-
/*********************************************************************
* Device identification routine
*
@@ -474,15 +447,6 @@ ixgbe_attach(device_t dev)
"max number of tx packets to process",
&adapter->tx_process_limit, ixgbe_tx_process_limit);
- /* Sysctls for limiting the amount of work done in the taskqueues */
- ixgbe_set_sysctl_value(adapter, "rx_processing_limit",
- "max number of rx packets to process",
- &adapter->rx_process_limit, ixgbe_rx_process_limit);
-
- ixgbe_set_sysctl_value(adapter, "tx_processing_limit",
- "max number of tx packets to process",
- &adapter->tx_process_limit, ixgbe_tx_process_limit);
-
/* Do descriptor calc and sanity checks */
if (((ixgbe_txd * sizeof(union ixgbe_adv_tx_desc)) % DBA_ALIGN) != 0 ||
ixgbe_txd < MIN_TXD || ixgbe_txd > MAX_TXD) {
@@ -520,7 +484,7 @@ ixgbe_attach(device_t dev)
}
/* Allocate multicast array memory. */
- adapter->mta = malloc(sizeof(*adapter->mta) *
+ adapter->mta = malloc(sizeof(u8) * IXGBE_ETH_LENGTH_OF_ADDRESS *
MAX_NUM_MULTICAST_ADDRESSES, M_DEVBUF, M_NOWAIT);
if (adapter->mta == NULL) {
device_printf(dev, "Can not allocate multicast setup array\n");
@@ -602,32 +566,9 @@ ixgbe_attach(device_t dev)
/* Check PCIE slot type/speed/width */
ixgbe_get_slot_info(hw);
-
/* Set an initial default flow control value */
adapter->fc = ixgbe_fc_full;
-#ifdef PCI_IOV
- if ((hw->mac.type != ixgbe_mac_82598EB) && (adapter->msix > 1)) {
- nvlist_t *pf_schema, *vf_schema;
-
- hw->mbx.ops.init_params(hw);
- pf_schema = pci_iov_schema_alloc_node();
- vf_schema = pci_iov_schema_alloc_node();
- pci_iov_schema_add_unicast_mac(vf_schema, "mac-addr", 0, NULL);
- pci_iov_schema_add_bool(vf_schema, "mac-anti-spoof",
- IOV_SCHEMA_HASDEFAULT, TRUE);
- pci_iov_schema_add_bool(vf_schema, "allow-set-mac",
- IOV_SCHEMA_HASDEFAULT, FALSE);
- pci_iov_schema_add_bool(vf_schema, "allow-promisc",
- IOV_SCHEMA_HASDEFAULT, FALSE);
- error = pci_iov_attach(dev, pf_schema, vf_schema);
- if (error != 0) {
- device_printf(dev,
- "Error %d setting up SR-IOV\n", error);
- }
- }
-#endif /* PCI_IOV */
-
/* Check for certain supported features */
ixgbe_check_wol_support(adapter);
ixgbe_check_eee_support(adapter);
@@ -684,13 +625,6 @@ ixgbe_detach(device_t dev)
return (EBUSY);
}
-#ifdef PCI_IOV
- if (pci_iov_detach(dev) != 0) {
- device_printf(dev, "SR-IOV in use; detach first.\n");
- return (EBUSY);
- }
-#endif /* PCI_IOV */
-
/* Stop the adapter */
IXGBE_CORE_LOCK(adapter);
ixgbe_setup_low_power_mode(adapter);
@@ -711,9 +645,6 @@ ixgbe_detach(device_t dev)
taskqueue_drain(adapter->tq, &adapter->link_task);
taskqueue_drain(adapter->tq, &adapter->mod_task);
taskqueue_drain(adapter->tq, &adapter->msf_task);
-#ifdef PCI_IOV
- taskqueue_drain(adapter->tq, &adapter->mbx_task);
-#endif
taskqueue_drain(adapter->tq, &adapter->phy_task);
#ifdef IXGBE_FDIR
taskqueue_drain(adapter->tq, &adapter->fdir_task);
@@ -890,9 +821,6 @@ ixgbe_ioctl(struct ifnet * ifp, u_long c
adapter->max_frame_size =
ifp->if_mtu + IXGBE_MTU_HDR;
ixgbe_init_locked(adapter);
-#ifdef PCI_IOV
- ixgbe_recalculate_max_frame(adapter);
-#endif
IXGBE_CORE_UNLOCK(adapter);
}
break;
@@ -1008,36 +936,22 @@ ixgbe_init_locked(struct adapter *adapte
struct ifnet *ifp = adapter->ifp;
device_t dev = adapter->dev;
struct ixgbe_hw *hw = &adapter->hw;
- struct tx_ring *txr;
- struct rx_ring *rxr;
- u32 txdctl, mhadd;
+ u32 k, txdctl, mhadd, gpie;
u32 rxdctl, rxctrl;
-#ifdef PCI_IOV
- enum ixgbe_iov_mode mode;
-#endif
mtx_assert(&adapter->core_mtx, MA_OWNED);
INIT_DEBUGOUT("ixgbe_init_locked: begin");
-
hw->adapter_stopped = FALSE;
ixgbe_stop_adapter(hw);
callout_stop(&adapter->timer);
-#ifdef PCI_IOV
- mode = ixgbe_get_iov_mode(adapter);
- adapter->pool = ixgbe_max_vfs(mode);
- /* Queue indices may change with IOV mode */
- for (int i = 0; i < adapter->num_queues; i++) {
- adapter->rx_rings[i].me = ixgbe_pf_que_index(mode, i);
- adapter->tx_rings[i].me = ixgbe_pf_que_index(mode, i);
- }
-#endif
/* reprogram the RAR[0] in case user changed it. */
- ixgbe_set_rar(hw, 0, hw->mac.addr, adapter->pool, IXGBE_RAH_AV);
+ ixgbe_set_rar(hw, 0, adapter->hw.mac.addr, 0, IXGBE_RAH_AV);
/* Get the latest mac address, User can use a LAA */
- bcopy(IF_LLADDR(ifp), hw->mac.addr, IXGBE_ETH_LENGTH_OF_ADDRESS);
- ixgbe_set_rar(hw, 0, hw->mac.addr, adapter->pool, 1);
+ bcopy(IF_LLADDR(adapter->ifp), hw->mac.addr,
+ IXGBE_ETH_LENGTH_OF_ADDRESS);
+ ixgbe_set_rar(hw, 0, hw->mac.addr, 0, 1);
hw->addr_ctrl.rar_used_count = 1;
/* Set the various hardware offload abilities */
@@ -1060,9 +974,6 @@ ixgbe_init_locked(struct adapter *adapte
}
ixgbe_init_hw(hw);
-#ifdef PCI_IOV
- ixgbe_initialize_iov(adapter);
-#endif
ixgbe_initialize_transmit_units(adapter);
/* Setup Multicast table */
@@ -1072,10 +983,14 @@ ixgbe_init_locked(struct adapter *adapte
** Determine the correct mbuf pool
** for doing jumbo frames
*/
- if (adapter->max_frame_size <= MCLBYTES)
+ if (adapter->max_frame_size <= 2048)
adapter->rx_mbuf_sz = MCLBYTES;
- else
+ else if (adapter->max_frame_size <= 4096)
adapter->rx_mbuf_sz = MJUMPAGESIZE;
+ else if (adapter->max_frame_size <= 9216)
+ adapter->rx_mbuf_sz = MJUM9BYTES;
+ else
+ adapter->rx_mbuf_sz = MJUM16BYTES;
/* Prepare receive descriptors and buffers */
if (ixgbe_setup_receive_structures(adapter)) {
@@ -1087,8 +1002,31 @@ ixgbe_init_locked(struct adapter *adapte
/* Configure RX settings */
ixgbe_initialize_receive_units(adapter);
- /* Enable SDP & MSIX interrupts based on adapter */
- ixgbe_config_gpie(adapter);
+ gpie = IXGBE_READ_REG(&adapter->hw, IXGBE_GPIE);
+
+ /* Enable Fan Failure Interrupt */
+ gpie |= IXGBE_SDP1_GPIEN_BY_MAC(hw);
+
+ /* Add for Module detection */
+ if (hw->mac.type == ixgbe_mac_82599EB)
+ gpie |= IXGBE_SDP2_GPIEN;
+
+ /*
+ * Thermal Failure Detection (X540)
+ * Link Detection (X552)
+ */
+ if (hw->mac.type == ixgbe_mac_X540 ||
+ hw->device_id == IXGBE_DEV_ID_X550EM_X_SFP ||
+ hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T)
+ gpie |= IXGBE_SDP0_GPIEN_X540;
+
+ if (adapter->msix > 1) {
+ /* Enable Enhanced MSIX mode */
+ gpie |= IXGBE_GPIE_MSIX_MODE;
+ gpie |= IXGBE_GPIE_EIAME | IXGBE_GPIE_PBA_SUPPORT |
+ IXGBE_GPIE_OCD;
+ }
+ IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
/* Set MTU size */
if (ifp->if_mtu > ETHERMTU) {
@@ -1101,8 +1039,7 @@ ixgbe_init_locked(struct adapter *adapte
/* Now enable all the queues */
for (int i = 0; i < adapter->num_queues; i++) {
- txr = &adapter->tx_rings[i];
- txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(txr->me));
+ txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(i));
txdctl |= IXGBE_TXDCTL_ENABLE;
/* Set WTHRESH to 8, burst writeback */
txdctl |= (8 << 16);
@@ -1114,12 +1051,11 @@ ixgbe_init_locked(struct adapter *adapte
* Prefetching enables tx line rate even with 1 queue.
*/
txdctl |= (32 << 0) | (1 << 8);
- IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(txr->me), txdctl);
+ IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(i), txdctl);
}
- for (int i = 0, j = 0; i < adapter->num_queues; i++) {
- rxr = &adapter->rx_rings[i];
- rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
+ for (int i = 0; i < adapter->num_queues; i++) {
+ rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
if (hw->mac.type == ixgbe_mac_82598EB) {
/*
** PTHRESH = 21
@@ -1130,9 +1066,9 @@ ixgbe_init_locked(struct adapter *adapte
rxdctl |= 0x080420;
}
rxdctl |= IXGBE_RXDCTL_ENABLE;
- IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), rxdctl);
- for (; j < 10; j++) {
- if (IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me)) &
+ IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), rxdctl);
+ for (k = 0; k < 10; k++) {
+ if (IXGBE_READ_REG(hw, IXGBE_RXDCTL(i)) &
IXGBE_RXDCTL_ENABLE)
break;
else
@@ -1161,10 +1097,10 @@ ixgbe_init_locked(struct adapter *adapte
struct netmap_kring *kring = &na->rx_rings[i];
int t = na->num_rx_desc - 1 - nm_kr_rxspace(kring);
- IXGBE_WRITE_REG(hw, IXGBE_RDT(rxr->me), t);
+ IXGBE_WRITE_REG(hw, IXGBE_RDT(i), t);
} else
#endif /* DEV_NETMAP */
- IXGBE_WRITE_REG(hw, IXGBE_RDT(rxr->me), adapter->num_rx_desc - 1);
+ IXGBE_WRITE_REG(hw, IXGBE_RDT(i), adapter->num_rx_desc - 1);
}
/* Enable Receive engine */
@@ -1203,9 +1139,9 @@ ixgbe_init_locked(struct adapter *adapte
#endif
/*
- * Check on any SFP devices that
- * need to be kick-started
- */
+ ** Check on any SFP devices that
+ ** need to be kick-started
+ */
if (hw->phy.type == ixgbe_phy_none) {
int err = hw->phy.ops.identify(hw);
if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
@@ -1219,7 +1155,8 @@ ixgbe_init_locked(struct adapter *adapte
IXGBE_WRITE_REG(hw, IXGBE_EITR(adapter->vector), IXGBE_LINK_ITR);
/* Configure Energy Efficient Ethernet for supported devices */
- ixgbe_setup_eee(hw, adapter->eee_enabled);
+ if (adapter->eee_support)
+ ixgbe_setup_eee(hw, adapter->eee_enabled);
/* Config/Enable Link */
ixgbe_config_link(adapter);
@@ -1239,15 +1176,6 @@ ixgbe_init_locked(struct adapter *adapte
/* And now turn on interrupts */
ixgbe_enable_intr(adapter);
-#ifdef PCI_IOV
- /* Enable the use of the MBX by the VF's */
- {
- u32 reg = IXGBE_READ_REG(hw, IXGBE_CTRL_EXT);
- reg |= IXGBE_CTRL_EXT_PFRSTD;
- IXGBE_WRITE_REG(hw, IXGBE_CTRL_EXT, reg);
- }
-#endif
-
/* Now inform the stack we're ready */
ifp->if_drv_flags |= IFF_DRV_RUNNING;
@@ -1266,51 +1194,6 @@ ixgbe_init(void *arg)
}
static void
-ixgbe_config_gpie(struct adapter *adapter)
-{
- struct ixgbe_hw *hw = &adapter->hw;
- u32 gpie;
-
- gpie = IXGBE_READ_REG(hw, IXGBE_GPIE);
-
- /* Fan Failure Interrupt */
- if (hw->device_id == IXGBE_DEV_ID_82598AT)
- gpie |= IXGBE_SDP1_GPIEN;
-
- /*
- * Module detection (SDP2)
- * Media ready (SDP1)
- */
- if (hw->mac.type == ixgbe_mac_82599EB) {
- gpie |= IXGBE_SDP2_GPIEN;
- if (hw->device_id != IXGBE_DEV_ID_82599_QSFP_SF_QP)
- gpie |= IXGBE_SDP1_GPIEN;
- }
-
- /*
- * Thermal Failure Detection (X540)
- * Link Detection (X557)
- */
- if (hw->mac.type == ixgbe_mac_X540 ||
- hw->device_id == IXGBE_DEV_ID_X550EM_X_SFP ||
- hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T)
- gpie |= IXGBE_SDP0_GPIEN_X540;
-
- if (adapter->msix > 1) {
- /* Enable Enhanced MSIX mode */
- gpie |= IXGBE_GPIE_MSIX_MODE;
- gpie |= IXGBE_GPIE_EIAME | IXGBE_GPIE_PBA_SUPPORT |
- IXGBE_GPIE_OCD;
- }
-
- IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
- return;
-}
-
-/*
- * Requires adapter->max_frame_size to be set.
- */
-static void
ixgbe_config_delay_values(struct adapter *adapter)
{
struct ixgbe_hw *hw = &adapter->hw;
@@ -1404,9 +1287,10 @@ ixgbe_handle_que(void *context, int pend
struct adapter *adapter = que->adapter;
struct tx_ring *txr = que->txr;
struct ifnet *ifp = adapter->ifp;
+ bool more;
if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
- ixgbe_rxeof(que);
+ more = ixgbe_rxeof(que);
IXGBE_TX_LOCK(txr);
ixgbe_txeof(txr);
#ifndef IXGBE_LEGACY_TX
@@ -1468,8 +1352,8 @@ ixgbe_legacy_irq(void *arg)
IXGBE_TX_UNLOCK(txr);
/* Check for fan failure */
- if ((hw->device_id == IXGBE_DEV_ID_82598AT) &&
- (reg_eicr & IXGBE_EICR_GPI_SDP1)) {
+ if ((hw->phy.media_type == ixgbe_media_type_copper) &&
+ (reg_eicr & IXGBE_EICR_GPI_SDP1_BY_MAC(hw))) {
device_printf(adapter->dev, "\nCRITICAL: FAN FAILURE!! "
"REPLACE IMMEDIATELY!!\n");
IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EICR_GPI_SDP1_BY_MAC(hw));
@@ -1508,7 +1392,6 @@ ixgbe_msix_que(void *arg)
bool more;
u32 newitr = 0;
-
/* Protect against spurious interrupts */
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
return;
@@ -1632,10 +1515,6 @@ ixgbe_msix_link(void *arg)
device_printf(adapter->dev, "System shutdown required!\n");
IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_TS);
}
-#ifdef PCI_IOV
- if (reg_eicr & IXGBE_EICR_MAILBOX)
- taskqueue_enqueue(adapter->tq, &adapter->mbx_task);
-#endif
}
/* Pluggable optics-related interrupt */
@@ -1701,7 +1580,7 @@ ixgbe_media_status(struct ifnet * ifp, s
}
ifmr->ifm_status |= IFM_ACTIVE;
- layer = adapter->phy_layer;
+ layer = ixgbe_get_supported_physical_layer(hw);
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_T ||
layer & IXGBE_PHYSICAL_LAYER_1000BASE_T ||
@@ -1934,17 +1813,18 @@ ixgbe_set_promisc(struct adapter *adapte
static void
ixgbe_set_multi(struct adapter *adapter)
{
- u32 fctrl;
- u8 *update_ptr;
- struct ifmultiaddr *ifma;
- struct ixgbe_mc_addr *mta;
- int mcnt = 0;
- struct ifnet *ifp = adapter->ifp;
+ u32 fctrl;
+ u8 *mta;
+ u8 *update_ptr;
+ struct ifmultiaddr *ifma;
+ int mcnt = 0;
+ struct ifnet *ifp = adapter->ifp;
IOCTL_DEBUGOUT("ixgbe_set_multi: begin");
mta = adapter->mta;
- bzero(mta, sizeof(*mta) * MAX_NUM_MULTICAST_ADDRESSES);
+ bzero(mta, sizeof(u8) * IXGBE_ETH_LENGTH_OF_ADDRESS *
+ MAX_NUM_MULTICAST_ADDRESSES);
#if __FreeBSD_version < 800000
IF_ADDR_LOCK(ifp);
@@ -1957,8 +1837,8 @@ ixgbe_set_multi(struct adapter *adapter)
if (mcnt == MAX_NUM_MULTICAST_ADDRESSES)
break;
bcopy(LLADDR((struct sockaddr_dl *) ifma->ifma_addr),
- mta[mcnt].addr, IXGBE_ETH_LENGTH_OF_ADDRESS);
- mta[mcnt].vmdq = adapter->pool;
+ &mta[mcnt * IXGBE_ETH_LENGTH_OF_ADDRESS],
+ IXGBE_ETH_LENGTH_OF_ADDRESS);
mcnt++;
}
#if __FreeBSD_version < 800000
@@ -1981,7 +1861,7 @@ ixgbe_set_multi(struct adapter *adapter)
IXGBE_WRITE_REG(&adapter->hw, IXGBE_FCTRL, fctrl);
if (mcnt < MAX_NUM_MULTICAST_ADDRESSES) {
- update_ptr = (u8 *)mta;
+ update_ptr = mta;
ixgbe_update_mc_addr_list(&adapter->hw,
update_ptr, mcnt, ixgbe_mc_array_itr, TRUE);
}
@@ -1997,13 +1877,13 @@ ixgbe_set_multi(struct adapter *adapter)
static u8 *
ixgbe_mc_array_itr(struct ixgbe_hw *hw, u8 **update_ptr, u32 *vmdq)
{
- struct ixgbe_mc_addr *mta;
-
- mta = (struct ixgbe_mc_addr *)*update_ptr;
- *vmdq = mta->vmdq;
-
- *update_ptr = (u8*)(mta + 1);;
- return (mta->addr);
+ u8 *addr = *update_ptr;
+ u8 *newptr;
+ *vmdq = 0;
+
+ newptr = addr + IXGBE_ETH_LENGTH_OF_ADDRESS;
+ *update_ptr = newptr;
+ return addr;
}
@@ -2085,7 +1965,6 @@ watchdog:
ixgbe_init_locked(adapter);
}
-
/*
** Note: this routine updates the OS on the link state
** the real check of the hardware only happens with
@@ -2109,9 +1988,6 @@ ixgbe_update_link_status(struct adapter
/* Update DMA coalescing config */
ixgbe_config_dmac(adapter);
if_link_state_change(ifp, LINK_STATE_UP);
-#ifdef PCI_IOV
- ixgbe_ping_all_vfs(adapter);
-#endif
}
} else { /* Link down */
if (adapter->link_active == TRUE) {
@@ -2119,9 +1995,6 @@ ixgbe_update_link_status(struct adapter
device_printf(dev,"Link is Down\n");
if_link_state_change(ifp, LINK_STATE_DOWN);
adapter->link_active = FALSE;
-#ifdef PCI_IOV
- ixgbe_ping_all_vfs(adapter);
-#endif
}
}
@@ -2221,7 +2094,7 @@ ixgbe_setup_optics(struct adapter *adapt
struct ixgbe_hw *hw = &adapter->hw;
int layer;
- layer = adapter->phy_layer = ixgbe_get_supported_physical_layer(hw);
+ layer = ixgbe_get_supported_physical_layer(hw);
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_T) {
adapter->optics = IFM_10G_T;
@@ -2350,31 +2223,6 @@ ixgbe_allocate_msix(struct adapter *adap
struct tx_ring *txr = adapter->tx_rings;
int error, rid, vector = 0;
int cpu_id = 0;
-#ifdef RSS
- cpuset_t cpu_mask;
-#endif
-
-#ifdef RSS
- /*
- * If we're doing RSS, the number of queues needs to
- * match the number of RSS buckets that are configured.
- *
- * + If there's more queues than RSS buckets, we'll end
- * up with queues that get no traffic.
- *
- * + If there's more RSS buckets than queues, we'll end
- * up having multiple RSS buckets map to the same queue,
- * so there'll be some contention.
- */
- if (adapter->num_queues != rss_getnumbuckets()) {
- device_printf(dev,
- "%s: number of queues (%d) != number of RSS buckets (%d)"
- "; performance will be impacted.\n",
- __func__,
- adapter->num_queues,
- rss_getnumbuckets());
- }
-#endif
for (int i = 0; i < adapter->num_queues; i++, vector++, que++, txr++) {
rid = vector + 1;
@@ -2399,14 +2247,6 @@ ixgbe_allocate_msix(struct adapter *adap
#endif
que->msix = vector;
adapter->active_queues |= (u64)(1 << que->msix);
-#ifdef RSS
- /*
- * The queue ID is used as the RSS layer bucket ID.
- * We look up the queue ID -> RSS CPU ID and select
- * that.
- */
- cpu_id = rss_getcpu(i % rss_getnumbuckets());
-#else
/*
* Bind the msix vector, and thus the
* rings to the corresponding cpu.
@@ -2416,21 +2256,9 @@ ixgbe_allocate_msix(struct adapter *adap
*/
if (adapter->num_queues > 1)
cpu_id = i;
-#endif
+
if (adapter->num_queues > 1)
bus_bind_intr(dev, que->res, cpu_id);
-#ifdef IXGBE_DEBUG
-#ifdef RSS
- device_printf(dev,
- "Bound RSS bucket %d to CPU %d\n",
- i, cpu_id);
-#else
- device_printf(dev,
- "Bound queue %d to cpu %d\n",
- i, cpu_id);
-#endif
-#endif /* IXGBE_DEBUG */
-
#ifndef IXGBE_LEGACY_TX
TASK_INIT(&txr->txq_task, 0, ixgbe_deferred_mq_start, txr);
@@ -2438,17 +2266,8 @@ ixgbe_allocate_msix(struct adapter *adap
TASK_INIT(&que->que_task, 0, ixgbe_handle_que, que);
que->tq = taskqueue_create_fast("ixgbe_que", M_NOWAIT,
taskqueue_thread_enqueue, &que->tq);
-#ifdef RSS
- CPU_SETOF(cpu_id, &cpu_mask);
- taskqueue_start_threads_cpuset(&que->tq, 1, PI_NET,
- &cpu_mask,
- "%s (bucket %d)",
- device_get_nameunit(adapter->dev),
- cpu_id);
-#else
taskqueue_start_threads(&que->tq, 1, PI_NET, "%s que",
device_get_nameunit(adapter->dev));
-#endif
}
/* and Link */
@@ -2477,9 +2296,6 @@ ixgbe_allocate_msix(struct adapter *adap
TASK_INIT(&adapter->link_task, 0, ixgbe_handle_link, adapter);
TASK_INIT(&adapter->mod_task, 0, ixgbe_handle_mod, adapter);
TASK_INIT(&adapter->msf_task, 0, ixgbe_handle_msf, adapter);
-#ifdef PCI_IOV
- TASK_INIT(&adapter->mbx_task, 0, ixgbe_handle_mbx, adapter);
-#endif
TASK_INIT(&adapter->phy_task, 0, ixgbe_handle_phy, adapter);
#ifdef IXGBE_FDIR
TASK_INIT(&adapter->fdir_task, 0, ixgbe_reinit_fdir, adapter);
@@ -2527,14 +2343,11 @@ ixgbe_setup_msix(struct adapter *adapter
/* Figure out a reasonable auto config value */
queues = (mp_ncpus > (msgs-1)) ? (msgs-1) : mp_ncpus;
-#ifdef RSS
- /* If we're doing RSS, clamp at the number of RSS buckets */
- if (queues > rss_getnumbuckets())
- queues = rss_getnumbuckets();
-#endif
-
if (ixgbe_num_queues != 0)
queues = ixgbe_num_queues;
+ /* Set max queues to 8 when autoconfiguring */
+ else if ((ixgbe_num_queues == 0) && (queues > 8))
+ queues = 8;
/* reflect correct sysctl value */
ixgbe_num_queues = queues;
@@ -2698,20 +2511,15 @@ ixgbe_setup_interface(device_t dev, stru
return (-1);
}
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
- ifp->if_baudrate = IF_Gbps(10);
+ if_initbaudrate(ifp, IF_Gbps(10));
ifp->if_init = ixgbe_init;
ifp->if_softc = adapter;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = ixgbe_ioctl;
-#if __FreeBSD_version >= 1100036
- if_setgetcounterfn(ifp, ixgbe_get_counter);
-#endif
-#if __FreeBSD_version >= 1100045
/* TSO parameters */
ifp->if_hw_tsomax = 65518;
ifp->if_hw_tsomaxsegcount = IXGBE_82599_SCATTER;
ifp->if_hw_tsomaxsegsize = 2048;
-#endif
#ifndef IXGBE_LEGACY_TX
ifp->if_transmit = ixgbe_mq_start;
ifp->if_qflush = ixgbe_qflush;
@@ -2773,7 +2581,7 @@ ixgbe_add_media_types(struct adapter *ad
device_t dev = adapter->dev;
int layer;
- layer = adapter->phy_layer = ixgbe_get_supported_physical_layer(hw);
+ layer = ixgbe_get_supported_physical_layer(hw);
/* Media types with matching FreeBSD media defines */
if (layer & IXGBE_PHYSICAL_LAYER_10GBASE_T)
@@ -2884,41 +2692,40 @@ ixgbe_initialize_transmit_units(struct a
for (int i = 0; i < adapter->num_queues; i++, txr++) {
u64 tdba = txr->txdma.dma_paddr;
u32 txctrl = 0;
- int j = txr->me;
- IXGBE_WRITE_REG(hw, IXGBE_TDBAL(j),
+ IXGBE_WRITE_REG(hw, IXGBE_TDBAL(i),
(tdba & 0x00000000ffffffffULL));
- IXGBE_WRITE_REG(hw, IXGBE_TDBAH(j), (tdba >> 32));
- IXGBE_WRITE_REG(hw, IXGBE_TDLEN(j),
+ IXGBE_WRITE_REG(hw, IXGBE_TDBAH(i), (tdba >> 32));
+ IXGBE_WRITE_REG(hw, IXGBE_TDLEN(i),
adapter->num_tx_desc * sizeof(union ixgbe_adv_tx_desc));
/* Setup the HW Tx Head and Tail descriptor pointers */
- IXGBE_WRITE_REG(hw, IXGBE_TDH(j), 0);
- IXGBE_WRITE_REG(hw, IXGBE_TDT(j), 0);
+ IXGBE_WRITE_REG(hw, IXGBE_TDH(i), 0);
+ IXGBE_WRITE_REG(hw, IXGBE_TDT(i), 0);
/* Cache the tail address */
- txr->tail = IXGBE_TDT(j);
+ txr->tail = IXGBE_TDT(txr->me);
/* Disable Head Writeback */
switch (hw->mac.type) {
case ixgbe_mac_82598EB:
- txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(j));
+ txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL(i));
break;
case ixgbe_mac_82599EB:
case ixgbe_mac_X540:
default:
- txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(j));
+ txctrl = IXGBE_READ_REG(hw, IXGBE_DCA_TXCTRL_82599(i));
break;
}
txctrl &= ~IXGBE_DCA_TXCTRL_DESC_WRO_EN;
switch (hw->mac.type) {
case ixgbe_mac_82598EB:
- IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(j), txctrl);
+ IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL(i), txctrl);
break;
case ixgbe_mac_82599EB:
case ixgbe_mac_X540:
default:
- IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(j), txctrl);
+ IXGBE_WRITE_REG(hw, IXGBE_DCA_TXCTRL_82599(i), txctrl);
break;
}
@@ -2926,9 +2733,6 @@ ixgbe_initialize_transmit_units(struct a
if (hw->mac.type != ixgbe_mac_82598EB) {
u32 dmatxctl, rttdcs;
-#ifdef PCI_IOV
- enum ixgbe_iov_mode mode = ixgbe_get_iov_mode(adapter);
-#endif
dmatxctl = IXGBE_READ_REG(hw, IXGBE_DMATXCTL);
dmatxctl |= IXGBE_DMATXCTL_TE;
IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL, dmatxctl);
@@ -2936,11 +2740,7 @@ ixgbe_initialize_transmit_units(struct a
rttdcs = IXGBE_READ_REG(hw, IXGBE_RTTDCS);
rttdcs |= IXGBE_RTTDCS_ARBDIS;
IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
-#ifdef PCI_IOV
- IXGBE_WRITE_REG(hw, IXGBE_MTQC, ixgbe_get_mtqc(mode));
-#else
IXGBE_WRITE_REG(hw, IXGBE_MTQC, IXGBE_MTQC_64Q_1PB);
-#endif
rttdcs &= ~IXGBE_RTTDCS_ARBDIS;
IXGBE_WRITE_REG(hw, IXGBE_RTTDCS, rttdcs);
}
@@ -2952,22 +2752,17 @@ static void
ixgbe_initialise_rss_mapping(struct adapter *adapter)
{
struct ixgbe_hw *hw = &adapter->hw;
- u32 reta = 0, mrqc, rss_key[10];
- int queue_id, table_size, index_mult;
-#ifdef RSS
- u32 rss_hash_config;
-#endif
-#ifdef PCI_IOV
- enum ixgbe_iov_mode mode;
-#endif
+ uint32_t reta;
+ int i, j, queue_id, table_size;
+ int index_mult;
+ uint32_t rss_key[10];
+ uint32_t mrqc;
+
+ /* Setup RSS */
+ reta = 0;
-#ifdef RSS
- /* Fetch the configured RSS key */
- rss_getkey((uint8_t *) &rss_key);
-#else
/* set up random bits */
arc4rand(&rss_key, sizeof(rss_key), 0);
-#endif
/* Set multiplier for RETA setup and table size based on MAC */
index_mult = 0x1;
@@ -2985,19 +2780,9 @@ ixgbe_initialise_rss_mapping(struct adap
}
/* Set up the redirection table */
- for (int i = 0, j = 0; i < table_size; i++, j++) {
+ for (i = 0, j = 0; i < table_size; i++, j++) {
if (j == adapter->num_queues) j = 0;
-#ifdef RSS
- /*
- * Fetch the RSS bucket id for the given indirection entry.
- * Cap it at the number of configured buckets (which is
- * num_queues.)
- */
- queue_id = rss_get_indirection_to_bucket(i);
- queue_id = queue_id % adapter->num_queues;
-#else
queue_id = (j * index_mult);
-#endif
/*
* The low 8 bits are for hash value (n+0);
* The next 8 bits are for hash value (n+1), etc.
@@ -3018,32 +2803,6 @@ ixgbe_initialise_rss_mapping(struct adap
IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), rss_key[i]);
/* Perform hash on these packet types */
-#ifdef RSS
- mrqc = IXGBE_MRQC_RSSEN;
- rss_hash_config = rss_gethashconfig();
- if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4;
- if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_TCP;
- if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6;
- if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_TCP;
- if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6_EX)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX;
- if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6_EX)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP;
- if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_UDP;
- if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4_EX)
- device_printf(adapter->dev,
- "%s: RSS_HASHTYPE_RSS_UDP_IPV4_EX defined, "
- "but not supported\n", __func__);
- if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP;
- if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX)
- mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;
-#else
/*
* Disable UDP - IP fragments aren't currently being handled
* and so we end up with a mix of 2-tuple and 4-tuple
@@ -3052,16 +2811,18 @@ ixgbe_initialise_rss_mapping(struct adap
mrqc = IXGBE_MRQC_RSSEN
| IXGBE_MRQC_RSS_FIELD_IPV4
| IXGBE_MRQC_RSS_FIELD_IPV4_TCP
+#if 0
+ | IXGBE_MRQC_RSS_FIELD_IPV4_UDP
+#endif
| IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP
| IXGBE_MRQC_RSS_FIELD_IPV6_EX
| IXGBE_MRQC_RSS_FIELD_IPV6
| IXGBE_MRQC_RSS_FIELD_IPV6_TCP
- ;
-#endif /* RSS */
-#ifdef PCI_IOV
- mode = ixgbe_get_iov_mode(adapter);
- mrqc |= ixgbe_get_mrqc(mode);
+#if 0
+ | IXGBE_MRQC_RSS_FIELD_IPV6_UDP
+ | IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP
#endif
+ ;
IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);
}
@@ -3120,17 +2881,16 @@ ixgbe_initialize_receive_units(struct ad
for (int i = 0; i < adapter->num_queues; i++, rxr++) {
u64 rdba = rxr->rxdma.dma_paddr;
- int j = rxr->me;
/* Setup the Base and Length of the Rx Descriptor Ring */
- IXGBE_WRITE_REG(hw, IXGBE_RDBAL(j),
+ IXGBE_WRITE_REG(hw, IXGBE_RDBAL(i),
(rdba & 0x00000000ffffffffULL));
- IXGBE_WRITE_REG(hw, IXGBE_RDBAH(j), (rdba >> 32));
- IXGBE_WRITE_REG(hw, IXGBE_RDLEN(j),
+ IXGBE_WRITE_REG(hw, IXGBE_RDBAH(i), (rdba >> 32));
+ IXGBE_WRITE_REG(hw, IXGBE_RDLEN(i),
adapter->num_rx_desc * sizeof(union ixgbe_adv_rx_desc));
/* Set up the SRRCTL register */
- srrctl = IXGBE_READ_REG(hw, IXGBE_SRRCTL(j));
+ srrctl = IXGBE_READ_REG(hw, IXGBE_SRRCTL(i));
srrctl &= ~IXGBE_SRRCTL_BSIZEHDR_MASK;
srrctl &= ~IXGBE_SRRCTL_BSIZEPKT_MASK;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Fri Jan 15 22:49:26 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 74010A8477A
for <svn-src-user@mailman.ysv.freebsd.org>;
Fri, 15 Jan 2016 22:49:26 +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 1E1511AD3;
Fri, 15 Jan 2016 22:49:26 +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 u0FMnPQn005277;
Fri, 15 Jan 2016 22:49:25 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0FMnLxG005237;
Fri, 15 Jan 2016 22:49:21 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601152249.u0FMnLxG005237@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, 15 Jan 2016 22:49:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294106 - in user/ngie/socket-tests: crypto/openssh etc
etc/rc.d lib/clang lib/libc++ lib/libkvm lib/libmd share/man/man4 share/mk
sys/amd64/linux sys/amd64/linux32 sys/arm/arm sys/arm/...
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, 15 Jan 2016 22:49:26 -0000
Author: ngie
Date: Fri Jan 15 22:49:20 2016
New Revision: 294106
URL: https://svnweb.freebsd.org/changeset/base/294106
Log:
MFhead @ r294105
Added:
user/ngie/socket-tests/sys/boot/efi/boot1/boot_module.h
- copied unchanged from r294105, head/sys/boot/efi/boot1/boot_module.h
user/ngie/socket-tests/sys/boot/efi/boot1/ufs_module.c
- copied unchanged from r294105, head/sys/boot/efi/boot1/ufs_module.c
user/ngie/socket-tests/sys/boot/efi/boot1/zfs_module.c
- copied unchanged from r294105, head/sys/boot/efi/boot1/zfs_module.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_lic.c
- copied unchanged from r294105, head/sys/dev/sfxge/common/efx_lic.c
Modified:
user/ngie/socket-tests/crypto/openssh/readconf.c
user/ngie/socket-tests/etc/Makefile
user/ngie/socket-tests/etc/rc.d/mountcritlocal
user/ngie/socket-tests/lib/clang/clang.lib.mk
user/ngie/socket-tests/lib/libc++/Makefile
user/ngie/socket-tests/lib/libkvm/kvm_arm.h
user/ngie/socket-tests/lib/libkvm/kvm_i386.h
user/ngie/socket-tests/lib/libkvm/kvm_minidump_arm.c
user/ngie/socket-tests/lib/libmd/mdXhl.c
user/ngie/socket-tests/share/man/man4/ddb.4
user/ngie/socket-tests/share/man/man4/ioat.4
user/ngie/socket-tests/share/man/man4/sfxge.4
user/ngie/socket-tests/share/mk/bsd.dep.mk
user/ngie/socket-tests/share/mk/bsd.sys.mk
user/ngie/socket-tests/sys/amd64/linux/linux_proto.h
user/ngie/socket-tests/sys/amd64/linux/linux_syscall.h
user/ngie/socket-tests/sys/amd64/linux/linux_syscalls.c
user/ngie/socket-tests/sys/amd64/linux/linux_sysent.c
user/ngie/socket-tests/sys/amd64/linux/linux_systrace_args.c
user/ngie/socket-tests/sys/amd64/linux/syscalls.master
user/ngie/socket-tests/sys/amd64/linux32/linux32_proto.h
user/ngie/socket-tests/sys/amd64/linux32/linux32_syscall.h
user/ngie/socket-tests/sys/amd64/linux32/linux32_syscalls.c
user/ngie/socket-tests/sys/amd64/linux32/linux32_sysent.c
user/ngie/socket-tests/sys/amd64/linux32/linux32_systrace_args.c
user/ngie/socket-tests/sys/amd64/linux32/syscalls.master
user/ngie/socket-tests/sys/arm/arm/minidump_machdep.c
user/ngie/socket-tests/sys/arm/at91/at91_mci.c
user/ngie/socket-tests/sys/arm/at91/board_tsc4370.c
user/ngie/socket-tests/sys/arm/conf/IMX53
user/ngie/socket-tests/sys/arm/conf/IMX6
user/ngie/socket-tests/sys/arm/include/minidump.h
user/ngie/socket-tests/sys/boot/common/bootstrap.h
user/ngie/socket-tests/sys/boot/common/module.c
user/ngie/socket-tests/sys/boot/common/ufsread.c
user/ngie/socket-tests/sys/boot/efi/Makefile
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/include/efilib.h
user/ngie/socket-tests/sys/boot/efi/libefi/handles.c
user/ngie/socket-tests/sys/boot/efi/loader/Makefile
user/ngie/socket-tests/sys/boot/efi/loader/conf.c
user/ngie/socket-tests/sys/boot/efi/loader/devicename.c
user/ngie/socket-tests/sys/boot/efi/loader/main.c
user/ngie/socket-tests/sys/boot/fdt/fdt_loader_cmd.c
user/ngie/socket-tests/sys/boot/i386/loader/main.c
user/ngie/socket-tests/sys/boot/userboot/test/test.c
user/ngie/socket-tests/sys/boot/userboot/userboot/main.c
user/ngie/socket-tests/sys/boot/zfs/libzfs.h
user/ngie/socket-tests/sys/boot/zfs/zfs.c
user/ngie/socket-tests/sys/boot/zfs/zfsimpl.c
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
user/ngie/socket-tests/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
user/ngie/socket-tests/sys/compat/linux/linux_futex.c
user/ngie/socket-tests/sys/compat/linux/linux_misc.c
user/ngie/socket-tests/sys/compat/linuxkpi/common/include/linux/pci.h
user/ngie/socket-tests/sys/compat/linuxkpi/common/src/linux_pci.c
user/ngie/socket-tests/sys/conf/files.amd64
user/ngie/socket-tests/sys/conf/kern.post.mk
user/ngie/socket-tests/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c
user/ngie/socket-tests/sys/dev/ioat/ioat.c
user/ngie/socket-tests/sys/dev/ioat/ioat.h
user/ngie/socket-tests/sys/dev/sfxge/common/ef10_impl.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_check.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_mcdi.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_mcdi.h
user/ngie/socket-tests/sys/dev/sfxge/common/efx_nic.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_nvram.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_phy.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_rx.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_tx.c
user/ngie/socket-tests/sys/dev/sfxge/common/efx_vpd.c
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_mcdi.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/hunt_phy.c
user/ngie/socket-tests/sys/dev/sfxge/common/hunt_tx.c
user/ngie/socket-tests/sys/dev/sfxge/common/hunt_vpd.c
user/ngie/socket-tests/sys/dev/sfxge/common/medford_impl.h
user/ngie/socket-tests/sys/dev/sfxge/common/medford_nic.c
user/ngie/socket-tests/sys/dev/sfxge/common/siena_impl.h
user/ngie/socket-tests/sys/dev/sfxge/common/siena_mcdi.c
user/ngie/socket-tests/sys/dev/sfxge/common/siena_nic.c
user/ngie/socket-tests/sys/dev/sfxge/common/siena_nvram.c
user/ngie/socket-tests/sys/dev/sfxge/common/siena_vpd.c
user/ngie/socket-tests/sys/dev/sfxge/sfxge.h
user/ngie/socket-tests/sys/dev/sfxge/sfxge_tx.c
user/ngie/socket-tests/sys/dev/sfxge/sfxge_tx.h
user/ngie/socket-tests/sys/dev/usb/usb_device.c
user/ngie/socket-tests/sys/fs/nfs/nfs_var.h
user/ngie/socket-tests/sys/fs/nfsclient/nfs_clport.c
user/ngie/socket-tests/sys/fs/nfsclient/nfs_clrpcops.c
user/ngie/socket-tests/sys/geom/geom_disk.c
user/ngie/socket-tests/sys/i386/linux/linux_proto.h
user/ngie/socket-tests/sys/i386/linux/linux_syscall.h
user/ngie/socket-tests/sys/i386/linux/linux_syscalls.c
user/ngie/socket-tests/sys/i386/linux/linux_sysent.c
user/ngie/socket-tests/sys/i386/linux/syscalls.master
user/ngie/socket-tests/sys/kern/kern_prot.c
user/ngie/socket-tests/sys/kern/vfs_aio.c
user/ngie/socket-tests/sys/modules/sfxge/Makefile
user/ngie/socket-tests/sys/net/radix_mpath.c
user/ngie/socket-tests/sys/net/route.c
user/ngie/socket-tests/sys/net/route.h
user/ngie/socket-tests/sys/netgraph/netflow/netflow.c
user/ngie/socket-tests/sys/netinet/in_rmx.c
user/ngie/socket-tests/sys/netinet/in_var.h
user/ngie/socket-tests/sys/netinet/ip_mroute.c
user/ngie/socket-tests/sys/netinet/sctp_pcb.c
user/ngie/socket-tests/sys/netinet/sctp_usrreq.c
user/ngie/socket-tests/sys/netinet/tcp_output.c
user/ngie/socket-tests/sys/netinet6/sctp6_usrreq.c
user/ngie/socket-tests/sys/powerpc/include/vmparam.h
user/ngie/socket-tests/sys/sys/param.h
user/ngie/socket-tests/sys/sys/ucred.h
user/ngie/socket-tests/sys/xen/xenbus/xenbusvar.h
user/ngie/socket-tests/tools/regression/sockets/accf_data_attach/accf_data_attach.c
user/ngie/socket-tests/usr.bin/clang/clang/Makefile
user/ngie/socket-tests/usr.bin/clang/lldb/Makefile
user/ngie/socket-tests/usr.sbin/boot0cfg/boot0cfg.c
Directory Properties:
user/ngie/socket-tests/ (props changed)
user/ngie/socket-tests/crypto/openssh/ (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)
Modified: user/ngie/socket-tests/crypto/openssh/readconf.c
==============================================================================
--- user/ngie/socket-tests/crypto/openssh/readconf.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/crypto/openssh/readconf.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -1610,7 +1610,7 @@ initialize_options(Options * options)
options->tun_remote = -1;
options->local_command = NULL;
options->permit_local_command = -1;
- options->use_roaming = -1;
+ options->use_roaming = 0;
options->visual_host_key = -1;
options->ip_qos_interactive = -1;
options->ip_qos_bulk = -1;
@@ -1788,8 +1788,7 @@ fill_default_options(Options * options)
options->tun_remote = SSH_TUNID_ANY;
if (options->permit_local_command == -1)
options->permit_local_command = 0;
- if (options->use_roaming == -1)
- options->use_roaming = 1;
+ options->use_roaming = 0;
if (options->visual_host_key == -1)
options->visual_host_key = 0;
if (options->ip_qos_interactive == -1)
Modified: user/ngie/socket-tests/etc/Makefile
==============================================================================
--- user/ngie/socket-tests/etc/Makefile Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/etc/Makefile Fri Jan 15 22:49:20 2016 (r294106)
@@ -82,10 +82,6 @@ BIN1+= apmd.conf
BIN1+= auto_master
.endif
-.if ${MK_BSNMP} != "no"
-BIN1+= snmpd.config
-.endif
-
.if ${MK_FREEBSD_UPDATE} != "no"
BIN1+= freebsd-update.conf
.endif
@@ -219,6 +215,11 @@ distribution:
${BIN2} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+.if ${MK_BSNMP} != "no"
+ cd ${.CURDIR}; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+ snmpd.config ${DESTDIR}/etc;
+.endif
.if ${MK_AT} == "no"
sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab
.endif
Modified: user/ngie/socket-tests/etc/rc.d/mountcritlocal
==============================================================================
--- user/ngie/socket-tests/etc/rc.d/mountcritlocal Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/etc/rc.d/mountcritlocal Fri Jan 15 22:49:20 2016 (r294106)
@@ -36,15 +36,15 @@ mountcritlocal_start()
done
mount_excludes=${mount_excludes%,}
- # Originally, root mount hold had to be released before mounting the root
- # filesystem. This delayed the boot, so it was changed to only wait if
- # the root device isn't readily available. This can result in this script
- # executing before all the devices - such as graid(8) - are available.
- # Thus, should the mount fail, we will wait for the root mount hold release
- # and retry.
+ # Originally, root mount hold had to be released before mounting
+ # the root filesystem. This delayed the boot, so it was changed
+ # to only wait if the root device isn't readily available. This
+ # can result in this script executing before all the devices - such
+ # as graid(8) - are available. Thus, should the mount fail,
+ # we will wait for the root mount hold release and retry.
mount -a -t ${mount_excludes}
err=$?
- if [ $? -ne 0 ]; then
+ if [ ${err} -ne 0 ]; then
echo
echo 'Mounting /etc/fstab filesystems failed,' \
'will retry after root mount hold release'
Modified: user/ngie/socket-tests/lib/clang/clang.lib.mk
==============================================================================
--- user/ngie/socket-tests/lib/clang/clang.lib.mk Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/lib/clang/clang.lib.mk Fri Jan 15 22:49:20 2016 (r294106)
@@ -6,4 +6,8 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/l
INTERNALLIB=
+.if ${MACHINE_CPUARCH} == "arm"
+STATIC_CXXFLAGS+= -mlong-calls
+.endif
+
.include <bsd.lib.mk>
Modified: user/ngie/socket-tests/lib/libc++/Makefile
==============================================================================
--- user/ngie/socket-tests/lib/libc++/Makefile Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/lib/libc++/Makefile Fri Jan 15 22:49:20 2016 (r294106)
@@ -6,6 +6,9 @@ _LIBCXXRTDIR= ${.CURDIR}/../../contrib/l
HDRDIR= ${.CURDIR}/../../contrib/libc++/include
SRCDIR= ${.CURDIR}/../../contrib/libc++/src
CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
+.if ${MACHINE_CPUARCH} == "arm"
+STATIC_CXXFLAGS+= -mlong-calls
+.endif
.PATH: ${SRCDIR}
Modified: user/ngie/socket-tests/lib/libkvm/kvm_arm.h
==============================================================================
--- user/ngie/socket-tests/lib/libkvm/kvm_arm.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/lib/libkvm/kvm_arm.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -67,13 +67,16 @@ typedef uint32_t arm_pt_entry_t;
#define ARM_L1_C_ADDR_MASK 0xfffffc00 /* phys address of L2 Table */
#define ARM_L2_TYPE_INV 0x00 /* Invalid (fault) */
-#define ARM_L2_TYPE_L 0x01 /* Large Page - 64k - not used yet*/
-#define ARM_L2_TYPE_S 0x02 /* Small Page - 4 */
+#define ARM_L2_TYPE_L 0x01 /* Large Page - 64k */
+#define ARM_L2_TYPE_S 0x02 /* Small Page - 4k */
+#define ARM_L2_TYPE_T 0x03 /* Tiny Page - 1k - not used */
#define ARM_L2_TYPE_MASK 0x03
#define ARM_L2_ADDR_BITS 0x000ff000 /* L2 PTE address bits */
#ifdef __arm__
+#include <machine/acle-compat.h>
+
_Static_assert(PAGE_SHIFT == ARM_PAGE_SHIFT, "PAGE_SHIFT mismatch");
_Static_assert(PAGE_SIZE == ARM_PAGE_SIZE, "PAGE_SIZE mismatch");
_Static_assert(PAGE_MASK == ARM_PAGE_MASK, "PAGE_MASK mismatch");
@@ -99,6 +102,9 @@ _Static_assert(L1_C_ADDR_MASK == ARM_L1_
_Static_assert(L2_TYPE_INV == ARM_L2_TYPE_INV, "L2_TYPE_INV mismatch");
_Static_assert(L2_TYPE_L == ARM_L2_TYPE_L, "L2_TYPE_L mismatch");
_Static_assert(L2_TYPE_S == ARM_L2_TYPE_S, "L2_TYPE_S mismatch");
+#if __ARM_ARCH < 6
+_Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch");
+#endif
_Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch");
_Static_assert(L2_ADDR_BITS == ARM_L2_ADDR_BITS, "L2_ADDR_BITS mismatch");
#endif
Modified: user/ngie/socket-tests/lib/libkvm/kvm_i386.h
==============================================================================
--- user/ngie/socket-tests/lib/libkvm/kvm_i386.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/lib/libkvm/kvm_i386.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -70,7 +70,7 @@ _Static_assert(NBPDR == I386_NBPDR, "NBP
_Static_assert(PG_V == I386_PG_V, "PG_V mismatch");
_Static_assert(PG_PS == I386_PG_PS, "PG_PS mismatch");
-_Static_assert(PG_FRAME == I386_PG_FRAME, "PG_FRAME mismatch");
+_Static_assert((u_int)PG_FRAME == I386_PG_FRAME, "PG_FRAME mismatch");
_Static_assert(PG_PS_FRAME == I386_PG_PS_FRAME, "PG_PS_FRAME mismatch");
#endif
Modified: user/ngie/socket-tests/lib/libkvm/kvm_minidump_arm.c
==============================================================================
--- user/ngie/socket-tests/lib/libkvm/kvm_minidump_arm.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/lib/libkvm/kvm_minidump_arm.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -112,6 +112,12 @@ _arm_minidump_initvtop(kvm_t *kd)
vmst->hdr.bitmapsize = _kvm32toh(kd, vmst->hdr.bitmapsize);
vmst->hdr.ptesize = _kvm32toh(kd, vmst->hdr.ptesize);
vmst->hdr.kernbase = _kvm32toh(kd, vmst->hdr.kernbase);
+ vmst->hdr.arch = _kvm32toh(kd, vmst->hdr.arch);
+ vmst->hdr.mmuformat = _kvm32toh(kd, vmst->hdr.mmuformat);
+ if (vmst->hdr.mmuformat == MINIDUMP_MMU_FORMAT_UNKNOWN) {
+ /* This is a safe default as 1K pages are not used. */
+ vmst->hdr.mmuformat = MINIDUMP_MMU_FORMAT_V6;
+ }
/* Skip header and msgbuf */
off = ARM_PAGE_SIZE + arm_round_page(vmst->hdr.msgbufsize);
@@ -179,19 +185,27 @@ _arm_minidump_kvatop(kvm_t *kd, kvaddr_t
if (va >= vm->hdr.kernbase) {
pteindex = (va - vm->hdr.kernbase) >> ARM_PAGE_SHIFT;
pte = _kvm32toh(kd, ptemap[pteindex]);
- if (!pte) {
+ if ((pte & ARM_L2_TYPE_MASK) == ARM_L2_TYPE_INV) {
_kvm_err(kd, kd->program,
"_arm_minidump_kvatop: pte not valid");
goto invalid;
}
if ((pte & ARM_L2_TYPE_MASK) == ARM_L2_TYPE_L) {
- offset = va & ARM_L2_L_OFFSET;
- a = pte & ARM_L2_L_FRAME;
- } else if ((pte & ARM_L2_TYPE_MASK) == ARM_L2_TYPE_S) {
+ /* 64K page -> convert to be like 4K page */
+ offset = va & ARM_L2_S_OFFSET;
+ a = (pte & ARM_L2_L_FRAME) +
+ (va & ARM_L2_L_OFFSET & ARM_L2_S_FRAME);
+ } else {
+ if (kd->vmst->hdr.mmuformat == MINIDUMP_MMU_FORMAT_V4 &&
+ (pte & ARM_L2_TYPE_MASK) == ARM_L2_TYPE_T) {
+ _kvm_err(kd, kd->program,
+ "_arm_minidump_kvatop: pte not supported");
+ goto invalid;
+ }
+ /* 4K page */
offset = va & ARM_L2_S_OFFSET;
a = pte & ARM_L2_S_FRAME;
- } else
- goto invalid;
+ }
ofs = _kvm_hpt_find(&vm->hpt, a);
if (ofs == -1) {
@@ -203,7 +217,6 @@ _arm_minidump_kvatop(kvm_t *kd, kvaddr_t
*pa = ofs + offset;
return (ARM_PAGE_SIZE - offset);
-
} else
_kvm_err(kd, kd->program, "_arm_minidump_kvatop: virtual "
"address 0x%jx not minidumped", (uintmax_t)va);
Modified: user/ngie/socket-tests/lib/libmd/mdXhl.c
==============================================================================
--- user/ngie/socket-tests/lib/libmd/mdXhl.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/lib/libmd/mdXhl.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -1,4 +1,5 @@
-/* mdXhl.c * ----------------------------------------------------------------------------
+/* mdXhl.c
+ * ----------------------------------------------------------------------------
* "THE BEER-WARE LICENSE" (Revision 42):
* <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
* can do whatever you want with this stuff. If we meet some day, and you think
@@ -52,43 +53,44 @@ MDXFileChunk(const char *filename, char
unsigned char buffer[16*1024];
MDX_CTX ctx;
struct stat stbuf;
- int f, i, e;
- off_t n;
+ int fd, readrv, e;
+ off_t remain;
- MDXInit(&ctx);
- f = open(filename, O_RDONLY);
- if (f < 0)
- return 0;
- if (fstat(f, &stbuf) < 0) {
- i = -1;
- goto error;
+ if (len < 0) {
+ errno = EINVAL;
+ return NULL;
}
- if (ofs > stbuf.st_size)
- ofs = stbuf.st_size;
- if ((len == 0) || (len > stbuf.st_size - ofs))
- len = stbuf.st_size - ofs;
- if (lseek(f, ofs, SEEK_SET) < 0) {
- i = -1;
- goto error;
+
+ MDXInit(&ctx);
+ fd = open(filename, O_RDONLY);
+ if (fd < 0)
+ return NULL;
+ if (ofs != 0) {
+ errno = 0;
+ if (lseek(fd, ofs, SEEK_SET) != ofs ||
+ (ofs == -1 && errno != 0)) {
+ readrv = -1;
+ goto error;
+ }
}
- n = len;
- i = 0;
- while (n > 0) {
- if (n > sizeof(buffer))
- i = read(f, buffer, sizeof(buffer));
+ remain = len;
+ readrv = 0;
+ while (len == 0 || remain > 0) {
+ if (len == 0 || remain > sizeof(buffer))
+ readrv = read(fd, buffer, sizeof(buffer));
else
- i = read(f, buffer, n);
- if (i <= 0)
+ readrv = read(fd, buffer, remain);
+ if (readrv <= 0)
break;
- MDXUpdate(&ctx, buffer, i);
- n -= i;
+ MDXUpdate(&ctx, buffer, readrv);
+ remain -= readrv;
}
error:
e = errno;
- close(f);
+ close(fd);
errno = e;
- if (i < 0)
- return 0;
+ if (readrv < 0)
+ return NULL;
return (MDXEnd(&ctx, buf));
}
Modified: user/ngie/socket-tests/share/man/man4/ddb.4
==============================================================================
--- user/ngie/socket-tests/share/man/man4/ddb.4 Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/share/man/man4/ddb.4 Fri Jan 15 22:49:20 2016 (r294106)
@@ -60,7 +60,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 5, 2015
+.Dd January 14, 2016
.Dt DDB 4
.Os
.Sh NAME
@@ -1435,6 +1435,47 @@ The NMI allows one to break into the deb
diagnose problems.
Other bus' bridge chipsets may be able to generate NMI using bus specific
methods.
+There are many PCI and PCIe add-in cards which can generate NMI for
+debugging.
+Modern systems typically use IPMI to generate signals to enter the
+debugger.
+The
+.Dv devel/ipmitool
+port can be used to send the
+.Cd chassis power diag
+command which delivers an NMI to the processor.
+.Pp
+For serial consoles, you can break to the debugger by sending a BREAK
+condition on the serial line if
+.Cd options BREAK_TO_DEBUGGER
+is specified in the kernel.
+Most terminal emulation programs can send a break sequence with a
+special key sequence or via a menu item.
+However, in some setups, sending the break can be difficult to arrange
+or happens spuriously, so if the kernel contains
+.Cd options ALT_BREAK_TO_DEBUGGER
+then the sequence of CR TILDE CTRL-B enters the debugger;
+CR TILDE CTRL-P causes a panic instead of entering the
+debugger; and
+CR TILDE CTRL-R causes an immediate reboot.
+In all the above sequences, CR is a Carriage Return and is usually
+sent by hitting the Enter or Return key.
+TILDE is the ASCII tilde character (~).
+CTRL-x is Control x created by hitting the control key and then x
+and then releasing both.
+.Pp
+The break to debugger behavior may also be enabled by setting the
+.Xr sysctl 8
+.Dv debug.kdb.break_to_debugger
+to 1.
+The alt break to debugger behavior may also be enabled by setting the
+.Xr sysctl 8
+.Dv debug.kdb.alt_break_to_debugger
+to 1.
+The debugger may be entered by setting the
+.Xr sysctl 8
+.Dv debug.kdb.enter
+to 1.
.Sh FILES
Header files mentioned in this manual page can be found below
.Pa /usr/include
Modified: user/ngie/socket-tests/share/man/man4/ioat.4
==============================================================================
--- user/ngie/socket-tests/share/man/man4/ioat.4 Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/share/man/man4/ioat.4 Fri Jan 15 22:49:20 2016 (r294106)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 7, 2016
+.Dd January 14, 2016
.Dt IOAT 4
.Os
.Sh NAME
@@ -134,7 +134,7 @@ Null operations do nothing, but may be u
mechanism.
.Pp
All operations can optionally trigger an interrupt at completion with the
-.Ar DMA_EN_INT
+.Ar DMA_INT_EN
flag.
For example, a user might submit multiple operations to the same channel and
only enable an interrupt and callback for the last operation.
@@ -160,6 +160,17 @@ flag.
.Ar DMA_NO_WAIT
may return NULL.)
.Pp
+Operations that depend on the result of prior operations should use
+.Ar DMA_FENCE .
+For example, such a scenario can happen when two related DMA operations are
+queued.
+First, a DMA copy to one location (A), followed directly by a DMA copy
+from A to B.
+In this scenario, some classes of I/OAT hardware may prefetch A for the second
+operation before it is written by the first operation.
+To avoid reading a stale value in sequences of dependent operations, use
+.Ar DMA_FENCE .
+.Pp
All operations, as well as
.Fn ioat_get_dmaengine ,
can return NULL in special circumstances.
Modified: user/ngie/socket-tests/share/man/man4/sfxge.4
==============================================================================
--- user/ngie/socket-tests/share/man/man4/sfxge.4 Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/share/man/man4/sfxge.4 Fri Jan 15 22:49:20 2016 (r294106)
@@ -121,8 +121,10 @@ If a packet is dropped, the
counter is incremented and the local sender receives ENOBUFS.
The value must be greater than or equal to 0.
.It Va hw.sfxge.tso_fw_assisted
-Enable/disable usage of FW-assisted TSO if supported by NIC firmware.
-Enabled by default.
+Bitmask to enable/disable usage of FW-assisted TSO version if supported
+by NIC firmware.
+FATSOv1 (bit 0) and FATSOv2 (bit 1) are supported.
+All enabled by default.
.It Va hw.sfxge.N.max_rss_channels
The maximum number of allocated RSS channels for the Nth adapter.
If set to 0 or unset, the number of channels is determined by the number
Modified: user/ngie/socket-tests/share/mk/bsd.dep.mk
==============================================================================
--- user/ngie/socket-tests/share/mk/bsd.dep.mk Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/share/mk/bsd.dep.mk Fri Jan 15 22:49:20 2016 (r294106)
@@ -170,12 +170,12 @@ DEPENDSRCS= ${SRCS:M*.[cSC]} ${SRCS:M*.c
.if !empty(DEPENDSRCS)
DEPENDOBJS+= ${DEPENDSRCS:R:S,$,.o,}
.endif
-.for __obj in ${DEPENDOBJS:O:u}
+DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:${DEPEND_FILTER}:C/^/${DEPENDFILE}./}
.if ${.MAKEFLAGS:M-V} == ""
-.sinclude "${DEPENDFILE}.${__obj:${DEPEND_FILTER}}"
-.endif
-DEPENDFILES_OBJS+= ${DEPENDFILE}.${__obj:${DEPEND_FILTER}}
+.for __depend_obj in ${DEPENDFILES_OBJS}
+.sinclude "${__depend_obj}"
.endfor
+.endif
.endif # ${MK_FAST_DEPEND} == "yes"
.endif # defined(SRCS)
Modified: user/ngie/socket-tests/share/mk/bsd.sys.mk
==============================================================================
--- user/ngie/socket-tests/share/mk/bsd.sys.mk Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/share/mk/bsd.sys.mk Fri Jan 15 22:49:20 2016 (r294106)
@@ -164,10 +164,11 @@ SSP_CFLAGS?= -fstack-protector
CFLAGS+= ${SSP_CFLAGS}
.endif # SSP && !ARM && !MIPS
-# Allow user-specified additional warning flags, plus compiler specific flag overrides.
-# Unless we've overriden this...
+# Allow user-specified additional warning flags, plus compiler and file
+# specific flag overrides, unless we've overriden this...
.if ${MK_WARNS} != "no"
CFLAGS+= ${CWARNFLAGS} ${CWARNFLAGS.${COMPILER_TYPE}}
+CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
.endif
CFLAGS+= ${CFLAGS.${COMPILER_TYPE}}
Modified: user/ngie/socket-tests/sys/amd64/linux/linux_proto.h
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux/linux_proto.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux/linux_proto.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
#ifndef _LINUX_SYSPROTO_H_
@@ -966,7 +966,7 @@ struct linux_set_robust_list_args {
};
struct linux_get_robust_list_args {
char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
- char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
+ char head_l_[PADL_(struct linux_robust_list_head **)]; struct linux_robust_list_head ** head; char head_r_[PADR_(struct linux_robust_list_head **)];
char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)];
};
struct linux_splice_args {
Modified: user/ngie/socket-tests/sys/amd64/linux/linux_syscall.h
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux/linux_syscall.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux/linux_syscall.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
#define LINUX_SYS_read 0
Modified: user/ngie/socket-tests/sys/amd64/linux/linux_syscalls.c
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux/linux_syscalls.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux/linux_syscalls.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
const char *linux_syscallnames[] = {
Modified: user/ngie/socket-tests/sys/amd64/linux/linux_sysent.c
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux/linux_sysent.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux/linux_sysent.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
#include <sys/param.h>
Modified: user/ngie/socket-tests/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux/linux_systrace_args.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux/linux_systrace_args.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -2020,7 +2020,7 @@ systrace_args(int sysnum, void *params,
case 274: {
struct linux_get_robust_list_args *p = params;
iarg[0] = p->pid; /* l_int */
- uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head * */
+ uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head ** */
uarg[2] = (intptr_t) p->len; /* l_size_t * */
*n_args = 3;
break;
@@ -5347,7 +5347,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_int";
break;
case 1:
- p = "struct linux_robust_list_head *";
+ p = "struct linux_robust_list_head **";
break;
case 2:
p = "l_size_t *";
Modified: user/ngie/socket-tests/sys/amd64/linux/syscalls.master
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux/syscalls.master Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux/syscalls.master Fri Jan 15 22:49:20 2016 (r294106)
@@ -461,8 +461,8 @@
272 AUE_NULL STD { int linux_unshare(void); }
273 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
l_size_t len); }
-274 AUE_NULL STD { int linux_get_robust_list(l_int pid, struct linux_robust_list_head *head, \
- l_size_t *len); }
+274 AUE_NULL STD { int linux_get_robust_list(l_int pid, \
+ struct linux_robust_list_head **head, l_size_t *len); }
275 AUE_NULL STD { int linux_splice(void); }
276 AUE_NULL STD { int linux_tee(void); }
277 AUE_NULL STD { int linux_sync_file_range(void); }
Modified: user/ngie/socket-tests/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux32/linux32_proto.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux32/linux32_proto.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
#ifndef _LINUX32_SYSPROTO_H_
@@ -1023,7 +1023,7 @@ struct linux_set_robust_list_args {
};
struct linux_get_robust_list_args {
char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
- char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
+ char head_l_[PADL_(struct linux_robust_list_head **)]; struct linux_robust_list_head ** head; char head_r_[PADR_(struct linux_robust_list_head **)];
char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)];
};
struct linux_splice_args {
Modified: user/ngie/socket-tests/sys/amd64/linux32/linux32_syscall.h
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux32/linux32_syscall.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux32/linux32_syscall.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
#define LINUX32_SYS_linux_exit 1
Modified: user/ngie/socket-tests/sys/amd64/linux32/linux32_syscalls.c
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux32/linux32_syscalls.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux32/linux32_syscalls.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
const char *linux32_syscallnames[] = {
Modified: user/ngie/socket-tests/sys/amd64/linux32/linux32_sysent.c
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux32/linux32_sysent.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux32/linux32_sysent.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 289769 2015-10-22 21:28:20Z jhb
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 293907 2016-01-14 10:13:58Z glebius
*/
#include "opt_compat.h"
Modified: user/ngie/socket-tests/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux32/linux32_systrace_args.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux32/linux32_systrace_args.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -2122,7 +2122,7 @@ systrace_args(int sysnum, void *params,
case 312: {
struct linux_get_robust_list_args *p = params;
iarg[0] = p->pid; /* l_int */
- uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head * */
+ uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head ** */
uarg[2] = (intptr_t) p->len; /* l_size_t * */
*n_args = 3;
break;
@@ -5551,7 +5551,7 @@ systrace_entry_setargdesc(int sysnum, in
p = "l_int";
break;
case 1:
- p = "struct linux_robust_list_head *";
+ p = "struct linux_robust_list_head **";
break;
case 2:
p = "l_size_t *";
Modified: user/ngie/socket-tests/sys/amd64/linux32/syscalls.master
==============================================================================
--- user/ngie/socket-tests/sys/amd64/linux32/syscalls.master Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/amd64/linux32/syscalls.master Fri Jan 15 22:49:20 2016 (r294106)
@@ -520,8 +520,8 @@
; linux 2.6.17:
311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
l_size_t len); }
-312 AUE_NULL STD { int linux_get_robust_list(l_int pid, struct linux_robust_list_head *head, \
- l_size_t *len); }
+312 AUE_NULL STD { int linux_get_robust_list(l_int pid, \
+ struct linux_robust_list_head **head, l_size_t *len); }
313 AUE_NULL STD { int linux_splice(void); }
314 AUE_NULL STD { int linux_sync_file_range(void); }
315 AUE_NULL STD { int linux_tee(void); }
Modified: user/ngie/socket-tests/sys/arm/arm/minidump_machdep.c
==============================================================================
--- user/ngie/socket-tests/sys/arm/arm/minidump_machdep.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/arm/arm/minidump_machdep.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -312,7 +312,12 @@ minidumpsys(struct dumperinfo *di)
mdhdr.bitmapsize = vm_page_dump_size;
mdhdr.ptesize = ptesize;
mdhdr.kernbase = KERNBASE;
-
+ mdhdr.arch = __ARM_ARCH;
+#if __ARM_ARCH >= 6
+ mdhdr.mmuformat = MINIDUMP_MMU_FORMAT_V6;
+#else
+ mdhdr.mmuformat = MINIDUMP_MMU_FORMAT_V4;
+#endif
mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARM_VERSION, dumpsize,
di->blocksize);
Modified: user/ngie/socket-tests/sys/arm/at91/at91_mci.c
==============================================================================
--- user/ngie/socket-tests/sys/arm/at91/at91_mci.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/arm/at91/at91_mci.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -446,6 +446,9 @@ at91_mci_attach(device_t dev)
CTLFLAG_RW, &sc->allow_overclock, 0,
"Allow up to 30MHz clock for 25MHz request when next highest speed 15MHz or less.");
+ SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "debug",
+ CTLFLAG_RWTUN, &mci_debug, 0, "enable debug output");
+
/*
* Our real min freq is master_clock/512, but upper driver layers are
* going to set the min speed during card discovery, and the right speed
@@ -783,15 +786,6 @@ at91_mci_start_cmd(struct at91_mci_softc
WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN);
} else {
len = min(BBSIZE, remaining);
- /*
- * If this is MCI1 revision 2xx controller, apply
- * a work-around for the "Data Write Operation and
- * number of bytes" erratum.
- */
- if ((sc->sc_cap & CAP_MCI1_REV2XX) && len < 12) {
- len = 12;
- memset(sc->bbuf_vaddr[0], 0, 12);
- }
at91_bswap_buf(sc, sc->bbuf_vaddr[0], data->data, len);
err = bus_dmamap_load(sc->dmatag, sc->bbuf_map[0],
sc->bbuf_vaddr[0], len, at91_mci_getaddr,
@@ -800,8 +794,13 @@ at91_mci_start_cmd(struct at91_mci_softc
panic("IO write dmamap_load failed\n");
bus_dmamap_sync(sc->dmatag, sc->bbuf_map[0],
BUS_DMASYNC_PREWRITE);
+ /*
+ * Erratum workaround: PDC transfer length on a write
+ * must not be smaller than 12 bytes (3 words); only
+ * blklen bytes (set above) are actually transferred.
+ */
WR4(sc, PDC_TPR,paddr);
- WR4(sc, PDC_TCR, len / 4);
+ WR4(sc, PDC_TCR, (len < 12) ? 3 : len / 4);
sc->bbuf_len[0] = len;
remaining -= len;
if (remaining == 0) {
@@ -818,7 +817,7 @@ at91_mci_start_cmd(struct at91_mci_softc
bus_dmamap_sync(sc->dmatag, sc->bbuf_map[1],
BUS_DMASYNC_PREWRITE);
WR4(sc, PDC_TNPR, paddr);
- WR4(sc, PDC_TNCR, len / 4);
+ WR4(sc, PDC_TNCR, (len < 12) ? 3 : len / 4);
sc->bbuf_len[1] = len;
remaining -= len;
}
Modified: user/ngie/socket-tests/sys/arm/at91/board_tsc4370.c
==============================================================================
--- user/ngie/socket-tests/sys/arm/at91/board_tsc4370.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/arm/at91/board_tsc4370.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -70,6 +70,10 @@ WR4HW(uint32_t devbase, uint32_t regoff,
*(volatile uint32_t *)(AT91_BASE + devbase + regoff) = val;
}
+/*
+ * This is the same calculation the at91 uart driver does, we use it to update
+ * the console uart baud rate after changing the MCK rate.
+ */
#ifndef BAUD2DIVISOR
#define BAUD2DIVISOR(b) \
((((at91_master_clock * 10) / ((b) * 16)) + 5) / 10)
@@ -96,34 +100,6 @@ static struct arm_boot_params boot_param
static struct tsc_bootinfo inkernel_bootinfo;
/*
- * Override the default boot param parser (supplied via weak linkage) with one
- * that knows how to handle our custom tsc_bootinfo passed in from boot2.
- */
-vm_offset_t
-parse_boot_param(struct arm_boot_params *abp)
-{
-
- boot_params = *abp;
-
- /*
- * If the right magic is in r0 and a non-NULL pointer is in r1, then
- * it's our bootinfo, copy it. The pointer in r1 is a physical address
- * passed from boot2. This routine is called immediately upon entry to
- * initarm() and is in very nearly the same environment as boot2. In
- * particular, va=pa and we can safely copy the args before we lose easy
- * access to the memory they're stashed in right now.
- *
- * Note that all versions of boot2 that we've ever shipped have put
- * zeroes into r2 and r3. Maybe that'll be useful some day.
- */
- if (abp->abp_r0 == TSC_BOOTINFO_MAGIC && abp->abp_r1 != 0) {
- inkernel_bootinfo = *(struct tsc_bootinfo *)(abp->abp_r1);
- }
-
- return fake_preload_metadata(abp);
-}
-
-/*
* Change the master clock config and wait for it to stabilize.
*/
static void
@@ -516,6 +492,8 @@ board_init(void)
*/
master_clock_init();
+ /* From this point on you can use printf. */
+
/*
* Configure UARTs.
*/
@@ -598,5 +576,33 @@ board_init(void)
return (at91_ramsize());
}
+/*
+ * Override the default boot param parser (supplied via weak linkage) with one
+ * that knows how to handle our custom tsc_bootinfo passed in from boot2.
+ */
+vm_offset_t
+parse_boot_param(struct arm_boot_params *abp)
+{
+
+ boot_params = *abp;
+
+ /*
+ * If the right magic is in r0 and a non-NULL pointer is in r1, then
+ * it's our bootinfo, copy it. The pointer in r1 is a physical address
+ * passed from boot2. This routine is called immediately upon entry to
+ * initarm() and is in very nearly the same environment as boot2. In
+ * particular, va=pa and we can safely copy the args before we lose easy
+ * access to the memory they're stashed in right now.
+ *
+ * Note that all versions of boot2 that we've ever shipped have put
+ * zeroes into r2 and r3. Maybe that'll be useful some day.
+ */
+ if (abp->abp_r0 == TSC_BOOTINFO_MAGIC && abp->abp_r1 != 0) {
+ inkernel_bootinfo = *(struct tsc_bootinfo *)(abp->abp_r1);
+ }
+
+ return fake_preload_metadata(abp);
+}
+
ARM_BOARD(NONE, "TSC4370 Controller Board");
Modified: user/ngie/socket-tests/sys/arm/conf/IMX53
==============================================================================
--- user/ngie/socket-tests/sys/arm/conf/IMX53 Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/arm/conf/IMX53 Fri Jan 15 22:49:20 2016 (r294106)
@@ -136,11 +136,3 @@ device wlan_amrr # AMRR transmit rate
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
-
-# NOTE: serial console will be disabled if syscons enabled
-# Uncomment following lines for framebuffer/syscons support
-#device sc
-#device vt
-#device kbdmux
-#options SC_DFLT_FONT # compile font in
-#makeoptions SC_DFLT_FONT=cp437
Modified: user/ngie/socket-tests/sys/arm/conf/IMX6
==============================================================================
--- user/ngie/socket-tests/sys/arm/conf/IMX6 Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/arm/conf/IMX6 Fri Jan 15 22:49:20 2016 (r294106)
@@ -125,14 +125,6 @@ device u3g # USB modems
#device wlan_tkip # 802.11 TKIP support
#device wlan_amrr # AMRR transmit rate control algorithm
-# NOTE: serial console will be disabled if syscons enabled
-# Uncomment following lines for framebuffer/syscons support
-# Wandboard has no video console support yet.
-#device sc
-#device kbdmux
-#options SC_DFLT_FONT # compile font in
-#makeoptions SC_DFLT_FONT=cp437
-
device vt
device kbdmux
device ukbd
Modified: user/ngie/socket-tests/sys/arm/include/minidump.h
==============================================================================
--- user/ngie/socket-tests/sys/arm/include/minidump.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/arm/include/minidump.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -28,11 +28,18 @@
*/
#ifndef _MACHINE_MINIDUMP_H_
-#define _MACHINE_MINIDUMP_H_ 1
+#define _MACHINE_MINIDUMP_H_
#define MINIDUMP_MAGIC "minidump FreeBSD/arm"
#define MINIDUMP_VERSION 1
+/*
+ * The first page of vmcore is dedicated to the following header.
+ * As the rest of the page is zeroed, any header extension can be
+ * done without version bumping. It should be taken into account
+ * only that new entries will be zero in old vmcores.
+ */
+
struct minidumphdr {
char magic[24];
uint32_t version;
@@ -40,6 +47,13 @@ struct minidumphdr {
uint32_t bitmapsize;
uint32_t ptesize;
uint32_t kernbase;
+ uint32_t arch;
+ uint32_t mmuformat;
};
+#define MINIDUMP_MMU_FORMAT_UNKNOWN 0
+#define MINIDUMP_MMU_FORMAT_V4 1
+#define MINIDUMP_MMU_FORMAT_V6 2
+#define MINIDUMP_MMU_FORMAT_V6_LPAE 3
+
#endif /* _MACHINE_MINIDUMP_H_ */
Modified: user/ngie/socket-tests/sys/boot/common/bootstrap.h
==============================================================================
--- user/ngie/socket-tests/sys/boot/common/bootstrap.h Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/boot/common/bootstrap.h Fri Jan 15 22:49:20 2016 (r294106)
@@ -237,7 +237,7 @@ void unload(void);
struct preloaded_file *file_alloc(void);
struct preloaded_file *file_findfile(const char *name, const char *type);
struct file_metadata *file_findmetadata(struct preloaded_file *fp, int type);
-struct preloaded_file *file_loadraw(char *name, char *type, int insert);
+struct preloaded_file *file_loadraw(const char *name, char *type, int insert);
void file_discard(struct preloaded_file *fp);
void file_addmetadata(struct preloaded_file *fp, int type, size_t size, void *p);
int file_addmodule(struct preloaded_file *fp, char *modname, int version,
Modified: user/ngie/socket-tests/sys/boot/common/module.c
==============================================================================
--- user/ngie/socket-tests/sys/boot/common/module.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/boot/common/module.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -388,14 +388,14 @@ file_load_dependencies(struct preloaded_
}
/*
- * We've been asked to load (name) as (type), so just suck it in,
+ * We've been asked to load (fname) as (type), so just suck it in,
* no arguments or anything.
*/
struct preloaded_file *
-file_loadraw(char *name, char *type, int insert)
+file_loadraw(const char *fname, char *type, int insert)
{
struct preloaded_file *fp;
- char *cp;
+ char *name;
int fd, got;
vm_offset_t laddr;
@@ -406,12 +406,11 @@ file_loadraw(char *name, char *type, int
}
/* locate the file on the load path */
- cp = file_search(name, NULL);
- if (cp == NULL) {
- sprintf(command_errbuf, "can't find '%s'", name);
+ name = file_search(fname, NULL);
+ if (name == NULL) {
+ sprintf(command_errbuf, "can't find '%s'", fname);
return(NULL);
}
- name = cp;
if ((fd = open(name, O_RDONLY)) < 0) {
sprintf(command_errbuf, "can't open '%s': %s", name, strerror(errno));
Modified: user/ngie/socket-tests/sys/boot/common/ufsread.c
==============================================================================
--- user/ngie/socket-tests/sys/boot/common/ufsread.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/boot/common/ufsread.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -187,8 +187,15 @@ fsread(ufs_ino_t inode, void *buf, size_
blkbuf = dmadat->blkbuf;
indbuf = dmadat->indbuf;
- if (!dsk_meta) {
+
+ /*
+ * Force probe if inode is zero to ensure we have a valid fs, otherwise
+ * when probing multiple paritions, reads from subsequent parititions
+ * will incorrectly succeed.
+ */
+ if (!dsk_meta || inode == 0) {
inomap = 0;
+ dsk_meta = 0;
for (n = 0; sblock_try[n] != -1; n++) {
if (dskread(dmadat->sbbuf, sblock_try[n] / DEV_BSIZE,
SBLOCKSIZE / DEV_BSIZE))
Modified: user/ngie/socket-tests/sys/boot/efi/Makefile
==============================================================================
--- user/ngie/socket-tests/sys/boot/efi/Makefile Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/boot/efi/Makefile Fri Jan 15 22:49:20 2016 (r294106)
@@ -2,7 +2,8 @@
.include <src.opts.mk>
-SUBDIR= libefi
+# In-tree GCC does not support __attribute__((ms_abi)).
+.if ${COMPILER_TYPE} != "gcc"
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
.if ${MK_FDT} != "no"
@@ -13,7 +14,10 @@ SUBDIR+= fdt
.if ${MACHINE_CPUARCH} == "aarch64" || \
${MACHINE_CPUARCH} == "amd64" || \
${MACHINE_CPUARCH} == "arm"
-SUBDIR+= loader boot1
+SUBDIR+= libefi loader boot1
.endif
+.endif # ${COMPILER_TYPE} != "gcc"
+
.include <bsd.subdir.mk>
+
Modified: user/ngie/socket-tests/sys/boot/efi/boot1/Makefile
==============================================================================
--- user/ngie/socket-tests/sys/boot/efi/boot1/Makefile Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/boot/efi/boot1/Makefile Fri Jan 15 22:49:20 2016 (r294106)
@@ -2,10 +2,7 @@
MAN=
-.include <bsd.own.mk>
-
-# In-tree GCC does not support __attribute__((ms_abi)).
-.if ${COMPILER_TYPE} != "gcc"
+.include <src.opts.mk>
MK_SSP= no
@@ -13,14 +10,35 @@ PROG= boot1.sym
INTERNALPROG=
WARNS?= 6
+.if ${MK_ZFS} != "no"
+# Disable warnings that are currently incompatible with the zfs boot code
+CWARNFLAGS.zfs_module.c += -Wno-array-bounds
+CWARNFLAGS.zfs_module.c += -Wno-cast-align
+CWARNFLAGS.zfs_module.c += -Wno-cast-qual
+CWARNFLAGS.zfs_module.c += -Wno-missing-prototypes
+CWARNFLAGS.zfs_module.c += -Wno-sign-compare
+CWARNFLAGS.zfs_module.c += -Wno-unused-parameter
+CWARNFLAGS.zfs_module.c += -Wno-unused-function
+.endif
+
# architecture-specific loader code
-SRCS= boot1.c self_reloc.c start.S
+SRCS= boot1.c self_reloc.c start.S ufs_module.c
+.if ${MK_ZFS} != "no"
+SRCS+= zfs_module.c
+.endif
CFLAGS+= -I.
CFLAGS+= -I${.CURDIR}/../include
CFLAGS+= -I${.CURDIR}/../include/${MACHINE}
CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include
CFLAGS+= -I${.CURDIR}/../../..
+CFLAGS+= -DEFI_UFS_BOOT
+
+.if ${MK_ZFS} != "no"
+CFLAGS+= -I${.CURDIR}/../../zfs/
+CFLAGS+= -I${.CURDIR}/../../../cddl/boot/zfs/
+CFLAGS+= -DEFI_ZFS_BOOT
+.endif
# Always add MI sources and REGULAR efi loader bits
.PATH: ${.CURDIR}/../loader/arch/${MACHINE}
@@ -96,8 +114,6 @@ boot1.efifat: boot1.efi
CLEANFILES= boot1.efi boot1.efifat
-.endif # ${COMPILER_TYPE} != "gcc"
-
.include <bsd.prog.mk>
beforedepend ${OBJS}: machine
Modified: user/ngie/socket-tests/sys/boot/efi/boot1/boot1.c
==============================================================================
--- user/ngie/socket-tests/sys/boot/efi/boot1/boot1.c Fri Jan 15 22:08:58 2016 (r294105)
+++ user/ngie/socket-tests/sys/boot/efi/boot1/boot1.c Fri Jan 15 22:49:20 2016 (r294106)
@@ -5,6 +5,8 @@
* All rights reserved.
* Copyright (c) 2014 Nathan Whitehorn
* All rights reserved.
+ * Copyright (c) 2015 Eric McCorkle
+ * All rights reserved.
*
* Redistribution and use in source and binary forms are freely
* permitted provided that the above copyright notice and this
@@ -21,7 +23,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/dirent.h>
#include <machine/elf.h>
#include <machine/stdarg.h>
#include <stand.h>
@@ -29,19 +30,32 @@ __FBSDID("$FreeBSD$");
#include <efi.h>
#include <eficonsctl.h>
+#include "boot_module.h"
+
#define _PATH_LOADER "/boot/loader.efi"
-#define _PATH_KERNEL "/boot/kernel/kernel"
-#define BSIZEMAX 16384
+static const boot_module_t *boot_modules[] =
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-user@freebsd.org Sat Jan 16 00:44: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 D63A8A84E8B
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 16 Jan 2016 00:44: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 A5E281CFE;
Sat, 16 Jan 2016 00:44: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 u0G0iAlH040200;
Sat, 16 Jan 2016 00:44:10 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0G0iAfe040199;
Sat, 16 Jan 2016 00:44:10 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601160044.u0G0iAfe040199@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, 16 Jan 2016 00:44:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294117 -
user/ngie/socket-tests/tools/regression/sockets/rtsocket
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, 16 Jan 2016 00:44:11 -0000
Author: ngie
Date: Sat Jan 16 00:44:10 2016
New Revision: 294117
URL: https://svnweb.freebsd.org/changeset/base/294117
Log:
Test for EPROTOTYPE, not EPROTONOSUPPORT, with PF_ROUTE as the only
supported `type` parameter for socket(2) per route(4) is SOCK_RAW
The error logically makes sense per socket(2) according to ERRORS
Modified:
user/ngie/socket-tests/tools/regression/sockets/rtsocket/rtsocket.c
Modified: user/ngie/socket-tests/tools/regression/sockets/rtsocket/rtsocket.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/rtsocket/rtsocket.c Sat Jan 16 00:43:10 2016 (r294116)
+++ user/ngie/socket-tests/tools/regression/sockets/rtsocket/rtsocket.c Sat Jan 16 00:44:10 2016 (r294117)
@@ -52,7 +52,7 @@ main(void)
sock);
}
- if (errno != EPROTONOSUPPORT)
+ if (errno != EPROTOTYPE)
err(-1, "socket(PF_ROUTE, SOCK_STREAM, 0)");
sock = socket(PF_ROUTE, SOCK_DGRAM, 0);
@@ -62,7 +62,7 @@ main(void)
sock);
}
- if (errno != EPROTONOSUPPORT)
+ if (errno != EPROTOTYPE)
err(-1, "socket(PF_ROUTE, SOCK_DGRAM, 0)");
sock = socket(PF_ROUTE, SOCK_RAW, 0);
@@ -77,7 +77,7 @@ main(void)
"socketpair(PF_ROUTE, SOCK_STREAM, 0, socks) success");
}
- if (errno != EPROTONOSUPPORT)
+ if (errno != EPROTOTYPE)
err(-1, "socketpair(PF_ROUTE, SOCK_STREAM, 0, socks)");
if (socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks) == 0) {
@@ -87,7 +87,7 @@ main(void)
"socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks) success");
}
- if (errno != EPROTONOSUPPORT)
+ if (errno != EPROTOTYPE)
err(-1, "socketpair(PF_ROUTE, SOCK_DGRAM, 0, socks)");
if (socketpair(PF_ROUTE, SOCK_RAW, 0, socks) == 0) {
From owner-svn-src-user@freebsd.org Sat Jan 16 01:00:50 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 99214A84288
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 16 Jan 2016 01:00:50 +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 6C17B1351;
Sat, 16 Jan 2016 01:00:50 +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 u0G10nSY043552;
Sat, 16 Jan 2016 01:00:49 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0G10neD043551;
Sat, 16 Jan 2016 01:00:49 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601160100.u0G10neD043551@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, 16 Jan 2016 01:00:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294119 -
user/ngie/socket-tests/tools/regression/sockets/unix_socket
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, 16 Jan 2016 01:00:50 -0000
Author: ngie
Date: Sat Jan 16 01:00:49 2016
New Revision: 294119
URL: https://svnweb.freebsd.org/changeset/base/294119
Log:
Similar to r294117, test for EPROTOTYPE, not EPROTONOSUPPORT, as the type
argument is the mismatch, not the protocol
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_socket/unix_socket.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_socket/unix_socket.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_socket/unix_socket.c Sat Jan 16 00:45:48 2016 (r294118)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_socket/unix_socket.c Sat Jan 16 01:00:49 2016 (r294119)
@@ -59,7 +59,7 @@ main(void)
close(sock);
errx(-1, "socket(PF_LOCAL, SOCK_RAW, 0) returned %d", sock);
}
- if (errno != EPROTONOSUPPORT)
+ if (errno != EPROTOTYPE)
err(-1, "socket(PF_LOCAL, SOCK_RAW, 0)");
if (socketpair(PF_LOCAL, SOCK_STREAM, 0, socks) < 0)
From owner-svn-src-user@freebsd.org Sat Jan 16 01:03: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 400C5A843A5
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 16 Jan 2016 01:03: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 09DAA1776;
Sat, 16 Jan 2016 01:03:40 +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 u0G13dV3046243;
Sat, 16 Jan 2016 01:03:39 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0G13dVe046242;
Sat, 16 Jan 2016 01:03:39 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601160103.u0G13dVe046242@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, 16 Jan 2016 01:03:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294120 -
user/ngie/socket-tests/tools/regression/sockets/so_setfib
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, 16 Jan 2016 01:03:41 -0000
Author: ngie
Date: Sat Jan 16 01:03:39 2016
New Revision: 294120
URL: https://svnweb.freebsd.org/changeset/base/294120
Log:
Add missing newline to message about requiring root privileges
Modified:
user/ngie/socket-tests/tools/regression/sockets/so_setfib/so_setfib.c
Modified: user/ngie/socket-tests/tools/regression/sockets/so_setfib/so_setfib.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/so_setfib/so_setfib.c Sat Jan 16 01:00:49 2016 (r294119)
+++ user/ngie/socket-tests/tools/regression/sockets/so_setfib/so_setfib.c Sat Jan 16 01:03:39 2016 (r294120)
@@ -171,7 +171,7 @@ main(int argc __unused, char *argv[] __u
size_t s;
if (geteuid() != 0) {
- printf("1..0 # SKIP: must be root");
+ printf("1..0 # SKIP: must be root\n");
return (0);
}
From owner-svn-src-user@freebsd.org Sat Jan 16 02:28:09 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 C2E5FA8202E
for <svn-src-user@mailman.ysv.freebsd.org>;
Sat, 16 Jan 2016 02:28:09 +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 6B92D1388;
Sat, 16 Jan 2016 02:28:09 +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 u0G2S8r5069939;
Sat, 16 Jan 2016 02:28:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0G2S7YM069928;
Sat, 16 Jan 2016 02:28:07 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601160228.u0G2S7YM069928@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, 16 Jan 2016 02:28:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294129 - in user/ngie/socket-tests: . contrib/mdocml
etc/mtree share/man/man4 share/man/man5 share/man/man9 usr.bin/less
usr.bin/mandoc usr.bin/unzip
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, 16 Jan 2016 02:28:09 -0000
Author: ngie
Date: Sat Jan 16 02:28:07 2016
New Revision: 294129
URL: https://svnweb.freebsd.org/changeset/base/294129
Log:
MFhead @ r294128
Added:
user/ngie/socket-tests/contrib/mdocml/compat_err.c
- copied unchanged from r294128, head/contrib/mdocml/compat_err.c
user/ngie/socket-tests/contrib/mdocml/compat_getline.c
- copied unchanged from r294128, head/contrib/mdocml/compat_getline.c
user/ngie/socket-tests/contrib/mdocml/compat_isblank.c
- copied unchanged from r294128, head/contrib/mdocml/compat_isblank.c
user/ngie/socket-tests/contrib/mdocml/compat_mkdtemp.c
- copied unchanged from r294128, head/contrib/mdocml/compat_mkdtemp.c
user/ngie/socket-tests/contrib/mdocml/compat_progname.c
- copied unchanged from r294128, head/contrib/mdocml/compat_progname.c
user/ngie/socket-tests/contrib/mdocml/compat_stringlist.c
- copied unchanged from r294128, head/contrib/mdocml/compat_stringlist.c
user/ngie/socket-tests/contrib/mdocml/compat_stringlist.h
- copied unchanged from r294128, head/contrib/mdocml/compat_stringlist.h
user/ngie/socket-tests/contrib/mdocml/compat_vasprintf.c
- copied unchanged from r294128, head/contrib/mdocml/compat_vasprintf.c
user/ngie/socket-tests/contrib/mdocml/config.log
- copied unchanged from r294128, head/contrib/mdocml/config.log
user/ngie/socket-tests/contrib/mdocml/man.conf.5
- copied unchanged from r294128, head/contrib/mdocml/man.conf.5
user/ngie/socket-tests/contrib/mdocml/manconf.h
- copied unchanged from r294128, head/contrib/mdocml/manconf.h
user/ngie/socket-tests/contrib/mdocml/mandoc.css
- copied unchanged from r294128, head/contrib/mdocml/mandoc.css
user/ngie/socket-tests/contrib/mdocml/mandoc_ohash.c
- copied unchanged from r294128, head/contrib/mdocml/mandoc_ohash.c
user/ngie/socket-tests/contrib/mdocml/mandoc_ohash.h
- copied unchanged from r294128, head/contrib/mdocml/mandoc_ohash.h
user/ngie/socket-tests/contrib/mdocml/mdoc_state.c
- copied unchanged from r294128, head/contrib/mdocml/mdoc_state.c
user/ngie/socket-tests/contrib/mdocml/roff.h
- copied unchanged from r294128, head/contrib/mdocml/roff.h
user/ngie/socket-tests/contrib/mdocml/roff_int.h
- copied unchanged from r294128, head/contrib/mdocml/roff_int.h
user/ngie/socket-tests/contrib/mdocml/soelim.1
- copied unchanged from r294128, head/contrib/mdocml/soelim.1
user/ngie/socket-tests/contrib/mdocml/soelim.c
- copied unchanged from r294128, head/contrib/mdocml/soelim.c
user/ngie/socket-tests/contrib/mdocml/tag.c
- copied unchanged from r294128, head/contrib/mdocml/tag.c
user/ngie/socket-tests/contrib/mdocml/tag.h
- copied unchanged from r294128, head/contrib/mdocml/tag.h
user/ngie/socket-tests/contrib/mdocml/test-err.c
- copied unchanged from r294128, head/contrib/mdocml/test-err.c
user/ngie/socket-tests/contrib/mdocml/test-getline.c
- copied unchanged from r294128, head/contrib/mdocml/test-getline.c
user/ngie/socket-tests/contrib/mdocml/test-isblank.c
- copied unchanged from r294128, head/contrib/mdocml/test-isblank.c
user/ngie/socket-tests/contrib/mdocml/test-mkdtemp.c
- copied unchanged from r294128, head/contrib/mdocml/test-mkdtemp.c
user/ngie/socket-tests/contrib/mdocml/test-pledge.c
- copied unchanged from r294128, head/contrib/mdocml/test-pledge.c
user/ngie/socket-tests/contrib/mdocml/test-progname.c
- copied unchanged from r294128, head/contrib/mdocml/test-progname.c
user/ngie/socket-tests/contrib/mdocml/test-rewb-bsd.c
- copied unchanged from r294128, head/contrib/mdocml/test-rewb-bsd.c
user/ngie/socket-tests/contrib/mdocml/test-rewb-sysv.c
- copied unchanged from r294128, head/contrib/mdocml/test-rewb-sysv.c
user/ngie/socket-tests/contrib/mdocml/test-stringlist.c
- copied unchanged from r294128, head/contrib/mdocml/test-stringlist.c
user/ngie/socket-tests/contrib/mdocml/test-vasprintf.c
- copied unchanged from r294128, head/contrib/mdocml/test-vasprintf.c
Deleted:
user/ngie/socket-tests/contrib/mdocml/chars.in
user/ngie/socket-tests/contrib/mdocml/compat_fgetln.c
user/ngie/socket-tests/contrib/mdocml/example.style.css
user/ngie/socket-tests/contrib/mdocml/style.css
Modified:
user/ngie/socket-tests/ObsoleteFiles.inc
user/ngie/socket-tests/contrib/mdocml/INSTALL
user/ngie/socket-tests/contrib/mdocml/LICENSE
user/ngie/socket-tests/contrib/mdocml/Makefile
user/ngie/socket-tests/contrib/mdocml/Makefile.depend
user/ngie/socket-tests/contrib/mdocml/NEWS
user/ngie/socket-tests/contrib/mdocml/TODO
user/ngie/socket-tests/contrib/mdocml/apropos.1
user/ngie/socket-tests/contrib/mdocml/att.c
user/ngie/socket-tests/contrib/mdocml/cgi.c
user/ngie/socket-tests/contrib/mdocml/cgi.h.example
user/ngie/socket-tests/contrib/mdocml/chars.c
user/ngie/socket-tests/contrib/mdocml/compat_fts.c
user/ngie/socket-tests/contrib/mdocml/compat_fts.h
user/ngie/socket-tests/contrib/mdocml/compat_ohash.h
user/ngie/socket-tests/contrib/mdocml/compat_sqlite3_errstr.c
user/ngie/socket-tests/contrib/mdocml/config.h
user/ngie/socket-tests/contrib/mdocml/configure
user/ngie/socket-tests/contrib/mdocml/configure.local.example
user/ngie/socket-tests/contrib/mdocml/demandoc.c
user/ngie/socket-tests/contrib/mdocml/eqn.7
user/ngie/socket-tests/contrib/mdocml/eqn.c
user/ngie/socket-tests/contrib/mdocml/gmdiff
user/ngie/socket-tests/contrib/mdocml/html.c
user/ngie/socket-tests/contrib/mdocml/html.h
user/ngie/socket-tests/contrib/mdocml/lib.c
user/ngie/socket-tests/contrib/mdocml/libman.h
user/ngie/socket-tests/contrib/mdocml/libmandoc.h
user/ngie/socket-tests/contrib/mdocml/libmdoc.h
user/ngie/socket-tests/contrib/mdocml/libroff.h
user/ngie/socket-tests/contrib/mdocml/main.c
user/ngie/socket-tests/contrib/mdocml/main.h
user/ngie/socket-tests/contrib/mdocml/man.1
user/ngie/socket-tests/contrib/mdocml/man.c
user/ngie/socket-tests/contrib/mdocml/man.cgi.8
user/ngie/socket-tests/contrib/mdocml/man.h
user/ngie/socket-tests/contrib/mdocml/man_hash.c
user/ngie/socket-tests/contrib/mdocml/man_html.c
user/ngie/socket-tests/contrib/mdocml/man_macro.c
user/ngie/socket-tests/contrib/mdocml/man_term.c
user/ngie/socket-tests/contrib/mdocml/man_validate.c
user/ngie/socket-tests/contrib/mdocml/mandoc.1
user/ngie/socket-tests/contrib/mdocml/mandoc.3
user/ngie/socket-tests/contrib/mdocml/mandoc.c
user/ngie/socket-tests/contrib/mdocml/mandoc.h
user/ngie/socket-tests/contrib/mdocml/mandoc_aux.c
user/ngie/socket-tests/contrib/mdocml/mandoc_aux.h
user/ngie/socket-tests/contrib/mdocml/mandoc_char.7
user/ngie/socket-tests/contrib/mdocml/mandoc_headers.3
user/ngie/socket-tests/contrib/mdocml/mandocdb.c
user/ngie/socket-tests/contrib/mdocml/manpage.c
user/ngie/socket-tests/contrib/mdocml/manpath.c
user/ngie/socket-tests/contrib/mdocml/mansearch.3
user/ngie/socket-tests/contrib/mdocml/mansearch.c
user/ngie/socket-tests/contrib/mdocml/mansearch.h
user/ngie/socket-tests/contrib/mdocml/mchars_alloc.3
user/ngie/socket-tests/contrib/mdocml/mdoc.7
user/ngie/socket-tests/contrib/mdocml/mdoc.c
user/ngie/socket-tests/contrib/mdocml/mdoc.h
user/ngie/socket-tests/contrib/mdocml/mdoc_argv.c
user/ngie/socket-tests/contrib/mdocml/mdoc_hash.c
user/ngie/socket-tests/contrib/mdocml/mdoc_html.c
user/ngie/socket-tests/contrib/mdocml/mdoc_macro.c
user/ngie/socket-tests/contrib/mdocml/mdoc_man.c
user/ngie/socket-tests/contrib/mdocml/mdoc_term.c
user/ngie/socket-tests/contrib/mdocml/mdoc_validate.c
user/ngie/socket-tests/contrib/mdocml/msec.c
user/ngie/socket-tests/contrib/mdocml/out.c
user/ngie/socket-tests/contrib/mdocml/out.h
user/ngie/socket-tests/contrib/mdocml/preconv.c
user/ngie/socket-tests/contrib/mdocml/read.c
user/ngie/socket-tests/contrib/mdocml/roff.7
user/ngie/socket-tests/contrib/mdocml/roff.c
user/ngie/socket-tests/contrib/mdocml/st.c
user/ngie/socket-tests/contrib/mdocml/tbl.c
user/ngie/socket-tests/contrib/mdocml/tbl_data.c
user/ngie/socket-tests/contrib/mdocml/tbl_html.c
user/ngie/socket-tests/contrib/mdocml/tbl_layout.c
user/ngie/socket-tests/contrib/mdocml/tbl_opts.c
user/ngie/socket-tests/contrib/mdocml/tbl_term.c
user/ngie/socket-tests/contrib/mdocml/term.c
user/ngie/socket-tests/contrib/mdocml/term.h
user/ngie/socket-tests/contrib/mdocml/term_ascii.c
user/ngie/socket-tests/contrib/mdocml/term_ps.c
user/ngie/socket-tests/contrib/mdocml/test-dirent-namlen.c
user/ngie/socket-tests/contrib/mdocml/test-fts.c
user/ngie/socket-tests/contrib/mdocml/test-getsubopt.c
user/ngie/socket-tests/contrib/mdocml/test-mmap.c
user/ngie/socket-tests/contrib/mdocml/test-ohash.c
user/ngie/socket-tests/contrib/mdocml/test-reallocarray.c
user/ngie/socket-tests/contrib/mdocml/test-sqlite3.c
user/ngie/socket-tests/contrib/mdocml/test-sqlite3_errstr.c
user/ngie/socket-tests/contrib/mdocml/test-strcasestr.c
user/ngie/socket-tests/contrib/mdocml/test-strlcat.c
user/ngie/socket-tests/contrib/mdocml/test-strlcpy.c
user/ngie/socket-tests/contrib/mdocml/test-strptime.c
user/ngie/socket-tests/contrib/mdocml/test-strsep.c
user/ngie/socket-tests/contrib/mdocml/test-strtonum.c
user/ngie/socket-tests/contrib/mdocml/test-wchar.c
user/ngie/socket-tests/contrib/mdocml/tree.c
user/ngie/socket-tests/etc/mtree/BSD.usr.dist
user/ngie/socket-tests/share/man/man4/acpi_panasonic.4
user/ngie/socket-tests/share/man/man4/ddb.4
user/ngie/socket-tests/share/man/man4/ffclock.4
user/ngie/socket-tests/share/man/man4/geom_uncompress.4
user/ngie/socket-tests/share/man/man4/geom_uzip.4
user/ngie/socket-tests/share/man/man4/sctp.4
user/ngie/socket-tests/share/man/man5/nandfs.5
user/ngie/socket-tests/share/man/man9/cd.9
user/ngie/socket-tests/share/man/man9/zone.9
user/ngie/socket-tests/usr.bin/less/lesspipe.sh
user/ngie/socket-tests/usr.bin/mandoc/Makefile
user/ngie/socket-tests/usr.bin/unzip/unzip.1
user/ngie/socket-tests/usr.bin/unzip/unzip.c
Directory Properties:
user/ngie/socket-tests/ (props changed)
user/ngie/socket-tests/contrib/mdocml/ (props changed)
user/ngie/socket-tests/share/ (props changed)
user/ngie/socket-tests/share/man/man4/ (props changed)
Modified: user/ngie/socket-tests/ObsoleteFiles.inc
==============================================================================
--- user/ngie/socket-tests/ObsoleteFiles.inc Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/ObsoleteFiles.inc Sat Jan 16 02:28:07 2016 (r294129)
@@ -38,6 +38,10 @@
# xargs -n1 | sort | uniq -d;
# 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
# 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/contrib/mdocml/INSTALL
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/INSTALL Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/INSTALL Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,4 +1,4 @@
-$Id: INSTALL,v 1.10 2015/03/09 21:00:14 schwarze Exp $
+$Id: INSTALL,v 1.13 2015/11/07 14:01:16 schwarze Exp $
About mdocml, the portable mandoc distribution
----------------------------------------------
@@ -42,6 +42,8 @@ generates. If anything looks wrong or d
wish, read the file "configure.local.example", create and edit
a file "configure.local", and re-run "./configure" until the
result seems right to you.
+On Solaris 10 and earlier, you may have to run "ksh ./configure"
+because the native /bin/sh lacks some POSIX features.
3. Run "make".
Any POSIX-compatible make, in particular both BSD make and GNU make,
@@ -82,9 +84,10 @@ manual page source.
Understanding mandoc dependencies
---------------------------------
-The mandoc(1), man(1), and demandoc(1) utilities have no external
-dependencies, but makewhatis(8) and apropos(1) depend on the
-following software:
+The mandoc(1), man(1), and demandoc(1) utilities only depend
+on the zlib library for decompressing gzipped manual pages,
+but makewhatis(8) and apropos(1) depend on the following
+additional software:
1. The SQLite database system, see <http://sqlite.org/>.
The recommended version of SQLite is 3.8.4.3 or newer. The mandoc
@@ -107,6 +110,11 @@ If you run into that problem, set "HAVE_
If your system does not have it, the bundled compatibility version
will be used, so you probably need not worry about it.
+One of the chief design goals of the mandoc toolbox is to make
+sure that nothing related to documentation requires C++.
+Consequently, linking mandoc against any kind of C++ program
+would defeat the purpose and is not supported.
+
Checking autoconfiguration quality
----------------------------------
Modified: user/ngie/socket-tests/contrib/mdocml/LICENSE
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/LICENSE Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/LICENSE Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,4 +1,4 @@
-$Id: LICENSE,v 1.7 2015/02/16 14:56:22 schwarze Exp $
+$Id: LICENSE,v 1.11 2015/11/07 17:58:55 schwarze Exp $
With the exceptions noted below, all code and documentation
contained in the mdocml toolkit is protected by the Copyright
@@ -8,10 +8,12 @@ Copyright (c) 2008-2012, 2014 Kristaps D
Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger <joerg@netbsd.org>
Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
+Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
Copyright (c) 1998, 2004, 2010 Todd C. Miller <Todd.Miller@courtesan.com>
Copyright (c) 2008 Otto Moerbeek <otto@drijf.net>
Copyright (c) 2004 Ted Unangst <tedu@openbsd.org>
+Copyright (c) 1994 Christos Zoulas <christos@netbsd.org>
Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org>
See the individual source files for information about who contributed
@@ -35,13 +37,16 @@ OR IN CONNECTION WITH THE USE OR PERFORM
The following files included from outside sources are protected by
-other people's Copyright and are distributed under a 3-clause BSD
-license; see these individual files for details.
+other people's Copyright and are distributed under various 2-clause
+and 3-clause BSD licenses; see these individual files for details.
-compat_fts.c, compat_fts.h,
+soelim.c, soelim.1:
+Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
+
+compat_err.c, compat_fts.c, compat_fts.h,
compat_getsubopt.c, compat_strcasestr.c, compat_strsep.c,
man.1:
Copyright (c) 1989,1990,1993,1994 The Regents of the University of California
-compat_fgetln.c:
-Copyright (c) 1998 The NetBSD Foundation, Inc.
+compat_stringlist.c, compat_stringlist.h:
+Copyright (c) 1994 Christos Zoulas <christos@netbsd.org>
Modified: user/ngie/socket-tests/contrib/mdocml/Makefile
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/Makefile Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/Makefile Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.457 2015/03/13 12:35:32 schwarze Exp $
+# $Id: Makefile,v 1.480 2015/11/07 21:53:14 schwarze Exp $
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
# Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,36 +20,49 @@ VERSION = 1.13.3
# === LIST OF FILES ====================================================
TESTSRCS = test-dirent-namlen.c \
- test-fgetln.c \
+ test-err.c \
test-fts.c \
+ test-getline.c \
test-getsubopt.c \
+ test-isblank.c \
+ test-mkdtemp.c \
test-mmap.c \
test-ohash.c \
+ test-pledge.c \
+ test-progname.c \
test-reallocarray.c \
test-sqlite3.c \
test-sqlite3_errstr.c \
test-strcasestr.c \
+ test-stringlist.c \
test-strlcat.c \
test-strlcpy.c \
test-strptime.c \
test-strsep.c \
test-strtonum.c \
+ test-vasprintf.c \
test-wchar.c
SRCS = att.c \
cgi.c \
chars.c \
- compat_fgetln.c \
+ compat_err.c \
compat_fts.c \
+ compat_getline.c \
compat_getsubopt.c \
+ compat_isblank.c \
+ compat_mkdtemp.c \
compat_ohash.c \
+ compat_progname.c \
compat_reallocarray.c \
compat_sqlite3_errstr.c \
compat_strcasestr.c \
+ compat_stringlist.c \
compat_strlcat.c \
compat_strlcpy.c \
compat_strsep.c \
compat_strtonum.c \
+ compat_vasprintf.c \
demandoc.c \
eqn.c \
eqn_html.c \
@@ -65,6 +78,7 @@ SRCS = att.c \
man_validate.c \
mandoc.c \
mandoc_aux.c \
+ mandoc_ohash.c \
mandocdb.c \
manpage.c \
manpath.c \
@@ -76,6 +90,7 @@ SRCS = att.c \
mdoc_html.c \
mdoc_macro.c \
mdoc_man.c \
+ mdoc_state.c \
mdoc_term.c \
mdoc_validate.c \
msec.c \
@@ -83,7 +98,9 @@ SRCS = att.c \
preconv.c \
read.c \
roff.c \
+ soelim.c \
st.c \
+ tag.c \
tbl.c \
tbl_data.c \
tbl_html.c \
@@ -93,8 +110,7 @@ SRCS = att.c \
term.c \
term_ascii.c \
term_ps.c \
- tree.c \
- $(TESTSRCS)
+ tree.c
DISTFILES = INSTALL \
LICENSE \
@@ -104,14 +120,13 @@ DISTFILES = INSTALL \
TODO \
apropos.1 \
cgi.h.example \
- chars.in \
compat_fts.h \
compat_ohash.h \
+ compat_stringlist.h \
configure \
configure.local.example \
demandoc.1 \
eqn.7 \
- example.style.css \
gmdiff \
html.h \
lib.in \
@@ -121,13 +136,15 @@ DISTFILES = INSTALL \
libroff.h \
main.h \
makewhatis.8 \
- man-cgi.css \
man.1 \
man.7 \
man.cgi.8 \
+ man.conf.5 \
man.h \
+ manconf.h \
mandoc.1 \
mandoc.3 \
+ mandoc.css \
mandoc.db.5 \
mandoc.h \
mandoc_aux.h \
@@ -136,7 +153,7 @@ DISTFILES = INSTALL \
mandoc_headers.3 \
mandoc_html.3 \
mandoc_malloc.3 \
- manpath.h \
+ mandoc_ohash.h \
mansearch.3 \
mansearch.h \
mchars_alloc.3 \
@@ -146,12 +163,15 @@ DISTFILES = INSTALL \
out.h \
predefs.in \
roff.7 \
+ roff.h \
+ soelim.1 \
st.in \
- style.css \
+ tag.h \
tbl.3 \
tbl.7 \
term.h \
- $(SRCS)
+ $(SRCS) \
+ $(TESTSRCS)
LIBMAN_OBJS = man.o \
man_hash.o \
@@ -164,6 +184,7 @@ LIBMDOC_OBJS = att.o \
mdoc_argv.o \
mdoc_hash.o \
mdoc_macro.o \
+ mdoc_state.o \
mdoc_validate.o \
st.o
@@ -180,21 +201,27 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
chars.o \
mandoc.o \
mandoc_aux.o \
+ mandoc_ohash.o \
msec.o \
preconv.o \
read.o
-COMPAT_OBJS = compat_fgetln.o \
+COMPAT_OBJS = compat_err.o \
compat_fts.o \
+ compat_getline.o \
compat_getsubopt.o \
+ compat_isblank.o \
+ compat_mkdtemp.o \
compat_ohash.o \
+ compat_progname.o \
compat_reallocarray.o \
compat_sqlite3_errstr.o \
compat_strcasestr.o \
compat_strlcat.o \
compat_strlcpy.o \
compat_strsep.o \
- compat_strtonum.o
+ compat_strtonum.o \
+ compat_vasprintf.o
MANDOC_HTML_OBJS = eqn_html.o \
html.o \
@@ -218,6 +245,7 @@ BASE_OBJS = $(MANDOC_HTML_OBJS) \
main.o \
manpath.o \
out.o \
+ tag.o \
tree.o
MAIN_OBJS = $(BASE_OBJS)
@@ -236,10 +264,18 @@ MANPAGE_OBJS = manpage.o mansearch.o ma
DEMANDOC_OBJS = demandoc.o
+SOELIM_OBJS = soelim.o \
+ compat_err.o \
+ compat_getline.o \
+ compat_progname.o \
+ compat_reallocarray.o \
+ compat_stringlist.o
+
WWW_MANS = apropos.1.html \
demandoc.1.html \
man.1.html \
mandoc.1.html \
+ soelim.1.html \
mandoc.3.html \
mandoc_escape.3.html \
mandoc_headers.3.html \
@@ -248,6 +284,7 @@ WWW_MANS = apropos.1.html \
mansearch.3.html \
mchars_alloc.3.html \
tbl.3.html \
+ man.conf.5.html \
mandoc.db.5.html \
eqn.7.html \
man.7.html \
@@ -258,11 +295,12 @@ WWW_MANS = apropos.1.html \
makewhatis.8.html \
man.cgi.8.html \
man.h.html \
+ manconf.h.html \
mandoc.h.html \
mandoc_aux.h.html \
- manpath.h.html \
mansearch.h.html \
- mdoc.h.html
+ mdoc.h.html \
+ roff.h.html
WWW_OBJS = mdocml.tar.gz \
mdocml.sha256
@@ -275,7 +313,7 @@ include Makefile.local
all: base-build $(BUILD_TARGETS) Makefile.local
-base-build: mandoc demandoc
+base-build: mandoc demandoc soelim
cgi-build: man.cgi
@@ -301,33 +339,36 @@ clean:
rm -f man.cgi $(CGI_OBJS)
rm -f manpage $(MANPAGE_OBJS)
rm -f demandoc $(DEMANDOC_OBJS)
+ rm -f soelim $(SOELIM_OBJS)
rm -f $(WWW_MANS) $(WWW_OBJS)
rm -rf *.dSYM
base-install: base-build
mkdir -p $(DESTDIR)$(BINDIR)
- mkdir -p $(DESTDIR)$(EXAMPLEDIR)
mkdir -p $(DESTDIR)$(LIBDIR)
mkdir -p $(DESTDIR)$(INCLUDEDIR)
mkdir -p $(DESTDIR)$(MANDIR)/man1
mkdir -p $(DESTDIR)$(MANDIR)/man3
+ mkdir -p $(DESTDIR)$(MANDIR)/man5
mkdir -p $(DESTDIR)$(MANDIR)/man7
$(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
- $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
+ $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
$(DESTDIR)$(INCLUDEDIR)
$(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
$(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+ $(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/${MANM_MANCONF}.5
$(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MAN}.7
$(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MDOC}.7
$(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/${MANM_ROFF}.7
$(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7
$(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7
$(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
- $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
db-install: base-build
mkdir -p $(DESTDIR)$(BINDIR)
@@ -354,8 +395,7 @@ cgi-install: cgi-build
mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8
$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
- $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
- $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
+ $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
$(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
$(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
@@ -376,13 +416,16 @@ man.cgi: $(CGI_OBJS) libmandoc.a
$(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
demandoc: $(DEMANDOC_OBJS) libmandoc.a
- $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
+ $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a $(DBLIB)
+
+soelim: $(SOELIM_OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(SOELIM_OBJS)
# --- maintainer targets ---
www-install: www
mkdir -p $(HTDOCDIR)/snapshots
- $(INSTALL_DATA) $(WWW_MANS) style.css $(HTDOCDIR)
+ $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR)
$(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots
$(INSTALL_DATA) mdocml.tar.gz \
$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
@@ -416,4 +459,4 @@ mdocml.tar.gz: $(DISTFILES)
.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
./mandoc -Thtml -Wall,stop \
- -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
+ -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@
Modified: user/ngie/socket-tests/contrib/mdocml/Makefile.depend
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/Makefile.depend Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/Makefile.depend Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,51 +1,61 @@
-att.o: att.c config.h mdoc.h libmdoc.h
-cgi.o: cgi.c config.h mandoc.h mandoc_aux.h main.h manpath.h mansearch.h cgi.h
-chars.o: chars.c config.h mandoc.h mandoc_aux.h libmandoc.h chars.in
-compat_fgetln.o: compat_fgetln.c config.h
+att.o: att.c config.h roff.h mdoc.h libmdoc.h
+cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h main.h manconf.h mansearch.h cgi.h
+chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h libmandoc.h
+compat_err.o: compat_err.c config.h
compat_fts.o: compat_fts.c config.h compat_fts.h
+compat_getline.o: compat_getline.c config.h
compat_getsubopt.o: compat_getsubopt.c config.h
+compat_isblank.o: compat_isblank.c config.h
+compat_mkdtemp.o: compat_mkdtemp.c config.h
compat_ohash.o: compat_ohash.c config.h compat_ohash.h
+compat_progname.o: compat_progname.c config.h
compat_reallocarray.o: compat_reallocarray.c config.h
compat_sqlite3_errstr.o: compat_sqlite3_errstr.c config.h
compat_strcasestr.o: compat_strcasestr.c config.h
+compat_stringlist.o: compat_stringlist.c config.h compat_stringlist.h
compat_strlcat.o: compat_strlcat.c config.h
compat_strlcpy.o: compat_strlcpy.c config.h
compat_strsep.o: compat_strsep.c config.h
compat_strtonum.o: compat_strtonum.c config.h
-demandoc.o: demandoc.c config.h man.h mdoc.h mandoc.h
+compat_vasprintf.o: compat_vasprintf.c config.h
+demandoc.o: demandoc.c config.h roff.h man.h mdoc.h mandoc.h
eqn.o: eqn.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h
eqn_html.o: eqn_html.c config.h mandoc.h out.h html.h
eqn_term.o: eqn_term.c config.h mandoc.h out.h term.h
-html.o: html.c config.h mandoc.h mandoc_aux.h out.h html.h main.h
-lib.o: lib.c config.h mdoc.h libmdoc.h lib.in
-main.o: main.c config.h mandoc.h mandoc_aux.h main.h mdoc.h man.h manpath.h mansearch.h
-man.o: man.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h
-man_hash.o: man_hash.c config.h man.h libman.h
-man_html.o: man_html.c config.h mandoc_aux.h man.h out.h html.h main.h
-man_macro.o: man_macro.c config.h man.h mandoc.h libmandoc.h libman.h
-man_term.o: man_term.c config.h mandoc.h mandoc_aux.h out.h man.h term.h main.h
-man_validate.o: man_validate.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h
+html.o: html.c config.h mandoc.h mandoc_aux.h out.h html.h manconf.h main.h
+lib.o: lib.c config.h roff.h mdoc.h libmdoc.h lib.in
+main.o: main.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h tag.h main.h manconf.h mansearch.h
+man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h
+man_hash.o: man_hash.c config.h roff.h man.h libman.h
+man_html.o: man_html.c config.h mandoc_aux.h roff.h man.h out.h html.h main.h
+man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h
+man_term.o: man_term.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h term.h main.h
+man_validate.o: man_validate.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h
mandoc.o: mandoc.c config.h mandoc.h mandoc_aux.h libmandoc.h
mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h
-mandocdb.o: mandocdb.c config.h compat_fts.h compat_ohash.h mdoc.h man.h mandoc.h mandoc_aux.h manpath.h mansearch.h
-manpage.o: manpage.c config.h manpath.h mansearch.h
-manpath.o: manpath.c config.h mandoc_aux.h manpath.h
-mansearch.o: mansearch.c config.h compat_ohash.h mandoc.h mandoc_aux.h manpath.h mansearch.h
+mandoc_ohash.o: mandoc_ohash.c mandoc_aux.h mandoc_ohash.h compat_ohash.h
+mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h manconf.h mansearch.h
+manpage.o: manpage.c config.h manconf.h mansearch.h
+manpath.o: manpath.c config.h mandoc_aux.h manconf.h
+mansearch.o: mansearch.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h
mansearch_const.o: mansearch_const.c config.h mansearch.h
-mdoc.o: mdoc.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h
-mdoc_argv.o: mdoc_argv.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h
-mdoc_hash.o: mdoc_hash.c config.h mdoc.h libmdoc.h
-mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mdoc.h out.h html.h main.h
-mdoc_macro.o: mdoc_macro.c config.h mdoc.h mandoc.h libmdoc.h libmandoc.h
-mdoc_man.o: mdoc_man.c config.h mandoc.h mandoc_aux.h out.h man.h mdoc.h main.h
-mdoc_term.o: mdoc_term.c config.h mandoc.h mandoc_aux.h out.h term.h mdoc.h main.h
-mdoc_validate.o: mdoc_validate.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h
+mdoc.o: mdoc.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
+mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h
+mdoc_hash.o: mdoc_hash.c config.h roff.h mdoc.h libmdoc.h
+mdoc_html.o: mdoc_html.c config.h mandoc_aux.h roff.h mdoc.h out.h html.h main.h
+mdoc_macro.o: mdoc_macro.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
+mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h out.h main.h
+mdoc_state.o: mdoc_state.c mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h
+mdoc_term.o: mdoc_term.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h term.h tag.h main.h
+mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h
msec.o: msec.c config.h mandoc.h libmandoc.h msec.in
out.o: out.c config.h mandoc_aux.h mandoc.h out.h
preconv.o: preconv.c config.h mandoc.h libmandoc.h
-read.o: read.c config.h mandoc.h mandoc_aux.h libmandoc.h mdoc.h man.h
-roff.o: roff.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h predefs.in
-st.o: st.c config.h mdoc.h libmdoc.h st.in
+read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h libmandoc.h roff_int.h
+roff.o: roff.c config.h mandoc.h mandoc_aux.h roff.h libmandoc.h roff_int.h libroff.h predefs.in
+soelim.o: soelim.c config.h compat_stringlist.h
+st.o: st.c config.h roff.h mdoc.h libmdoc.h st.in
+tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h tag.h
tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h
tbl_data.o: tbl_data.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h
tbl_html.o: tbl_html.c config.h mandoc.h out.h html.h
@@ -53,22 +63,6 @@ tbl_layout.o: tbl_layout.c config.h mand
tbl_opts.o: tbl_opts.c config.h mandoc.h libmandoc.h libroff.h
tbl_term.o: tbl_term.c config.h mandoc.h out.h term.h
term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h
-term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h main.h
-term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h main.h
-tree.o: tree.c config.h mandoc.h mdoc.h man.h main.h
-test-dirent-namlen.o: test-dirent-namlen.c
-test-fgetln.o: test-fgetln.c
-test-fts.o: test-fts.c
-test-getsubopt.o: test-getsubopt.c
-test-mmap.o: test-mmap.c
-test-ohash.o: test-ohash.c
-test-reallocarray.o: test-reallocarray.c
-test-sqlite3.o: test-sqlite3.c
-test-sqlite3_errstr.o: test-sqlite3_errstr.c
-test-strcasestr.o: test-strcasestr.c
-test-strlcat.o: test-strlcat.c
-test-strlcpy.o: test-strlcpy.c
-test-strptime.o: test-strptime.c
-test-strsep.o: test-strsep.c
-test-strtonum.o: test-strtonum.c
-test-wchar.o: test-wchar.c
+term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h manconf.h main.h
+term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h manconf.h main.h
+tree.o: tree.c config.h mandoc.h roff.h mdoc.h man.h main.h
Modified: user/ngie/socket-tests/contrib/mdocml/NEWS
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/NEWS Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/NEWS Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.9 2015/03/13 12:35:32 schwarze Exp $
+$Id: NEWS,v 1.10 2015/11/05 16:58:20 schwarze Exp $
This file lists the most important changes in the mdocml.bsd.lv distribution.
@@ -93,7 +93,7 @@ Changes in version 1.13.3, released on M
* roff(7): Three minor fixes with respect to evaluation of conditionals.
* roff(7): Let .it accept numerical expressions, not just constants.
* mandoc_char(7): Correct some character names and renderings.
- * If earlier files set a non-zero exit status, never reset it to zero.
+ * If earlier files set a non-zero exit status, never reset it to zero.
--- THANKS TO ---
* Jonathan Gray (OpenBSD) for yet more testing with afl (the American
Fuzzy Lop security fuzzer), again resulting in many bug reports.
Modified: user/ngie/socket-tests/contrib/mdocml/TODO
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/TODO Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/TODO Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,6 +1,6 @@
************************************************************************
* Official mandoc TODO.
-* $Id: TODO,v 1.202 2015/03/11 13:11:22 schwarze Exp $
+* $Id: TODO,v 1.216 2016/01/08 01:37:32 schwarze Exp $
************************************************************************
Many issues are annotated for difficulty as follows:
@@ -66,6 +66,7 @@ are mere guesses, and some may be wrong.
loc * exist * algo * size * imp **
- .ns (no-space mode) occurs in xine-config(1)
+ when implementing this, also let .TH set it
reported by brad@ Sat, 15 Jan 2011 15:45:23 -0500
loc *** exist *** algo *** size ** imp *
@@ -105,6 +106,19 @@ are mere guesses, and some may be wrong.
needed for Tcl_NewStringObj(3) via wiz@ Wed, 5 Mar 2014 22:27:43 +0100
loc ** exist *** algo *** size * imp ***
+- \\ in high-level macro arguments
+ Currently, \\ is expanded in two situations:
+ 1) macro and string definition (roff.c setstrn())
+ 2) macro argument parsing (mandoc.c mandoc_getarg())
+ For user defined macros, the second happens in time because of ROFF_REPARSE.
+ But for standard high-level macros, it only happens after entering the
+ high level parsers, which is too late because the code doesn't get
+ back to roff.c roff_res() from that point. Because this requires
+ distinguishing requests, user-defined macros and standard macros
+ on the roff_res() level, it is hard to solve without the parser reorg.
+ Found by naddy@ in devel/cutils cobfusc(1) Mon, 16 Feb 2015 19:10:52 +0100
+ loc *** exist *** algo *** size ** imp *
+
- using undefined strings or macros defines them to be empty
wl@ Mon, 14 Nov 2011 14:37:01 +0000
loc * exist * algo * size * imp *
@@ -194,6 +208,26 @@ are mere guesses, and some may be wrong.
--- missing tbl features -----------------------------------------------
+- horizontal lines in the layout still consume data cells
+ and can be mixed with actual data on the same table line
+ synaptics(4) found by tedu@ Mon, 17 Aug 2015 21:17:42 -0400
+ loc ** exist ** algo ** size ** imp ***
+
+- the "w" layout option is ignored
+ synaptics(4) found by tedu@ Mon, 17 Aug 2015 21:17:42 -0400
+ loc * exist * algo * size * imp **
+
+- the "s" layout column specifier is used for placement of data
+ into columns, but ignored during column width calculations
+ synaptics(4) found by tedu@ Mon, 17 Aug 2015 21:17:42 -0400
+ loc * exist ** algo *** size * imp **
+
+- support mdoc(7) and man(7) macros inside tbl(7) code;
+ probably requires the parser reorg and letting tbl(7)
+ use roff_node such that macro sets can mix;
+ informed by bapt@ that FreeBSD needs this.
+ loc *** exist ** algo *** size ** imp ***
+
- look at the POSIX manuals in the books/man-pages-posix port,
they use some unsupported tbl(7) features.
loc * exist ** algo ** size ** imp ***
@@ -203,13 +237,13 @@ are mere guesses, and some may be wrong.
suggested by bentley@ Tue, 14 Oct 2014 04:10:55 -0600
loc * exist ** algo * size * imp **
-- allow standalone `.' to be interpreted as an end-of-layout
- delimiter instead of being thrown away as a no-op roff line
- reported by Yuri Pankov, Wed 18 May 2011 11:34:59 CEST
- loc ** exist ** algo ** size * imp **
-
--- missing eqn features -----------------------------------------------
+- In a matrix, break the output line after each matrix line.
+ Found in the discussion at CDBUG 2015.
+ Suggested by Avi Weinstock.
+ loc * exist * algo * size * imp **
+
- The "size" keyword is parsed, but ignored by the formatter.
loc * exist * algo * size * imp *
@@ -227,13 +261,9 @@ are mere guesses, and some may be wrong.
Werner LEMBERG on groff at gnu dot org Sun, 10 Nov 2013 12:47:46
loc ** exist ** algo * size * imp *
-- When makewhatis(8) encounters a FATAL parse error,
- it silently treats the file as formatted, which makes no sense
- at all for paths like man1/foo.1 - and which also contradicts
- what the manual says at the end of the description.
- The end result will be ENOENT for file names returned
- by mansearch() in manpage.file.
- loc * exist * algo * size * imp **
+- change the default PAGER to more -Es and use the pager
+ even for apropos title line output; req by bapt@
+ loc * exist * algo * size * imp ***
- makewhatis(8) for preformatted pages:
parse the section number from the header line
@@ -255,11 +285,13 @@ are mere guesses, and some may be wrong.
- kettenis wants base roff, ms, and me Fri, 1 Jan 2010 22:13:15 +0100 (CET)
loc ** exist ** algo ** size *** imp *
---- compatibility checks -----------------------------------------------
+- Vsevolod Stakhov (FreeBSD) needs either a markdown output formatter
+ for mandoc -mdoc or a markdown to mdoc converter because they
+ have to maintain manuals needed both in markdown and mdoc format.
+ Look at the libsoldout (markdown -> whatever)
+ loc * exist * algo * size ** imp **
-- write a configure check for [[:<:]] support and provide some
- fallback for whatis(1) when it doesn't work;
- Svyatoslav Mishyn Wed, 17 Dec 2014 11:07:10 +0200
+--- compatibility checks -----------------------------------------------
- is .Bk implemented correctly in modern groff?
sobrado@ Tue, 19 Apr 2011 22:12:55 +0200
@@ -293,6 +325,9 @@ are mere guesses, and some may be wrong.
http://swtch.com/plan9port/man/man7/man.html
"Anthony J. Bentley" <anthonyjbentley@gmail.com> 28 Dec 2010 21:58:40 -0700
+- check compatibility with COHERENT troff:
+ http://www.nesssoftware.com/home/mwc/source.php
+
- check compatibility with the man(7) formatter
https://raw.githubusercontent.com/rofl0r/hardcore-utils/master/man.c
@@ -381,6 +416,12 @@ are mere guesses, and some may be wrong.
see also matthew@ Fri, 18 Jul 2014 19:25:12 -0700
loc * exist * algo ** size * imp ***
+- .Bf at the beginning of a paragraph inserts a bogus 1ex horizontal
+ space, see for example random(3). Introduced in
+ http://mdocml.bsd.lv/cgi-bin/cvsweb/mdoc_html.c.diff?r1=1.91&r2=1.92
+ reported by deraadt@ Mon, 28 Sep 2015 20:14:13 -0600 (MDT)
+ loc ** exist ** algo ** size * imp *
+
- jsg on icb, Nov 3, 2014:
try to guess Xr in man(7) for hyperlinking
@@ -394,6 +435,10 @@ are mere guesses, and some may be wrong.
- consider whether <var> can be used for Ar Dv Er Ev Fa Va.
from bentley@ Wed, 13 Aug 2014 09:17:55 -0600
+- generate <img> tags in HTML
+ idea from florian@ Tue, 7 Apr 2015 00:26:28 +0000
+ may be possible to implement with .Lk img://something.png alt_text
+
- check https://github.com/trentm/mdocml
************************************************************************
@@ -466,6 +511,10 @@ are mere guesses, and some may be wrong.
found while talking to Chris Bennett
loc * exist * algo * size * imp *
+- Sequences of multiple man(7) paragraphs (.PP, .IP) interspersed
+ with .ps and .nf/.fi produce execessive blank lines, see libJudy
+ and graphics/dcmtk. The parser reorg may help with this.
+
- trailing whitespace must be ignored even when followed by a font escape,
see for example
makes
@@ -475,9 +524,31 @@ are mere guesses, and some may be wrong.
loc ** exist ** algo ** size * imp **
************************************************************************
+* portability
+************************************************************************
+
+- systems having UTF-8 but not en_US.UTF-8
+ call locale(1) from ./configure, select a UTF-8-locale,
+ and use that for test-wchar.c and term_ascii.c
+ to Markus Waldeck Sat, 18 Jul 2015 01:55:37 +0200
+ loc * exist * algo * size * imp *
+
+************************************************************************
* warning issues
************************************************************************
+- provide a way in mandoc(1) to warn about broken .Xr links;
+ probably cannot be on by default in -Tlint because it needs
+ to access the manpath and mandoc.db(3) after parsing.
+ asked for by jmc@ Fri, 4 Dec 2015 22:39:40 +0000
+
+- Report errors in -O suboption parsing.
+ loc * exist * algo * size * imp **
+
+- warn when .Sh or .Ss contain other macros
+ Steffen Nurpmeso, savannah.gnu.org/bugs/index.php?45034
+ loc * exist * algo * size * imp **
+
- check that MANDOCERR_BADTAB is thrown in the right cases,
i.e. when finding a literal tab character in fill mode,
and possibly change the wording of the warning message
@@ -557,11 +628,6 @@ Several areas can be cleaned up to make
* structural issues
************************************************************************
-- Improve -O suboption parsing. Do it in the main program such that
- errors can be reported. Pay attention to distinguishing the
- mandoc(1) and apropos(1) styles of both options.
- loc ** exist * algo ** size ** imp ***
-
- Use libz directly instead of forking gunzip(1).
Suggested by bapt at FreeBSD among others.
Modified: user/ngie/socket-tests/contrib/mdocml/apropos.1
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/apropos.1 Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/apropos.1 Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,4 +1,4 @@
-.\" $Id: apropos.1,v 1.37 2015/02/16 16:23:54 schwarze Exp $
+.\" $Id: apropos.1,v 1.39 2015/04/03 08:46:17 schwarze Exp $
.\"
.\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
.\" Copyright (c) 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: February 16 2015 $
+.Dd $Mdocdate: April 3 2015 $
.Dt APROPOS 1
.Os
.Sh NAME
@@ -210,7 +210,7 @@ This has syntax
.Sm off
.Oo
.Op Ar key Op , Ar key ...
-.Pq Cm = | ~
+.Pq Cm = | \(ti
.Oc
.Ar val ,
.Sm on
@@ -227,7 +227,7 @@ for a list of available keys.
Operator
.Cm =
evaluates a substring, while
-.Cm ~
+.Cm \(ti
evaluates a regular expression.
.It Fl i Ar term
If
@@ -365,7 +365,8 @@ Specifies the pagination program to use
.Ev MANPAGER
is not defined.
If neither PAGER nor MANPAGER is defined,
-.Pa /usr/bin/more Fl s
+.Xr more 1
+.Fl s
will be used.
.El
.Sh FILES
@@ -398,7 +399,7 @@ as well:
.Pp
Search in names and descriptions using a regular expression:
.Pp
-.Dl $ apropos '~set.?[ug]id'
+.Dl $ apropos \(aq\(tiset.?[ug]id\(aq
.Pp
Search for manuals in the library section mentioning both the
.Qq optind
@@ -413,15 +414,15 @@ Do exactly the same as calling
with the argument
.Qq ssh :
.Pp
-.Dl $ apropos \-\- \-i 'Nm~[[:<:]]ssh[[:>:]]'
+.Dl $ apropos \-\- \-i \(aqNm\(ti[[:<:]]ssh[[:>:]]\(aq
.Pp
The following two invocations are equivalent:
.Pp
.D1 Li $ apropos -S Ar arch Li -s Ar section expression
.Bd -ragged -offset indent
.Li $ apropos \e( Ar expression Li \e)
-.Li -a arch~^( Ns Ar arch Ns Li |any)$
-.Li -a sec~^ Ns Ar section Ns Li $
+.Li -a arch\(ti^( Ns Ar arch Ns Li |any)$
+.Li -a sec\(ti^ Ns Ar section Ns Li $
.Ed
.Sh SEE ALSO
.Xr man 1 ,
Modified: user/ngie/socket-tests/contrib/mdocml/att.c
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/att.c Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/att.c Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,4 +1,4 @@
-/* $Id: att.c,v 1.13 2014/11/28 18:57:31 schwarze Exp $ */
+/* $Id: att.c,v 1.15 2015/10/06 18:32:19 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <string.h>
+#include "roff.h"
#include "mdoc.h"
#include "libmdoc.h"
@@ -45,5 +46,5 @@ mdoc_a2att(const char *p)
LINE("V.3", "AT&T System\\~V Release\\~3 UNIX");
LINE("V.4", "AT&T System\\~V Release\\~4 UNIX");
- return(NULL);
+ return NULL;
}
Modified: user/ngie/socket-tests/contrib/mdocml/cgi.c
==============================================================================
--- user/ngie/socket-tests/contrib/mdocml/cgi.c Sat Jan 16 02:19:56 2016 (r294128)
+++ user/ngie/socket-tests/contrib/mdocml/cgi.c Sat Jan 16 02:28:07 2016 (r294129)
@@ -1,15 +1,15 @@
-/* $Id: cgi.c,v 1.104 2015/02/10 08:05:30 schwarze Exp $ */
+/* $Id: cgi.c,v 1.116 2016/01/04 12:36:26 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
+ * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@usta.de>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -30,10 +30,13 @@
#include <string.h>
#include <unistd.h>
-#include "mandoc.h"
#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"
+#include "man.h"
#include "main.h"
-#include "manpath.h"
+#include "manconf.h"
#include "mansearch.h"
#include "cgi.h"
@@ -60,9 +63,6 @@ static void html_print(const char *);
static void html_putchar(char);
static int http_decode(char *);
static void http_parse(struct req *, const char *);
-static void http_print(const char *);
-static void http_putchar(char);
-static void http_printquery(const struct req *, const char *);
static void pathgen(struct req *);
static void pg_error_badrequest(const char *);
static void pg_error_internal(void);
@@ -74,6 +74,7 @@ static void pg_searchres(const struct
static void pg_show(struct req *, const char *);
static void resp_begin_html(int, const char *);
static void resp_begin_http(int, const char *);
+static void resp_copy(const char *);
static void resp_end_html(void);
static void resp_searchform(const struct req *);
static void resp_show(const struct req *, const char *);
@@ -145,40 +146,6 @@ html_putchar(char c)
}
}
-static void
-http_printquery(const struct req *req, const char *sep)
-{
-
- if (NULL != req->q.query) {
- printf("query=");
- http_print(req->q.query);
- }
- if (0 == req->q.equal)
- printf("%sapropos=1", sep);
- if (NULL != req->q.sec) {
- printf("%ssec=", sep);
- http_print(req->q.sec);
- }
- if (NULL != req->q.arch) {
- printf("%sarch=", sep);
- http_print(req->q.arch);
- }
- if (strcmp(req->q.manpath, req->p[0])) {
- printf("%smanpath=", sep);
- http_print(req->q.manpath);
- }
-}
-
-static void
-http_print(const char *p)
-{
-
- if (NULL == p)
- return;
- while ('\0' != *p)
- http_putchar(*p++);
-}
-
/*
* Call through to html_putchar().
* Accepts NULL strings.
@@ -299,20 +266,6 @@ next:
}
}
-static void
-http_putchar(char c)
-{
-
- if (isalnum((unsigned char)c)) {
- putchar((unsigned char)c);
- return;
- } else if (' ' == c) {
- putchar('+');
- return;
- }
- printf("%%%.2x", c);
-}
-
/*
* HTTP-decode a string. The standard explanation is that this turns
* "%4e+foo" into "n foo" in the regular way. This is done in-place
@@ -331,13 +284,13 @@ http_decode(char *p)
for ( ; '\0' != *p; p++, q++) {
if ('%' == *p) {
if ('\0' == (hex[0] = *(p + 1)))
- return(0);
+ return 0;
if ('\0' == (hex[1] = *(p + 2)))
- return(0);
+ return 0;
if (1 != sscanf(hex, "%x", &c))
- return(0);
+ return 0;
if ('\0' == c)
- return(0);
+ return 0;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***