From owner-svn-src-projects@freebsd.org Sun Sep 3 22:00:38 2017 Return-Path: Delivered-To: svn-src-projects@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 5B73AE210E8 for ; Sun, 3 Sep 2017 22:00:38 +0000 (UTC) (envelope-from rmacklem@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 21EB87DA0B; Sun, 3 Sep 2017 22:00:38 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v83M0b2B007625; Sun, 3 Sep 2017 22:00:37 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v83M0bdX007624; Sun, 3 Sep 2017 22:00:37 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201709032200.v83M0bdX007624@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 3 Sep 2017 22:00:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323149 - projects/pnfs-planb-server-stable11/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server-stable11/sys/fs/nfsserver X-SVN-Commit-Revision: 323149 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Sep 2017 22:00:38 -0000 Author: rmacklem Date: Sun Sep 3 22:00:36 2017 New Revision: 323149 URL: https://svnweb.freebsd.org/changeset/base/323149 Log: Change the ffsd_stateid.seqid field in the Flex File Layout to be 0, so that the DS will accept it. Found during testing with the Linux flexfilelayout client driver. Modified: projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c Sun Sep 3 16:45:18 2017 (r323148) +++ projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdstate.c Sun Sep 3 22:00:36 2017 (r323149) @@ -6408,7 +6408,7 @@ nfsrv_flexlayout(struct nfsrv_descript *nd, int iomode tl += (NFSX_V4DEVICEID / NFSX_UNSIGNED); devid += NFSX_V4DEVICEID; *tl++ = txdr_unsigned(1); /* Efficiency. */ - *tl++ = 0xffffffff; /* Proxy Stateid. */ + *tl++ = 0; /* Proxy Stateid. */ *tl++ = 0x55555555; *tl++ = 0x55555555; *tl++ = 0x55555555; From owner-svn-src-projects@freebsd.org Sun Sep 3 22:03:00 2017 Return-Path: Delivered-To: svn-src-projects@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 51AB7E21263 for ; Sun, 3 Sep 2017 22:03:00 +0000 (UTC) (envelope-from rmacklem@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 1EE647DDC4; Sun, 3 Sep 2017 22:03:00 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v83M2xhQ011356; Sun, 3 Sep 2017 22:02:59 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v83M2xjx011355; Sun, 3 Sep 2017 22:02:59 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201709032202.v83M2xjx011355@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sun, 3 Sep 2017 22:02:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323150 - projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Commit-Revision: 323150 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Sep 2017 22:03:00 -0000 Author: rmacklem Date: Sun Sep 3 22:02:59 2017 New Revision: 323150 URL: https://svnweb.freebsd.org/changeset/base/323150 Log: Change the ffsd_stateid.seqid field in the Flex File Layout to be 0, so that the DS will accept it. Found during testing with the Linux flexfilelayout client driver. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Sun Sep 3 22:00:36 2017 (r323149) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c Sun Sep 3 22:02:59 2017 (r323150) @@ -6408,7 +6408,7 @@ nfsrv_flexlayout(struct nfsrv_descript *nd, int iomode tl += (NFSX_V4DEVICEID / NFSX_UNSIGNED); devid += NFSX_V4DEVICEID; *tl++ = txdr_unsigned(1); /* Efficiency. */ - *tl++ = 0xffffffff; /* Proxy Stateid. */ + *tl++ = 0; /* Proxy Stateid. */ *tl++ = 0x55555555; *tl++ = 0x55555555; *tl++ = 0x55555555; From owner-svn-src-projects@freebsd.org Mon Sep 4 20:23:40 2017 Return-Path: Delivered-To: svn-src-projects@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 EA544E1C025 for ; Mon, 4 Sep 2017 20:23:40 +0000 (UTC) (envelope-from rmacklem@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 B96FD93E; Mon, 4 Sep 2017 20:23:40 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84KNd2g055437; Mon, 4 Sep 2017 20:23:39 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84KNdc2055436; Mon, 4 Sep 2017 20:23:39 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201709042023.v84KNdc2055436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 4 Sep 2017 20:23:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323158 - projects/pnfs-planb-server-stable11/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server-stable11/sys/fs/nfsserver X-SVN-Commit-Revision: 323158 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2017 20:23:41 -0000 Author: rmacklem Date: Mon Sep 4 20:23:39 2017 New Revision: 323158 URL: https://svnweb.freebsd.org/changeset/base/323158 Log: Fix handling of the case where one of the mirrors is no longer online. One small step towards handling failure/recovery of a mirror. Modified: projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdport.c Modified: projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdport.c Mon Sep 4 20:19:36 2017 (r323157) +++ projects/pnfs-planb-server-stable11/sys/fs/nfsserver/nfs_nfsdport.c Mon Sep 4 20:23:39 2017 (r323158) @@ -4174,7 +4174,7 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char struct nfsdevice *ds, *mds; struct pnfsdsfile *pf; uint32_t dsdir; - int done, error, fhiszero, gotone, i, j, mirrorcnt; + int done, error, fhiszero, gotone, i, mirrorcnt; *mirrorcntp = 1; fhiszero = 0; @@ -4226,7 +4226,6 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char } NFSDDSUNLOCK(); if (ds != NULL) { - gotone = 1; if (dvpp != NULL || fhiszero != 0) { dvp = ds->nfsdev_dsdir[dsdir]; error = vn_lock(dvp, lktype); @@ -4250,6 +4249,7 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char devid += NFSX_V4DEVICEID; } if (error == 0) { + gotone++; if (dvpp != NULL) { *tdvpp++ = dvp; *nmpp++ = nmp; @@ -4271,14 +4271,14 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char error = ENOENT; if (error == 0) - *mirrorcntp = mirrorcnt; - else if (i > 1 && dvpp != NULL && gotone != 0) { + *mirrorcntp = gotone; + else if (gotone > 0 && dvpp != NULL) { /* * If the error didn't occur on the first one and dvpp != NULL, * the one(s) prior to the failure will have locked dvp's that * need to be unlocked. */ - for (j = 1; j < i; j++) { + for (i = 0; i < gotone; i++) { NFSVOPUNLOCK(*dvpp, 0); *dvpp++ = NULL; } From owner-svn-src-projects@freebsd.org Mon Sep 4 20:27:13 2017 Return-Path: Delivered-To: svn-src-projects@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 E96D0E1C25E for ; Mon, 4 Sep 2017 20:27:13 +0000 (UTC) (envelope-from rmacklem@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 B39E4AAF; Mon, 4 Sep 2017 20:27:13 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84KRC8r055599; Mon, 4 Sep 2017 20:27:12 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84KRCOo055598; Mon, 4 Sep 2017 20:27:12 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201709042027.v84KRCOo055598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 4 Sep 2017 20:27:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323159 - projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/sys/fs/nfsserver X-SVN-Commit-Revision: 323159 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2017 20:27:14 -0000 Author: rmacklem Date: Mon Sep 4 20:27:12 2017 New Revision: 323159 URL: https://svnweb.freebsd.org/changeset/base/323159 Log: Fix handling of the case where one of the mirrors is no longer online. One small step towards handling failure/recovery of a mirror. Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Mon Sep 4 20:23:39 2017 (r323158) +++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c Mon Sep 4 20:27:12 2017 (r323159) @@ -4191,7 +4191,7 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char struct nfsdevice *ds, *mds; struct pnfsdsfile *pf; uint32_t dsdir; - int done, error, fhiszero, gotone, i, j, mirrorcnt; + int done, error, fhiszero, gotone, i, mirrorcnt; *mirrorcntp = 1; fhiszero = 0; @@ -4243,7 +4243,6 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char } NFSDDSUNLOCK(); if (ds != NULL) { - gotone = 1; if (dvpp != NULL || fhiszero != 0) { dvp = ds->nfsdev_dsdir[dsdir]; error = vn_lock(dvp, lktype); @@ -4267,6 +4266,7 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char devid += NFSX_V4DEVICEID; } if (error == 0) { + gotone++; if (dvpp != NULL) { *tdvpp++ = dvp; *nmpp++ = nmp; @@ -4288,14 +4288,14 @@ nfsrv_dsgetsockmnt(struct vnode *vp, int lktype, char error = ENOENT; if (error == 0) - *mirrorcntp = mirrorcnt; - else if (i > 1 && dvpp != NULL && gotone != 0) { + *mirrorcntp = gotone; + else if (gotone > 0 && dvpp != NULL) { /* * If the error didn't occur on the first one and dvpp != NULL, * the one(s) prior to the failure will have locked dvp's that * need to be unlocked. */ - for (j = 1; j < i; j++) { + for (i = 0; i < gotone; i++) { NFSVOPUNLOCK(*dvpp, 0); *dvpp++ = NULL; } From owner-svn-src-projects@freebsd.org Mon Sep 4 21:14:14 2017 Return-Path: Delivered-To: svn-src-projects@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 07215E1EC14 for ; Mon, 4 Sep 2017 21:14:14 +0000 (UTC) (envelope-from rmacklem@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 D59D52C62; Mon, 4 Sep 2017 21:14:13 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84LECSt075794; Mon, 4 Sep 2017 21:14:12 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84LECai075793; Mon, 4 Sep 2017 21:14:12 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201709042114.v84LECai075793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 4 Sep 2017 21:14:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323162 - projects/pnfs-planb-server-stable11/usr.bin/pnfsdsfile X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server-stable11/usr.bin/pnfsdsfile X-SVN-Commit-Revision: 323162 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2017 21:14:14 -0000 Author: rmacklem Date: Mon Sep 4 21:14:12 2017 New Revision: 323162 URL: https://svnweb.freebsd.org/changeset/base/323162 Log: Fix pnfsdsfile to handle mirrors. Modified: projects/pnfs-planb-server-stable11/usr.bin/pnfsdsfile/pnfsdsfile.c Modified: projects/pnfs-planb-server-stable11/usr.bin/pnfsdsfile/pnfsdsfile.c ============================================================================== --- projects/pnfs-planb-server-stable11/usr.bin/pnfsdsfile/pnfsdsfile.c Mon Sep 4 20:57:38 2017 (r323161) +++ projects/pnfs-planb-server-stable11/usr.bin/pnfsdsfile/pnfsdsfile.c Mon Sep 4 21:14:12 2017 (r323162) @@ -40,6 +40,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include +#include #include static void usage(void); @@ -65,12 +68,14 @@ main(int argc, char *argv[]) struct sockaddr_in *sin, *adsin; struct sockaddr_in6 *sin6, *adsin6; char hostn[2 * NI_MAXHOST + 2], *cp; - struct pnfsdsfile dsfile; - int ch, quiet, zerofh; + struct pnfsdsfile dsfile[NFSDEV_MAXMIRRORS]; + int ch, dosetxattr, i, mirrorcnt, quiet, zerofh; in_port_t tport; + ssize_t xattrsize; zerofh = 0; quiet = 0; + dosetxattr = 0; res = NULL; newres = NULL; while ((ch = getopt_long(argc, argv, "c:qs:z", longopts, NULL)) != -1) { @@ -116,110 +121,121 @@ main(int argc, char *argv[]) * The host address and directory where the data storage file is * located is in the extended attribute "pnfsd.dsfile". */ - if (extattr_get_file(*argv, EXTATTR_NAMESPACE_SYSTEM, "pnfsd.dsfile", - &dsfile, sizeof(dsfile)) != sizeof(dsfile)) + xattrsize = extattr_get_file(*argv, EXTATTR_NAMESPACE_SYSTEM, + "pnfsd.dsfile", dsfile, sizeof(dsfile)); + mirrorcnt = xattrsize / sizeof(struct pnfsdsfile); + if (mirrorcnt < 1 || xattrsize != mirrorcnt * sizeof(struct pnfsdsfile)) err(1, "Can't get extattr pnfsd.dsfile\n"); - /* Do the zerofh option. You must be root to use this option. */ - if (zerofh != 0) { - if (geteuid() != 0) - errx(1, "Must be root/su to zerofh\n"); - - /* - * Do it for the server specified by -s/--ds or all servers, - * if -s/--ds was not sepcified. - */ - sin = &dsfile.dsf_sin; - sin6 = &dsfile.dsf_sin6; - ad = res; - while (ad != NULL) { - adsin = (struct sockaddr_in *)ad->ai_addr; - adsin6 = (struct sockaddr_in6 *)ad->ai_addr; - if (adsin->sin_family == sin->sin_family) { - if (sin->sin_family == AF_INET && - sin->sin_addr.s_addr == - adsin->sin_addr.s_addr) - break; - else if (sin->sin_family == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &adsin6->sin6_addr)) - break; + for (i = 0; i < mirrorcnt; i++) { + if (i > 0) + printf(" "); + /* Do the zerofh option. You must be root. */ + if (zerofh != 0) { + if (geteuid() != 0) + errx(1, "Must be root/su to zerofh\n"); + + /* + * Do it for the server specified by -s/--ds or all + * servers, if -s/--ds was not specified. + */ + sin = &dsfile[i].dsf_sin; + sin6 = &dsfile[i].dsf_sin6; + ad = res; + while (ad != NULL) { + adsin = (struct sockaddr_in *)ad->ai_addr; + adsin6 = (struct sockaddr_in6 *)ad->ai_addr; + if (adsin->sin_family == sin->sin_family) { + if (sin->sin_family == AF_INET && + sin->sin_addr.s_addr == + adsin->sin_addr.s_addr) + break; + else if (sin->sin_family == AF_INET6 && + IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + &adsin6->sin6_addr)) + break; + } + ad = ad->ai_next; } - ad = ad->ai_next; - } - if (res == NULL || ad != NULL) { - memset(&dsfile.dsf_fh, 0, sizeof(dsfile.dsf_fh)); - if (extattr_set_file(*argv, EXTATTR_NAMESPACE_SYSTEM, - "pnfsd.dsfile", &dsfile, sizeof(dsfile)) != - sizeof(dsfile)) - err(1, "Can't set pnfsd.dsfile\n"); - } - } - - /* Do the -c option to replace the DS host address. */ - if (newres != NULL) { - if (geteuid() != 0) - errx(1, "Must be root/su to replace the host addr\n"); - - /* - * Check that the old host address matches. - */ - sin = &dsfile.dsf_sin; - sin6 = &dsfile.dsf_sin6; - ad = res; - while (ad != NULL) { - adsin = (struct sockaddr_in *)ad->ai_addr; - adsin6 = (struct sockaddr_in6 *)ad->ai_addr; - if (adsin->sin_family == sin->sin_family) { - if (sin->sin_family == AF_INET && - sin->sin_addr.s_addr == - adsin->sin_addr.s_addr) - break; - else if (sin->sin_family == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &adsin6->sin6_addr)) - break; + if (res == NULL || ad != NULL) { + memset(&dsfile[i].dsf_fh, 0, sizeof(fhandle_t)); + dosetxattr = 1; } - ad = ad->ai_next; } - if (ad != NULL) { - if (sin->sin_family == AF_INET) - tport = sin->sin_port; - else - tport = sin6->sin6_port; + + /* Do the -c option to replace the DS host address. */ + if (newres != NULL) { + if (geteuid() != 0) + errx(1, "Must be root/su to replace the host" + " addr\n"); + /* - * We have a match, so replace it with the first - * AF_INET or AF_INET6 address in the newres list. + * Check that the old host address matches. */ - while (newres->ai_addr->sa_family != AF_INET && - newres->ai_addr->sa_family != AF_INET6) { - newres = newres->ai_next; - if (newres == NULL) - errx(1, "Hostname %s has no IP#\n", cp); + sin = &dsfile[i].dsf_sin; + sin6 = &dsfile[i].dsf_sin6; + ad = res; + while (ad != NULL) { + adsin = (struct sockaddr_in *)ad->ai_addr; + adsin6 = (struct sockaddr_in6 *)ad->ai_addr; + if (adsin->sin_family == sin->sin_family) { + if (sin->sin_family == AF_INET && + sin->sin_addr.s_addr == + adsin->sin_addr.s_addr) + break; + else if (sin->sin_family == AF_INET6 && + IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + &adsin6->sin6_addr)) + break; + } + ad = ad->ai_next; } - if (newres->ai_addr->sa_family == AF_INET) { - memcpy(sin, newres->ai_addr, sizeof(*sin)); - sin->sin_port = tport; - } else if (newres->ai_addr->sa_family == AF_INET6) { - memcpy(sin6, newres->ai_addr, sizeof(*sin6)); - sin6->sin6_port = tport; + if (ad != NULL) { + if (sin->sin_family == AF_INET) + tport = sin->sin_port; + else + tport = sin6->sin6_port; + /* + * We have a match, so replace it with the first + * AF_INET or AF_INET6 address in the newres + * list. + */ + while (newres->ai_addr->sa_family != AF_INET && + newres->ai_addr->sa_family != AF_INET6) { + newres = newres->ai_next; + if (newres == NULL) + errx(1, "Hostname %s has no" + " IP#\n", cp); + } + if (newres->ai_addr->sa_family == AF_INET) { + memcpy(sin, newres->ai_addr, + sizeof(*sin)); + sin->sin_port = tport; + } else if (newres->ai_addr->sa_family == + AF_INET6) { + memcpy(sin6, newres->ai_addr, + sizeof(*sin6)); + sin6->sin6_port = tport; + } + dosetxattr = 1; } - if (extattr_set_file(*argv, EXTATTR_NAMESPACE_SYSTEM, - "pnfsd.dsfile", &dsfile, sizeof(dsfile)) != - sizeof(dsfile)) - err(1, "Can't set pnfsd.dsfile\n"); } + + if (quiet == 0) { + /* Translate the IP address to a hostname. */ + if (getnameinfo((struct sockaddr *)&dsfile[i].dsf_sin, + dsfile[i].dsf_sin.sin_len, hostn, sizeof(hostn), + NULL, 0, 0) < 0) + err(1, "Can't get hostname\n"); + printf("%s\tds%d/%s", hostn, dsfile[i].dsf_dir, + dsfile[i].dsf_filename); + } } - - if (quiet != 0) - exit(0); - - /* Translate the IP address to a hostname. */ - if (getnameinfo((struct sockaddr *)&dsfile.dsf_sin, - dsfile.dsf_sin.sin_len, hostn, sizeof(hostn), NULL, 0, 0) < 0) - err(1, "Can't get hostname\n"); - - printf("%s\tds%d/%s\n", hostn, dsfile.dsf_dir, dsfile.dsf_filename); + if (quiet == 0) + printf("\n"); + if (dosetxattr != 0 && extattr_set_file(*argv, EXTATTR_NAMESPACE_SYSTEM, + "pnfsd.dsfile", dsfile, xattrsize) != xattrsize) + err(1, "Can't set pnfsd.dsfile\n"); } static void From owner-svn-src-projects@freebsd.org Mon Sep 4 21:17:51 2017 Return-Path: Delivered-To: svn-src-projects@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 62A2CE1EEF0 for ; Mon, 4 Sep 2017 21:17:51 +0000 (UTC) (envelope-from rmacklem@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 3E8DA2EA8; Mon, 4 Sep 2017 21:17:51 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v84LHo3m075974; Mon, 4 Sep 2017 21:17:50 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v84LHoc2075973; Mon, 4 Sep 2017 21:17:50 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201709042117.v84LHoc2075973@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 4 Sep 2017 21:17:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323163 - projects/pnfs-planb-server/usr.bin/pnfsdsfile X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/pnfs-planb-server/usr.bin/pnfsdsfile X-SVN-Commit-Revision: 323163 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2017 21:17:51 -0000 Author: rmacklem Date: Mon Sep 4 21:17:50 2017 New Revision: 323163 URL: https://svnweb.freebsd.org/changeset/base/323163 Log: Fix pnfsdsfile to handle mirrors. Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Modified: projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c ============================================================================== --- projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Mon Sep 4 21:14:12 2017 (r323162) +++ projects/pnfs-planb-server/usr.bin/pnfsdsfile/pnfsdsfile.c Mon Sep 4 21:17:50 2017 (r323163) @@ -40,6 +40,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include +#include #include static void usage(void); @@ -65,12 +68,14 @@ main(int argc, char *argv[]) struct sockaddr_in *sin, *adsin; struct sockaddr_in6 *sin6, *adsin6; char hostn[2 * NI_MAXHOST + 2], *cp; - struct pnfsdsfile dsfile; - int ch, quiet, zerofh; + struct pnfsdsfile dsfile[NFSDEV_MAXMIRRORS]; + int ch, dosetxattr, i, mirrorcnt, quiet, zerofh; in_port_t tport; + ssize_t xattrsize; zerofh = 0; quiet = 0; + dosetxattr = 0; res = NULL; newres = NULL; while ((ch = getopt_long(argc, argv, "c:qs:z", longopts, NULL)) != -1) { @@ -116,110 +121,121 @@ main(int argc, char *argv[]) * The host address and directory where the data storage file is * located is in the extended attribute "pnfsd.dsfile". */ - if (extattr_get_file(*argv, EXTATTR_NAMESPACE_SYSTEM, "pnfsd.dsfile", - &dsfile, sizeof(dsfile)) != sizeof(dsfile)) + xattrsize = extattr_get_file(*argv, EXTATTR_NAMESPACE_SYSTEM, + "pnfsd.dsfile", dsfile, sizeof(dsfile)); + mirrorcnt = xattrsize / sizeof(struct pnfsdsfile); + if (mirrorcnt < 1 || xattrsize != mirrorcnt * sizeof(struct pnfsdsfile)) err(1, "Can't get extattr pnfsd.dsfile\n"); - /* Do the zerofh option. You must be root to use this option. */ - if (zerofh != 0) { - if (geteuid() != 0) - errx(1, "Must be root/su to zerofh\n"); - - /* - * Do it for the server specified by -s/--ds or all servers, - * if -s/--ds was not sepcified. - */ - sin = &dsfile.dsf_sin; - sin6 = &dsfile.dsf_sin6; - ad = res; - while (ad != NULL) { - adsin = (struct sockaddr_in *)ad->ai_addr; - adsin6 = (struct sockaddr_in6 *)ad->ai_addr; - if (adsin->sin_family == sin->sin_family) { - if (sin->sin_family == AF_INET && - sin->sin_addr.s_addr == - adsin->sin_addr.s_addr) - break; - else if (sin->sin_family == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &adsin6->sin6_addr)) - break; + for (i = 0; i < mirrorcnt; i++) { + if (i > 0) + printf(" "); + /* Do the zerofh option. You must be root. */ + if (zerofh != 0) { + if (geteuid() != 0) + errx(1, "Must be root/su to zerofh\n"); + + /* + * Do it for the server specified by -s/--ds or all + * servers, if -s/--ds was not specified. + */ + sin = &dsfile[i].dsf_sin; + sin6 = &dsfile[i].dsf_sin6; + ad = res; + while (ad != NULL) { + adsin = (struct sockaddr_in *)ad->ai_addr; + adsin6 = (struct sockaddr_in6 *)ad->ai_addr; + if (adsin->sin_family == sin->sin_family) { + if (sin->sin_family == AF_INET && + sin->sin_addr.s_addr == + adsin->sin_addr.s_addr) + break; + else if (sin->sin_family == AF_INET6 && + IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + &adsin6->sin6_addr)) + break; + } + ad = ad->ai_next; } - ad = ad->ai_next; - } - if (res == NULL || ad != NULL) { - memset(&dsfile.dsf_fh, 0, sizeof(dsfile.dsf_fh)); - if (extattr_set_file(*argv, EXTATTR_NAMESPACE_SYSTEM, - "pnfsd.dsfile", &dsfile, sizeof(dsfile)) != - sizeof(dsfile)) - err(1, "Can't set pnfsd.dsfile\n"); - } - } - - /* Do the -c option to replace the DS host address. */ - if (newres != NULL) { - if (geteuid() != 0) - errx(1, "Must be root/su to replace the host addr\n"); - - /* - * Check that the old host address matches. - */ - sin = &dsfile.dsf_sin; - sin6 = &dsfile.dsf_sin6; - ad = res; - while (ad != NULL) { - adsin = (struct sockaddr_in *)ad->ai_addr; - adsin6 = (struct sockaddr_in6 *)ad->ai_addr; - if (adsin->sin_family == sin->sin_family) { - if (sin->sin_family == AF_INET && - sin->sin_addr.s_addr == - adsin->sin_addr.s_addr) - break; - else if (sin->sin_family == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, - &adsin6->sin6_addr)) - break; + if (res == NULL || ad != NULL) { + memset(&dsfile[i].dsf_fh, 0, sizeof(fhandle_t)); + dosetxattr = 1; } - ad = ad->ai_next; } - if (ad != NULL) { - if (sin->sin_family == AF_INET) - tport = sin->sin_port; - else - tport = sin6->sin6_port; + + /* Do the -c option to replace the DS host address. */ + if (newres != NULL) { + if (geteuid() != 0) + errx(1, "Must be root/su to replace the host" + " addr\n"); + /* - * We have a match, so replace it with the first - * AF_INET or AF_INET6 address in the newres list. + * Check that the old host address matches. */ - while (newres->ai_addr->sa_family != AF_INET && - newres->ai_addr->sa_family != AF_INET6) { - newres = newres->ai_next; - if (newres == NULL) - errx(1, "Hostname %s has no IP#\n", cp); + sin = &dsfile[i].dsf_sin; + sin6 = &dsfile[i].dsf_sin6; + ad = res; + while (ad != NULL) { + adsin = (struct sockaddr_in *)ad->ai_addr; + adsin6 = (struct sockaddr_in6 *)ad->ai_addr; + if (adsin->sin_family == sin->sin_family) { + if (sin->sin_family == AF_INET && + sin->sin_addr.s_addr == + adsin->sin_addr.s_addr) + break; + else if (sin->sin_family == AF_INET6 && + IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, + &adsin6->sin6_addr)) + break; + } + ad = ad->ai_next; } - if (newres->ai_addr->sa_family == AF_INET) { - memcpy(sin, newres->ai_addr, sizeof(*sin)); - sin->sin_port = tport; - } else if (newres->ai_addr->sa_family == AF_INET6) { - memcpy(sin6, newres->ai_addr, sizeof(*sin6)); - sin6->sin6_port = tport; + if (ad != NULL) { + if (sin->sin_family == AF_INET) + tport = sin->sin_port; + else + tport = sin6->sin6_port; + /* + * We have a match, so replace it with the first + * AF_INET or AF_INET6 address in the newres + * list. + */ + while (newres->ai_addr->sa_family != AF_INET && + newres->ai_addr->sa_family != AF_INET6) { + newres = newres->ai_next; + if (newres == NULL) + errx(1, "Hostname %s has no" + " IP#\n", cp); + } + if (newres->ai_addr->sa_family == AF_INET) { + memcpy(sin, newres->ai_addr, + sizeof(*sin)); + sin->sin_port = tport; + } else if (newres->ai_addr->sa_family == + AF_INET6) { + memcpy(sin6, newres->ai_addr, + sizeof(*sin6)); + sin6->sin6_port = tport; + } + dosetxattr = 1; } - if (extattr_set_file(*argv, EXTATTR_NAMESPACE_SYSTEM, - "pnfsd.dsfile", &dsfile, sizeof(dsfile)) != - sizeof(dsfile)) - err(1, "Can't set pnfsd.dsfile\n"); } + + if (quiet == 0) { + /* Translate the IP address to a hostname. */ + if (getnameinfo((struct sockaddr *)&dsfile[i].dsf_sin, + dsfile[i].dsf_sin.sin_len, hostn, sizeof(hostn), + NULL, 0, 0) < 0) + err(1, "Can't get hostname\n"); + printf("%s\tds%d/%s", hostn, dsfile[i].dsf_dir, + dsfile[i].dsf_filename); + } } - - if (quiet != 0) - exit(0); - - /* Translate the IP address to a hostname. */ - if (getnameinfo((struct sockaddr *)&dsfile.dsf_sin, - dsfile.dsf_sin.sin_len, hostn, sizeof(hostn), NULL, 0, 0) < 0) - err(1, "Can't get hostname\n"); - - printf("%s\tds%d/%s\n", hostn, dsfile.dsf_dir, dsfile.dsf_filename); + if (quiet == 0) + printf("\n"); + if (dosetxattr != 0 && extattr_set_file(*argv, EXTATTR_NAMESPACE_SYSTEM, + "pnfsd.dsfile", dsfile, xattrsize) != xattrsize) + err(1, "Can't set pnfsd.dsfile\n"); } static void From owner-svn-src-projects@freebsd.org Tue Sep 5 22:08:45 2017 Return-Path: Delivered-To: svn-src-projects@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 A1793E21C76 for ; Tue, 5 Sep 2017 22:08:45 +0000 (UTC) (envelope-from asomers@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 C60757699C; Tue, 5 Sep 2017 22:08:44 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v85M8hU6086813; Tue, 5 Sep 2017 22:08:43 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v85M8hS7086812; Tue, 5 Sep 2017 22:08:43 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709052208.v85M8hS7086812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 5 Sep 2017 22:08:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323198 - projects/zfsd/head/tests/sys/cddl/zfs/tests/exec X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/exec X-SVN-Commit-Revision: 323198 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Sep 2017 22:08:45 -0000 Author: asomers Date: Tue Sep 5 22:08:43 2017 New Revision: 323198 URL: https://svnweb.freebsd.org/changeset/base/323198 Log: Clear expected failure on exec_002_neg It was fixed by r313967 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh Tue Sep 5 21:17:20 2017 (r323197) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh Tue Sep 5 22:08:43 2017 (r323198) @@ -54,7 +54,6 @@ exec_002_neg_head() } exec_002_neg_body() { - atf_expect_fail "FreeBSD does not enforce the exec property for mmap(): TeamTrack BUG25314" PATH=$(atf_get_srcdir):$PATH . $(atf_get_srcdir)/../../include/default.cfg From owner-svn-src-projects@freebsd.org Wed Sep 6 22:48:44 2017 Return-Path: Delivered-To: svn-src-projects@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 0118DE1B94B for ; Wed, 6 Sep 2017 22:48:44 +0000 (UTC) (envelope-from asomers@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 C4B6175BE1; Wed, 6 Sep 2017 22:48:43 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v86MmgI9095614; Wed, 6 Sep 2017 22:48:42 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v86MmgnL095607; Wed, 6 Sep 2017 22:48:42 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709062248.v86MmgnL095607@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 6 Sep 2017 22:48:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323247 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zpool_get cli_user/zpool_list X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zpool_get cli_user/zpool_list X-SVN-Commit-Revision: 323247 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2017 22:48:44 -0000 Author: asomers Date: Wed Sep 6 22:48:42 2017 New Revision: 323247 URL: https://svnweb.freebsd.org/changeset/base/323247 Log: Diff reduction versus Illumos' ZFS test suite Two of the zpool_get and one of the zpool_list tests have long been failing because they expected an outdated list of pool properties. Illumos has fixed this in their version of the test suite (though not in their zpool(8) man page). tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_001_pos.ksh Update the list of pool properties tests/sys/cddl/zfs/tests/cli_root/zpool_get/cleanup.ksh tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh Remove checks for the current kernel's level of ZFS support. They're not necessary since the test suite now resides in the same codebase as the kernel. tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Remove atf_expect_fail statements Obtained from: Illumos Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/cleanup.ksh Wed Sep 6 21:38:07 2017 (r323246) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/cleanup.ksh Wed Sep 6 22:48:42 2017 (r323247) @@ -31,10 +31,4 @@ verify_runnable "both" -$ZPOOL upgrade -v 2>&1 | $GREP "bootfs pool property" > /dev/null -if [ $? -ne 0 ] -then - log_unsupported "Pool properties not supported on this release." -fi - default_cleanup Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh Wed Sep 6 21:38:07 2017 (r323246) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/setup.ksh Wed Sep 6 22:48:42 2017 (r323247) @@ -30,12 +30,6 @@ . ${STF_SUITE}/include/libtest.kshlib verify_runnable "both" -$ZPOOL upgrade -v 2>&1 | $GREP "bootfs pool property" > /dev/null -if [ $? -ne 0 ] -then - log_unsupported "Pool properties not supported on this release." -fi - DISK=${DISKS%% *} default_setup $DISK Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Wed Sep 6 21:38:07 2017 (r323246) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get.cfg Wed Sep 6 22:48:42 2017 (r323247) @@ -25,14 +25,44 @@ # ident "@(#)zpool_get.cfg 1.6 09/06/22 SMI" # -set -A properties "size" "used" "available" "capacity" "altroot" "health" \ - "guid" "version" "bootfs" "delegation" "autoreplace" \ - "cachefile" - -typeset -i i=${#properties[*]} -for prop in "failmode" "listsnapshots" "keysource" "keystatus" "autoexpand"; do - if pool_prop_exist $prop ; then - properties[$i]="$prop" - (( i = i + 1 )) - fi -done +# Set the expected properties of zpool +typeset -a properties=( + "size" + "capacity" + "altroot" + "health" + "guid" + "version" + "bootfs" + "delegation" + "autoreplace" + "cachefile" + "failmode" + "listsnapshots" + "autoexpand" + "dedupditto" + "dedupratio" + "free" + "allocated" + "readonly" + "comment" + "expandsize" + "freeing" + "fragmentation" + "leaked" + "feature@async_destroy" + "feature@empty_bpobj" + "feature@lz4_compress" + "feature@multi_vdev_crash_dump" + "feature@spacemap_histogram" + "feature@enabled_txg" + "feature@hole_birth" + "feature@extensible_dataset" + "feature@embedded_data" + "feature@bookmarks" + "feature@filesystem_limits" + "feature@large_blocks" + "feature@sha512" + "feature@skein" + # "feature@edonr" Edonr is not yet implemented on FreeBSD +) Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh Wed Sep 6 21:38:07 2017 (r323246) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh Wed Sep 6 22:48:42 2017 (r323247) @@ -55,7 +55,6 @@ zpool_get_002_pos_head() } zpool_get_002_pos_body() { - atf_expect_fail 'BUG26173: zpool man page and STF tests were never updated for removal of "used" property' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_get.cfg @@ -79,7 +78,6 @@ zpool_get_003_pos_head() } zpool_get_003_pos_body() { - atf_expect_fail 'BUG26173: zpool man page and STF tests were never updated for removal of "used" property' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_get.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_001_pos.ksh Wed Sep 6 21:38:07 2017 (r323246) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_001_pos.ksh Wed Sep 6 22:48:42 2017 (r323247) @@ -61,8 +61,8 @@ fi set -A args "list $TESTPOOL" "list -H $TESTPOOL" "list" "list -H" \ "list -H -o name $TESTPOOL" "list -o name $TESTPOOL" \ - "list -o name,size,used,available,capacity,health,altroot $TESTPOOL" \ - "list -H -o name,size,used,available,capacity,health,altroot $TESTPOOL" + "list -o name,size,capacity,health,altroot $TESTPOOL" \ + "list -H -o name,size,capacity,health,altroot $TESTPOOL" log_assert "zpool list [-H] [-o filed[,filed]*] [ ...]" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Wed Sep 6 21:38:07 2017 (r323246) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Wed Sep 6 22:48:42 2017 (r323247) @@ -34,8 +34,6 @@ zpool_list_001_pos_head() } zpool_list_001_pos_body() { - atf_expect_fail 'BUG26173: zpool man page and STF tests were never updated for removal of "used" property' - . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_list.cfg From owner-svn-src-projects@freebsd.org Wed Sep 6 22:56:52 2017 Return-Path: Delivered-To: svn-src-projects@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 4B0AAE1C111 for ; Wed, 6 Sep 2017 22:56:52 +0000 (UTC) (envelope-from asomers@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 D498A77B6A; Wed, 6 Sep 2017 22:56:51 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v86MuomL099751; Wed, 6 Sep 2017 22:56:50 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v86MuowF099750; Wed, 6 Sep 2017 22:56:50 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709062256.v86MuowF099750@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 6 Sep 2017 22:56:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323248 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create X-SVN-Commit-Revision: 323248 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2017 22:56:52 -0000 Author: asomers Date: Wed Sep 6 22:56:50 2017 New Revision: 323248 URL: https://svnweb.freebsd.org/changeset/base/323248 Log: Update zpool_create_023_neg for large record sizes tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_023_neg.ksh This test has been failing (due to kern/221987) for years, so we didn't notice that it needed to be updated when ZFS gained support for records larger than 128KB. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_023_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_023_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_023_neg.ksh Wed Sep 6 22:48:42 2017 (r323247) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_023_neg.ksh Wed Sep 6 22:56:50 2017 (r323248) @@ -67,7 +67,7 @@ log_onexit cleanup set -A args "QuOta=none" "quota=non" "quota=abcd" "quota=0" "quota=" \ "ResErVaTi0n=none" "reserV=none" "reservation=abcd" "reserv=" \ - "recorDSize=64k" "recordsize=256K" "recordsize=256" \ + "recorDSize=64k" "recordsize=32M" "recordsize=256" \ "recsize=" "recsize=zero" "recordsize=0" \ "mountPoint=/tmp/tmpfile${TESTCASE_ID}" "mountpoint=non0" "mountpoint=" \ "mountpoint=LEGACY" "mounpoint=none" \ From owner-svn-src-projects@freebsd.org Wed Sep 6 23:01:44 2017 Return-Path: Delivered-To: svn-src-projects@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 A3120E1C3FC for ; Wed, 6 Sep 2017 23:01:44 +0000 (UTC) (envelope-from asomers@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 5B7CA7CCEC; Wed, 6 Sep 2017 23:01:43 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v86N1gDB003157; Wed, 6 Sep 2017 23:01:42 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v86N1fVY003147; Wed, 6 Sep 2017 23:01:41 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709062301.v86N1fVY003147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 6 Sep 2017 23:01:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323249 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zfs_create cli_root/zfs_get cli_root/zfs_mount cli_root/zpool_create cli_root/zpool_import txg_integrity zfsd zvol_thrash X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zfs_create cli_root/zfs_get cli_root/zfs_mount cli_root/zpool_create cli_root/zpool_import txg_integrity zfsd zvol_thrash X-SVN-Commit-Revision: 323249 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2017 23:01:44 -0000 Author: asomers Date: Wed Sep 6 23:01:41 2017 New Revision: 323249 URL: https://svnweb.freebsd.org/changeset/base/323249 Log: Replace proprietary bug numbers with public ones in the ZFS test suite Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_004_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh Wed Sep 6 23:01:41 2017 (r323249) @@ -221,7 +221,7 @@ zfs_create_008_neg_head() } zfs_create_008_neg_body() { - atf_expect_fail 'BUG26172: "zpool create" does not validate the sharenfs parameter' + atf_expect_fail 'kern/221987 - ZFS does not validate the sharenfs parameter' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_create_common.kshlib . $(atf_get_srcdir)/properties.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Wed Sep 6 23:01:41 2017 (r323249) @@ -86,7 +86,7 @@ zfs_get_003_pos_head() } zfs_get_003_pos_body() { - atf_expect_fail "BUG26181: The remount mount option is broken in SpectraBSD" + atf_expect_fail "kern/221985 - zfs mount -o remount is broken" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_get_list_d.kshlib . $(atf_get_srcdir)/zfs_get_common.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Wed Sep 6 23:01:41 2017 (r323249) @@ -184,7 +184,7 @@ zfs_mount_007_pos_head() } zfs_mount_007_pos_body() { - atf_expect_fail "BUG26181: The remount mount option is broken in SpectraBSD" + atf_expect_fail "kern/221985 - zfs mount -o remount is broken" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_mount.kshlib . $(atf_get_srcdir)/zfs_mount.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Wed Sep 6 23:01:41 2017 (r323249) @@ -630,7 +630,7 @@ zpool_create_023_neg_head() } zpool_create_023_neg_body() { - atf_expect_fail 'BUG26172: "zpool create" does not validate the sharenfs parameter' + atf_expect_fail 'kern/221987 - ZFS does not validate the sharenfs parameter' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_create.kshlib . $(atf_get_srcdir)/zpool_create.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_004_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_004_pos.ksh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_missing_004_pos.ksh Wed Sep 6 23:01:41 2017 (r323249) @@ -36,7 +36,6 @@ # DESCRIPTION: # Once a pool has been exported and one or more devices are missing # "zpool import" with no pool argument should exit with error code 0. -# This is a regression test for Spectra Logic BUG27046. # # STRATEGY: # 1. Create test pool upon device files using the various combinations. Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/setup.ksh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/setup.ksh Wed Sep 6 23:01:41 2017 (r323249) @@ -30,7 +30,7 @@ . ${STF_SUITE}/include/libtest.kshlib # For this test, we create an MD instead of using the defined DISKS. -# BUG25451 reproduces much more quickly on an MD +# Data corrupts much more quickly on an MD. # Make it small enough that we can tar up the entire pool for post-mortem # analysis log_must $MDCONFIG -a -t swap -s 1g -u $TESTCASE_ID Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity_test.sh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity_test.sh Wed Sep 6 23:01:41 2017 (r323249) @@ -27,7 +27,7 @@ atf_test_case txg_integrity_001_pos cleanup txg_integrity_001_pos_head() { - atf_set "descr" "Ensure that non-aligned writes to the same blocks that crosstransaction groups do not corrupt the file." + atf_set "descr" "Ensure that non-aligned writes to the same blocks that cross transaction groups do not corrupt the file." atf_set "timeout" 1800 } txg_integrity_001_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Wed Sep 6 23:01:41 2017 (r323249) @@ -90,7 +90,7 @@ zfsd_degrade_002_pos_head() } zfsd_degrade_002_pos_body() { - atf_expect_fail "BUG25761 An active spare on a raidz array will incorrectly account its checksum errors" + atf_expect_fail "https://www.illumos.org/issues/8614 Checksum errors on a mirrored child of a raidz are incorrectly accounted" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/zfsd.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_001_pos.ksh Wed Sep 6 23:01:41 2017 (r323249) @@ -104,10 +104,7 @@ log_onexit docleanup typeset i=0 typeset -i num_disks_used=0 -log_assert "Cause frequent device removal and arrival in the prescence of" \ - " zvols. ZFS should not taste them for VDev GUIDs. If it does," \ - " deadlocks (SpectraLogic MST 23637) and panics (SpectraLogic BUG23665" \ - " and BUG23677) may result" +log_assert "Cause frequent device removal and arrival in the prescence of zvols. ZFS should not misbehave while tasting them for VDev GUIDs." mk_vols for p in `all_pools` do Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh Wed Sep 6 22:56:50 2017 (r323248) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh Wed Sep 6 23:01:41 2017 (r323249) @@ -27,7 +27,7 @@ atf_test_case zvol_thrash_001_pos cleanup zvol_thrash_001_pos_head() { - atf_set "descr" "Cause frequent device removal and arrival in the prescence of zvols. ZFS should not taste them for VDev GUIDs. If it does, \ deadlocks (SpectraLogic MST 23637) and panics (SpectraLogic BUG23665 \ and BUG23677) may result" + atf_set "descr" "Cause frequent device removal and arrival in the prescence of zvols. ZFS should not misbehave while tasting them for VDev GUIDs." atf_set "require.progs" zfs zpool camcontrol atf_set "timeout" 900 } From owner-svn-src-projects@freebsd.org Wed Sep 6 23:12:36 2017 Return-Path: Delivered-To: svn-src-projects@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 95E93E1C972 for ; Wed, 6 Sep 2017 23:12:36 +0000 (UTC) (envelope-from asomers@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 2A6BC7F2CD; Wed, 6 Sep 2017 23:12:36 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v86NCZXj007972; Wed, 6 Sep 2017 23:12:35 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v86NCY8d007969; Wed, 6 Sep 2017 23:12:34 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709062312.v86NCY8d007969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 6 Sep 2017 23:12:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323250 - projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv X-SVN-Commit-Revision: 323250 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2017 23:12:36 -0000 Author: asomers Date: Wed Sep 6 23:12:34 2017 New Revision: 323250 URL: https://svnweb.freebsd.org/changeset/base/323250 Log: Fix refreserv_00[24] tests/sys/cddl/zfs/tests/refreserv/refreserv_002_pos.ksh Import a fix from Illumos. Quotas and reservations are a little bit approximate. This change incrementally raises refreservation as high as it can go, instead of assuming that it can equal the quota. tests/sys/cddl/zfs/tests/refreserv/refreserv_004_pos.ksh Instead of assuming that refreservation can equal the parent's quota, allow a margin of 5MB, like refreserv_001_pos does. I don't know why this wasn't a problem for Illumos. Also, delete the final line setting reservation. I'm not sure what the purpose of that line was. It may originally have been a copy/paste error. tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh Clear expected failures Obtained from: Illumos (partially) Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_004_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_002_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_002_pos.ksh Wed Sep 6 23:01:41 2017 (r323249) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_002_pos.ksh Wed Sep 6 23:12:34 2017 (r323250) @@ -70,6 +70,29 @@ function cleanup log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS } +# This function iteratively increases refreserv to its highest possible +# value. Simply setting refreserv == quota can allow enough writes to +# complete that the test fails. +function max_refreserv +{ + typeset ds=$1 + typeset -i incsize=131072 + typeset -i rr=$(get_prop available $ds) + + log_must $ZFS set refreserv=$rr $ds + while :; do + $ZFS set refreserv=$((rr + incsize)) $ds >/dev/null 2>&1 + if [[ $? == 0 ]]; then + ((rr += incsize)) + continue + else + ((incsize /= 2)) + ((incsize == 0)) && break + fi + done +} + + log_assert "Setting full size as refreservation, verify no snapshot " \ "can be created." log_onexit cleanup @@ -88,9 +111,7 @@ for ds in $datasets; do # Verify refreservation on dataset # log_must $ZFS set quota=25M $ds - log_must $ZFS set refreservation=25M $ds - mntpnt=$(get_prop mountpoint $ds) - log_must $TOUCH $mntpnt/$TESTFILE + max_refreserv $ds log_mustnot $ZFS snapshot $ds@snap if datasetexists $ds@snap ; then log_fail "ERROR: $ds@snap should not exists." Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_004_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_004_pos.ksh Wed Sep 6 23:01:41 2017 (r323249) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_004_pos.ksh Wed Sep 6 23:12:34 2017 (r323250) @@ -82,20 +82,19 @@ for ds in $datasets; do log_must $ZFS set quota=25M $ds log_must $ZFS set refreservation=15M $ds - typeset -i avail - avail=$(get_prop avail $subfs) + typeset avail + avail=5M log_must $ZFS set refreservation=$avail $subfs typeset mntpnt mntpnt=$(get_prop mountpoint $subfs) log_must $MKFILE $avail $mntpnt/$TESTFILE - typeset -i exceed - ((exceed = avail + 1)) + typeset exceed + exceed=15M log_mustnot $ZFS set refreservation=$exceed $subfs - log_mustnot $MKFILE $avail $mntpnt/$TESTFILE + log_mustnot $MKFILE $exceed $mntpnt/$TESTFILE log_must $ZFS set quota=none $ds - log_must $ZFS set reservation=15M $ds done log_pass "Verify refreservation is limited by available space." Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh Wed Sep 6 23:01:41 2017 (r323249) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh Wed Sep 6 23:12:34 2017 (r323250) @@ -55,7 +55,6 @@ refreserv_002_pos_head() } refreserv_002_pos_body() { - atf_expect_fail "BUG25520 this test incorrectly assumes that the avail, reserv, and refreserv properties are exact values that apply to data but not metadata" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/refreserv.cfg @@ -102,7 +101,6 @@ refreserv_004_pos_head() } refreserv_004_pos_body() { - atf_expect_fail "BUG25520 this test incorrectly assumes that the avail, reserv, and refreserv properties are exact values that apply to data but not metadata" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/refreserv.cfg From owner-svn-src-projects@freebsd.org Thu Sep 7 15:19:12 2017 Return-Path: Delivered-To: svn-src-projects@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 2F05CE22262 for ; Thu, 7 Sep 2017 15:19:12 +0000 (UTC) (envelope-from asomers@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 BE573669D2; Thu, 7 Sep 2017 15:19:11 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v87FJAtJ098940; Thu, 7 Sep 2017 15:19:10 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87FJAo9098938; Thu, 7 Sep 2017 15:19:10 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709071519.v87FJAo9098938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 7 Sep 2017 15:19:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323267 - projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool X-SVN-Commit-Revision: 323267 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Sep 2017 15:19:12 -0000 Author: asomers Date: Thu Sep 7 15:19:10 2017 New Revision: 323267 URL: https://svnweb.freebsd.org/changeset/base/323267 Log: Fix the rootpool tests from the ZFS test suite Delete rootpool_003_neg, rootpool_004_pos, and rootpool_006_pos. These tests verify requirements which haven't been true of ZFS for years, on either Illumos or FreeBSD. Reenable rootpool_002_neg. Apparently the panic it exposed has been fixed. Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_003_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_004_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_005_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_006_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile Thu Sep 7 15:02:57 2017 (r323266) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/Makefile Thu Sep 7 15:19:10 2017 (r323267) @@ -8,14 +8,10 @@ FILESDIR= ${TESTSDIR} ATF_TESTS_KSH93+= rootpool_test -${PACKAGE}FILES+= rootpool_006_pos.ksh ${PACKAGE}FILES+= cleanup.ksh -${PACKAGE}FILES+= rootpool_003_neg.ksh ${PACKAGE}FILES+= rootpool_007_neg.ksh ${PACKAGE}FILES+= rootpool_002_neg.ksh ${PACKAGE}FILES+= setup.ksh -${PACKAGE}FILES+= rootpool_005_pos.ksh ${PACKAGE}FILES+= rootpool_001_pos.ksh -${PACKAGE}FILES+= rootpool_004_pos.ksh .include Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh Thu Sep 7 15:02:57 2017 (r323266) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh Thu Sep 7 15:19:10 2017 (r323267) @@ -53,8 +53,6 @@ rootpool_002_neg_head() } rootpool_002_neg_body() { - atf_expect_fail "Destroying the root pool will panic FreeBSD BUG25145" - atf_fail "Prematurely fail the test so we don't cause a panic" . $(atf_get_srcdir)/../../include/default.cfg ksh93 $(atf_get_srcdir)/rootpool_002_neg.ksh || atf_fail "Testcase failed" @@ -67,92 +65,6 @@ rootpool_002_neg_cleanup() } -atf_test_case rootpool_003_neg cleanup -rootpool_003_neg_head() -{ - atf_set "descr" "system related filesytems can not be renamed or destroyed" - atf_set "require.config" is_zfs_root - atf_set "require.progs" zfs -} -rootpool_003_neg_body() -{ - atf_expect_fail "Destroying the root pool will panic FreeBSD BUG25145" - atf_fail "Prematurely fail the test so we don't cause a panic" - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/rootpool_003_neg.ksh || atf_fail "Testcase failed" -} -rootpool_003_neg_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case rootpool_004_pos cleanup -rootpool_004_pos_head() -{ - atf_set "descr" "rootfs's canmount property must be noauto" - atf_set "require.config" is_zfs_root -} -rootpool_004_pos_body() -{ - atf_skip "The expected behavior of this test does not match the behavior of Illumos. Illumos and FreeBSD behave identically in this regard, so the test is probably wrong" - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/rootpool_004_pos.ksh || atf_fail "Testcase failed" -} -rootpool_004_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case rootpool_005_pos cleanup -rootpool_005_pos_head() -{ - atf_set "descr" "rootpool/ROOT's mountpoint must be legacy" - atf_set "require.config" is_zfs_root -} -rootpool_005_pos_body() -{ - atf_skip "FreeBSD does not place any special requirements on /ROOT" - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/rootpool_005_pos.ksh || atf_fail "Testcase failed" -} -rootpool_005_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case rootpool_006_pos cleanup -rootpool_006_pos_head() -{ - atf_set "descr" "zfs rootfs's mountpoint must be mounted and must be /" - atf_set "require.config" is_zfs_root -} -rootpool_006_pos_body() -{ - atf_skip "The expected behavior of this test does not match the behavior of Illumos. Illumos and FreeBSD behave identically in this regard, so the test is probably wrong" - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/rootpool_006_pos.ksh || atf_fail "Testcase failed" -} -rootpool_006_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - atf_test_case rootpool_007_neg cleanup rootpool_007_neg_head() { @@ -179,9 +91,5 @@ atf_init_test_cases() atf_add_test_case rootpool_001_pos atf_add_test_case rootpool_002_neg - atf_add_test_case rootpool_003_neg - atf_add_test_case rootpool_004_pos - atf_add_test_case rootpool_005_pos - atf_add_test_case rootpool_006_pos atf_add_test_case rootpool_007_neg } From owner-svn-src-projects@freebsd.org Thu Sep 7 15:30:54 2017 Return-Path: Delivered-To: svn-src-projects@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 91A65E22D82 for ; Thu, 7 Sep 2017 15:30:54 +0000 (UTC) (envelope-from asomers@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 1DF3769ABF; Thu, 7 Sep 2017 15:30:53 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v87FUrZm004624; Thu, 7 Sep 2017 15:30:53 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v87FUqtJ004617; Thu, 7 Sep 2017 15:30:52 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709071530.v87FUqtJ004617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 7 Sep 2017 15:30:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323270 - in projects/zfsd/head: etc/mtree tests/sys/cddl/zfs/include tests/sys/cddl/zfs/tests/cli_root/zpool_import tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head: etc/mtree tests/sys/cddl/zfs/include tests/sys/cddl/zfs/tests/cli_root/zpool_import tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles X-SVN-Commit-Revision: 323270 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Sep 2017 15:30:54 -0000 Author: asomers Date: Thu Sep 7 15:30:52 2017 New Revision: 323270 URL: https://svnweb.freebsd.org/changeset/base/323270 Log: Fix zpool_import_013_neg from the ZFS test suite This test is supposed to check that ZFS will refuse to import a foreign, in-use pool without the "-f" flag. But it's always failed, because the blockfiles it tested were all from exported pools. I'm importing the change that Illumos made, which adds a new blockfile and tests only that. Also, in the interest of reducing runtime, I'm eliminating the setup and cleanup steps for this test, which create a pool for temporary storage. It's fine to just use TMPDIR. etc/mtree/BSD.tests.dist Add the blockfiles directory tests/sys/cddl/zfs/include/commands.txt Add bzcat to the list of commands tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/README tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/unclean_export.dat.bz2 tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_013_neg.ksh Use the new blockfile instead of the ones from zpool_upgrade, and dispense with the temporary pool. tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Clear the expected failure Sponsored by: Spectra Logic Corp Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile (contents, props changed) projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/README projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/unclean_export.dat.bz2 (contents, props changed) Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_013_neg.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist ============================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Sep 7 15:30:13 2017 (r323269) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Sep 7 15:30:52 2017 (r323270) @@ -483,6 +483,8 @@ zpool_clear .. zpool_import + blockfiles + .. .. zpool .. Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Thu Sep 7 15:30:13 2017 (r323269) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/commands.txt Thu Sep 7 15:30:52 2017 (r323270) @@ -39,6 +39,7 @@ /usr/bin/awk /usr/sbin/arp /usr/bin/basename +/usr/bin/bzcat /bin/cat /usr/bin/cd /usr/bin/chgrp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile Thu Sep 7 15:30:13 2017 (r323269) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile Thu Sep 7 15:30:52 2017 (r323270) @@ -34,4 +34,6 @@ ${PACKAGE}FILES+= zpool_import_008_pos.ksh ${PACKAGE}FILES+= zpool_import_004_pos.ksh ${PACKAGE}FILES+= zpool_import.kshlib +SUBDIR+= blockfiles + .include Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile Thu Sep 7 15:30:52 2017 (r323270) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.include + +PACKAGE=tests +TESTSDIR=${TESTSBASE}/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles +FILESDIR=${TESTSDIR} + +${PACKAGE}FILES+= README +${PACKAGE}FILES+= unclean_export.dat.bz2 + +.include Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/README ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/README Thu Sep 7 15:30:52 2017 (r323270) @@ -0,0 +1,29 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2012 by Delphix. All rights reserved. +# + +Unless otherwise noted, all files in this distribution are released +under the Common Development and Distribution License (CDDL). + +This directory contains compressed blockfiles for zpool import testing. Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/unclean_export.dat.bz2 ============================================================================== Binary file. No diff available. Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_013_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_013_neg.ksh Thu Sep 7 15:30:13 2017 (r323269) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_013_neg.ksh Thu Sep 7 15:30:52 2017 (r323270) @@ -56,55 +56,30 @@ verify_runnable "global" -if (( ZPOOL_VERSION < 6 )); then - log_unsupported "This case need zpool version >= 6" -fi +POOL_NAME=unclean_export +POOL_FILE=unclean_export.dat -function create_old_pool +function uncompress_pool { - VERSION=$1 - POOL_FILES=$($ENV | grep "ZPOOL_VERSION_${VERSION}_FILES"\ - | $AWK -F= '{print $2}') - POOL_NAME=$($ENV|grep "ZPOOL_VERSION_${VERSION}_NAME"\ - | $AWK -F= '{print $2}') - - log_note "Creating $POOL_NAME from $POOL_FILES" - for pool_file in $POOL_FILES; do - $CP $STF_SUITE/tests/cli_root/zpool_upgrade/blockfiles/$pool_file.Z \ - /$TESTPOOL - $UNCOMPRESS /$TESTPOOL/$pool_file.Z - done + log_note "Creating pool from $POOL_FILE" + log_must $BZCAT \ + $STF_SUITE/tests/cli_root/zpool_import/blockfiles/$POOL_FILE.bz2 \ + > $TMPDIR/$POOL_FILE return 0 } function cleanup { - if [[ -z $POOL_NAME ]]; then - return 1 - fi - destroy_pool $POOL_NAME - for file in $POOL_FILES; do - if [[ -e /$TESTPOOL/$file ]]; then - $RM /$TESTPOOL/$file - fi - done + poolexists $POOL_NAME && log_must zpool destroy $POOL_NAME + [[ -e $TMPDIR/$POOL_FILE ]] && rm $TMPDIR/$POOL_FILE return 0 } -log_assert "'zpool import' fail while pool may be in use from other system," \ - "it need import forcefully." +log_assert "'zpool import' fails for pool that was not cleanly exported" log_onexit cleanup -typeset POOL_FILES -typeset POOL_NAME -# $CONFIGS gets set in the .cfg script -for config in $CONFIGS -do - create_old_pool $config - log_mustnot $ZPOOL import -d /$TESTPOOL $POOL_NAME - log_must $ZPOOL import -d /$TESTPOOL -f $POOL_NAME - destroy_upgraded_pool -done - -log_pass "'zpool import' fail while pool may be in use from other system," \ - "import forcefully succeed as expected." +uncompress_pool +log_mustnot zpool import -d $TMPDIR $POOL_NAME +log_must zpool import -d $TMPDIR -f $POOL_NAME + +log_pass "'zpool import' fails for pool that was not cleanly exported" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Thu Sep 7 15:30:13 2017 (r323269) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Thu Sep 7 15:30:52 2017 (r323270) @@ -299,29 +299,18 @@ zpool_import_012_pos_cleanup() } -atf_test_case zpool_import_013_neg cleanup +atf_test_case zpool_import_013_neg zpool_import_013_neg_head() { - atf_set "descr" "'zpool import' fail while pool may be in use from other system,it need import forcefully." + atf_set "descr" "'zpool import' fails for pool that was not cleanly exported" atf_set "require.progs" zfs zpool - atf_set "timeout" 2400 } zpool_import_013_neg_body() { - atf_expect_fail 'BUG26195: "zpool import" without "-f" will import foreign, in-use, downrev pools' . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg - verify_disk_count "$DISKS" 2 - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_013_neg.ksh || atf_fail "Testcase failed" -} -zpool_import_013_neg_cleanup() -{ - . $(atf_get_srcdir)/../../../include/default.cfg - . $(atf_get_srcdir)/zpool_import.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } From owner-svn-src-projects@freebsd.org Fri Sep 8 14:56:27 2017 Return-Path: Delivered-To: svn-src-projects@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 69B27E1C48D for ; Fri, 8 Sep 2017 14:56:27 +0000 (UTC) (envelope-from asomers@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 431B982667; Fri, 8 Sep 2017 14:56:27 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88EuQDn081351; Fri, 8 Sep 2017 14:56:26 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88EuQ8b081348; Fri, 8 Sep 2017 14:56:26 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709081456.v88EuQ8b081348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 8 Sep 2017 14:56:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323313 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zfs_create snapshot zvol/zvol_cli X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests: cli_root/zfs_create snapshot zvol/zvol_cli X-SVN-Commit-Revision: 323313 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Sep 2017 14:56:27 -0000 Author: asomers Date: Fri Sep 8 14:56:26 2017 New Revision: 323313 URL: https://svnweb.freebsd.org/changeset/base/323313 Log: Remove atf_expect_fail statements for tests that have been fixed ino64 fixed two tests that previously failed because the maximum mount path was too short. And avg's rewrite of ZFS's ctldir fixed a test involving renaming a mounted snapshot. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh Fri Sep 8 14:54:07 2017 (r323312) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh Fri Sep 8 14:56:26 2017 (r323313) @@ -357,7 +357,6 @@ zfs_create_013_pos_head() } zfs_create_013_pos_body() { - atf_expect_fail "REQ25548 FreeBSD's mount path limit is too short" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_create_common.kshlib . $(atf_get_srcdir)/properties.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Fri Sep 8 14:54:07 2017 (r323312) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Fri Sep 8 14:56:26 2017 (r323313) @@ -564,7 +564,6 @@ snapshot_020_pos_head() } snapshot_020_pos_body() { - atf_expect_fail "TeamTrack: P2_29644 zfs rename does not unmount snapshots in a ctldir" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh Fri Sep 8 14:54:07 2017 (r323312) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh Fri Sep 8 14:56:26 2017 (r323313) @@ -55,7 +55,6 @@ zvol_cli_002_pos_head() } zvol_cli_002_pos_body() { - atf_expect_fail "REQ25548 Increase FreeBSDs mount path length limit" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zvol_cli.cfg From owner-svn-src-projects@freebsd.org Fri Sep 8 16:59:57 2017 Return-Path: Delivered-To: svn-src-projects@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 50A2CE22768 for ; Fri, 8 Sep 2017 16:59:57 +0000 (UTC) (envelope-from asomers@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 1D86E2F81; Fri, 8 Sep 2017 16:59:57 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88Gxukm029654; Fri, 8 Sep 2017 16:59:56 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88GxuWb029653; Fri, 8 Sep 2017 16:59:56 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709081659.v88GxuWb029653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 8 Sep 2017 16:59:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323318 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear X-SVN-Commit-Revision: 323318 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Sep 2017 16:59:57 -0000 Author: asomers Date: Fri Sep 8 16:59:56 2017 New Revision: 323318 URL: https://svnweb.freebsd.org/changeset/base/323318 Log: Add atf_expect_fail statement for zpool_clear_004_pos https://www.illumos.org/issues/8641 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Fri Sep 8 16:52:59 2017 (r323317) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh Fri Sep 8 16:59:56 2017 (r323318) @@ -107,6 +107,7 @@ zpool_clear_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_clear.cfg + atf_expect_fail "https://www.illumos.org/issues/8641 zpool clear doesn't work on spare or replacing vdevs" ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_clear_004_pos.ksh || atf_fail "Testcase failed" } From owner-svn-src-projects@freebsd.org Fri Sep 8 20:07:54 2017 Return-Path: Delivered-To: svn-src-projects@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 E4552E07E7E for ; Fri, 8 Sep 2017 20:07:54 +0000 (UTC) (envelope-from asomers@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 B13A9691BB; Fri, 8 Sep 2017 20:07:54 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88K7rJA006876; Fri, 8 Sep 2017 20:07:53 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88K7r0U006875; Fri, 8 Sep 2017 20:07:53 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201709082007.v88K7r0U006875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 8 Sep 2017 20:07:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323328 - projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names X-SVN-Commit-Revision: 323328 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Sep 2017 20:07:55 -0000 Author: asomers Date: Fri Sep 8 20:07:53 2017 New Revision: 323328 URL: https://svnweb.freebsd.org/changeset/base/323328 Log: Clear the expected failure of pool_names_001_pos It was fixed by the ino64 project. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh Fri Sep 8 19:51:03 2017 (r323327) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh Fri Sep 8 20:07:53 2017 (r323328) @@ -33,7 +33,6 @@ pool_names_001_pos_head() } pool_names_001_pos_body() { - atf_expect_fail "REQ25521 FreeBSD does not support dataset names as long as Illumos does" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/pool_names.cfg From owner-svn-src-projects@freebsd.org Fri Sep 8 21:47:11 2017 Return-Path: Delivered-To: svn-src-projects@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 DA49EE0CADE for ; Fri, 8 Sep 2017 21:47:11 +0000 (UTC) (envelope-from cy@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 7F3B36BF72; Fri, 8 Sep 2017 21:47:11 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88LlA8l047203; Fri, 8 Sep 2017 21:47:10 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88Ll5U5047153; Fri, 8 Sep 2017 21:47:05 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201709082147.v88Ll5U5047153@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 8 Sep 2017 21:47:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323334 - in projects/krb5: . etc/mtree kerberos5 kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_ntlm kerberos5/lib/libgssapi_spnego kerberos5/lib/libhdb ker... X-SVN-Group: projects X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in projects/krb5: . etc/mtree kerberos5 kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_ntlm kerberos5/lib/libgssapi_spnego kerberos5/lib/libhdb kerberos5/lib/libheimbase ke... X-SVN-Commit-Revision: 323334 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Sep 2017 21:47:12 -0000 Author: cy Date: Fri Sep 8 21:47:05 2017 New Revision: 323334 URL: https://svnweb.freebsd.org/changeset/base/323334 Log: Change Heimdal libraries and includes to private. This is the first step to selectable Heimdal/MIT in base. One of the things this commit will allow us to test is how well making heimdal in base private affects ports, especially ports that depend on the heimdal or krb5 ports. This will need to be tested through an exp run at some point. Modified: projects/krb5/ObsoleteFiles.inc projects/krb5/etc/mtree/BSD.usr.dist projects/krb5/kerberos5/Makefile.inc projects/krb5/kerberos5/lib/libasn1/Makefile projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile projects/krb5/kerberos5/lib/libhdb/Makefile projects/krb5/kerberos5/lib/libheimbase/Makefile projects/krb5/kerberos5/lib/libheimipcc/Makefile projects/krb5/kerberos5/lib/libheimipcs/Makefile projects/krb5/kerberos5/lib/libheimntlm/Makefile projects/krb5/kerberos5/lib/libhx509/Makefile projects/krb5/kerberos5/lib/libkadm5clnt/Makefile projects/krb5/kerberos5/lib/libkadm5srv/Makefile projects/krb5/kerberos5/lib/libkafs5/Makefile projects/krb5/kerberos5/lib/libkdc/Makefile projects/krb5/kerberos5/lib/libkrb5/Makefile projects/krb5/kerberos5/lib/libroken/Makefile projects/krb5/kerberos5/lib/libsl/Makefile projects/krb5/kerberos5/lib/libwind/Makefile projects/krb5/kerberos5/libexec/digest-service/Makefile projects/krb5/kerberos5/libexec/hprop/Makefile projects/krb5/kerberos5/libexec/hpropd/Makefile projects/krb5/kerberos5/libexec/ipropd-master/Makefile projects/krb5/kerberos5/libexec/ipropd-slave/Makefile projects/krb5/kerberos5/libexec/kadmind/Makefile projects/krb5/kerberos5/libexec/kcm/Makefile projects/krb5/kerberos5/libexec/kdc/Makefile projects/krb5/kerberos5/libexec/kdigest/Makefile projects/krb5/kerberos5/libexec/kfd/Makefile projects/krb5/kerberos5/libexec/kimpersonate/Makefile projects/krb5/kerberos5/libexec/kpasswdd/Makefile projects/krb5/kerberos5/tools/asn1_compile/Makefile projects/krb5/kerberos5/tools/slc/Makefile projects/krb5/kerberos5/usr.bin/hxtool/Makefile projects/krb5/kerberos5/usr.bin/kadmin/Makefile projects/krb5/kerberos5/usr.bin/kcc/Makefile projects/krb5/kerberos5/usr.bin/kdestroy/Makefile projects/krb5/kerberos5/usr.bin/kf/Makefile projects/krb5/kerberos5/usr.bin/kgetcred/Makefile projects/krb5/kerberos5/usr.bin/kinit/Makefile projects/krb5/kerberos5/usr.bin/kpasswd/Makefile projects/krb5/kerberos5/usr.bin/ksu/Makefile projects/krb5/kerberos5/usr.bin/string2key/Makefile projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile projects/krb5/kerberos5/usr.sbin/kstash/Makefile projects/krb5/kerberos5/usr.sbin/ktutil/Makefile projects/krb5/lib/libpam/modules/pam_krb5/Makefile projects/krb5/lib/libpam/modules/pam_ksu/Makefile projects/krb5/lib/libtelnet/Makefile projects/krb5/secure/usr.bin/ssh/Makefile projects/krb5/secure/usr.sbin/sshd/Makefile projects/krb5/share/mk/src.libnames.mk projects/krb5/usr.bin/compile_et/Makefile projects/krb5/usr.sbin/gssd/Makefile Modified: projects/krb5/ObsoleteFiles.inc ============================================================================== --- projects/krb5/ObsoleteFiles.inc Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/ObsoleteFiles.inc Fri Sep 8 21:47:05 2017 (r323334) @@ -38,6 +38,123 @@ # xargs -n1 | sort | uniq -d; # done +# 20170831: hemdal becomes private +OLD_FILES+=usr/include/asn1-common.h +OLD_FILES+=usr/include/asn1_err.h +OLD_FILES+=usr/include/base64.h +OLD_FILES+=usr/include/cms_asn1.h +OLD_FILES+=usr/include/crmf_asn1.h +OLD_FILES+=usr/include/der-private.h +OLD_FILES+=usr/include/der-protos.h +OLD_FILES+=usr/include/der.h +OLD_FILES+=usr/include/digest_asn1.h +OLD_FILES+=usr/include/getarg.h +OLD_FILES+=usr/include/hdb-protos.h +OLD_FILES+=usr/include/hdb.h +OLD_FILES+=usr/include/hdb_asn1.h +OLD_FILES+=usr/include/hdb_err.h +OLD_FILES+=usr/include/heim_asn1.h +OLD_FILES+=usr/include/heim_err.h +OLD_FILES+=usr/include/heim_threads.h +OLD_FILES+=usr/include/heimbase.h +OLD_FILES+=usr/include/heimntlm-protos.h +OLD_FILES+=usr/include/heimntlm.h +OLD_FILES+=usr/include/hex.h +OLD_FILES+=usr/include/hx509-private.h +OLD_FILES+=usr/include/hx509-protos.h +OLD_FILES+=usr/include/hx509.h +OLD_FILES+=usr/include/hx509_err.h +OLD_FILES+=usr/include/k524_err.h +OLD_FILES+=usr/include/kafs.h +OLD_FILES+=usr/include/kdc-protos.h +OLD_FILES+=usr/include/kdc.h +OLD_FILES+=usr/include/krb5-private.h +OLD_FILES+=usr/include/krb5-protos.h +OLD_FILES+=usr/include/krb5-types.h +OLD_FILES+=usr/include/krb5.h +OLD_FILES+=usr/include/krb5_asn1.h +OLD_FILES+=usr/include/krb5_ccapi.h +OLD_FILES+=usr/include/krb5_err.h +OLD_FILES+=usr/include/kx509_asn1.h +OLD_FILES+=usr/include/ntlm_err.h +OLD_FILES+=usr/include/ocsp_asn1.h +OLD_FILES+=usr/include/parse_bytes.h +OLD_FILES+=usr/include/parse_time.h +OLD_FILES+=usr/include/parse_units.h +OLD_FILES+=usr/include/pkcs10_asn1.h +OLD_FILES+=usr/include/pkcs12_asn1.h +OLD_FILES+=usr/include/pkcs8_asn1.h +OLD_FILES+=usr/include/pkcs9_asn1.h +OLD_FILES+=usr/include/pkinit_asn1.h +OLD_FILES+=usr/include/resolve.h +OLD_FILES+=usr/include/rfc2459_asn1.h +OLD_FILES+=usr/include/roken-common.h +OLD_FILES+=usr/include/roken.h +OLD_FILES+=usr/include/rtbl.h +OLD_FILES+=usr/include/wind.h +OLD_FILES+=usr/include/wind_err.h +OLD_FILES+=usr/include/xdbm.h +OLD_LIBS+=usr/lib/libasn1.a +OLD_LIBS+=usr/lib/libasn1.so +OLD_LIBS+=usr/lib/libasn1.so.11 +OLD_LIBS+=usr/lib/libasn1_p.a +OLD_LIBS+=usr/lib/libgssapi_krb5.a +OLD_LIBS+=usr/lib/libgssapi_krb5.so +OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 +OLD_LIBS+=usr/lib/libgssapi_krb5_p.a +OLD_LIBS+=usr/lib/libgssapi_ntlm.a +OLD_LIBS+=usr/lib/libgssapi_ntlm.so +OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10 +OLD_LIBS+=usr/lib/libgssapi_ntlm_p.a +OLD_LIBS+=usr/lib/libgssapi_spnego.a +OLD_LIBS+=usr/lib/libgssapi_spnego.so +OLD_LIBS+=usr/lib/libgssapi_spnego.so.10 +OLD_LIBS+=usr/lib/libgssapi_spnego_p.a +OLD_LIBS+=usr/lib/libhdb.a +OLD_LIBS+=usr/lib/libhdb.so +OLD_LIBS+=usr/lib/libhdb.so.11 +OLD_LIBS+=usr/lib/libhdb_p.a +OLD_LIBS+=usr/lib/libheimbase.a +OLD_LIBS+=usr/lib/libheimbase.so +OLD_LIBS+=usr/lib/libheimbase.so.11 +OLD_LIBS+=usr/lib/libheimbase_p.a +OLD_LIBS+=usr/lib/libheimntlm.a +OLD_LIBS+=usr/lib/libheimntlm.so +OLD_LIBS+=usr/lib/libheimntlm.so.11 +OLD_LIBS+=usr/lib/libheimntlm_p.a +OLD_LIBS+=usr/lib/libhx509.a +OLD_LIBS+=usr/lib/libhx509.so +OLD_LIBS+=usr/lib/libhx509.so.11 +OLD_LIBS+=usr/lib/libhx509_p.a +OLD_LIBS+=usr/lib/libkadm5clnt.a +OLD_LIBS+=usr/lib/libkadm5clnt.so +OLD_LIBS+=usr/lib/libkadm5clnt.so.11 +OLD_LIBS+=usr/lib/libkadm5clnt_p.a +OLD_LIBS+=usr/lib/libkadm5srv.a +OLD_LIBS+=usr/lib/libkadm5srv.so +OLD_LIBS+=usr/lib/libkadm5srv.so.11 +OLD_LIBS+=usr/lib/libkadm5srv_p.a +OLD_LIBS+=usr/lib/libkafs5.a +OLD_LIBS+=usr/lib/libkafs5.so +OLD_LIBS+=usr/lib/libkafs5.so.11 +OLD_LIBS+=usr/lib/libkafs5_p.a +OLD_LIBS+=usr/lib/libkdc.a +OLD_LIBS+=usr/lib/libkdc.so +OLD_LIBS+=usr/lib/libkdc.so.11 +OLD_LIBS+=usr/lib/libkdc_p.a +OLD_LIBS+=usr/lib/libkrb5.a +OLD_LIBS+=usr/lib/libkrb5.so +OLD_LIBS+=usr/lib/libkrb5.so.11 +OLD_LIBS+=usr/lib/libkrb5_p.a +OLD_LIBS+=usr/lib/libroken.a +OLD_LIBS+=usr/lib/libroken.so +OLD_LIBS+=usr/lib/libroken.so.11 +OLD_LIBS+=usr/lib/libroken_p.a +OLD_LIBS+=usr/lib/libwind.a +OLD_LIBS+=usr/lib/libwind.so +OLD_LIBS+=usr/lib/libwind.so.11 +OLD_LIBS+=usr/lib/libwind_p.a + # 20170802: ksyms(4) ioctl interface was removed OLD_FILES+=usr/include/sys/ksyms.h Modified: projects/krb5/etc/mtree/BSD.usr.dist ============================================================================== --- projects/krb5/etc/mtree/BSD.usr.dist Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/etc/mtree/BSD.usr.dist Fri Sep 8 21:47:05 2017 (r323334) @@ -9,13 +9,33 @@ .. include private + asn1 + .. bsdstat .. event .. + hdb + .. + heimbase + .. + heimntlm + .. + hx509 + .. + kafs5 + .. + kdc + .. + krb5 + .. + roken + .. sqlite3 .. ucl + .. + wind .. zstd .. Modified: projects/krb5/kerberos5/Makefile.inc ============================================================================== --- projects/krb5/kerberos5/Makefile.inc Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/Makefile.inc Fri Sep 8 21:47:05 2017 (r323334) @@ -6,7 +6,7 @@ NO_LINT= KRB5DIR= ${SRCTOP}/crypto/heimdal -CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR:H:H}/include -I${KRB5DIR}/include .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) OPENLDAPBASE?= /usr/local Modified: projects/krb5/kerberos5/lib/libasn1/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libasn1/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libasn1/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= asn1 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h LIBADD= com_err roken @@ -21,7 +22,8 @@ SRCS= asn1_err.c \ timegm.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} -CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H}/libroken -I. GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx Modified: projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libgssapi_krb5/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= gssapi_krb5 +PRIVATELIB= true LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi krb5 crypto roken asn1 com_err SHLIB_MAJOR= 10 @@ -77,8 +78,16 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5 CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/krb5 +CFLAGS+=-I${.OBJDIR:H}/libkrb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${.OBJDIR:H}/libasn1 +CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${.OBJDIR:H}/libroken +CFLAGS+=-I${KRB5DIR}/lib/wind +CFLAGS+=-I${.OBJDIR:H}/libwind +CFLAGS+=-I${KRB5DIR}/lib/hx509 +CFLAGS+=-I${.OBJDIR:H}/libhx509 +CFLAGS+=-I${KRB5DIR}/base -I. .include Modified: projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libgssapi_ntlm/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= gssapi_ntlm +PRIVATELIB= true LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= crypto gssapi krb5 heimntlm roken SHLIB_MAJOR= 10 @@ -41,7 +42,14 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/ntlm CFLAGS+=-I${KRB5DIR}/lib/krb5 +CFLAGS+=-I${.OBJDIR:H}/libkrb5 CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${.OBJDIR:H}/libroken +CFLAGS+=-I${KRB5DIR}/lib/asn1 +CFLAGS+=-I${.OBJDIR:H}/libasn1 +CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-I${.OBJDIR:H}/libheimntlm .include Modified: projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libgssapi_spnego/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= gssapi_spnego +PRIVATELIB= true LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 @@ -31,8 +32,11 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego CFLAGS+=-I${KRB5DIR}/lib/asn1 +CFLAGS+=-I${.OBJDIR:H}/libasn1 CFLAGS+=-I${SRCTOP}/lib/libgssapi -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${.OBJDIR:H}/libroken +CFLAGS+=-I${KRB5DIR}/base -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ spnego_asn1_files spnego_asn1-template.c Modified: projects/krb5/kerberos5/lib/libhdb/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libhdb/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libhdb/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= hdb +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map LIBADD= asn1 com_err krb5 roken sqlite3 @@ -56,9 +59,13 @@ SRCS= common.c \ print.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} -CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ - -I${KRB5DIR}/lib/krb5 \ +CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${SRCTOP}/contrib/sqlite3/ \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \ + -I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \ + -I${KRB5DIR}/base \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" Modified: projects/krb5/kerberos5/lib/libheimbase/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimbase/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimbase/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ #$FreeBSD$ LIB= heimbase +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= pthread VERSION_MAP= ${KRB5DIR}/base/version-script.map Modified: projects/krb5/kerberos5/lib/libheimipcc/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimipcc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimipcc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -9,6 +9,8 @@ SRCS= \ common.c CFLAGS+= -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/base \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/include Modified: projects/krb5/kerberos5/lib/libheimipcs/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimipcs/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimipcs/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -8,7 +8,8 @@ SRCS= \ server.c \ common.c -CFLAGS+= -I${KRB5DIR}/lib/roken \ +CFLAGS+= -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ -I${KRB5DIR}/base \ -I${KRB5DIR}/lib/ipc -I. Modified: projects/krb5/kerberos5/lib/libheimntlm/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libheimntlm/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libheimntlm/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,11 +1,17 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= heimntlm +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= crypto com_err krb5 roken SRCS= ntlm.c ntlm_err.c ntlm_err.h INCS= heimntlm.h heimntlm-protos.h ntlm_err.h -CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map MAN= ntlm_buf.3 \ Modified: projects/krb5/kerberos5/lib/libhx509/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libhx509/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libhx509/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= hx509 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map LIBADD= asn1 com_err crypto roken wind @@ -209,9 +210,9 @@ SRCS+= ${GEN_OCSP:S/.x$/.c/:S/.hx$/.h/} \ CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/hx509/ref -CFLAGS+=-I${KRB5DIR}/lib/asn1 -CFLAGS+=-I${KRB5DIR}/lib/wind -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 +CFLAGS+=-I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken -I. GEN_OCSP= \ asn1_OCSPBasicOCSPResponse.x \ Modified: projects/krb5/kerberos5/lib/libkadm5clnt/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkadm5clnt/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkadm5clnt/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= kadm5clnt +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= com_err krb5 roken @@ -34,7 +37,10 @@ SRCS= ad.c \ rename_c.c \ send_recv.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb -I. .include Modified: projects/krb5/kerberos5/lib/libkadm5srv/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkadm5srv/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkadm5srv/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= kadm5srv +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= com_err hdb krb5 roken VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map @@ -35,7 +38,10 @@ SRCS= acl.c \ set_keys.c \ set_modifier.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb -I. .include Modified: projects/krb5/kerberos5/lib/libkafs5/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkafs5/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkafs5/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= kafs5 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined LIBADD= asn1 krb5 roken INCS= kafs.h @@ -27,7 +28,10 @@ SRCS= afssys.c afskrb5.c common.c CFLAGS+= -I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/lib/krb5 \ -I${.OBJDIR:H}/libkrb5 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 \ + -I${.OBJDIR:H}/libasn1 CLEANFILES= kafs5.3 Modified: projects/krb5/kerberos5/lib/libkdc/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkdc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkdc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ #$FreeBSD$ LIB= kdc +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/kdc/version-script.map LIBADD= roken hdb hx509 krb5 heimntlm asn1 crypto @@ -25,10 +26,15 @@ SRCS= \ process.c \ windc.c -CFLAGS+= -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/kdc +CFLAGS+= -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/krb5 -I${.OBJDIR:H}/libkrb5 \ + -I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \ + -I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \ + -I${KRB5DIR}/lib/hdb -I${.OBJDIR:H}/libhdb \ + -I${KRB5DIR}/lib/ntlm -I${.OBJDIR:H}/libheimntlm \ + -I${KRB5DIR}/kdc \ + -I${KRB5DIR}/base .include Modified: projects/krb5/kerberos5/lib/libkrb5/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libkrb5/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libkrb5/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,9 @@ # $FreeBSD$ +.include "../Makefile.inc" + LIB= krb5 +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map LIBADD= asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc @@ -618,8 +621,10 @@ SRCS+= heim_err.c \ krb_err.h CFLAGS+= -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/asn1 -I${.OBJDIR:H}/libasn1 \ + -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken \ + -I${KRB5DIR}/lib/wind -I${.OBJDIR:H}/libwind \ + -I${KRB5DIR}/lib/hx509 -I${.OBJDIR:H}/libhx509 \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/base -I. Modified: projects/krb5/kerberos5/lib/libroken/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libroken/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libroken/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ # $FreeBSD$ LIB= roken +PRIVATELIB= true LIBADD= crypt VERSION_MAP= ${KRB5DIR}/lib/roken/version-script.map INCS= roken.h \ Modified: projects/krb5/kerberos5/lib/libsl/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libsl/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libsl/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,7 @@ LIB= sl INTERNALLIB= SRCS= sl.c -CFLAGS+=-I${KRB5DIR}/lib/sl +CFLAGS+=-I${KRB5DIR}/lib/sl -I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken .include Modified: projects/krb5/kerberos5/lib/libwind/Makefile ============================================================================== --- projects/krb5/kerberos5/lib/libwind/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/lib/libwind/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,6 +1,7 @@ #$FreeBSD$ LIB= wind +PRIVATELIB= true LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map LIBADD= com_err roken @@ -27,7 +28,7 @@ SRCS= bidi.c \ SRCS+= wind_err.c \ wind_err.h -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken -I${.OBJDIR:H}/libroken -I. .include Modified: projects/krb5/kerberos5/libexec/digest-service/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/digest-service/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/digest-service/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,12 +2,23 @@ PROG= digest-service MAN= -CFLAGS+= -I${KRB5DIR}/kdc \ +CFLAGS+= -I${KRB5DIR}/base \ + -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/asn1 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ -I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/wind \ - -I${KRB5DIR}/lib/roken + -I${.OBJDIR:H:H}/lib/libwind \ + -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${KRB5DIR}/lib/hx509 \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libheimntlm LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/libexec/hprop/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/hprop/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/hprop/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -8,8 +8,18 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-I${KRB5DIR}/lib/wind +CFLAGS+=-I${KRB5DIR}/lib/hdb +CFLAGS+=-I${KRB5DIR}/base CFLAGS+=-I${KRB5DIR}/kdc CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libroken +CFLAGS+=-I${.OBJDIR:H:H}/lib/libasn1 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libhx509 +CFLAGS+=-I${.OBJDIR:H:H}/lib/libheimntlm +CFLAGS+=-I${.OBJDIR:H:H}/lib/libwind +CFLAGS+=-I${.OBJDIR:H:H}/lib/libhdb +CFLAGS+=-I${.OBJDIR:H:H}/lib/libheimbase LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/hpropd/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/hpropd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/hpropd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,20 @@ PROG= hpropd MAN= hpropd.8 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${KRB5DIR}/kdc \ + -I${KRB5DIR}/base \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + ${LDAPCFLAGS} LIBADD= hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/ipropd-master/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/ipropd-master/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/ipropd-master/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -4,7 +4,13 @@ PROG= ipropd-master MAN= iprop.8 SRCS= ipropd_common.c ipropd_master.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhdb \ -I. ${LDAPCFLAGS} + LIBADD= kadm5srv hdb krb5 roken vers DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/ipropd-slave/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/ipropd-slave/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/ipropd-slave/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -4,6 +4,11 @@ PROG= ipropd-slave MAN= SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libroken \ -I. ${LDAPCFLAGS} LIBADD= kadm5srv hdb krb5 roken vers DPADD= ${LDAPDPADD} Modified: projects/krb5/kerberos5/libexec/kadmind/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kadmind/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kadmind/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -8,6 +8,16 @@ SRCS= rpc.c \ kadm_conn.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/base \ + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ ${LDAPCFLAGS} LIBADD= kadm5srv gssapi hdb krb5 roken vers DPADD= ${LDAPDPADD} Modified: projects/krb5/kerberos5/libexec/kcm/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kcm/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kcm/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -18,7 +18,13 @@ SRCS= acl.c \ renew.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS} + -I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + ${LDAPCFLAGS} LIBADD= krb5 roken heimntlm heimipcs crypto DPADD= ${LDAPDPADD} LDADD= ${LIBVERS} ${LDAPLDADD} Modified: projects/krb5/kerberos5/libexec/kdc/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kdc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kdc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -9,7 +9,20 @@ SRCS= config.c \ main.c CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/kdc ${LDAPCFLAGS} + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${KRB5DIR}/kdc \ + -I${KRB5DIR}/base \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + ${LDAPCFLAGS} LIBADD= kdc hdb krb5 roken crypt vers LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/libexec/kdigest/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kdigest/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kdigest/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -4,7 +4,15 @@ PROG= kdigest MAN= kdigest.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + -I. LIBADD= krb5 heimntlm roken crypto edit sl vers SRCS= kdigest.c \ kdigest-commands.c \ Modified: projects/krb5/kerberos5/libexec/kfd/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kfd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kfd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,11 @@ PROG= kfd MAN= kfd.8 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= krb5 roken vers .include Modified: projects/krb5/kerberos5/libexec/kimpersonate/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kimpersonate/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kimpersonate/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -5,7 +5,13 @@ MAN= kimpersonate.8 CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I. LIBADD= krb5 roken asn1 vers .include Modified: projects/krb5/kerberos5/libexec/kpasswdd/Makefile ============================================================================== --- projects/krb5/kerberos5/libexec/kpasswdd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/libexec/kpasswdd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,15 @@ PROG= kpasswdd MAN= kpasswdd.8 -CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/libhdb ${LDAPCFLAGS} +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + ${LDAPCFLAGS} LIBADD= kadm5srv hdb krb5 roken vers asn1 DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/tools/asn1_compile/Makefile ============================================================================== --- projects/krb5/kerberos5/tools/asn1_compile/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/tools/asn1_compile/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,7 @@ PROG= asn1_compile MAN= -LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libprivateroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} Modified: projects/krb5/kerberos5/tools/slc/Makefile ============================================================================== --- projects/krb5/kerberos5/tools/slc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/tools/slc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= slc -LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libroken.a +LIBROKEN_A= ${.OBJDIR:H:H}/lib/libroken/libprivateroken.a LIBADD= vers LDADD= ${LIBROKEN_A} DPADD= ${LIBROKEN_A} Modified: projects/krb5/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/hxtool/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/hxtool/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -5,6 +5,9 @@ MAN= CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libroken \ -I${KRB5DIR}/lib/sl -I. LIBADD= hx509 roken asn1 crypto sl vers edit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h Modified: projects/krb5/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kadmin/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kadmin/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -25,7 +25,19 @@ SRCS= add_enctype.c \ util.c CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS} + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/base \ + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I. \ + ${LDAPCFLAGS} LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit DPADD= ${LDAPDPADD} LDADD= ${LDAPLDADD} Modified: projects/krb5/kerberos5/usr.bin/kcc/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kcc/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kcc/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -7,7 +7,13 @@ LINKS= ${BINDIR}/kcc ${BINDIR}/klist \ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl -I. + -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I. LIBADD= krb5 roken asn1 kafs5 edit sl vers SRCS= kcc.c \ kcc-commands.c \ Modified: projects/krb5/kerberos5/usr.bin/kdestroy/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kdestroy/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kdestroy/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,12 @@ # $FreeBSD$ PROG= kdestroy -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= kafs5 krb5 roken vers MAN= kdestroy.1 Modified: projects/krb5/kerberos5/usr.bin/kf/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kf/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kf/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -3,7 +3,11 @@ PROG= kf MAN= kf.1 CFLAGS+= -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= krb5 roken vers .include Modified: projects/krb5/kerberos5/usr.bin/kgetcred/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kgetcred/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kgetcred/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,12 @@ PROG= kgetcred CFLAGS+= -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken + -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 LIBADD= krb5 roken asn1 vers .include Modified: projects/krb5/kerberos5/usr.bin/kinit/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kinit/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kinit/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,14 @@ # $FreeBSD$ PROG= kinit -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${KRB5DIR}/lib/ntlm \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libheimntlm \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= kafs5 krb5 heimntlm roken crypto vers .include Modified: projects/krb5/kerberos5/usr.bin/kpasswd/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/kpasswd/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/kpasswd/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -1,7 +1,11 @@ # $FreeBSD$ PROG= kpasswd -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= hdb krb5 roken vers crypto LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/usr.bin/ksu/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/ksu/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/ksu/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -7,7 +7,12 @@ PRECIOUSPROG= .endif MAN= SRCS= su.c -CFLAGS+=-I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/kafs \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libasn1 LIBADD= kafs5 krb5 roken vers crypto crypt .include Modified: projects/krb5/kerberos5/usr.bin/string2key/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/string2key/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/string2key/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -6,7 +6,18 @@ CFLAGS+= -I${KRB5DIR}/kdc \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/windc + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/ntlm \ + -I${KRB5DIR}/base \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libhx509 \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libheimntlm LIBADD= krb5 roken crypto vers .include Modified: projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.bin/verify_krb5_conf/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -2,7 +2,15 @@ PROG= verify_krb5_conf MAN= verify_krb5_conf.8 -CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/base \ + -I${KRB5DIR}/lib/wind \ + -I${KRB5DIR}/lib/hx509 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libwind \ + -I${.OBJDIR:H:H}/lib/libasn1 \ + -I${.OBJDIR:H:H}/lib/libhx509 LIBADD= krb5 roken vers .include Modified: projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile Fri Sep 8 21:16:23 2017 (r323333) +++ projects/krb5/kerberos5/usr.sbin/iprop-log/Makefile Fri Sep 8 21:47:05 2017 (r323334) @@ -7,6 +7,12 @@ CFLAGS+= -I${KRB5DIR}/lib/kadm5 \ -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/sl \ + -I${KRB5DIR}/lib/hdb \ + -I${KRB5DIR}/lib/asn1 \ + -I${.OBJDIR:H:H}/lib/libkrb5 \ + -I${.OBJDIR:H:H}/lib/libroken \ + -I${.OBJDIR:H:H}/lib/libhdb \ + -I${.OBJDIR:H:H}/lib/libasn1 \ -I. LIBADD= kadm5srv hdb krb5 roken edit sl vers LDFLAGS=${LDAPLDFLAGS} Modified: projects/krb5/kerberos5/usr.sbin/kstash/Makefile ============================================================================== --- projects/krb5/kerberos5/usr.sbin/kstash/Makefile Fri Sep 8 21:16:23 2017 (r323333) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Fri Sep 8 22:04:33 2017 Return-Path: Delivered-To: svn-src-projects@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 C515CE0D937 for ; Fri, 8 Sep 2017 22:04:33 +0000 (UTC) (envelope-from cy@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 5D76D6CEF6; Fri, 8 Sep 2017 22:04:33 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v88M4WQJ056562; Fri, 8 Sep 2017 22:04:32 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v88M4TpO056533; Fri, 8 Sep 2017 22:04:29 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201709082204.v88M4TpO056533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 8 Sep 2017 22:04:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323335 - in projects/krb5: . bin/chflags bin/chflags/tests bin/dd bin/mkdir bin/mkdir/tests bin/pkill bin/ps bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests cddl/compat/opensolaris/mis... X-SVN-Group: projects X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in projects/krb5: . bin/chflags bin/chflags/tests bin/dd bin/mkdir bin/mkdir/tests bin/pkill bin/ps bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests cddl/compat/opensolaris/misc cddl/contrib/opensolari... X-SVN-Commit-Revision: 323335 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Sep 2017 22:04:33 -0000 Author: cy Date: Fri Sep 8 22:04:28 2017 New Revision: 323335 URL: https://svnweb.freebsd.org/changeset/base/323335 Log: Catch up on (MFH) r320793 through r323334 from head. Added: projects/krb5/bin/chflags/tests/ - copied from r323334, head/bin/chflags/tests/ projects/krb5/bin/mkdir/tests/ - copied from r323334, head/bin/mkdir/tests/ projects/krb5/bin/rcp/tests/ - copied from r323334, head/bin/rcp/tests/ projects/krb5/bin/rmdir/tests/ - copied from r323334, head/bin/rmdir/tests/ projects/krb5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d - copied unchanged from r323334, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d projects/krb5/cddl/lib/libdtrace/socket.d - copied unchanged from r323334, head/cddl/lib/libdtrace/socket.d projects/krb5/contrib/zstd/lib/common/compiler.h - copied unchanged from r323334, head/contrib/zstd/lib/common/compiler.h projects/krb5/contrib/zstd/tests/files/ - copied from r323334, head/contrib/zstd/tests/files/ projects/krb5/contrib/zstd/tests/fuzz/ - copied from r323334, head/contrib/zstd/tests/fuzz/ projects/krb5/contrib/zstd/tests/poolTests.c - copied unchanged from r323334, head/contrib/zstd/tests/poolTests.c projects/krb5/lib/clang/Makefile.inc - copied unchanged from r323334, head/lib/clang/Makefile.inc projects/krb5/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c - copied unchanged from r323334, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c projects/krb5/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h - copied unchanged from r323334, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h projects/krb5/lib/libc/tests/gen/getmntinfo_test.c - copied unchanged from r323334, head/lib/libc/tests/gen/getmntinfo_test.c projects/krb5/share/man/man4/amdsmn.4 - copied unchanged from r323334, head/share/man/man4/amdsmn.4 projects/krb5/share/man/man4/mlx5ib.4 - copied unchanged from r323334, head/share/man/man4/mlx5ib.4 projects/krb5/share/man/man4/ntb.4 - copied unchanged from r323334, head/share/man/man4/ntb.4 projects/krb5/share/man/man4/ntb_hw_intel.4 - copied unchanged from r323334, head/share/man/man4/ntb_hw_intel.4 projects/krb5/share/man/man4/ntb_hw_plx.4 - copied unchanged from r323334, head/share/man/man4/ntb_hw_plx.4 projects/krb5/sys/arm/mv/armada38x/armada38x_rtc.c - copied unchanged from r323334, head/sys/arm/mv/armada38x/armada38x_rtc.c projects/krb5/sys/boot/efi/loader/efi_main.c - copied unchanged from r323334, head/sys/boot/efi/loader/efi_main.c projects/krb5/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c - copied unchanged from r323334, head/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c projects/krb5/sys/dev/amdsmn/ - copied from r323334, head/sys/dev/amdsmn/ projects/krb5/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu - copied unchanged from r323334, head/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu projects/krb5/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu - copied unchanged from r323334, head/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu projects/krb5/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu - copied unchanged from r323334, head/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu projects/krb5/sys/dev/mlx5/mlx5_ib/ - copied from r323334, head/sys/dev/mlx5/mlx5_ib/ projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw_intel.c - copied unchanged from r323334, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw_intel.h - copied unchanged from r323334, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.h projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw_plx.c - copied unchanged from r323334, head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c projects/krb5/sys/modules/amdsmn/ - copied from r323334, head/sys/modules/amdsmn/ projects/krb5/sys/modules/mlx5ib/ - copied from r323334, head/sys/modules/mlx5ib/ projects/krb5/sys/modules/ntb/ntb_hw_intel/ - copied from r323334, head/sys/modules/ntb/ntb_hw_intel/ projects/krb5/sys/modules/ntb/ntb_hw_plx/ - copied from r323334, head/sys/modules/ntb/ntb_hw_plx/ projects/krb5/usr.sbin/efivar/efiutil.c - copied unchanged from r323334, head/usr.sbin/efivar/efiutil.c projects/krb5/usr.sbin/efivar/efiutil.h - copied unchanged from r323334, head/usr.sbin/efivar/efiutil.h Deleted: projects/krb5/contrib/zstd/PATENTS projects/krb5/contrib/zstd/tests/pool.c projects/krb5/share/man/man4/ntb_hw.4 projects/krb5/sys/arm/mv/armada38x/rtc.c projects/krb5/sys/dev/cxgbe/firmware/t4fw-1.16.45.0.bin.uu projects/krb5/sys/dev/cxgbe/firmware/t5fw-1.16.45.0.bin.uu projects/krb5/sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw.c projects/krb5/sys/dev/ntb/ntb_hw/ntb_regs.h projects/krb5/sys/modules/ntb/ntb_hw/ Modified: projects/krb5/Makefile.inc1 projects/krb5/UPDATING projects/krb5/bin/chflags/Makefile projects/krb5/bin/dd/args.c projects/krb5/bin/dd/conv.c projects/krb5/bin/dd/dd.c projects/krb5/bin/dd/dd.h projects/krb5/bin/dd/position.c projects/krb5/bin/mkdir/Makefile projects/krb5/bin/pkill/pkill.c projects/krb5/bin/ps/print.c projects/krb5/bin/ps/ps.1 projects/krb5/bin/rcp/Makefile projects/krb5/bin/rmdir/Makefile projects/krb5/cddl/compat/opensolaris/misc/zmount.c projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/krb5/cddl/lib/libdtrace/Makefile projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc projects/krb5/contrib/binutils/opcodes/i386-dis.c projects/krb5/contrib/binutils/opcodes/i386-opc.h projects/krb5/contrib/binutils/opcodes/i386-opc.tbl projects/krb5/contrib/binutils/opcodes/i386-tbl.h projects/krb5/contrib/compiler-rt/lib/builtins/arm/aeabi_dcmp.S projects/krb5/contrib/compiler-rt/lib/builtins/arm/aeabi_fcmp.S projects/krb5/contrib/compiler-rt/lib/builtins/int_lib.h projects/krb5/contrib/compiler-rt/lib/esan/esan_sideline_linux.cpp projects/krb5/contrib/compiler-rt/lib/profile/InstrProfilingNameVar.c projects/krb5/contrib/cortex-strings/src/aarch64/memcpy.S projects/krb5/contrib/file/src/readelf.c projects/krb5/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h projects/krb5/contrib/llvm/lib/Analysis/PostDominators.cpp projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/krb5/contrib/llvm/lib/IR/AutoUpgrade.cpp projects/krb5/contrib/llvm/lib/Object/COFFModuleDefinition.cpp projects/krb5/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp projects/krb5/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/krb5/contrib/llvm/lib/Target/X86/X86InstrAVX512.td projects/krb5/contrib/llvm/lib/Target/X86/X86SchedSandyBridge.td projects/krb5/contrib/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp projects/krb5/contrib/llvm/lib/ToolDrivers/llvm-dlltool/Options.td projects/krb5/contrib/llvm/lib/Transforms/Scalar/LowerAtomic.cpp projects/krb5/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp projects/krb5/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp projects/krb5/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h projects/krb5/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/krb5/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def projects/krb5/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h projects/krb5/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h projects/krb5/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp projects/krb5/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp projects/krb5/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/Clang.cpp projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/Darwin.cpp projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/MSVC.cpp projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/MSVC.h projects/krb5/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp projects/krb5/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h projects/krb5/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp projects/krb5/contrib/llvm/tools/clang/lib/Headers/unwind.h projects/krb5/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp projects/krb5/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp projects/krb5/contrib/llvm/tools/clang/lib/Parse/Parser.cpp projects/krb5/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp projects/krb5/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp projects/krb5/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp projects/krb5/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp projects/krb5/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp projects/krb5/contrib/llvm/tools/lldb/source/Host/common/TCPSocket.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_x86.h projects/krb5/contrib/netbsd-tests/usr.bin/grep/t_grep.sh projects/krb5/contrib/top/loadavg.h projects/krb5/contrib/unbound/validator/autotrust.c projects/krb5/contrib/zstd/CONTRIBUTING.md projects/krb5/contrib/zstd/Makefile projects/krb5/contrib/zstd/NEWS projects/krb5/contrib/zstd/README.md projects/krb5/contrib/zstd/circle.yml projects/krb5/contrib/zstd/doc/educational_decoder/harness.c projects/krb5/contrib/zstd/doc/educational_decoder/zstd_decompress.c projects/krb5/contrib/zstd/doc/educational_decoder/zstd_decompress.h projects/krb5/contrib/zstd/doc/zstd_compression_format.md projects/krb5/contrib/zstd/doc/zstd_manual.html projects/krb5/contrib/zstd/lib/common/bitstream.h projects/krb5/contrib/zstd/lib/common/error_private.c projects/krb5/contrib/zstd/lib/common/error_private.h projects/krb5/contrib/zstd/lib/common/fse.h projects/krb5/contrib/zstd/lib/common/fse_decompress.c projects/krb5/contrib/zstd/lib/common/huf.h projects/krb5/contrib/zstd/lib/common/mem.h projects/krb5/contrib/zstd/lib/common/pool.c projects/krb5/contrib/zstd/lib/common/pool.h projects/krb5/contrib/zstd/lib/common/threading.h projects/krb5/contrib/zstd/lib/common/xxhash.c projects/krb5/contrib/zstd/lib/common/zstd_common.c projects/krb5/contrib/zstd/lib/common/zstd_errors.h projects/krb5/contrib/zstd/lib/common/zstd_internal.h projects/krb5/contrib/zstd/lib/compress/fse_compress.c projects/krb5/contrib/zstd/lib/compress/huf_compress.c projects/krb5/contrib/zstd/lib/compress/zstd_compress.c projects/krb5/contrib/zstd/lib/compress/zstd_opt.h projects/krb5/contrib/zstd/lib/compress/zstdmt_compress.c projects/krb5/contrib/zstd/lib/compress/zstdmt_compress.h projects/krb5/contrib/zstd/lib/decompress/huf_decompress.c projects/krb5/contrib/zstd/lib/decompress/zstd_decompress.c projects/krb5/contrib/zstd/lib/deprecated/zbuff.h projects/krb5/contrib/zstd/lib/deprecated/zbuff_common.c projects/krb5/contrib/zstd/lib/deprecated/zbuff_compress.c projects/krb5/contrib/zstd/lib/deprecated/zbuff_decompress.c projects/krb5/contrib/zstd/lib/dictBuilder/cover.c projects/krb5/contrib/zstd/lib/dictBuilder/zdict.c projects/krb5/contrib/zstd/lib/dictBuilder/zdict.h projects/krb5/contrib/zstd/lib/legacy/zstd_legacy.h projects/krb5/contrib/zstd/lib/legacy/zstd_v01.c projects/krb5/contrib/zstd/lib/legacy/zstd_v01.h projects/krb5/contrib/zstd/lib/legacy/zstd_v02.c projects/krb5/contrib/zstd/lib/legacy/zstd_v02.h projects/krb5/contrib/zstd/lib/legacy/zstd_v03.c projects/krb5/contrib/zstd/lib/legacy/zstd_v03.h projects/krb5/contrib/zstd/lib/legacy/zstd_v04.c projects/krb5/contrib/zstd/lib/legacy/zstd_v04.h projects/krb5/contrib/zstd/lib/legacy/zstd_v05.c projects/krb5/contrib/zstd/lib/legacy/zstd_v05.h projects/krb5/contrib/zstd/lib/legacy/zstd_v06.c projects/krb5/contrib/zstd/lib/legacy/zstd_v06.h projects/krb5/contrib/zstd/lib/legacy/zstd_v07.c projects/krb5/contrib/zstd/lib/legacy/zstd_v07.h projects/krb5/contrib/zstd/lib/zstd.h projects/krb5/contrib/zstd/programs/.gitignore projects/krb5/contrib/zstd/programs/Makefile projects/krb5/contrib/zstd/programs/README.md projects/krb5/contrib/zstd/programs/bench.c projects/krb5/contrib/zstd/programs/bench.h projects/krb5/contrib/zstd/programs/datagen.c projects/krb5/contrib/zstd/programs/datagen.h projects/krb5/contrib/zstd/programs/dibio.c projects/krb5/contrib/zstd/programs/dibio.h projects/krb5/contrib/zstd/programs/fileio.c projects/krb5/contrib/zstd/programs/fileio.h projects/krb5/contrib/zstd/programs/platform.h projects/krb5/contrib/zstd/programs/util.h projects/krb5/contrib/zstd/programs/zstd.1 projects/krb5/contrib/zstd/programs/zstd.1.md projects/krb5/contrib/zstd/programs/zstdcli.c projects/krb5/contrib/zstd/tests/Makefile projects/krb5/contrib/zstd/tests/datagencli.c projects/krb5/contrib/zstd/tests/decodecorpus.c projects/krb5/contrib/zstd/tests/fullbench.c projects/krb5/contrib/zstd/tests/fuzzer.c projects/krb5/contrib/zstd/tests/invalidDictionaries.c projects/krb5/contrib/zstd/tests/legacy.c projects/krb5/contrib/zstd/tests/longmatch.c projects/krb5/contrib/zstd/tests/namespaceTest.c projects/krb5/contrib/zstd/tests/paramgrill.c projects/krb5/contrib/zstd/tests/playTests.sh projects/krb5/contrib/zstd/tests/roundTripCrash.c projects/krb5/contrib/zstd/tests/symbols.c projects/krb5/contrib/zstd/tests/zbufftest.c projects/krb5/contrib/zstd/tests/zstreamtest.c projects/krb5/contrib/zstd/zlibWrapper/examples/zwrapbench.c projects/krb5/contrib/zstd/zlibWrapper/gzcompatibility.h projects/krb5/contrib/zstd/zlibWrapper/gzlib.c projects/krb5/contrib/zstd/zlibWrapper/gzread.c projects/krb5/contrib/zstd/zlibWrapper/gzwrite.c projects/krb5/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c projects/krb5/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h projects/krb5/etc/mtree/BSD.tests.dist projects/krb5/etc/periodic/security/100.chksetuid projects/krb5/etc/periodic/security/110.neggrpperm projects/krb5/etc/periodic/security/security.functions projects/krb5/lib/clang/include/clang/Basic/Version.inc projects/krb5/lib/clang/include/lld/Config/Version.inc projects/krb5/lib/clang/include/llvm/Support/VCSRevision.h projects/krb5/lib/csu/mips/crti.S projects/krb5/lib/csu/mips/crtn.S projects/krb5/lib/libc/amd64/sys/Makefile.inc projects/krb5/lib/libc/amd64/sys/amd64_get_fsbase.c projects/krb5/lib/libc/amd64/sys/amd64_get_gsbase.c projects/krb5/lib/libc/amd64/sys/amd64_set_fsbase.c projects/krb5/lib/libc/amd64/sys/amd64_set_gsbase.c projects/krb5/lib/libc/gen/fnmatch.c projects/krb5/lib/libc/gen/getmntinfo.c projects/krb5/lib/libc/locale/setlocale.c projects/krb5/lib/libc/locale/setrunelocale.c projects/krb5/lib/libc/locale/xlocale_private.h projects/krb5/lib/libc/mips/Symbol.map projects/krb5/lib/libc/tests/gen/Makefile projects/krb5/lib/libcompiler_rt/Makefile.inc projects/krb5/lib/libefivar/Makefile projects/krb5/lib/libefivar/efivar-dp-format.c projects/krb5/lib/libefivar/efivar-dp-parse.c projects/krb5/lib/libefivar/efivar-dp.h projects/krb5/lib/libgeom/geom_util.c projects/krb5/lib/libpmc/libpmc.c projects/krb5/lib/libproc/_libproc.h projects/krb5/lib/libproc/proc_rtld.c projects/krb5/lib/libproc/proc_sym.c projects/krb5/lib/libstand/nfs.c projects/krb5/lib/libsysdecode/Makefile projects/krb5/lib/libsysdecode/flags.c projects/krb5/lib/libsysdecode/mktables projects/krb5/lib/libsysdecode/sysdecode.h projects/krb5/lib/libsysdecode/sysdecode_enum.3 projects/krb5/lib/libsysdecode/sysdecode_mask.3 projects/krb5/lib/msun/src/catrig.c projects/krb5/lib/msun/src/catrigl.c projects/krb5/lib/msun/src/s_csqrtl.c projects/krb5/lib/msun/tests/csqrt_test.c projects/krb5/lib/msun/tests/trig_test.c projects/krb5/libexec/getty/gettytab.5 projects/krb5/libexec/getty/gettytab.h projects/krb5/libexec/getty/init.c projects/krb5/libexec/getty/main.c projects/krb5/libexec/rtld-elf/Makefile projects/krb5/libexec/rtld-elf/rtld.1 projects/krb5/libexec/rtld-elf/rtld.c projects/krb5/release/amd64/make-memstick.sh projects/krb5/release/amd64/mkisoimages.sh projects/krb5/release/i386/make-memstick.sh projects/krb5/release/i386/mkisoimages.sh projects/krb5/release/powerpc/make-memstick.sh projects/krb5/release/powerpc/mkisoimages.sh projects/krb5/release/sparc64/mkisoimages.sh projects/krb5/release/tools/ec2.conf projects/krb5/release/tools/gce.conf projects/krb5/sbin/fsck_ffs/setup.c projects/krb5/sbin/geom/class/eli/geli.8 projects/krb5/sbin/geom/class/eli/geom_eli.c projects/krb5/sbin/geom/class/virstor/geom_virstor.c projects/krb5/sbin/geom/misc/subr.c projects/krb5/sbin/mdconfig/mdconfig.8 projects/krb5/sbin/mdconfig/mdconfig.c projects/krb5/sbin/newfs/mkfs.c projects/krb5/sbin/nvmecontrol/identify.c projects/krb5/share/man/man4/Makefile projects/krb5/share/man/man4/amdtemp.4 projects/krb5/share/man/man4/ddb.4 projects/krb5/share/man/man4/hv_vss.4 projects/krb5/share/man/man4/if_ntb.4 projects/krb5/share/man/man4/ntb_transport.4 projects/krb5/share/man/man4/tty.4 projects/krb5/share/misc/committers-ports.dot projects/krb5/share/misc/committers-src.dot projects/krb5/share/misc/pci_vendors projects/krb5/share/mk/bsd.lib.mk projects/krb5/share/mk/bsd.prog.mk projects/krb5/share/mk/bsd.sys.mk projects/krb5/sys/amd64/amd64/cpu_switch.S projects/krb5/sys/amd64/amd64/exception.S projects/krb5/sys/amd64/amd64/machdep.c projects/krb5/sys/amd64/amd64/ptrace_machdep.c projects/krb5/sys/amd64/amd64/sys_machdep.c projects/krb5/sys/amd64/amd64/vm_machdep.c projects/krb5/sys/amd64/conf/GENERIC projects/krb5/sys/amd64/conf/NOTES projects/krb5/sys/amd64/include/asmacros.h projects/krb5/sys/amd64/include/param.h projects/krb5/sys/amd64/include/pcb.h projects/krb5/sys/amd64/vmm/intel/vmx_msr.c projects/krb5/sys/arm/arm/generic_timer.c projects/krb5/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/krb5/sys/arm/conf/ARMADA38X projects/krb5/sys/arm/mv/armada38x/files.armada38x projects/krb5/sys/arm64/arm64/genassym.c projects/krb5/sys/arm64/arm64/identcpu.c projects/krb5/sys/arm64/arm64/mp_machdep.c projects/krb5/sys/arm64/arm64/pmap.c projects/krb5/sys/arm64/arm64/swtch.S projects/krb5/sys/arm64/arm64/vm_machdep.c projects/krb5/sys/arm64/conf/GENERIC projects/krb5/sys/arm64/include/armreg.h projects/krb5/sys/arm64/include/cpu.h projects/krb5/sys/arm64/include/pcb.h projects/krb5/sys/arm64/include/proc.h projects/krb5/sys/boot/efi/boot1/Makefile projects/krb5/sys/boot/efi/boot1/boot1.c projects/krb5/sys/boot/efi/boot1/boot_module.h projects/krb5/sys/boot/efi/boot1/ufs_module.c projects/krb5/sys/boot/efi/boot1/zfs_module.c projects/krb5/sys/boot/efi/include/efiapi.h projects/krb5/sys/boot/efi/include/efichar.h projects/krb5/sys/boot/efi/include/efidevp.h projects/krb5/sys/boot/efi/include/efilib.h projects/krb5/sys/boot/efi/libefi/Makefile projects/krb5/sys/boot/efi/libefi/efichar.c projects/krb5/sys/boot/efi/libefi/libefi.c projects/krb5/sys/boot/efi/loader/Makefile projects/krb5/sys/boot/efi/loader/arch/amd64/Makefile.inc projects/krb5/sys/boot/efi/loader/arch/i386/Makefile.inc projects/krb5/sys/boot/efi/loader/bootinfo.c projects/krb5/sys/boot/efi/loader/conf.c projects/krb5/sys/boot/fdt/dts/arm/zedboard.dts projects/krb5/sys/boot/fdt/dts/arm/zybo.dts projects/krb5/sys/boot/forth/loader.conf projects/krb5/sys/boot/geli/geliboot.c projects/krb5/sys/boot/geli/geliboot.h projects/krb5/sys/boot/geli/geliboot_crypto.c projects/krb5/sys/boot/geli/geliboot_internal.h projects/krb5/sys/boot/geli/pwgets.c projects/krb5/sys/boot/i386/libi386/biosdisk.c projects/krb5/sys/boot/i386/libi386/spinconsole.c projects/krb5/sys/cam/ata/ata_da.c projects/krb5/sys/cam/cam_ccb.h projects/krb5/sys/cam/cam_iosched.c projects/krb5/sys/cam/cam_iosched.h projects/krb5/sys/cam/cam_xpt.c projects/krb5/sys/cam/nvme/nvme_all.c projects/krb5/sys/cam/nvme/nvme_all.h projects/krb5/sys/cam/nvme/nvme_da.c projects/krb5/sys/cam/nvme/nvme_xpt.c projects/krb5/sys/cam/scsi/scsi_all.c projects/krb5/sys/cam/scsi/scsi_da.c projects/krb5/sys/cam/scsi/scsi_pass.c projects/krb5/sys/cddl/compat/opensolaris/sys/mntent.h projects/krb5/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/krb5/sys/cddl/dev/dtrace/mips/dtrace_asm.S projects/krb5/sys/cddl/dev/dtrace/mips/dtrace_subr.c projects/krb5/sys/cddl/dev/fbt/mips/fbt_isa.c projects/krb5/sys/compat/cloudabi/cloudabi_fd.c projects/krb5/sys/compat/cloudabi/cloudabi_file.c projects/krb5/sys/compat/cloudabi/cloudabi_sock.c projects/krb5/sys/compat/cloudabi32/cloudabi32_proto.h projects/krb5/sys/compat/cloudabi32/cloudabi32_syscall.h projects/krb5/sys/compat/cloudabi32/cloudabi32_syscalls.c projects/krb5/sys/compat/cloudabi32/cloudabi32_sysent.c projects/krb5/sys/compat/cloudabi32/cloudabi32_systrace_args.c projects/krb5/sys/compat/cloudabi64/cloudabi64_proto.h projects/krb5/sys/compat/cloudabi64/cloudabi64_syscall.h projects/krb5/sys/compat/cloudabi64/cloudabi64_syscalls.c projects/krb5/sys/compat/cloudabi64/cloudabi64_sysent.c projects/krb5/sys/compat/cloudabi64/cloudabi64_systrace_args.c projects/krb5/sys/compat/freebsd32/freebsd32.h projects/krb5/sys/compat/freebsd32/freebsd32_ioctl.c projects/krb5/sys/compat/freebsd32/freebsd32_ioctl.h projects/krb5/sys/compat/freebsd32/freebsd32_misc.c projects/krb5/sys/compat/linuxkpi/common/include/linux/device.h projects/krb5/sys/compat/linuxkpi/common/include/linux/fs.h projects/krb5/sys/compat/linuxkpi/common/include/linux/kobject.h projects/krb5/sys/compat/linuxkpi/common/include/linux/lockdep.h projects/krb5/sys/compat/linuxkpi/common/include/linux/module.h projects/krb5/sys/compat/linuxkpi/common/src/linux_pci.c projects/krb5/sys/conf/files projects/krb5/sys/conf/files.amd64 projects/krb5/sys/conf/files.arm64 projects/krb5/sys/conf/files.i386 projects/krb5/sys/conf/ldscript.amd64 projects/krb5/sys/conf/newvers.sh projects/krb5/sys/conf/options projects/krb5/sys/contrib/cloudabi/cloudabi_types_common.h projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_armv6.S projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_i686.S projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S projects/krb5/sys/contrib/cloudabi/syscalls32.master projects/krb5/sys/contrib/cloudabi/syscalls64.master projects/krb5/sys/contrib/dev/acpica/changes.txt projects/krb5/sys/contrib/dev/acpica/common/dmtbinfo.c projects/krb5/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/krb5/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/krb5/sys/contrib/dev/acpica/compiler/asldebug.c projects/krb5/sys/contrib/dev/acpica/compiler/aslerror.c projects/krb5/sys/contrib/dev/acpica/compiler/aslhelp.c projects/krb5/sys/contrib/dev/acpica/compiler/aslmain.c projects/krb5/sys/contrib/dev/acpica/compiler/aslmessages.c projects/krb5/sys/contrib/dev/acpica/compiler/aslmessages.h projects/krb5/sys/contrib/dev/acpica/compiler/aslresource.c projects/krb5/sys/contrib/dev/acpica/compiler/aslrules.y projects/krb5/sys/contrib/dev/acpica/compiler/asltree.c projects/krb5/sys/contrib/dev/acpica/compiler/aslutils.c projects/krb5/sys/contrib/dev/acpica/compiler/dtcompile.c projects/krb5/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/krb5/sys/contrib/dev/acpica/compiler/dtfield.c projects/krb5/sys/contrib/dev/acpica/compiler/dtparser.y projects/krb5/sys/contrib/dev/acpica/compiler/dtutils.c projects/krb5/sys/contrib/dev/acpica/compiler/prparser.y projects/krb5/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/krb5/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/krb5/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/krb5/sys/contrib/dev/acpica/components/events/evgpe.c projects/krb5/sys/contrib/dev/acpica/components/executer/exconcat.c projects/krb5/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/krb5/sys/contrib/dev/acpica/components/executer/exmisc.c projects/krb5/sys/contrib/dev/acpica/components/executer/exresop.c projects/krb5/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/krb5/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/krb5/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/krb5/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/krb5/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/krb5/sys/contrib/dev/acpica/components/tables/tbxface.c projects/krb5/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c projects/krb5/sys/contrib/dev/acpica/include/acexcep.h projects/krb5/sys/contrib/dev/acpica/include/achware.h projects/krb5/sys/contrib/dev/acpica/include/acinterp.h projects/krb5/sys/contrib/dev/acpica/include/acpixf.h projects/krb5/sys/contrib/dev/acpica/include/actbl1.h projects/krb5/sys/contrib/dev/acpica/include/actbl2.h projects/krb5/sys/contrib/dev/acpica/include/acutils.h projects/krb5/sys/dev/aac/aac.c projects/krb5/sys/dev/acpica/acpi_cpu.c projects/krb5/sys/dev/amdtemp/amdtemp.c projects/krb5/sys/dev/amr/amr.c projects/krb5/sys/dev/bhnd/cores/usb/bhnd_usb.c projects/krb5/sys/dev/bnxt/bnxt.h projects/krb5/sys/dev/bnxt/bnxt_hwrm.c projects/krb5/sys/dev/bnxt/bnxt_hwrm.h projects/krb5/sys/dev/bnxt/bnxt_sysctl.c projects/krb5/sys/dev/bnxt/bnxt_sysctl.h projects/krb5/sys/dev/bnxt/hsi_struct_def.h projects/krb5/sys/dev/bnxt/if_bnxt.c projects/krb5/sys/dev/cxgbe/adapter.h projects/krb5/sys/dev/cxgbe/common/t4_hw.c projects/krb5/sys/dev/cxgbe/firmware/t4fw_interface.h projects/krb5/sys/dev/cxgbe/firmware/t6fw_cfg.txt projects/krb5/sys/dev/cxgbe/iw_cxgbe/cm.c projects/krb5/sys/dev/cxgbe/iw_cxgbe/qp.c projects/krb5/sys/dev/cxgbe/offload.h projects/krb5/sys/dev/cxgbe/t4_main.c projects/krb5/sys/dev/cxgbe/t4_sge.c projects/krb5/sys/dev/cxgbe/tom/t4_connect.c projects/krb5/sys/dev/cxgbe/tom/t4_listen.c projects/krb5/sys/dev/cxgbe/tom/t4_tom.c projects/krb5/sys/dev/e1000/if_em.c projects/krb5/sys/dev/e1000/if_em.h projects/krb5/sys/dev/hwpmc/hwpmc_core.c projects/krb5/sys/dev/hwpmc/hwpmc_intel.c projects/krb5/sys/dev/hwpmc/pmc_events.h projects/krb5/sys/dev/hyperv/netvsc/hn_rndis.c projects/krb5/sys/dev/hyperv/netvsc/if_hn.c projects/krb5/sys/dev/isp/isp_freebsd.c projects/krb5/sys/dev/ixgbe/if_ix.c projects/krb5/sys/dev/ixgbe/if_ixv.c projects/krb5/sys/dev/md/md.c projects/krb5/sys/dev/mfi/mfi.c projects/krb5/sys/dev/mpr/mpr.c projects/krb5/sys/dev/mpr/mpr_mapping.c projects/krb5/sys/dev/mpr/mpr_pci.c projects/krb5/sys/dev/mpr/mpr_sas.c projects/krb5/sys/dev/mpr/mpr_sas_lsi.c projects/krb5/sys/dev/mpr/mpr_user.c projects/krb5/sys/dev/mps/mps.c projects/krb5/sys/dev/mps/mps_mapping.c projects/krb5/sys/dev/mps/mps_pci.c projects/krb5/sys/dev/mps/mps_sas.c projects/krb5/sys/dev/mps/mps_sas_lsi.c projects/krb5/sys/dev/mps/mps_user.c projects/krb5/sys/dev/ntb/ntb.c projects/krb5/sys/dev/ntb/ntb.h projects/krb5/sys/dev/ntb/ntb_transport.c projects/krb5/sys/dev/nvme/nvme.c projects/krb5/sys/dev/nvme/nvme.h projects/krb5/sys/dev/nvme/nvme_ctrlr.c projects/krb5/sys/dev/nvme/nvme_ctrlr_cmd.c projects/krb5/sys/dev/nvme/nvme_ns.c projects/krb5/sys/dev/nvme/nvme_private.h projects/krb5/sys/dev/nvme/nvme_qpair.c projects/krb5/sys/dev/nvme/nvme_sim.c projects/krb5/sys/dev/nvme/nvme_sysctl.c projects/krb5/sys/dev/ppc/ppc_pci.c projects/krb5/sys/dev/qlnx/qlnxe/qlnx_os.c projects/krb5/sys/dev/qlxgbe/README.txt projects/krb5/sys/dev/qlxgbe/ql_boot.c projects/krb5/sys/dev/qlxgbe/ql_def.h projects/krb5/sys/dev/qlxgbe/ql_fw.c projects/krb5/sys/dev/qlxgbe/ql_glbl.h projects/krb5/sys/dev/qlxgbe/ql_hw.c projects/krb5/sys/dev/qlxgbe/ql_hw.h projects/krb5/sys/dev/qlxgbe/ql_inline.h projects/krb5/sys/dev/qlxgbe/ql_ioctl.c projects/krb5/sys/dev/qlxgbe/ql_isr.c projects/krb5/sys/dev/qlxgbe/ql_minidump.c projects/krb5/sys/dev/qlxgbe/ql_os.c projects/krb5/sys/dev/qlxgbe/ql_os.h projects/krb5/sys/dev/qlxgbe/ql_reset.c projects/krb5/sys/dev/qlxgbe/ql_ver.h projects/krb5/sys/dev/rtwn/if_rtwn_ridx.h projects/krb5/sys/dev/rtwn/if_rtwn_rx.c projects/krb5/sys/dev/rtwn/rtl8188e/r88e.h projects/krb5/sys/dev/rtwn/rtl8188e/r88e_chan.c projects/krb5/sys/dev/rtwn/rtl8192c/r92c.h projects/krb5/sys/dev/rtwn/rtl8192c/r92c_chan.c projects/krb5/sys/dev/rtwn/rtl8192c/r92c_fw.c projects/krb5/sys/dev/rtwn/rtl8192c/r92c_priv.h projects/krb5/sys/dev/rtwn/rtl8192c/r92c_rx.c projects/krb5/sys/dev/rtwn/rtl8192c/r92c_tx.c projects/krb5/sys/dev/rtwn/rtl8192c/r92c_var.h projects/krb5/sys/dev/rtwn/rtl8192e/r92e_chan.c projects/krb5/sys/dev/rtwn/rtl8812a/r12a_chan.c projects/krb5/sys/dev/rtwn/rtl8812a/r12a_rx.c projects/krb5/sys/dev/rtwn/rtl8812a/r12a_tx.c projects/krb5/sys/dev/syscons/scvgarndr.c projects/krb5/sys/dev/syscons/syscons.c projects/krb5/sys/dev/syscons/syscons.h projects/krb5/sys/dev/usb/quirk/usb_quirk.c projects/krb5/sys/dev/usb/usbdevs projects/krb5/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c projects/krb5/sys/fs/msdosfs/msdosfs_fat.c projects/krb5/sys/geom/eli/g_eli.c projects/krb5/sys/geom/eli/g_eli.h projects/krb5/sys/geom/eli/g_eli_ctl.c projects/krb5/sys/geom/geom_subr.c projects/krb5/sys/geom/part/g_part_gpt.c projects/krb5/sys/i386/conf/GENERIC projects/krb5/sys/i386/conf/NOTES projects/krb5/sys/i386/i386/trap.c projects/krb5/sys/i386/include/param.h projects/krb5/sys/kern/kern_cpuset.c projects/krb5/sys/kern/kern_dtrace.c projects/krb5/sys/kern/kern_lockstat.c projects/krb5/sys/kern/kern_mutex.c projects/krb5/sys/kern/kern_proc.c projects/krb5/sys/kern/kern_rwlock.c projects/krb5/sys/kern/kern_sx.c projects/krb5/sys/kern/kern_sysctl.c projects/krb5/sys/kern/subr_blist.c projects/krb5/sys/kern/subr_bus_dma.c projects/krb5/sys/kern/subr_smp.c projects/krb5/sys/kern/subr_turnstile.c projects/krb5/sys/kern/subr_vmem.c projects/krb5/sys/kern/sys_socket.c projects/krb5/sys/kern/uipc_sockbuf.c projects/krb5/sys/kern/uipc_socket.c projects/krb5/sys/kern/vfs_bio.c projects/krb5/sys/kern/vfs_cache.c projects/krb5/sys/kern/vfs_mountroot.c projects/krb5/sys/kern/vfs_subr.c projects/krb5/sys/mips/atheros/if_arge.c projects/krb5/sys/mips/cavium/octeon_ebt3000_cf.c projects/krb5/sys/mips/conf/ERL projects/krb5/sys/mips/include/_limits.h projects/krb5/sys/mips/mips/elf_machdep.c projects/krb5/sys/mips/mips/exception.S projects/krb5/sys/mips/mips/freebsd32_machdep.c projects/krb5/sys/mips/mips/pm_machdep.c projects/krb5/sys/mips/rmi/xls_ehci.c projects/krb5/sys/modules/Makefile projects/krb5/sys/modules/cxgbe/t4_firmware/Makefile projects/krb5/sys/modules/cxgbe/t5_firmware/Makefile projects/krb5/sys/modules/cxgbe/t6_firmware/Makefile projects/krb5/sys/modules/dtrace/Makefile projects/krb5/sys/modules/dtrace/dtraceall/Makefile projects/krb5/sys/modules/dtrace/dtraceall/dtraceall.c projects/krb5/sys/modules/ntb/Makefile projects/krb5/sys/modules/nvme/Makefile projects/krb5/sys/modules/qlxgbe/Makefile projects/krb5/sys/net/ieee8023ad_lacp.c projects/krb5/sys/net/if.c projects/krb5/sys/net/if.h projects/krb5/sys/net/if_var.h projects/krb5/sys/net/iflib.c projects/krb5/sys/net/route.h projects/krb5/sys/net80211/ieee80211_output.c projects/krb5/sys/netinet/in_pcb.c projects/krb5/sys/netinet/in_pcb.h projects/krb5/sys/netinet/tcp_input.c projects/krb5/sys/netinet/tcp_stacks/fastpath.c projects/krb5/sys/netinet/tcp_timer.c projects/krb5/sys/netinet/tcp_var.h projects/krb5/sys/netipsec/udpencap.c projects/krb5/sys/ofed/drivers/infiniband/core/cma.c projects/krb5/sys/powerpc/conf/GENERIC projects/krb5/sys/riscv/conf/GENERIC projects/krb5/sys/security/audit/audit.c projects/krb5/sys/sparc64/conf/GENERIC projects/krb5/sys/sys/cdefs.h projects/krb5/sys/sys/consio.h projects/krb5/sys/sys/mdioctl.h projects/krb5/sys/sys/param.h projects/krb5/sys/sys/smp.h projects/krb5/sys/sys/sockio.h projects/krb5/sys/sys/systm.h projects/krb5/sys/ufs/ffs/ffs_softdep.c projects/krb5/sys/ufs/ffs/fs.h projects/krb5/sys/vm/swap_pager.c projects/krb5/sys/vm/swap_pager.h projects/krb5/sys/vm/uma_core.c projects/krb5/sys/vm/vm_fault.c projects/krb5/sys/vm/vm_object.c projects/krb5/sys/vm/vm_object.h projects/krb5/sys/vm/vm_page.c projects/krb5/sys/vm/vm_pageout.c projects/krb5/sys/vm/vm_pager.c projects/krb5/sys/vm/vm_phys.c projects/krb5/sys/vm/vm_phys.h projects/krb5/sys/x86/acpica/srat.c projects/krb5/sys/x86/cpufreq/hwpstate.c projects/krb5/sys/x86/include/apicreg.h projects/krb5/sys/x86/include/apicvar.h projects/krb5/sys/x86/include/specialreg.h projects/krb5/sys/x86/include/x86_var.h projects/krb5/sys/x86/iommu/intel_drv.c projects/krb5/sys/x86/pci/qpi.c projects/krb5/sys/x86/x86/identcpu.c projects/krb5/sys/x86/x86/io_apic.c projects/krb5/sys/x86/x86/mca.c projects/krb5/sys/x86/x86/mp_x86.c projects/krb5/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/krb5/tools/tools/nanobsd/embedded/common projects/krb5/usr.bin/calendar/calendars/calendar.freebsd projects/krb5/usr.bin/calendar/calendars/calendar.holiday projects/krb5/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte projects/krb5/usr.bin/clang/Makefile.inc projects/krb5/usr.bin/grep/grep.c projects/krb5/usr.bin/grep/grep.h projects/krb5/usr.bin/grep/util.c projects/krb5/usr.bin/kdump/kdump.c projects/krb5/usr.bin/netstat/inet.c projects/krb5/usr.bin/netstat/main.c projects/krb5/usr.bin/tail/extern.h projects/krb5/usr.bin/tail/tests/tail_test.sh projects/krb5/usr.bin/truss/extern.h projects/krb5/usr.bin/truss/setup.c projects/krb5/usr.bin/truss/syscall.h projects/krb5/usr.bin/truss/syscalls.c projects/krb5/usr.sbin/acpi/acpidb/Makefile projects/krb5/usr.sbin/acpi/acpidump/acpi.c projects/krb5/usr.sbin/acpi/iasl/Makefile projects/krb5/usr.sbin/autofs/auto_master.5 projects/krb5/usr.sbin/binmiscctl/binmiscctl.8 projects/krb5/usr.sbin/camdd/camdd.c projects/krb5/usr.sbin/chown/tests/chown_test.sh projects/krb5/usr.sbin/crunch/crunchgen/crunched_main.c projects/krb5/usr.sbin/crunch/crunchgen/crunchgen.c projects/krb5/usr.sbin/ctladm/ctladm.c projects/krb5/usr.sbin/efivar/Makefile projects/krb5/usr.sbin/efivar/efivar.8 projects/krb5/usr.sbin/efivar/efivar.c projects/krb5/usr.sbin/makefs/mtree.c projects/krb5/usr.sbin/vidcontrol/vidcontrol.1 projects/krb5/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/krb5/ (props changed) projects/krb5/cddl/ (props changed) projects/krb5/cddl/contrib/opensolaris/ (props changed) projects/krb5/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/krb5/contrib/binutils/ (props changed) projects/krb5/contrib/compiler-rt/ (props changed) projects/krb5/contrib/file/ (props changed) projects/krb5/contrib/libc++/ (props changed) projects/krb5/contrib/llvm/ (props changed) projects/krb5/contrib/llvm/tools/clang/ (props changed) projects/krb5/contrib/llvm/tools/lld/ (props changed) projects/krb5/contrib/llvm/tools/lldb/ (props changed) projects/krb5/contrib/netbsd-tests/ (props changed) projects/krb5/contrib/top/ (props changed) projects/krb5/contrib/unbound/ (props changed) projects/krb5/contrib/zstd/ (props changed) projects/krb5/sys/cddl/contrib/opensolaris/ (props changed) projects/krb5/sys/contrib/dev/acpica/ (props changed) Modified: projects/krb5/Makefile.inc1 ============================================================================== --- projects/krb5/Makefile.inc1 Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/Makefile.inc1 Fri Sep 8 22:04:28 2017 (r323335) @@ -557,7 +557,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - MK_GDB=no MK_TESTS=no + MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no # kernel-tools stage KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -1786,7 +1786,8 @@ update: .PHONY # ELF Tool Chain libraries are needed for ELF tools and dtrace tools. # r296685 fix cross-endian objcopy -.if ${BOOTSTRAPPING} < 1100102 +# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2. +.if ${BOOTSTRAPPING} < 1200020 _elftoolchain_libs= lib/libelf lib/libdwarf .endif @@ -1984,8 +1985,12 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue=rescue/rescue .endif +.if ${MK_TCSH} != "no" +_tcsh=bin/csh +.endif + .for _tool in \ - bin/csh \ + ${_tcsh} \ bin/sh \ ${LOCAL_TOOL_DIRS} \ lib/ncurses/ncurses \ @@ -2143,7 +2148,7 @@ native-xtools: .PHONY bin/cat \ bin/chmod \ bin/cp \ - bin/csh \ + ${_tcsh} \ bin/echo \ bin/expr \ bin/hostname \ Modified: projects/krb5/UPDATING ============================================================================== --- projects/krb5/UPDATING Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/UPDATING Fri Sep 8 22:04:28 2017 (r323335) @@ -51,6 +51,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20170826: + During boot the geli passphrase will be hidden. To restore previous + behavior see geli(8) configuration options. + +20170825: + Move PMTUD blackhole counters to TCPSTATS and remove them from bare + sysctl values. Minor nit, but requires a rebuild of both world/kernel + to complete. + 20170814: "make check" behavior (made in ^/head@r295380) has been changed to execute from a limited sandbox, as opposed to executing from Modified: projects/krb5/bin/chflags/Makefile ============================================================================== --- projects/krb5/bin/chflags/Makefile Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/chflags/Makefile Fri Sep 8 22:04:28 2017 (r323335) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= chflags +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/krb5/bin/dd/args.c ============================================================================== --- projects/krb5/bin/dd/args.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/dd/args.c Fri Sep 8 22:04:28 2017 (r323335) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -184,7 +185,7 @@ f_bs(char *arg) res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX); + errx(1, "bs must be between 1 and %zd", (ssize_t)SSIZE_MAX); in.dbsz = out.dbsz = (size_t)res; } @@ -195,22 +196,22 @@ f_cbs(char *arg) res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX); + errx(1, "cbs must be between 1 and %zd", (ssize_t)SSIZE_MAX); cbsz = (size_t)res; } static void f_count(char *arg) { - intmax_t res; + uintmax_t res; - res = (intmax_t)get_num(arg); - if (res < 0) - errx(1, "count cannot be negative"); + res = get_num(arg); + if (res == UINTMAX_MAX) + errc(1, ERANGE, "%s", oper); if (res == 0) - cpy_cnt = (uintmax_t)-1; + cpy_cnt = UINTMAX_MAX; else - cpy_cnt = (uintmax_t)res; + cpy_cnt = res; } static void @@ -219,7 +220,7 @@ f_files(char *arg) files_cnt = get_num(arg); if (files_cnt < 1) - errx(1, "files must be between 1 and %jd", (uintmax_t)-1); + errx(1, "files must be between 1 and %zu", SIZE_MAX); } static void @@ -240,8 +241,8 @@ f_ibs(char *arg) if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "ibs must be between 1 and %jd", - (intmax_t)SSIZE_MAX); + errx(1, "ibs must be between 1 and %zd", + (ssize_t)SSIZE_MAX); in.dbsz = (size_t)res; } } @@ -261,8 +262,8 @@ f_obs(char *arg) if (!(ddflags & C_BS)) { res = get_num(arg); if (res < 1 || res > SSIZE_MAX) - errx(1, "obs must be between 1 and %jd", - (intmax_t)SSIZE_MAX); + errx(1, "obs must be between 1 and %zd", + (ssize_t)SSIZE_MAX); out.dbsz = (size_t)res; } } Modified: projects/krb5/bin/dd/conv.c ============================================================================== --- projects/krb5/bin/dd/conv.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/dd/conv.c Fri Sep 8 22:04:28 2017 (r323335) @@ -133,7 +133,7 @@ block(void) */ ch = 0; for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) { - maxlen = MIN(cbsz, in.dbcnt); + maxlen = MIN(cbsz, (size_t)in.dbcnt); if ((t = ctab) != NULL) for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n'; ++cnt) @@ -146,7 +146,7 @@ block(void) * Check for short record without a newline. Reassemble the * input block. */ - if (ch != '\n' && in.dbcnt < cbsz) { + if (ch != '\n' && (size_t)in.dbcnt < cbsz) { (void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt); break; } @@ -228,7 +228,7 @@ unblock(void) * translation has to already be done or we might not recognize the * spaces. */ - for (inp = in.db; in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) { + for (inp = in.db; (size_t)in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) { for (t = inp + cbsz - 1; t >= inp && *t == ' '; --t) ; if (t >= inp) { Modified: projects/krb5/bin/dd/dd.c ============================================================================== --- projects/krb5/bin/dd/dd.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/dd/dd.c Fri Sep 8 22:04:28 2017 (r323335) @@ -204,10 +204,10 @@ setup(void) * record oriented I/O, only need a single buffer. */ if (!(ddflags & (C_BLOCK | C_UNBLOCK))) { - if ((in.db = malloc(out.dbsz + in.dbsz - 1)) == NULL) + if ((in.db = malloc((size_t)out.dbsz + in.dbsz - 1)) == NULL) err(1, "input buffer"); out.db = in.db; - } else if ((in.db = malloc(MAX(in.dbsz, cbsz) + cbsz)) == NULL || + } else if ((in.db = malloc(MAX((size_t)in.dbsz, cbsz) + cbsz)) == NULL || (out.db = malloc(out.dbsz + cbsz)) == NULL) err(1, "output buffer"); @@ -405,7 +405,7 @@ dd_in(void) ++st.in_full; /* Handle full input blocks. */ - } else if ((size_t)n == in.dbsz) { + } else if ((size_t)n == (size_t)in.dbsz) { in.dbcnt += in.dbrcnt = n; ++st.in_full; @@ -562,7 +562,7 @@ dd_out(int force) outp += nw; st.bytes += nw; - if ((size_t)nw == n && n == out.dbsz) + if ((size_t)nw == n && n == (size_t)out.dbsz) ++st.out_full; else ++st.out_part; Modified: projects/krb5/bin/dd/dd.h ============================================================================== --- projects/krb5/bin/dd/dd.h Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/dd/dd.h Fri Sep 8 22:04:28 2017 (r323335) @@ -38,10 +38,9 @@ typedef struct { u_char *db; /* buffer address */ u_char *dbp; /* current buffer I/O address */ - /* XXX ssize_t? */ - size_t dbcnt; /* current buffer byte count */ - size_t dbrcnt; /* last read byte count */ - size_t dbsz; /* block size */ + ssize_t dbcnt; /* current buffer byte count */ + ssize_t dbrcnt; /* last read byte count */ + ssize_t dbsz; /* block size */ #define ISCHR 0x01 /* character device (warn on short) */ #define ISPIPE 0x02 /* pipe-like (see position.c) */ Modified: projects/krb5/bin/dd/position.c ============================================================================== --- projects/krb5/bin/dd/position.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/dd/position.c Fri Sep 8 22:04:28 2017 (r323335) @@ -207,7 +207,7 @@ pos_out(void) n = write(out.fd, out.db, out.dbsz); if (n == -1) err(1, "%s", out.name); - if ((size_t)n != out.dbsz) + if (n != out.dbsz) errx(1, "%s: write failure", out.name); } break; Modified: projects/krb5/bin/mkdir/Makefile ============================================================================== --- projects/krb5/bin/mkdir/Makefile Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/mkdir/Makefile Fri Sep 8 22:04:28 2017 (r323335) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= mkdir +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/krb5/bin/pkill/pkill.c ============================================================================== --- projects/krb5/bin/pkill/pkill.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/pkill/pkill.c Fri Sep 8 22:04:28 2017 (r323335) @@ -568,7 +568,7 @@ main(int argc, char **argv) continue; rv |= (*action)(kp); } - if (rv && pgrep) + if (rv && pgrep && !quiet) putchar('\n'); if (!did_action && !pgrep && longfmt) fprintf(stderr, Modified: projects/krb5/bin/ps/print.c ============================================================================== --- projects/krb5/bin/ps/print.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/ps/print.c Fri Sep 8 22:04:28 2017 (r323335) @@ -262,9 +262,9 @@ state(KINFO *k, VARENT *ve __unused) cp++; if (!(flag & P_INMEM)) *cp++ = 'W'; - if (k->ki_p->ki_nice < NZERO) + if (k->ki_p->ki_nice < NZERO || k->ki_p->ki_pri.pri_class == PRI_REALTIME) *cp++ = '<'; - else if (k->ki_p->ki_nice > NZERO) + else if (k->ki_p->ki_nice > NZERO || k->ki_p->ki_pri.pri_class == PRI_IDLE) *cp++ = 'N'; if (flag & P_TRACED) *cp++ = 'X'; @@ -274,6 +274,8 @@ state(KINFO *k, VARENT *ve __unused) *cp++ = 'V'; if ((flag & P_SYSTEM) || k->ki_p->ki_lock > 0) *cp++ = 'L'; + if ((k->ki_p->ki_cr_flags & CRED_FLAG_CAPMODE) != 0) + *cp++ = 'C'; if (k->ki_p->ki_kiflag & KI_SLEADER) *cp++ = 's'; if ((flag & P_CONTROLT) && k->ki_p->ki_pgid == k->ki_p->ki_tpgid) Modified: projects/krb5/bin/ps/ps.1 ============================================================================== --- projects/krb5/bin/ps/ps.1 Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/ps/ps.1 Fri Sep 8 22:04:28 2017 (r323335) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd July 25, 2017 +.Dd September 7, 2017 .Dt PS 1 .Os .Sh NAME @@ -436,6 +436,10 @@ information: The process is in the foreground process group of its control terminal. .It Li < The process has raised CPU scheduling priority. +.It Li C +The process is in +.Xr capsicum 4 +capability mode. .It Li E The process is trying to exit. .It Li J @@ -541,7 +545,7 @@ short-term CPU usage factor (for scheduling) .It Cm dsiz data size (in Kbytes) .It Cm emul -system-call emulation environment +system-call emulation environment (ABI) .It Cm etime elapsed running time, format .Op days- Ns Modified: projects/krb5/bin/rcp/Makefile ============================================================================== --- projects/krb5/bin/rcp/Makefile Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/rcp/Makefile Fri Sep 8 22:04:28 2017 (r323335) @@ -11,4 +11,7 @@ PACKAGE=rcmds BINOWN= root BINMODE=4555 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/krb5/bin/rmdir/Makefile ============================================================================== --- projects/krb5/bin/rmdir/Makefile Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/bin/rmdir/Makefile Fri Sep 8 22:04:28 2017 (r323335) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= rmdir +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/krb5/cddl/compat/opensolaris/misc/zmount.c ============================================================================== --- projects/krb5/cddl/compat/opensolaris/misc/zmount.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/compat/opensolaris/misc/zmount.c Fri Sep 8 22:04:28 2017 (r323335) @@ -74,7 +74,7 @@ zmount(const char *spec, const char *dir, int mflag, c char *dataptr, int datalen, char *optptr, int optlen) { struct iovec *iov; - char *optstr, *os, *p; + char *optstr, *os, *p, *tofree; int iovlen, rv; assert(spec != NULL); @@ -87,7 +87,7 @@ zmount(const char *spec, const char *dir, int mflag, c assert(optptr != NULL); assert(optlen > 0); - optstr = strdup(optptr); + tofree = optstr = strdup(optptr); assert(optstr != NULL); iov = NULL; @@ -98,11 +98,9 @@ zmount(const char *spec, const char *dir, int mflag, c build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir), (size_t)-1); build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1); - for (p = optstr; p != NULL; strsep(&p, ",/ ")) { - if (*p != '\0') - build_iovec(&iov, &iovlen, p, NULL, (size_t)-1); - } + while ((p = strsep(&optstr, ",/")) != NULL) + build_iovec(&iov, &iovlen, p, NULL, (size_t)-1); rv = nmount(iov, iovlen, 0); - free(optstr); + free(tofree); return (rv); } Copied: projects/krb5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d (from r323334, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/krb5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d Fri Sep 8 22:04:28 2017 (r323335, copy of r323334, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d) @@ -0,0 +1,25 @@ +/* + * This file and its contents are supplied under the terms of the + * Common Development and Distribution License ("CDDL"), version 1.0. + * You may only use this file in accordance with the terms version + * 1.0 of the CDDL. + * + * A full copy of the text of the CDDL should have accompanied this + * source. A copy of the CDDL is also available via the Internet at + * http://www.illumos.org/license/CDDL. + */ + +/* + * Copyright 2017 Mark Johnston + */ + +/* + * A regression test for FreeBSD r322773. 100^9 fits in 64 bits, but + * llquantize() will create buckets up to 100^{10}, which does not fit. + */ + +BEGIN +{ + @ = llquantize(0, 100, 0, 9, 100); + exit(0); +} Modified: projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c Fri Sep 8 22:04:28 2017 (r323335) @@ -1503,7 +1503,7 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_node_t *dnp, dtra "divide a power of the factor\n"); } - for (i = 0, order = 1; i < args[2].value; i++) { + for (i = 0, order = 1; i <= args[2].value + 1; i++) { if (order * args[0].value > order) { order *= args[0].value; continue; @@ -1511,7 +1511,7 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_node_t *dnp, dtra dnerror(dnp, D_LLQUANT_MAGTOOBIG, "llquantize( ) " "factor (%d) raised to power of high magnitude " - "(%d) overflows 64-bits\n", args[0].value, + "(%d) plus 1 overflows 64-bits\n", args[0].value, args[2].value); } Modified: projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Sep 8 22:04:28 2017 (r323335) @@ -963,7 +963,7 @@ dt_provmod_open(dt_provmod_t **provmod, dt_fdlist_t *d (void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1); - if ((fd = open(path, O_RDONLY)) == -1) + if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) continue; /* failed to open driver; just skip it */ if (((prov = malloc(sizeof (dt_provmod_t))) == NULL) || @@ -1100,7 +1100,7 @@ dt_vopen(int version, int flags, int *errp, */ dt_provmod_open(&provmod, &df); - dtfd = open("/dev/dtrace/dtrace", O_RDWR); + dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC); err = errno; /* save errno from opening dtfd */ #if defined(__FreeBSD__) /* @@ -1116,7 +1116,7 @@ dt_vopen(int version, int flags, int *errp, #ifdef illumos ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR); #else - ftfd = open("/dev/dtrace/fasttrap", O_RDWR); + ftfd = open("/dev/dtrace/fasttrap", O_RDWR | O_CLOEXEC); #endif fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */ @@ -1145,9 +1145,6 @@ dt_vopen(int version, int flags, int *errp, } return (set_open_errno(dtp, errp, err)); } - - (void) fcntl(dtfd, F_SETFD, FD_CLOEXEC); - (void) fcntl(ftfd, F_SETFD, FD_CLOEXEC); alloc: if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL) { Modified: projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Sep 8 22:04:28 2017 (r323335) @@ -772,6 +772,7 @@ extern int zpool_in_use(libzfs_handle_t *, int, pool_s * Label manipulation. */ extern int zpool_read_label(int, nvlist_t **); +extern int zpool_read_all_labels(int, nvlist_t **); extern int zpool_clear_label(int); /* is this zvol valid for use as a dump device? */ Modified: projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Fri Sep 8 22:04:28 2017 (r323335) @@ -914,6 +914,65 @@ zpool_read_label(int fd, nvlist_t **config) return (0); } +/* + * Given a file descriptor, read the label information and return an nvlist + * describing the configuration, if there is one. + * returns the number of valid labels found + */ +int +zpool_read_all_labels(int fd, nvlist_t **config) +{ + struct stat64 statbuf; + int l; + vdev_label_t *label; + uint64_t state, txg, size; + int nlabels = 0; + + *config = NULL; + + if (fstat64(fd, &statbuf) == -1) + return (0); + size = P2ALIGN_TYPED(statbuf.st_size, sizeof (vdev_label_t), uint64_t); + + if ((label = malloc(sizeof (vdev_label_t))) == NULL) + return (0); + + for (l = 0; l < VDEV_LABELS; l++) { + nvlist_t *temp = NULL; + + /* TODO: use aio_read so we can read al 4 labels in parallel */ + if (pread64(fd, label, sizeof (vdev_label_t), + label_offset(size, l)) != sizeof (vdev_label_t)) + continue; + + if (nvlist_unpack(label->vl_vdev_phys.vp_nvlist, + sizeof (label->vl_vdev_phys.vp_nvlist), &temp, 0) != 0) + continue; + + if (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_STATE, + &state) != 0 || state > POOL_STATE_L2CACHE) { + nvlist_free(temp); + temp = NULL; + continue; + } + + if (state != POOL_STATE_SPARE && state != POOL_STATE_L2CACHE && + (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_TXG, + &txg) != 0 || txg == 0)) { + nvlist_free(temp); + temp = NULL; + continue; + } + if (temp) + *config = temp; + + nlabels++; + } + + free(label); + return (nlabels); +} + typedef struct rdsk_node { char *rn_name; int rn_dfd; Modified: projects/krb5/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/krb5/cddl/lib/libdtrace/Makefile Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/lib/libdtrace/Makefile Fri Sep 8 22:04:28 2017 (r323335) @@ -54,6 +54,7 @@ DSRCS= errno.d \ siftr.d \ signal.d \ tcp.d \ + socket.d \ udp.d \ unistd.d Copied: projects/krb5/cddl/lib/libdtrace/socket.d (from r323334, head/cddl/lib/libdtrace/socket.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/krb5/cddl/lib/libdtrace/socket.d Fri Sep 8 22:04:28 2017 (r323335, copy of r323334, head/cddl/lib/libdtrace/socket.d) @@ -0,0 +1,301 @@ +/* + * Copyright (c) 2017 George V. Neville-Neil + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + * + * Translators and flags for the socket structure. FreeBSD specific code. + */ + +#pragma D depends_on module kernel + +/* + * Option flags per-socket. + */ +#pragma D binding "1.13" SO_DEBUG +inline int SO_DEBUG = 0x0001; /* turn on debugging info recording */ +#pragma D binding "1.13" SO_ACCEPTCONN +inline int SO_ACCEPTCONN = 0x0002; /* socket has had listen() */ +#pragma D binding "1.13" SO_REUSEADDR +inline int SO_REUSEADDR = 0x0004; /* allow local address reuse */ +#pragma D binding "1.13" SO_KEEPALIVE +inline int SO_KEEPALIVE = 0x0008; /* keep connections alive */ +#pragma D binding "1.13" SO_DONTROUTE +inline int SO_DONTROUTE = 0x0010; /* just use interface addresses */ +#pragma D binding "1.13" SO_BROADCAST +inline int SO_BROADCAST = 0x0020; /* permit sending of broadcast msgs */ +#pragma D binding "1.13" SO_USELOOPBACK +inline int SO_USELOOPBACK = 0x0040; /* bypass hardware when possible */ +#pragma D binding "1.13" SO_LINGER +inline int SO_LINGER = 0x0080; /* linger on close if data present */ +#pragma D binding "1.13" SO_OOBINLINE +inline int SO_OOBINLINE = 0x0100; /* leave received OOB data in line */ +#pragma D binding "1.13" SO_REUSEPORT +inline int SO_REUSEPORT = 0x0200; /* allow local address & port reuse */ +#pragma D binding "1.13" SO_TIMESTAMP +inline int SO_TIMESTAMP = 0x0400; /* timestamp received dgram traffic */ +#pragma D binding "1.13" SO_NOSIGPIPE +inline int SO_NOSIGPIPE = 0x0800; /* no SIGPIPE from EPIPE */ +#pragma D binding "1.13" SO_ACCEPTFILTER +inline int SO_ACCEPTFILTER = 0x1000; /* there is an accept filter */ +#pragma D binding "1.13" SO_BINTIME +inline int SO_BINTIME = 0x2000; /* timestamp received dgram traffic */ +#pragma D binding "1.13" SO_NO_OFFLOAD +inline int SO_NO_OFFLOAD = 0x4000; /* socket cannot be offloaded */ +#pragma D binding "1.13" SO_NO_DDP +inline int SO_NO_DDP = 0x8000; /* disable direct data placement */ + +/* + * Additional options, not kept in so_options. + */ +#pragma D binding "1.13" SO_SNDBUF +inline int SO_SNDBUF = 0x1001; /* send buffer size */ +#pragma D binding "1.13" SO_RCVBUF +inline int SO_RCVBUF = 0x1002; /* receive buffer size */ +#pragma D binding "1.13" SO_SNDLOWAT +inline int SO_SNDLOWAT = 0x1003; /* send low-water mark */ +#pragma D binding "1.13" SO_RCVLOWAT +inline int SO_RCVLOWAT = 0x1004; /* receive low-water mark */ +#pragma D binding "1.13" SO_SNDTIMEO +inline int SO_SNDTIMEO = 0x1005; /* send timeout */ +#pragma D binding "1.13" SO_RCVTIMEO +inline int SO_RCVTIMEO = 0x1006; /* receive timeout */ +#pragma D binding "1.13" SO_ERROR +inline int SO_ERROR = 0x1007; /* get error status and clear */ +#pragma D binding "1.13" SO_TYPE +inline int SO_TYPE = 0x1008; /* get socket type */ +#pragma D binding "1.13" SO_LABEL +inline int SO_LABEL = 0x1009; /* socket's MAC label */ +#pragma D binding "1.13" SO_PEERLABEL +inline int SO_PEERLABEL = 0x1010; /* socket's peer's MAC label */ +#pragma D binding "1.13" SO_LISTENQLIMIT +inline int SO_LISTENQLIMIT = 0x1011; /* socket's backlog limit */ +#pragma D binding "1.13" SO_LISTENQLEN +inline int SO_LISTENQLEN = 0x1012; /* socket's complete queue length */ +#pragma D binding "1.13" SO_LISTENINCQLEN +inline int SO_LISTENINCQLEN = 0x1013; /* socket's incomplete queue length */ +#pragma D binding "1.13" SO_SETFIB +inline int SO_SETFIB = 0x1014; /* use this FIB to route */ +#pragma D binding "1.13" SO_USER_COOKIE +inline int SO_USER_COOKIE = 0x1015; /* user cookie (dummynet etc.) */ +#pragma D binding "1.13" SO_PROTOCOL +inline int SO_PROTOCOL = 0x1016; /* get socket protocol (Linux name) */ +#pragma D binding "1.13" SO_PROTOTYPE +inline int SO_PROTOTYPE = SO_PROTOCOL; /* alias for SO_PROTOCOL (SunOS name) */ +#pragma D binding "1.13" SO_TS_CLOCK +inline int SO_TS_CLOCK = 0x1017; /* clock type used for SO_TIMESTAMP */ +#pragma D binding "1.13" SO_MAX_PACING_RATE +inline int SO_MAX_PACING_RATE = 0x1018; /* socket's max TX pacing rate (Linux name) */ + +#pragma D binding "1.13" SO_TS_REALTIME_MICRO +inline int SO_TS_REALTIME_MICRO = 0; /* microsecond resolution, realtime */ +#pragma D binding "1.13" SO_TS_BINTIME +inline int SO_TS_BINTIME = 1; /* sub-nanosecond resolution, realtime */ +#pragma D binding "1.13" SO_TS_REALTIME +inline int SO_TS_REALTIME = 2; /* nanosecond resolution, realtime */ +#pragma D binding "1.13" SO_TS_MONOTONIC +inline int SO_TS_MONOTONIC = 3; /* nanosecond resolution, monotonic */ +#pragma D binding "1.13" SO_TS_DEFAULT +inline int SO_TS_DEFAULT = SO_TS_REALTIME_MICRO; +#pragma D binding "1.13" SO_TS_CLOCK_MAX +inline int SO_TS_CLOCK_MAX = SO_TS_MONOTONIC; + +#pragma D binding "1.13" AF_UNSPEC +inline int AF_UNSPEC = 0; /* unspecified */ +#pragma D binding "1.13" AF_UNIX +inline int AF_UNIX = 1; /* standardized name for AF_LOCAL */ +#pragma D binding "1.13" AF_LOCAL +inline int AF_LOCAL = AF_UNIX; /* local to host (pipes, portals) */ +#pragma D binding "1.13" AF_INET +inline int AF_INET = 2; /* internetwork: UDP, TCP, etc. */ +#pragma D binding "1.13" AF_IMPLINK +inline int AF_IMPLINK = 3; /* arpanet imp addresses */ +#pragma D binding "1.13" AF_PUP +inline int AF_PUP = 4; /* pup protocols: e.g. BSP */ +#pragma D binding "1.13" AF_CHAOS +inline int AF_CHAOS = 5; /* mit CHAOS protocols */ +#pragma D binding "1.13" AF_NETBIOS +inline int AF_NETBIOS = 6; /* SMB protocols */ +#pragma D binding "1.13" AF_ISO +inline int AF_ISO = 7; /* ISO protocols */ +#pragma D binding "1.13" AF_OSI +inline int AF_OSI = AF_ISO; +#pragma D binding "1.13" AF_ECMA +inline int AF_ECMA = 8; /* European computer manufacturers */ +#pragma D binding "1.13" AF_DATAKIT +inline int AF_DATAKIT = 9; /* datakit protocols */ +#pragma D binding "1.13" AF_CCITT +inline int AF_CCITT = 10; /* CCITT protocols, X.25 etc */ +#pragma D binding "1.13" AF_SNA +inline int AF_SNA = 11; /* IBM SNA */ +#pragma D binding "1.13" AF_DECnet +inline int AF_DECnet = 12; /* DECnet */ +#pragma D binding "1.13" AF_DLI +inline int AF_DLI = 13; /* DEC Direct data link interface */ +#pragma D binding "1.13" AF_LAT +inline int AF_LAT = 14; /* LAT */ +#pragma D binding "1.13" AF_HYLINK +inline int AF_HYLINK = 15; /* NSC Hyperchannel */ +#pragma D binding "1.13" AF_APPLETALK +inline int AF_APPLETALK = 16; /* Apple Talk */ +#pragma D binding "1.13" AF_ROUTE +inline int AF_ROUTE = 17; /* Internal Routing Protocol */ +#pragma D binding "1.13" AF_LINK +inline int AF_LINK = 18; /* Link layer interface */ +#pragma D binding "1.13" pseudo_AF_XTP +inline int pseudo_AF_XTP = 19; /* eXpress Transfer Protocol (no AF) */ +#pragma D binding "1.13" AF_COIP +inline int AF_COIP = 20; /* connection-oriented IP, aka ST II */ +#pragma D binding "1.13" AF_CNT +inline int AF_CNT = 21; /* Computer Network Technology */ +#pragma D binding "1.13" pseudo_AF_RTIP +inline int pseudo_AF_RTIP = 22; /* Help Identify RTIP packets */ +#pragma D binding "1.13" AF_IPX +inline int AF_IPX = 23; /* Novell Internet Protocol */ +#pragma D binding "1.13" AF_SIP +inline int AF_SIP = 24; /* Simple Internet Protocol */ +#pragma D binding "1.13" pseudo_AF_PIP +inline int pseudo_AF_PIP = 25; /* Help Identify PIP packets */ +#pragma D binding "1.13" AF_ISDN +inline int AF_ISDN = 26; /* Integrated Services Digital Network*/ +#pragma D binding "1.13" AF_E164 +inline int AF_E164 = AF_ISDN; /* CCITT E.164 recommendation */ +#pragma D binding "1.13" pseudo_AF_KEY +inline int pseudo_AF_KEY = 27; /* Internal key-management function */ +#pragma D binding "1.13" AF_INET6 +inline int AF_INET6 = 28; /* IPv6 */ +#pragma D binding "1.13" AF_NATM +inline int AF_NATM = 29; /* native ATM access */ +#pragma D binding "1.13" AF_ATM +inline int AF_ATM = 30; /* ATM */ +#pragma D binding "1.13" pseudo_AF_HDRCMPLT +inline int pseudo_AF_HDRCMPLT = 31; /* Used by BPF to not rewrite headers + * in interface output routine + */ +#pragma D binding "1.13" AF_NETGRAPH +inline int AF_NETGRAPH = 32; /* Netgraph sockets */ +#pragma D binding "1.13" AF_SLOW +inline int AF_SLOW = 33; /* 802.3ad slow protocol */ +#pragma D binding "1.13" AF_SCLUSTER +inline int AF_SCLUSTER = 34; /* Sitara cluster protocol */ +#pragma D binding "1.13" AF_ARP +inline int AF_ARP = 35; /* Address Resolution Protocol */ +#pragma D binding "1.13" AF_BLUETOOTH +inline int AF_BLUETOOTH = 36; /* Bluetooth sockets */ +#pragma D binding "1.13" AF_IEEE80211 +inline int AF_IEEE80211 = 37; /* IEEE 802.11 protocol */ +#pragma D binding "1.13" AF_INET_SDP +inline int AF_INET_SDP = 40; /* OFED Socket Direct Protocol ipv4 */ +#pragma D binding "1.13" AF_INET6_SDP +inline int AF_INET6_SDP = 42; /* OFED Socket Direct Protocol ipv6 */ +#pragma D binding "1.13" AF_MAX +inline int AF_MAX = 42; + +/* + * Protocol families, same as address families for now. + */ +#pragma D binding "1.13" PF_UNSPEC +inline int PF_UNSPEC = AF_UNSPEC; +#pragma D binding "1.13" PF_LOCAL +inline int PF_LOCAL = AF_LOCAL; +#pragma D binding "1.13" PF_UNIX +inline int PF_UNIX = PF_LOCAL; /* backward compatibility */ +#pragma D binding "1.13" PF_INET +inline int PF_INET = AF_INET; +#pragma D binding "1.13" PF_IMPLINK +inline int PF_IMPLINK = AF_IMPLINK; +#pragma D binding "1.13" PF_PUP +inline int PF_PUP = AF_PUP; +#pragma D binding "1.13" PF_CHAOS +inline int PF_CHAOS = AF_CHAOS; +#pragma D binding "1.13" PF_NETBIOS +inline int PF_NETBIOS = AF_NETBIOS; +#pragma D binding "1.13" PF_ISO +inline int PF_ISO = AF_ISO; +#pragma D binding "1.13" PF_OSI +inline int PF_OSI = AF_ISO; +#pragma D binding "1.13" PF_ECMA +inline int PF_ECMA = AF_ECMA; +#pragma D binding "1.13" PF_DATAKIT +inline int PF_DATAKIT = AF_DATAKIT; +#pragma D binding "1.13" PF_CCITT +inline int PF_CCITT = AF_CCITT; +#pragma D binding "1.13" PF_SNA +inline int PF_SNA = AF_SNA; +#pragma D binding "1.13" PF_DECnet +inline int PF_DECnet = AF_DECnet; +#pragma D binding "1.13" PF_DLI +inline int PF_DLI = AF_DLI; +#pragma D binding "1.13" PF_LAT +inline int PF_LAT = AF_LAT; +#pragma D binding "1.13" PF_HYLINK +inline int PF_HYLINK = AF_HYLINK; +#pragma D binding "1.13" PF_APPLETALK +inline int PF_APPLETALK = AF_APPLETALK; +#pragma D binding "1.13" PF_ROUTE +inline int PF_ROUTE = AF_ROUTE; +#pragma D binding "1.13" PF_LINK +inline int PF_LINK = AF_LINK; +#pragma D binding "1.13" PF_XTP +inline int PF_XTP = pseudo_AF_XTP; /* really just proto family, no AF */ +#pragma D binding "1.13" PF_COIP +inline int PF_COIP = AF_COIP; +#pragma D binding "1.13" PF_CNT +inline int PF_CNT = AF_CNT; +#pragma D binding "1.13" PF_SIP +inline int PF_SIP = AF_SIP; +#pragma D binding "1.13" PF_IPX +inline int PF_IPX = AF_IPX; +#pragma D binding "1.13" PF_RTIP +inline int PF_RTIP = pseudo_AF_RTIP; /* same format as AF_INET */ +#pragma D binding "1.13" PF_PIP +inline int PF_PIP = pseudo_AF_PIP; +#pragma D binding "1.13" PF_ISDN +inline int PF_ISDN = AF_ISDN; +#pragma D binding "1.13" PF_KEY +inline int PF_KEY = pseudo_AF_KEY; +#pragma D binding "1.13" PF_INET6 +inline int PF_INET6 = AF_INET6; +#pragma D binding "1.13" PF_NATM +inline int PF_NATM = AF_NATM; +#pragma D binding "1.13" PF_ATM +inline int PF_ATM = AF_ATM; +#pragma D binding "1.13" PF_NETGRAPH +inline int PF_NETGRAPH = AF_NETGRAPH; +#pragma D binding "1.13" PF_SLOW +inline int PF_SLOW = AF_SLOW; +#pragma D binding "1.13" PF_SCLUSTER +inline int PF_SCLUSTER = AF_SCLUSTER; +#pragma D binding "1.13" PF_ARP +inline int PF_ARP = AF_ARP; +#pragma D binding "1.13" PF_BLUETOOTH +inline int PF_BLUETOOTH = AF_BLUETOOTH; +#pragma D binding "1.13" PF_IEEE80211 +inline int PF_IEEE80211 = AF_IEEE80211; +#pragma D binding "1.13" PF_INET_SDP +inline int PF_INET_SDP= AF_INET_SDP; +#pragma D binding "1.13" PF_INET6_SDP +inline int PF_INET6_SDP= AF_INET6_SDP; +#pragma D binding "1.13" PF_MAX +inline int PF_MAX = AF_MAX; Modified: projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile ============================================================================== --- projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile Fri Sep 8 22:04:28 2017 (r323335) @@ -22,6 +22,7 @@ ${PACKAGE}FILES= \ err.D_LLQUANT_LOWVAL.d \ err.D_LLQUANT_MAGRANGE.d \ err.D_LLQUANT_MAGTOOBIG.d \ + err.D_LLQUANT_MAGTOOBIG.offbyone.d \ err.D_LLQUANT_NSTEPMATCH.d \ err.D_LLQUANT_NSTEPTYPE.d \ err.D_LLQUANT_NSTEPVAL.d \ Modified: projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc Fri Sep 8 22:04:28 2017 (r323335) @@ -36,6 +36,7 @@ #include #include #include +#include #include @@ -93,6 +94,7 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de pool_state_t poolState; char *poolName; boolean_t b_inuse; + int nlabels; inUse = false; degraded = false; @@ -105,8 +107,16 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de if (poolName != NULL) free(poolName); - if (zpool_read_label(devFd, &devLabel) != 0 - || devLabel == NULL) + nlabels = zpool_read_all_labels(devFd, &devLabel); + /* + * If we find a disk with fewer than the maximum number of + * labels, it might be the whole disk of a partitioned disk + * where ZFS resides on a partition. In that case, we should do + * nothing and wait for the partition to appear. Or, the disk + * might be damaged. In that case, zfsd should do nothing and + * wait for the sysadmin to decide. + */ + if (nlabels != VDEV_LABELS || devLabel == NULL) return (NULL); try { Modified: projects/krb5/contrib/binutils/opcodes/i386-dis.c ============================================================================== --- projects/krb5/contrib/binutils/opcodes/i386-dis.c Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/contrib/binutils/opcodes/i386-dis.c Fri Sep 8 22:04:28 2017 (r323335) @@ -1302,7 +1302,7 @@ static const unsigned char twobyte_uses_REPZ_prefix[25 /* 70 */ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1, /* 7f */ /* 80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 8f */ /* 90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 9f */ - /* a0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* af */ + /* a0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0, /* af */ /* b0 */ 0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0, /* bf */ /* c0 */ 0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, /* cf */ /* d0 */ 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0, /* df */ @@ -1793,10 +1793,10 @@ static const struct dis386 grps[][8] = { }, /* GRP15 */ { - { "fxsave", { Ev } }, - { "fxrstor", { Ev } }, - { "ldmxcsr", { Ev } }, - { "stmxcsr", { Ev } }, + { "fxsave", { { OP_0fae, v_mode } } }, + { "fxrstor", { { OP_0fae, v_mode } } }, + { "ldmxcsr", { { OP_0fae, v_mode } } }, + { "stmxcsr", { { OP_0fae, v_mode } } }, { "xsave", { Ev } }, { "xrstor", { { OP_0fae, v_mode } } }, { "xsaveopt", { { OP_0fae, v_mode } } }, @@ -5997,19 +5997,34 @@ OP_0fae (int bytemode, int sizeflag) { if (modrm.mod == 3) { - if (modrm.reg == 7) - strcpy (obuf + strlen (obuf) - sizeof ("clflush") + 1, "sfence"); - else if (modrm.reg == 6) - strcpy (obuf + strlen (obuf) - sizeof ("xsaveopt") + 1, "mfence"); - else if (modrm.reg == 5) - strcpy (obuf + strlen (obuf) - sizeof ("xrstor") + 1, "lfence"); - - if (modrm.reg < 5 || modrm.rm != 0) + if (modrm.reg >= 5 && modrm.reg <= 7 && modrm.rm == 0) { - BadOp (); /* bad sfence, mfence, or lfence */ + if (modrm.reg == 7) + strcpy (obuf + strlen (obuf) - sizeof ("clflush") + 1, "sfence"); + else if (modrm.reg == 6) + strcpy (obuf + strlen (obuf) - sizeof ("xsaveopt") + 1, "mfence"); + else if (modrm.reg == 5) + strcpy (obuf + strlen (obuf) - sizeof ("xrstor") + 1, "lfence"); + bytemode = 0; + } + else if (modrm.reg <= 3 && (prefixes & PREFIX_REPZ) != 0) + { + if (modrm.reg == 0) + strcpy (obuf + strlen (obuf) - sizeof ("fxsave") + 1, "rdfsbase"); + else if (modrm.reg == 1) + strcpy (obuf + strlen (obuf) - sizeof ("fxrstor") + 1, "rdgsbase"); + else if (modrm.reg == 2) + strcpy (obuf + strlen (obuf) - sizeof ("ldmxcsr") + 1, "wrfsbase"); + else if (modrm.reg == 3) + strcpy (obuf + strlen (obuf) - sizeof ("stmxcsr") + 1, "wrgsbase"); + used_prefixes |= PREFIX_REPZ; + bytemode = dq_mode; + } + else + { + BadOp (); return; } - bytemode = 0; } OP_E (bytemode, sizeflag); Modified: projects/krb5/contrib/binutils/opcodes/i386-opc.h ============================================================================== --- projects/krb5/contrib/binutils/opcodes/i386-opc.h Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/contrib/binutils/opcodes/i386-opc.h Fri Sep 8 22:04:28 2017 (r323335) @@ -81,6 +81,7 @@ typedef struct template #define CpuPCLMUL 0x10000000 /* Carry-less Multiplication extensions */ #define CpuRdRnd 0x20000000 /* Intel Random Number Generator extensions */ #define CpuSMAP 0x40000000 /* Intel Supervisor Mode Access Prevention */ +#define CpuFSGSBase 0x80000000 /* Read/write fs/gs segment base registers */ /* SSE4.1/4.2 Instructions required */ #define CpuSSE4 (CpuSSE4_1|CpuSSE4_2) @@ -89,7 +90,8 @@ typedef struct template #define CpuUnknownFlags (Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 \ |CpuP4|CpuSledgehammer|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuVMX \ |Cpu3dnow|Cpu3dnowA|CpuK6|CpuPadLock|CpuSVME|CpuSSSE3|CpuSSE4_1 \ - |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd|CpuSMAP) + |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd|CpuSMAP \ + |CpuFSGSBase) /* the bits in opcode_modifier are used to generate the final opcode from the base_opcode. These bits also are used to detect alternate forms of Modified: projects/krb5/contrib/binutils/opcodes/i386-opc.tbl ============================================================================== --- projects/krb5/contrib/binutils/opcodes/i386-opc.tbl Fri Sep 8 21:47:05 2017 (r323334) +++ projects/krb5/contrib/binutils/opcodes/i386-opc.tbl Fri Sep 8 22:04:28 2017 (r323335) @@ -1525,3 +1525,13 @@ pclmulhqhqdq, 2, 0x660f3a44, 0x11, CpuPCLMUL, Modrm|Ig // Intel Random Number Generator extensions rdrand, 1, 0x0fc7, 0x6, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 } rdseed, 1, 0x0fc7, 0x7, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 } + +// Intel Supervisor Mode Access Prevention extensions +clac, 0, 0x0f01, 0xca, CpuSMAP, NoSuf|ImmExt, { 0 } +stac, 0, 0x0f01, 0xcb, CpuSMAP, NoSuf|ImmExt, { 0 } + +// Read/write fs/gs segment base registers *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Sep 9 05:42:29 2017 Return-Path: Delivered-To: svn-src-projects@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 0FDD4E04426 for ; Sat, 9 Sep 2017 05:42:29 +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 952C28091D; Sat, 9 Sep 2017 05:42: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 v895gRsj043643; Sat, 9 Sep 2017 05:42:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v895gOE8043613; Sat, 9 Sep 2017 05:42:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201709090542.v895gOE8043613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 9 Sep 2017 05:42:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323344 - in projects/runtime-coverage: . bin/chflags bin/chflags/tests bin/mkdir bin/mkdir/tests bin/ps bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests cddl/compat/opensolaris/misc cdd... X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: . bin/chflags bin/chflags/tests bin/mkdir bin/mkdir/tests bin/ps bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests cddl/compat/opensolaris/misc cddl/contrib/opensolaris/lib... X-SVN-Commit-Revision: 323344 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Sep 2017 05:42:29 -0000 Author: ngie Date: Sat Sep 9 05:42:23 2017 New Revision: 323344 URL: https://svnweb.freebsd.org/changeset/base/323344 Log: MFhead@r323343 Added: projects/runtime-coverage/bin/chflags/tests/ - copied from r323343, head/bin/chflags/tests/ projects/runtime-coverage/bin/mkdir/tests/ - copied from r323343, head/bin/mkdir/tests/ projects/runtime-coverage/bin/rcp/tests/ - copied from r323343, head/bin/rcp/tests/ projects/runtime-coverage/bin/rmdir/tests/ - copied from r323343, head/bin/rmdir/tests/ projects/runtime-coverage/cddl/lib/libdtrace/socket.d - copied unchanged from r323343, head/cddl/lib/libdtrace/socket.d projects/runtime-coverage/share/man/man4/amdsmn.4 - copied unchanged from r323343, head/share/man/man4/amdsmn.4 projects/runtime-coverage/share/man/man4/ntb.4 - copied unchanged from r323343, head/share/man/man4/ntb.4 projects/runtime-coverage/share/man/man4/ntb_hw_intel.4 - copied unchanged from r323343, head/share/man/man4/ntb_hw_intel.4 projects/runtime-coverage/share/man/man4/ntb_hw_plx.4 - copied unchanged from r323343, head/share/man/man4/ntb_hw_plx.4 projects/runtime-coverage/sys/arm/mv/armada38x/armada38x_rtc.c - copied unchanged from r323343, head/sys/arm/mv/armada38x/armada38x_rtc.c projects/runtime-coverage/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c - copied unchanged from r323343, head/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c projects/runtime-coverage/sys/dev/amdsmn/ - copied from r323343, head/sys/dev/amdsmn/ projects/runtime-coverage/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu - copied unchanged from r323343, head/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu projects/runtime-coverage/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu - copied unchanged from r323343, head/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu projects/runtime-coverage/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu - copied unchanged from r323343, head/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_intel.c - copied unchanged from r323343, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_intel.h - copied unchanged from r323343, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.h projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw_plx.c - copied unchanged from r323343, head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c projects/runtime-coverage/sys/modules/amdsmn/ - copied from r323343, head/sys/modules/amdsmn/ projects/runtime-coverage/sys/modules/ntb/ntb_hw_intel/ - copied from r323343, head/sys/modules/ntb/ntb_hw_intel/ projects/runtime-coverage/sys/modules/ntb/ntb_hw_plx/ - copied from r323343, head/sys/modules/ntb/ntb_hw_plx/ projects/runtime-coverage/usr.sbin/efivar/efiutil.c - copied unchanged from r323343, head/usr.sbin/efivar/efiutil.c projects/runtime-coverage/usr.sbin/efivar/efiutil.h - copied unchanged from r323343, head/usr.sbin/efivar/efiutil.h Deleted: projects/runtime-coverage/share/man/man4/ntb_hw.4 projects/runtime-coverage/sys/arm/mv/armada38x/rtc.c projects/runtime-coverage/sys/dev/cxgbe/firmware/t4fw-1.16.45.0.bin.uu projects/runtime-coverage/sys/dev/cxgbe/firmware/t5fw-1.16.45.0.bin.uu projects/runtime-coverage/sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_hw.c projects/runtime-coverage/sys/dev/ntb/ntb_hw/ntb_regs.h projects/runtime-coverage/sys/modules/ntb/ntb_hw/ Modified: projects/runtime-coverage/Makefile.inc1 projects/runtime-coverage/bin/chflags/Makefile projects/runtime-coverage/bin/mkdir/Makefile projects/runtime-coverage/bin/ps/print.c projects/runtime-coverage/bin/ps/ps.1 projects/runtime-coverage/bin/rcp/Makefile projects/runtime-coverage/bin/rmdir/Makefile projects/runtime-coverage/cddl/compat/opensolaris/misc/zmount.c projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c projects/runtime-coverage/cddl/lib/libdtrace/Makefile projects/runtime-coverage/contrib/binutils/opcodes/i386-dis.c projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.h projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.tbl projects/runtime-coverage/contrib/binutils/opcodes/i386-tbl.h projects/runtime-coverage/contrib/file/src/readelf.c projects/runtime-coverage/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h projects/runtime-coverage/contrib/llvm/lib/Analysis/PostDominators.cpp projects/runtime-coverage/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp projects/runtime-coverage/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h projects/runtime-coverage/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/Driver/ToolChains/Clang.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp projects/runtime-coverage/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h projects/runtime-coverage/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp projects/runtime-coverage/contrib/llvm/tools/lldb/source/Host/common/TCPSocket.cpp projects/runtime-coverage/contrib/unbound/validator/autotrust.c projects/runtime-coverage/etc/mtree/BSD.tests.dist projects/runtime-coverage/lib/clang/include/clang/Basic/Version.inc projects/runtime-coverage/lib/clang/include/lld/Config/Version.inc projects/runtime-coverage/lib/clang/include/llvm/Support/VCSRevision.h projects/runtime-coverage/lib/csu/mips/crti.S projects/runtime-coverage/lib/csu/mips/crtn.S projects/runtime-coverage/lib/libc/locale/xlocale_private.h projects/runtime-coverage/lib/libcompiler_rt/Makefile.inc projects/runtime-coverage/lib/libefivar/Makefile projects/runtime-coverage/lib/libefivar/efivar-dp-format.c projects/runtime-coverage/lib/libefivar/efivar-dp-parse.c projects/runtime-coverage/lib/libefivar/efivar-dp.h projects/runtime-coverage/lib/libgeom/geom_util.c projects/runtime-coverage/lib/libpmc/libpmc.c projects/runtime-coverage/lib/libproc/_libproc.h projects/runtime-coverage/lib/libproc/proc_rtld.c projects/runtime-coverage/lib/libproc/proc_sym.c projects/runtime-coverage/lib/libstand/nfs.c projects/runtime-coverage/lib/libsysdecode/Makefile projects/runtime-coverage/lib/libsysdecode/flags.c projects/runtime-coverage/lib/libsysdecode/mktables projects/runtime-coverage/lib/libsysdecode/sysdecode.h projects/runtime-coverage/lib/libsysdecode/sysdecode_enum.3 projects/runtime-coverage/lib/libsysdecode/sysdecode_mask.3 projects/runtime-coverage/lib/msun/src/catrig.c projects/runtime-coverage/lib/msun/src/catrigl.c projects/runtime-coverage/lib/msun/src/s_csqrtl.c projects/runtime-coverage/lib/msun/tests/csqrt_test.c projects/runtime-coverage/libexec/getty/gettytab.5 projects/runtime-coverage/libexec/getty/gettytab.h projects/runtime-coverage/libexec/getty/init.c projects/runtime-coverage/libexec/getty/main.c projects/runtime-coverage/libexec/rtld-elf/Makefile projects/runtime-coverage/libexec/rtld-elf/rtld.1 projects/runtime-coverage/libexec/rtld-elf/rtld.c projects/runtime-coverage/release/amd64/make-memstick.sh projects/runtime-coverage/release/amd64/mkisoimages.sh projects/runtime-coverage/release/i386/make-memstick.sh projects/runtime-coverage/release/i386/mkisoimages.sh projects/runtime-coverage/release/powerpc/make-memstick.sh projects/runtime-coverage/release/powerpc/mkisoimages.sh projects/runtime-coverage/release/sparc64/mkisoimages.sh projects/runtime-coverage/release/tools/ec2.conf projects/runtime-coverage/sbin/fsck_ffs/setup.c projects/runtime-coverage/sbin/geom/class/virstor/geom_virstor.c projects/runtime-coverage/sbin/geom/misc/subr.c projects/runtime-coverage/sbin/mdconfig/mdconfig.8 projects/runtime-coverage/sbin/mdconfig/mdconfig.c projects/runtime-coverage/sbin/newfs/mkfs.c projects/runtime-coverage/sbin/nvmecontrol/identify.c projects/runtime-coverage/share/man/man4/Makefile projects/runtime-coverage/share/man/man4/amdtemp.4 projects/runtime-coverage/share/man/man4/hv_vss.4 projects/runtime-coverage/share/man/man4/if_ntb.4 projects/runtime-coverage/share/man/man4/ntb_transport.4 projects/runtime-coverage/share/man/man4/tty.4 projects/runtime-coverage/share/man/man5/tmpfs.5 projects/runtime-coverage/share/misc/committers-ports.dot projects/runtime-coverage/share/misc/committers-src.dot projects/runtime-coverage/share/misc/pci_vendors projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/sys/amd64/conf/GENERIC projects/runtime-coverage/sys/amd64/conf/NOTES projects/runtime-coverage/sys/amd64/include/param.h projects/runtime-coverage/sys/arm/arm/generic_timer.c projects/runtime-coverage/sys/arm/broadcom/bcm2835/bcm2836_mp.c projects/runtime-coverage/sys/arm/conf/ARMADA38X projects/runtime-coverage/sys/arm/mv/armada38x/files.armada38x projects/runtime-coverage/sys/arm64/arm64/identcpu.c projects/runtime-coverage/sys/arm64/arm64/mp_machdep.c projects/runtime-coverage/sys/arm64/conf/GENERIC projects/runtime-coverage/sys/arm64/include/armreg.h projects/runtime-coverage/sys/arm64/include/cpu.h projects/runtime-coverage/sys/boot/efi/boot1/Makefile projects/runtime-coverage/sys/boot/efi/boot1/boot1.c projects/runtime-coverage/sys/boot/efi/include/efiapi.h projects/runtime-coverage/sys/boot/efi/include/efichar.h projects/runtime-coverage/sys/boot/efi/libefi/Makefile projects/runtime-coverage/sys/boot/efi/libefi/efichar.c projects/runtime-coverage/sys/boot/efi/loader/bootinfo.c projects/runtime-coverage/sys/boot/forth/loader.conf projects/runtime-coverage/sys/cam/ata/ata_da.c projects/runtime-coverage/sys/cam/cam_ccb.h projects/runtime-coverage/sys/cam/cam_xpt.c projects/runtime-coverage/sys/cam/nvme/nvme_all.c projects/runtime-coverage/sys/cam/nvme/nvme_all.h projects/runtime-coverage/sys/cam/nvme/nvme_da.c projects/runtime-coverage/sys/cam/nvme/nvme_xpt.c projects/runtime-coverage/sys/cam/scsi/scsi_all.c projects/runtime-coverage/sys/cam/scsi/scsi_da.c projects/runtime-coverage/sys/cam/scsi/scsi_pass.c projects/runtime-coverage/sys/cddl/compat/opensolaris/sys/mntent.h projects/runtime-coverage/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/runtime-coverage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/runtime-coverage/sys/cddl/dev/dtrace/mips/dtrace_asm.S projects/runtime-coverage/sys/cddl/dev/dtrace/mips/dtrace_subr.c projects/runtime-coverage/sys/cddl/dev/fbt/mips/fbt_isa.c projects/runtime-coverage/sys/compat/cloudabi/cloudabi_fd.c projects/runtime-coverage/sys/compat/cloudabi/cloudabi_file.c projects/runtime-coverage/sys/compat/cloudabi/cloudabi_sock.c projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_proto.h projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscall.h projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_syscalls.c projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_sysent.c projects/runtime-coverage/sys/compat/cloudabi32/cloudabi32_systrace_args.c projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_proto.h projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_syscall.h projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_syscalls.c projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_sysent.c projects/runtime-coverage/sys/compat/cloudabi64/cloudabi64_systrace_args.c projects/runtime-coverage/sys/compat/freebsd32/freebsd32.h projects/runtime-coverage/sys/compat/freebsd32/freebsd32_ioctl.c projects/runtime-coverage/sys/compat/freebsd32/freebsd32_ioctl.h projects/runtime-coverage/sys/compat/freebsd32/freebsd32_misc.c projects/runtime-coverage/sys/conf/files projects/runtime-coverage/sys/conf/files.amd64 projects/runtime-coverage/sys/conf/files.arm64 projects/runtime-coverage/sys/conf/files.i386 projects/runtime-coverage/sys/conf/ldscript.amd64 projects/runtime-coverage/sys/conf/options projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_types_common.h projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_armv6.S projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_i686.S projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S projects/runtime-coverage/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S projects/runtime-coverage/sys/contrib/cloudabi/syscalls32.master projects/runtime-coverage/sys/contrib/cloudabi/syscalls64.master projects/runtime-coverage/sys/contrib/dev/acpica/changes.txt projects/runtime-coverage/sys/contrib/dev/acpica/common/dmtbinfo.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/runtime-coverage/sys/contrib/dev/acpica/compiler/asldebug.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslerror.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslhelp.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslmain.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslmessages.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslmessages.h projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslresource.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslrules.y projects/runtime-coverage/sys/contrib/dev/acpica/compiler/asltree.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/aslutils.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/dtcompile.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/runtime-coverage/sys/contrib/dev/acpica/compiler/dtfield.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/dtparser.y projects/runtime-coverage/sys/contrib/dev/acpica/compiler/dtutils.c projects/runtime-coverage/sys/contrib/dev/acpica/compiler/prparser.y projects/runtime-coverage/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/runtime-coverage/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/runtime-coverage/sys/contrib/dev/acpica/components/dispatcher/dswexec.c projects/runtime-coverage/sys/contrib/dev/acpica/components/events/evgpe.c projects/runtime-coverage/sys/contrib/dev/acpica/components/executer/exconcat.c projects/runtime-coverage/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/runtime-coverage/sys/contrib/dev/acpica/components/executer/exmisc.c projects/runtime-coverage/sys/contrib/dev/acpica/components/executer/exresop.c projects/runtime-coverage/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/runtime-coverage/sys/contrib/dev/acpica/components/hardware/hwregs.c projects/runtime-coverage/sys/contrib/dev/acpica/components/hardware/hwtimer.c projects/runtime-coverage/sys/contrib/dev/acpica/components/hardware/hwxface.c projects/runtime-coverage/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/runtime-coverage/sys/contrib/dev/acpica/components/tables/tbxface.c projects/runtime-coverage/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c projects/runtime-coverage/sys/contrib/dev/acpica/include/acexcep.h projects/runtime-coverage/sys/contrib/dev/acpica/include/achware.h projects/runtime-coverage/sys/contrib/dev/acpica/include/acinterp.h projects/runtime-coverage/sys/contrib/dev/acpica/include/acpixf.h projects/runtime-coverage/sys/contrib/dev/acpica/include/actbl1.h projects/runtime-coverage/sys/contrib/dev/acpica/include/actbl2.h projects/runtime-coverage/sys/contrib/dev/acpica/include/acutils.h projects/runtime-coverage/sys/dev/aac/aac.c projects/runtime-coverage/sys/dev/acpica/acpi_cpu.c projects/runtime-coverage/sys/dev/amdtemp/amdtemp.c projects/runtime-coverage/sys/dev/amr/amr.c projects/runtime-coverage/sys/dev/bhnd/cores/usb/bhnd_usb.c projects/runtime-coverage/sys/dev/bnxt/bnxt.h projects/runtime-coverage/sys/dev/bnxt/bnxt_hwrm.c projects/runtime-coverage/sys/dev/bnxt/bnxt_hwrm.h projects/runtime-coverage/sys/dev/bnxt/bnxt_sysctl.c projects/runtime-coverage/sys/dev/bnxt/bnxt_sysctl.h projects/runtime-coverage/sys/dev/bnxt/hsi_struct_def.h projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c projects/runtime-coverage/sys/dev/cxgbe/adapter.h projects/runtime-coverage/sys/dev/cxgbe/common/t4_hw.c projects/runtime-coverage/sys/dev/cxgbe/firmware/t4fw_interface.h projects/runtime-coverage/sys/dev/cxgbe/firmware/t6fw_cfg.txt projects/runtime-coverage/sys/dev/cxgbe/iw_cxgbe/cm.c projects/runtime-coverage/sys/dev/cxgbe/iw_cxgbe/qp.c projects/runtime-coverage/sys/dev/cxgbe/offload.h projects/runtime-coverage/sys/dev/cxgbe/t4_main.c projects/runtime-coverage/sys/dev/cxgbe/t4_sge.c projects/runtime-coverage/sys/dev/cxgbe/tom/t4_connect.c projects/runtime-coverage/sys/dev/cxgbe/tom/t4_listen.c projects/runtime-coverage/sys/dev/cxgbe/tom/t4_tom.c projects/runtime-coverage/sys/dev/e1000/if_em.c projects/runtime-coverage/sys/dev/hwpmc/hwpmc_core.c projects/runtime-coverage/sys/dev/hwpmc/hwpmc_intel.c projects/runtime-coverage/sys/dev/hwpmc/pmc_events.h projects/runtime-coverage/sys/dev/hyperv/netvsc/hn_rndis.c projects/runtime-coverage/sys/dev/hyperv/netvsc/if_hn.c projects/runtime-coverage/sys/dev/ixgbe/if_ix.c projects/runtime-coverage/sys/dev/md/md.c projects/runtime-coverage/sys/dev/mfi/mfi.c projects/runtime-coverage/sys/dev/mpr/mpr_pci.c projects/runtime-coverage/sys/dev/mpr/mpr_sas.c projects/runtime-coverage/sys/dev/mps/mps_pci.c projects/runtime-coverage/sys/dev/mps/mps_sas.c projects/runtime-coverage/sys/dev/ntb/ntb.c projects/runtime-coverage/sys/dev/ntb/ntb.h projects/runtime-coverage/sys/dev/ntb/ntb_transport.c projects/runtime-coverage/sys/dev/nvme/nvme.c projects/runtime-coverage/sys/dev/nvme/nvme.h projects/runtime-coverage/sys/dev/nvme/nvme_ctrlr.c projects/runtime-coverage/sys/dev/nvme/nvme_private.h projects/runtime-coverage/sys/dev/nvme/nvme_qpair.c projects/runtime-coverage/sys/dev/nvme/nvme_sim.c projects/runtime-coverage/sys/dev/nvme/nvme_sysctl.c projects/runtime-coverage/sys/dev/rtwn/if_rtwn_ridx.h projects/runtime-coverage/sys/dev/rtwn/if_rtwn_rx.c projects/runtime-coverage/sys/dev/rtwn/rtl8188e/r88e_chan.c projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c_chan.c projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c_fw.c projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c_priv.h projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c_rx.c projects/runtime-coverage/sys/dev/rtwn/rtl8192c/r92c_tx.c projects/runtime-coverage/sys/dev/rtwn/rtl8192e/r92e_chan.c projects/runtime-coverage/sys/dev/rtwn/rtl8812a/r12a_chan.c projects/runtime-coverage/sys/dev/rtwn/rtl8812a/r12a_rx.c projects/runtime-coverage/sys/dev/rtwn/rtl8812a/r12a_tx.c projects/runtime-coverage/sys/dev/usb/quirk/usb_quirk.c projects/runtime-coverage/sys/dev/usb/usbdevs projects/runtime-coverage/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c projects/runtime-coverage/sys/fs/msdosfs/msdosfs_fat.c projects/runtime-coverage/sys/geom/eli/g_eli_integrity.c projects/runtime-coverage/sys/geom/part/g_part_gpt.c projects/runtime-coverage/sys/i386/conf/GENERIC projects/runtime-coverage/sys/i386/conf/NOTES projects/runtime-coverage/sys/i386/include/param.h projects/runtime-coverage/sys/kern/kern_dtrace.c projects/runtime-coverage/sys/kern/kern_lockstat.c projects/runtime-coverage/sys/kern/kern_mutex.c projects/runtime-coverage/sys/kern/kern_proc.c projects/runtime-coverage/sys/kern/kern_rwlock.c projects/runtime-coverage/sys/kern/kern_sx.c projects/runtime-coverage/sys/kern/subr_bus_dma.c projects/runtime-coverage/sys/kern/subr_vmem.c projects/runtime-coverage/sys/kern/vfs_bio.c projects/runtime-coverage/sys/kern/vfs_cache.c projects/runtime-coverage/sys/kern/vfs_mountroot.c projects/runtime-coverage/sys/kern/vfs_subr.c projects/runtime-coverage/sys/mips/atheros/if_arge.c projects/runtime-coverage/sys/mips/cavium/octeon_ebt3000_cf.c projects/runtime-coverage/sys/mips/conf/ERL projects/runtime-coverage/sys/mips/mips/elf_machdep.c projects/runtime-coverage/sys/mips/mips/freebsd32_machdep.c projects/runtime-coverage/sys/mips/mips/pm_machdep.c projects/runtime-coverage/sys/mips/rmi/xls_ehci.c projects/runtime-coverage/sys/modules/Makefile projects/runtime-coverage/sys/modules/cxgbe/t4_firmware/Makefile projects/runtime-coverage/sys/modules/cxgbe/t5_firmware/Makefile projects/runtime-coverage/sys/modules/cxgbe/t6_firmware/Makefile projects/runtime-coverage/sys/modules/dtrace/Makefile projects/runtime-coverage/sys/modules/dtrace/dtraceall/Makefile projects/runtime-coverage/sys/modules/dtrace/dtraceall/dtraceall.c projects/runtime-coverage/sys/modules/ntb/Makefile projects/runtime-coverage/sys/modules/nvme/Makefile projects/runtime-coverage/sys/net/ieee8023ad_lacp.c projects/runtime-coverage/sys/net/if.c projects/runtime-coverage/sys/net/if.h projects/runtime-coverage/sys/net/if_var.h projects/runtime-coverage/sys/net/iflib.c projects/runtime-coverage/sys/netinet/in_pcb.c projects/runtime-coverage/sys/netinet/in_pcb.h projects/runtime-coverage/sys/netinet/tcp_timer.c projects/runtime-coverage/sys/netipsec/udpencap.c projects/runtime-coverage/sys/ofed/drivers/infiniband/core/cma.c projects/runtime-coverage/sys/powerpc/conf/GENERIC projects/runtime-coverage/sys/powerpc/include/spr.h projects/runtime-coverage/sys/powerpc/mpc85xx/mpc85xx.c projects/runtime-coverage/sys/riscv/conf/GENERIC projects/runtime-coverage/sys/security/audit/audit.c projects/runtime-coverage/sys/sparc64/conf/GENERIC projects/runtime-coverage/sys/sys/cdefs.h projects/runtime-coverage/sys/sys/mdioctl.h projects/runtime-coverage/sys/sys/param.h projects/runtime-coverage/sys/sys/sockio.h projects/runtime-coverage/sys/sys/systm.h projects/runtime-coverage/sys/ufs/ffs/fs.h projects/runtime-coverage/sys/vm/swap_pager.c projects/runtime-coverage/sys/vm/swap_pager.h projects/runtime-coverage/sys/vm/uma_core.c projects/runtime-coverage/sys/vm/vm_fault.c projects/runtime-coverage/sys/vm/vm_page.c projects/runtime-coverage/sys/vm/vm_pageout.c projects/runtime-coverage/sys/vm/vm_pager.c projects/runtime-coverage/sys/vm/vm_phys.c projects/runtime-coverage/sys/vm/vm_phys.h projects/runtime-coverage/sys/x86/acpica/srat.c projects/runtime-coverage/sys/x86/cpufreq/hwpstate.c projects/runtime-coverage/sys/x86/include/apicreg.h projects/runtime-coverage/sys/x86/include/apicvar.h projects/runtime-coverage/sys/x86/include/specialreg.h projects/runtime-coverage/sys/x86/include/x86_var.h projects/runtime-coverage/sys/x86/iommu/intel_drv.c projects/runtime-coverage/sys/x86/pci/qpi.c projects/runtime-coverage/sys/x86/x86/identcpu.c projects/runtime-coverage/sys/x86/x86/io_apic.c projects/runtime-coverage/sys/x86/x86/mca.c projects/runtime-coverage/tools/tools/nanobsd/embedded/common projects/runtime-coverage/usr.bin/calendar/calendars/calendar.freebsd projects/runtime-coverage/usr.bin/calendar/calendars/calendar.holiday projects/runtime-coverage/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte projects/runtime-coverage/usr.bin/kdump/kdump.c projects/runtime-coverage/usr.bin/netstat/main.c projects/runtime-coverage/usr.bin/tail/extern.h projects/runtime-coverage/usr.bin/tail/tests/tail_test.sh projects/runtime-coverage/usr.bin/truss/extern.h projects/runtime-coverage/usr.bin/truss/setup.c projects/runtime-coverage/usr.bin/truss/syscall.h projects/runtime-coverage/usr.bin/truss/syscalls.c projects/runtime-coverage/usr.sbin/acpi/acpidb/Makefile projects/runtime-coverage/usr.sbin/acpi/acpidump/acpi.c projects/runtime-coverage/usr.sbin/acpi/iasl/Makefile projects/runtime-coverage/usr.sbin/autofs/auto_master.5 projects/runtime-coverage/usr.sbin/binmiscctl/binmiscctl.8 projects/runtime-coverage/usr.sbin/crunch/crunchgen/crunched_main.c projects/runtime-coverage/usr.sbin/crunch/crunchgen/crunchgen.c projects/runtime-coverage/usr.sbin/efivar/Makefile projects/runtime-coverage/usr.sbin/efivar/efivar.8 projects/runtime-coverage/usr.sbin/efivar/efivar.c projects/runtime-coverage/usr.sbin/manctl/manctl.8 projects/runtime-coverage/usr.sbin/manctl/manctl.sh Directory Properties: projects/runtime-coverage/ (props changed) projects/runtime-coverage/cddl/ (props changed) projects/runtime-coverage/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage/contrib/binutils/ (props changed) projects/runtime-coverage/contrib/compiler-rt/ (props changed) projects/runtime-coverage/contrib/file/ (props changed) projects/runtime-coverage/contrib/libc++/ (props changed) projects/runtime-coverage/contrib/llvm/ (props changed) projects/runtime-coverage/contrib/llvm/tools/clang/ (props changed) projects/runtime-coverage/contrib/llvm/tools/lld/ (props changed) projects/runtime-coverage/contrib/llvm/tools/lldb/ (props changed) projects/runtime-coverage/contrib/unbound/ (props changed) projects/runtime-coverage/sys/cddl/contrib/opensolaris/ (props changed) projects/runtime-coverage/sys/contrib/dev/acpica/ (props changed) Modified: projects/runtime-coverage/Makefile.inc1 ============================================================================== --- projects/runtime-coverage/Makefile.inc1 Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/Makefile.inc1 Sat Sep 9 05:42:23 2017 (r323344) @@ -1787,7 +1787,8 @@ update: .PHONY # ELF Tool Chain libraries are needed for ELF tools and dtrace tools. # r296685 fix cross-endian objcopy -.if ${BOOTSTRAPPING} < 1100102 +# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2. +.if ${BOOTSTRAPPING} < 1200020 _elftoolchain_libs= lib/libelf lib/libdwarf .endif Modified: projects/runtime-coverage/bin/chflags/Makefile ============================================================================== --- projects/runtime-coverage/bin/chflags/Makefile Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/bin/chflags/Makefile Sat Sep 9 05:42:23 2017 (r323344) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= chflags +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/runtime-coverage/bin/mkdir/Makefile ============================================================================== --- projects/runtime-coverage/bin/mkdir/Makefile Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/bin/mkdir/Makefile Sat Sep 9 05:42:23 2017 (r323344) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= mkdir +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/runtime-coverage/bin/ps/print.c ============================================================================== --- projects/runtime-coverage/bin/ps/print.c Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/bin/ps/print.c Sat Sep 9 05:42:23 2017 (r323344) @@ -262,9 +262,9 @@ state(KINFO *k, VARENT *ve __unused) cp++; if (!(flag & P_INMEM)) *cp++ = 'W'; - if (k->ki_p->ki_nice < NZERO) + if (k->ki_p->ki_nice < NZERO || k->ki_p->ki_pri.pri_class == PRI_REALTIME) *cp++ = '<'; - else if (k->ki_p->ki_nice > NZERO) + else if (k->ki_p->ki_nice > NZERO || k->ki_p->ki_pri.pri_class == PRI_IDLE) *cp++ = 'N'; if (flag & P_TRACED) *cp++ = 'X'; @@ -274,6 +274,8 @@ state(KINFO *k, VARENT *ve __unused) *cp++ = 'V'; if ((flag & P_SYSTEM) || k->ki_p->ki_lock > 0) *cp++ = 'L'; + if ((k->ki_p->ki_cr_flags & CRED_FLAG_CAPMODE) != 0) + *cp++ = 'C'; if (k->ki_p->ki_kiflag & KI_SLEADER) *cp++ = 's'; if ((flag & P_CONTROLT) && k->ki_p->ki_pgid == k->ki_p->ki_tpgid) Modified: projects/runtime-coverage/bin/ps/ps.1 ============================================================================== --- projects/runtime-coverage/bin/ps/ps.1 Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/bin/ps/ps.1 Sat Sep 9 05:42:23 2017 (r323344) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd July 25, 2017 +.Dd September 7, 2017 .Dt PS 1 .Os .Sh NAME @@ -436,6 +436,10 @@ information: The process is in the foreground process group of its control terminal. .It Li < The process has raised CPU scheduling priority. +.It Li C +The process is in +.Xr capsicum 4 +capability mode. .It Li E The process is trying to exit. .It Li J @@ -541,7 +545,7 @@ short-term CPU usage factor (for scheduling) .It Cm dsiz data size (in Kbytes) .It Cm emul -system-call emulation environment +system-call emulation environment (ABI) .It Cm etime elapsed running time, format .Op days- Ns Modified: projects/runtime-coverage/bin/rcp/Makefile ============================================================================== --- projects/runtime-coverage/bin/rcp/Makefile Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/bin/rcp/Makefile Sat Sep 9 05:42:23 2017 (r323344) @@ -11,4 +11,7 @@ PACKAGE=rcmds BINOWN= root BINMODE=4555 +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/runtime-coverage/bin/rmdir/Makefile ============================================================================== --- projects/runtime-coverage/bin/rmdir/Makefile Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/bin/rmdir/Makefile Sat Sep 9 05:42:23 2017 (r323344) @@ -4,4 +4,7 @@ PACKAGE=runtime PROG= rmdir +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include Modified: projects/runtime-coverage/cddl/compat/opensolaris/misc/zmount.c ============================================================================== --- projects/runtime-coverage/cddl/compat/opensolaris/misc/zmount.c Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/cddl/compat/opensolaris/misc/zmount.c Sat Sep 9 05:42:23 2017 (r323344) @@ -74,7 +74,7 @@ zmount(const char *spec, const char *dir, int mflag, c char *dataptr, int datalen, char *optptr, int optlen) { struct iovec *iov; - char *optstr, *os, *p; + char *optstr, *os, *p, *tofree; int iovlen, rv; assert(spec != NULL); @@ -87,7 +87,7 @@ zmount(const char *spec, const char *dir, int mflag, c assert(optptr != NULL); assert(optlen > 0); - optstr = strdup(optptr); + tofree = optstr = strdup(optptr); assert(optstr != NULL); iov = NULL; @@ -98,11 +98,9 @@ zmount(const char *spec, const char *dir, int mflag, c build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir), (size_t)-1); build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1); - for (p = optstr; p != NULL; strsep(&p, ",/ ")) { - if (*p != '\0') - build_iovec(&iov, &iovlen, p, NULL, (size_t)-1); - } + while ((p = strsep(&optstr, ",/")) != NULL) + build_iovec(&iov, &iovlen, p, NULL, (size_t)-1); rv = nmount(iov, iovlen, 0); - free(optstr); + free(tofree); return (rv); } Modified: projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Sat Sep 9 05:42:23 2017 (r323344) @@ -963,7 +963,7 @@ dt_provmod_open(dt_provmod_t **provmod, dt_fdlist_t *d (void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1); - if ((fd = open(path, O_RDONLY)) == -1) + if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) continue; /* failed to open driver; just skip it */ if (((prov = malloc(sizeof (dt_provmod_t))) == NULL) || @@ -1100,7 +1100,7 @@ dt_vopen(int version, int flags, int *errp, */ dt_provmod_open(&provmod, &df); - dtfd = open("/dev/dtrace/dtrace", O_RDWR); + dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC); err = errno; /* save errno from opening dtfd */ #if defined(__FreeBSD__) /* @@ -1116,7 +1116,7 @@ dt_vopen(int version, int flags, int *errp, #ifdef illumos ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR); #else - ftfd = open("/dev/dtrace/fasttrap", O_RDWR); + ftfd = open("/dev/dtrace/fasttrap", O_RDWR | O_CLOEXEC); #endif fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */ @@ -1145,9 +1145,6 @@ dt_vopen(int version, int flags, int *errp, } return (set_open_errno(dtp, errp, err)); } - - (void) fcntl(dtfd, F_SETFD, FD_CLOEXEC); - (void) fcntl(ftfd, F_SETFD, FD_CLOEXEC); alloc: if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL) { Modified: projects/runtime-coverage/cddl/lib/libdtrace/Makefile ============================================================================== --- projects/runtime-coverage/cddl/lib/libdtrace/Makefile Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/cddl/lib/libdtrace/Makefile Sat Sep 9 05:42:23 2017 (r323344) @@ -54,6 +54,7 @@ DSRCS= errno.d \ siftr.d \ signal.d \ tcp.d \ + socket.d \ udp.d \ unistd.d Copied: projects/runtime-coverage/cddl/lib/libdtrace/socket.d (from r323343, head/cddl/lib/libdtrace/socket.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/runtime-coverage/cddl/lib/libdtrace/socket.d Sat Sep 9 05:42:23 2017 (r323344, copy of r323343, head/cddl/lib/libdtrace/socket.d) @@ -0,0 +1,301 @@ +/* + * Copyright (c) 2017 George V. Neville-Neil + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + * + * Translators and flags for the socket structure. FreeBSD specific code. + */ + +#pragma D depends_on module kernel + +/* + * Option flags per-socket. + */ +#pragma D binding "1.13" SO_DEBUG +inline int SO_DEBUG = 0x0001; /* turn on debugging info recording */ +#pragma D binding "1.13" SO_ACCEPTCONN +inline int SO_ACCEPTCONN = 0x0002; /* socket has had listen() */ +#pragma D binding "1.13" SO_REUSEADDR +inline int SO_REUSEADDR = 0x0004; /* allow local address reuse */ +#pragma D binding "1.13" SO_KEEPALIVE +inline int SO_KEEPALIVE = 0x0008; /* keep connections alive */ +#pragma D binding "1.13" SO_DONTROUTE +inline int SO_DONTROUTE = 0x0010; /* just use interface addresses */ +#pragma D binding "1.13" SO_BROADCAST +inline int SO_BROADCAST = 0x0020; /* permit sending of broadcast msgs */ +#pragma D binding "1.13" SO_USELOOPBACK +inline int SO_USELOOPBACK = 0x0040; /* bypass hardware when possible */ +#pragma D binding "1.13" SO_LINGER +inline int SO_LINGER = 0x0080; /* linger on close if data present */ +#pragma D binding "1.13" SO_OOBINLINE +inline int SO_OOBINLINE = 0x0100; /* leave received OOB data in line */ +#pragma D binding "1.13" SO_REUSEPORT +inline int SO_REUSEPORT = 0x0200; /* allow local address & port reuse */ +#pragma D binding "1.13" SO_TIMESTAMP +inline int SO_TIMESTAMP = 0x0400; /* timestamp received dgram traffic */ +#pragma D binding "1.13" SO_NOSIGPIPE +inline int SO_NOSIGPIPE = 0x0800; /* no SIGPIPE from EPIPE */ +#pragma D binding "1.13" SO_ACCEPTFILTER +inline int SO_ACCEPTFILTER = 0x1000; /* there is an accept filter */ +#pragma D binding "1.13" SO_BINTIME +inline int SO_BINTIME = 0x2000; /* timestamp received dgram traffic */ +#pragma D binding "1.13" SO_NO_OFFLOAD +inline int SO_NO_OFFLOAD = 0x4000; /* socket cannot be offloaded */ +#pragma D binding "1.13" SO_NO_DDP +inline int SO_NO_DDP = 0x8000; /* disable direct data placement */ + +/* + * Additional options, not kept in so_options. + */ +#pragma D binding "1.13" SO_SNDBUF +inline int SO_SNDBUF = 0x1001; /* send buffer size */ +#pragma D binding "1.13" SO_RCVBUF +inline int SO_RCVBUF = 0x1002; /* receive buffer size */ +#pragma D binding "1.13" SO_SNDLOWAT +inline int SO_SNDLOWAT = 0x1003; /* send low-water mark */ +#pragma D binding "1.13" SO_RCVLOWAT +inline int SO_RCVLOWAT = 0x1004; /* receive low-water mark */ +#pragma D binding "1.13" SO_SNDTIMEO +inline int SO_SNDTIMEO = 0x1005; /* send timeout */ +#pragma D binding "1.13" SO_RCVTIMEO +inline int SO_RCVTIMEO = 0x1006; /* receive timeout */ +#pragma D binding "1.13" SO_ERROR +inline int SO_ERROR = 0x1007; /* get error status and clear */ +#pragma D binding "1.13" SO_TYPE +inline int SO_TYPE = 0x1008; /* get socket type */ +#pragma D binding "1.13" SO_LABEL +inline int SO_LABEL = 0x1009; /* socket's MAC label */ +#pragma D binding "1.13" SO_PEERLABEL +inline int SO_PEERLABEL = 0x1010; /* socket's peer's MAC label */ +#pragma D binding "1.13" SO_LISTENQLIMIT +inline int SO_LISTENQLIMIT = 0x1011; /* socket's backlog limit */ +#pragma D binding "1.13" SO_LISTENQLEN +inline int SO_LISTENQLEN = 0x1012; /* socket's complete queue length */ +#pragma D binding "1.13" SO_LISTENINCQLEN +inline int SO_LISTENINCQLEN = 0x1013; /* socket's incomplete queue length */ +#pragma D binding "1.13" SO_SETFIB +inline int SO_SETFIB = 0x1014; /* use this FIB to route */ +#pragma D binding "1.13" SO_USER_COOKIE +inline int SO_USER_COOKIE = 0x1015; /* user cookie (dummynet etc.) */ +#pragma D binding "1.13" SO_PROTOCOL +inline int SO_PROTOCOL = 0x1016; /* get socket protocol (Linux name) */ +#pragma D binding "1.13" SO_PROTOTYPE +inline int SO_PROTOTYPE = SO_PROTOCOL; /* alias for SO_PROTOCOL (SunOS name) */ +#pragma D binding "1.13" SO_TS_CLOCK +inline int SO_TS_CLOCK = 0x1017; /* clock type used for SO_TIMESTAMP */ +#pragma D binding "1.13" SO_MAX_PACING_RATE +inline int SO_MAX_PACING_RATE = 0x1018; /* socket's max TX pacing rate (Linux name) */ + +#pragma D binding "1.13" SO_TS_REALTIME_MICRO +inline int SO_TS_REALTIME_MICRO = 0; /* microsecond resolution, realtime */ +#pragma D binding "1.13" SO_TS_BINTIME +inline int SO_TS_BINTIME = 1; /* sub-nanosecond resolution, realtime */ +#pragma D binding "1.13" SO_TS_REALTIME +inline int SO_TS_REALTIME = 2; /* nanosecond resolution, realtime */ +#pragma D binding "1.13" SO_TS_MONOTONIC +inline int SO_TS_MONOTONIC = 3; /* nanosecond resolution, monotonic */ +#pragma D binding "1.13" SO_TS_DEFAULT +inline int SO_TS_DEFAULT = SO_TS_REALTIME_MICRO; +#pragma D binding "1.13" SO_TS_CLOCK_MAX +inline int SO_TS_CLOCK_MAX = SO_TS_MONOTONIC; + +#pragma D binding "1.13" AF_UNSPEC +inline int AF_UNSPEC = 0; /* unspecified */ +#pragma D binding "1.13" AF_UNIX +inline int AF_UNIX = 1; /* standardized name for AF_LOCAL */ +#pragma D binding "1.13" AF_LOCAL +inline int AF_LOCAL = AF_UNIX; /* local to host (pipes, portals) */ +#pragma D binding "1.13" AF_INET +inline int AF_INET = 2; /* internetwork: UDP, TCP, etc. */ +#pragma D binding "1.13" AF_IMPLINK +inline int AF_IMPLINK = 3; /* arpanet imp addresses */ +#pragma D binding "1.13" AF_PUP +inline int AF_PUP = 4; /* pup protocols: e.g. BSP */ +#pragma D binding "1.13" AF_CHAOS +inline int AF_CHAOS = 5; /* mit CHAOS protocols */ +#pragma D binding "1.13" AF_NETBIOS +inline int AF_NETBIOS = 6; /* SMB protocols */ +#pragma D binding "1.13" AF_ISO +inline int AF_ISO = 7; /* ISO protocols */ +#pragma D binding "1.13" AF_OSI +inline int AF_OSI = AF_ISO; +#pragma D binding "1.13" AF_ECMA +inline int AF_ECMA = 8; /* European computer manufacturers */ +#pragma D binding "1.13" AF_DATAKIT +inline int AF_DATAKIT = 9; /* datakit protocols */ +#pragma D binding "1.13" AF_CCITT +inline int AF_CCITT = 10; /* CCITT protocols, X.25 etc */ +#pragma D binding "1.13" AF_SNA +inline int AF_SNA = 11; /* IBM SNA */ +#pragma D binding "1.13" AF_DECnet +inline int AF_DECnet = 12; /* DECnet */ +#pragma D binding "1.13" AF_DLI +inline int AF_DLI = 13; /* DEC Direct data link interface */ +#pragma D binding "1.13" AF_LAT +inline int AF_LAT = 14; /* LAT */ +#pragma D binding "1.13" AF_HYLINK +inline int AF_HYLINK = 15; /* NSC Hyperchannel */ +#pragma D binding "1.13" AF_APPLETALK +inline int AF_APPLETALK = 16; /* Apple Talk */ +#pragma D binding "1.13" AF_ROUTE +inline int AF_ROUTE = 17; /* Internal Routing Protocol */ +#pragma D binding "1.13" AF_LINK +inline int AF_LINK = 18; /* Link layer interface */ +#pragma D binding "1.13" pseudo_AF_XTP +inline int pseudo_AF_XTP = 19; /* eXpress Transfer Protocol (no AF) */ +#pragma D binding "1.13" AF_COIP +inline int AF_COIP = 20; /* connection-oriented IP, aka ST II */ +#pragma D binding "1.13" AF_CNT +inline int AF_CNT = 21; /* Computer Network Technology */ +#pragma D binding "1.13" pseudo_AF_RTIP +inline int pseudo_AF_RTIP = 22; /* Help Identify RTIP packets */ +#pragma D binding "1.13" AF_IPX +inline int AF_IPX = 23; /* Novell Internet Protocol */ +#pragma D binding "1.13" AF_SIP +inline int AF_SIP = 24; /* Simple Internet Protocol */ +#pragma D binding "1.13" pseudo_AF_PIP +inline int pseudo_AF_PIP = 25; /* Help Identify PIP packets */ +#pragma D binding "1.13" AF_ISDN +inline int AF_ISDN = 26; /* Integrated Services Digital Network*/ +#pragma D binding "1.13" AF_E164 +inline int AF_E164 = AF_ISDN; /* CCITT E.164 recommendation */ +#pragma D binding "1.13" pseudo_AF_KEY +inline int pseudo_AF_KEY = 27; /* Internal key-management function */ +#pragma D binding "1.13" AF_INET6 +inline int AF_INET6 = 28; /* IPv6 */ +#pragma D binding "1.13" AF_NATM +inline int AF_NATM = 29; /* native ATM access */ +#pragma D binding "1.13" AF_ATM +inline int AF_ATM = 30; /* ATM */ +#pragma D binding "1.13" pseudo_AF_HDRCMPLT +inline int pseudo_AF_HDRCMPLT = 31; /* Used by BPF to not rewrite headers + * in interface output routine + */ +#pragma D binding "1.13" AF_NETGRAPH +inline int AF_NETGRAPH = 32; /* Netgraph sockets */ +#pragma D binding "1.13" AF_SLOW +inline int AF_SLOW = 33; /* 802.3ad slow protocol */ +#pragma D binding "1.13" AF_SCLUSTER +inline int AF_SCLUSTER = 34; /* Sitara cluster protocol */ +#pragma D binding "1.13" AF_ARP +inline int AF_ARP = 35; /* Address Resolution Protocol */ +#pragma D binding "1.13" AF_BLUETOOTH +inline int AF_BLUETOOTH = 36; /* Bluetooth sockets */ +#pragma D binding "1.13" AF_IEEE80211 +inline int AF_IEEE80211 = 37; /* IEEE 802.11 protocol */ +#pragma D binding "1.13" AF_INET_SDP +inline int AF_INET_SDP = 40; /* OFED Socket Direct Protocol ipv4 */ +#pragma D binding "1.13" AF_INET6_SDP +inline int AF_INET6_SDP = 42; /* OFED Socket Direct Protocol ipv6 */ +#pragma D binding "1.13" AF_MAX +inline int AF_MAX = 42; + +/* + * Protocol families, same as address families for now. + */ +#pragma D binding "1.13" PF_UNSPEC +inline int PF_UNSPEC = AF_UNSPEC; +#pragma D binding "1.13" PF_LOCAL +inline int PF_LOCAL = AF_LOCAL; +#pragma D binding "1.13" PF_UNIX +inline int PF_UNIX = PF_LOCAL; /* backward compatibility */ +#pragma D binding "1.13" PF_INET +inline int PF_INET = AF_INET; +#pragma D binding "1.13" PF_IMPLINK +inline int PF_IMPLINK = AF_IMPLINK; +#pragma D binding "1.13" PF_PUP +inline int PF_PUP = AF_PUP; +#pragma D binding "1.13" PF_CHAOS +inline int PF_CHAOS = AF_CHAOS; +#pragma D binding "1.13" PF_NETBIOS +inline int PF_NETBIOS = AF_NETBIOS; +#pragma D binding "1.13" PF_ISO +inline int PF_ISO = AF_ISO; +#pragma D binding "1.13" PF_OSI +inline int PF_OSI = AF_ISO; +#pragma D binding "1.13" PF_ECMA +inline int PF_ECMA = AF_ECMA; +#pragma D binding "1.13" PF_DATAKIT +inline int PF_DATAKIT = AF_DATAKIT; +#pragma D binding "1.13" PF_CCITT +inline int PF_CCITT = AF_CCITT; +#pragma D binding "1.13" PF_SNA +inline int PF_SNA = AF_SNA; +#pragma D binding "1.13" PF_DECnet +inline int PF_DECnet = AF_DECnet; +#pragma D binding "1.13" PF_DLI +inline int PF_DLI = AF_DLI; +#pragma D binding "1.13" PF_LAT +inline int PF_LAT = AF_LAT; +#pragma D binding "1.13" PF_HYLINK +inline int PF_HYLINK = AF_HYLINK; +#pragma D binding "1.13" PF_APPLETALK +inline int PF_APPLETALK = AF_APPLETALK; +#pragma D binding "1.13" PF_ROUTE +inline int PF_ROUTE = AF_ROUTE; +#pragma D binding "1.13" PF_LINK +inline int PF_LINK = AF_LINK; +#pragma D binding "1.13" PF_XTP +inline int PF_XTP = pseudo_AF_XTP; /* really just proto family, no AF */ +#pragma D binding "1.13" PF_COIP +inline int PF_COIP = AF_COIP; +#pragma D binding "1.13" PF_CNT +inline int PF_CNT = AF_CNT; +#pragma D binding "1.13" PF_SIP +inline int PF_SIP = AF_SIP; +#pragma D binding "1.13" PF_IPX +inline int PF_IPX = AF_IPX; +#pragma D binding "1.13" PF_RTIP +inline int PF_RTIP = pseudo_AF_RTIP; /* same format as AF_INET */ +#pragma D binding "1.13" PF_PIP +inline int PF_PIP = pseudo_AF_PIP; +#pragma D binding "1.13" PF_ISDN +inline int PF_ISDN = AF_ISDN; +#pragma D binding "1.13" PF_KEY +inline int PF_KEY = pseudo_AF_KEY; +#pragma D binding "1.13" PF_INET6 +inline int PF_INET6 = AF_INET6; +#pragma D binding "1.13" PF_NATM +inline int PF_NATM = AF_NATM; +#pragma D binding "1.13" PF_ATM +inline int PF_ATM = AF_ATM; +#pragma D binding "1.13" PF_NETGRAPH +inline int PF_NETGRAPH = AF_NETGRAPH; +#pragma D binding "1.13" PF_SLOW +inline int PF_SLOW = AF_SLOW; +#pragma D binding "1.13" PF_SCLUSTER +inline int PF_SCLUSTER = AF_SCLUSTER; +#pragma D binding "1.13" PF_ARP +inline int PF_ARP = AF_ARP; +#pragma D binding "1.13" PF_BLUETOOTH +inline int PF_BLUETOOTH = AF_BLUETOOTH; +#pragma D binding "1.13" PF_IEEE80211 +inline int PF_IEEE80211 = AF_IEEE80211; +#pragma D binding "1.13" PF_INET_SDP +inline int PF_INET_SDP= AF_INET_SDP; +#pragma D binding "1.13" PF_INET6_SDP +inline int PF_INET6_SDP= AF_INET6_SDP; +#pragma D binding "1.13" PF_MAX +inline int PF_MAX = AF_MAX; Modified: projects/runtime-coverage/contrib/binutils/opcodes/i386-dis.c ============================================================================== --- projects/runtime-coverage/contrib/binutils/opcodes/i386-dis.c Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/binutils/opcodes/i386-dis.c Sat Sep 9 05:42:23 2017 (r323344) @@ -1302,7 +1302,7 @@ static const unsigned char twobyte_uses_REPZ_prefix[25 /* 70 */ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1, /* 7f */ /* 80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 8f */ /* 90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 9f */ - /* a0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* af */ + /* a0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0, /* af */ /* b0 */ 0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0, /* bf */ /* c0 */ 0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, /* cf */ /* d0 */ 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0, /* df */ @@ -1793,10 +1793,10 @@ static const struct dis386 grps[][8] = { }, /* GRP15 */ { - { "fxsave", { Ev } }, - { "fxrstor", { Ev } }, - { "ldmxcsr", { Ev } }, - { "stmxcsr", { Ev } }, + { "fxsave", { { OP_0fae, v_mode } } }, + { "fxrstor", { { OP_0fae, v_mode } } }, + { "ldmxcsr", { { OP_0fae, v_mode } } }, + { "stmxcsr", { { OP_0fae, v_mode } } }, { "xsave", { Ev } }, { "xrstor", { { OP_0fae, v_mode } } }, { "xsaveopt", { { OP_0fae, v_mode } } }, @@ -5997,19 +5997,34 @@ OP_0fae (int bytemode, int sizeflag) { if (modrm.mod == 3) { - if (modrm.reg == 7) - strcpy (obuf + strlen (obuf) - sizeof ("clflush") + 1, "sfence"); - else if (modrm.reg == 6) - strcpy (obuf + strlen (obuf) - sizeof ("xsaveopt") + 1, "mfence"); - else if (modrm.reg == 5) - strcpy (obuf + strlen (obuf) - sizeof ("xrstor") + 1, "lfence"); - - if (modrm.reg < 5 || modrm.rm != 0) + if (modrm.reg >= 5 && modrm.reg <= 7 && modrm.rm == 0) { - BadOp (); /* bad sfence, mfence, or lfence */ + if (modrm.reg == 7) + strcpy (obuf + strlen (obuf) - sizeof ("clflush") + 1, "sfence"); + else if (modrm.reg == 6) + strcpy (obuf + strlen (obuf) - sizeof ("xsaveopt") + 1, "mfence"); + else if (modrm.reg == 5) + strcpy (obuf + strlen (obuf) - sizeof ("xrstor") + 1, "lfence"); + bytemode = 0; + } + else if (modrm.reg <= 3 && (prefixes & PREFIX_REPZ) != 0) + { + if (modrm.reg == 0) + strcpy (obuf + strlen (obuf) - sizeof ("fxsave") + 1, "rdfsbase"); + else if (modrm.reg == 1) + strcpy (obuf + strlen (obuf) - sizeof ("fxrstor") + 1, "rdgsbase"); + else if (modrm.reg == 2) + strcpy (obuf + strlen (obuf) - sizeof ("ldmxcsr") + 1, "wrfsbase"); + else if (modrm.reg == 3) + strcpy (obuf + strlen (obuf) - sizeof ("stmxcsr") + 1, "wrgsbase"); + used_prefixes |= PREFIX_REPZ; + bytemode = dq_mode; + } + else + { + BadOp (); return; } - bytemode = 0; } OP_E (bytemode, sizeflag); Modified: projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.h ============================================================================== --- projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.h Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.h Sat Sep 9 05:42:23 2017 (r323344) @@ -81,6 +81,7 @@ typedef struct template #define CpuPCLMUL 0x10000000 /* Carry-less Multiplication extensions */ #define CpuRdRnd 0x20000000 /* Intel Random Number Generator extensions */ #define CpuSMAP 0x40000000 /* Intel Supervisor Mode Access Prevention */ +#define CpuFSGSBase 0x80000000 /* Read/write fs/gs segment base registers */ /* SSE4.1/4.2 Instructions required */ #define CpuSSE4 (CpuSSE4_1|CpuSSE4_2) @@ -89,7 +90,8 @@ typedef struct template #define CpuUnknownFlags (Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 \ |CpuP4|CpuSledgehammer|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuVMX \ |Cpu3dnow|Cpu3dnowA|CpuK6|CpuPadLock|CpuSVME|CpuSSSE3|CpuSSE4_1 \ - |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd|CpuSMAP) + |CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd|CpuSMAP \ + |CpuFSGSBase) /* the bits in opcode_modifier are used to generate the final opcode from the base_opcode. These bits also are used to detect alternate forms of Modified: projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.tbl ============================================================================== --- projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.tbl Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/binutils/opcodes/i386-opc.tbl Sat Sep 9 05:42:23 2017 (r323344) @@ -1525,3 +1525,13 @@ pclmulhqhqdq, 2, 0x660f3a44, 0x11, CpuPCLMUL, Modrm|Ig // Intel Random Number Generator extensions rdrand, 1, 0x0fc7, 0x6, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 } rdseed, 1, 0x0fc7, 0x7, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 } + +// Intel Supervisor Mode Access Prevention extensions +clac, 0, 0x0f01, 0xca, CpuSMAP, NoSuf|ImmExt, { 0 } +stac, 0, 0x0f01, 0xcb, CpuSMAP, NoSuf|ImmExt, { 0 } + +// Read/write fs/gs segment base registers +rdfsbase, 1, 0xf30fae, 0x0, CpuFSGSBase|Cpu64, Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, { Reg32|Reg64 } +rdgsbase, 1, 0xf30fae, 0x1, CpuFSGSBase|Cpu64, Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, { Reg32|Reg64 } +wrfsbase, 1, 0xf30fae, 0x2, CpuFSGSBase|Cpu64, Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, { Reg32|Reg64 } +wrgsbase, 1, 0xf30fae, 0x3, CpuFSGSBase|Cpu64, Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, { Reg32|Reg64 } Modified: projects/runtime-coverage/contrib/binutils/opcodes/i386-tbl.h ============================================================================== --- projects/runtime-coverage/contrib/binutils/opcodes/i386-tbl.h Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/binutils/opcodes/i386-tbl.h Sat Sep 9 05:42:23 2017 (r323344) @@ -4400,6 +4400,20 @@ const template i386_optab[] = NoSuf|ImmExt, { 0, 0, 0 } }, {"stac", 0, 0x0f01, 0xcb, CpuSMAP, NoSuf|ImmExt, { 0, 0, 0 } }, + + /* Read/write fs/gs segment base registers */ + {"rdfsbase", 1, 0xf30fae, 0x0, CpuFSGSBase|Cpu64, + Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, + { Reg32|Reg64 } }, + {"rdgsbase", 1, 0xf30fae, 0x1, CpuFSGSBase|Cpu64, + Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, + { Reg32|Reg64 } }, + {"wrfsbase", 1, 0xf30fae, 0x2, CpuFSGSBase|Cpu64, + Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, + { Reg32|Reg64 } }, + {"wrgsbase", 1, 0xf30fae, 0x3, CpuFSGSBase|Cpu64, + Modrm|No_bSuf|No_wSuf|No_sSuf|No_xSuf, + { Reg32|Reg64 } }, { NULL, 0, 0, 0, 0, 0, { 0 } } }; Modified: projects/runtime-coverage/contrib/file/src/readelf.c ============================================================================== --- projects/runtime-coverage/contrib/file/src/readelf.c Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/file/src/readelf.c Sat Sep 9 05:42:23 2017 (r323344) @@ -509,7 +509,7 @@ do_bid_note(struct magic_set *ms, unsigned char *nbuf, size_t noff, size_t doff, int *flags) { if (namesz == 4 && strcmp((char *)&nbuf[noff], "GNU") == 0 && - type == NT_GNU_BUILD_ID && (descsz >= 4 || descsz <= 20)) { + type == NT_GNU_BUILD_ID && (descsz >= 4 && descsz <= 20)) { uint8_t desc[20]; const char *btype; uint32_t i; Modified: projects/runtime-coverage/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h ============================================================================== --- projects/runtime-coverage/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h Sat Sep 9 05:42:23 2017 (r323344) @@ -801,7 +801,8 @@ class SDNode : public FoldingSetNode, public ilist_nod /// if DAG changes. static bool hasPredecessorHelper(const SDNode *N, SmallPtrSetImpl &Visited, - SmallVectorImpl &Worklist) { + SmallVectorImpl &Worklist, + unsigned int MaxSteps = 0) { if (Visited.count(N)) return true; while (!Worklist.empty()) { @@ -816,6 +817,8 @@ class SDNode : public FoldingSetNode, public ilist_nod } if (Found) return true; + if (MaxSteps != 0 && Visited.size() >= MaxSteps) + return false; } return false; } Modified: projects/runtime-coverage/contrib/llvm/lib/Analysis/PostDominators.cpp ============================================================================== --- projects/runtime-coverage/contrib/llvm/lib/Analysis/PostDominators.cpp Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/lib/Analysis/PostDominators.cpp Sat Sep 9 05:42:23 2017 (r323344) @@ -23,8 +23,6 @@ using namespace llvm; #define DEBUG_TYPE "postdomtree" -template class llvm::DominatorTreeBase; // PostDomTreeBase - //===----------------------------------------------------------------------===// // PostDominatorTree Implementation //===----------------------------------------------------------------------===// Modified: projects/runtime-coverage/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp ============================================================================== --- projects/runtime-coverage/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Sat Sep 9 05:42:23 2017 (r323344) @@ -1118,22 +1118,30 @@ SDValue DAGCombiner::PromoteIntBinOp(SDValue Op) { SDValue RV = DAG.getNode(ISD::TRUNCATE, DL, VT, DAG.getNode(Opc, DL, PVT, NN0, NN1)); - // New replace instances of N0 and N1 - if (Replace0 && N0 && N0.getOpcode() != ISD::DELETED_NODE && NN0 && - NN0.getOpcode() != ISD::DELETED_NODE) { + // We are always replacing N0/N1's use in N and only need + // additional replacements if there are additional uses. + Replace0 &= !N0->hasOneUse(); + Replace1 &= (N0 != N1) && !N1->hasOneUse(); + + // Combine Op here so it is presreved past replacements. + CombineTo(Op.getNode(), RV); + + // If operands have a use ordering, make sur we deal with + // predecessor first. + if (Replace0 && Replace1 && N0.getNode()->isPredecessorOf(N1.getNode())) { + std::swap(N0, N1); + std::swap(NN0, NN1); + } + + if (Replace0) { AddToWorklist(NN0.getNode()); ReplaceLoadWithPromotedLoad(N0.getNode(), NN0.getNode()); } - - if (Replace1 && N1 && N1.getOpcode() != ISD::DELETED_NODE && NN1 && - NN1.getOpcode() != ISD::DELETED_NODE) { + if (Replace1) { AddToWorklist(NN1.getNode()); ReplaceLoadWithPromotedLoad(N1.getNode(), NN1.getNode()); } - - // Deal with Op being deleted. - if (Op && Op.getOpcode() != ISD::DELETED_NODE) - return RV; + return Op; } return SDValue(); } @@ -12599,25 +12607,37 @@ void DAGCombiner::getStoreMergeCandidates( } } -// We need to check that merging these stores does not cause a loop -// in the DAG. Any store candidate may depend on another candidate +// We need to check that merging these stores does not cause a loop in +// the DAG. Any store candidate may depend on another candidate // indirectly through its operand (we already consider dependencies // through the chain). Check in parallel by searching up from // non-chain operands of candidates. + bool DAGCombiner::checkMergeStoreCandidatesForDependencies( SmallVectorImpl &StoreNodes, unsigned NumStores) { + + // FIXME: We should be able to truncate a full search of + // predecessors by doing a BFS and keeping tabs the originating + // stores from which worklist nodes come from in a similar way to + // TokenFactor simplfication. + SmallPtrSet Visited; SmallVector Worklist; - // search ops of store candidates + unsigned int Max = 8192; + // Search Ops of store candidates. for (unsigned i = 0; i < NumStores; ++i) { SDNode *n = StoreNodes[i].MemNode; // Potential loops may happen only through non-chain operands for (unsigned j = 1; j < n->getNumOperands(); ++j) Worklist.push_back(n->getOperand(j).getNode()); } - // search through DAG. We can stop early if we find a storenode + // Search through DAG. We can stop early if we find a store node. for (unsigned i = 0; i < NumStores; ++i) { - if (SDNode::hasPredecessorHelper(StoreNodes[i].MemNode, Visited, Worklist)) + if (SDNode::hasPredecessorHelper(StoreNodes[i].MemNode, Visited, Worklist, + Max)) + return false; + // Check if we ended early, failing conservatively if so. + if (Visited.size() >= Max) return false; } return true; Modified: projects/runtime-coverage/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp ============================================================================== --- projects/runtime-coverage/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Sat Sep 9 05:42:23 2017 (r323344) @@ -30942,11 +30942,40 @@ static bool checkBoolTestAndOrSetCCCombine(SDValue Con return true; } +// When legalizing carry, we create carries via add X, -1 +// If that comes from an actual carry, via setcc, we use the +// carry directly. +static SDValue combineCarryThroughADD(SDValue EFLAGS) { + if (EFLAGS.getOpcode() == X86ISD::ADD) { + if (isAllOnesConstant(EFLAGS.getOperand(1))) { + SDValue Carry = EFLAGS.getOperand(0); + while (Carry.getOpcode() == ISD::TRUNCATE || + Carry.getOpcode() == ISD::ZERO_EXTEND || + Carry.getOpcode() == ISD::SIGN_EXTEND || + Carry.getOpcode() == ISD::ANY_EXTEND || + (Carry.getOpcode() == ISD::AND && + isOneConstant(Carry.getOperand(1)))) + Carry = Carry.getOperand(0); + if (Carry.getOpcode() == X86ISD::SETCC || + Carry.getOpcode() == X86ISD::SETCC_CARRY) { + if (Carry.getConstantOperandVal(0) == X86::COND_B) + return Carry.getOperand(1); + } + } + } + + return SDValue(); +} + /// Optimize an EFLAGS definition used according to the condition code \p CC /// into a simpler EFLAGS value, potentially returning a new \p CC and replacing /// uses of chain values. static SDValue combineSetCCEFLAGS(SDValue EFLAGS, X86::CondCode &CC, SelectionDAG &DAG) { + if (CC == X86::COND_B) + if (SDValue Flags = combineCarryThroughADD(EFLAGS)) + return Flags; + if (SDValue R = checkBoolTestSetCCCombine(EFLAGS, CC)) return R; return combineSetCCAtomicArith(EFLAGS, CC, DAG); @@ -34989,27 +35018,13 @@ static SDValue combineSIntToFP(SDNode *N, SelectionDAG return SDValue(); } -// Optimize RES, EFLAGS = X86ISD::ADD LHS, RHS -static SDValue combineX86ADD(SDNode *N, SelectionDAG &DAG, - X86TargetLowering::DAGCombinerInfo &DCI) { - // When legalizing carry, we create carries via add X, -1 - // If that comes from an actual carry, via setcc, we use the - // carry directly. - if (isAllOnesConstant(N->getOperand(1)) && N->hasAnyUseOfValue(1)) { - SDValue Carry = N->getOperand(0); - while (Carry.getOpcode() == ISD::TRUNCATE || - Carry.getOpcode() == ISD::ZERO_EXTEND || - Carry.getOpcode() == ISD::SIGN_EXTEND || - Carry.getOpcode() == ISD::ANY_EXTEND || - (Carry.getOpcode() == ISD::AND && - isOneConstant(Carry.getOperand(1)))) - Carry = Carry.getOperand(0); - - if (Carry.getOpcode() == X86ISD::SETCC || - Carry.getOpcode() == X86ISD::SETCC_CARRY) { - if (Carry.getConstantOperandVal(0) == X86::COND_B) - return DCI.CombineTo(N, SDValue(N, 0), Carry.getOperand(1)); - } +static SDValue combineSBB(SDNode *N, SelectionDAG &DAG) { + if (SDValue Flags = combineCarryThroughADD(N->getOperand(2))) { + MVT VT = N->getSimpleValueType(0); + SDVTList VTs = DAG.getVTList(VT, MVT::i32); + return DAG.getNode(X86ISD::SBB, SDLoc(N), VTs, + N->getOperand(0), N->getOperand(1), + Flags); } return SDValue(); @@ -35038,6 +35053,14 @@ static SDValue combineADC(SDNode *N, SelectionDAG &DAG return DCI.CombineTo(N, Res1, CarryOut); } + if (SDValue Flags = combineCarryThroughADD(N->getOperand(2))) { + MVT VT = N->getSimpleValueType(0); + SDVTList VTs = DAG.getVTList(VT, MVT::i32); + return DAG.getNode(X86ISD::ADC, SDLoc(N), VTs, + N->getOperand(0), N->getOperand(1), + Flags); + } + return SDValue(); } @@ -35677,7 +35700,7 @@ SDValue X86TargetLowering::PerformDAGCombine(SDNode *N case X86ISD::CMOV: return combineCMov(N, DAG, DCI, Subtarget); case ISD::ADD: return combineAdd(N, DAG, Subtarget); case ISD::SUB: return combineSub(N, DAG, Subtarget); - case X86ISD::ADD: return combineX86ADD(N, DAG, DCI); + case X86ISD::SBB: return combineSBB(N, DAG); case X86ISD::ADC: return combineADC(N, DAG, DCI); case ISD::MUL: return combineMul(N, DAG, DCI, Subtarget); case ISD::SHL: Modified: projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h Sat Sep 9 05:42:23 2017 (r323344) @@ -2028,7 +2028,10 @@ class CXXMethodDecl : public FunctionDecl { (public) /// \brief Returns the type of the \c this pointer. /// - /// Should only be called for instance (i.e., non-static) methods. + /// Should only be called for instance (i.e., non-static) methods. Note + /// that for the call operator of a lambda closure type, this returns the + /// desugared 'this' type (a pointer to the closure type), not the captured + /// 'this' type. QualType getThisType(ASTContext &C) const; unsigned getTypeQualifiers() const { Modified: projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Driver/Options.td ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Driver/Options.td Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Driver/Options.td Sat Sep 9 05:42:23 2017 (r323344) @@ -694,6 +694,9 @@ def fbuiltin : Flag<["-"], "fbuiltin">, Group def fbuiltin_module_map : Flag <["-"], "fbuiltin-module-map">, Group, Flags<[DriverOption]>, HelpText<"Load the clang builtins module map file.">; def fcaret_diagnostics : Flag<["-"], "fcaret-diagnostics">, Group; +def fclang_abi_compat_EQ : Joined<["-"], "fclang-abi-compat=">, Group, + Flags<[CC1Option]>, MetaVarName<"">, Values<".,latest">, + HelpText<"Attempt to match the ABI of Clang ">; def fclasspath_EQ : Joined<["-"], "fclasspath=">, Group; def fcolor_diagnostics : Flag<["-"], "fcolor-diagnostics">, Group, Flags<[CoreOption, CC1Option]>, HelpText<"Use colors in diagnostics">; Modified: projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def Sat Sep 9 05:42:23 2017 (r323344) @@ -120,6 +120,10 @@ CODEGENOPT(NoZeroInitializedInBSS , 1, 0) ///< -fno-ze ENUM_CODEGENOPT(ObjCDispatchMethod, ObjCDispatchMethodKind, 2, Legacy) CODEGENOPT(OmitLeafFramePointer , 1, 0) ///< Set when -momit-leaf-frame-pointer is ///< enabled. + +/// A version of Clang that we should attempt to be ABI-compatible with. +ENUM_CODEGENOPT(ClangABICompat, ClangABI, 4, ClangABI::Latest) + VALUE_CODEGENOPT(OptimizationLevel, 2, 0) ///< The -O[0-3] option specified. VALUE_CODEGENOPT(OptimizeSize, 2, 0) ///< If -Os (==1) or -Oz (==2) is specified. Modified: projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h Sat Sep 9 05:42:23 2017 (r323344) @@ -69,6 +69,23 @@ class CodeGenOptions : public CodeGenOptionsBase { (pu LocalExecTLSModel }; + /// Clang versions with different platform ABI conformance. + enum class ClangABI { + /// Attempt to be ABI-compatible with code generated by Clang 3.8.x + /// (SVN r257626). This causes <1 x long long> to be passed in an + /// integer register instead of an SSE register on x64_64. + Ver3_8, + + /// Attempt to be ABI-compatible with code generated by Clang 4.0.x + /// (SVN r291814). This causes move operations to be ignored when + /// determining whether a class type can be passed or returned directly. + Ver4, + + /// Conform to the underlying platform's C and C++ ABIs as closely + /// as we can. + Latest + }; + enum StructReturnConventionKind { SRCK_Default, // No special option was passed. SRCK_OnStack, // Small structs on the stack (-fpcc-struct-return). Modified: projects/runtime-coverage/contrib/llvm/tools/clang/lib/Basic/Version.cpp ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/lib/Basic/Version.cpp Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/lib/Basic/Version.cpp Sat Sep 9 05:42:23 2017 (r323344) @@ -36,7 +36,7 @@ std::string getClangRepositoryPath() { // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us // pick up a tag in an SVN export, for example. - StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/branches/release_50/lib/Basic/Version.cpp $"); + StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_500/final/lib/Basic/Version.cpp $"); if (URL.empty()) { URL = SVNRepository.slice(SVNRepository.find(':'), SVNRepository.find("/lib/Basic")); Modified: projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h Sat Sep 9 05:42:23 2017 (r323344) @@ -24,6 +24,7 @@ namespace llvm { namespace clang { class ASTContext; + class CodeGenOptions; class TargetInfo; namespace CodeGen { @@ -68,6 +69,7 @@ namespace swiftcall { llvm::LLVMContext &getVMContext() const; const llvm::DataLayout &getDataLayout() const; const TargetInfo &getTarget() const; + const CodeGenOptions &getCodeGenOpts() const; /// Return the calling convention to use for system runtime /// functions. Modified: projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp Sat Sep 9 05:42:23 2017 (r323344) @@ -3260,7 +3260,7 @@ void CGDebugInfo::EmitInlineFunctionStart(CGBuilderTy llvm::DISubprogram *SP = nullptr; if (FI != SPCache.end()) SP = dyn_cast_or_null(FI->second); - if (!SP) + if (!SP || !SP->isDefinition()) SP = getFunctionStub(GD); FnBeginRegionCount.push_back(LexicalBlockStack.size()); LexicalBlockStack.emplace_back(SP); Modified: projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp Sat Sep 9 05:42:23 2017 (r323344) @@ -22,6 +22,7 @@ #include "CodeGenPGO.h" #include "TargetInfo.h" #include "clang/AST/ASTContext.h" +#include "clang/AST/ASTLambda.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/StmtCXX.h" @@ -983,11 +984,22 @@ void CodeGenFunction::StartFunction(GlobalDecl GD, } // Check the 'this' pointer once per function, if it's available. - if (CXXThisValue) { + if (CXXABIThisValue) { SanitizerSet SkippedChecks; SkippedChecks.set(SanitizerKind::ObjectSize, true); QualType ThisTy = MD->getThisType(getContext()); - EmitTypeCheck(TCK_Load, Loc, CXXThisValue, ThisTy, + + // If this is the call operator of a lambda with no capture-default, it + // may have a static invoker function, which may call this operator with + // a null 'this' pointer. + if (isLambdaCallOperator(MD) && + cast(MD->getParent())->getLambdaCaptureDefault() == + LCD_None) + SkippedChecks.set(SanitizerKind::Null, true); + + EmitTypeCheck(isa(MD) ? TCK_ConstructorCall + : TCK_MemberCall, + Loc, CXXABIThisValue, ThisTy, getContext().getTypeAlignInChars(ThisTy->getPointeeType()), SkippedChecks); } Modified: projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp ============================================================================== --- projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp Sat Sep 9 05:12:14 2017 (r323343) +++ projects/runtime-coverage/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp Sat Sep 9 05:42:23 2017 (r323344) @@ -44,6 +44,10 @@ CodeGenTypes::~CodeGenTypes() { delete &*I++; } *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***