From owner-svn-src-projects@freebsd.org Mon Jan 18 16:33:05 2016 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 19366A872F6 for ; Mon, 18 Jan 2016 16:33:05 +0000 (UTC) (envelope-from nwhitehorn@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 CD55811B9; Mon, 18 Jan 2016 16:33:04 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0IGX3Og022898; Mon, 18 Jan 2016 16:33:03 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0IGX3Ba022895; Mon, 18 Jan 2016 16:33:03 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201601181633.u0IGX3Ba022895@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Mon, 18 Jan 2016 16:33:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294277 - in projects/powernv/powerpc: ofw pseries X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 18 Jan 2016 16:33:05 -0000 Author: nwhitehorn Date: Mon Jan 18 16:33:03 2016 New Revision: 294277 URL: https://svnweb.freebsd.org/changeset/base/294277 Log: Move RTAS PCI-specific interpretation of the "reg" property of the PCI host device to the RTAS driver, where it belongs. Modified: projects/powernv/powerpc/ofw/ofw_pci.c projects/powernv/powerpc/ofw/ofw_pci.h projects/powernv/powerpc/pseries/rtas_pci.c Modified: projects/powernv/powerpc/ofw/ofw_pci.c ============================================================================== --- projects/powernv/powerpc/ofw/ofw_pci.c Mon Jan 18 16:09:58 2016 (r294276) +++ projects/powernv/powerpc/ofw/ofw_pci.c Mon Jan 18 16:33:03 2016 (r294277) @@ -136,10 +136,6 @@ ofw_pci_init(device_t dev) sc = device_get_softc(dev); sc->sc_initialized = 1; - if (OF_getencprop(node, "reg", (pcell_t *)&sc->sc_pcir, - sizeof(sc->sc_pcir)) == -1) - return (ENXIO); - if (OF_getencprop(node, "bus-range", busrange, sizeof(busrange)) != 8) busrange[0] = 0; Modified: projects/powernv/powerpc/ofw/ofw_pci.h ============================================================================== --- projects/powernv/powerpc/ofw/ofw_pci.h Mon Jan 18 16:09:58 2016 (r294276) +++ projects/powernv/powerpc/ofw/ofw_pci.h Mon Jan 18 16:33:03 2016 (r294277) @@ -56,8 +56,6 @@ struct ofw_pci_softc { int sc_quirks; - struct ofw_pci_register sc_pcir; - struct ofw_pci_range *sc_range; int sc_nrange; Modified: projects/powernv/powerpc/pseries/rtas_pci.c ============================================================================== --- projects/powernv/powerpc/pseries/rtas_pci.c Mon Jan 18 16:09:58 2016 (r294276) +++ projects/powernv/powerpc/pseries/rtas_pci.c Mon Jan 18 16:33:03 2016 (r294277) @@ -91,6 +91,8 @@ static device_method_t rtaspci_methods[] struct rtaspci_softc { struct ofw_pci_softc pci_sc; + struct ofw_pci_register sc_pcir; + cell_t read_pci_config, write_pci_config; cell_t ex_read_pci_config, ex_write_pci_config; int sc_extended_config; @@ -127,6 +129,10 @@ rtaspci_attach(device_t dev) sc = device_get_softc(dev); + if (OF_getencprop(ofw_bus_get_node(dev), "reg", (pcell_t *)&sc->sc_pcir, + sizeof(sc->sc_pcir)) == -1) + return (ENXIO); + sc->read_pci_config = rtas_token_lookup("read-pci-config"); sc->write_pci_config = rtas_token_lookup("write-pci-config"); sc->ex_read_pci_config = rtas_token_lookup("ibm,read-pci-config"); @@ -157,8 +163,8 @@ rtaspci_read_config(device_t dev, u_int if (sc->ex_read_pci_config != -1) error = rtas_call_method(sc->ex_read_pci_config, 4, 2, - config_addr, sc->pci_sc.sc_pcir.phys_hi, - sc->pci_sc.sc_pcir.phys_mid, width, &pcierror, &retval); + config_addr, sc->sc_pcir.phys_hi, + sc->sc_pcir.phys_mid, width, &pcierror, &retval); else error = rtas_call_method(sc->read_pci_config, 2, 2, config_addr, width, &pcierror, &retval); @@ -196,7 +202,7 @@ rtaspci_write_config(device_t dev, u_int if (sc->ex_write_pci_config != -1) rtas_call_method(sc->ex_write_pci_config, 5, 1, config_addr, - sc->pci_sc.sc_pcir.phys_hi, sc->pci_sc.sc_pcir.phys_mid, + sc->sc_pcir.phys_hi, sc->sc_pcir.phys_mid, width, val, &pcierror); else rtas_call_method(sc->write_pci_config, 3, 1, config_addr, From owner-svn-src-projects@freebsd.org Tue Jan 19 18:57:38 2016 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 871AEA892CB for ; Tue, 19 Jan 2016 18:57:38 +0000 (UTC) (envelope-from dim@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 3E6BB119F; Tue, 19 Jan 2016 18:57:38 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0JIvb65096611; Tue, 19 Jan 2016 18:57:37 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0JIvbsr096610; Tue, 19 Jan 2016 18:57:37 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601191857.u0JIvbsr096610@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 19 Jan 2016 18:57:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294337 - projects/clang380-import/contrib/llvm/tools/clang/lib/Sema X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 19 Jan 2016 18:57:38 -0000 Author: dim Date: Tue Jan 19 18:57:37 2016 New Revision: 294337 URL: https://svnweb.freebsd.org/changeset/base/294337 Log: Pull in r258110 from upstream clang trunk, by Faisal Vali: Fix PR26134: When substituting into default template arguments, keep CurContext unchanged. Or, do not set Sema's CurContext to the template declaration's when substituting into default template arguments of said template declaration. If we do push the template declaration context on to Sema, and the template declaration is at namespace scope, Sema can get confused and try and do odr analysis when substituting into default template arguments, even though the substitution could be occurring within a dependent context. I'm not sure why this was being done, perhaps there was concern that if a default template argument referred to a previous template parameter, it might not be found during substitution - but all regression tests pass, and I can't craft a test that would cause it to fails (if some one does, please inform me, and i'll craft a different fix for the PR). This patch removes a single line of code, but unfortunately adds more than it removes, because of the tests. Some day I still hope to commit a patch that removes far more lines than it adds, while leaving clang better for it ;) Sorry that r253590 ("Change the expression evaluation context from Unevaluated to ConstantEvaluated while substituting into non-type template argument defaults") caused the PR! This fix will be merged to the upstream release_38 branch soon, but we need it now, to fix a failure in the databases/sfcgal port. Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp Modified: projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp Tue Jan 19 18:55:44 2016 (r294336) +++ projects/clang380-import/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp Tue Jan 19 18:57:37 2016 (r294337) @@ -3281,7 +3281,6 @@ SubstDefaultTemplateArgument(Sema &SemaR for (unsigned i = 0, e = Param->getDepth(); i != e; ++i) TemplateArgLists.addOuterTemplateArguments(None); - Sema::ContextRAII SavedContext(SemaRef, Template->getDeclContext()); EnterExpressionEvaluationContext ConstantEvaluated(SemaRef, Sema::ConstantEvaluated); return SemaRef.SubstExpr(Param->getDefaultArgument(), TemplateArgLists); From owner-svn-src-projects@freebsd.org Wed Jan 20 09:50:57 2016 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 A1B03A8A858 for ; Wed, 20 Jan 2016 09:50:57 +0000 (UTC) (envelope-from gjb@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 35DA91960; Wed, 20 Jan 2016 09:50:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0K9ou6F070705; Wed, 20 Jan 2016 09:50:56 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0K9otI8070677; Wed, 20 Jan 2016 09:50:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601200950.u0K9otI8070677@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 20 Jan 2016 09:50:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294408 - in projects/release-pkg: . bin/sh contrib/mdocml crypto/openssh crypto/openssh/contrib crypto/openssh/contrib/caldera crypto/openssh/contrib/cygwin crypto/openssh/contrib/redh... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 20 Jan 2016 09:50:57 -0000 Author: gjb Date: Wed Jan 20 09:50:54 2016 New Revision: 294408 URL: https://svnweb.freebsd.org/changeset/base/294408 Log: MFH Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/contrib/mdocml/compat_err.c - copied unchanged from r294407, head/contrib/mdocml/compat_err.c projects/release-pkg/contrib/mdocml/compat_getline.c - copied unchanged from r294407, head/contrib/mdocml/compat_getline.c projects/release-pkg/contrib/mdocml/compat_isblank.c - copied unchanged from r294407, head/contrib/mdocml/compat_isblank.c projects/release-pkg/contrib/mdocml/compat_mkdtemp.c - copied unchanged from r294407, head/contrib/mdocml/compat_mkdtemp.c projects/release-pkg/contrib/mdocml/compat_progname.c - copied unchanged from r294407, head/contrib/mdocml/compat_progname.c projects/release-pkg/contrib/mdocml/compat_stringlist.c - copied unchanged from r294407, head/contrib/mdocml/compat_stringlist.c projects/release-pkg/contrib/mdocml/compat_stringlist.h - copied unchanged from r294407, head/contrib/mdocml/compat_stringlist.h projects/release-pkg/contrib/mdocml/compat_vasprintf.c - copied unchanged from r294407, head/contrib/mdocml/compat_vasprintf.c projects/release-pkg/contrib/mdocml/config.log - copied unchanged from r294407, head/contrib/mdocml/config.log projects/release-pkg/contrib/mdocml/man.conf.5 - copied unchanged from r294407, head/contrib/mdocml/man.conf.5 projects/release-pkg/contrib/mdocml/manconf.h - copied unchanged from r294407, head/contrib/mdocml/manconf.h projects/release-pkg/contrib/mdocml/mandoc.css - copied unchanged from r294407, head/contrib/mdocml/mandoc.css projects/release-pkg/contrib/mdocml/mandoc_ohash.c - copied unchanged from r294407, head/contrib/mdocml/mandoc_ohash.c projects/release-pkg/contrib/mdocml/mandoc_ohash.h - copied unchanged from r294407, head/contrib/mdocml/mandoc_ohash.h projects/release-pkg/contrib/mdocml/mdoc_state.c - copied unchanged from r294407, head/contrib/mdocml/mdoc_state.c projects/release-pkg/contrib/mdocml/roff.h - copied unchanged from r294407, head/contrib/mdocml/roff.h projects/release-pkg/contrib/mdocml/roff_int.h - copied unchanged from r294407, head/contrib/mdocml/roff_int.h projects/release-pkg/contrib/mdocml/soelim.1 - copied unchanged from r294407, head/contrib/mdocml/soelim.1 projects/release-pkg/contrib/mdocml/soelim.c - copied unchanged from r294407, head/contrib/mdocml/soelim.c projects/release-pkg/contrib/mdocml/tag.c - copied unchanged from r294407, head/contrib/mdocml/tag.c projects/release-pkg/contrib/mdocml/tag.h - copied unchanged from r294407, head/contrib/mdocml/tag.h projects/release-pkg/contrib/mdocml/test-err.c - copied unchanged from r294407, head/contrib/mdocml/test-err.c projects/release-pkg/contrib/mdocml/test-getline.c - copied unchanged from r294407, head/contrib/mdocml/test-getline.c projects/release-pkg/contrib/mdocml/test-isblank.c - copied unchanged from r294407, head/contrib/mdocml/test-isblank.c projects/release-pkg/contrib/mdocml/test-mkdtemp.c - copied unchanged from r294407, head/contrib/mdocml/test-mkdtemp.c projects/release-pkg/contrib/mdocml/test-pledge.c - copied unchanged from r294407, head/contrib/mdocml/test-pledge.c projects/release-pkg/contrib/mdocml/test-progname.c - copied unchanged from r294407, head/contrib/mdocml/test-progname.c projects/release-pkg/contrib/mdocml/test-rewb-bsd.c - copied unchanged from r294407, head/contrib/mdocml/test-rewb-bsd.c projects/release-pkg/contrib/mdocml/test-rewb-sysv.c - copied unchanged from r294407, head/contrib/mdocml/test-rewb-sysv.c projects/release-pkg/contrib/mdocml/test-stringlist.c - copied unchanged from r294407, head/contrib/mdocml/test-stringlist.c projects/release-pkg/contrib/mdocml/test-vasprintf.c - copied unchanged from r294407, head/contrib/mdocml/test-vasprintf.c projects/release-pkg/crypto/openssh/.cvsignore - copied unchanged from r294407, head/crypto/openssh/.cvsignore projects/release-pkg/crypto/openssh/bitmap.c - copied unchanged from r294407, head/crypto/openssh/bitmap.c projects/release-pkg/crypto/openssh/bitmap.h - copied unchanged from r294407, head/crypto/openssh/bitmap.h projects/release-pkg/crypto/openssh/cipher-aesctr.c - copied unchanged from r294407, head/crypto/openssh/cipher-aesctr.c projects/release-pkg/crypto/openssh/cipher-aesctr.h - copied unchanged from r294407, head/crypto/openssh/cipher-aesctr.h projects/release-pkg/crypto/openssh/opacket.c - copied unchanged from r294407, head/crypto/openssh/opacket.c projects/release-pkg/crypto/openssh/opacket.h - copied unchanged from r294407, head/crypto/openssh/opacket.h projects/release-pkg/crypto/openssh/openbsd-compat/.cvsignore - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/.cvsignore projects/release-pkg/crypto/openssh/openbsd-compat/kludge-fd_set.c - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/kludge-fd_set.c projects/release-pkg/crypto/openssh/openbsd-compat/md5.c - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/md5.c projects/release-pkg/crypto/openssh/openbsd-compat/md5.h - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/md5.h projects/release-pkg/crypto/openssh/openbsd-compat/reallocarray.c - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/reallocarray.c projects/release-pkg/crypto/openssh/openbsd-compat/regress/.cvsignore - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/regress/.cvsignore projects/release-pkg/crypto/openssh/openbsd-compat/regress/opensslvertest.c - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/regress/opensslvertest.c projects/release-pkg/crypto/openssh/openbsd-compat/rmd160.c - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/rmd160.c projects/release-pkg/crypto/openssh/openbsd-compat/rmd160.h - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/rmd160.h projects/release-pkg/crypto/openssh/openbsd-compat/sha1.c - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/sha1.c projects/release-pkg/crypto/openssh/openbsd-compat/sha1.h - copied unchanged from r294407, head/crypto/openssh/openbsd-compat/sha1.h projects/release-pkg/crypto/openssh/regress/.cvsignore - copied unchanged from r294407, head/crypto/openssh/regress/.cvsignore projects/release-pkg/crypto/openssh/regress/cfgparse.sh - copied unchanged from r294407, head/crypto/openssh/regress/cfgparse.sh projects/release-pkg/crypto/openssh/regress/hostkey-agent.sh - copied unchanged from r294407, head/crypto/openssh/regress/hostkey-agent.sh projects/release-pkg/crypto/openssh/regress/hostkey-rotate.sh - copied unchanged from r294407, head/crypto/openssh/regress/hostkey-rotate.sh projects/release-pkg/crypto/openssh/regress/keygen-knownhosts.sh - copied unchanged from r294407, head/crypto/openssh/regress/keygen-knownhosts.sh projects/release-pkg/crypto/openssh/regress/limit-keytype.sh - copied unchanged from r294407, head/crypto/openssh/regress/limit-keytype.sh projects/release-pkg/crypto/openssh/regress/multipubkey.sh - copied unchanged from r294407, head/crypto/openssh/regress/multipubkey.sh projects/release-pkg/crypto/openssh/regress/netcat.c - copied unchanged from r294407, head/crypto/openssh/regress/netcat.c projects/release-pkg/crypto/openssh/regress/principals-command.sh - copied unchanged from r294407, head/crypto/openssh/regress/principals-command.sh projects/release-pkg/crypto/openssh/regress/t11.ok - copied unchanged from r294407, head/crypto/openssh/regress/t11.ok projects/release-pkg/crypto/openssh/regress/unittests/ - copied from r294407, head/crypto/openssh/regress/unittests/ projects/release-pkg/crypto/openssh/regress/valgrind-unit.sh - copied unchanged from r294407, head/crypto/openssh/regress/valgrind-unit.sh projects/release-pkg/crypto/openssh/scard/.cvsignore - copied unchanged from r294407, head/crypto/openssh/scard/.cvsignore projects/release-pkg/crypto/openssh/ssh_api.c - copied unchanged from r294407, head/crypto/openssh/ssh_api.c projects/release-pkg/crypto/openssh/ssh_api.h - copied unchanged from r294407, head/crypto/openssh/ssh_api.h projects/release-pkg/crypto/openssh/sshbuf-getput-basic.c - copied unchanged from r294407, head/crypto/openssh/sshbuf-getput-basic.c projects/release-pkg/crypto/openssh/sshbuf-getput-crypto.c - copied unchanged from r294407, head/crypto/openssh/sshbuf-getput-crypto.c projects/release-pkg/crypto/openssh/sshbuf-misc.c - copied unchanged from r294407, head/crypto/openssh/sshbuf-misc.c projects/release-pkg/crypto/openssh/sshbuf.c - copied unchanged from r294407, head/crypto/openssh/sshbuf.c projects/release-pkg/crypto/openssh/sshbuf.h - copied unchanged from r294407, head/crypto/openssh/sshbuf.h projects/release-pkg/crypto/openssh/ssherr.c - copied unchanged from r294407, head/crypto/openssh/ssherr.c projects/release-pkg/crypto/openssh/ssherr.h - copied unchanged from r294407, head/crypto/openssh/ssherr.h projects/release-pkg/crypto/openssh/sshkey.c - copied unchanged from r294407, head/crypto/openssh/sshkey.c projects/release-pkg/crypto/openssh/sshkey.h - copied unchanged from r294407, head/crypto/openssh/sshkey.h projects/release-pkg/lib/libc/riscv/SYS.h - copied unchanged from r294407, head/lib/libc/riscv/SYS.h projects/release-pkg/lib/libc/riscv/Symbol.map - copied unchanged from r294407, head/lib/libc/riscv/Symbol.map projects/release-pkg/lib/libc/riscv/_fpmath.h - copied unchanged from r294407, head/lib/libc/riscv/_fpmath.h projects/release-pkg/lib/libc/riscv/arith.h - copied unchanged from r294407, head/lib/libc/riscv/arith.h projects/release-pkg/lib/libc/riscv/gd_qnan.h - copied unchanged from r294407, head/lib/libc/riscv/gd_qnan.h projects/release-pkg/lib/libc/riscv/gen/ - copied from r294407, head/lib/libc/riscv/gen/ projects/release-pkg/lib/libc/riscv/sys/ - copied from r294407, head/lib/libc/riscv/sys/ projects/release-pkg/sys/arm/at91/at91_ohci.c - copied unchanged from r294407, head/sys/arm/at91/at91_ohci.c projects/release-pkg/sys/arm/at91/at91_ohci_fdt.c - copied unchanged from r294407, head/sys/arm/at91/at91_ohci_fdt.c projects/release-pkg/sys/boot/efi/boot1/boot_module.h - copied unchanged from r294407, head/sys/boot/efi/boot1/boot_module.h projects/release-pkg/sys/boot/efi/boot1/ufs_module.c - copied unchanged from r294407, head/sys/boot/efi/boot1/ufs_module.c projects/release-pkg/sys/boot/efi/boot1/zfs_module.c - copied unchanged from r294407, head/sys/boot/efi/boot1/zfs_module.c Deleted: projects/release-pkg/contrib/mdocml/chars.in projects/release-pkg/contrib/mdocml/compat_fgetln.c projects/release-pkg/contrib/mdocml/example.style.css projects/release-pkg/contrib/mdocml/style.css projects/release-pkg/crypto/openssh/README.hpn projects/release-pkg/crypto/openssh/compress.c projects/release-pkg/crypto/openssh/compress.h projects/release-pkg/crypto/openssh/contrib/caldera/ projects/release-pkg/sys/dev/usb/controller/ohci_atmelarm.c projects/release-pkg/sys/dev/usb/controller/ohci_fdt.c Modified: projects/release-pkg/ObsoleteFiles.inc projects/release-pkg/UPDATING projects/release-pkg/bin/sh/options.c projects/release-pkg/bin/sh/options.h projects/release-pkg/contrib/mdocml/INSTALL projects/release-pkg/contrib/mdocml/LICENSE projects/release-pkg/contrib/mdocml/Makefile projects/release-pkg/contrib/mdocml/Makefile.depend projects/release-pkg/contrib/mdocml/NEWS projects/release-pkg/contrib/mdocml/TODO projects/release-pkg/contrib/mdocml/apropos.1 projects/release-pkg/contrib/mdocml/att.c projects/release-pkg/contrib/mdocml/cgi.c projects/release-pkg/contrib/mdocml/cgi.h.example projects/release-pkg/contrib/mdocml/chars.c projects/release-pkg/contrib/mdocml/compat_fts.c projects/release-pkg/contrib/mdocml/compat_fts.h projects/release-pkg/contrib/mdocml/compat_ohash.h projects/release-pkg/contrib/mdocml/compat_sqlite3_errstr.c projects/release-pkg/contrib/mdocml/config.h projects/release-pkg/contrib/mdocml/configure projects/release-pkg/contrib/mdocml/configure.local.example projects/release-pkg/contrib/mdocml/demandoc.c projects/release-pkg/contrib/mdocml/eqn.7 projects/release-pkg/contrib/mdocml/eqn.c projects/release-pkg/contrib/mdocml/gmdiff projects/release-pkg/contrib/mdocml/html.c projects/release-pkg/contrib/mdocml/html.h projects/release-pkg/contrib/mdocml/lib.c projects/release-pkg/contrib/mdocml/libman.h projects/release-pkg/contrib/mdocml/libmandoc.h projects/release-pkg/contrib/mdocml/libmdoc.h projects/release-pkg/contrib/mdocml/libroff.h projects/release-pkg/contrib/mdocml/main.c projects/release-pkg/contrib/mdocml/main.h projects/release-pkg/contrib/mdocml/man.1 projects/release-pkg/contrib/mdocml/man.c projects/release-pkg/contrib/mdocml/man.cgi.8 projects/release-pkg/contrib/mdocml/man.h projects/release-pkg/contrib/mdocml/man_hash.c projects/release-pkg/contrib/mdocml/man_html.c projects/release-pkg/contrib/mdocml/man_macro.c projects/release-pkg/contrib/mdocml/man_term.c projects/release-pkg/contrib/mdocml/man_validate.c projects/release-pkg/contrib/mdocml/mandoc.1 projects/release-pkg/contrib/mdocml/mandoc.3 projects/release-pkg/contrib/mdocml/mandoc.c projects/release-pkg/contrib/mdocml/mandoc.h projects/release-pkg/contrib/mdocml/mandoc_aux.c projects/release-pkg/contrib/mdocml/mandoc_aux.h projects/release-pkg/contrib/mdocml/mandoc_char.7 projects/release-pkg/contrib/mdocml/mandoc_headers.3 projects/release-pkg/contrib/mdocml/mandocdb.c projects/release-pkg/contrib/mdocml/manpage.c projects/release-pkg/contrib/mdocml/manpath.c projects/release-pkg/contrib/mdocml/mansearch.3 projects/release-pkg/contrib/mdocml/mansearch.c projects/release-pkg/contrib/mdocml/mansearch.h projects/release-pkg/contrib/mdocml/mchars_alloc.3 projects/release-pkg/contrib/mdocml/mdoc.7 projects/release-pkg/contrib/mdocml/mdoc.c projects/release-pkg/contrib/mdocml/mdoc.h projects/release-pkg/contrib/mdocml/mdoc_argv.c projects/release-pkg/contrib/mdocml/mdoc_hash.c projects/release-pkg/contrib/mdocml/mdoc_html.c projects/release-pkg/contrib/mdocml/mdoc_macro.c projects/release-pkg/contrib/mdocml/mdoc_man.c projects/release-pkg/contrib/mdocml/mdoc_term.c projects/release-pkg/contrib/mdocml/mdoc_validate.c projects/release-pkg/contrib/mdocml/msec.c projects/release-pkg/contrib/mdocml/out.c projects/release-pkg/contrib/mdocml/out.h projects/release-pkg/contrib/mdocml/preconv.c projects/release-pkg/contrib/mdocml/read.c projects/release-pkg/contrib/mdocml/roff.7 projects/release-pkg/contrib/mdocml/roff.c projects/release-pkg/contrib/mdocml/st.c projects/release-pkg/contrib/mdocml/tbl.c projects/release-pkg/contrib/mdocml/tbl_data.c projects/release-pkg/contrib/mdocml/tbl_html.c projects/release-pkg/contrib/mdocml/tbl_layout.c projects/release-pkg/contrib/mdocml/tbl_opts.c projects/release-pkg/contrib/mdocml/tbl_term.c projects/release-pkg/contrib/mdocml/term.c projects/release-pkg/contrib/mdocml/term.h projects/release-pkg/contrib/mdocml/term_ascii.c projects/release-pkg/contrib/mdocml/term_ps.c projects/release-pkg/contrib/mdocml/test-dirent-namlen.c projects/release-pkg/contrib/mdocml/test-fts.c projects/release-pkg/contrib/mdocml/test-getsubopt.c projects/release-pkg/contrib/mdocml/test-mmap.c projects/release-pkg/contrib/mdocml/test-ohash.c projects/release-pkg/contrib/mdocml/test-reallocarray.c projects/release-pkg/contrib/mdocml/test-sqlite3.c projects/release-pkg/contrib/mdocml/test-sqlite3_errstr.c projects/release-pkg/contrib/mdocml/test-strcasestr.c projects/release-pkg/contrib/mdocml/test-strlcat.c projects/release-pkg/contrib/mdocml/test-strlcpy.c projects/release-pkg/contrib/mdocml/test-strptime.c projects/release-pkg/contrib/mdocml/test-strsep.c projects/release-pkg/contrib/mdocml/test-strtonum.c projects/release-pkg/contrib/mdocml/test-wchar.c projects/release-pkg/contrib/mdocml/tree.c projects/release-pkg/crypto/openssh/ChangeLog projects/release-pkg/crypto/openssh/INSTALL projects/release-pkg/crypto/openssh/Makefile.in projects/release-pkg/crypto/openssh/PROTOCOL projects/release-pkg/crypto/openssh/PROTOCOL.agent projects/release-pkg/crypto/openssh/PROTOCOL.krl projects/release-pkg/crypto/openssh/README projects/release-pkg/crypto/openssh/atomicio.c projects/release-pkg/crypto/openssh/auth-bsdauth.c projects/release-pkg/crypto/openssh/auth-chall.c projects/release-pkg/crypto/openssh/auth-krb5.c projects/release-pkg/crypto/openssh/auth-options.c projects/release-pkg/crypto/openssh/auth-options.h projects/release-pkg/crypto/openssh/auth-pam.c projects/release-pkg/crypto/openssh/auth-passwd.c projects/release-pkg/crypto/openssh/auth-rh-rsa.c projects/release-pkg/crypto/openssh/auth-rhosts.c projects/release-pkg/crypto/openssh/auth-rsa.c projects/release-pkg/crypto/openssh/auth.c projects/release-pkg/crypto/openssh/auth.h projects/release-pkg/crypto/openssh/auth1.c projects/release-pkg/crypto/openssh/auth2-chall.c projects/release-pkg/crypto/openssh/auth2-gss.c projects/release-pkg/crypto/openssh/auth2-hostbased.c projects/release-pkg/crypto/openssh/auth2-kbdint.c projects/release-pkg/crypto/openssh/auth2-none.c projects/release-pkg/crypto/openssh/auth2-passwd.c projects/release-pkg/crypto/openssh/auth2-pubkey.c projects/release-pkg/crypto/openssh/auth2.c projects/release-pkg/crypto/openssh/authfd.c projects/release-pkg/crypto/openssh/authfd.h projects/release-pkg/crypto/openssh/authfile.c projects/release-pkg/crypto/openssh/authfile.h projects/release-pkg/crypto/openssh/bufaux.c projects/release-pkg/crypto/openssh/bufbn.c projects/release-pkg/crypto/openssh/bufec.c projects/release-pkg/crypto/openssh/buffer.c projects/release-pkg/crypto/openssh/buffer.h projects/release-pkg/crypto/openssh/canohost.c projects/release-pkg/crypto/openssh/chacha.h projects/release-pkg/crypto/openssh/channels.c projects/release-pkg/crypto/openssh/channels.h projects/release-pkg/crypto/openssh/cipher-3des1.c projects/release-pkg/crypto/openssh/cipher-bf1.c projects/release-pkg/crypto/openssh/cipher-chachapoly.c projects/release-pkg/crypto/openssh/cipher-chachapoly.h projects/release-pkg/crypto/openssh/cipher-ctr.c projects/release-pkg/crypto/openssh/cipher.c (contents, props changed) projects/release-pkg/crypto/openssh/cipher.h projects/release-pkg/crypto/openssh/clientloop.c projects/release-pkg/crypto/openssh/compat.c projects/release-pkg/crypto/openssh/compat.h projects/release-pkg/crypto/openssh/config.guess projects/release-pkg/crypto/openssh/config.h projects/release-pkg/crypto/openssh/config.h.in projects/release-pkg/crypto/openssh/configure projects/release-pkg/crypto/openssh/configure.ac projects/release-pkg/crypto/openssh/contrib/Makefile projects/release-pkg/crypto/openssh/contrib/cygwin/README projects/release-pkg/crypto/openssh/contrib/cygwin/ssh-host-config projects/release-pkg/crypto/openssh/contrib/cygwin/ssh-user-config projects/release-pkg/crypto/openssh/contrib/redhat/openssh.spec projects/release-pkg/crypto/openssh/contrib/suse/openssh.spec projects/release-pkg/crypto/openssh/deattack.c projects/release-pkg/crypto/openssh/deattack.h projects/release-pkg/crypto/openssh/defines.h projects/release-pkg/crypto/openssh/dh.c projects/release-pkg/crypto/openssh/dh.h projects/release-pkg/crypto/openssh/digest-libc.c projects/release-pkg/crypto/openssh/digest-openssl.c projects/release-pkg/crypto/openssh/digest.h projects/release-pkg/crypto/openssh/dispatch.c projects/release-pkg/crypto/openssh/dispatch.h projects/release-pkg/crypto/openssh/dns.c projects/release-pkg/crypto/openssh/dns.h projects/release-pkg/crypto/openssh/entropy.c projects/release-pkg/crypto/openssh/freebsd-configure.sh projects/release-pkg/crypto/openssh/freebsd-post-merge.sh projects/release-pkg/crypto/openssh/freebsd-pre-merge.sh projects/release-pkg/crypto/openssh/ge25519.h projects/release-pkg/crypto/openssh/groupaccess.c projects/release-pkg/crypto/openssh/gss-genr.c projects/release-pkg/crypto/openssh/gss-serv-krb5.c projects/release-pkg/crypto/openssh/gss-serv.c projects/release-pkg/crypto/openssh/hmac.c projects/release-pkg/crypto/openssh/hmac.h projects/release-pkg/crypto/openssh/hostfile.c projects/release-pkg/crypto/openssh/hostfile.h projects/release-pkg/crypto/openssh/includes.h projects/release-pkg/crypto/openssh/kex.c (contents, props changed) projects/release-pkg/crypto/openssh/kex.h (contents, props changed) projects/release-pkg/crypto/openssh/kexc25519.c projects/release-pkg/crypto/openssh/kexc25519c.c projects/release-pkg/crypto/openssh/kexc25519s.c projects/release-pkg/crypto/openssh/kexdh.c projects/release-pkg/crypto/openssh/kexdhc.c projects/release-pkg/crypto/openssh/kexdhs.c projects/release-pkg/crypto/openssh/kexecdh.c projects/release-pkg/crypto/openssh/kexecdhc.c projects/release-pkg/crypto/openssh/kexecdhs.c projects/release-pkg/crypto/openssh/kexgex.c projects/release-pkg/crypto/openssh/kexgexc.c projects/release-pkg/crypto/openssh/kexgexs.c projects/release-pkg/crypto/openssh/key.c projects/release-pkg/crypto/openssh/key.h projects/release-pkg/crypto/openssh/krl.c projects/release-pkg/crypto/openssh/krl.h projects/release-pkg/crypto/openssh/loginrec.c projects/release-pkg/crypto/openssh/mac.c projects/release-pkg/crypto/openssh/mac.h projects/release-pkg/crypto/openssh/match.c projects/release-pkg/crypto/openssh/match.h projects/release-pkg/crypto/openssh/misc.c projects/release-pkg/crypto/openssh/misc.h projects/release-pkg/crypto/openssh/moduli projects/release-pkg/crypto/openssh/moduli.0 projects/release-pkg/crypto/openssh/moduli.c projects/release-pkg/crypto/openssh/monitor.c projects/release-pkg/crypto/openssh/monitor.h projects/release-pkg/crypto/openssh/monitor_fdpass.c projects/release-pkg/crypto/openssh/monitor_mm.c projects/release-pkg/crypto/openssh/monitor_wrap.c projects/release-pkg/crypto/openssh/monitor_wrap.h projects/release-pkg/crypto/openssh/msg.c projects/release-pkg/crypto/openssh/msg.h projects/release-pkg/crypto/openssh/mux.c projects/release-pkg/crypto/openssh/myproposal.h (contents, props changed) projects/release-pkg/crypto/openssh/openbsd-compat/Makefile.in projects/release-pkg/crypto/openssh/openbsd-compat/arc4random.c projects/release-pkg/crypto/openssh/openbsd-compat/bcrypt_pbkdf.c projects/release-pkg/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/release-pkg/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/release-pkg/crypto/openssh/openbsd-compat/bsd-misc.c projects/release-pkg/crypto/openssh/openbsd-compat/bsd-misc.h (contents, props changed) projects/release-pkg/crypto/openssh/openbsd-compat/bsd-snprintf.c projects/release-pkg/crypto/openssh/openbsd-compat/explicit_bzero.c projects/release-pkg/crypto/openssh/openbsd-compat/fake-rfc2553.h projects/release-pkg/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/release-pkg/crypto/openssh/openbsd-compat/openbsd-compat.h projects/release-pkg/crypto/openssh/openbsd-compat/openssl-compat.c projects/release-pkg/crypto/openssh/openbsd-compat/openssl-compat.h projects/release-pkg/crypto/openssh/openbsd-compat/port-tun.c projects/release-pkg/crypto/openssh/openbsd-compat/port-uw.c projects/release-pkg/crypto/openssh/openbsd-compat/readpassphrase.c projects/release-pkg/crypto/openssh/openbsd-compat/regress/Makefile.in projects/release-pkg/crypto/openssh/openbsd-compat/sha2.c projects/release-pkg/crypto/openssh/openbsd-compat/sha2.h projects/release-pkg/crypto/openssh/openbsd-compat/xcrypt.c projects/release-pkg/crypto/openssh/opensshd.init.in projects/release-pkg/crypto/openssh/packet.c projects/release-pkg/crypto/openssh/packet.h (contents, props changed) projects/release-pkg/crypto/openssh/platform.c projects/release-pkg/crypto/openssh/poly1305.h projects/release-pkg/crypto/openssh/progressmeter.c projects/release-pkg/crypto/openssh/progressmeter.h projects/release-pkg/crypto/openssh/readconf.c projects/release-pkg/crypto/openssh/readconf.h (contents, props changed) projects/release-pkg/crypto/openssh/regress/Makefile projects/release-pkg/crypto/openssh/regress/README.regress projects/release-pkg/crypto/openssh/regress/agent-pkcs11.sh projects/release-pkg/crypto/openssh/regress/agent-timeout.sh projects/release-pkg/crypto/openssh/regress/agent.sh projects/release-pkg/crypto/openssh/regress/broken-pipe.sh projects/release-pkg/crypto/openssh/regress/cert-hostkey.sh projects/release-pkg/crypto/openssh/regress/cfgmatch.sh projects/release-pkg/crypto/openssh/regress/cipher-speed.sh projects/release-pkg/crypto/openssh/regress/connect-privsep.sh projects/release-pkg/crypto/openssh/regress/connect.sh projects/release-pkg/crypto/openssh/regress/dhgex.sh projects/release-pkg/crypto/openssh/regress/dynamic-forward.sh projects/release-pkg/crypto/openssh/regress/exit-status.sh projects/release-pkg/crypto/openssh/regress/forcecommand.sh projects/release-pkg/crypto/openssh/regress/forward-control.sh projects/release-pkg/crypto/openssh/regress/forwarding.sh projects/release-pkg/crypto/openssh/regress/host-expand.sh projects/release-pkg/crypto/openssh/regress/integrity.sh projects/release-pkg/crypto/openssh/regress/kextype.sh projects/release-pkg/crypto/openssh/regress/key-options.sh projects/release-pkg/crypto/openssh/regress/keygen-change.sh projects/release-pkg/crypto/openssh/regress/keys-command.sh projects/release-pkg/crypto/openssh/regress/keyscan.sh projects/release-pkg/crypto/openssh/regress/krl.sh projects/release-pkg/crypto/openssh/regress/localcommand.sh projects/release-pkg/crypto/openssh/regress/login-timeout.sh projects/release-pkg/crypto/openssh/regress/multiplex.sh projects/release-pkg/crypto/openssh/regress/proto-mismatch.sh projects/release-pkg/crypto/openssh/regress/proto-version.sh projects/release-pkg/crypto/openssh/regress/proxy-connect.sh projects/release-pkg/crypto/openssh/regress/reconfigure.sh projects/release-pkg/crypto/openssh/regress/reexec.sh projects/release-pkg/crypto/openssh/regress/rekey.sh projects/release-pkg/crypto/openssh/regress/ssh-com.sh projects/release-pkg/crypto/openssh/regress/ssh2putty.sh projects/release-pkg/crypto/openssh/regress/sshd-log-wrapper.sh projects/release-pkg/crypto/openssh/regress/stderr-data.sh projects/release-pkg/crypto/openssh/regress/t4.ok projects/release-pkg/crypto/openssh/regress/test-exec.sh projects/release-pkg/crypto/openssh/regress/transfer.sh projects/release-pkg/crypto/openssh/regress/try-ciphers.sh projects/release-pkg/crypto/openssh/regress/yes-head.sh projects/release-pkg/crypto/openssh/rijndael.c projects/release-pkg/crypto/openssh/rijndael.h projects/release-pkg/crypto/openssh/roaming_client.c projects/release-pkg/crypto/openssh/roaming_common.c projects/release-pkg/crypto/openssh/roaming_dummy.c projects/release-pkg/crypto/openssh/rsa.c projects/release-pkg/crypto/openssh/rsa.h projects/release-pkg/crypto/openssh/sandbox-seccomp-filter.c projects/release-pkg/crypto/openssh/sandbox-systrace.c projects/release-pkg/crypto/openssh/scp.0 projects/release-pkg/crypto/openssh/scp.1 (contents, props changed) projects/release-pkg/crypto/openssh/scp.c projects/release-pkg/crypto/openssh/servconf.c projects/release-pkg/crypto/openssh/servconf.h (contents, props changed) projects/release-pkg/crypto/openssh/serverloop.c projects/release-pkg/crypto/openssh/session.c projects/release-pkg/crypto/openssh/sftp-client.c projects/release-pkg/crypto/openssh/sftp-client.h projects/release-pkg/crypto/openssh/sftp-common.c projects/release-pkg/crypto/openssh/sftp-common.h projects/release-pkg/crypto/openssh/sftp-glob.c projects/release-pkg/crypto/openssh/sftp-server.0 projects/release-pkg/crypto/openssh/sftp-server.8 (contents, props changed) projects/release-pkg/crypto/openssh/sftp-server.c projects/release-pkg/crypto/openssh/sftp.0 projects/release-pkg/crypto/openssh/sftp.1 (contents, props changed) projects/release-pkg/crypto/openssh/sftp.c projects/release-pkg/crypto/openssh/ssh-add.0 projects/release-pkg/crypto/openssh/ssh-add.1 (contents, props changed) projects/release-pkg/crypto/openssh/ssh-add.c projects/release-pkg/crypto/openssh/ssh-agent.0 projects/release-pkg/crypto/openssh/ssh-agent.1 projects/release-pkg/crypto/openssh/ssh-agent.c projects/release-pkg/crypto/openssh/ssh-dss.c projects/release-pkg/crypto/openssh/ssh-ecdsa.c projects/release-pkg/crypto/openssh/ssh-ed25519.c projects/release-pkg/crypto/openssh/ssh-keygen.0 projects/release-pkg/crypto/openssh/ssh-keygen.1 (contents, props changed) projects/release-pkg/crypto/openssh/ssh-keygen.c projects/release-pkg/crypto/openssh/ssh-keyscan.0 projects/release-pkg/crypto/openssh/ssh-keyscan.1 (contents, props changed) projects/release-pkg/crypto/openssh/ssh-keyscan.c projects/release-pkg/crypto/openssh/ssh-keysign.0 projects/release-pkg/crypto/openssh/ssh-keysign.c projects/release-pkg/crypto/openssh/ssh-pkcs11-client.c projects/release-pkg/crypto/openssh/ssh-pkcs11-helper.0 projects/release-pkg/crypto/openssh/ssh-pkcs11-helper.c projects/release-pkg/crypto/openssh/ssh-pkcs11.c projects/release-pkg/crypto/openssh/ssh-pkcs11.h projects/release-pkg/crypto/openssh/ssh-rsa.c projects/release-pkg/crypto/openssh/ssh.0 projects/release-pkg/crypto/openssh/ssh.1 projects/release-pkg/crypto/openssh/ssh.c projects/release-pkg/crypto/openssh/ssh_config projects/release-pkg/crypto/openssh/ssh_config.0 projects/release-pkg/crypto/openssh/ssh_config.5 projects/release-pkg/crypto/openssh/ssh_namespace.h projects/release-pkg/crypto/openssh/sshconnect.c projects/release-pkg/crypto/openssh/sshconnect1.c projects/release-pkg/crypto/openssh/sshconnect2.c (contents, props changed) projects/release-pkg/crypto/openssh/sshd.0 projects/release-pkg/crypto/openssh/sshd.8 projects/release-pkg/crypto/openssh/sshd.c projects/release-pkg/crypto/openssh/sshd_config projects/release-pkg/crypto/openssh/sshd_config.0 projects/release-pkg/crypto/openssh/sshd_config.5 projects/release-pkg/crypto/openssh/sshlogin.c projects/release-pkg/crypto/openssh/sshpty.c projects/release-pkg/crypto/openssh/uidswap.c projects/release-pkg/crypto/openssh/umac.c projects/release-pkg/crypto/openssh/uuencode.c projects/release-pkg/crypto/openssh/version.h projects/release-pkg/crypto/openssh/xmalloc.c projects/release-pkg/crypto/openssh/xmalloc.h projects/release-pkg/etc/defaults/rc.conf projects/release-pkg/etc/mtree/BSD.usr.dist projects/release-pkg/etc/rc.d/ldconfig projects/release-pkg/etc/rc.d/mountcritlocal projects/release-pkg/gnu/lib/libgcc/Makefile projects/release-pkg/lib/clang/clang.lib.mk projects/release-pkg/lib/libc++/Makefile projects/release-pkg/lib/libc/Makefile projects/release-pkg/lib/libc/gen/tls.c projects/release-pkg/lib/libc/riscv/Makefile.inc projects/release-pkg/lib/libc/sys/utimensat.2 projects/release-pkg/lib/libc/sys/utrace.2 projects/release-pkg/lib/libc/xdr/xdr_float.c projects/release-pkg/lib/libelftc/elftc_version.c projects/release-pkg/lib/libfetch/common.c projects/release-pkg/lib/libkvm/kvm_arm.h projects/release-pkg/lib/libkvm/kvm_i386.h projects/release-pkg/lib/libkvm/kvm_minidump_arm.c projects/release-pkg/lib/libmd/mdXhl.c projects/release-pkg/lib/libpam/modules/pam_ssh/pam_ssh.c projects/release-pkg/lib/libstand/Makefile projects/release-pkg/libexec/rtld-elf/aarch64/reloc.c projects/release-pkg/libexec/rtld-elf/amd64/reloc.c projects/release-pkg/libexec/rtld-elf/arm/reloc.c projects/release-pkg/libexec/rtld-elf/debug.c projects/release-pkg/libexec/rtld-elf/i386/reloc.c projects/release-pkg/libexec/rtld-elf/paths.h projects/release-pkg/libexec/rtld-elf/powerpc/reloc.c projects/release-pkg/libexec/rtld-elf/powerpc64/reloc.c projects/release-pkg/libexec/rtld-elf/riscv/reloc.c projects/release-pkg/libexec/rtld-elf/rtld.c projects/release-pkg/libexec/rtld-elf/rtld.h projects/release-pkg/libexec/rtld-elf/sparc64/reloc.c projects/release-pkg/sbin/ldconfig/ldconfig.c projects/release-pkg/secure/lib/libssh/Makefile projects/release-pkg/secure/usr.sbin/sshd/Makefile projects/release-pkg/share/man/man4/acpi_panasonic.4 projects/release-pkg/share/man/man4/ddb.4 projects/release-pkg/share/man/man4/ffclock.4 projects/release-pkg/share/man/man4/geom_uncompress.4 projects/release-pkg/share/man/man4/geom_uzip.4 projects/release-pkg/share/man/man4/ioat.4 projects/release-pkg/share/man/man4/sctp.4 projects/release-pkg/share/man/man4/sfxge.4 projects/release-pkg/share/man/man5/nandfs.5 projects/release-pkg/share/man/man7/tuning.7 projects/release-pkg/share/man/man9/cd.9 projects/release-pkg/share/man/man9/vref.9 projects/release-pkg/share/man/man9/zone.9 projects/release-pkg/share/mk/bsd.dep.mk projects/release-pkg/share/mk/bsd.lib.mk projects/release-pkg/share/mk/bsd.subdir.mk projects/release-pkg/share/mk/local.init.mk projects/release-pkg/share/mk/local.sys.mk projects/release-pkg/share/mk/sys.mk projects/release-pkg/sys/amd64/amd64/fpu.c projects/release-pkg/sys/arm/arm/minidump_machdep.c projects/release-pkg/sys/arm/arm/physmem.c projects/release-pkg/sys/arm/at91/at91.c projects/release-pkg/sys/arm/at91/at91_common.c projects/release-pkg/sys/arm/at91/at91_machdep.c projects/release-pkg/sys/arm/at91/at91_mci.c projects/release-pkg/sys/arm/at91/board_tsc4370.c projects/release-pkg/sys/arm/at91/files.at91 projects/release-pkg/sys/arm/at91/uart_cpu_at91usart.c projects/release-pkg/sys/arm/conf/IMX53 projects/release-pkg/sys/arm/conf/IMX6 projects/release-pkg/sys/arm/freescale/imx/imx_sdhci.c projects/release-pkg/sys/arm/include/minidump.h projects/release-pkg/sys/arm/include/sysarch.h projects/release-pkg/sys/arm64/cavium/thunder_pcie.c projects/release-pkg/sys/arm64/cavium/thunder_pcie_common.c projects/release-pkg/sys/arm64/cavium/thunder_pcie_common.h projects/release-pkg/sys/arm64/cavium/thunder_pcie_pem.c projects/release-pkg/sys/arm64/conf/GENERIC projects/release-pkg/sys/boot/arm/uboot/Makefile projects/release-pkg/sys/boot/common/bootstrap.h projects/release-pkg/sys/boot/common/module.c projects/release-pkg/sys/boot/common/ufsread.c projects/release-pkg/sys/boot/efi/Makefile projects/release-pkg/sys/boot/efi/boot1/Makefile projects/release-pkg/sys/boot/efi/boot1/boot1.c projects/release-pkg/sys/boot/efi/fdt/Makefile projects/release-pkg/sys/boot/efi/include/efilib.h projects/release-pkg/sys/boot/efi/libefi/Makefile projects/release-pkg/sys/boot/efi/libefi/handles.c projects/release-pkg/sys/boot/efi/loader/Makefile projects/release-pkg/sys/boot/efi/loader/conf.c projects/release-pkg/sys/boot/efi/loader/devicename.c projects/release-pkg/sys/boot/efi/loader/main.c projects/release-pkg/sys/boot/fdt/fdt_loader_cmd.c projects/release-pkg/sys/boot/i386/loader/main.c projects/release-pkg/sys/boot/userboot/test/test.c projects/release-pkg/sys/boot/userboot/userboot/main.c projects/release-pkg/sys/boot/zfs/libzfs.h projects/release-pkg/sys/boot/zfs/zfs.c projects/release-pkg/sys/boot/zfs/zfsimpl.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/release-pkg/sys/compat/linux/linux_socket.c projects/release-pkg/sys/compat/linuxkpi/common/include/linux/pci.h projects/release-pkg/sys/compat/linuxkpi/common/src/linux_compat.c projects/release-pkg/sys/compat/linuxkpi/common/src/linux_pci.c projects/release-pkg/sys/conf/files projects/release-pkg/sys/conf/kern.post.mk projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c projects/release-pkg/sys/dev/cxgb/cxgb_sge.c projects/release-pkg/sys/dev/cxgbe/t4_sge.c projects/release-pkg/sys/dev/e1000/if_igb.c projects/release-pkg/sys/dev/hwpmc/hwpmc_e500.c projects/release-pkg/sys/dev/hwpmc/hwpmc_powerpc.c projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/release-pkg/sys/dev/ioat/ioat.c projects/release-pkg/sys/dev/ioat/ioat.h projects/release-pkg/sys/dev/iwm/if_iwm.c projects/release-pkg/sys/dev/ixgbe/if_ix.c projects/release-pkg/sys/dev/ixgbe/if_ixv.c projects/release-pkg/sys/dev/mlx5/mlx5_en/en.h projects/release-pkg/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c projects/release-pkg/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/release-pkg/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c projects/release-pkg/sys/dev/mxge/if_mxge.c projects/release-pkg/sys/dev/sfxge/common/ef10_impl.h projects/release-pkg/sys/dev/sfxge/common/ef10_tlv_layout.h projects/release-pkg/sys/dev/sfxge/common/efsys.h projects/release-pkg/sys/dev/sfxge/common/efx.h projects/release-pkg/sys/dev/sfxge/common/efx_impl.h projects/release-pkg/sys/dev/sfxge/common/efx_mac.c projects/release-pkg/sys/dev/sfxge/common/efx_mcdi.c projects/release-pkg/sys/dev/sfxge/common/efx_mcdi.h projects/release-pkg/sys/dev/sfxge/common/efx_nvram.c projects/release-pkg/sys/dev/sfxge/common/efx_phy.c projects/release-pkg/sys/dev/sfxge/common/efx_regs_ef10.h projects/release-pkg/sys/dev/sfxge/common/hunt_ev.c projects/release-pkg/sys/dev/sfxge/common/hunt_impl.h projects/release-pkg/sys/dev/sfxge/common/hunt_mac.c projects/release-pkg/sys/dev/sfxge/common/hunt_mcdi.c projects/release-pkg/sys/dev/sfxge/common/hunt_nic.c projects/release-pkg/sys/dev/sfxge/common/hunt_nvram.c projects/release-pkg/sys/dev/sfxge/common/hunt_phy.c projects/release-pkg/sys/dev/sfxge/common/hunt_vpd.c projects/release-pkg/sys/dev/sfxge/common/medford_nic.c projects/release-pkg/sys/dev/sfxge/common/siena_flash.h projects/release-pkg/sys/dev/sfxge/common/siena_impl.h projects/release-pkg/sys/dev/sfxge/common/siena_mcdi.c projects/release-pkg/sys/dev/sfxge/common/siena_nvram.c projects/release-pkg/sys/dev/sfxge/sfxge.h projects/release-pkg/sys/dev/sfxge/sfxge_tx.c projects/release-pkg/sys/dev/sfxge/sfxge_tx.h projects/release-pkg/sys/dev/sfxge/sfxge_version.h projects/release-pkg/sys/dev/uart/uart_cpu_fdt.c projects/release-pkg/sys/dev/uart/uart_tty.c projects/release-pkg/sys/dev/usb/serial/usb_serial.c projects/release-pkg/sys/dev/usb/usb_device.c projects/release-pkg/sys/dev/usb/wlan/if_urtwn.c projects/release-pkg/sys/dev/usb/wlan/if_urtwnreg.h projects/release-pkg/sys/dev/usb/wlan/if_urtwnvar.h projects/release-pkg/sys/fs/devfs/devfs_vnops.c projects/release-pkg/sys/fs/nandfs/nandfs_segment.c projects/release-pkg/sys/fs/nfs/nfs_var.h projects/release-pkg/sys/fs/nfsclient/nfs_clport.c projects/release-pkg/sys/fs/nfsclient/nfs_clrpcops.c projects/release-pkg/sys/geom/geom_disk.c projects/release-pkg/sys/i386/isa/npx.c projects/release-pkg/sys/kern/tty.c projects/release-pkg/sys/kern/vfs_aio.c projects/release-pkg/sys/kern/vfs_subr.c projects/release-pkg/sys/kern/vfs_vnops.c projects/release-pkg/sys/net/radix_mpath.c projects/release-pkg/sys/net/route.c projects/release-pkg/sys/netinet/sctp_pcb.c projects/release-pkg/sys/netinet/tcp_lro.c projects/release-pkg/sys/netinet/tcp_lro.h projects/release-pkg/sys/powerpc/booke/pmap.c projects/release-pkg/sys/powerpc/include/vmparam.h projects/release-pkg/sys/powerpc/ofw/ofw_pci.c projects/release-pkg/sys/powerpc/ofw/ofw_pci.h projects/release-pkg/sys/powerpc/pseries/rtas_pci.c projects/release-pkg/sys/riscv/include/riscvreg.h projects/release-pkg/sys/security/audit/audit_worker.c projects/release-pkg/sys/sys/elf_common.h projects/release-pkg/sys/sys/fcntl.h projects/release-pkg/sys/sys/param.h projects/release-pkg/sys/sys/ttydevsw.h projects/release-pkg/sys/sys/vnode.h projects/release-pkg/sys/vm/vm_extern.h projects/release-pkg/sys/vm/vm_map.c projects/release-pkg/sys/vm/vm_phys.c projects/release-pkg/sys/xen/xenbus/xenbusvar.h projects/release-pkg/tools/build/check-links.sh projects/release-pkg/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/release-pkg/tools/regression/sockets/reconnect/reconnect.c projects/release-pkg/tools/regression/sockets/rtsocket/rtsocket.c projects/release-pkg/tools/regression/sockets/sendfile/sendfile.c projects/release-pkg/tools/regression/sockets/so_setfib/so_setfib.c projects/release-pkg/tools/regression/sockets/unix_gc/Makefile projects/release-pkg/tools/regression/sockets/unix_gc/unix_gc.c projects/release-pkg/tools/regression/sockets/unix_socket/unix_socket.c projects/release-pkg/tools/regression/sockets/zerosend/Makefile projects/release-pkg/tools/regression/sockets/zerosend/zerosend.c projects/release-pkg/tools/tools/nanobsd/embedded/rpi2.cfg projects/release-pkg/usr.bin/clang/clang/Makefile projects/release-pkg/usr.bin/clang/lldb/Makefile projects/release-pkg/usr.bin/finger/net.c projects/release-pkg/usr.bin/iscsictl/iscsictl.8 projects/release-pkg/usr.bin/less/lesspipe.sh projects/release-pkg/usr.bin/m4/misc.c projects/release-pkg/usr.bin/mandoc/Makefile projects/release-pkg/usr.bin/truncate/tests/truncate_test.sh projects/release-pkg/usr.bin/unzip/unzip.1 projects/release-pkg/usr.bin/unzip/unzip.c projects/release-pkg/usr.sbin/boot0cfg/boot0cfg.c projects/release-pkg/usr.sbin/bsdinstall/scripts/zfsboot projects/release-pkg/usr.sbin/jail/command.c projects/release-pkg/usr.sbin/jail/config.c projects/release-pkg/usr.sbin/jls/jls.8 projects/release-pkg/usr.sbin/vidcontrol/vidcontrol.1 projects/release-pkg/usr.sbin/vidcontrol/vidcontrol.c Directory Properties: projects/release-pkg/ (props changed) projects/release-pkg/contrib/mdocml/ (props changed) projects/release-pkg/crypto/openssh/ (props changed) projects/release-pkg/crypto/openssh/contrib/ssh-copy-id.1 (props changed) projects/release-pkg/crypto/openssh/moduli.5 (props changed) projects/release-pkg/crypto/openssh/ssh-keysign.8 (props changed) projects/release-pkg/crypto/openssh/ssh-pkcs11-helper.8 (props changed) projects/release-pkg/gnu/lib/ (props changed) projects/release-pkg/lib/libc/ (props changed) projects/release-pkg/sbin/ (props changed) projects/release-pkg/share/ (props changed) projects/release-pkg/share/man/man4/ (props changed) projects/release-pkg/sys/ (props changed) projects/release-pkg/sys/boot/ (props changed) projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/sys/conf/ (props changed) projects/release-pkg/sys/dev/hyperv/ (props changed) projects/release-pkg/usr.sbin/jail/ (props changed) Modified: projects/release-pkg/ObsoleteFiles.inc ============================================================================== --- projects/release-pkg/ObsoleteFiles.inc Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/ObsoleteFiles.inc Wed Jan 20 09:50:54 2016 (r294408) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20160116: Update mandoc to cvs snapshot 20160116 +OLD_FILES+=usr/share/mdocml/example.style.css +OLD_FILES+=usr/share/mdocml/style.css +OLD_DIRS+=usr/share/mdocml # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h Modified: projects/release-pkg/UPDATING ============================================================================== --- projects/release-pkg/UPDATING Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/UPDATING Wed Jan 20 09:50:54 2016 (r294408) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160119: + The NONE and HPN patches has been removed from OpenSSH. They are + still available in the security/openssh-portable port. + 20160113: With the addition of ypldap(8), a new _ypldap user is now required during installworld. "mergemaster -p" can be used to add the user Modified: projects/release-pkg/bin/sh/options.c ============================================================================== --- projects/release-pkg/bin/sh/options.c Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/bin/sh/options.c Wed Jan 20 09:50:54 2016 (r294408) @@ -74,6 +74,7 @@ static void options(int); static void minus_o(char *, int); static void setoption(int, int); static void setoptionbyindex(int, int); +static void setparam(int, char **); static int getopts(char *, char *, char **, char ***, char **); @@ -224,7 +225,7 @@ end_options1: end_options2: if (!cmdline) { if (*argptr == NULL) - setparam(argptr); + setparam(0, argptr); return; } @@ -318,22 +319,20 @@ setoption(int flag, int val) * Set the shell parameters. */ -void -setparam(char **argv) +static void +setparam(int argc, char **argv) { char **newparam; char **ap; - int nparam; - for (nparam = 0 ; argv[nparam] ; nparam++); - ap = newparam = ckmalloc((nparam + 1) * sizeof *ap); + ap = newparam = ckmalloc((argc + 1) * sizeof *ap); while (*argv) { *ap++ = savestr(*argv++); } *ap = NULL; freeparam(&shellparam); shellparam.malloc = 1; - shellparam.nparam = nparam; + shellparam.nparam = argc; shellparam.p = newparam; shellparam.optp = NULL; shellparam.reset = 1; @@ -371,8 +370,7 @@ freeparam(struct shparam *param) int shiftcmd(int argc, char **argv) { - int n; - char **ap1, **ap2; + int i, n; n = 1; if (argc > 1) @@ -381,12 +379,11 @@ shiftcmd(int argc, char **argv) return 1; INTOFF; shellparam.nparam -= n; - for (ap1 = shellparam.p ; --n >= 0 ; ap1++) { - if (shellparam.malloc) - ckfree(*ap1); - } - ap2 = shellparam.p; - while ((*ap2++ = *ap1++) != NULL); + if (shellparam.malloc) + for (i = 0; i < n; i++) + ckfree(shellparam.p[i]); + memmove(shellparam.p, shellparam.p + n, + (shellparam.nparam + 1) * sizeof(shellparam.p[0])); shellparam.reset = 1; INTON; return 0; @@ -407,7 +404,7 @@ setcmd(int argc, char **argv) options(0); optschanged(); if (*argptr != NULL) { - setparam(argptr); + setparam(argc - (argptr - argv), argptr); } INTON; return 0; Modified: projects/release-pkg/bin/sh/options.h ============================================================================== --- projects/release-pkg/bin/sh/options.h Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/bin/sh/options.h Wed Jan 20 09:50:54 2016 (r294408) @@ -108,7 +108,6 @@ extern char *nextopt_optptr; /* used by void procargs(int, char **); void optschanged(void); -void setparam(char **); void freeparam(struct shparam *); int nextopt(const char *); void getoptsreset(const char *); Modified: projects/release-pkg/contrib/mdocml/INSTALL ============================================================================== --- projects/release-pkg/contrib/mdocml/INSTALL Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/INSTALL Wed Jan 20 09:50:54 2016 (r294408) @@ -1,4 +1,4 @@ -$Id: INSTALL,v 1.10 2015/03/09 21:00:14 schwarze Exp $ +$Id: INSTALL,v 1.13 2015/11/07 14:01:16 schwarze Exp $ About mdocml, the portable mandoc distribution ---------------------------------------------- @@ -42,6 +42,8 @@ generates. If anything looks wrong or d wish, read the file "configure.local.example", create and edit a file "configure.local", and re-run "./configure" until the result seems right to you. +On Solaris 10 and earlier, you may have to run "ksh ./configure" +because the native /bin/sh lacks some POSIX features. 3. Run "make". Any POSIX-compatible make, in particular both BSD make and GNU make, @@ -82,9 +84,10 @@ manual page source. Understanding mandoc dependencies --------------------------------- -The mandoc(1), man(1), and demandoc(1) utilities have no external -dependencies, but makewhatis(8) and apropos(1) depend on the -following software: +The mandoc(1), man(1), and demandoc(1) utilities only depend +on the zlib library for decompressing gzipped manual pages, +but makewhatis(8) and apropos(1) depend on the following +additional software: 1. The SQLite database system, see . The recommended version of SQLite is 3.8.4.3 or newer. The mandoc @@ -107,6 +110,11 @@ If you run into that problem, set "HAVE_ If your system does not have it, the bundled compatibility version will be used, so you probably need not worry about it. +One of the chief design goals of the mandoc toolbox is to make +sure that nothing related to documentation requires C++. +Consequently, linking mandoc against any kind of C++ program +would defeat the purpose and is not supported. + Checking autoconfiguration quality ---------------------------------- Modified: projects/release-pkg/contrib/mdocml/LICENSE ============================================================================== --- projects/release-pkg/contrib/mdocml/LICENSE Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/LICENSE Wed Jan 20 09:50:54 2016 (r294408) @@ -1,4 +1,4 @@ -$Id: LICENSE,v 1.7 2015/02/16 14:56:22 schwarze Exp $ +$Id: LICENSE,v 1.11 2015/11/07 17:58:55 schwarze Exp $ With the exceptions noted below, all code and documentation contained in the mdocml toolkit is protected by the Copyright @@ -8,10 +8,12 @@ Copyright (c) 2008-2012, 2014 Kristaps D Copyright (c) 2010-2015 Ingo Schwarze Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger Copyright (c) 2013 Franco Fichtner +Copyright (c) 2014 Baptiste Daroussin Copyright (c) 1999, 2004 Marc Espie Copyright (c) 1998, 2004, 2010 Todd C. Miller Copyright (c) 2008 Otto Moerbeek Copyright (c) 2004 Ted Unangst +Copyright (c) 1994 Christos Zoulas Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre See the individual source files for information about who contributed @@ -35,13 +37,16 @@ OR IN CONNECTION WITH THE USE OR PERFORM The following files included from outside sources are protected by -other people's Copyright and are distributed under a 3-clause BSD -license; see these individual files for details. +other people's Copyright and are distributed under various 2-clause +and 3-clause BSD licenses; see these individual files for details. -compat_fts.c, compat_fts.h, +soelim.c, soelim.1: +Copyright (c) 2014 Baptiste Daroussin + +compat_err.c, compat_fts.c, compat_fts.h, compat_getsubopt.c, compat_strcasestr.c, compat_strsep.c, man.1: Copyright (c) 1989,1990,1993,1994 The Regents of the University of California -compat_fgetln.c: -Copyright (c) 1998 The NetBSD Foundation, Inc. +compat_stringlist.c, compat_stringlist.h: +Copyright (c) 1994 Christos Zoulas Modified: projects/release-pkg/contrib/mdocml/Makefile ============================================================================== --- projects/release-pkg/contrib/mdocml/Makefile Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/Makefile Wed Jan 20 09:50:54 2016 (r294408) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.457 2015/03/13 12:35:32 schwarze Exp $ +# $Id: Makefile,v 1.480 2015/11/07 21:53:14 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze @@ -20,36 +20,49 @@ VERSION = 1.13.3 # === LIST OF FILES ==================================================== TESTSRCS = test-dirent-namlen.c \ - test-fgetln.c \ + test-err.c \ test-fts.c \ + test-getline.c \ test-getsubopt.c \ + test-isblank.c \ + test-mkdtemp.c \ test-mmap.c \ test-ohash.c \ + test-pledge.c \ + test-progname.c \ test-reallocarray.c \ test-sqlite3.c \ test-sqlite3_errstr.c \ test-strcasestr.c \ + test-stringlist.c \ test-strlcat.c \ test-strlcpy.c \ test-strptime.c \ test-strsep.c \ test-strtonum.c \ + test-vasprintf.c \ test-wchar.c SRCS = att.c \ cgi.c \ chars.c \ - compat_fgetln.c \ + compat_err.c \ compat_fts.c \ + compat_getline.c \ compat_getsubopt.c \ + compat_isblank.c \ + compat_mkdtemp.c \ compat_ohash.c \ + compat_progname.c \ compat_reallocarray.c \ compat_sqlite3_errstr.c \ compat_strcasestr.c \ + compat_stringlist.c \ compat_strlcat.c \ compat_strlcpy.c \ compat_strsep.c \ compat_strtonum.c \ + compat_vasprintf.c \ demandoc.c \ eqn.c \ eqn_html.c \ @@ -65,6 +78,7 @@ SRCS = att.c \ man_validate.c \ mandoc.c \ mandoc_aux.c \ + mandoc_ohash.c \ mandocdb.c \ manpage.c \ manpath.c \ @@ -76,6 +90,7 @@ SRCS = att.c \ mdoc_html.c \ mdoc_macro.c \ mdoc_man.c \ + mdoc_state.c \ mdoc_term.c \ mdoc_validate.c \ msec.c \ @@ -83,7 +98,9 @@ SRCS = att.c \ preconv.c \ read.c \ roff.c \ + soelim.c \ st.c \ + tag.c \ tbl.c \ tbl_data.c \ tbl_html.c \ @@ -93,8 +110,7 @@ SRCS = att.c \ term.c \ term_ascii.c \ term_ps.c \ - tree.c \ - $(TESTSRCS) + tree.c DISTFILES = INSTALL \ LICENSE \ @@ -104,14 +120,13 @@ DISTFILES = INSTALL \ TODO \ apropos.1 \ cgi.h.example \ - chars.in \ compat_fts.h \ compat_ohash.h \ + compat_stringlist.h \ configure \ configure.local.example \ demandoc.1 \ eqn.7 \ - example.style.css \ gmdiff \ html.h \ lib.in \ @@ -121,13 +136,15 @@ DISTFILES = INSTALL \ libroff.h \ main.h \ makewhatis.8 \ - man-cgi.css \ man.1 \ man.7 \ man.cgi.8 \ + man.conf.5 \ man.h \ + manconf.h \ mandoc.1 \ mandoc.3 \ + mandoc.css \ mandoc.db.5 \ mandoc.h \ mandoc_aux.h \ @@ -136,7 +153,7 @@ DISTFILES = INSTALL \ mandoc_headers.3 \ mandoc_html.3 \ mandoc_malloc.3 \ - manpath.h \ + mandoc_ohash.h \ mansearch.3 \ mansearch.h \ mchars_alloc.3 \ @@ -146,12 +163,15 @@ DISTFILES = INSTALL \ out.h \ predefs.in \ roff.7 \ + roff.h \ + soelim.1 \ st.in \ - style.css \ + tag.h \ tbl.3 \ tbl.7 \ term.h \ - $(SRCS) + $(SRCS) \ + $(TESTSRCS) LIBMAN_OBJS = man.o \ man_hash.o \ @@ -164,6 +184,7 @@ LIBMDOC_OBJS = att.o \ mdoc_argv.o \ mdoc_hash.o \ mdoc_macro.o \ + mdoc_state.o \ mdoc_validate.o \ st.o @@ -180,21 +201,27 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ chars.o \ mandoc.o \ mandoc_aux.o \ + mandoc_ohash.o \ msec.o \ preconv.o \ read.o -COMPAT_OBJS = compat_fgetln.o \ +COMPAT_OBJS = compat_err.o \ compat_fts.o \ + compat_getline.o \ compat_getsubopt.o \ + compat_isblank.o \ + compat_mkdtemp.o \ compat_ohash.o \ + compat_progname.o \ compat_reallocarray.o \ compat_sqlite3_errstr.o \ compat_strcasestr.o \ compat_strlcat.o \ compat_strlcpy.o \ compat_strsep.o \ - compat_strtonum.o + compat_strtonum.o \ + compat_vasprintf.o MANDOC_HTML_OBJS = eqn_html.o \ html.o \ @@ -218,6 +245,7 @@ BASE_OBJS = $(MANDOC_HTML_OBJS) \ main.o \ manpath.o \ out.o \ + tag.o \ tree.o MAIN_OBJS = $(BASE_OBJS) @@ -236,10 +264,18 @@ MANPAGE_OBJS = manpage.o mansearch.o ma DEMANDOC_OBJS = demandoc.o +SOELIM_OBJS = soelim.o \ + compat_err.o \ + compat_getline.o \ + compat_progname.o \ + compat_reallocarray.o \ + compat_stringlist.o + WWW_MANS = apropos.1.html \ demandoc.1.html \ man.1.html \ mandoc.1.html \ + soelim.1.html \ mandoc.3.html \ mandoc_escape.3.html \ mandoc_headers.3.html \ @@ -248,6 +284,7 @@ WWW_MANS = apropos.1.html \ mansearch.3.html \ mchars_alloc.3.html \ tbl.3.html \ + man.conf.5.html \ mandoc.db.5.html \ eqn.7.html \ man.7.html \ @@ -258,11 +295,12 @@ WWW_MANS = apropos.1.html \ makewhatis.8.html \ man.cgi.8.html \ man.h.html \ + manconf.h.html \ mandoc.h.html \ mandoc_aux.h.html \ - manpath.h.html \ mansearch.h.html \ - mdoc.h.html + mdoc.h.html \ + roff.h.html WWW_OBJS = mdocml.tar.gz \ mdocml.sha256 @@ -275,7 +313,7 @@ include Makefile.local all: base-build $(BUILD_TARGETS) Makefile.local -base-build: mandoc demandoc +base-build: mandoc demandoc soelim cgi-build: man.cgi @@ -301,33 +339,36 @@ clean: rm -f man.cgi $(CGI_OBJS) rm -f manpage $(MANPAGE_OBJS) rm -f demandoc $(DEMANDOC_OBJS) + rm -f soelim $(SOELIM_OBJS) rm -f $(WWW_MANS) $(WWW_OBJS) rm -rf *.dSYM base-install: base-build mkdir -p $(DESTDIR)$(BINDIR) - mkdir -p $(DESTDIR)$(EXAMPLEDIR) mkdir -p $(DESTDIR)$(LIBDIR) mkdir -p $(DESTDIR)$(INCLUDEDIR) mkdir -p $(DESTDIR)$(MANDIR)/man1 mkdir -p $(DESTDIR)$(MANDIR)/man3 + mkdir -p $(DESTDIR)$(MANDIR)/man5 mkdir -p $(DESTDIR)$(MANDIR)/man7 $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM) ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN) $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) - $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \ + $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \ $(DESTDIR)$(INCLUDEDIR) $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1 $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1 $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/${MANM_MANCONF}.5 $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MAN}.7 $(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MDOC}.7 $(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/${MANM_ROFF}.7 $(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7 $(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7 $(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 - $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) db-install: base-build mkdir -p $(DESTDIR)$(BINDIR) @@ -354,8 +395,7 @@ cgi-install: cgi-build mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1 mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8 $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR) - $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css - $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR) + $(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR) $(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/ $(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/ @@ -376,13 +416,16 @@ man.cgi: $(CGI_OBJS) libmandoc.a $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB) demandoc: $(DEMANDOC_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a $(DBLIB) + +soelim: $(SOELIM_OBJS) + $(CC) $(LDFLAGS) -o $@ $(SOELIM_OBJS) # --- maintainer targets --- www-install: www mkdir -p $(HTDOCDIR)/snapshots - $(INSTALL_DATA) $(WWW_MANS) style.css $(HTDOCDIR) + $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR) $(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots $(INSTALL_DATA) mdocml.tar.gz \ $(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz @@ -416,4 +459,4 @@ mdocml.tar.gz: $(DISTFILES) .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc ./mandoc -Thtml -Wall,stop \ - -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@ + -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@ Modified: projects/release-pkg/contrib/mdocml/Makefile.depend ============================================================================== --- projects/release-pkg/contrib/mdocml/Makefile.depend Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/Makefile.depend Wed Jan 20 09:50:54 2016 (r294408) @@ -1,51 +1,61 @@ -att.o: att.c config.h mdoc.h libmdoc.h -cgi.o: cgi.c config.h mandoc.h mandoc_aux.h main.h manpath.h mansearch.h cgi.h -chars.o: chars.c config.h mandoc.h mandoc_aux.h libmandoc.h chars.in -compat_fgetln.o: compat_fgetln.c config.h +att.o: att.c config.h roff.h mdoc.h libmdoc.h +cgi.o: cgi.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h main.h manconf.h mansearch.h cgi.h +chars.o: chars.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h libmandoc.h +compat_err.o: compat_err.c config.h compat_fts.o: compat_fts.c config.h compat_fts.h +compat_getline.o: compat_getline.c config.h compat_getsubopt.o: compat_getsubopt.c config.h +compat_isblank.o: compat_isblank.c config.h +compat_mkdtemp.o: compat_mkdtemp.c config.h compat_ohash.o: compat_ohash.c config.h compat_ohash.h +compat_progname.o: compat_progname.c config.h compat_reallocarray.o: compat_reallocarray.c config.h compat_sqlite3_errstr.o: compat_sqlite3_errstr.c config.h compat_strcasestr.o: compat_strcasestr.c config.h +compat_stringlist.o: compat_stringlist.c config.h compat_stringlist.h compat_strlcat.o: compat_strlcat.c config.h compat_strlcpy.o: compat_strlcpy.c config.h compat_strsep.o: compat_strsep.c config.h compat_strtonum.o: compat_strtonum.c config.h -demandoc.o: demandoc.c config.h man.h mdoc.h mandoc.h +compat_vasprintf.o: compat_vasprintf.c config.h +demandoc.o: demandoc.c config.h roff.h man.h mdoc.h mandoc.h eqn.o: eqn.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h eqn_html.o: eqn_html.c config.h mandoc.h out.h html.h eqn_term.o: eqn_term.c config.h mandoc.h out.h term.h -html.o: html.c config.h mandoc.h mandoc_aux.h out.h html.h main.h -lib.o: lib.c config.h mdoc.h libmdoc.h lib.in -main.o: main.c config.h mandoc.h mandoc_aux.h main.h mdoc.h man.h manpath.h mansearch.h -man.o: man.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h -man_hash.o: man_hash.c config.h man.h libman.h -man_html.o: man_html.c config.h mandoc_aux.h man.h out.h html.h main.h -man_macro.o: man_macro.c config.h man.h mandoc.h libmandoc.h libman.h -man_term.o: man_term.c config.h mandoc.h mandoc_aux.h out.h man.h term.h main.h -man_validate.o: man_validate.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h +html.o: html.c config.h mandoc.h mandoc_aux.h out.h html.h manconf.h main.h +lib.o: lib.c config.h roff.h mdoc.h libmdoc.h lib.in +main.o: main.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h tag.h main.h manconf.h mansearch.h +man.o: man.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h +man_hash.o: man_hash.c config.h roff.h man.h libman.h +man_html.o: man_html.c config.h mandoc_aux.h roff.h man.h out.h html.h main.h +man_macro.o: man_macro.c config.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h +man_term.o: man_term.c config.h mandoc_aux.h mandoc.h roff.h man.h out.h term.h main.h +man_validate.o: man_validate.c config.h mandoc_aux.h mandoc.h roff.h man.h libmandoc.h roff_int.h libman.h mandoc.o: mandoc.c config.h mandoc.h mandoc_aux.h libmandoc.h mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h -mandocdb.o: mandocdb.c config.h compat_fts.h compat_ohash.h mdoc.h man.h mandoc.h mandoc_aux.h manpath.h mansearch.h -manpage.o: manpage.c config.h manpath.h mansearch.h -manpath.o: manpath.c config.h mandoc_aux.h manpath.h -mansearch.o: mansearch.c config.h compat_ohash.h mandoc.h mandoc_aux.h manpath.h mansearch.h +mandoc_ohash.o: mandoc_ohash.c mandoc_aux.h mandoc_ohash.h compat_ohash.h +mandocdb.o: mandocdb.c config.h compat_fts.h mandoc_aux.h mandoc_ohash.h compat_ohash.h mandoc.h roff.h mdoc.h man.h manconf.h mansearch.h +manpage.o: manpage.c config.h manconf.h mansearch.h +manpath.o: manpath.c config.h mandoc_aux.h manconf.h +mansearch.o: mansearch.c config.h mandoc.h mandoc_aux.h mandoc_ohash.h compat_ohash.h manconf.h mansearch.h mansearch_const.o: mansearch_const.c config.h mansearch.h -mdoc.o: mdoc.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h -mdoc_argv.o: mdoc_argv.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h -mdoc_hash.o: mdoc_hash.c config.h mdoc.h libmdoc.h -mdoc_html.o: mdoc_html.c config.h mandoc_aux.h mdoc.h out.h html.h main.h -mdoc_macro.o: mdoc_macro.c config.h mdoc.h mandoc.h libmdoc.h libmandoc.h -mdoc_man.o: mdoc_man.c config.h mandoc.h mandoc_aux.h out.h man.h mdoc.h main.h -mdoc_term.o: mdoc_term.c config.h mandoc.h mandoc_aux.h out.h term.h mdoc.h main.h -mdoc_validate.o: mdoc_validate.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h +mdoc.o: mdoc.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_argv.o: mdoc_argv.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h +mdoc_hash.o: mdoc_hash.c config.h roff.h mdoc.h libmdoc.h +mdoc_html.o: mdoc_html.c config.h mandoc_aux.h roff.h mdoc.h out.h html.h main.h +mdoc_macro.o: mdoc_macro.c config.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h +mdoc_man.o: mdoc_man.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h out.h main.h +mdoc_state.o: mdoc_state.c mandoc.h roff.h mdoc.h libmandoc.h libmdoc.h +mdoc_term.o: mdoc_term.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h out.h term.h tag.h main.h +mdoc_validate.o: mdoc_validate.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h libmandoc.h roff_int.h libmdoc.h msec.o: msec.c config.h mandoc.h libmandoc.h msec.in out.o: out.c config.h mandoc_aux.h mandoc.h out.h preconv.o: preconv.c config.h mandoc.h libmandoc.h -read.o: read.c config.h mandoc.h mandoc_aux.h libmandoc.h mdoc.h man.h -roff.o: roff.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h predefs.in -st.o: st.c config.h mdoc.h libmdoc.h st.in +read.o: read.c config.h mandoc_aux.h mandoc.h roff.h mdoc.h man.h libmandoc.h roff_int.h +roff.o: roff.c config.h mandoc.h mandoc_aux.h roff.h libmandoc.h roff_int.h libroff.h predefs.in +soelim.o: soelim.c config.h compat_stringlist.h +st.o: st.c config.h roff.h mdoc.h libmdoc.h st.in +tag.o: tag.c config.h mandoc_aux.h mandoc_ohash.h compat_ohash.h tag.h tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h tbl_data.o: tbl_data.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h tbl_html.o: tbl_html.c config.h mandoc.h out.h html.h @@ -53,22 +63,6 @@ tbl_layout.o: tbl_layout.c config.h mand tbl_opts.o: tbl_opts.c config.h mandoc.h libmandoc.h libroff.h tbl_term.o: tbl_term.c config.h mandoc.h out.h term.h term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h -term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h main.h -term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h main.h -tree.o: tree.c config.h mandoc.h mdoc.h man.h main.h -test-dirent-namlen.o: test-dirent-namlen.c -test-fgetln.o: test-fgetln.c -test-fts.o: test-fts.c -test-getsubopt.o: test-getsubopt.c -test-mmap.o: test-mmap.c -test-ohash.o: test-ohash.c -test-reallocarray.o: test-reallocarray.c -test-sqlite3.o: test-sqlite3.c -test-sqlite3_errstr.o: test-sqlite3_errstr.c -test-strcasestr.o: test-strcasestr.c -test-strlcat.o: test-strlcat.c -test-strlcpy.o: test-strlcpy.c -test-strptime.o: test-strptime.c -test-strsep.o: test-strsep.c -test-strtonum.o: test-strtonum.c -test-wchar.o: test-wchar.c +term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h manconf.h main.h +term_ps.o: term_ps.c config.h mandoc_aux.h out.h term.h manconf.h main.h +tree.o: tree.c config.h mandoc.h roff.h mdoc.h man.h main.h Modified: projects/release-pkg/contrib/mdocml/NEWS ============================================================================== --- projects/release-pkg/contrib/mdocml/NEWS Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/NEWS Wed Jan 20 09:50:54 2016 (r294408) @@ -1,4 +1,4 @@ -$Id: NEWS,v 1.9 2015/03/13 12:35:32 schwarze Exp $ +$Id: NEWS,v 1.10 2015/11/05 16:58:20 schwarze Exp $ This file lists the most important changes in the mdocml.bsd.lv distribution. @@ -93,7 +93,7 @@ Changes in version 1.13.3, released on M * roff(7): Three minor fixes with respect to evaluation of conditionals. * roff(7): Let .it accept numerical expressions, not just constants. * mandoc_char(7): Correct some character names and renderings. - * If earlier files set a non-zero exit status, never reset it to zero. + * If earlier files set a non-zero exit status, never reset it to zero. --- THANKS TO --- * Jonathan Gray (OpenBSD) for yet more testing with afl (the American Fuzzy Lop security fuzzer), again resulting in many bug reports. Modified: projects/release-pkg/contrib/mdocml/TODO ============================================================================== --- projects/release-pkg/contrib/mdocml/TODO Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/TODO Wed Jan 20 09:50:54 2016 (r294408) @@ -1,6 +1,6 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.202 2015/03/11 13:11:22 schwarze Exp $ +* $Id: TODO,v 1.216 2016/01/08 01:37:32 schwarze Exp $ ************************************************************************ Many issues are annotated for difficulty as follows: @@ -66,6 +66,7 @@ are mere guesses, and some may be wrong. loc * exist * algo * size * imp ** - .ns (no-space mode) occurs in xine-config(1) + when implementing this, also let .TH set it reported by brad@ Sat, 15 Jan 2011 15:45:23 -0500 loc *** exist *** algo *** size ** imp * @@ -105,6 +106,19 @@ are mere guesses, and some may be wrong. needed for Tcl_NewStringObj(3) via wiz@ Wed, 5 Mar 2014 22:27:43 +0100 loc ** exist *** algo *** size * imp *** +- \\ in high-level macro arguments + Currently, \\ is expanded in two situations: + 1) macro and string definition (roff.c setstrn()) + 2) macro argument parsing (mandoc.c mandoc_getarg()) + For user defined macros, the second happens in time because of ROFF_REPARSE. + But for standard high-level macros, it only happens after entering the + high level parsers, which is too late because the code doesn't get + back to roff.c roff_res() from that point. Because this requires + distinguishing requests, user-defined macros and standard macros + on the roff_res() level, it is hard to solve without the parser reorg. + Found by naddy@ in devel/cutils cobfusc(1) Mon, 16 Feb 2015 19:10:52 +0100 + loc *** exist *** algo *** size ** imp * + - using undefined strings or macros defines them to be empty wl@ Mon, 14 Nov 2011 14:37:01 +0000 loc * exist * algo * size * imp * @@ -194,6 +208,26 @@ are mere guesses, and some may be wrong. --- missing tbl features ----------------------------------------------- +- horizontal lines in the layout still consume data cells + and can be mixed with actual data on the same table line + synaptics(4) found by tedu@ Mon, 17 Aug 2015 21:17:42 -0400 + loc ** exist ** algo ** size ** imp *** + +- the "w" layout option is ignored + synaptics(4) found by tedu@ Mon, 17 Aug 2015 21:17:42 -0400 + loc * exist * algo * size * imp ** + +- the "s" layout column specifier is used for placement of data + into columns, but ignored during column width calculations + synaptics(4) found by tedu@ Mon, 17 Aug 2015 21:17:42 -0400 + loc * exist ** algo *** size * imp ** + +- support mdoc(7) and man(7) macros inside tbl(7) code; + probably requires the parser reorg and letting tbl(7) + use roff_node such that macro sets can mix; + informed by bapt@ that FreeBSD needs this. + loc *** exist ** algo *** size ** imp *** + - look at the POSIX manuals in the books/man-pages-posix port, they use some unsupported tbl(7) features. loc * exist ** algo ** size ** imp *** @@ -203,13 +237,13 @@ are mere guesses, and some may be wrong. suggested by bentley@ Tue, 14 Oct 2014 04:10:55 -0600 loc * exist ** algo * size * imp ** -- allow standalone `.' to be interpreted as an end-of-layout - delimiter instead of being thrown away as a no-op roff line - reported by Yuri Pankov, Wed 18 May 2011 11:34:59 CEST - loc ** exist ** algo ** size * imp ** - --- missing eqn features ----------------------------------------------- +- In a matrix, break the output line after each matrix line. + Found in the discussion at CDBUG 2015. + Suggested by Avi Weinstock. + loc * exist * algo * size * imp ** + - The "size" keyword is parsed, but ignored by the formatter. loc * exist * algo * size * imp * @@ -227,13 +261,9 @@ are mere guesses, and some may be wrong. Werner LEMBERG on groff at gnu dot org Sun, 10 Nov 2013 12:47:46 loc ** exist ** algo * size * imp * -- When makewhatis(8) encounters a FATAL parse error, - it silently treats the file as formatted, which makes no sense - at all for paths like man1/foo.1 - and which also contradicts - what the manual says at the end of the description. - The end result will be ENOENT for file names returned - by mansearch() in manpage.file. - loc * exist * algo * size * imp ** +- change the default PAGER to more -Es and use the pager + even for apropos title line output; req by bapt@ + loc * exist * algo * size * imp *** - makewhatis(8) for preformatted pages: parse the section number from the header line @@ -255,11 +285,13 @@ are mere guesses, and some may be wrong. - kettenis wants base roff, ms, and me Fri, 1 Jan 2010 22:13:15 +0100 (CET) loc ** exist ** algo ** size *** imp * ---- compatibility checks ----------------------------------------------- +- Vsevolod Stakhov (FreeBSD) needs either a markdown output formatter + for mandoc -mdoc or a markdown to mdoc converter because they + have to maintain manuals needed both in markdown and mdoc format. + Look at the libsoldout (markdown -> whatever) + loc * exist * algo * size ** imp ** -- write a configure check for [[:<:]] support and provide some - fallback for whatis(1) when it doesn't work; - Svyatoslav Mishyn Wed, 17 Dec 2014 11:07:10 +0200 +--- compatibility checks ----------------------------------------------- - is .Bk implemented correctly in modern groff? sobrado@ Tue, 19 Apr 2011 22:12:55 +0200 @@ -293,6 +325,9 @@ are mere guesses, and some may be wrong. http://swtch.com/plan9port/man/man7/man.html "Anthony J. Bentley" 28 Dec 2010 21:58:40 -0700 +- check compatibility with COHERENT troff: + http://www.nesssoftware.com/home/mwc/source.php + - check compatibility with the man(7) formatter https://raw.githubusercontent.com/rofl0r/hardcore-utils/master/man.c @@ -381,6 +416,12 @@ are mere guesses, and some may be wrong. see also matthew@ Fri, 18 Jul 2014 19:25:12 -0700 loc * exist * algo ** size * imp *** +- .Bf at the beginning of a paragraph inserts a bogus 1ex horizontal + space, see for example random(3). Introduced in + http://mdocml.bsd.lv/cgi-bin/cvsweb/mdoc_html.c.diff?r1=1.91&r2=1.92 + reported by deraadt@ Mon, 28 Sep 2015 20:14:13 -0600 (MDT) + loc ** exist ** algo ** size * imp * + - jsg on icb, Nov 3, 2014: try to guess Xr in man(7) for hyperlinking @@ -394,6 +435,10 @@ are mere guesses, and some may be wrong. - consider whether can be used for Ar Dv Er Ev Fa Va. from bentley@ Wed, 13 Aug 2014 09:17:55 -0600 +- generate tags in HTML + idea from florian@ Tue, 7 Apr 2015 00:26:28 +0000 + may be possible to implement with .Lk img://something.png alt_text + - check https://github.com/trentm/mdocml ************************************************************************ @@ -466,6 +511,10 @@ are mere guesses, and some may be wrong. found while talking to Chris Bennett loc * exist * algo * size * imp * +- Sequences of multiple man(7) paragraphs (.PP, .IP) interspersed + with .ps and .nf/.fi produce execessive blank lines, see libJudy + and graphics/dcmtk. The parser reorg may help with this. + - trailing whitespace must be ignored even when followed by a font escape, see for example makes @@ -475,9 +524,31 @@ are mere guesses, and some may be wrong. loc ** exist ** algo ** size * imp ** ************************************************************************ +* portability +************************************************************************ + +- systems having UTF-8 but not en_US.UTF-8 + call locale(1) from ./configure, select a UTF-8-locale, + and use that for test-wchar.c and term_ascii.c + to Markus Waldeck Sat, 18 Jul 2015 01:55:37 +0200 + loc * exist * algo * size * imp * + +************************************************************************ * warning issues ************************************************************************ +- provide a way in mandoc(1) to warn about broken .Xr links; + probably cannot be on by default in -Tlint because it needs + to access the manpath and mandoc.db(3) after parsing. + asked for by jmc@ Fri, 4 Dec 2015 22:39:40 +0000 + +- Report errors in -O suboption parsing. + loc * exist * algo * size * imp ** + +- warn when .Sh or .Ss contain other macros + Steffen Nurpmeso, savannah.gnu.org/bugs/index.php?45034 + loc * exist * algo * size * imp ** + - check that MANDOCERR_BADTAB is thrown in the right cases, i.e. when finding a literal tab character in fill mode, and possibly change the wording of the warning message @@ -557,11 +628,6 @@ Several areas can be cleaned up to make * structural issues ************************************************************************ -- Improve -O suboption parsing. Do it in the main program such that - errors can be reported. Pay attention to distinguishing the - mandoc(1) and apropos(1) styles of both options. - loc ** exist * algo ** size ** imp *** - - Use libz directly instead of forking gunzip(1). Suggested by bapt at FreeBSD among others. Modified: projects/release-pkg/contrib/mdocml/apropos.1 ============================================================================== --- projects/release-pkg/contrib/mdocml/apropos.1 Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/apropos.1 Wed Jan 20 09:50:54 2016 (r294408) @@ -1,4 +1,4 @@ -.\" $Id: apropos.1,v 1.37 2015/02/16 16:23:54 schwarze Exp $ +.\" $Id: apropos.1,v 1.39 2015/04/03 08:46:17 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons .\" Copyright (c) 2011, 2012, 2014 Ingo Schwarze @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: February 16 2015 $ +.Dd $Mdocdate: April 3 2015 $ .Dt APROPOS 1 .Os .Sh NAME @@ -210,7 +210,7 @@ This has syntax .Sm off .Oo .Op Ar key Op , Ar key ... -.Pq Cm = | ~ +.Pq Cm = | \(ti .Oc .Ar val , .Sm on @@ -227,7 +227,7 @@ for a list of available keys. Operator .Cm = evaluates a substring, while -.Cm ~ +.Cm \(ti evaluates a regular expression. .It Fl i Ar term If @@ -365,7 +365,8 @@ Specifies the pagination program to use .Ev MANPAGER is not defined. If neither PAGER nor MANPAGER is defined, -.Pa /usr/bin/more Fl s +.Xr more 1 +.Fl s will be used. .El .Sh FILES @@ -398,7 +399,7 @@ as well: .Pp Search in names and descriptions using a regular expression: .Pp -.Dl $ apropos '~set.?[ug]id' +.Dl $ apropos \(aq\(tiset.?[ug]id\(aq .Pp Search for manuals in the library section mentioning both the .Qq optind @@ -413,15 +414,15 @@ Do exactly the same as calling with the argument .Qq ssh : .Pp -.Dl $ apropos \-\- \-i 'Nm~[[:<:]]ssh[[:>:]]' +.Dl $ apropos \-\- \-i \(aqNm\(ti[[:<:]]ssh[[:>:]]\(aq .Pp The following two invocations are equivalent: .Pp .D1 Li $ apropos -S Ar arch Li -s Ar section expression .Bd -ragged -offset indent .Li $ apropos \e( Ar expression Li \e) -.Li -a arch~^( Ns Ar arch Ns Li |any)$ -.Li -a sec~^ Ns Ar section Ns Li $ +.Li -a arch\(ti^( Ns Ar arch Ns Li |any)$ +.Li -a sec\(ti^ Ns Ar section Ns Li $ .Ed .Sh SEE ALSO .Xr man 1 , Modified: projects/release-pkg/contrib/mdocml/att.c ============================================================================== --- projects/release-pkg/contrib/mdocml/att.c Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/att.c Wed Jan 20 09:50:54 2016 (r294408) @@ -1,4 +1,4 @@ -/* $Id: att.c,v 1.13 2014/11/28 18:57:31 schwarze Exp $ */ +/* $Id: att.c,v 1.15 2015/10/06 18:32:19 schwarze Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -19,6 +19,7 @@ #include #include +#include "roff.h" #include "mdoc.h" #include "libmdoc.h" @@ -45,5 +46,5 @@ mdoc_a2att(const char *p) LINE("V.3", "AT&T System\\~V Release\\~3 UNIX"); LINE("V.4", "AT&T System\\~V Release\\~4 UNIX"); - return(NULL); + return NULL; } Modified: projects/release-pkg/contrib/mdocml/cgi.c ============================================================================== --- projects/release-pkg/contrib/mdocml/cgi.c Wed Jan 20 09:14:37 2016 (r294407) +++ projects/release-pkg/contrib/mdocml/cgi.c Wed Jan 20 09:50:54 2016 (r294408) @@ -1,15 +1,15 @@ -/* $Id: cgi.c,v 1.104 2015/02/10 08:05:30 schwarze Exp $ */ +/* $Id: cgi.c,v 1.116 2016/01/04 12:36:26 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons - * Copyright (c) 2014 Ingo Schwarze + * Copyright (c) 2014, 2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF @@ -30,10 +30,13 @@ #include #include -#include "mandoc.h" *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Wed Jan 20 17:07:15 2016 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 D0A26A89BA2 for ; Wed, 20 Jan 2016 17:07:15 +0000 (UTC) (envelope-from gjb@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 8E6201542; Wed, 20 Jan 2016 17:07:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0KH7EYW036271; Wed, 20 Jan 2016 17:07:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0KH7DnC036256; Wed, 20 Jan 2016 17:07:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601201707.u0KH7DnC036256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 20 Jan 2016 17:07:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294447 - in projects/release-pkg: etc/rc.d lib/libjail release/packages usr.sbin/jail usr.sbin/jexec usr.sbin/jls X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 20 Jan 2016 17:07:15 -0000 Author: gjb Date: Wed Jan 20 17:07:13 2016 New Revision: 294447 URL: https://svnweb.freebsd.org/changeset/base/294447 Log: Add a package for jail(8) and related utilities. Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/release/packages/jail-debug-lib32.ucl projects/release-pkg/release/packages/jail-debug.ucl projects/release-pkg/release/packages/jail-development.ucl projects/release-pkg/release/packages/jail-lib32-development.ucl projects/release-pkg/release/packages/jail-lib32-profile.ucl projects/release-pkg/release/packages/jail-lib32.ucl projects/release-pkg/release/packages/jail-profile.ucl projects/release-pkg/release/packages/jail.ucl Modified: projects/release-pkg/etc/rc.d/Makefile projects/release-pkg/lib/libjail/Makefile projects/release-pkg/usr.sbin/jail/Makefile projects/release-pkg/usr.sbin/jexec/Makefile projects/release-pkg/usr.sbin/jls/Makefile Modified: projects/release-pkg/etc/rc.d/Makefile ============================================================================== --- projects/release-pkg/etc/rc.d/Makefile Wed Jan 20 16:59:37 2016 (r294446) +++ projects/release-pkg/etc/rc.d/Makefile Wed Jan 20 17:07:13 2016 (r294447) @@ -204,7 +204,8 @@ FILES+= iscsid .endif .if ${MK_JAIL} != "no" -FILES+= jail +FILESGROUPS+= JAIL +JAIL+= jail .endif .if ${MK_LEGACY_CONSOLE} != "no" @@ -307,4 +308,8 @@ BSNMPDIR= /etc/rc.d BSNMPMODE= ${BINMODE} BSNMPPACKAGE= bsnmp +JAILDIR= /etc/rc.d +JAILMODE= ${BINMODE} +JAILPACKAGE= jail + .include Modified: projects/release-pkg/lib/libjail/Makefile ============================================================================== --- projects/release-pkg/lib/libjail/Makefile Wed Jan 20 16:59:37 2016 (r294446) +++ projects/release-pkg/lib/libjail/Makefile Wed Jan 20 17:07:13 2016 (r294447) @@ -6,6 +6,8 @@ SHLIB_MAJOR= 1 SRCS= jail.c jail_getid.c INCS= jail.h +PACKAGE=jail + MAN= jail.3 MLINKS+=jail.3 jail_getid.3 Added: projects/release-pkg/release/packages/jail-debug-lib32.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/jail-debug-lib32.ucl Wed Jan 20 17:07:13 2016 (r294447) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "Jail 32-bit libraries (debugging symbols)" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < Modified: projects/release-pkg/usr.sbin/jls/Makefile ============================================================================== --- projects/release-pkg/usr.sbin/jls/Makefile Wed Jan 20 16:59:37 2016 (r294446) +++ projects/release-pkg/usr.sbin/jls/Makefile Wed Jan 20 17:07:13 2016 (r294447) @@ -6,6 +6,8 @@ PROG= jls MAN= jls.8 LIBADD= jail xo +PACKAGE=jail + .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif From owner-svn-src-projects@freebsd.org Wed Jan 20 17:08:04 2016 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 A3C4EA89BEE for ; Wed, 20 Jan 2016 17:08:04 +0000 (UTC) (envelope-from gjb@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 708FC1731; Wed, 20 Jan 2016 17:08:04 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0KH835q036415; Wed, 20 Jan 2016 17:08:03 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0KH81x1036388; Wed, 20 Jan 2016 17:08:01 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601201708.u0KH81x1036388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 20 Jan 2016 17:08:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294448 - in projects/release-pkg: share/misc sys/arm/arm sys/arm/conf sys/arm/mv sys/arm/mv/armada38x sys/arm/mv/armadaxp sys/arm64/conf sys/boot/fdt/dts/arm sys/conf sys/dev/fdt sys/d... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 20 Jan 2016 17:08:04 -0000 Author: gjb Date: Wed Jan 20 17:08:01 2016 New Revision: 294448 URL: https://svnweb.freebsd.org/changeset/base/294448 Log: MFH Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/sys/arm/conf/ARMADA38X - copied unchanged from r294447, head/sys/arm/conf/ARMADA38X projects/release-pkg/sys/arm/mv/armada38x/ - copied from r294447, head/sys/arm/mv/armada38x/ projects/release-pkg/sys/boot/fdt/dts/arm/armada-380.dtsi - copied unchanged from r294447, head/sys/boot/fdt/dts/arm/armada-380.dtsi projects/release-pkg/sys/boot/fdt/dts/arm/armada-385.dtsi - copied unchanged from r294447, head/sys/boot/fdt/dts/arm/armada-385.dtsi projects/release-pkg/sys/boot/fdt/dts/arm/armada-388-gp.dts - copied unchanged from r294447, head/sys/boot/fdt/dts/arm/armada-388-gp.dts projects/release-pkg/sys/boot/fdt/dts/arm/armada-388.dtsi - copied unchanged from r294447, head/sys/boot/fdt/dts/arm/armada-388.dtsi projects/release-pkg/sys/boot/fdt/dts/arm/armada-38x.dtsi - copied unchanged from r294447, head/sys/boot/fdt/dts/arm/armada-38x.dtsi Modified: projects/release-pkg/share/misc/committers-src.dot projects/release-pkg/share/misc/organization.dot projects/release-pkg/sys/arm/arm/gic.c projects/release-pkg/sys/arm/conf/DB-78XXX projects/release-pkg/sys/arm/conf/DB-88F5XXX projects/release-pkg/sys/arm/conf/DB-88F6XXX projects/release-pkg/sys/arm/conf/DOCKSTAR projects/release-pkg/sys/arm/conf/DREAMPLUG-1001 projects/release-pkg/sys/arm/conf/SHEEVAPLUG projects/release-pkg/sys/arm/conf/TS7800 projects/release-pkg/sys/arm/mv/armadaxp/armadaxp.c projects/release-pkg/sys/arm/mv/files.mv projects/release-pkg/sys/arm/mv/mv_common.c projects/release-pkg/sys/arm/mv/mv_machdep.c projects/release-pkg/sys/arm/mv/mv_pci.c projects/release-pkg/sys/arm/mv/mvreg.h projects/release-pkg/sys/arm/mv/mvvar.h projects/release-pkg/sys/arm/mv/mvwin.h projects/release-pkg/sys/arm/mv/timer.c projects/release-pkg/sys/arm/mv/twsi.c projects/release-pkg/sys/arm64/conf/GENERIC projects/release-pkg/sys/boot/fdt/dts/arm/db78460.dts projects/release-pkg/sys/boot/fdt/dts/arm/rk3188.dtsi projects/release-pkg/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/release-pkg/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/release-pkg/sys/conf/options.arm projects/release-pkg/sys/dev/fdt/fdt_common.c projects/release-pkg/sys/dev/ofw/ofw_bus_subr.c projects/release-pkg/sys/dev/pci/pcireg.h projects/release-pkg/sys/dev/uart/uart_dev_ns8250.c projects/release-pkg/sys/dev/usb/controller/ehci_mv.c projects/release-pkg/sys/dev/xen/netfront/netfront.c projects/release-pkg/sys/modules/ix/Makefile projects/release-pkg/sys/modules/ixlv/Makefile projects/release-pkg/sys/modules/ixv/Makefile projects/release-pkg/sys/netinet6/ip6_forward.c projects/release-pkg/sys/sys/ttydevsw.h Directory Properties: projects/release-pkg/ (props changed) projects/release-pkg/share/ (props changed) projects/release-pkg/sys/ (props changed) projects/release-pkg/sys/boot/ (props changed) projects/release-pkg/sys/conf/ (props changed) Modified: projects/release-pkg/share/misc/committers-src.dot ============================================================================== --- projects/release-pkg/share/misc/committers-src.dot Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/share/misc/committers-src.dot Wed Jan 20 17:08:01 2016 (r294448) @@ -316,6 +316,7 @@ weongyo [label="Weongyo Jeong\nweongyo@F wes [label="Wes Peters\nwes@FreeBSD.org\n1998/11/25"] whu [label="Wei Hu\nwhu@FreeBSD.org\n2015/02/11"] wkoszek [label="Wojciech A. Koszek\nwkoszek@FreeBSD.org\n2006/02/21"] +wma [label="Wojciech Macek\nwma@FreeBSD.org\n2016/01/18"] wollman [label="Garrett Wollman\nwollman@FreeBSD.org\n????/??/??"] wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"] yongari [label="Pyun YongHyeon\nyongari@FreeBSD.org\n2004/08/01"] @@ -391,6 +392,7 @@ cognet -> jceel cognet -> kevlo cognet -> ian cognet -> wkoszek +cognet -> wma cognet -> zbb cperciva -> eadler Modified: projects/release-pkg/share/misc/organization.dot ============================================================================== --- projects/release-pkg/share/misc/organization.dot Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/share/misc/organization.dot Wed Jan 20 17:08:01 2016 (r294448) @@ -30,7 +30,7 @@ coresecretary [label="Core Team Secretar doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\nerwin, mat, swills"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\nerwin, mat, swills,\nmiwi"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nculot"] re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"] secteam [label="Security Team\nsecteam@FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"] Modified: projects/release-pkg/sys/arm/arm/gic.c ============================================================================== --- projects/release-pkg/sys/arm/arm/gic.c Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/arm/gic.c Wed Jan 20 17:08:01 2016 (r294448) @@ -336,9 +336,11 @@ gic_decode_fdt(phandle_t iparent, pcell_ * 2 = high-to-low edge triggered * 4 = active high level-sensitive * 8 = active low level-sensitive - * The hardware only supports active-high-level or rising-edge. + * The hardware only supports active-high-level or rising-edge + * for SPIs */ - if (fdt32_to_cpu(intr[2]) & 0x0a) { + if (*interrupt >= GIC_FIRST_SPI && + fdt32_to_cpu(intr[2]) & 0x0a) { printf("unsupported trigger/polarity configuration " "0x%02x\n", fdt32_to_cpu(intr[2]) & 0x0f); } Copied: projects/release-pkg/sys/arm/conf/ARMADA38X (from r294447, head/sys/arm/conf/ARMADA38X) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/sys/arm/conf/ARMADA38X Wed Jan 20 17:08:01 2016 (r294448, copy of r294447, head/sys/arm/conf/ARMADA38X) @@ -0,0 +1,84 @@ +# +# Kernel configuration for Marvell Armada38x +# +# $FreeBSD$ +# + +include "../mv/armada38x/std.armada38x" +include "std.armv6" + +ident ARMADA38X + +options SOC_MV_ARMADA38X + +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions WERROR="-Werror" + +options MD_ROOT +#makeoptions MFS_IMAGE=/path/to/miniroot +#options ROOTDEVNAME=\"ufs:md0\" +options ROOTDEVNAME=\"/dev/da0s1a\" + +options SCHED_ULE # ULE scheduler +#options SCHED_4BSD # 4BSD scheduler + +options SMP + +# Debugging +#options DEBUG +#options VERBOSE_SYSINIT +options ALT_BREAK_TO_DEBUGGER +options DDB +#options GDB +#options DIAGNOSTIC +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options KDB +options KDB_TRACE +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options WITNESS_KDB +#options BOOTVERBOSE + +# Pseudo devices +device random +device pty +device loop +device md + +# Serial ports +device uart +device uart_ns8250 + +# Network +device ether +device vlan +device mii +device bpf +device re + +# PCI +device pci + +# Interrupt controllers +device gic + +# Timers +device mpcore_timer + +# USB +device usb +device ehci +device umass +device scbus +device pass +device da + +# I2C +device iic +device iicbus + +#FDT +options FDT +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=armada-388-gp.dts Modified: projects/release-pkg/sys/arm/conf/DB-78XXX ============================================================================== --- projects/release-pkg/sys/arm/conf/DB-78XXX Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/conf/DB-78XXX Wed Jan 20 17:08:01 2016 (r294448) @@ -90,6 +90,9 @@ device mvs # NAND device nand +# GPIO +device gpio + # Flattened Device Tree options FDT options FDT_DTB_STATIC Modified: projects/release-pkg/sys/arm/conf/DB-88F5XXX ============================================================================== --- projects/release-pkg/sys/arm/conf/DB-88F5XXX Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/conf/DB-88F5XXX Wed Jan 20 17:08:01 2016 (r294448) @@ -88,6 +88,9 @@ device da # SATA device mvs +# GPIO +device gpio + # Flattened Device Tree options FDT makeoptions FDT_DTS_FILE=db88f5281.dts Modified: projects/release-pkg/sys/arm/conf/DB-88F6XXX ============================================================================== --- projects/release-pkg/sys/arm/conf/DB-88F6XXX Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/conf/DB-88F6XXX Wed Jan 20 17:08:01 2016 (r294448) @@ -94,6 +94,9 @@ device mvs # NAND device nand +# GPIO +device gpio + # Flattened Device Tree options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC Modified: projects/release-pkg/sys/arm/conf/DOCKSTAR ============================================================================== --- projects/release-pkg/sys/arm/conf/DOCKSTAR Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/conf/DOCKSTAR Wed Jan 20 17:08:01 2016 (r294448) @@ -148,6 +148,9 @@ device pf device pflog device pfsync +# GPIO +device gpio + # ALTQ, required for PF options ALTQ # Basic ALTQ support options ALTQ_CBQ # Class Based Queueing Modified: projects/release-pkg/sys/arm/conf/DREAMPLUG-1001 ============================================================================== --- projects/release-pkg/sys/arm/conf/DREAMPLUG-1001 Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/conf/DREAMPLUG-1001 Wed Jan 20 17:08:01 2016 (r294448) @@ -122,6 +122,9 @@ device u3g # USB-based 3G modems (O device iic device iicbus +# GPIO +device gpio + # SATA device mvs device ahci Modified: projects/release-pkg/sys/arm/conf/SHEEVAPLUG ============================================================================== --- projects/release-pkg/sys/arm/conf/SHEEVAPLUG Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/conf/SHEEVAPLUG Wed Jan 20 17:08:01 2016 (r294448) @@ -82,6 +82,9 @@ device da # NAND device nand +# GPIO +device gpio + # Flattened Device Tree options FDT # Configure using FDT/DTB data options FDT_DTB_STATIC Modified: projects/release-pkg/sys/arm/conf/TS7800 ============================================================================== --- projects/release-pkg/sys/arm/conf/TS7800 Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/conf/TS7800 Wed Jan 20 17:08:01 2016 (r294448) @@ -76,6 +76,9 @@ device da # SATA device ata +# GPIO +device gpio + # Flattened Device Tree options FDT options FDT_DTB_STATIC Modified: projects/release-pkg/sys/arm/mv/armadaxp/armadaxp.c ============================================================================== --- projects/release-pkg/sys/arm/mv/armadaxp/armadaxp.c Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/armadaxp/armadaxp.c Wed Jan 20 17:08:01 2016 (r294448) @@ -86,13 +86,6 @@ int platform_get_ncpus(void); #define COHER_FABRIC_CFU 0x28 #define COHER_FABRIC_CIB_CTRL 0x80 -/* XXX Make gpio driver optional and remove it */ -struct resource_spec mv_gpio_res[] = { - { SYS_RES_MEMORY, 0, RF_ACTIVE }, - { SYS_RES_IRQ, 0, RF_ACTIVE }, - { -1, 0 } -}; - struct vco_freq_ratio { uint8_t vco_cpu; /* VCO to CLK0(CPU) clock ratio */ uint8_t vco_l2c; /* VCO to NB(L2 cache) clock ratio */ Modified: projects/release-pkg/sys/arm/mv/files.mv ============================================================================== --- projects/release-pkg/sys/arm/mv/files.mv Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/files.mv Wed Jan 20 17:08:01 2016 (r294448) @@ -12,7 +12,7 @@ # - JTAG/ICE # - Vector Floating Point (VFP) unit # -arm/mv/gpio.c standard +arm/mv/gpio.c optional gpio arm/mv/mv_common.c standard arm/mv/mv_localbus.c standard arm/mv/mv_machdep.c standard Modified: projects/release-pkg/sys/arm/mv/mv_common.c ============================================================================== --- projects/release-pkg/sys/arm/mv/mv_common.c Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/mv_common.c Wed Jan 20 17:08:01 2016 (r294448) @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -104,6 +105,10 @@ static void decode_win_idma_dump(u_long static void decode_win_xor_dump(u_long base); static int fdt_get_ranges(const char *, void *, int, int *, int *); +#ifdef SOC_MV_ARMADA38X +int gic_decode_fdt(phandle_t iparent, pcell_t *intr, int *interrupt, + int *trig, int *pol); +#endif static int win_cpu_from_dt(void); static int fdt_win_setup(void); @@ -260,7 +265,7 @@ write_cpu_ctrl(uint32_t reg, uint32_t va bus_space_write_4(fdtbus_bs_tag, MV_CPU_CONTROL_BASE, reg, val); } -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) uint32_t read_cpu_mp_clocks(uint32_t reg) { @@ -294,7 +299,7 @@ void cpu_reset(void) { -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined (SOC_MV_ARMADA38X) write_cpu_misc(RSTOUTn_MASK, SOFT_RST_OUT_EN); write_cpu_misc(SYSTEM_SOFT_RESET, SYS_SOFT_RST); #else @@ -442,6 +447,15 @@ soc_identify(void) else if (r == 1) rev = "A1"; break; + case MV_DEV_88F6828: + dev = "Marvell 88F6828"; + break; + case MV_DEV_88F6820: + dev = "Marvell 88F6820"; + break; + case MV_DEV_88F6810: + dev = "Marvell 88F6810"; + break; case MV_DEV_MV78100_Z0: dev = "Marvell MV78100 Z0"; break; @@ -719,6 +733,9 @@ win_cpu_can_remap(int i) (dev == MV_DEV_88F5281 && i < 4) || (dev == MV_DEV_88F6281 && i < 4) || (dev == MV_DEV_88F6282 && i < 4) || + (dev == MV_DEV_88F6828 && i < 20) || + (dev == MV_DEV_88F6820 && i < 20) || + (dev == MV_DEV_88F6810 && i < 20) || (dev == MV_DEV_88RC8180 && i < 2) || (dev == MV_DEV_88F6781 && i < 4) || (dev == MV_DEV_MV78100_Z0 && i < 8) || @@ -2055,7 +2072,7 @@ fdt_win_setup(void) */ child = OF_peer(child); if ((child == 0) && (node == OF_finddevice("/"))) { - node = fdt_find_compatible(node, "simple-bus", 1); + node = fdt_find_compatible(node, "simple-bus", 0); if (node == 0) return (ENXIO); child = OF_child(node); @@ -2181,6 +2198,9 @@ fdt_pic_decode_ic(phandle_t node, pcell_ } fdt_pic_decode_t fdt_pic_table[] = { +#ifdef SOC_MV_ARMADA38X + &gic_decode_fdt, +#endif &fdt_pic_decode_ic, NULL }; @@ -2195,6 +2215,10 @@ get_sar_value(void) SAMPLE_AT_RESET_HI); sar_low = bus_space_read_4(fdtbus_bs_tag, MV_MISC_BASE, SAMPLE_AT_RESET_LO); +#elif defined(SOC_MV_ARMADA38X) + sar_high = 0; + sar_low = bus_space_read_4(fdtbus_bs_tag, MV_MISC_BASE, + SAMPLE_AT_RESET); #else /* * TODO: Add getting proper values for other SoC configurations Modified: projects/release-pkg/sys/arm/mv/mv_machdep.c ============================================================================== --- projects/release-pkg/sys/arm/mv/mv_machdep.c Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/mv_machdep.c Wed Jan 20 17:08:01 2016 (r294448) @@ -66,6 +66,11 @@ static int platform_mpp_init(void); void armadaxp_init_coher_fabric(void); void armadaxp_l2_init(void); #endif +#if defined(SOC_MV_ARMADA38X) +int armada38x_win_set_iosync_barrier(void); +int armada38x_scu_enable(void); +int armada38x_open_bootrom_win(void); +#endif #define MPP_PIN_MAX 68 #define MPP_PIN_CELLS 2 @@ -249,6 +254,19 @@ platform_late_init(void) #endif armadaxp_l2_init(); #endif + +#if defined(SOC_MV_ARMADA38X) + /* Set IO Sync Barrier bit for all Mbus devices */ + if (armada38x_win_set_iosync_barrier() != 0) + printf("WARNING: could not map CPU Subsystem registers\n"); + if (armada38x_scu_enable() != 0) + printf("WARNING: could not enable SCU\n"); +#ifdef SMP + /* Open window to bootROM memory - needed for SMP */ + if (armada38x_open_bootrom_win() != 0) + printf("WARNING: could not open window to bootROM\n"); +#endif +#endif } #define FDT_DEVMAP_MAX (MV_WIN_CPU_MAX + 2) Modified: projects/release-pkg/sys/arm/mv/mv_pci.c ============================================================================== --- projects/release-pkg/sys/arm/mv/mv_pci.c Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/mv_pci.c Wed Jan 20 17:08:01 2016 (r294448) @@ -1,7 +1,7 @@ /*- * Copyright (c) 2008 MARVELL INTERNATIONAL LTD. * Copyright (c) 2010 The FreeBSD Foundation - * Copyright (c) 2010-2012 Semihalf + * Copyright (c) 2010-2015 Semihalf * All rights reserved. * * Developed by Semihalf. @@ -1016,6 +1016,25 @@ mv_pcib_maxslots(device_t dev) return ((sc->sc_type != MV_TYPE_PCI) ? 1 : PCI_SLOTMAX); } +static int +mv_pcib_root_slot(device_t dev, u_int bus, u_int slot, u_int func) +{ +#if defined(SOC_MV_ARMADA38X) + struct mv_pcib_softc *sc = device_get_softc(dev); + uint32_t vendor, device; + + vendor = mv_pcib_hw_cfgread(sc, bus, slot, func, PCIR_VENDOR, + PCIR_VENDOR_LENGTH); + device = mv_pcib_hw_cfgread(sc, bus, slot, func, PCIR_DEVICE, + PCIR_DEVICE_LENGTH) & MV_DEV_FAMILY_MASK; + + return (vendor == PCI_VENDORID_MRVL && device == MV_DEV_ARMADA38X); +#else + /* On platforms other than Armada38x, root link is always at slot 0 */ + return (slot == 0); +#endif +} + static uint32_t mv_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) @@ -1024,7 +1043,7 @@ mv_pcib_read_config(device_t dev, u_int /* Return ~0 if link is inactive or trying to read from Root */ if ((bus_space_read_4(sc->sc_bst, sc->sc_bsh, PCIE_REG_STATUS) & - PCIE_STATUS_LINK_DOWN) || (slot == 0)) + PCIE_STATUS_LINK_DOWN) || mv_pcib_root_slot(dev, bus, slot, func)) return (~0U); return (mv_pcib_hw_cfgread(sc, bus, slot, func, reg, bytes)); @@ -1038,7 +1057,7 @@ mv_pcib_write_config(device_t dev, u_int /* Return if link is inactive or trying to write to Root */ if ((bus_space_read_4(sc->sc_bst, sc->sc_bsh, PCIE_REG_STATUS) & - PCIE_STATUS_LINK_DOWN) || (slot == 0)) + PCIE_STATUS_LINK_DOWN) || mv_pcib_root_slot(dev, bus, slot, func)) return; mv_pcib_hw_cfgwrite(sc, bus, slot, func, reg, val, bytes); Modified: projects/release-pkg/sys/arm/mv/mvreg.h ============================================================================== --- projects/release-pkg/sys/arm/mv/mvreg.h Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/mvreg.h Wed Jan 20 17:08:01 2016 (r294448) @@ -34,6 +34,8 @@ #ifndef _MVREG_H_ #define _MVREG_H_ +#include + #if defined(SOC_MV_DISCOVERY) #define IRQ_CAUSE_ERROR 0x0 #define IRQ_CAUSE 0x4 @@ -123,8 +125,9 @@ /* * System reset */ -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) #define RSTOUTn_MASK 0x60 +#define RSTOUTn_MASK_WD 0x400 #define SYSTEM_SOFT_RESET 0x64 #define WD_RSTOUTn_MASK 0x4 #define WD_GLOBAL_MASK 0x00000100 @@ -217,8 +220,10 @@ #define CPU_TIMER0_AUTO 0x00000002 #define CPU_TIMER1_EN 0x00000004 #define CPU_TIMER1_AUTO 0x00000008 -#define CPU_TIMER_WD_EN 0x00000010 -#define CPU_TIMER_WD_AUTO 0x00000020 +#define CPU_TIMER2_EN 0x00000010 +#define CPU_TIMER2_AUTO 0x00000020 +#define CPU_TIMER_WD_EN 0x00000100 +#define CPU_TIMER_WD_AUTO 0x00000200 /* 25MHz mode is Armada XP - specific */ #define CPU_TIMER_WD_25MHZ_EN 0x00000400 #define CPU_TIMER0_25MHZ_EN 0x00000800 @@ -346,6 +351,8 @@ #define SAMPLE_AT_RESET 0x30 #elif defined(SOC_MV_FREY) #define SAMPLE_AT_RESET 0x100 +#elif defined(SOC_MV_ARMADA38X) +#define SAMPLE_AT_RESET 0x400 #endif #if defined(SOC_MV_DISCOVERY) #define SAMPLE_AT_RESET_LO 0x30 @@ -370,6 +377,9 @@ #elif defined(SOC_MV_LOKIPLUS) #define TCLK_MASK 0x0000F000 #define TCLK_SHIFT 0x0C +#elif defined(SOC_MV_ARMADA38X) +#define TCLK_MASK 0x00008000 +#define TCLK_SHIFT 15 #endif #define TCLK_100MHZ 100000000 @@ -415,6 +425,9 @@ #define MV_DEV_88F6281 0x6281 #define MV_DEV_88F6282 0x6282 #define MV_DEV_88F6781 0x6781 +#define MV_DEV_88F6828 0x6828 +#define MV_DEV_88F6820 0x6820 +#define MV_DEV_88F6810 0x6810 #define MV_DEV_MV78100_Z0 0x6381 #define MV_DEV_MV78100 0x7810 #define MV_DEV_MV78130 0x7813 @@ -428,6 +441,7 @@ #define MV_DEV_FAMILY_MASK 0xff00 #define MV_DEV_DISCOVERY 0x7800 +#define MV_DEV_ARMADA38X 0x6800 /* * Doorbell register control @@ -444,4 +458,36 @@ #define MV_DRBL_MASK(d,u) (0x10 * (u) + 0x8 * (d) + 0x4) #define MV_DRBL_MSG(m,d,u) (0x10 * (u) + 0x8 * (d) + 0x4 * (m) + 0x30) #endif + +/* + * SCU + */ +#if defined(SOC_MV_ARMADA38X) +#define MV_SCU_BASE (MV_BASE + 0xc000) +#define MV_SCU_REGS_LEN 0x100 +#define MV_SCU_REG_CTRL 0x00 +#define MV_SCU_REG_CONFIG 0x04 +#define MV_SCU_ENABLE 1 +#define SCU_CFG_REG_NCPU_MASK 0x3 +#endif + +/* + * PMSU + */ +#if defined(SOC_MV_ARMADA38X) +#define MV_PMSU_BASE (MV_BASE + 0x22000) +#define MV_PMSU_REGS_LEN 0x1000 +#define PMSU_BOOT_ADDR_REDIRECT_OFFSET(cpu) (((cpu) * 0x100) + 0x124) +#endif + +/* + * CPU RESET + */ +#if defined(SOC_MV_ARMADA38X) +#define MV_CPU_RESET_BASE (MV_BASE + 0x20800) +#define MV_CPU_RESET_REGS_LEN 0x8 +#define CPU_RESET_OFFSET(cpu) ((cpu) * 0x8) +#define CPU_RESET_ASSERT 0x1 +#endif + #endif /* _MVREG_H_ */ Modified: projects/release-pkg/sys/arm/mv/mvvar.h ============================================================================== --- projects/release-pkg/sys/arm/mv/mvvar.h Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/mvvar.h Wed Jan 20 17:08:01 2016 (r294448) @@ -109,7 +109,7 @@ uint32_t get_l2clk(void); uint32_t read_cpu_ctrl(uint32_t); void write_cpu_ctrl(uint32_t, uint32_t); -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) uint32_t read_cpu_mp_clocks(uint32_t reg); void write_cpu_mp_clocks(uint32_t reg, uint32_t val); uint32_t read_cpu_misc(uint32_t reg); Modified: projects/release-pkg/sys/arm/mv/mvwin.h ============================================================================== --- projects/release-pkg/sys/arm/mv/mvwin.h Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/mvwin.h Wed Jan 20 17:08:01 2016 (r294448) @@ -73,6 +73,8 @@ #define MV_PCI_PORTS 2 /* 2x PCIE */ #elif defined(SOC_MV_ARMADAXP) #define MV_PCI_PORTS 3 /* 3x PCIE */ +#elif defined(SOC_MV_ARMADA38X) +#define MV_PCI_PORTS 4 /* 4x PCIE */ #else #error "MV_PCI_PORTS not configured !" #endif @@ -122,14 +124,14 @@ #define MV_DDR_CADR_BASE (MV_AXI_BASE + 0x100) #elif defined(SOC_MV_LOKIPLUS) #define MV_DDR_CADR_BASE (MV_BASE + 0xF1500) -#elif defined(SOC_MV_ARMADAXP) +#elif defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) #define MV_DDR_CADR_BASE (MV_BASE + 0x20180) #else #define MV_DDR_CADR_BASE (MV_BASE + 0x1500) #endif #define MV_MPP_BASE (MV_BASE + 0x10000) -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) #define MV_MISC_BASE (MV_BASE + 0x18200) #define MV_MBUS_BRIDGE_BASE (MV_BASE + 0x20000) #define MV_INTREGS_BASE (MV_MBUS_BRIDGE_BASE + 0x80) @@ -148,6 +150,8 @@ #if defined(SOC_MV_FREY) #define MV_PCIE_BASE (MV_BASE + 0x8000) +#elif defined(SOC_MV_ARMADA38X) +#define MV_PCIE_BASE (MV_BASE + 0x80000) #else #define MV_PCIE_BASE (MV_BASE + 0x40000) #endif @@ -168,7 +172,7 @@ /* * Decode windows definitions and macros */ -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) #define MV_WIN_CPU_CTRL(n) (((n) < 8) ? 0x10 * (n) : 0x90 + (0x8 * ((n) - 8))) #define MV_WIN_CPU_BASE(n) ((((n) < 8) ? 0x10 * (n) : 0x90 + (0x8 * ((n) - 8))) + 0x4) #define MV_WIN_CPU_REMAP_LO(n) (0x10 * (n) + 0x008) @@ -182,7 +186,7 @@ #if defined(SOC_MV_DISCOVERY) #define MV_WIN_CPU_MAX 14 -#elif defined(SOC_MV_ARMADAXP) +#elif defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) #define MV_WIN_CPU_MAX 20 #else #define MV_WIN_CPU_MAX 8 @@ -267,6 +271,10 @@ #define MV_WIN_PCIE_TARGET(n) (4 + (4 * ((n) % 2))) #define MV_WIN_PCIE_MEM_ATTR(n) (0xE8 + (0x10 * ((n) / 2))) #define MV_WIN_PCIE_IO_ATTR(n) (0xE0 + (0x10 * ((n) / 2))) +#elif defined(SOC_MV_ARMADA38X) +#define MV_WIN_PCIE_TARGET(n) ((n) == 0 ? 8 : 4) +#define MV_WIN_PCIE_MEM_ATTR(n) ((n) < 2 ? 0xE8 : (0xD8 - (((n) % 2) * 0x20))) +#define MV_WIN_PCIE_IO_ATTR(n) ((n) < 2 ? 0xE0 : (0xD0 - (((n) % 2) * 0x20))) #elif defined(SOC_MV_ORION) #define MV_WIN_PCIE_TARGET(n) 4 #define MV_WIN_PCIE_MEM_ATTR(n) 0x59 @@ -303,6 +311,35 @@ #define MV_WIN_SATA_BASE(n) (0x10 * (n) + 0x34) #define MV_WIN_SATA_MAX 4 +#if defined(SOC_MV_ARMADA38X) +#define MV_BOOTROM_MEM_ADDR 0xFFF00000 +#define MV_BOOTROM_WIN_SIZE 0xF +#define MV_CPU_SUBSYS_REGS_LEN 0x100 + +/* IO Window Control Register fields */ +#define IO_WIN_SIZE_SHIFT 16 +#define IO_WIN_SIZE_MASK 0xFFFF +#define IO_WIN_ATTR_SHIFT 8 +#define IO_WIN_ATTR_MASK 0xFF +#define IO_WIN_TGT_SHIFT 4 +#define IO_WIN_TGT_MASK 0xF +#define IO_WIN_SYNC_SHIFT 1 +#define IO_WIN_SYNC_MASK 0x1 +#define IO_WIN_ENA_SHIFT 0 +#define IO_WIN_ENA_MASK 0x1 + +#define IO_WIN_9_CTRL_OFFSET 0x98 +#define IO_WIN_9_BASE_OFFSET 0x9C + +/* Mbus decoding unit IDs and attributes */ +#define MBUS_BOOTROM_TGT_ID 0x1 +#define MBUS_BOOTROM_ATTR 0x1D + +/* Internal Units Sync Barrier Control Register */ +#define MV_SYNC_BARRIER_CTRL 0x84 +#define MV_SYNC_BARRIER_CTRL_ALL 0xFFFF +#endif + #define WIN_REG_IDX_RD(pre,reg,off,base) \ static __inline uint32_t \ pre ## _ ## reg ## _read(int i) \ Modified: projects/release-pkg/sys/arm/mv/timer.c ============================================================================== --- projects/release-pkg/sys/arm/mv/timer.c Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/timer.c Wed Jan 20 17:08:01 2016 (r294448) @@ -54,26 +54,44 @@ __FBSDID("$FreeBSD$"); #define INITIAL_TIMECOUNTER (0xffffffff) #define MAX_WATCHDOG_TICKS (0xffffffff) -#if defined(SOC_MV_ARMADAXP) +#define MV_TMR 0x1 +#define MV_WDT 0x2 +#define MV_NONE 0x0 + +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) #define MV_CLOCK_SRC 25000000 /* Timers' 25MHz mode */ #else #define MV_CLOCK_SRC get_tclk() #endif +#if defined(SOC_MV_ARMADA38X) +#define WATCHDOG_TIMER 4 +#else +#define WATCHDOG_TIMER 2 +#endif + struct mv_timer_softc { struct resource * timer_res[2]; bus_space_tag_t timer_bst; bus_space_handle_t timer_bsh; struct mtx timer_mtx; struct eventtimer et; + boolean_t has_wdt; }; static struct resource_spec mv_timer_spec[] = { { SYS_RES_MEMORY, 0, RF_ACTIVE }, - { SYS_RES_IRQ, 0, RF_ACTIVE }, + { SYS_RES_IRQ, 0, RF_ACTIVE | RF_OPTIONAL }, { -1, 0 } }; +/* Interrupt is not required by MV_WDT devices */ +static struct ofw_compat_data mv_timer_compat[] = { + {"mrvl,timer", MV_TMR | MV_WDT }, + {"marvell,armada-380-wdt", MV_WDT }, + {NULL, MV_NONE } +}; + static struct mv_timer_softc *timer_softc = NULL; static int timers_initialized = 0; @@ -111,7 +129,7 @@ mv_timer_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "mrvl,timer")) + if (ofw_bus_search_compatible(dev, mv_timer_compat)->ocd_data == MV_NONE) return (ENXIO); device_set_desc(dev, "Marvell CPU Timer"); @@ -124,7 +142,7 @@ mv_timer_attach(device_t dev) int error; void *ihl; struct mv_timer_softc *sc; -#if !defined(SOC_MV_ARMADAXP) +#if !defined(SOC_MV_ARMADAXP) && !defined(SOC_MV_ARMADA38X) uint32_t irq_cause, irq_mask; #endif @@ -143,9 +161,26 @@ mv_timer_attach(device_t dev) sc->timer_bst = rman_get_bustag(sc->timer_res[0]); sc->timer_bsh = rman_get_bushandle(sc->timer_res[0]); + sc->has_wdt = ofw_bus_has_prop(dev, "mrvl,has-wdt") || + ofw_bus_is_compatible(dev, "marvell,armada-380-wdt"); + mtx_init(&timer_softc->timer_mtx, "watchdog", NULL, MTX_DEF); - mv_watchdog_disable(); - EVENTHANDLER_REGISTER(watchdog_list, mv_watchdog_event, sc, 0); + + if (sc->has_wdt) { + mv_watchdog_disable(); + EVENTHANDLER_REGISTER(watchdog_list, mv_watchdog_event, sc, 0); + } + + if (ofw_bus_search_compatible(dev, mv_timer_compat)->ocd_data + == MV_WDT) { + /* Don't set timers for wdt-only entry. */ + device_printf(dev, "only watchdog attached\n"); + return (0); + } else if (sc->timer_res[1] == NULL) { + device_printf(dev, "no interrupt resource\n"); + bus_release_resources(dev, mv_timer_spec, sc->timer_res); + return (ENXIO); + } if (bus_setup_intr(dev, sc->timer_res[1], INTR_TYPE_CLK, mv_hardclock, NULL, sc, &ihl) != 0) { @@ -155,7 +190,7 @@ mv_timer_attach(device_t dev) } mv_setup_timers(); -#if !defined(SOC_MV_ARMADAXP) +#if !defined(SOC_MV_ARMADAXP) && !defined(SOC_MV_ARMADA38X) irq_cause = read_cpu_ctrl(BRIDGE_IRQ_CAUSE); irq_cause &= IRQ_TIMER0_CLR; @@ -294,7 +329,7 @@ static void mv_watchdog_enable(void) { uint32_t val, irq_cause; -#if !defined(SOC_MV_ARMADAXP) +#if !defined(SOC_MV_ARMADAXP) && !defined(SOC_MV_ARMADA38X) uint32_t irq_mask; #endif @@ -302,10 +337,14 @@ mv_watchdog_enable(void) irq_cause &= IRQ_TIMER_WD_CLR; write_cpu_ctrl(BRIDGE_IRQ_CAUSE, irq_cause); -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) val = read_cpu_mp_clocks(WD_RSTOUTn_MASK); val |= (WD_GLOBAL_MASK | WD_CPU0_MASK); write_cpu_mp_clocks(WD_RSTOUTn_MASK, val); + + val = read_cpu_misc(RSTOUTn_MASK); + val &= ~RSTOUTn_MASK_WD; + write_cpu_misc(RSTOUTn_MASK, val); #else irq_mask = read_cpu_ctrl(BRIDGE_IRQ_MASK); irq_mask |= IRQ_TIMER_WD_MASK; @@ -317,9 +356,12 @@ mv_watchdog_enable(void) #endif val = mv_get_timer_control(); - val |= CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO; -#if defined(SOC_MV_ARMADAXP) - val |= CPU_TIMER_WD_25MHZ_EN; +#if defined(SOC_MV_ARMADA38X) + val |= CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO | CPU_TIMER_WD_25MHZ_EN; +#elif defined(SOC_MV_ARMADAXP) + val |= CPU_TIMER2_EN | CPU_TIMER2_AUTO | CPU_TIMER_WD_25MHZ_EN; +#else + val |= CPU_TIMER2_EN | CPU_TIMER2_AUTO; #endif mv_set_timer_control(val); } @@ -328,18 +370,26 @@ static void mv_watchdog_disable(void) { uint32_t val, irq_cause; -#if !defined(SOC_MV_ARMADAXP) +#if !defined(SOC_MV_ARMADAXP) && !defined(SOC_MV_ARMADA38X) uint32_t irq_mask; #endif val = mv_get_timer_control(); +#if defined(SOC_MV_ARMADA38X) val &= ~(CPU_TIMER_WD_EN | CPU_TIMER_WD_AUTO); +#else + val &= ~(CPU_TIMER2_EN | CPU_TIMER2_AUTO); +#endif mv_set_timer_control(val); -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) val = read_cpu_mp_clocks(WD_RSTOUTn_MASK); val &= ~(WD_GLOBAL_MASK | WD_CPU0_MASK); write_cpu_mp_clocks(WD_RSTOUTn_MASK, val); + + val = read_cpu_misc(RSTOUTn_MASK); + val |= RSTOUTn_MASK_WD; + write_cpu_misc(RSTOUTn_MASK, RSTOUTn_MASK_WD); #else val = read_cpu_ctrl(RSTOUTn_MASK); val &= ~WD_RST_OUT_EN; @@ -378,8 +428,7 @@ mv_watchdog_event(void *arg, unsigned in if (ticks > MAX_WATCHDOG_TICKS) mv_watchdog_disable(); else { - /* Timer 2 is the watchdog */ - mv_set_timer(2, ticks); + mv_set_timer(WATCHDOG_TIMER, ticks); mv_watchdog_enable(); *error = 0; } @@ -438,7 +487,7 @@ mv_setup_timers(void) val = mv_get_timer_control(); val &= ~(CPU_TIMER0_EN | CPU_TIMER0_AUTO); val |= CPU_TIMER1_EN | CPU_TIMER1_AUTO; -#if defined(SOC_MV_ARMADAXP) +#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) /* Enable 25MHz mode */ val |= CPU_TIMER0_25MHZ_EN | CPU_TIMER1_25MHZ_EN; #endif Modified: projects/release-pkg/sys/arm/mv/twsi.c ============================================================================== --- projects/release-pkg/sys/arm/mv/twsi.c Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm/mv/twsi.c Wed Jan 20 17:08:01 2016 (r294448) @@ -141,6 +141,12 @@ static struct resource_spec res_spec[] = { -1, 0 } }; +static struct ofw_compat_data compat_data[] = { + { "mrvl,twsi", true }, + { "marvell,mv64xxx-i2c", true }, + { NULL, false } +}; + static device_method_t mv_twsi_methods[] = { /* device interface */ DEVMETHOD(device_probe, mv_twsi_probe), @@ -308,7 +314,7 @@ mv_twsi_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "mrvl,twsi")) + if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data) return (ENXIO); device_set_desc(dev, "Marvell Integrated I2C Bus Controller"); Modified: projects/release-pkg/sys/arm64/conf/GENERIC ============================================================================== --- projects/release-pkg/sys/arm64/conf/GENERIC Wed Jan 20 17:07:13 2016 (r294447) +++ projects/release-pkg/sys/arm64/conf/GENERIC Wed Jan 20 17:08:01 2016 (r294448) @@ -66,7 +66,6 @@ options MAC # TrustedBSD MAC Framewor options KDTRACE_FRAME # Ensure frames are compiled in options KDTRACE_HOOKS # Kernel DTrace hooks options VFP # Floating-point support -options VFS_AIO # Real implementations of the aio_* system calls options RACCT # Resource accounting framework options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default options RCTL # Resource limits Copied: projects/release-pkg/sys/boot/fdt/dts/arm/armada-380.dtsi (from r294447, head/sys/boot/fdt/dts/arm/armada-380.dtsi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/sys/boot/fdt/dts/arm/armada-380.dtsi Wed Jan 20 17:08:01 2016 (r294448, copy of r294447, head/sys/boot/fdt/dts/arm/armada-380.dtsi) @@ -0,0 +1,154 @@ +/* + * Device Tree Include file for Marvell Armada 380 SoC. + * + * Copyright (C) 2014 Marvell + * + * Lior Amsalem + * Gregory CLEMENT + * Thomas Petazzoni + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * $FreeBSD$ + */ + +#include "armada-38x.dtsi" + +/ { + model = "Marvell Armada 380 family SoC"; + compatible = "marvell,armada380"; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "marvell,armada-380-smp"; + + cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0>; + }; + }; + + soc { + internal-regs { + pinctrl@18000 { + compatible = "marvell,mv88f6810-pinctrl"; + }; + }; + + pcie-controller { + compatible = "marvell,armada-370-pcie"; + status = "disabled"; + device_type = "pci"; + + #address-cells = <3>; + #size-cells = <2>; + + msi-parent = <&mpic>; + bus-range = <0x00 0xff>; + + ranges = + <0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000 + 0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000 + 0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000 + 0x82000000 0 0x48000 MBUS_ID(0xf0, 0x01) 0x48000 0 0x00002000 + 0x82000000 0x1 0 MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 0 MEM */ + 0x81000000 0x1 0 MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 0 IO */ + 0x82000000 0x2 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 1 MEM */ + 0x81000000 0x2 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 1 IO */ + 0x82000000 0x3 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 2 MEM */ + 0x81000000 0x3 0 MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 2 IO */>; + + /* x1 port */ + pcie@1,0 { + device_type = "pci"; + assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; + reg = <0x0800 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0 + 0x81000000 0 0 0x81000000 0x1 0 1 0>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; + marvell,pcie-port = <0>; + marvell,pcie-lane = <0>; + clocks = <&gateclk 8>; + status = "disabled"; + }; + + /* x1 port */ + pcie@2,0 { + device_type = "pci"; + assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Thu Jan 21 16:36:35 2016 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 51974A8C317 for ; Thu, 21 Jan 2016 16:36:35 +0000 (UTC) (envelope-from gjb@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 2A19A1D41; Thu, 21 Jan 2016 16:36:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LGaYFT094288; Thu, 21 Jan 2016 16:36:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LGaXBP094280; Thu, 21 Jan 2016 16:36:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211636.u0LGaXBP094280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 16:36:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294508 - in projects/release-pkg/share/man: man1 man3 man4 man5 man6 man7 man8 man9 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 16:36:35 -0000 Author: gjb Date: Thu Jan 21 16:36:33 2016 New Revision: 294508 URL: https://svnweb.freebsd.org/changeset/base/294508 Log: Separate manual pages into their own package. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/share/man/man1/Makefile projects/release-pkg/share/man/man3/Makefile projects/release-pkg/share/man/man4/Makefile projects/release-pkg/share/man/man5/Makefile projects/release-pkg/share/man/man6/Makefile projects/release-pkg/share/man/man7/Makefile projects/release-pkg/share/man/man8/Makefile projects/release-pkg/share/man/man9/Makefile Modified: projects/release-pkg/share/man/man1/Makefile ============================================================================== --- projects/release-pkg/share/man/man1/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man1/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -5,6 +5,8 @@ MAN= builtin.1 intro.1 +PACKAGE=runtime-manuals + .if ${MK_TESTS} != "no" ATF= ${.CURDIR}/../../../contrib/atf .PATH: ${ATF}/doc Modified: projects/release-pkg/share/man/man3/Makefile ============================================================================== --- projects/release-pkg/share/man/man3/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man3/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -3,6 +3,8 @@ .include +PACKAGE=runtime-manuals + MAN= assert.3 \ ATOMIC_VAR_INIT.3 \ bitstring.3 \ Modified: projects/release-pkg/share/man/man4/Makefile ============================================================================== --- projects/release-pkg/share/man/man4/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man4/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -3,6 +3,8 @@ .include +PACKAGE=runtime-manuals + MAN= aac.4 \ aacraid.4 \ acpi.4 \ Modified: projects/release-pkg/share/man/man5/Makefile ============================================================================== --- projects/release-pkg/share/man/man5/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man5/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -3,6 +3,8 @@ .include +PACKAGE=runtime-manuals + #MISSING: dump.5 plot.5 MAN= acct.5 \ ar.5 \ Modified: projects/release-pkg/share/man/man6/Makefile ============================================================================== --- projects/release-pkg/share/man/man6/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man6/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -2,4 +2,6 @@ MAN= intro.6 +PACKAGE=runtime-manuals + .include Modified: projects/release-pkg/share/man/man7/Makefile ============================================================================== --- projects/release-pkg/share/man/man7/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man7/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -3,6 +3,8 @@ .include +PACKAGE=runtime-manuals + #MISSING: eqnchar.7 ms.7 term.7 MAN= adding_user.7 \ ascii.7 \ Modified: projects/release-pkg/share/man/man8/Makefile ============================================================================== --- projects/release-pkg/share/man/man8/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man8/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ +PACKAGE=runtime-manuals + MAN= crash.8 \ diskless.8 \ intro.8 \ Modified: projects/release-pkg/share/man/man9/Makefile ============================================================================== --- projects/release-pkg/share/man/man9/Makefile Thu Jan 21 16:11:20 2016 (r294507) +++ projects/release-pkg/share/man/man9/Makefile Thu Jan 21 16:36:33 2016 (r294508) @@ -2,6 +2,8 @@ .include +PACKAGE=runtime-manuals + MAN= accept_filter.9 \ accf_data.9 \ accf_dns.9 \ From owner-svn-src-projects@freebsd.org Thu Jan 21 16:38:59 2016 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 A815DA8C434 for ; Thu, 21 Jan 2016 16:38:59 +0000 (UTC) (envelope-from gjb@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 7AE5910C0; Thu, 21 Jan 2016 16:38:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LGcwlQ094540; Thu, 21 Jan 2016 16:38:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LGcwN1094539; Thu, 21 Jan 2016 16:38:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211638.u0LGcwN1094539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 16:38:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294509 - projects/release-pkg/release/packages X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 16:38:59 -0000 Author: gjb Date: Thu Jan 21 16:38:58 2016 New Revision: 294509 URL: https://svnweb.freebsd.org/changeset/base/294509 Log: Add UCL file for release-manuals package, missed in previous commit. Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/release/packages/runtime-manuals.ucl Added: projects/release-pkg/release/packages/runtime-manuals.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/runtime-manuals.ucl Thu Jan 21 16:38:58 2016 (r294509) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "FreeBSD runtime manual pages" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < 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 92ED8A8C8C6 for ; Thu, 21 Jan 2016 16:50:18 +0000 (UTC) (envelope-from gjb@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 457511A0B; Thu, 21 Jan 2016 16:50:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LGoH2T098168; Thu, 21 Jan 2016 16:50:17 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LGoGs0098164; Thu, 21 Jan 2016 16:50:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211650.u0LGoGs0098164@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 16:50:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294512 - in projects/release-pkg/share/man/man4: man4.arm man4.i386 man4.powerpc man4.sparc64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 16:50:18 -0000 Author: gjb Date: Thu Jan 21 16:50:16 2016 New Revision: 294512 URL: https://svnweb.freebsd.org/changeset/base/294512 Log: Include architecture-specific manuals in the runtime-manuals package. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/share/man/man4/man4.arm/Makefile projects/release-pkg/share/man/man4/man4.i386/Makefile projects/release-pkg/share/man/man4/man4.powerpc/Makefile projects/release-pkg/share/man/man4/man4.sparc64/Makefile Modified: projects/release-pkg/share/man/man4/man4.arm/Makefile ============================================================================== --- projects/release-pkg/share/man/man4/man4.arm/Makefile Thu Jan 21 16:48:01 2016 (r294511) +++ projects/release-pkg/share/man/man4/man4.arm/Makefile Thu Jan 21 16:50:16 2016 (r294512) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=runtime-manuals + MAN= cgem.4 \ devcfg.4 \ mge.4 \ Modified: projects/release-pkg/share/man/man4/man4.i386/Makefile ============================================================================== --- projects/release-pkg/share/man/man4/man4.i386/Makefile Thu Jan 21 16:48:01 2016 (r294511) +++ projects/release-pkg/share/man/man4/man4.i386/Makefile Thu Jan 21 16:50:16 2016 (r294512) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=runtime-manuals + MAN= aic.4 \ apm.4 \ ce.4 \ Modified: projects/release-pkg/share/man/man4/man4.powerpc/Makefile ============================================================================== --- projects/release-pkg/share/man/man4/man4.powerpc/Makefile Thu Jan 21 16:48:01 2016 (r294511) +++ projects/release-pkg/share/man/man4/man4.powerpc/Makefile Thu Jan 21 16:50:16 2016 (r294512) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=runtime-manuals + MAN= adb.4 \ akbd.4 \ abtn.4 \ Modified: projects/release-pkg/share/man/man4/man4.sparc64/Makefile ============================================================================== --- projects/release-pkg/share/man/man4/man4.sparc64/Makefile Thu Jan 21 16:48:01 2016 (r294511) +++ projects/release-pkg/share/man/man4/man4.sparc64/Makefile Thu Jan 21 16:50:16 2016 (r294512) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE=runtime-manuals + MAN= auxio.4 \ central.4 \ clkbrd.4 \ From owner-svn-src-projects@freebsd.org Thu Jan 21 17:33:33 2016 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 BE4D8A8B7AE for ; Thu, 21 Jan 2016 17:33:33 +0000 (UTC) (envelope-from gjb@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 80D5B1648; Thu, 21 Jan 2016 17:33:33 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LHXWx4015212; Thu, 21 Jan 2016 17:33:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LHXVuE015201; Thu, 21 Jan 2016 17:33:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211733.u0LHXVuE015201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 17:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294517 - in projects/release-pkg: bin/rcp etc/pam.d libexec/rlogind libexec/rshd release/packages usr.bin/rlogin usr.bin/rsh usr.bin/ruptime usr.bin/rwho usr.sbin/rwhod X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 17:33:33 -0000 Author: gjb Date: Thu Jan 21 17:33:31 2016 New Revision: 294517 URL: https://svnweb.freebsd.org/changeset/base/294517 Log: Create a rcmds package. Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/release/packages/rcmds-debug.ucl projects/release-pkg/release/packages/rcmds.ucl Modified: projects/release-pkg/bin/rcp/Makefile projects/release-pkg/etc/pam.d/Makefile projects/release-pkg/libexec/rlogind/Makefile projects/release-pkg/libexec/rshd/Makefile projects/release-pkg/usr.bin/rlogin/Makefile projects/release-pkg/usr.bin/rsh/Makefile projects/release-pkg/usr.bin/ruptime/Makefile projects/release-pkg/usr.bin/rwho/Makefile projects/release-pkg/usr.sbin/rwhod/Makefile Modified: projects/release-pkg/bin/rcp/Makefile ============================================================================== --- projects/release-pkg/bin/rcp/Makefile Thu Jan 21 17:33:10 2016 (r294516) +++ projects/release-pkg/bin/rcp/Makefile Thu Jan 21 17:33:31 2016 (r294517) @@ -5,6 +5,8 @@ PROG= rcp SRCS= rcp.c util.c CFLAGS+=-DBINDIR=${BINDIR} +PACKAGE=rcmds + BINOWN= root BINMODE=4555 Modified: projects/release-pkg/etc/pam.d/Makefile ============================================================================== --- projects/release-pkg/etc/pam.d/Makefile Thu Jan 21 17:33:10 2016 (r294516) +++ projects/release-pkg/etc/pam.d/Makefile Thu Jan 21 17:33:31 2016 (r294517) @@ -13,7 +13,6 @@ FILES= README \ login \ other \ passwd pop3 \ - rsh \ sshd su system \ telnetd \ xdm @@ -26,6 +25,14 @@ ATDIR= /etc/pam.d ATMODE= 644 .endif +.if ${MK_RCMDS} != "no" +FILESGROUPS+= RCMDS +RCMDS+= rsh +RCMDSPACKAGE+= rcmds +RCMDSDIR= /etc/pam.d +RCMDSMODE= 644 +.endif + FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 Modified: projects/release-pkg/libexec/rlogind/Makefile ============================================================================== --- projects/release-pkg/libexec/rlogind/Makefile Thu Jan 21 17:33:10 2016 (r294516) +++ projects/release-pkg/libexec/rlogind/Makefile Thu Jan 21 17:33:31 2016 (r294517) @@ -5,6 +5,7 @@ PROG= rlogind MAN= rlogind.8 +PACKAGE=rcmds LIBADD= util WARNS?= 2 Modified: projects/release-pkg/libexec/rshd/Makefile ============================================================================== --- projects/release-pkg/libexec/rshd/Makefile Thu Jan 21 17:33:10 2016 (r294516) +++ projects/release-pkg/libexec/rshd/Makefile Thu Jan 21 17:33:31 2016 (r294517) @@ -4,6 +4,8 @@ PROG= rshd MAN= rshd.8 +PACKAGE=rcmds + WARNS?= 3 WFORMAT=0 Added: projects/release-pkg/release/packages/rcmds-debug.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/rcmds-debug.ucl Thu Jan 21 17:33:31 2016 (r294517) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "Remote Command Tools (debugging symbols)" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < Modified: projects/release-pkg/usr.bin/rwho/Makefile ============================================================================== --- projects/release-pkg/usr.bin/rwho/Makefile Thu Jan 21 17:33:10 2016 (r294516) +++ projects/release-pkg/usr.bin/rwho/Makefile Thu Jan 21 17:33:31 2016 (r294517) @@ -3,4 +3,6 @@ PROG= rwho +PACKAGE=rcmds + .include Modified: projects/release-pkg/usr.sbin/rwhod/Makefile ============================================================================== --- projects/release-pkg/usr.sbin/rwhod/Makefile Thu Jan 21 17:33:10 2016 (r294516) +++ projects/release-pkg/usr.sbin/rwhod/Makefile Thu Jan 21 17:33:31 2016 (r294517) @@ -4,6 +4,8 @@ PROG= rwhod MAN= rwhod.8 +PACKAGE=rcmds + WARNS?= 3 .include From owner-svn-src-projects@freebsd.org Thu Jan 21 17:49:12 2016 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 997F1A8BE2C for ; Thu, 21 Jan 2016 17:49:12 +0000 (UTC) (envelope-from gjb@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 7108A1E2A; Thu, 21 Jan 2016 17:49:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LHnBa3019289; Thu, 21 Jan 2016 17:49:11 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LHnAa0019280; Thu, 21 Jan 2016 17:49:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211749.u0LHnAa0019280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 17:49:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294519 - in projects/release-pkg: release/packages usr.bin/lastcomm usr.bin/lastcomm/tests usr.sbin/accton usr.sbin/sa usr.sbin/sa/tests X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 17:49:12 -0000 Author: gjb Date: Thu Jan 21 17:49:10 2016 New Revision: 294519 URL: https://svnweb.freebsd.org/changeset/base/294519 Log: Create an acct package for accounting tools. Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/release/packages/acct-debug.ucl projects/release-pkg/release/packages/acct.ucl Modified: projects/release-pkg/usr.bin/lastcomm/Makefile projects/release-pkg/usr.bin/lastcomm/tests/Makefile projects/release-pkg/usr.sbin/accton/Makefile projects/release-pkg/usr.sbin/sa/Makefile projects/release-pkg/usr.sbin/sa/tests/Makefile Added: projects/release-pkg/release/packages/acct-debug.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/acct-debug.ucl Thu Jan 21 17:49:10 2016 (r294519) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "Accounting Tools (debugging symbols)" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < +PACKAGE=acct + PROG= lastcomm SRCS= lastcomm.c readrec.c Modified: projects/release-pkg/usr.bin/lastcomm/tests/Makefile ============================================================================== --- projects/release-pkg/usr.bin/lastcomm/tests/Makefile Thu Jan 21 17:36:06 2016 (r294518) +++ projects/release-pkg/usr.bin/lastcomm/tests/Makefile Thu Jan 21 17:49:10 2016 (r294519) @@ -2,6 +2,8 @@ TAP_TESTS_SH= legacy_test +PACKAGE= tests + FILESDIR= ${TESTSDIR} FILES= v1-amd64-acct.in FILES+= v1-amd64.out Modified: projects/release-pkg/usr.sbin/accton/Makefile ============================================================================== --- projects/release-pkg/usr.sbin/accton/Makefile Thu Jan 21 17:36:06 2016 (r294518) +++ projects/release-pkg/usr.sbin/accton/Makefile Thu Jan 21 17:49:10 2016 (r294519) @@ -4,4 +4,6 @@ PROG= accton MAN= accton.8 +PACKAGE=acct + .include Modified: projects/release-pkg/usr.sbin/sa/Makefile ============================================================================== --- projects/release-pkg/usr.sbin/sa/Makefile Thu Jan 21 17:36:06 2016 (r294518) +++ projects/release-pkg/usr.sbin/sa/Makefile Thu Jan 21 17:49:10 2016 (r294519) @@ -8,6 +8,8 @@ PROG= sa MAN= sa.8 SRCS= main.c db.c pdb.c usrdb.c readrec.c +PACKAGE=acct + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif Modified: projects/release-pkg/usr.sbin/sa/tests/Makefile ============================================================================== --- projects/release-pkg/usr.sbin/sa/tests/Makefile Thu Jan 21 17:36:06 2016 (r294518) +++ projects/release-pkg/usr.sbin/sa/tests/Makefile Thu Jan 21 17:49:10 2016 (r294519) @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE= tests + TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} From owner-svn-src-projects@freebsd.org Thu Jan 21 18:02:32 2016 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 64D21A8C431 for ; Thu, 21 Jan 2016 18:02:32 +0000 (UTC) (envelope-from gjb@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 375731AD1; Thu, 21 Jan 2016 18:02:32 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LI2VRe025753; Thu, 21 Jan 2016 18:02:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LI2VS6025752; Thu, 21 Jan 2016 18:02:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211802.u0LI2VS6025752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 18:02:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294522 - projects/release-pkg/release/packages X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 18:02:32 -0000 Author: gjb Date: Thu Jan 21 18:02:31 2016 New Revision: 294522 URL: https://svnweb.freebsd.org/changeset/base/294522 Log: Fix an incorrect comment. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/release/packages/acct.ucl Modified: projects/release-pkg/release/packages/acct.ucl ============================================================================== --- projects/release-pkg/release/packages/acct.ucl Thu Jan 21 17:56:23 2016 (r294521) +++ projects/release-pkg/release/packages/acct.ucl Thu Jan 21 18:02:31 2016 (r294522) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "Accounting Tools (debugging symbols)" +comment = "Accounting Tools" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" From owner-svn-src-projects@freebsd.org Thu Jan 21 18:19:35 2016 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 84090A8C8B6 for ; Thu, 21 Jan 2016 18:19:35 +0000 (UTC) (envelope-from gjb@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 42CC315F5; Thu, 21 Jan 2016 18:19:35 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LIJYcm030093; Thu, 21 Jan 2016 18:19:34 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LIJX0Y030088; Thu, 21 Jan 2016 18:19:33 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211819.u0LIJX0Y030088@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 18:19:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294524 - in projects/release-pkg: etc/rc.d release/packages usr.sbin/amd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 18:19:35 -0000 Author: gjb Date: Thu Jan 21 18:19:33 2016 New Revision: 294524 URL: https://svnweb.freebsd.org/changeset/base/294524 Log: Create a package for amd(8) and related tools. While here, fix accounting rc script installation. Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/release/packages/amd-debug.ucl projects/release-pkg/release/packages/amd.ucl Modified: projects/release-pkg/etc/rc.d/Makefile projects/release-pkg/usr.sbin/amd/Makefile.inc Modified: projects/release-pkg/etc/rc.d/Makefile ============================================================================== --- projects/release-pkg/etc/rc.d/Makefile Thu Jan 21 18:17:19 2016 (r294523) +++ projects/release-pkg/etc/rc.d/Makefile Thu Jan 21 18:19:33 2016 (r294524) @@ -135,7 +135,8 @@ FILES= DAEMON \ zvol .if ${MK_ACCT} != "no" -FILES+= accounting +FILESGROUPS+= ACCT +ACCT+= accounting .endif .if ${MK_ACPI} != "no" @@ -148,7 +149,8 @@ FILES+= powerd .endif .if ${MK_AMD} != "no" -FILES+= amd +FILESGROUPS+= AMD +AMD+= amd .endif .if ${MK_APM} != "no" @@ -300,6 +302,10 @@ ACPIDIR= /etc/rc.d ACPIMODE= ${BINMODE} ACPIPACKAGE= acpi +AMDDIR= /etc/rc.d +AMDMODE= ${BINMODE} +AMDPACKAGE= amd + SSHDIR= /etc/rc.d SSHMODE= ${BINMODE} SSHPACKAGE= ssh @@ -312,4 +318,8 @@ JAILDIR= /etc/rc.d JAILMODE= ${BINMODE} JAILPACKAGE= jail +ACCTDIR= /etc/rc.d +ACCTMODE= ${BINMODE} +ACCTPACKAGE= acct + .include Added: projects/release-pkg/release/packages/amd-debug.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/amd-debug.ucl Thu Jan 21 18:19:33 2016 (r294524) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "BSD 4.4 Automounter (debugging symbols)" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < +PACKAGE= amd + CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include .if exists(${.OBJDIR}/../include) From owner-svn-src-projects@freebsd.org Thu Jan 21 18:41:57 2016 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 B5AE3A8CE50 for ; Thu, 21 Jan 2016 18:41:57 +0000 (UTC) (envelope-from gjb@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 7741A1880; Thu, 21 Jan 2016 18:41:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LIfuT6037275; Thu, 21 Jan 2016 18:41:56 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LIfuwi037269; Thu, 21 Jan 2016 18:41:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211841.u0LIfuwi037269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 18:41:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294527 - in projects/release-pkg: etc/rc.d release/packages usr.sbin/apm usr.sbin/apmd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 18:41:57 -0000 Author: gjb Date: Thu Jan 21 18:41:55 2016 New Revision: 294527 URL: https://svnweb.freebsd.org/changeset/base/294527 Log: Create a package for apm(8). Sponsored by: The FreeBSD Foundation Added: projects/release-pkg/release/packages/apm-debug.ucl projects/release-pkg/release/packages/apm.ucl Modified: projects/release-pkg/etc/rc.d/Makefile projects/release-pkg/usr.sbin/apm/Makefile projects/release-pkg/usr.sbin/apmd/Makefile Modified: projects/release-pkg/etc/rc.d/Makefile ============================================================================== --- projects/release-pkg/etc/rc.d/Makefile Thu Jan 21 18:22:50 2016 (r294526) +++ projects/release-pkg/etc/rc.d/Makefile Thu Jan 21 18:41:55 2016 (r294527) @@ -154,8 +154,9 @@ AMD+= amd .endif .if ${MK_APM} != "no" -FILES+= apm -FILES+= apmd +FILESGROUPS+= APM +APM+= apm +APM+= apmd .endif .if ${MK_AUTOFS} != "no" @@ -322,4 +323,8 @@ ACCTDIR= /etc/rc.d ACCTMODE= ${BINMODE} ACCTPACKAGE= acct +APMDIR= /etc/rc.d +APMMODE= ${BINMODE} +APMPACKAGE= apm + .include Added: projects/release-pkg/release/packages/apm-debug.ucl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/apm-debug.ucl Thu Jan 21 18:41:55 2016 (r294527) @@ -0,0 +1,13 @@ +name = "FreeBSD-%PKGNAME%" +origin = "base" +version = "%VERSION%" +comment = "Advanced Power Management Utilities (debugging symbols)" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "https://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = < Modified: projects/release-pkg/usr.sbin/apmd/Makefile ============================================================================== --- projects/release-pkg/usr.sbin/apmd/Makefile Thu Jan 21 18:22:50 2016 (r294526) +++ projects/release-pkg/usr.sbin/apmd/Makefile Thu Jan 21 18:41:55 2016 (r294527) @@ -5,6 +5,8 @@ MAN= apmd.8 MANSUBDIR= /i386 SRCS= apmd.c apmdlex.l apmdparse.y y.tab.h +PACKAGE=apm + WARNS?= 3 LIBADD= l From owner-svn-src-projects@freebsd.org Thu Jan 21 18:45:49 2016 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 EED78A8CFFA for ; Thu, 21 Jan 2016 18:45:48 +0000 (UTC) (envelope-from gjb@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 B4F4C1B55; Thu, 21 Jan 2016 18:45:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LIjl2O040441; Thu, 21 Jan 2016 18:45:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LIjkA6040425; Thu, 21 Jan 2016 18:45:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601211845.u0LIjkA6040425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 18:45:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294528 - projects/release-pkg/release/packages X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 18:45:49 -0000 Author: gjb Date: Thu Jan 21 18:45:46 2016 New Revision: 294528 URL: https://svnweb.freebsd.org/changeset/base/294528 Log: Comment wordsmithing. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl projects/release-pkg/release/packages/bsnmp-lib32-development.ucl projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl projects/release-pkg/release/packages/bsnmp-lib32.ucl projects/release-pkg/release/packages/debug-lib32.ucl projects/release-pkg/release/packages/lib32-development.ucl projects/release-pkg/release/packages/lib32-profile.ucl projects/release-pkg/release/packages/lib32.ucl projects/release-pkg/release/packages/ssh-debug-lib32.ucl projects/release-pkg/release/packages/ssh-lib32-development.ucl projects/release-pkg/release/packages/ssh-lib32-profile.ucl projects/release-pkg/release/packages/ssh-lib32.ucl projects/release-pkg/release/packages/unbound-debug-lib32.ucl projects/release-pkg/release/packages/unbound-lib32.ucl Modified: projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/bsnmp-debug-lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "SNMP 32bits libraries (debugging symbols)" +comment = "SNMP 32-bit libraries (debugging symbols)" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/bsnmp-lib32-development.ucl ============================================================================== --- projects/release-pkg/release/packages/bsnmp-lib32-development.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/bsnmp-lib32-development.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "SNMP 32bits development" +comment = "SNMP 32-bit development" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl ============================================================================== --- projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/bsnmp-lib32-profile.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "SNMP 32bits libraries (profiling)" +comment = "SNMP 32-bit libraries (profiling)" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/bsnmp-lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/bsnmp-lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/bsnmp-lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "SNMP 32bits libraries" +comment = "SNMP 32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/debug-lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/debug-lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/debug-lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "32bits libraries (debugging symbols)" +comment = "32-bit libraries (debugging symbols)" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/lib32-development.ucl ============================================================================== --- projects/release-pkg/release/packages/lib32-development.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/lib32-development.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "32bits libraries" +comment = "32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/lib32-profile.ucl ============================================================================== --- projects/release-pkg/release/packages/lib32-profile.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/lib32-profile.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "32bits libraries" +comment = "32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "32bits libraries" +comment = "32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/ssh-debug-lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/ssh-debug-lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/ssh-debug-lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "Secure SHell 32bits libraries (debugging symbols)" +comment = "Secure SHell 32-bit libraries (debugging symbols)" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/ssh-lib32-development.ucl ============================================================================== --- projects/release-pkg/release/packages/ssh-lib32-development.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/ssh-lib32-development.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "Secure SHell 32bits libraries" +comment = "Secure SHell 32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/ssh-lib32-profile.ucl ============================================================================== --- projects/release-pkg/release/packages/ssh-lib32-profile.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/ssh-lib32-profile.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "Secure SHell 32bits libraries" +comment = "Secure SHell 32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/ssh-lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/ssh-lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/ssh-lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "Secure SHell 32bits libraries" +comment = "Secure SHell 32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/unbound-debug-lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/unbound-debug-lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/unbound-debug-lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "Validating, recursive, and caching DNS resolver, 32bits libraries (debugging symbols)" +comment = "Validating, recursive, and caching DNS resolver, 32-bit libraries (debugging symbols)" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" Modified: projects/release-pkg/release/packages/unbound-lib32.ucl ============================================================================== --- projects/release-pkg/release/packages/unbound-lib32.ucl Thu Jan 21 18:41:55 2016 (r294527) +++ projects/release-pkg/release/packages/unbound-lib32.ucl Thu Jan 21 18:45:46 2016 (r294528) @@ -1,7 +1,7 @@ name = "FreeBSD-%PKGNAME%" origin = "base" version = "%VERSION%" -comment = "Validating, recursive, and caching DNS resolver, 32bits libraries" +comment = "Validating, recursive, and caching DNS resolver, 32-bit libraries" categories = [ base ] maintainer = "re@FreeBSD.org" www = "https://www.FreeBSD.org" From owner-svn-src-projects@freebsd.org Thu Jan 21 21:42:08 2016 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 60F4BA8C422 for ; Thu, 21 Jan 2016 21:42:08 +0000 (UTC) (envelope-from gjb@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 158F1151A; Thu, 21 Jan 2016 21:42:08 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0LLg77U094529; Thu, 21 Jan 2016 21:42:07 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0LLg7SK094528; Thu, 21 Jan 2016 21:42:07 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601212142.u0LLg7SK094528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 21 Jan 2016 21:42:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294533 - projects/release-pkg X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 21 Jan 2016 21:42:08 -0000 Author: gjb Date: Thu Jan 21 21:42:06 2016 New Revision: 294533 URL: https://svnweb.freebsd.org/changeset/base/294533 Log: Ensure pkg(8) is bootstrapped, and avoid prompting for confirmation to install, in case the 'packages' target is run non-interactively. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Thu Jan 21 21:16:57 2016 (r294532) +++ projects/release-pkg/Makefile.inc1 Thu Jan 21 21:42:06 2016 (r294533) @@ -1384,7 +1384,7 @@ create-world-packages: /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${DESTDIR}/$${pkgname}.ucl ; \ - pkg -o ABI_FILE=${DESTDIR}/bin/sh \ + env ASSUME_ALWAYS_YES="YES" pkg -o ABI_FILE=${DESTDIR}/bin/sh \ create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ -r ${DESTDIR} -o ${DESTDIR} ; \ @@ -1415,7 +1415,7 @@ create-kernel-packages: ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST - @pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ + @env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -r ${DESTDIR}/${DISTDIR}/kernel \ -o ${DESTDIR} @@ -1438,7 +1438,7 @@ create-kernel-packages: ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST - @pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ + @env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \ -o ${DESTDIR} From owner-svn-src-projects@freebsd.org Fri Jan 22 15:00:06 2016 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 75FF2A8DB4D for ; Fri, 22 Jan 2016 15:00:06 +0000 (UTC) (envelope-from bz@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 09C941FE0; Fri, 22 Jan 2016 15:00:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MF04Rq014017; Fri, 22 Jan 2016 15:00:04 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MF0114013983; Fri, 22 Jan 2016 15:00:01 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221500.u0MF0114013983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 15:00:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294566 - in projects/vnet/sys: contrib/ipfilter/netinet dev/usb/net kern net netinet netinet6 netipsec netpfil/ipfw netpfil/pf sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 15:00:06 -0000 Author: bz Date: Fri Jan 22 15:00:01 2016 New Revision: 294566 URL: https://svnweb.freebsd.org/changeset/base/294566 Log: Just checkpoint the WIP in order to be able to make the tree update easier. Note: this is currently not in a usable state as certain teardown parts are not called and the DOMAIN rework is missing. More to come soon and find its way to head. Obtained from: P4 //depot/user/bz/vimage/... Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c projects/vnet/sys/dev/usb/net/usb_ethernet.c projects/vnet/sys/kern/kern_shutdown.c projects/vnet/sys/kern/kern_timeout.c projects/vnet/sys/kern/uipc_domain.c projects/vnet/sys/net/if.c projects/vnet/sys/net/if_disc.c projects/vnet/sys/net/if_enc.c projects/vnet/sys/net/pfil.c projects/vnet/sys/net/vnet.c projects/vnet/sys/netinet/igmp.c projects/vnet/sys/netinet/in_proto.c projects/vnet/sys/netinet/ip_divert.c projects/vnet/sys/netinet/ip_mroute.c projects/vnet/sys/netinet/ip_var.h projects/vnet/sys/netinet/raw_ip.c projects/vnet/sys/netinet/sctp_bsd_addr.c projects/vnet/sys/netinet/sctp_pcb.c projects/vnet/sys/netinet/sctp_usrreq.c projects/vnet/sys/netinet/sctp_var.h projects/vnet/sys/netinet/tcp_subr.c projects/vnet/sys/netinet/tcp_var.h projects/vnet/sys/netinet/udp_usrreq.c projects/vnet/sys/netinet/udp_var.h projects/vnet/sys/netinet6/in6.c projects/vnet/sys/netinet6/in6_ifattach.c projects/vnet/sys/netinet6/in6_ifattach.h projects/vnet/sys/netinet6/in6_proto.c projects/vnet/sys/netinet6/ip6_input.c projects/vnet/sys/netinet6/ip6_mroute.c projects/vnet/sys/netinet6/mld6.c projects/vnet/sys/netinet6/nd6.c projects/vnet/sys/netinet6/nd6.h projects/vnet/sys/netipsec/ipsec.c projects/vnet/sys/netipsec/xform_tcp.c projects/vnet/sys/netpfil/ipfw/dn_sched.h projects/vnet/sys/netpfil/ipfw/ip_dummynet.c projects/vnet/sys/netpfil/ipfw/ip_fw2.c projects/vnet/sys/netpfil/ipfw/ip_fw_nat.c projects/vnet/sys/netpfil/pf/if_pfsync.c projects/vnet/sys/netpfil/pf/pf_ioctl.c projects/vnet/sys/sys/kernel.h Modified: projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c ============================================================================== --- projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c Fri Jan 22 15:00:01 2016 (r294566) @@ -287,7 +287,7 @@ static moduledata_t ipfiltermod = { }; -DECLARE_MODULE(ipfilter, ipfiltermod, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY); +DECLARE_MODULE(ipfilter, ipfiltermod, SI_SUB_FW, SI_ORDER_ANY); #ifdef MODULE_VERSION MODULE_VERSION(ipfilter, 1); #endif Modified: projects/vnet/sys/dev/usb/net/usb_ethernet.c ============================================================================== --- projects/vnet/sys/dev/usb/net/usb_ethernet.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/dev/usb/net/usb_ethernet.c Fri Jan 22 15:00:01 2016 (r294566) @@ -641,5 +641,9 @@ uether_rxflush(struct usb_ether *ue) } } -DECLARE_MODULE(uether, uether_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +/* + * USB net drivers are run by DRIVER_MODULE() thus SI_SUB_DRIVERS, + * SI_ORDER_MIDDLE. Run uether after that. + */ +DECLARE_MODULE(uether, uether_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); MODULE_VERSION(uether, 1); Modified: projects/vnet/sys/kern/kern_shutdown.c ============================================================================== --- projects/vnet/sys/kern/kern_shutdown.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/kern/kern_shutdown.c Fri Jan 22 15:00:01 2016 (r294566) @@ -899,3 +899,14 @@ mkdumpheader(struct kerneldumpheader *kd strlcpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring)); kdh->parity = kerneldump_parity(kdh); } + +#ifdef DDB +DB_SHOW_COMMAND(panic, db_show_panic) +{ + + if (panicstr == NULL) + db_printf("Not paniced\n"); + else + db_printf("panic: %s\n", panicstr); +} +#endif Modified: projects/vnet/sys/kern/kern_timeout.c ============================================================================== --- projects/vnet/sys/kern/kern_timeout.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/kern/kern_timeout.c Fri Jan 22 15:00:01 2016 (r294566) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include "opt_callout_profiling.h" +#include "opt_ddb.h" #if defined(__arm__) #include "opt_timer.h" #endif @@ -60,6 +61,11 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef DDB +#include +#include +#endif + #ifdef SMP #include #endif @@ -1615,3 +1621,35 @@ SYSCTL_PROC(_kern, OID_AUTO, callout_sta CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0, sysctl_kern_callout_stat, "I", "Dump immediate statistic snapshot of the scheduled callouts"); + +#ifdef DDB + +static void +_show_callout(struct callout *c) +{ + + db_printf("callout %p\n", c); +#define C_DB_PRINTF(f, e) db_printf(" %s = " f "\n", #e, c->e); + db_printf(" &c_links = %p\n", &(c->c_links)); + C_DB_PRINTF("%" PRId64, c_time); + C_DB_PRINTF("%" PRId64, c_precision); + C_DB_PRINTF("%p", c_arg); + C_DB_PRINTF("%p", c_func); + C_DB_PRINTF("%p", c_lock); + C_DB_PRINTF("%#x", c_flags); + C_DB_PRINTF("%#x", c_iflags); + C_DB_PRINTF("%d", c_cpu); +#undef C_DB_PRINTF +} + +DB_SHOW_COMMAND(callout, db_show_callout) +{ + + if (!have_addr) { + db_printf("usage: show callout \n"); + return; + } + + _show_callout((struct callout *)addr); +} +#endif /* DDB */ Modified: projects/vnet/sys/kern/uipc_domain.c ============================================================================== --- projects/vnet/sys/kern/uipc_domain.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/kern/uipc_domain.c Fri Jan 22 15:00:01 2016 (r294566) @@ -198,8 +198,12 @@ vnet_domain_uninit(void *arg) struct protosw *pr; for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) - if (pr->pr_destroy) + if (pr->pr_destroy) { +#ifdef INVARIANTS + printf("%s: pr %p called pr_destroy\n", __func__, pr); +#endif (*pr->pr_destroy)(); + } if (dp->dom_destroy) (*dp->dom_destroy)(); } Modified: projects/vnet/sys/net/if.c ============================================================================== --- projects/vnet/sys/net/if.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/net/if.c Fri Jan 22 15:00:01 2016 (r294566) @@ -384,6 +384,26 @@ vnet_if_uninit(const void *unused __unus } VNET_SYSUNINIT(vnet_if_uninit, SI_SUB_INIT_IF, SI_ORDER_FIRST, vnet_if_uninit, NULL); + +/* + * XXX-BZ VNET; probably along with dom stuff. + * This is very wrong but MC currently implies that interfaces are + * gone before we can free it. This needs to be fied differently + * and this needs to be moved back to SI_SUB_INIT_IF. + */ +static void +vnet_if_return(const void *unused __unused) +{ + struct ifnet *ifp, *nifp; + + /* Return all inherited interfaces to their parent vnets. */ + TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) { + if (ifp->if_home_vnet != ifp->if_vnet) + if_vmove(ifp, ifp->if_home_vnet); + } +} +VNET_SYSUNINIT(vnet_if_return, SI_SUB_VNET_DONE, SI_ORDER_ANY, + vnet_if_return, NULL); #endif static void @@ -821,6 +841,7 @@ if_purgeaddrs(struct ifnet *ifp) { struct ifaddr *ifa, *next; + /* XXX IF_ADDR_R/WLOCK */ TAILQ_FOREACH_SAFE(ifa, &ifp->if_addrhead, ifa_link, next) { if (ifa->ifa_addr->sa_family == AF_LINK) continue; @@ -845,7 +866,9 @@ if_purgeaddrs(struct ifnet *ifp) continue; } #endif /* INET6 */ + IF_ADDR_WLOCK(ifp); TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link); + IF_ADDR_WUNLOCK(ifp); ifa_free(ifa); } } @@ -979,7 +1002,9 @@ if_detach_internal(struct ifnet *ifp, in /* We can now free link ifaddr. */ if (!TAILQ_EMPTY(&ifp->if_addrhead)) { ifa = TAILQ_FIRST(&ifp->if_addrhead); + IF_ADDR_WLOCK(ifp); TAILQ_REMOVE(&ifp->if_addrhead, ifa, ifa_link); + IF_ADDR_WUNLOCK(ifp); ifa_free(ifa); } } @@ -1285,7 +1310,7 @@ if_delgroups(struct ifnet *ifp) strlcpy(groupname, ifgl->ifgl_group->ifg_group, IFNAMSIZ); IF_ADDR_WLOCK(ifp); - TAILQ_REMOVE(&ifp->if_groups, ifgl, ifgl_next); + TAILQ_REMOVE(&ifp->if_groups, ifgl, ifgl_next); // <<<< IF_ADDR_WUNLOCK(ifp); TAILQ_FOREACH(ifgm, &ifgl->ifgl_group->ifg_members, ifgm_next) Modified: projects/vnet/sys/net/if_disc.c ============================================================================== --- projects/vnet/sys/net/if_disc.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/net/if_disc.c Fri Jan 22 15:00:01 2016 (r294566) @@ -137,7 +137,7 @@ vnet_disc_init(const void *unused __unus V_disc_cloner = if_clone_simple(discname, disc_clone_create, disc_clone_destroy, 0); } -VNET_SYSINIT(vnet_disc_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, +VNET_SYSINIT(vnet_disc_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_disc_init, NULL); static void @@ -146,7 +146,7 @@ vnet_disc_uninit(const void *unused __un if_clone_detach(V_disc_cloner); } -VNET_SYSUNINIT(vnet_disc_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, +VNET_SYSUNINIT(vnet_disc_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_disc_uninit, NULL); static int Modified: projects/vnet/sys/net/if_enc.c ============================================================================== --- projects/vnet/sys/net/if_enc.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/net/if_enc.c Fri Jan 22 15:00:01 2016 (r294566) @@ -369,7 +369,7 @@ vnet_enc_init(const void *unused __unuse V_enc_cloner = if_clone_simple(encname, enc_clone_create, enc_clone_destroy, 1); } -VNET_SYSINIT(vnet_enc_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, +VNET_SYSINIT(vnet_enc_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_enc_init, NULL); static void @@ -378,7 +378,7 @@ vnet_enc_uninit(const void *unused __unu if_clone_detach(V_enc_cloner); } -VNET_SYSUNINIT(vnet_enc_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY, +VNET_SYSUNINIT(vnet_enc_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_enc_uninit, NULL); static int @@ -401,4 +401,4 @@ static moduledata_t enc_mod = { 0 }; -DECLARE_MODULE(if_enc, enc_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); +DECLARE_MODULE(if_enc, enc_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); Modified: projects/vnet/sys/net/pfil.c ============================================================================== --- projects/vnet/sys/net/pfil.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/net/pfil.c Fri Jan 22 15:00:01 2016 (r294566) @@ -363,39 +363,34 @@ pfil_chain_remove(pfil_chain_t *chain, p * Stuff that must be initialized for every instance (including the first of * course). */ -static int +static void vnet_pfil_init(const void *unused) { LIST_INIT(&V_pfil_head_list); PFIL_LOCK_INIT_REAL(&V_pfil_lock, "shared"); - return (0); } /* * Called for the removal of each instance. */ -static int +static void vnet_pfil_uninit(const void *unused) { - KASSERT(LIST_EMPTY(&V_pfil_head_list), + VNET_ASSERT(LIST_EMPTY(&V_pfil_head_list), ("%s: pfil_head_list %p not empty", __func__, &V_pfil_head_list)); PFIL_LOCK_DESTROY_REAL(&V_pfil_lock); - return (0); } -/* Define startup order. */ -#define PFIL_SYSINIT_ORDER SI_SUB_PROTO_BEGIN -#define PFIL_MODEVENT_ORDER (SI_ORDER_FIRST) /* On boot slot in here. */ -#define PFIL_VNET_ORDER (PFIL_MODEVENT_ORDER + 2) /* Later still. */ - /* * Starting up. * * VNET_SYSINIT is called for each existing vnet and each new vnet. + * Make sure the pfil bits are first before any possible subsystem which + * might piggyback on the SI_SUB_PROTO_PFIL. */ -VNET_SYSINIT(vnet_pfil_init, PFIL_SYSINIT_ORDER, PFIL_VNET_ORDER, +VNET_SYSINIT(vnet_pfil_init, SI_SUB_PROTO_PFIL, SI_ORDER_FIRST, vnet_pfil_init, NULL); /* @@ -403,5 +398,5 @@ VNET_SYSINIT(vnet_pfil_init, PFIL_SYSINI * * VNET_SYSUNINIT is called for each exiting vnet as it exits. */ -VNET_SYSUNINIT(vnet_pfil_uninit, PFIL_SYSINIT_ORDER, PFIL_VNET_ORDER, +VNET_SYSUNINIT(vnet_pfil_uninit, SI_SUB_PROTO_PFIL, SI_ORDER_FIRST, vnet_pfil_uninit, NULL); Modified: projects/vnet/sys/net/vnet.c ============================================================================== --- projects/vnet/sys/net/vnet.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/net/vnet.c Fri Jan 22 15:00:01 2016 (r294566) @@ -269,7 +269,6 @@ vnet_alloc(void) void vnet_destroy(struct vnet *vnet) { - struct ifnet *ifp, *nifp; SDT_PROBE2(vnet, functions, vnet_destroy, entry, __LINE__, vnet); KASSERT(vnet->vnet_sockcnt == 0, @@ -280,13 +279,6 @@ vnet_destroy(struct vnet *vnet) VNET_LIST_WUNLOCK(); CURVNET_SET_QUIET(vnet); - - /* Return all inherited interfaces to their parent vnets. */ - TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) { - if (ifp->if_home_vnet != ifp->if_vnet) - if_vmove(ifp, ifp->if_home_vnet); - } - vnet_sysuninit(); CURVNET_RESTORE(); Modified: projects/vnet/sys/netinet/igmp.c ============================================================================== --- projects/vnet/sys/netinet/igmp.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/igmp.c Fri Jan 22 15:00:01 2016 (r294566) @@ -50,6 +50,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_ddb.h" + #include #include #include @@ -64,6 +66,10 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef DDB +#include +#endif + #include #include #include @@ -221,7 +227,8 @@ static VNET_DEFINE(int, current_state_ti #define V_state_change_timers_running VNET(state_change_timers_running) #define V_current_state_timers_running VNET(current_state_timers_running) -static VNET_DEFINE(LIST_HEAD(, igmp_ifsoftc), igi_head); +static VNET_DEFINE(LIST_HEAD(, igmp_ifsoftc), igi_head) = + LIST_HEAD_INITIALIZER(igi_head); static VNET_DEFINE(struct igmpstat, igmpstat) = { .igps_version = IGPS_VERSION_3, .igps_len = sizeof(struct igmpstat), @@ -659,16 +666,12 @@ igmp_ifdetach(struct ifnet *ifp) void igmp_domifdetach(struct ifnet *ifp) { - struct igmp_ifsoftc *igi; CTR3(KTR_IGMPV3, "%s: called for ifp %p(%s)", __func__, ifp, ifp->if_xname); IGMP_LOCK(); - - igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; igi_delete_locked(ifp); - IGMP_UNLOCK(); } @@ -3593,70 +3596,74 @@ igmp_rec_type_to_str(const int type) } #endif +#ifdef VIMAGE static void -igmp_init(void *unused __unused) -{ - - CTR1(KTR_IGMPV3, "%s: initializing", __func__); - - IGMP_LOCK_INIT(); - - m_raopt = igmp_ra_alloc(); - - netisr_register(&igmp_nh); -} -SYSINIT(igmp_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, igmp_init, NULL); - -static void -igmp_uninit(void *unused __unused) +vnet_igmp_uninit(const void *unused __unused) { CTR1(KTR_IGMPV3, "%s: tearing down", __func__); - netisr_unregister(&igmp_nh); - - m_free(m_raopt); - m_raopt = NULL; - - IGMP_LOCK_DESTROY(); + VNET_ASSERT(LIST_EMPTY(&V_igi_head), + ("%s: igi list %p not empty; ifnets not detached?", __func__, + &V_igi_head)); } -SYSUNINIT(igmp_uninit, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, igmp_uninit, NULL); - -static void -vnet_igmp_init(const void *unused __unused) -{ - - CTR1(KTR_IGMPV3, "%s: initializing", __func__); - - LIST_INIT(&V_igi_head); -} -VNET_SYSINIT(vnet_igmp_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_igmp_init, - NULL); +VNET_SYSUNINIT(vnet_igmp_uninit, SI_SUB_PROTO_MC, SI_ORDER_ANY, + vnet_igmp_uninit, NULL); +#endif -static void -vnet_igmp_uninit(const void *unused __unused) +#ifdef DDB +DB_SHOW_COMMAND(igi_list, db_show_igi_list) { + struct igmp_ifsoftc *igi, *tigi; + LIST_HEAD(_igi_list, igmp_ifsoftc) *igi_head; - CTR1(KTR_IGMPV3, "%s: tearing down", __func__); - - KASSERT(LIST_EMPTY(&V_igi_head), - ("%s: igi list not empty; ifnets not detached?", __func__)); + if (!have_addr) { + db_printf("usage: show igi_list \n"); + return; + } + igi_head = (struct _igi_list *)addr; + + LIST_FOREACH_SAFE(igi, igi_head, igi_link, tigi) { + db_printf("igmp_ifsoftc %p:\n", igi); + db_printf(" ifp %p\n", igi->igi_ifp); + db_printf(" version %u\n", igi->igi_version); + db_printf(" v1_timer %u\n", igi->igi_v1_timer); + db_printf(" v2_timer %u\n", igi->igi_v2_timer); + db_printf(" v3_timer %u\n", igi->igi_v3_timer); + db_printf(" flags %#x\n", igi->igi_flags); + db_printf(" rv %u\n", igi->igi_rv); + db_printf(" qi %u\n", igi->igi_qi); + db_printf(" qri %u\n", igi->igi_qri); + db_printf(" uri %u\n", igi->igi_uri); + /* SLIST_HEAD(,in_multi) igi_relinmhead */ + /* struct mbufq igi_gq; */ + db_printf("\n"); + } } -VNET_SYSUNINIT(vnet_igmp_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY, - vnet_igmp_uninit, NULL); +#endif static int igmp_modevent(module_t mod, int type, void *unused __unused) { - switch (type) { - case MOD_LOAD: - case MOD_UNLOAD: - break; - default: - return (EOPNOTSUPP); - } - return (0); + switch (type) { + case MOD_LOAD: + CTR1(KTR_IGMPV3, "%s: initializing", __func__); + IGMP_LOCK_INIT(); + m_raopt = igmp_ra_alloc(); + netisr_register(&igmp_nh); + break; + case MOD_UNLOAD: + CTR1(KTR_IGMPV3, "%s: tearing down", __func__); + netisr_unregister(&igmp_nh); + m_free(m_raopt); + m_raopt = NULL; + IGMP_LOCK_DESTROY(); + break; + default: + return (EOPNOTSUPP); + } + return (0); } static moduledata_t igmp_mod = { @@ -3664,4 +3671,4 @@ static moduledata_t igmp_mod = { igmp_modevent, 0 }; -DECLARE_MODULE(igmp, igmp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(igmp, igmp_mod, SI_SUB_PROTO_MC, SI_ORDER_ANY); Modified: projects/vnet/sys/netinet/in_proto.c ============================================================================== --- projects/vnet/sys/netinet/in_proto.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/in_proto.c Fri Jan 22 15:00:01 2016 (r294566) @@ -118,9 +118,6 @@ struct protosw inetsw[] = { .pr_domain = &inetdomain, .pr_protocol = IPPROTO_IP, .pr_init = ip_init, -#ifdef VIMAGE - .pr_destroy = ip_destroy, -#endif .pr_slowtimo = ip_slowtimo, .pr_drain = ip_drain, .pr_usrreqs = &nousrreqs @@ -134,9 +131,6 @@ struct protosw inetsw[] = { .pr_ctlinput = udp_ctlinput, .pr_ctloutput = udp_ctloutput, .pr_init = udp_init, -#ifdef VIMAGE - .pr_destroy = udp_destroy, -#endif .pr_usrreqs = &udp_usrreqs }, { @@ -148,9 +142,6 @@ struct protosw inetsw[] = { .pr_ctlinput = tcp_ctlinput, .pr_ctloutput = tcp_ctloutput, .pr_init = tcp_init, -#ifdef VIMAGE - .pr_destroy = tcp_destroy, -#endif .pr_slowtimo = tcp_slowtimo, .pr_drain = tcp_drain, .pr_usrreqs = &tcp_usrreqs @@ -165,9 +156,6 @@ struct protosw inetsw[] = { .pr_ctlinput = sctp_ctlinput, .pr_ctloutput = sctp_ctloutput, .pr_init = sctp_init, -#ifdef VIMAGE - .pr_destroy = sctp_finish, -#endif .pr_drain = sctp_drain, .pr_usrreqs = &sctp_usrreqs }, @@ -192,9 +180,6 @@ struct protosw inetsw[] = { .pr_ctlinput = udplite_ctlinput, .pr_ctloutput = udp_ctloutput, .pr_init = udplite_init, -#ifdef VIMAGE - .pr_destroy = udplite_destroy, -#endif .pr_usrreqs = &udp_usrreqs }, { @@ -342,9 +327,6 @@ IPPROTOSPACER, .pr_input = rip_input, .pr_ctloutput = rip_ctloutput, .pr_init = rip_init, -#ifdef VIMAGE - .pr_destroy = rip_destroy, -#endif .pr_usrreqs = &rip_usrreqs }, }; Modified: projects/vnet/sys/netinet/ip_divert.c ============================================================================== --- projects/vnet/sys/netinet/ip_divert.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/ip_divert.c Fri Jan 22 15:00:01 2016 (r294566) @@ -168,6 +168,8 @@ div_destroy(void) in_pcbinfo_destroy(&V_divcbinfo); } +VNET_SYSUNINIT(divert, SI_SUB_PROTO_DOMAININIT, SI_ORDER_ANY, + div_destroy, NULL); /* * IPPROTO_DIVERT is not in the real IP protocol number space; this @@ -756,9 +758,6 @@ struct protosw div_protosw = { .pr_ctlinput = div_ctlinput, .pr_ctloutput = ip_ctloutput, .pr_init = div_init, -#ifdef VIMAGE - .pr_destroy = div_destroy, -#endif .pr_usrreqs = &div_usrreqs }; @@ -766,9 +765,7 @@ static int div_modevent(module_t mod, int type, void *unused) { int err = 0; -#ifndef VIMAGE int n; -#endif switch (type) { case MOD_LOAD: @@ -793,10 +790,6 @@ div_modevent(module_t mod, int type, voi err = EPERM; break; case MOD_UNLOAD: -#ifdef VIMAGE - err = EPERM; - break; -#else /* * Forced unload. * @@ -821,7 +814,6 @@ div_modevent(module_t mod, int type, voi div_destroy(); EVENTHANDLER_DEREGISTER(maxsockets_change, ip_divert_event_tag); break; -#endif /* !VIMAGE */ default: err = EOPNOTSUPP; break; @@ -835,6 +827,6 @@ static moduledata_t ipdivertmod = { 0 }; -DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); +DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_FW, SI_ORDER_ANY); MODULE_DEPEND(ipdivert, ipfw, 3, 3, 3); MODULE_VERSION(ipdivert, 1); Modified: projects/vnet/sys/netinet/ip_mroute.c ============================================================================== --- projects/vnet/sys/netinet/ip_mroute.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/ip_mroute.c Fri Jan 22 15:00:01 2016 (r294566) @@ -2821,7 +2821,7 @@ vnet_mroute_init(const void *unused __un callout_init(&V_bw_meter_ch, 1); } -VNET_SYSINIT(vnet_mroute_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_mroute_init, +VNET_SYSINIT(vnet_mroute_init, SI_SUB_PROTO_MC, SI_ORDER_ANY, vnet_mroute_init, NULL); static void @@ -2832,7 +2832,7 @@ vnet_mroute_uninit(const void *unused __ V_nexpire = NULL; } -VNET_SYSUNINIT(vnet_mroute_uninit, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, +VNET_SYSUNINIT(vnet_mroute_uninit, SI_SUB_PROTO_MC, SI_ORDER_MIDDLE, vnet_mroute_uninit, NULL); static int @@ -2945,4 +2945,4 @@ static moduledata_t ip_mroutemod = { 0 }; -DECLARE_MODULE(ip_mroute, ip_mroutemod, SI_SUB_PSEUDO, SI_ORDER_MIDDLE); +DECLARE_MODULE(ip_mroute, ip_mroutemod, SI_SUB_PROTO_MC, SI_ORDER_MIDDLE); Modified: projects/vnet/sys/netinet/ip_var.h ============================================================================== --- projects/vnet/sys/netinet/ip_var.h Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/ip_var.h Fri Jan 22 15:00:01 2016 (r294566) @@ -229,9 +229,6 @@ void ip_fillid(struct ip *); int rip_ctloutput(struct socket *, struct sockopt *); void rip_ctlinput(int, struct sockaddr *, void *); void rip_init(void); -#ifdef VIMAGE -void rip_destroy(void); -#endif int rip_input(struct mbuf **, int *, int); int rip_output(struct mbuf *, struct socket *, ...); int ipip_input(struct mbuf **, int *, int); Modified: projects/vnet/sys/netinet/raw_ip.c ============================================================================== --- projects/vnet/sys/netinet/raw_ip.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/raw_ip.c Fri Jan 22 15:00:01 2016 (r294566) @@ -215,12 +215,13 @@ rip_init(void) } #ifdef VIMAGE -void +static void rip_destroy(void) { in_pcbinfo_destroy(&V_ripcbinfo); } +VNET_SYSUNINIT(raw_ip, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, rip_destroy, NULL); #endif #ifdef INET Modified: projects/vnet/sys/netinet/sctp_bsd_addr.c ============================================================================== --- projects/vnet/sys/netinet/sctp_bsd_addr.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/sctp_bsd_addr.c Fri Jan 22 15:00:01 2016 (r294566) @@ -293,6 +293,9 @@ sctp_addr_change(struct ifaddr *ifa, int { uint32_t ifa_flags = 0; + if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) + return; + /* * BSD only has one VRF, if this changes we will need to hook in the * right things here to get the id to pass to the address managment Modified: projects/vnet/sys/netinet/sctp_pcb.c ============================================================================== --- projects/vnet/sys/netinet/sctp_pcb.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/sctp_pcb.c Fri Jan 22 15:00:01 2016 (r294566) @@ -5927,12 +5927,34 @@ sctp_pcb_finish(void) int i; struct sctp_iterator *it, *nit; + if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) { + printf("%s: race condition on teardown.\n", __func__); + return; + } + SCTP_BASE_VAR(sctp_pcb_initialized) = 0; + /* * In FreeBSD the iterator thread never exits but we do clean up. * The only way FreeBSD reaches here is if we have VRF's but we * still add the ifdef to make it compile on old versions. */ +retry: + while (sctp_it_ctl.iterator_running != 0) + DELAY(1); SCTP_IPI_ITERATOR_WQ_LOCK(); + /* + * sctp_iterator_worker() might be working on an it entry without + * holding the lock. We won't find it on the list either and + * continue and free/destroy it. While holding the lock, spin, to + * avoid the race condition as sctp_iterator_worker() will have to + * wait to re-aquire the lock. + */ + if (sctp_it_ctl.cur_it != NULL || sctp_it_ctl.iterator_running != 0) { + SCTP_IPI_ITERATOR_WQ_UNLOCK(); + printf("%s: Iterator running while we held the lock. Retry.\n", + __func__); + goto retry; + } TAILQ_FOREACH_SAFE(it, &sctp_it_ctl.iteratorhead, sctp_nxt_itr, nit) { if (it->vn != curvnet) { continue; @@ -5950,7 +5972,7 @@ sctp_pcb_finish(void) sctp_it_ctl.iterator_flags |= SCTP_ITERATOR_STOP_CUR_IT; } SCTP_ITERATOR_UNLOCK(); - SCTP_OS_TIMER_STOP(&SCTP_BASE_INFO(addr_wq_timer.timer)); + SCTP_OS_TIMER_STOP_DRAIN(&SCTP_BASE_INFO(addr_wq_timer.timer)); SCTP_WQ_ADDR_LOCK(); LIST_FOREACH_SAFE(wi, &SCTP_BASE_INFO(addr_wq), sctp_nxt_addr, nwi) { LIST_REMOVE(wi, sctp_nxt_addr); Modified: projects/vnet/sys/netinet/sctp_usrreq.c ============================================================================== --- projects/vnet/sys/netinet/sctp_usrreq.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/sctp_usrreq.c Fri Jan 22 15:00:01 2016 (r294566) @@ -89,12 +89,12 @@ sctp_init(void) #endif } -void +static void sctp_finish(void) { sctp_pcb_finish(); } - +VNET_SYSUNINIT(sctp, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, sctp_finish, NULL); void Modified: projects/vnet/sys/netinet/sctp_var.h ============================================================================== --- projects/vnet/sys/netinet/sctp_var.h Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/sctp_var.h Fri Jan 22 15:00:01 2016 (r294566) @@ -333,7 +333,6 @@ int sctp_input(struct mbuf **, int *, in void sctp_pathmtu_adjustment(struct sctp_tcb *, uint16_t); void sctp_drain(void); void sctp_init(void); -void sctp_finish(void); int sctp_flush(struct socket *, int); int sctp_shutdown(struct socket *); void Modified: projects/vnet/sys/netinet/tcp_subr.c ============================================================================== --- projects/vnet/sys/netinet/tcp_subr.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/tcp_subr.c Fri Jan 22 15:00:01 2016 (r294566) @@ -714,7 +714,7 @@ tcp_init(void) } #ifdef VIMAGE -void +static void tcp_destroy(void) { int error; @@ -742,6 +742,7 @@ tcp_destroy(void) HHOOK_TYPE_TCP, HHOOK_TCP_EST_OUT, error); } } +VNET_SYSUNINIT(tcp, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, tcp_destroy, NULL); #endif void Modified: projects/vnet/sys/netinet/tcp_var.h ============================================================================== --- projects/vnet/sys/netinet/tcp_var.h Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/tcp_var.h Fri Jan 22 15:00:01 2016 (r294566) @@ -736,9 +736,6 @@ struct tcpcb * tcp_drop(struct tcpcb *, int); void tcp_drain(void); void tcp_init(void); -#ifdef VIMAGE -void tcp_destroy(void); -#endif void tcp_fini(void *); char *tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *, const void *); Modified: projects/vnet/sys/netinet/udp_usrreq.c ============================================================================== --- projects/vnet/sys/netinet/udp_usrreq.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/udp_usrreq.c Fri Jan 22 15:00:01 2016 (r294566) @@ -269,20 +269,23 @@ udp_discardcb(struct udpcb *up) } #ifdef VIMAGE -void +static void udp_destroy(void) { in_pcbinfo_destroy(&V_udbinfo); uma_zdestroy(V_udpcb_zone); } +VNET_SYSUNINIT(udp, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, udp_destroy, NULL); -void +static void udplite_destroy(void) { in_pcbinfo_destroy(&V_ulitecbinfo); } +VNET_SYSUNINIT(udplite, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, udplite_destroy, + NULL); #endif #ifdef INET Modified: projects/vnet/sys/netinet/udp_var.h ============================================================================== --- projects/vnet/sys/netinet/udp_var.h Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet/udp_var.h Fri Jan 22 15:00:01 2016 (r294566) @@ -169,10 +169,6 @@ void udplite_ctlinput(int, struct socka int udp_ctloutput(struct socket *, struct sockopt *); void udp_init(void); void udplite_init(void); -#ifdef VIMAGE -void udp_destroy(void); -void udplite_destroy(void); -#endif int udp_input(struct mbuf **, int *, int); void udplite_input(struct mbuf *, int); struct inpcb *udp_notify(struct inpcb *inp, int errno); Modified: projects/vnet/sys/netinet6/in6.c ============================================================================== --- projects/vnet/sys/netinet6/in6.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet6/in6.c Fri Jan 22 15:00:01 2016 (r294566) @@ -1552,7 +1552,7 @@ in6ifa_llaonifp(struct ifnet *ifp) if (ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) return (NULL); - if_addr_rlock(ifp); + IF_ADDR_RLOCK(ifp); TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != AF_INET6) continue; @@ -1562,7 +1562,7 @@ in6ifa_llaonifp(struct ifnet *ifp) IN6_IS_ADDR_MC_NODELOCAL(&sin6->sin6_addr)) break; } - if_addr_runlock(ifp); + IF_ADDR_RUNLOCK(ifp); return ((struct in6_ifaddr *)ifa); } Modified: projects/vnet/sys/netinet6/in6_ifattach.c ============================================================================== --- projects/vnet/sys/netinet6/in6_ifattach.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet6/in6_ifattach.c Fri Jan 22 15:00:01 2016 (r294566) @@ -890,3 +890,29 @@ in6_purgemaddrs(struct ifnet *ifp) IN6_MULTI_UNLOCK(); } + +void +in6_ifattach_destroy(void) +{ + + callout_drain(&V_in6_tmpaddrtimer_ch); +} + +static void +in6_ifattach_init(void *dummy) +{ + + /* Timer for regeneranation of temporary addresses randomize ID. */ + callout_init(&V_in6_tmpaddrtimer_ch, 0); + callout_reset(&V_in6_tmpaddrtimer_ch, + (V_ip6_temp_preferred_lifetime - V_ip6_desync_factor - + V_ip6_temp_regen_advance) * hz, + in6_tmpaddrtimer, curvnet); +} + +/* + * Cheat. + * This must be after route_init(), which is now SI_ORDER_THIRD. + */ +SYSINIT(in6_ifattach_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, + in6_ifattach_init, NULL); Modified: projects/vnet/sys/netinet6/in6_ifattach.h ============================================================================== --- projects/vnet/sys/netinet6/in6_ifattach.h Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet6/in6_ifattach.h Fri Jan 22 15:00:01 2016 (r294566) @@ -35,6 +35,7 @@ #ifdef _KERNEL void in6_ifattach(struct ifnet *, struct ifnet *); +void in6_ifattach_destroy(void); void in6_ifdetach(struct ifnet *); int in6_get_tmpifid(struct ifnet *, u_int8_t *, const u_int8_t *, int); void in6_tmpaddrtimer(void *); Modified: projects/vnet/sys/netinet6/in6_proto.c ============================================================================== --- projects/vnet/sys/netinet6/in6_proto.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet6/in6_proto.c Fri Jan 22 15:00:01 2016 (r294566) @@ -152,9 +152,6 @@ struct protosw inet6sw[] = { .pr_domain = &inet6domain, .pr_protocol = IPPROTO_IPV6, .pr_init = ip6_init, -#ifdef VIMAGE - .pr_destroy = ip6_destroy, -#endif .pr_slowtimo = frag6_slowtimo, .pr_drain = frag6_drain, .pr_usrreqs = &nousrreqs, Modified: projects/vnet/sys/netinet6/ip6_input.c ============================================================================== --- projects/vnet/sys/netinet6/ip6_input.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet6/ip6_input.c Fri Jan 22 15:00:01 2016 (r294566) @@ -156,9 +156,6 @@ static struct netisr_handler ip6_direct_ }; #endif -VNET_DECLARE(struct callout, in6_tmpaddrtimer_ch); -#define V_in6_tmpaddrtimer_ch VNET(in6_tmpaddrtimer_ch) - VNET_DEFINE(struct pfil_head, inet6_pfil_hook); VNET_PCPUSTAT_DEFINE(struct ip6stat, ip6stat); @@ -170,7 +167,6 @@ VNET_PCPUSTAT_SYSUNINIT(ip6stat); struct rmlock in6_ifaddr_lock; RM_SYSINIT(in6_ifaddr_lock, &in6_ifaddr_lock, "in6_ifaddr_lock"); -static void ip6_init2(void *); static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *); #ifdef PULLDOWN_TEST static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int); @@ -331,40 +327,11 @@ ip6_destroy() } hashdestroy(V_in6_ifaddrhashtbl, M_IFADDR, V_in6_ifaddrhmask); nd6_destroy(); - callout_drain(&V_in6_tmpaddrtimer_ch); + in6_ifattach_destroy(); } #endif static int -ip6_init2_vnet(const void *unused __unused) -{ - - /* nd6_timer_init */ - callout_init(&V_nd6_timer_ch, 0); - callout_reset(&V_nd6_timer_ch, hz, nd6_timer, curvnet); - - /* timer for regeneranation of temporary addresses randomize ID */ - callout_init(&V_in6_tmpaddrtimer_ch, 0); - callout_reset(&V_in6_tmpaddrtimer_ch, - (V_ip6_temp_preferred_lifetime - V_ip6_desync_factor - - V_ip6_temp_regen_advance) * hz, - in6_tmpaddrtimer, curvnet); - - return (0); -} - -static void -ip6_init2(void *dummy) -{ - - ip6_init2_vnet(NULL); -} - -/* cheat */ -/* This must be after route_init(), which is now SI_ORDER_THIRD */ -SYSINIT(netinet6init2, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ip6_init2, NULL); - -static int ip6_input_hbh(struct mbuf *m, uint32_t *plen, uint32_t *rtalert, int *off, int *nxt, int *ours) { Modified: projects/vnet/sys/netinet6/ip6_mroute.c ============================================================================== --- projects/vnet/sys/netinet6/ip6_mroute.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet6/ip6_mroute.c Fri Jan 22 15:00:01 2016 (r294566) @@ -1966,4 +1966,4 @@ static moduledata_t ip6_mroutemod = { 0 }; -DECLARE_MODULE(ip6_mroute, ip6_mroutemod, SI_SUB_PSEUDO, SI_ORDER_ANY); +DECLARE_MODULE(ip6_mroute, ip6_mroutemod, SI_SUB_PROTO_MC, SI_ORDER_ANY); Modified: projects/vnet/sys/netinet6/mld6.c ============================================================================== --- projects/vnet/sys/netinet6/mld6.c Fri Jan 22 14:52:31 2016 (r294565) +++ projects/vnet/sys/netinet6/mld6.c Fri Jan 22 15:00:01 2016 (r294566) @@ -3264,7 +3264,7 @@ mld_init(void *unused __unused) mld_po.ip6po_prefer_tempaddr = IP6PO_TEMPADDR_NOTPREFER; mld_po.ip6po_flags = IP6PO_DONTFRAG; } -SYSINIT(mld_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, mld_init, NULL); +SYSINIT(mld_init, SI_SUB_PROTO_MC, SI_ORDER_MIDDLE, mld_init, NULL); static void mld_uninit(void *unused __unused) @@ -3273,7 +3273,7 @@ mld_uninit(void *unused __unused) CTR1(KTR_MLD, "%s: tearing down", __func__); MLD_LOCK_DESTROY(); } -SYSUNINIT(mld_uninit, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, mld_uninit, NULL); +SYSUNINIT(mld_uninit, SI_SUB_PROTO_MC, SI_ORDER_MIDDLE, mld_uninit, NULL); static void vnet_mld_init(const void *unused __unused) @@ -3283,7 +3283,7 @@ vnet_mld_init(const void *unused __unuse LIST_INIT(&V_mli_head); } -VNET_SYSINIT(vnet_mld_init, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_mld_init, +VNET_SYSINIT(vnet_mld_init, SI_SUB_PROTO_MC, SI_ORDER_ANY, vnet_mld_init, NULL); static void @@ -3295,7 +3295,7 @@ vnet_mld_uninit(const void *unused __unu KASSERT(LIST_EMPTY(&V_mli_head), ("%s: mli list not empty; ifnets not detached?", __func__)); } -VNET_SYSUNINIT(vnet_mld_uninit, SI_SUB_PSEUDO, SI_ORDER_ANY, vnet_mld_uninit, +VNET_SYSUNINIT(vnet_mld_uninit, SI_SUB_PROTO_MC, SI_ORDER_ANY, vnet_mld_uninit, NULL); static int @@ -3317,4 +3317,4 @@ static moduledata_t mld_mod = { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Fri Jan 22 15:11:45 2016 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 005D5A8D01F for ; Fri, 22 Jan 2016 15:11:45 +0000 (UTC) (envelope-from bz@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 5733018EA; Fri, 22 Jan 2016 15:11:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MFBhcc017588; Fri, 22 Jan 2016 15:11:43 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MFBgu1017577; Fri, 22 Jan 2016 15:11:42 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221511.u0MFBgu1017577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 15:11:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294568 - in projects/vnet: . bin/pax bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/tools/ctf/cvt contrib/binutils/bfd contrib/bsnmp/snmp_mibII contrib/hyperv/tools contrib/less... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 15:11:45 -0000 Author: bz Date: Fri Jan 22 15:11:40 2016 New Revision: 294568 URL: https://svnweb.freebsd.org/changeset/base/294568 Log: MFH @r294567 Added: projects/vnet/bin/sh/tests/builtins/cd9.0 - copied unchanged from r294567, head/bin/sh/tests/builtins/cd9.0 projects/vnet/bin/sh/tests/builtins/cd9.0.stdout - copied unchanged from r294567, head/bin/sh/tests/builtins/cd9.0.stdout projects/vnet/bin/sh/tests/builtins/getopts10.0 - copied unchanged from r294567, head/bin/sh/tests/builtins/getopts10.0 projects/vnet/bin/sh/tests/builtins/local5.0 - copied unchanged from r294567, head/bin/sh/tests/builtins/local5.0 projects/vnet/contrib/less/compose.uni - copied unchanged from r294567, head/contrib/less/compose.uni projects/vnet/contrib/less/mkutable - copied unchanged from r294567, head/contrib/less/mkutable projects/vnet/contrib/less/ubin.uni - copied unchanged from r294567, head/contrib/less/ubin.uni projects/vnet/contrib/less/wide.uni - copied unchanged from r294567, head/contrib/less/wide.uni projects/vnet/contrib/mdocml/compat_err.c - copied unchanged from r294567, head/contrib/mdocml/compat_err.c projects/vnet/contrib/mdocml/compat_getline.c - copied unchanged from r294567, head/contrib/mdocml/compat_getline.c projects/vnet/contrib/mdocml/compat_isblank.c - copied unchanged from r294567, head/contrib/mdocml/compat_isblank.c projects/vnet/contrib/mdocml/compat_mkdtemp.c - copied unchanged from r294567, head/contrib/mdocml/compat_mkdtemp.c projects/vnet/contrib/mdocml/compat_progname.c - copied unchanged from r294567, head/contrib/mdocml/compat_progname.c projects/vnet/contrib/mdocml/compat_stringlist.c - copied unchanged from r294567, head/contrib/mdocml/compat_stringlist.c projects/vnet/contrib/mdocml/compat_stringlist.h - copied unchanged from r294567, head/contrib/mdocml/compat_stringlist.h projects/vnet/contrib/mdocml/compat_vasprintf.c - copied unchanged from r294567, head/contrib/mdocml/compat_vasprintf.c projects/vnet/contrib/mdocml/config.log - copied unchanged from r294567, head/contrib/mdocml/config.log projects/vnet/contrib/mdocml/man.conf.5 - copied unchanged from r294567, head/contrib/mdocml/man.conf.5 projects/vnet/contrib/mdocml/manconf.h - copied unchanged from r294567, head/contrib/mdocml/manconf.h projects/vnet/contrib/mdocml/mandoc.css - copied unchanged from r294567, head/contrib/mdocml/mandoc.css projects/vnet/contrib/mdocml/mandoc_ohash.c - copied unchanged from r294567, head/contrib/mdocml/mandoc_ohash.c projects/vnet/contrib/mdocml/mandoc_ohash.h - copied unchanged from r294567, head/contrib/mdocml/mandoc_ohash.h projects/vnet/contrib/mdocml/mdoc_state.c - copied unchanged from r294567, head/contrib/mdocml/mdoc_state.c projects/vnet/contrib/mdocml/roff.h - copied unchanged from r294567, head/contrib/mdocml/roff.h projects/vnet/contrib/mdocml/roff_int.h - copied unchanged from r294567, head/contrib/mdocml/roff_int.h projects/vnet/contrib/mdocml/soelim.1 - copied unchanged from r294567, head/contrib/mdocml/soelim.1 projects/vnet/contrib/mdocml/soelim.c - copied unchanged from r294567, head/contrib/mdocml/soelim.c projects/vnet/contrib/mdocml/tag.c - copied unchanged from r294567, head/contrib/mdocml/tag.c projects/vnet/contrib/mdocml/tag.h - copied unchanged from r294567, head/contrib/mdocml/tag.h projects/vnet/contrib/mdocml/test-err.c - copied unchanged from r294567, head/contrib/mdocml/test-err.c projects/vnet/contrib/mdocml/test-getline.c - copied unchanged from r294567, head/contrib/mdocml/test-getline.c projects/vnet/contrib/mdocml/test-isblank.c - copied unchanged from r294567, head/contrib/mdocml/test-isblank.c projects/vnet/contrib/mdocml/test-mkdtemp.c - copied unchanged from r294567, head/contrib/mdocml/test-mkdtemp.c projects/vnet/contrib/mdocml/test-pledge.c - copied unchanged from r294567, head/contrib/mdocml/test-pledge.c projects/vnet/contrib/mdocml/test-progname.c - copied unchanged from r294567, head/contrib/mdocml/test-progname.c projects/vnet/contrib/mdocml/test-rewb-bsd.c - copied unchanged from r294567, head/contrib/mdocml/test-rewb-bsd.c projects/vnet/contrib/mdocml/test-rewb-sysv.c - copied unchanged from r294567, head/contrib/mdocml/test-rewb-sysv.c projects/vnet/contrib/mdocml/test-stringlist.c - copied unchanged from r294567, head/contrib/mdocml/test-stringlist.c projects/vnet/contrib/mdocml/test-vasprintf.c - copied unchanged from r294567, head/contrib/mdocml/test-vasprintf.c projects/vnet/contrib/ntp/include/ntp_keyacc.h - copied unchanged from r294567, head/contrib/ntp/include/ntp_keyacc.h projects/vnet/contrib/ntp/include/safecast.h - copied unchanged from r294567, head/contrib/ntp/include/safecast.h projects/vnet/contrib/ntp/libntp/is_ip_address.c - copied unchanged from r294567, head/contrib/ntp/libntp/is_ip_address.c projects/vnet/crypto/openssh/.cvsignore - copied unchanged from r294567, head/crypto/openssh/.cvsignore projects/vnet/crypto/openssh/bitmap.c - copied unchanged from r294567, head/crypto/openssh/bitmap.c projects/vnet/crypto/openssh/bitmap.h - copied unchanged from r294567, head/crypto/openssh/bitmap.h projects/vnet/crypto/openssh/cipher-aesctr.c - copied unchanged from r294567, head/crypto/openssh/cipher-aesctr.c projects/vnet/crypto/openssh/cipher-aesctr.h - copied unchanged from r294567, head/crypto/openssh/cipher-aesctr.h projects/vnet/crypto/openssh/opacket.c - copied unchanged from r294567, head/crypto/openssh/opacket.c projects/vnet/crypto/openssh/opacket.h - copied unchanged from r294567, head/crypto/openssh/opacket.h projects/vnet/crypto/openssh/openbsd-compat/.cvsignore - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/.cvsignore projects/vnet/crypto/openssh/openbsd-compat/kludge-fd_set.c - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/kludge-fd_set.c projects/vnet/crypto/openssh/openbsd-compat/md5.c - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/md5.c projects/vnet/crypto/openssh/openbsd-compat/md5.h - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/md5.h projects/vnet/crypto/openssh/openbsd-compat/reallocarray.c - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/reallocarray.c projects/vnet/crypto/openssh/openbsd-compat/regress/.cvsignore - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/regress/.cvsignore projects/vnet/crypto/openssh/openbsd-compat/regress/opensslvertest.c - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/regress/opensslvertest.c projects/vnet/crypto/openssh/openbsd-compat/rmd160.c - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/rmd160.c projects/vnet/crypto/openssh/openbsd-compat/rmd160.h - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/rmd160.h projects/vnet/crypto/openssh/openbsd-compat/sha1.c - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/sha1.c projects/vnet/crypto/openssh/openbsd-compat/sha1.h - copied unchanged from r294567, head/crypto/openssh/openbsd-compat/sha1.h projects/vnet/crypto/openssh/regress/.cvsignore - copied unchanged from r294567, head/crypto/openssh/regress/.cvsignore projects/vnet/crypto/openssh/regress/cfgparse.sh - copied unchanged from r294567, head/crypto/openssh/regress/cfgparse.sh projects/vnet/crypto/openssh/regress/hostkey-agent.sh - copied unchanged from r294567, head/crypto/openssh/regress/hostkey-agent.sh projects/vnet/crypto/openssh/regress/hostkey-rotate.sh - copied unchanged from r294567, head/crypto/openssh/regress/hostkey-rotate.sh projects/vnet/crypto/openssh/regress/keygen-knownhosts.sh - copied unchanged from r294567, head/crypto/openssh/regress/keygen-knownhosts.sh projects/vnet/crypto/openssh/regress/limit-keytype.sh - copied unchanged from r294567, head/crypto/openssh/regress/limit-keytype.sh projects/vnet/crypto/openssh/regress/multipubkey.sh - copied unchanged from r294567, head/crypto/openssh/regress/multipubkey.sh projects/vnet/crypto/openssh/regress/netcat.c - copied unchanged from r294567, head/crypto/openssh/regress/netcat.c projects/vnet/crypto/openssh/regress/principals-command.sh - copied unchanged from r294567, head/crypto/openssh/regress/principals-command.sh projects/vnet/crypto/openssh/regress/t11.ok - copied unchanged from r294567, head/crypto/openssh/regress/t11.ok projects/vnet/crypto/openssh/regress/unittests/ - copied from r294567, head/crypto/openssh/regress/unittests/ projects/vnet/crypto/openssh/regress/valgrind-unit.sh - copied unchanged from r294567, head/crypto/openssh/regress/valgrind-unit.sh projects/vnet/crypto/openssh/scard/.cvsignore - copied unchanged from r294567, head/crypto/openssh/scard/.cvsignore projects/vnet/crypto/openssh/ssh_api.c - copied unchanged from r294567, head/crypto/openssh/ssh_api.c projects/vnet/crypto/openssh/ssh_api.h - copied unchanged from r294567, head/crypto/openssh/ssh_api.h projects/vnet/crypto/openssh/sshbuf-getput-basic.c - copied unchanged from r294567, head/crypto/openssh/sshbuf-getput-basic.c projects/vnet/crypto/openssh/sshbuf-getput-crypto.c - copied unchanged from r294567, head/crypto/openssh/sshbuf-getput-crypto.c projects/vnet/crypto/openssh/sshbuf-misc.c - copied unchanged from r294567, head/crypto/openssh/sshbuf-misc.c projects/vnet/crypto/openssh/sshbuf.c - copied unchanged from r294567, head/crypto/openssh/sshbuf.c projects/vnet/crypto/openssh/sshbuf.h - copied unchanged from r294567, head/crypto/openssh/sshbuf.h projects/vnet/crypto/openssh/ssherr.c - copied unchanged from r294567, head/crypto/openssh/ssherr.c projects/vnet/crypto/openssh/ssherr.h - copied unchanged from r294567, head/crypto/openssh/ssherr.h projects/vnet/crypto/openssh/sshkey.c - copied unchanged from r294567, head/crypto/openssh/sshkey.c projects/vnet/crypto/openssh/sshkey.h - copied unchanged from r294567, head/crypto/openssh/sshkey.h projects/vnet/etc/mtree/BSD.libsoft.dist - copied unchanged from r294567, head/etc/mtree/BSD.libsoft.dist projects/vnet/lib/libc/riscv/SYS.h - copied unchanged from r294567, head/lib/libc/riscv/SYS.h projects/vnet/lib/libc/riscv/Symbol.map - copied unchanged from r294567, head/lib/libc/riscv/Symbol.map projects/vnet/lib/libc/riscv/_fpmath.h - copied unchanged from r294567, head/lib/libc/riscv/_fpmath.h projects/vnet/lib/libc/riscv/arith.h - copied unchanged from r294567, head/lib/libc/riscv/arith.h projects/vnet/lib/libc/riscv/gd_qnan.h - copied unchanged from r294567, head/lib/libc/riscv/gd_qnan.h projects/vnet/lib/libc/riscv/gen/ - copied from r294567, head/lib/libc/riscv/gen/ projects/vnet/lib/libc/riscv/sys/ - copied from r294567, head/lib/libc/riscv/sys/ projects/vnet/lib/libsysdecode/Makefile.depend - copied unchanged from r294567, head/lib/libsysdecode/Makefile.depend projects/vnet/share/dtrace/watch_execve - copied unchanged from r294567, head/share/dtrace/watch_execve projects/vnet/share/dtrace/watch_kill - copied unchanged from r294567, head/share/dtrace/watch_kill projects/vnet/share/dtrace/watch_vop_remove - copied unchanged from r294567, head/share/dtrace/watch_vop_remove projects/vnet/share/examples/ypldap/ - copied from r294567, head/share/examples/ypldap/ projects/vnet/share/man/man4/cfi.4 - copied unchanged from r294567, head/share/man/man4/cfi.4 projects/vnet/share/man/man4/rtwn.4 - copied unchanged from r294567, head/share/man/man4/rtwn.4 projects/vnet/share/man/man4/rtwnfw.4 - copied unchanged from r294567, head/share/man/man4/rtwnfw.4 projects/vnet/sys/arm/at91/at91_ohci.c - copied unchanged from r294567, head/sys/arm/at91/at91_ohci.c projects/vnet/sys/arm/at91/at91_ohci_fdt.c - copied unchanged from r294567, head/sys/arm/at91/at91_ohci_fdt.c projects/vnet/sys/arm/conf/ARMADA38X - copied unchanged from r294567, head/sys/arm/conf/ARMADA38X projects/vnet/sys/arm/mv/armada38x/ - copied from r294567, head/sys/arm/mv/armada38x/ projects/vnet/sys/arm64/arm64/ofw_machdep.c - copied unchanged from r294567, head/sys/arm64/arm64/ofw_machdep.c projects/vnet/sys/boot/efi/boot1/boot_module.h - copied unchanged from r294567, head/sys/boot/efi/boot1/boot_module.h projects/vnet/sys/boot/efi/boot1/ufs_module.c - copied unchanged from r294567, head/sys/boot/efi/boot1/ufs_module.c projects/vnet/sys/boot/efi/boot1/zfs_module.c - copied unchanged from r294567, head/sys/boot/efi/boot1/zfs_module.c projects/vnet/sys/boot/fdt/dts/arm/armada-380.dtsi - copied unchanged from r294567, head/sys/boot/fdt/dts/arm/armada-380.dtsi projects/vnet/sys/boot/fdt/dts/arm/armada-385.dtsi - copied unchanged from r294567, head/sys/boot/fdt/dts/arm/armada-385.dtsi projects/vnet/sys/boot/fdt/dts/arm/armada-388-gp.dts - copied unchanged from r294567, head/sys/boot/fdt/dts/arm/armada-388-gp.dts projects/vnet/sys/boot/fdt/dts/arm/armada-388.dtsi - copied unchanged from r294567, head/sys/boot/fdt/dts/arm/armada-388.dtsi projects/vnet/sys/boot/fdt/dts/arm/armada-38x.dtsi - copied unchanged from r294567, head/sys/boot/fdt/dts/arm/armada-38x.dtsi projects/vnet/sys/compat/linuxkpi/common/include/asm/atomic64.h - copied unchanged from r294567, head/sys/compat/linuxkpi/common/include/asm/atomic64.h projects/vnet/sys/compat/linuxkpi/common/include/linux/rcupdate.h - copied unchanged from r294567, head/sys/compat/linuxkpi/common/include/linux/rcupdate.h projects/vnet/sys/contrib/dev/rtwn/ - copied from r294567, head/sys/contrib/dev/rtwn/ projects/vnet/sys/dev/hyperv/vmbus/hv_et.c - copied unchanged from r294567, head/sys/dev/hyperv/vmbus/hv_et.c projects/vnet/sys/dev/rtwn/ - copied from r294567, head/sys/dev/rtwn/ projects/vnet/sys/dev/sfxge/common/ef10_impl.h - copied unchanged from r294567, head/sys/dev/sfxge/common/ef10_impl.h projects/vnet/sys/dev/sfxge/common/efx_lic.c - copied unchanged from r294567, head/sys/dev/sfxge/common/efx_lic.c projects/vnet/sys/dev/sfxge/common/medford_impl.h - copied unchanged from r294567, head/sys/dev/sfxge/common/medford_impl.h projects/vnet/sys/dev/sfxge/common/medford_nic.c - copied unchanged from r294567, head/sys/dev/sfxge/common/medford_nic.c projects/vnet/sys/dev/syscons/plasma/ - copied from r294567, head/sys/dev/syscons/plasma/ projects/vnet/sys/dev/uart/uart_ppstypes.h - copied unchanged from r294567, head/sys/dev/uart/uart_ppstypes.h projects/vnet/sys/fs/ext2fs/ext2_hash.c - copied unchanged from r294567, head/sys/fs/ext2fs/ext2_hash.c projects/vnet/sys/fs/ext2fs/ext2_htree.c - copied unchanged from r294567, head/sys/fs/ext2fs/ext2_htree.c projects/vnet/sys/geom/eli/g_eli_hmac.c - copied unchanged from r294567, head/sys/geom/eli/g_eli_hmac.c projects/vnet/sys/kern/kern_sendfile.c - copied unchanged from r294567, head/sys/kern/kern_sendfile.c projects/vnet/sys/modules/rtwn/ - copied from r294567, head/sys/modules/rtwn/ projects/vnet/sys/modules/rtwnfw/ - copied from r294567, head/sys/modules/rtwnfw/ projects/vnet/sys/modules/syscons/plasma/ - copied from r294567, head/sys/modules/syscons/plasma/ projects/vnet/sys/netinet/tcp_cc.h - copied unchanged from r294567, head/sys/netinet/tcp_cc.h projects/vnet/sys/opencrypto/xform_aes_icm.c - copied unchanged from r294567, head/sys/opencrypto/xform_aes_icm.c projects/vnet/sys/opencrypto/xform_aes_xts.c - copied unchanged from r294567, head/sys/opencrypto/xform_aes_xts.c projects/vnet/sys/opencrypto/xform_auth.h - copied unchanged from r294567, head/sys/opencrypto/xform_auth.h projects/vnet/sys/opencrypto/xform_blf.c - copied unchanged from r294567, head/sys/opencrypto/xform_blf.c projects/vnet/sys/opencrypto/xform_cast5.c - copied unchanged from r294567, head/sys/opencrypto/xform_cast5.c projects/vnet/sys/opencrypto/xform_cml.c - copied unchanged from r294567, head/sys/opencrypto/xform_cml.c projects/vnet/sys/opencrypto/xform_comp.h - copied unchanged from r294567, head/sys/opencrypto/xform_comp.h projects/vnet/sys/opencrypto/xform_deflate.c - copied unchanged from r294567, head/sys/opencrypto/xform_deflate.c projects/vnet/sys/opencrypto/xform_des1.c - copied unchanged from r294567, head/sys/opencrypto/xform_des1.c projects/vnet/sys/opencrypto/xform_des3.c - copied unchanged from r294567, head/sys/opencrypto/xform_des3.c projects/vnet/sys/opencrypto/xform_enc.h - copied unchanged from r294567, head/sys/opencrypto/xform_enc.h projects/vnet/sys/opencrypto/xform_gmac.c - copied unchanged from r294567, head/sys/opencrypto/xform_gmac.c projects/vnet/sys/opencrypto/xform_md5.c - copied unchanged from r294567, head/sys/opencrypto/xform_md5.c projects/vnet/sys/opencrypto/xform_null.c - copied unchanged from r294567, head/sys/opencrypto/xform_null.c projects/vnet/sys/opencrypto/xform_rijndael.c - copied unchanged from r294567, head/sys/opencrypto/xform_rijndael.c projects/vnet/sys/opencrypto/xform_rmd160.c - copied unchanged from r294567, head/sys/opencrypto/xform_rmd160.c projects/vnet/sys/opencrypto/xform_sha1.c - copied unchanged from r294567, head/sys/opencrypto/xform_sha1.c projects/vnet/sys/opencrypto/xform_sha2.c - copied unchanged from r294567, head/sys/opencrypto/xform_sha2.c projects/vnet/sys/opencrypto/xform_skipjack.c - copied unchanged from r294567, head/sys/opencrypto/xform_skipjack.c projects/vnet/sys/opencrypto/xform_userland.h - copied unchanged from r294567, head/sys/opencrypto/xform_userland.h projects/vnet/sys/x86/include/metadata.h - copied unchanged from r294567, head/sys/x86/include/metadata.h projects/vnet/tests/sys/geom/ - copied from r294567, head/tests/sys/geom/ projects/vnet/tests/sys/kern/unix_passfd_test.c - copied unchanged from r294567, head/tests/sys/kern/unix_passfd_test.c projects/vnet/tools/build/options/WITHOUT_LLVM_LIBUNWIND - copied unchanged from r294567, head/tools/build/options/WITHOUT_LLVM_LIBUNWIND projects/vnet/tools/build/options/WITH_LLVM_LIBUNWIND - copied unchanged from r294567, head/tools/build/options/WITH_LLVM_LIBUNWIND projects/vnet/usr.bin/clang/clang/CC.sh - copied unchanged from r294567, head/usr.bin/clang/clang/CC.sh projects/vnet/usr.sbin/bhyvectl/bhyvectl.8 - copied unchanged from r294567, head/usr.sbin/bhyvectl/bhyvectl.8 projects/vnet/usr.sbin/kldxref/ef_aarch64.c - copied unchanged from r294567, head/usr.sbin/kldxref/ef_aarch64.c projects/vnet/usr.sbin/rpcbind/tests/ - copied from r294567, head/usr.sbin/rpcbind/tests/ Replaced: projects/vnet/sys/amd64/include/metadata.h - copied unchanged from r294567, head/sys/amd64/include/metadata.h Deleted: projects/vnet/contrib/llvm/patches/patch-02-add-CC-aliases.diff projects/vnet/contrib/mdocml/chars.in projects/vnet/contrib/mdocml/compat_fgetln.c projects/vnet/contrib/mdocml/example.style.css projects/vnet/contrib/mdocml/style.css projects/vnet/crypto/openssh/README.hpn projects/vnet/crypto/openssh/compress.c projects/vnet/crypto/openssh/compress.h projects/vnet/crypto/openssh/config.h.in projects/vnet/crypto/openssh/configure projects/vnet/crypto/openssh/contrib/caldera/ projects/vnet/crypto/openssh/moduli.0 projects/vnet/crypto/openssh/scp.0 projects/vnet/crypto/openssh/sftp-server.0 projects/vnet/crypto/openssh/sftp.0 projects/vnet/crypto/openssh/ssh-add.0 projects/vnet/crypto/openssh/ssh-agent.0 projects/vnet/crypto/openssh/ssh-keygen.0 projects/vnet/crypto/openssh/ssh-keyscan.0 projects/vnet/crypto/openssh/ssh-keysign.0 projects/vnet/crypto/openssh/ssh-pkcs11-helper.0 projects/vnet/crypto/openssh/ssh.0 projects/vnet/crypto/openssh/ssh_config.0 projects/vnet/crypto/openssh/sshd.0 projects/vnet/crypto/openssh/sshd_config.0 projects/vnet/sys/dev/fdt/fdt_arm64.c projects/vnet/sys/dev/fdt/fdt_mips.c projects/vnet/sys/dev/fdt/fdt_x86.c projects/vnet/sys/dev/usb/controller/ohci_atmelarm.c projects/vnet/sys/dev/usb/controller/ohci_fdt.c projects/vnet/sys/netinet/cc.h projects/vnet/sys/ofed/include/rdma/Kbuild projects/vnet/tools/regression/geom_concat/ projects/vnet/tools/regression/geom_eli/ projects/vnet/tools/regression/geom_gate/ projects/vnet/tools/regression/geom_mirror/ projects/vnet/tools/regression/geom_nop/ projects/vnet/tools/regression/geom_raid3/ projects/vnet/tools/regression/geom_shsec/ projects/vnet/tools/regression/geom_stripe/ projects/vnet/tools/regression/geom_subr.sh projects/vnet/tools/regression/geom_uzip/ projects/vnet/tools/regression/sockets/unix_passfd/ Modified: projects/vnet/COPYRIGHT projects/vnet/Makefile projects/vnet/Makefile.inc1 projects/vnet/ObsoleteFiles.inc projects/vnet/UPDATING projects/vnet/bin/pax/pat_rep.c projects/vnet/bin/sh/eval.c projects/vnet/bin/sh/exec.c projects/vnet/bin/sh/expand.c projects/vnet/bin/sh/expand.h projects/vnet/bin/sh/mkbuiltins projects/vnet/bin/sh/options.c projects/vnet/bin/sh/options.h projects/vnet/bin/sh/tests/builtins/Makefile projects/vnet/bin/sh/var.c projects/vnet/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c projects/vnet/contrib/binutils/bfd/elf32-arm.c projects/vnet/contrib/bsnmp/snmp_mibII/mibII.c projects/vnet/contrib/bsnmp/snmp_mibII/mibII.h projects/vnet/contrib/bsnmp/snmp_mibII/mibII_interfaces.c projects/vnet/contrib/hyperv/tools/hv_kvp_daemon.c projects/vnet/contrib/less/LICENSE projects/vnet/contrib/less/NEWS projects/vnet/contrib/less/README projects/vnet/contrib/less/brac.c projects/vnet/contrib/less/ch.c projects/vnet/contrib/less/charset.c projects/vnet/contrib/less/charset.h projects/vnet/contrib/less/cmd.h projects/vnet/contrib/less/cmdbuf.c projects/vnet/contrib/less/command.c projects/vnet/contrib/less/cvt.c projects/vnet/contrib/less/decode.c projects/vnet/contrib/less/edit.c projects/vnet/contrib/less/filename.c projects/vnet/contrib/less/forwback.c projects/vnet/contrib/less/funcs.h projects/vnet/contrib/less/help.c projects/vnet/contrib/less/ifile.c projects/vnet/contrib/less/input.c projects/vnet/contrib/less/jump.c projects/vnet/contrib/less/less.h projects/vnet/contrib/less/less.hlp projects/vnet/contrib/less/less.nro projects/vnet/contrib/less/lessecho.c projects/vnet/contrib/less/lessecho.nro projects/vnet/contrib/less/lesskey.c projects/vnet/contrib/less/lesskey.h projects/vnet/contrib/less/lesskey.nro projects/vnet/contrib/less/lglob.h projects/vnet/contrib/less/line.c projects/vnet/contrib/less/linenum.c projects/vnet/contrib/less/lsystem.c projects/vnet/contrib/less/main.c projects/vnet/contrib/less/mark.c projects/vnet/contrib/less/mkhelp.c projects/vnet/contrib/less/optfunc.c projects/vnet/contrib/less/option.c projects/vnet/contrib/less/option.h projects/vnet/contrib/less/opttbl.c projects/vnet/contrib/less/os.c projects/vnet/contrib/less/output.c projects/vnet/contrib/less/pattern.c projects/vnet/contrib/less/pattern.h projects/vnet/contrib/less/pckeys.h projects/vnet/contrib/less/position.c projects/vnet/contrib/less/position.h projects/vnet/contrib/less/prompt.c projects/vnet/contrib/less/regexp.c projects/vnet/contrib/less/screen.c projects/vnet/contrib/less/scrsize.c projects/vnet/contrib/less/search.c projects/vnet/contrib/less/signal.c projects/vnet/contrib/less/tags.c projects/vnet/contrib/less/ttyin.c projects/vnet/contrib/less/version.c projects/vnet/contrib/llvm/projects/libunwind/src/AddressSpace.hpp projects/vnet/contrib/llvm/projects/libunwind/src/DwarfParser.hpp projects/vnet/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp projects/vnet/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S projects/vnet/contrib/llvm/projects/libunwind/src/config.h projects/vnet/contrib/llvm/projects/libunwind/src/libunwind.cpp projects/vnet/contrib/llvm/tools/clang/tools/driver/driver.cpp projects/vnet/contrib/mdocml/INSTALL projects/vnet/contrib/mdocml/LICENSE projects/vnet/contrib/mdocml/Makefile projects/vnet/contrib/mdocml/Makefile.depend projects/vnet/contrib/mdocml/NEWS projects/vnet/contrib/mdocml/TODO projects/vnet/contrib/mdocml/apropos.1 projects/vnet/contrib/mdocml/att.c projects/vnet/contrib/mdocml/cgi.c projects/vnet/contrib/mdocml/cgi.h.example projects/vnet/contrib/mdocml/chars.c projects/vnet/contrib/mdocml/compat_fts.c projects/vnet/contrib/mdocml/compat_fts.h projects/vnet/contrib/mdocml/compat_ohash.h projects/vnet/contrib/mdocml/compat_sqlite3_errstr.c projects/vnet/contrib/mdocml/config.h projects/vnet/contrib/mdocml/configure projects/vnet/contrib/mdocml/configure.local.example projects/vnet/contrib/mdocml/demandoc.c projects/vnet/contrib/mdocml/eqn.7 projects/vnet/contrib/mdocml/eqn.c projects/vnet/contrib/mdocml/gmdiff projects/vnet/contrib/mdocml/html.c projects/vnet/contrib/mdocml/html.h projects/vnet/contrib/mdocml/lib.c projects/vnet/contrib/mdocml/libman.h projects/vnet/contrib/mdocml/libmandoc.h projects/vnet/contrib/mdocml/libmdoc.h projects/vnet/contrib/mdocml/libroff.h projects/vnet/contrib/mdocml/main.c projects/vnet/contrib/mdocml/main.h projects/vnet/contrib/mdocml/man.1 projects/vnet/contrib/mdocml/man.c projects/vnet/contrib/mdocml/man.cgi.8 projects/vnet/contrib/mdocml/man.h projects/vnet/contrib/mdocml/man_hash.c projects/vnet/contrib/mdocml/man_html.c projects/vnet/contrib/mdocml/man_macro.c projects/vnet/contrib/mdocml/man_term.c projects/vnet/contrib/mdocml/man_validate.c projects/vnet/contrib/mdocml/mandoc.1 projects/vnet/contrib/mdocml/mandoc.3 projects/vnet/contrib/mdocml/mandoc.c projects/vnet/contrib/mdocml/mandoc.h projects/vnet/contrib/mdocml/mandoc_aux.c projects/vnet/contrib/mdocml/mandoc_aux.h projects/vnet/contrib/mdocml/mandoc_char.7 projects/vnet/contrib/mdocml/mandoc_headers.3 projects/vnet/contrib/mdocml/mandocdb.c projects/vnet/contrib/mdocml/manpage.c projects/vnet/contrib/mdocml/manpath.c projects/vnet/contrib/mdocml/mansearch.3 projects/vnet/contrib/mdocml/mansearch.c projects/vnet/contrib/mdocml/mansearch.h projects/vnet/contrib/mdocml/mchars_alloc.3 projects/vnet/contrib/mdocml/mdoc.7 projects/vnet/contrib/mdocml/mdoc.c projects/vnet/contrib/mdocml/mdoc.h projects/vnet/contrib/mdocml/mdoc_argv.c projects/vnet/contrib/mdocml/mdoc_hash.c projects/vnet/contrib/mdocml/mdoc_html.c projects/vnet/contrib/mdocml/mdoc_macro.c projects/vnet/contrib/mdocml/mdoc_man.c projects/vnet/contrib/mdocml/mdoc_term.c projects/vnet/contrib/mdocml/mdoc_validate.c projects/vnet/contrib/mdocml/msec.c projects/vnet/contrib/mdocml/out.c projects/vnet/contrib/mdocml/out.h projects/vnet/contrib/mdocml/preconv.c projects/vnet/contrib/mdocml/read.c projects/vnet/contrib/mdocml/roff.7 projects/vnet/contrib/mdocml/roff.c projects/vnet/contrib/mdocml/st.c projects/vnet/contrib/mdocml/tbl.c projects/vnet/contrib/mdocml/tbl_data.c projects/vnet/contrib/mdocml/tbl_html.c projects/vnet/contrib/mdocml/tbl_layout.c projects/vnet/contrib/mdocml/tbl_opts.c projects/vnet/contrib/mdocml/tbl_term.c projects/vnet/contrib/mdocml/term.c projects/vnet/contrib/mdocml/term.h projects/vnet/contrib/mdocml/term_ascii.c projects/vnet/contrib/mdocml/term_ps.c projects/vnet/contrib/mdocml/test-dirent-namlen.c projects/vnet/contrib/mdocml/test-fts.c projects/vnet/contrib/mdocml/test-getsubopt.c projects/vnet/contrib/mdocml/test-mmap.c projects/vnet/contrib/mdocml/test-ohash.c projects/vnet/contrib/mdocml/test-reallocarray.c projects/vnet/contrib/mdocml/test-sqlite3.c projects/vnet/contrib/mdocml/test-sqlite3_errstr.c projects/vnet/contrib/mdocml/test-strcasestr.c projects/vnet/contrib/mdocml/test-strlcat.c projects/vnet/contrib/mdocml/test-strlcpy.c projects/vnet/contrib/mdocml/test-strptime.c projects/vnet/contrib/mdocml/test-strsep.c projects/vnet/contrib/mdocml/test-strtonum.c projects/vnet/contrib/mdocml/test-wchar.c projects/vnet/contrib/mdocml/tree.c projects/vnet/contrib/ntp/ChangeLog projects/vnet/contrib/ntp/CommitLog projects/vnet/contrib/ntp/NEWS projects/vnet/contrib/ntp/configure projects/vnet/contrib/ntp/html/miscopt.html projects/vnet/contrib/ntp/include/Makefile.am projects/vnet/contrib/ntp/include/Makefile.in projects/vnet/contrib/ntp/include/ntp.h projects/vnet/contrib/ntp/include/ntp_io.h projects/vnet/contrib/ntp/include/ntp_refclock.h projects/vnet/contrib/ntp/include/ntp_stdlib.h projects/vnet/contrib/ntp/include/ntp_types.h projects/vnet/contrib/ntp/include/ntp_worker.h projects/vnet/contrib/ntp/include/ntpd.h projects/vnet/contrib/ntp/include/parse.h projects/vnet/contrib/ntp/lib/isc/backtrace.c projects/vnet/contrib/ntp/lib/isc/buffer.c projects/vnet/contrib/ntp/lib/isc/inet_aton.c projects/vnet/contrib/ntp/lib/isc/inet_pton.c projects/vnet/contrib/ntp/lib/isc/log.c projects/vnet/contrib/ntp/lib/isc/netaddr.c projects/vnet/contrib/ntp/lib/isc/sockaddr.c projects/vnet/contrib/ntp/lib/isc/task.c projects/vnet/contrib/ntp/lib/isc/win32/interfaceiter.c projects/vnet/contrib/ntp/lib/isc/win32/net.c projects/vnet/contrib/ntp/libntp/Makefile.am projects/vnet/contrib/ntp/libntp/Makefile.in projects/vnet/contrib/ntp/libntp/a_md5encrypt.c projects/vnet/contrib/ntp/libntp/atolfp.c projects/vnet/contrib/ntp/libntp/authkeys.c projects/vnet/contrib/ntp/libntp/authreadkeys.c projects/vnet/contrib/ntp/libntp/authusekey.c projects/vnet/contrib/ntp/libntp/dolfptoa.c projects/vnet/contrib/ntp/libntp/hextolfp.c projects/vnet/contrib/ntp/libntp/mstolfp.c projects/vnet/contrib/ntp/libntp/msyslog.c projects/vnet/contrib/ntp/libntp/ntp_crypto_rnd.c projects/vnet/contrib/ntp/libntp/ntp_lineedit.c projects/vnet/contrib/ntp/libntp/ntp_rfc2553.c projects/vnet/contrib/ntp/libntp/ntp_worker.c projects/vnet/contrib/ntp/libntp/snprintf.c projects/vnet/contrib/ntp/libntp/socktohost.c projects/vnet/contrib/ntp/libntp/systime.c projects/vnet/contrib/ntp/libntp/work_thread.c projects/vnet/contrib/ntp/libparse/clk_computime.c projects/vnet/contrib/ntp/libparse/clk_dcf7000.c projects/vnet/contrib/ntp/libparse/clk_hopf6021.c projects/vnet/contrib/ntp/libparse/clk_meinberg.c projects/vnet/contrib/ntp/libparse/clk_rawdcf.c projects/vnet/contrib/ntp/libparse/clk_rcc8000.c projects/vnet/contrib/ntp/libparse/clk_schmid.c projects/vnet/contrib/ntp/libparse/clk_trimtaip.c projects/vnet/contrib/ntp/libparse/clk_varitext.c projects/vnet/contrib/ntp/libparse/clk_wharton.c projects/vnet/contrib/ntp/libparse/parse.c projects/vnet/contrib/ntp/ntpd/invoke-ntp.conf.texi projects/vnet/contrib/ntp/ntpd/invoke-ntp.keys.texi projects/vnet/contrib/ntp/ntpd/invoke-ntpd.texi projects/vnet/contrib/ntp/ntpd/keyword-gen-utd projects/vnet/contrib/ntp/ntpd/keyword-gen.c projects/vnet/contrib/ntp/ntpd/ntp.conf.5man projects/vnet/contrib/ntp/ntpd/ntp.conf.5mdoc projects/vnet/contrib/ntp/ntpd/ntp.conf.def projects/vnet/contrib/ntp/ntpd/ntp.conf.html projects/vnet/contrib/ntp/ntpd/ntp.conf.man.in projects/vnet/contrib/ntp/ntpd/ntp.conf.mdoc.in projects/vnet/contrib/ntp/ntpd/ntp.keys.5man projects/vnet/contrib/ntp/ntpd/ntp.keys.5mdoc projects/vnet/contrib/ntp/ntpd/ntp.keys.def projects/vnet/contrib/ntp/ntpd/ntp.keys.html projects/vnet/contrib/ntp/ntpd/ntp.keys.man.in projects/vnet/contrib/ntp/ntpd/ntp.keys.mdoc.in projects/vnet/contrib/ntp/ntpd/ntp_config.c projects/vnet/contrib/ntp/ntpd/ntp_control.c projects/vnet/contrib/ntp/ntpd/ntp_crypto.c projects/vnet/contrib/ntp/ntpd/ntp_io.c projects/vnet/contrib/ntp/ntpd/ntp_keyword.h projects/vnet/contrib/ntp/ntpd/ntp_loopfilter.c projects/vnet/contrib/ntp/ntpd/ntp_parser.c projects/vnet/contrib/ntp/ntpd/ntp_parser.h projects/vnet/contrib/ntp/ntpd/ntp_proto.c projects/vnet/contrib/ntp/ntpd/ntp_refclock.c projects/vnet/contrib/ntp/ntpd/ntp_request.c projects/vnet/contrib/ntp/ntpd/ntp_restrict.c projects/vnet/contrib/ntp/ntpd/ntp_scanner.c projects/vnet/contrib/ntp/ntpd/ntp_signd.c projects/vnet/contrib/ntp/ntpd/ntp_timer.c projects/vnet/contrib/ntp/ntpd/ntp_util.c projects/vnet/contrib/ntp/ntpd/ntpd-opts.c projects/vnet/contrib/ntp/ntpd/ntpd-opts.h projects/vnet/contrib/ntp/ntpd/ntpd.1ntpdman projects/vnet/contrib/ntp/ntpd/ntpd.1ntpdmdoc projects/vnet/contrib/ntp/ntpd/ntpd.c projects/vnet/contrib/ntp/ntpd/ntpd.html projects/vnet/contrib/ntp/ntpd/ntpd.man.in projects/vnet/contrib/ntp/ntpd/ntpd.mdoc.in projects/vnet/contrib/ntp/ntpd/refclock_chu.c projects/vnet/contrib/ntp/ntpd/refclock_gpsdjson.c projects/vnet/contrib/ntp/ntpd/refclock_jjy.c projects/vnet/contrib/ntp/ntpd/refclock_local.c projects/vnet/contrib/ntp/ntpd/refclock_parse.c projects/vnet/contrib/ntp/ntpd/refclock_shm.c projects/vnet/contrib/ntp/ntpd/refclock_true.c projects/vnet/contrib/ntp/ntpd/refclock_tsyncpci.c projects/vnet/contrib/ntp/ntpdate/ntpdate.c projects/vnet/contrib/ntp/ntpdc/invoke-ntpdc.texi projects/vnet/contrib/ntp/ntpdc/ntpdc-opts.c projects/vnet/contrib/ntp/ntpdc/ntpdc-opts.h projects/vnet/contrib/ntp/ntpdc/ntpdc.1ntpdcman projects/vnet/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc projects/vnet/contrib/ntp/ntpdc/ntpdc.c projects/vnet/contrib/ntp/ntpdc/ntpdc.h projects/vnet/contrib/ntp/ntpdc/ntpdc.html projects/vnet/contrib/ntp/ntpdc/ntpdc.man.in projects/vnet/contrib/ntp/ntpdc/ntpdc.mdoc.in projects/vnet/contrib/ntp/ntpdc/ntpdc_ops.c projects/vnet/contrib/ntp/ntpq/invoke-ntpq.texi projects/vnet/contrib/ntp/ntpq/libntpq.c projects/vnet/contrib/ntp/ntpq/libntpq.h projects/vnet/contrib/ntp/ntpq/libntpq_subs.c projects/vnet/contrib/ntp/ntpq/ntpq-opts.c projects/vnet/contrib/ntp/ntpq/ntpq-opts.h projects/vnet/contrib/ntp/ntpq/ntpq-subs.c projects/vnet/contrib/ntp/ntpq/ntpq.1ntpqman projects/vnet/contrib/ntp/ntpq/ntpq.1ntpqmdoc projects/vnet/contrib/ntp/ntpq/ntpq.c projects/vnet/contrib/ntp/ntpq/ntpq.h projects/vnet/contrib/ntp/ntpq/ntpq.html projects/vnet/contrib/ntp/ntpq/ntpq.man.in projects/vnet/contrib/ntp/ntpq/ntpq.mdoc.in projects/vnet/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi projects/vnet/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c projects/vnet/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h projects/vnet/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman projects/vnet/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc projects/vnet/contrib/ntp/ntpsnmpd/ntpsnmpd.html projects/vnet/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in projects/vnet/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in projects/vnet/contrib/ntp/packageinfo.sh projects/vnet/contrib/ntp/scripts/calc_tickadj/Makefile.am projects/vnet/contrib/ntp/scripts/calc_tickadj/Makefile.in projects/vnet/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman projects/vnet/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc projects/vnet/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html projects/vnet/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in projects/vnet/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in projects/vnet/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi projects/vnet/contrib/ntp/scripts/invoke-plot_summary.texi projects/vnet/contrib/ntp/scripts/invoke-summary.texi projects/vnet/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi projects/vnet/contrib/ntp/scripts/ntp-wait/ntp-wait-opts projects/vnet/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman projects/vnet/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc projects/vnet/contrib/ntp/scripts/ntp-wait/ntp-wait.html projects/vnet/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in projects/vnet/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in projects/vnet/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi projects/vnet/contrib/ntp/scripts/ntpsweep/ntpsweep-opts projects/vnet/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman projects/vnet/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc projects/vnet/contrib/ntp/scripts/ntpsweep/ntpsweep.html projects/vnet/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in projects/vnet/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in projects/vnet/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi projects/vnet/contrib/ntp/scripts/ntptrace/ntptrace-opts projects/vnet/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman projects/vnet/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc projects/vnet/contrib/ntp/scripts/ntptrace/ntptrace.html projects/vnet/contrib/ntp/scripts/ntptrace/ntptrace.man.in projects/vnet/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in projects/vnet/contrib/ntp/scripts/plot_summary-opts projects/vnet/contrib/ntp/scripts/plot_summary.1plot_summaryman projects/vnet/contrib/ntp/scripts/plot_summary.1plot_summarymdoc projects/vnet/contrib/ntp/scripts/plot_summary.html projects/vnet/contrib/ntp/scripts/plot_summary.man.in projects/vnet/contrib/ntp/scripts/plot_summary.mdoc.in projects/vnet/contrib/ntp/scripts/summary-opts projects/vnet/contrib/ntp/scripts/summary.1summaryman projects/vnet/contrib/ntp/scripts/summary.1summarymdoc projects/vnet/contrib/ntp/scripts/summary.html projects/vnet/contrib/ntp/scripts/summary.man.in projects/vnet/contrib/ntp/scripts/summary.mdoc.in projects/vnet/contrib/ntp/scripts/update-leap/invoke-update-leap.texi projects/vnet/contrib/ntp/scripts/update-leap/update-leap-opts projects/vnet/contrib/ntp/scripts/update-leap/update-leap.1update-leapman projects/vnet/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc projects/vnet/contrib/ntp/scripts/update-leap/update-leap.html projects/vnet/contrib/ntp/scripts/update-leap/update-leap.man.in projects/vnet/contrib/ntp/scripts/update-leap/update-leap.mdoc.in projects/vnet/contrib/ntp/sntp/configure projects/vnet/contrib/ntp/sntp/crypto.c projects/vnet/contrib/ntp/sntp/crypto.h projects/vnet/contrib/ntp/sntp/include/copyright.def projects/vnet/contrib/ntp/sntp/include/version.def projects/vnet/contrib/ntp/sntp/include/version.texi projects/vnet/contrib/ntp/sntp/invoke-sntp.texi projects/vnet/contrib/ntp/sntp/libopts/configfile.c projects/vnet/contrib/ntp/sntp/libopts/enum.c projects/vnet/contrib/ntp/sntp/libopts/find.c projects/vnet/contrib/ntp/sntp/libopts/init.c projects/vnet/contrib/ntp/sntp/libopts/load.c projects/vnet/contrib/ntp/sntp/libopts/makeshell.c projects/vnet/contrib/ntp/sntp/libopts/nested.c projects/vnet/contrib/ntp/sntp/libopts/parse-duration.c projects/vnet/contrib/ntp/sntp/libopts/reset.c projects/vnet/contrib/ntp/sntp/libopts/save.c projects/vnet/contrib/ntp/sntp/libopts/tokenize.c projects/vnet/contrib/ntp/sntp/m4/ntp_libevent.m4 projects/vnet/contrib/ntp/sntp/m4/ntp_problemtests.m4 projects/vnet/contrib/ntp/sntp/m4/version.m4 projects/vnet/contrib/ntp/sntp/main.c projects/vnet/contrib/ntp/sntp/networking.c projects/vnet/contrib/ntp/sntp/sntp-opts.c projects/vnet/contrib/ntp/sntp/sntp-opts.h projects/vnet/contrib/ntp/sntp/sntp.1sntpman projects/vnet/contrib/ntp/sntp/sntp.1sntpmdoc projects/vnet/contrib/ntp/sntp/sntp.html projects/vnet/contrib/ntp/sntp/sntp.man.in projects/vnet/contrib/ntp/sntp/sntp.mdoc.in projects/vnet/contrib/ntp/sntp/tests/crypto.c projects/vnet/contrib/ntp/sntp/tests/fileHandlingTest.c projects/vnet/contrib/ntp/sntp/tests/fileHandlingTest.h.in projects/vnet/contrib/ntp/sntp/tests/keyFile.c projects/vnet/contrib/ntp/sntp/tests/kodDatabase.c projects/vnet/contrib/ntp/sntp/tests/kodFile.c projects/vnet/contrib/ntp/sntp/tests/packetHandling.c projects/vnet/contrib/ntp/sntp/tests/packetProcessing.c projects/vnet/contrib/ntp/sntp/tests/run-kodDatabase.c projects/vnet/contrib/ntp/sntp/tests/run-packetProcessing.c projects/vnet/contrib/ntp/sntp/tests/run-t-log.c projects/vnet/contrib/ntp/sntp/tests/t-log.c projects/vnet/contrib/ntp/sntp/tests/utilities.c projects/vnet/contrib/ntp/sntp/unity/unity_internals.h projects/vnet/contrib/ntp/sntp/version.c projects/vnet/contrib/ntp/tests/bug-2803/bug-2803.c projects/vnet/contrib/ntp/tests/bug-2803/run-bug-2803.c projects/vnet/contrib/ntp/tests/libntp/a_md5encrypt.c projects/vnet/contrib/ntp/tests/libntp/authkeys.c projects/vnet/contrib/ntp/tests/libntp/buftvtots.c projects/vnet/contrib/ntp/tests/libntp/calendar.c projects/vnet/contrib/ntp/tests/libntp/caljulian.c projects/vnet/contrib/ntp/tests/libntp/clocktime.c projects/vnet/contrib/ntp/tests/libntp/decodenetnum.c projects/vnet/contrib/ntp/tests/libntp/humandate.c projects/vnet/contrib/ntp/tests/libntp/lfpfunc.c projects/vnet/contrib/ntp/tests/libntp/lfptostr.c projects/vnet/contrib/ntp/tests/libntp/modetoa.c projects/vnet/contrib/ntp/tests/libntp/msyslog.c projects/vnet/contrib/ntp/tests/libntp/netof.c projects/vnet/contrib/ntp/tests/libntp/numtoa.c projects/vnet/contrib/ntp/tests/libntp/numtohost.c projects/vnet/contrib/ntp/tests/libntp/octtoint.c projects/vnet/contrib/ntp/tests/libntp/prettydate.c projects/vnet/contrib/ntp/tests/libntp/recvbuff.c projects/vnet/contrib/ntp/tests/libntp/refidsmear.c projects/vnet/contrib/ntp/tests/libntp/refnumtoa.c projects/vnet/contrib/ntp/tests/libntp/run-a_md5encrypt.c projects/vnet/contrib/ntp/tests/libntp/run-authkeys.c projects/vnet/contrib/ntp/tests/libntp/run-calendar.c projects/vnet/contrib/ntp/tests/libntp/run-decodenetnum.c projects/vnet/contrib/ntp/tests/libntp/run-humandate.c projects/vnet/contrib/ntp/tests/libntp/run-lfpfunc.c projects/vnet/contrib/ntp/tests/libntp/run-lfptostr.c projects/vnet/contrib/ntp/tests/libntp/run-modetoa.c projects/vnet/contrib/ntp/tests/libntp/run-msyslog.c projects/vnet/contrib/ntp/tests/libntp/run-netof.c projects/vnet/contrib/ntp/tests/libntp/run-numtoa.c projects/vnet/contrib/ntp/tests/libntp/run-numtohost.c projects/vnet/contrib/ntp/tests/libntp/run-prettydate.c projects/vnet/contrib/ntp/tests/libntp/run-refnumtoa.c projects/vnet/contrib/ntp/tests/libntp/run-sfptostr.c projects/vnet/contrib/ntp/tests/libntp/run-socktoa.c projects/vnet/contrib/ntp/tests/libntp/run-statestr.c projects/vnet/contrib/ntp/tests/libntp/run-strtolfp.c projects/vnet/contrib/ntp/tests/libntp/run-timespecops.c projects/vnet/contrib/ntp/tests/libntp/run-timevalops.c projects/vnet/contrib/ntp/tests/libntp/run-uglydate.c projects/vnet/contrib/ntp/tests/libntp/sfptostr.c projects/vnet/contrib/ntp/tests/libntp/socktoa.c projects/vnet/contrib/ntp/tests/libntp/statestr.c projects/vnet/contrib/ntp/tests/libntp/strtolfp.c projects/vnet/contrib/ntp/tests/libntp/timespecops.c projects/vnet/contrib/ntp/tests/libntp/timevalops.c projects/vnet/contrib/ntp/tests/libntp/uglydate.c projects/vnet/contrib/ntp/tests/ntpd/leapsec.c projects/vnet/contrib/ntp/tests/ntpd/ntp_prio_q.c projects/vnet/contrib/ntp/tests/ntpd/ntp_restrict.c projects/vnet/contrib/ntp/tests/ntpd/rc_cmdlength.c projects/vnet/contrib/ntp/tests/ntpd/run-leapsec.c projects/vnet/contrib/ntp/tests/ntpd/run-ntp_restrict.c projects/vnet/contrib/ntp/tests/ntpd/run-rc_cmdlength.c projects/vnet/contrib/ntp/tests/ntpd/run-t-ntp_signd.c projects/vnet/contrib/ntp/tests/ntpd/t-ntp_scanner.c projects/vnet/contrib/ntp/tests/ntpd/t-ntp_signd.c projects/vnet/contrib/ntp/tests/sandbox/run-uglydate.c projects/vnet/contrib/ntp/tests/sandbox/smeartest.c projects/vnet/contrib/ntp/tests/sandbox/uglydate.c projects/vnet/contrib/ntp/tests/sec-2853/sec-2853.c projects/vnet/contrib/ntp/util/invoke-ntp-keygen.texi projects/vnet/contrib/ntp/util/ntp-keygen-opts.c projects/vnet/contrib/ntp/util/ntp-keygen-opts.h projects/vnet/contrib/ntp/util/ntp-keygen.1ntp-keygenman projects/vnet/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc projects/vnet/contrib/ntp/util/ntp-keygen.c projects/vnet/contrib/ntp/util/ntp-keygen.html projects/vnet/contrib/ntp/util/ntp-keygen.man.in projects/vnet/contrib/ntp/util/ntp-keygen.mdoc.in projects/vnet/contrib/pf/pflogd/pflogd.c projects/vnet/crypto/openssh/ChangeLog projects/vnet/crypto/openssh/FREEBSD-upgrade projects/vnet/crypto/openssh/INSTALL projects/vnet/crypto/openssh/Makefile.in projects/vnet/crypto/openssh/OVERVIEW projects/vnet/crypto/openssh/PROTOCOL projects/vnet/crypto/openssh/PROTOCOL.agent projects/vnet/crypto/openssh/PROTOCOL.krl projects/vnet/crypto/openssh/PROTOCOL.mux projects/vnet/crypto/openssh/README projects/vnet/crypto/openssh/addrmatch.c projects/vnet/crypto/openssh/atomicio.c projects/vnet/crypto/openssh/auth-bsdauth.c projects/vnet/crypto/openssh/auth-chall.c projects/vnet/crypto/openssh/auth-krb5.c projects/vnet/crypto/openssh/auth-options.c projects/vnet/crypto/openssh/auth-options.h projects/vnet/crypto/openssh/auth-pam.c projects/vnet/crypto/openssh/auth-passwd.c projects/vnet/crypto/openssh/auth-rh-rsa.c projects/vnet/crypto/openssh/auth-rhosts.c projects/vnet/crypto/openssh/auth-rsa.c projects/vnet/crypto/openssh/auth.c projects/vnet/crypto/openssh/auth.h projects/vnet/crypto/openssh/auth1.c projects/vnet/crypto/openssh/auth2-chall.c projects/vnet/crypto/openssh/auth2-gss.c projects/vnet/crypto/openssh/auth2-hostbased.c projects/vnet/crypto/openssh/auth2-kbdint.c projects/vnet/crypto/openssh/auth2-none.c projects/vnet/crypto/openssh/auth2-passwd.c projects/vnet/crypto/openssh/auth2-pubkey.c projects/vnet/crypto/openssh/auth2.c projects/vnet/crypto/openssh/authfd.c projects/vnet/crypto/openssh/authfd.h projects/vnet/crypto/openssh/authfile.c projects/vnet/crypto/openssh/authfile.h projects/vnet/crypto/openssh/bufaux.c projects/vnet/crypto/openssh/bufbn.c projects/vnet/crypto/openssh/bufec.c projects/vnet/crypto/openssh/buffer.c (contents, props changed) projects/vnet/crypto/openssh/buffer.h (contents, props changed) projects/vnet/crypto/openssh/canohost.c projects/vnet/crypto/openssh/chacha.h projects/vnet/crypto/openssh/channels.c (contents, props changed) projects/vnet/crypto/openssh/channels.h (contents, props changed) projects/vnet/crypto/openssh/cipher-3des1.c projects/vnet/crypto/openssh/cipher-bf1.c projects/vnet/crypto/openssh/cipher-chachapoly.c projects/vnet/crypto/openssh/cipher-chachapoly.h projects/vnet/crypto/openssh/cipher-ctr.c projects/vnet/crypto/openssh/cipher.c (contents, props changed) projects/vnet/crypto/openssh/cipher.h projects/vnet/crypto/openssh/clientloop.c (contents, props changed) projects/vnet/crypto/openssh/compat.c (contents, props changed) projects/vnet/crypto/openssh/compat.h (contents, props changed) projects/vnet/crypto/openssh/config.guess projects/vnet/crypto/openssh/config.h projects/vnet/crypto/openssh/configure.ac (contents, props changed) projects/vnet/crypto/openssh/contrib/Makefile projects/vnet/crypto/openssh/contrib/README projects/vnet/crypto/openssh/contrib/cygwin/README projects/vnet/crypto/openssh/contrib/cygwin/ssh-host-config projects/vnet/crypto/openssh/contrib/cygwin/ssh-user-config projects/vnet/crypto/openssh/contrib/redhat/openssh.spec projects/vnet/crypto/openssh/contrib/suse/openssh.spec projects/vnet/crypto/openssh/deattack.c projects/vnet/crypto/openssh/deattack.h projects/vnet/crypto/openssh/defines.h projects/vnet/crypto/openssh/dh.c projects/vnet/crypto/openssh/dh.h projects/vnet/crypto/openssh/digest-libc.c projects/vnet/crypto/openssh/digest-openssl.c projects/vnet/crypto/openssh/digest.h projects/vnet/crypto/openssh/dispatch.c projects/vnet/crypto/openssh/dispatch.h projects/vnet/crypto/openssh/dns.c projects/vnet/crypto/openssh/dns.h projects/vnet/crypto/openssh/entropy.c projects/vnet/crypto/openssh/freebsd-configure.sh projects/vnet/crypto/openssh/freebsd-post-merge.sh projects/vnet/crypto/openssh/freebsd-pre-merge.sh projects/vnet/crypto/openssh/ge25519.h projects/vnet/crypto/openssh/groupaccess.c projects/vnet/crypto/openssh/gss-genr.c projects/vnet/crypto/openssh/gss-serv-krb5.c projects/vnet/crypto/openssh/gss-serv.c projects/vnet/crypto/openssh/hmac.c projects/vnet/crypto/openssh/hmac.h projects/vnet/crypto/openssh/hostfile.c projects/vnet/crypto/openssh/hostfile.h projects/vnet/crypto/openssh/includes.h projects/vnet/crypto/openssh/kex.c (contents, props changed) projects/vnet/crypto/openssh/kex.h (contents, props changed) projects/vnet/crypto/openssh/kexc25519.c projects/vnet/crypto/openssh/kexc25519c.c projects/vnet/crypto/openssh/kexc25519s.c projects/vnet/crypto/openssh/kexdh.c projects/vnet/crypto/openssh/kexdhc.c projects/vnet/crypto/openssh/kexdhs.c projects/vnet/crypto/openssh/kexecdh.c projects/vnet/crypto/openssh/kexecdhc.c projects/vnet/crypto/openssh/kexecdhs.c projects/vnet/crypto/openssh/kexgex.c projects/vnet/crypto/openssh/kexgexc.c projects/vnet/crypto/openssh/kexgexs.c projects/vnet/crypto/openssh/key.c projects/vnet/crypto/openssh/key.h projects/vnet/crypto/openssh/krl.c projects/vnet/crypto/openssh/krl.h projects/vnet/crypto/openssh/log.c projects/vnet/crypto/openssh/loginrec.c projects/vnet/crypto/openssh/mac.c projects/vnet/crypto/openssh/mac.h projects/vnet/crypto/openssh/match.c projects/vnet/crypto/openssh/match.h projects/vnet/crypto/openssh/misc.c (contents, props changed) projects/vnet/crypto/openssh/misc.h (contents, props changed) projects/vnet/crypto/openssh/moduli projects/vnet/crypto/openssh/moduli.c projects/vnet/crypto/openssh/monitor.c projects/vnet/crypto/openssh/monitor.h projects/vnet/crypto/openssh/monitor_fdpass.c projects/vnet/crypto/openssh/monitor_mm.c projects/vnet/crypto/openssh/monitor_wrap.c projects/vnet/crypto/openssh/monitor_wrap.h projects/vnet/crypto/openssh/msg.c projects/vnet/crypto/openssh/msg.h projects/vnet/crypto/openssh/mux.c projects/vnet/crypto/openssh/myproposal.h projects/vnet/crypto/openssh/openbsd-compat/Makefile.in projects/vnet/crypto/openssh/openbsd-compat/arc4random.c projects/vnet/crypto/openssh/openbsd-compat/bcrypt_pbkdf.c projects/vnet/crypto/openssh/openbsd-compat/blowfish.c (contents, props changed) projects/vnet/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/vnet/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/vnet/crypto/openssh/openbsd-compat/bsd-misc.c projects/vnet/crypto/openssh/openbsd-compat/bsd-misc.h (contents, props changed) projects/vnet/crypto/openssh/openbsd-compat/bsd-snprintf.c projects/vnet/crypto/openssh/openbsd-compat/explicit_bzero.c projects/vnet/crypto/openssh/openbsd-compat/fake-rfc2553.h projects/vnet/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/vnet/crypto/openssh/openbsd-compat/openbsd-compat.h projects/vnet/crypto/openssh/openbsd-compat/openssl-compat.c projects/vnet/crypto/openssh/openbsd-compat/openssl-compat.h projects/vnet/crypto/openssh/openbsd-compat/port-linux.c projects/vnet/crypto/openssh/openbsd-compat/port-tun.c projects/vnet/crypto/openssh/openbsd-compat/port-uw.c projects/vnet/crypto/openssh/openbsd-compat/readpassphrase.c projects/vnet/crypto/openssh/openbsd-compat/realpath.c projects/vnet/crypto/openssh/openbsd-compat/regress/Makefile.in projects/vnet/crypto/openssh/openbsd-compat/sha2.c projects/vnet/crypto/openssh/openbsd-compat/sha2.h projects/vnet/crypto/openssh/openbsd-compat/xcrypt.c projects/vnet/crypto/openssh/opensshd.init.in projects/vnet/crypto/openssh/packet.c projects/vnet/crypto/openssh/packet.h (contents, props changed) projects/vnet/crypto/openssh/platform.c projects/vnet/crypto/openssh/poly1305.h projects/vnet/crypto/openssh/progressmeter.c projects/vnet/crypto/openssh/progressmeter.h projects/vnet/crypto/openssh/readconf.c projects/vnet/crypto/openssh/readconf.h projects/vnet/crypto/openssh/regress/Makefile projects/vnet/crypto/openssh/regress/README.regress projects/vnet/crypto/openssh/regress/agent-pkcs11.sh projects/vnet/crypto/openssh/regress/agent-timeout.sh projects/vnet/crypto/openssh/regress/agent.sh projects/vnet/crypto/openssh/regress/broken-pipe.sh projects/vnet/crypto/openssh/regress/cert-hostkey.sh projects/vnet/crypto/openssh/regress/cert-userkey.sh projects/vnet/crypto/openssh/regress/cfgmatch.sh projects/vnet/crypto/openssh/regress/cipher-speed.sh projects/vnet/crypto/openssh/regress/connect-privsep.sh projects/vnet/crypto/openssh/regress/connect.sh projects/vnet/crypto/openssh/regress/dhgex.sh projects/vnet/crypto/openssh/regress/dynamic-forward.sh projects/vnet/crypto/openssh/regress/exit-status.sh projects/vnet/crypto/openssh/regress/forcecommand.sh projects/vnet/crypto/openssh/regress/forward-control.sh projects/vnet/crypto/openssh/regress/forwarding.sh projects/vnet/crypto/openssh/regress/host-expand.sh projects/vnet/crypto/openssh/regress/integrity.sh projects/vnet/crypto/openssh/regress/kextype.sh projects/vnet/crypto/openssh/regress/key-options.sh projects/vnet/crypto/openssh/regress/keygen-change.sh projects/vnet/crypto/openssh/regress/keys-command.sh projects/vnet/crypto/openssh/regress/keyscan.sh projects/vnet/crypto/openssh/regress/keytype.sh projects/vnet/crypto/openssh/regress/krl.sh projects/vnet/crypto/openssh/regress/localcommand.sh projects/vnet/crypto/openssh/regress/login-timeout.sh projects/vnet/crypto/openssh/regress/multiplex.sh projects/vnet/crypto/openssh/regress/proto-mismatch.sh projects/vnet/crypto/openssh/regress/proto-version.sh projects/vnet/crypto/openssh/regress/proxy-connect.sh projects/vnet/crypto/openssh/regress/reconfigure.sh projects/vnet/crypto/openssh/regress/reexec.sh projects/vnet/crypto/openssh/regress/rekey.sh projects/vnet/crypto/openssh/regress/ssh-com.sh projects/vnet/crypto/openssh/regress/ssh2putty.sh projects/vnet/crypto/openssh/regress/sshd-log-wrapper.sh projects/vnet/crypto/openssh/regress/stderr-data.sh projects/vnet/crypto/openssh/regress/t4.ok projects/vnet/crypto/openssh/regress/test-exec.sh projects/vnet/crypto/openssh/regress/transfer.sh projects/vnet/crypto/openssh/regress/try-ciphers.sh projects/vnet/crypto/openssh/regress/yes-head.sh projects/vnet/crypto/openssh/rijndael.c projects/vnet/crypto/openssh/rijndael.h projects/vnet/crypto/openssh/roaming_client.c projects/vnet/crypto/openssh/roaming_common.c projects/vnet/crypto/openssh/roaming_dummy.c projects/vnet/crypto/openssh/rsa.c projects/vnet/crypto/openssh/rsa.h projects/vnet/crypto/openssh/sandbox-seccomp-filter.c projects/vnet/crypto/openssh/sandbox-systrace.c projects/vnet/crypto/openssh/scp.1 (contents, props changed) projects/vnet/crypto/openssh/scp.c projects/vnet/crypto/openssh/servconf.c projects/vnet/crypto/openssh/servconf.h (contents, props changed) projects/vnet/crypto/openssh/serverloop.c (contents, props changed) projects/vnet/crypto/openssh/session.c projects/vnet/crypto/openssh/sftp-client.c projects/vnet/crypto/openssh/sftp-client.h projects/vnet/crypto/openssh/sftp-common.c projects/vnet/crypto/openssh/sftp-common.h projects/vnet/crypto/openssh/sftp-glob.c projects/vnet/crypto/openssh/sftp-server.8 (contents, props changed) projects/vnet/crypto/openssh/sftp-server.c projects/vnet/crypto/openssh/sftp.1 (contents, props changed) projects/vnet/crypto/openssh/sftp.c (contents, props changed) projects/vnet/crypto/openssh/ssh-add.1 (contents, props changed) projects/vnet/crypto/openssh/ssh-add.c projects/vnet/crypto/openssh/ssh-agent.1 projects/vnet/crypto/openssh/ssh-agent.c projects/vnet/crypto/openssh/ssh-dss.c projects/vnet/crypto/openssh/ssh-ecdsa.c projects/vnet/crypto/openssh/ssh-ed25519.c projects/vnet/crypto/openssh/ssh-keygen.1 (contents, props changed) projects/vnet/crypto/openssh/ssh-keygen.c projects/vnet/crypto/openssh/ssh-keyscan.1 (contents, props changed) projects/vnet/crypto/openssh/ssh-keyscan.c projects/vnet/crypto/openssh/ssh-keysign.c projects/vnet/crypto/openssh/ssh-pkcs11-client.c projects/vnet/crypto/openssh/ssh-pkcs11-helper.c projects/vnet/crypto/openssh/ssh-pkcs11.c projects/vnet/crypto/openssh/ssh-pkcs11.h projects/vnet/crypto/openssh/ssh-rsa.c projects/vnet/crypto/openssh/ssh.1 projects/vnet/crypto/openssh/ssh.c projects/vnet/crypto/openssh/ssh.h projects/vnet/crypto/openssh/ssh_config projects/vnet/crypto/openssh/ssh_config.5 projects/vnet/crypto/openssh/ssh_namespace.h projects/vnet/crypto/openssh/sshconnect.c projects/vnet/crypto/openssh/sshconnect1.c projects/vnet/crypto/openssh/sshconnect2.c (contents, props changed) projects/vnet/crypto/openssh/sshd.8 projects/vnet/crypto/openssh/sshd.c projects/vnet/crypto/openssh/sshd_config projects/vnet/crypto/openssh/sshd_config.5 projects/vnet/crypto/openssh/sshlogin.c projects/vnet/crypto/openssh/sshpty.c projects/vnet/crypto/openssh/uidswap.c projects/vnet/crypto/openssh/umac.c projects/vnet/crypto/openssh/uuencode.c projects/vnet/crypto/openssh/version.h projects/vnet/crypto/openssh/xmalloc.c projects/vnet/crypto/openssh/xmalloc.h projects/vnet/etc/Makefile projects/vnet/etc/defaults/rc.conf projects/vnet/etc/master.passwd projects/vnet/etc/mtree/BSD.include.dist projects/vnet/etc/mtree/BSD.tests.dist projects/vnet/etc/mtree/BSD.usr.dist projects/vnet/etc/mtree/Makefile projects/vnet/etc/ntp/leap-seconds projects/vnet/etc/rc projects/vnet/etc/rc.d/ldconfig projects/vnet/etc/rc.d/mountcritlocal projects/vnet/etc/rc.d/sshd projects/vnet/gnu/lib/libgcc/Makefile projects/vnet/gnu/usr.bin/binutils/ld/Makefile projects/vnet/include/Makefile projects/vnet/include/limits.h projects/vnet/include/paths.h projects/vnet/lib/clang/clang.lib.mk projects/vnet/lib/csu/aarch64/crt1.c projects/vnet/lib/csu/arm/Makefile projects/vnet/lib/libc++/Makefile projects/vnet/lib/libc/Makefile projects/vnet/lib/libc/gen/exec.3 projects/vnet/lib/libc/gen/posix_spawn.3 projects/vnet/lib/libc/gen/sem_new.c projects/vnet/lib/libc/gen/tls.c projects/vnet/lib/libc/gmon/gmon.c projects/vnet/lib/libc/mips/SYS.h projects/vnet/lib/libc/riscv/Makefile.inc projects/vnet/lib/libc/rpc/rpc_soc.c projects/vnet/lib/libc/rpc/rpcb_clnt.c projects/vnet/lib/libc/rpc/rpcb_prot.c projects/vnet/lib/libc/stdio/findfp.c projects/vnet/lib/libc/stdlib/jemalloc/Makefile.inc projects/vnet/lib/libc/stdlib/tdelete.c projects/vnet/lib/libc/string/wcslcat.c projects/vnet/lib/libc/string/wcsncat.c projects/vnet/lib/libc/sys/futimens.c projects/vnet/lib/libc/sys/ptrace.2 projects/vnet/lib/libc/sys/sendfile.2 projects/vnet/lib/libc/sys/stat.2 projects/vnet/lib/libc/sys/utimensat.2 projects/vnet/lib/libc/sys/utimensat.c projects/vnet/lib/libc/sys/utrace.2 projects/vnet/lib/libc/xdr/xdr_float.c projects/vnet/lib/libdpv/dpv.c projects/vnet/lib/libdpv/dpv.h projects/vnet/lib/libdpv/util.h projects/vnet/lib/libelftc/elftc_version.c projects/vnet/lib/libfetch/common.c projects/vnet/lib/libgssapi/gss_release_oid_set.c projects/vnet/lib/libkvm/kvm_arm.h projects/vnet/lib/libkvm/kvm_i386.h projects/vnet/lib/libkvm/kvm_minidump_arm.c projects/vnet/lib/libmd/Makefile.depend projects/vnet/lib/libmd/mdXhl.c projects/vnet/lib/libnv/tests/dnv_tests.cc projects/vnet/lib/libnv/tests/nv_array_tests.cc projects/vnet/lib/libpam/modules/pam_ssh/pam_ssh.c projects/vnet/lib/libstand/Makefile projects/vnet/lib/libstand/uuid_to_string.c projects/vnet/lib/libthr/thread/thr_umtx.c projects/vnet/libexec/rtld-elf/aarch64/reloc.c projects/vnet/libexec/rtld-elf/aarch64/rtld_machdep.h projects/vnet/libexec/rtld-elf/aarch64/rtld_start.S projects/vnet/libexec/rtld-elf/amd64/reloc.c projects/vnet/libexec/rtld-elf/amd64/rtld_machdep.h projects/vnet/libexec/rtld-elf/arm/reloc.c projects/vnet/libexec/rtld-elf/arm/rtld_machdep.h projects/vnet/libexec/rtld-elf/debug.c projects/vnet/libexec/rtld-elf/i386/reloc.c projects/vnet/libexec/rtld-elf/i386/rtld_machdep.h projects/vnet/libexec/rtld-elf/mips/rtld_machdep.h projects/vnet/libexec/rtld-elf/paths.h projects/vnet/libexec/rtld-elf/powerpc/reloc.c projects/vnet/libexec/rtld-elf/powerpc/rtld_machdep.h projects/vnet/libexec/rtld-elf/powerpc64/reloc.c projects/vnet/libexec/rtld-elf/powerpc64/rtld_machdep.h projects/vnet/libexec/rtld-elf/powerpc64/rtld_start.S projects/vnet/libexec/rtld-elf/riscv/reloc.c projects/vnet/libexec/rtld-elf/rtld.c projects/vnet/libexec/rtld-elf/rtld.h projects/vnet/libexec/rtld-elf/sparc64/reloc.c projects/vnet/libexec/rtld-elf/sparc64/rtld_machdep.h projects/vnet/release/Makefile projects/vnet/release/Makefile.ec2 projects/vnet/release/amd64/make-memstick.sh projects/vnet/release/amd64/mkisoimages.sh projects/vnet/release/arm64/make-memstick.sh projects/vnet/release/doc/en_US.ISO8859-1/hardware/article.xml projects/vnet/release/i386/make-memstick.sh projects/vnet/release/i386/mkisoimages.sh projects/vnet/release/pc98/mkisoimages.sh projects/vnet/release/powerpc/make-memstick.sh projects/vnet/release/powerpc/mkisoimages.sh projects/vnet/release/release.sh projects/vnet/release/scripts/make-manifest.sh projects/vnet/release/sparc64/mkisoimages.sh projects/vnet/sbin/geom/class/eli/Makefile projects/vnet/sbin/ldconfig/ldconfig.c projects/vnet/sbin/mount/mount.c projects/vnet/sbin/reboot/reboot.c projects/vnet/sbin/umount/umount.c projects/vnet/secure/lib/libssh/Makefile projects/vnet/secure/usr.sbin/sshd/Makefile projects/vnet/share/dtrace/Makefile projects/vnet/share/examples/pf/pf.conf projects/vnet/share/man/man4/Makefile projects/vnet/share/man/man4/acpi_panasonic.4 projects/vnet/share/man/man4/ddb.4 projects/vnet/share/man/man4/ffclock.4 projects/vnet/share/man/man4/geom_uncompress.4 projects/vnet/share/man/man4/geom_uzip.4 projects/vnet/share/man/man4/ioat.4 projects/vnet/share/man/man4/ismt.4 projects/vnet/share/man/man4/mod_cc.4 projects/vnet/share/man/man4/nvme.4 projects/vnet/share/man/man4/sctp.4 projects/vnet/share/man/man4/sfxge.4 projects/vnet/share/man/man4/splash.4 projects/vnet/share/man/man4/tcp.4 projects/vnet/share/man/man4/uart.4 projects/vnet/share/man/man5/nandfs.5 projects/vnet/share/man/man5/src.conf.5 projects/vnet/share/man/man7/ascii.7 projects/vnet/share/man/man7/tuning.7 projects/vnet/share/man/man9/DEVICE_PROBE.9 projects/vnet/share/man/man9/Makefile projects/vnet/share/man/man9/cd.9 projects/vnet/share/man/man9/kern_testfrwk.9 projects/vnet/share/man/man9/make_dev.9 projects/vnet/share/man/man9/malloc.9 projects/vnet/share/man/man9/mod_cc.9 projects/vnet/share/man/man9/timeout.9 projects/vnet/share/man/man9/vref.9 projects/vnet/share/man/man9/zone.9 projects/vnet/share/misc/ascii (contents, props changed) projects/vnet/share/misc/committers-src.dot projects/vnet/share/misc/organization.dot projects/vnet/share/mk/bsd.compiler.mk projects/vnet/share/mk/bsd.dep.mk projects/vnet/share/mk/bsd.lib.mk projects/vnet/share/mk/bsd.subdir.mk projects/vnet/share/mk/bsd.sys.mk projects/vnet/share/mk/local.init.mk projects/vnet/share/mk/local.sys.mk projects/vnet/share/mk/src.opts.mk projects/vnet/share/mk/sys.mk projects/vnet/share/vt/keymaps/gr.101.acc.kbd projects/vnet/share/vt/keymaps/gr.elot.acc.kbd projects/vnet/share/vt/keymaps/hu.101.kbd projects/vnet/share/vt/keymaps/hu.102.kbd projects/vnet/share/vt/keymaps/lt.kbd projects/vnet/share/vt/keymaps/pt.acc.kbd projects/vnet/share/vt/keymaps/pt.kbd projects/vnet/share/vt/keymaps/ua.kbd projects/vnet/share/vt/keymaps/ua.shift.alt.kbd projects/vnet/sys/amd64/amd64/elf_machdep.c projects/vnet/sys/amd64/amd64/fpu.c projects/vnet/sys/amd64/amd64/machdep.c projects/vnet/sys/amd64/amd64/pmap.c projects/vnet/sys/amd64/amd64/trap.c projects/vnet/sys/amd64/include/atomic.h projects/vnet/sys/amd64/linux/linux_proto.h projects/vnet/sys/amd64/linux/linux_syscall.h projects/vnet/sys/amd64/linux/linux_syscalls.c projects/vnet/sys/amd64/linux/linux_sysent.c projects/vnet/sys/amd64/linux/linux_systrace_args.c projects/vnet/sys/amd64/linux/linux_sysvec.c projects/vnet/sys/amd64/linux/syscalls.master projects/vnet/sys/amd64/linux32/linux32_proto.h projects/vnet/sys/amd64/linux32/linux32_syscall.h projects/vnet/sys/amd64/linux32/linux32_syscalls.c projects/vnet/sys/amd64/linux32/linux32_sysent.c projects/vnet/sys/amd64/linux32/linux32_systrace_args.c projects/vnet/sys/amd64/linux32/linux32_sysvec.c projects/vnet/sys/amd64/linux32/syscalls.master projects/vnet/sys/arm/arm/db_interface.c projects/vnet/sys/arm/arm/elf_machdep.c projects/vnet/sys/arm/arm/fusu.S projects/vnet/sys/arm/arm/gic.c projects/vnet/sys/arm/arm/locore-v6.S projects/vnet/sys/arm/arm/machdep.c projects/vnet/sys/arm/arm/minidump_machdep.c projects/vnet/sys/arm/arm/physmem.c projects/vnet/sys/arm/arm/pmap-v6-new.c projects/vnet/sys/arm/at91/at91.c projects/vnet/sys/arm/at91/at91_common.c projects/vnet/sys/arm/at91/at91_machdep.c projects/vnet/sys/arm/at91/at91_mci.c projects/vnet/sys/arm/at91/board_tsc4370.c projects/vnet/sys/arm/at91/files.at91 projects/vnet/sys/arm/at91/uart_cpu_at91usart.c projects/vnet/sys/arm/conf/DB-78XXX projects/vnet/sys/arm/conf/DB-88F5XXX projects/vnet/sys/arm/conf/DB-88F6XXX projects/vnet/sys/arm/conf/DOCKSTAR projects/vnet/sys/arm/conf/DREAMPLUG-1001 projects/vnet/sys/arm/conf/IMX53 projects/vnet/sys/arm/conf/IMX6 projects/vnet/sys/arm/conf/SHEEVAPLUG projects/vnet/sys/arm/conf/TS7800 projects/vnet/sys/arm/freescale/imx/imx_sdhci.c projects/vnet/sys/arm/include/minidump.h projects/vnet/sys/arm/include/sysarch.h projects/vnet/sys/arm/mv/armadaxp/armadaxp.c projects/vnet/sys/arm/mv/files.mv projects/vnet/sys/arm/mv/mv_common.c projects/vnet/sys/arm/mv/mv_machdep.c projects/vnet/sys/arm/mv/mv_pci.c projects/vnet/sys/arm/mv/mvreg.h projects/vnet/sys/arm/mv/mvvar.h projects/vnet/sys/arm/mv/mvwin.h projects/vnet/sys/arm/mv/timer.c projects/vnet/sys/arm/mv/twsi.c projects/vnet/sys/arm/ti/ti_common.c projects/vnet/sys/arm/xscale/ixp425/avila_machdep.c projects/vnet/sys/arm64/arm64/elf_machdep.c projects/vnet/sys/arm64/arm64/identcpu.c projects/vnet/sys/arm64/arm64/machdep.c projects/vnet/sys/arm64/arm64/mp_machdep.c projects/vnet/sys/arm64/cavium/thunder_pcie.c projects/vnet/sys/arm64/cavium/thunder_pcie_common.c projects/vnet/sys/arm64/cavium/thunder_pcie_common.h projects/vnet/sys/arm64/cavium/thunder_pcie_pem.c projects/vnet/sys/arm64/include/armreg.h projects/vnet/sys/arm64/include/cpu.h projects/vnet/sys/arm64/include/ofw_machdep.h projects/vnet/sys/boot/arm64/libarm64/cache.c projects/vnet/sys/boot/common/bootstrap.h projects/vnet/sys/boot/common/console.c projects/vnet/sys/boot/common/interp_forth.c projects/vnet/sys/boot/common/load_elf.c projects/vnet/sys/boot/common/load_elf_obj.c projects/vnet/sys/boot/common/misc.c projects/vnet/sys/boot/common/module.c projects/vnet/sys/boot/common/part.c projects/vnet/sys/boot/common/self_reloc.c projects/vnet/sys/boot/common/ufsread.c projects/vnet/sys/boot/efi/Makefile projects/vnet/sys/boot/efi/boot1/Makefile projects/vnet/sys/boot/efi/boot1/boot1.c projects/vnet/sys/boot/efi/boot1/fat-amd64.tmpl.bz2.uu projects/vnet/sys/boot/efi/boot1/fat-arm.tmpl.bz2.uu projects/vnet/sys/boot/efi/boot1/fat-arm64.tmpl.bz2.uu projects/vnet/sys/boot/efi/boot1/fat-i386.tmpl.bz2.uu projects/vnet/sys/boot/efi/boot1/generate-fat.sh projects/vnet/sys/boot/efi/fdt/Makefile projects/vnet/sys/boot/efi/fdt/efi_fdt.c projects/vnet/sys/boot/efi/include/amd64/efibind.h projects/vnet/sys/boot/efi/include/arm64/efibind.h projects/vnet/sys/boot/efi/include/efi_nii.h projects/vnet/sys/boot/efi/include/efiapi.h projects/vnet/sys/boot/efi/include/eficon.h projects/vnet/sys/boot/efi/include/eficonsctl.h projects/vnet/sys/boot/efi/include/efidevp.h projects/vnet/sys/boot/efi/include/efierr.h projects/vnet/sys/boot/efi/include/efifpswa.h projects/vnet/sys/boot/efi/include/efigop.h projects/vnet/sys/boot/efi/include/efilib.h projects/vnet/sys/boot/efi/include/efinet.h projects/vnet/sys/boot/efi/include/efipciio.h projects/vnet/sys/boot/efi/include/efiprot.h projects/vnet/sys/boot/efi/include/efipxebc.h projects/vnet/sys/boot/efi/include/efiser.h projects/vnet/sys/boot/efi/include/efiuga.h projects/vnet/sys/boot/efi/include/i386/efibind.h projects/vnet/sys/boot/efi/libefi/Makefile projects/vnet/sys/boot/efi/libefi/efi_console.c projects/vnet/sys/boot/efi/libefi/efipart.c projects/vnet/sys/boot/efi/libefi/handles.c projects/vnet/sys/boot/efi/libefi/libefi.c projects/vnet/sys/boot/efi/loader/Makefile projects/vnet/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c projects/vnet/sys/boot/efi/loader/arch/amd64/framebuffer.c projects/vnet/sys/boot/efi/loader/arch/arm/exec.c projects/vnet/sys/boot/efi/loader/arch/arm64/exec.c projects/vnet/sys/boot/efi/loader/autoload.c projects/vnet/sys/boot/efi/loader/bootinfo.c projects/vnet/sys/boot/efi/loader/conf.c projects/vnet/sys/boot/efi/loader/copy.c projects/vnet/sys/boot/efi/loader/devicename.c projects/vnet/sys/boot/efi/loader/loader_efi.h projects/vnet/sys/boot/efi/loader/main.c projects/vnet/sys/boot/fdt/dts/arm/db78460.dts projects/vnet/sys/boot/fdt/dts/arm/rk3188.dtsi projects/vnet/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/vnet/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/vnet/sys/boot/fdt/fdt_loader_cmd.c projects/vnet/sys/boot/ficl/amd64/sysdep.c projects/vnet/sys/boot/forth/beastie.4th projects/vnet/sys/boot/forth/beastie.4th.8 projects/vnet/sys/boot/forth/loader.conf projects/vnet/sys/boot/forth/loader.conf.5 projects/vnet/sys/boot/forth/menu-commands.4th projects/vnet/sys/boot/forth/menu.rc projects/vnet/sys/boot/forth/support.4th projects/vnet/sys/boot/i386/libi386/smbios.c projects/vnet/sys/boot/i386/loader/main.c projects/vnet/sys/boot/kshim/bsd_global.h projects/vnet/sys/boot/kshim/bsd_kernel.c projects/vnet/sys/boot/kshim/bsd_kernel.h projects/vnet/sys/boot/libstand32/Makefile projects/vnet/sys/boot/libstand32/Makefile.depend projects/vnet/sys/boot/mips/beri/boot2/flashboot.ldscript projects/vnet/sys/boot/mips/beri/boot2/jtagboot.ldscript projects/vnet/sys/boot/powerpc/boot1.chrp/boot1.c projects/vnet/sys/boot/uboot/common/main.c projects/vnet/sys/boot/uboot/lib/copy.c projects/vnet/sys/boot/userboot/libstand/Makefile projects/vnet/sys/boot/userboot/libstand/Makefile.depend projects/vnet/sys/boot/userboot/test/Makefile.depend projects/vnet/sys/boot/userboot/test/test.c projects/vnet/sys/boot/userboot/userboot/main.c projects/vnet/sys/boot/zfs/libzfs.h projects/vnet/sys/boot/zfs/zfs.c projects/vnet/sys/boot/zfs/zfsimpl.c projects/vnet/sys/cam/ctl/ctl.c projects/vnet/sys/cam/ctl/ctl_ha.c projects/vnet/sys/cam/scsi/scsi_ch.c projects/vnet/sys/cam/scsi/scsi_enc.c projects/vnet/sys/cam/scsi/scsi_pass.c projects/vnet/sys/cam/scsi/scsi_pt.c projects/vnet/sys/cam/scsi/scsi_sa.c projects/vnet/sys/cam/scsi/scsi_sg.c projects/vnet/sys/cddl/boot/zfs/lz4.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/vnet/sys/compat/ia32/ia32_sysvec.c projects/vnet/sys/compat/linux/linux_futex.c projects/vnet/sys/compat/linux/linux_misc.c projects/vnet/sys/compat/linux/linux_socket.c projects/vnet/sys/compat/linuxkpi/common/include/asm/atomic-long.h projects/vnet/sys/compat/linuxkpi/common/include/asm/atomic.h projects/vnet/sys/compat/linuxkpi/common/include/linux/cdev.h projects/vnet/sys/compat/linuxkpi/common/include/linux/device.h projects/vnet/sys/compat/linuxkpi/common/include/linux/file.h projects/vnet/sys/compat/linuxkpi/common/include/linux/gfp.h projects/vnet/sys/compat/linuxkpi/common/include/linux/idr.h projects/vnet/sys/compat/linuxkpi/common/include/linux/interrupt.h projects/vnet/sys/compat/linuxkpi/common/include/linux/kobject.h projects/vnet/sys/compat/linuxkpi/common/include/linux/kthread.h projects/vnet/sys/compat/linuxkpi/common/include/linux/miscdevice.h projects/vnet/sys/compat/linuxkpi/common/include/linux/mutex.h projects/vnet/sys/compat/linuxkpi/common/include/linux/netdevice.h projects/vnet/sys/compat/linuxkpi/common/include/linux/pci.h projects/vnet/sys/compat/linuxkpi/common/src/linux_compat.c projects/vnet/sys/compat/linuxkpi/common/src/linux_idr.c projects/vnet/sys/compat/linuxkpi/common/src/linux_pci.c projects/vnet/sys/compat/svr4/svr4_sysvec.c projects/vnet/sys/conf/NOTES projects/vnet/sys/conf/files projects/vnet/sys/conf/files.amd64 projects/vnet/sys/conf/files.arm64 projects/vnet/sys/conf/files.i386 projects/vnet/sys/conf/files.mips projects/vnet/sys/conf/kern.post.mk projects/vnet/sys/conf/kmod.mk projects/vnet/sys/conf/newvers.sh projects/vnet/sys/conf/options.arm projects/vnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (contents, props changed) projects/vnet/sys/contrib/rdma/krping/krping.c projects/vnet/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c projects/vnet/sys/crypto/sha1.h projects/vnet/sys/dev/asmc/asmc.c projects/vnet/sys/dev/ath/ah_osdep.c projects/vnet/sys/dev/ath/ah_osdep.h projects/vnet/sys/dev/bwi/if_bwi.c projects/vnet/sys/dev/cxgb/cxgb_sge.c projects/vnet/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c projects/vnet/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/vnet/sys/dev/cxgb/ulp/tom/cxgb_l2t.c projects/vnet/sys/dev/cxgb/ulp/tom/cxgb_listen.c projects/vnet/sys/dev/cxgbe/iw_cxgbe/cm.c projects/vnet/sys/dev/cxgbe/t4_main.c projects/vnet/sys/dev/cxgbe/t4_sge.c projects/vnet/sys/dev/cxgbe/tom/t4_cpl_io.c projects/vnet/sys/dev/cxgbe/tom/t4_listen.c projects/vnet/sys/dev/cxgbe/tom/t4_tom_l2t.c projects/vnet/sys/dev/drm2/drm_crtc.c projects/vnet/sys/dev/drm2/drm_pci.c projects/vnet/sys/dev/drm2/i915/i915_gem.c projects/vnet/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/vnet/sys/dev/drm2/i915/i915_gem_gtt.c projects/vnet/sys/dev/drm2/i915/i915_gem_tiling.c projects/vnet/sys/dev/drm2/i915/i915_irq.c projects/vnet/sys/dev/drm2/i915/intel_crt.c projects/vnet/sys/dev/drm2/i915/intel_display.c projects/vnet/sys/dev/drm2/i915/intel_overlay.c projects/vnet/sys/dev/e1000/if_em.c projects/vnet/sys/dev/e1000/if_em.h projects/vnet/sys/dev/e1000/if_igb.c projects/vnet/sys/dev/e1000/if_igb.h projects/vnet/sys/dev/e1000/if_lem.c projects/vnet/sys/dev/e1000/if_lem.h projects/vnet/sys/dev/fdt/fdt_common.c projects/vnet/sys/dev/fdt/fdt_common.h projects/vnet/sys/dev/flash/mx25l.c projects/vnet/sys/dev/gpio/gpiobus.c projects/vnet/sys/dev/hwpmc/hwpmc_e500.c projects/vnet/sys/dev/hwpmc/hwpmc_powerpc.c projects/vnet/sys/dev/hyperv/include/hyperv.h projects/vnet/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/vnet/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/vnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/vnet/sys/dev/hyperv/netvsc/hv_rndis.h projects/vnet/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/vnet/sys/dev/hyperv/netvsc/hv_rndis_filter.h projects/vnet/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/vnet/sys/dev/hyperv/vmbus/hv_channel_mgmt.c projects/vnet/sys/dev/hyperv/vmbus/hv_connection.c projects/vnet/sys/dev/hyperv/vmbus/hv_hv.c projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c projects/vnet/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/vnet/sys/dev/ic/ns16550.h projects/vnet/sys/dev/if_ndis/if_ndis.c projects/vnet/sys/dev/ioat/ioat.c projects/vnet/sys/dev/ioat/ioat.h projects/vnet/sys/dev/iscsi/iscsi.c projects/vnet/sys/dev/iscsi/iscsi.h projects/vnet/sys/dev/ismt/ismt.c projects/vnet/sys/dev/iwi/if_iwi.c projects/vnet/sys/dev/iwm/if_iwm.c projects/vnet/sys/dev/iwm/if_iwm_mac_ctxt.c projects/vnet/sys/dev/iwm/if_iwmvar.h projects/vnet/sys/dev/iwn/if_iwn.c projects/vnet/sys/dev/ixgbe/if_ix.c projects/vnet/sys/dev/ixgbe/if_ixv.c projects/vnet/sys/dev/ixl/if_ixl.c projects/vnet/sys/dev/malo/if_malo.c projects/vnet/sys/dev/mlx5/mlx5_en/en.h projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c projects/vnet/sys/dev/mxge/if_mxge.c projects/vnet/sys/dev/netmap/if_em_netmap.h projects/vnet/sys/dev/nvd/nvd.c projects/vnet/sys/dev/nvme/nvme.c projects/vnet/sys/dev/nvme/nvme_ctrlr.c projects/vnet/sys/dev/nvme/nvme_private.h projects/vnet/sys/dev/nvme/nvme_qpair.c projects/vnet/sys/dev/nvme/nvme_sysctl.c projects/vnet/sys/dev/ofw/ofw_bus_subr.c projects/vnet/sys/dev/ofw/ofw_fdt.c projects/vnet/sys/dev/otus/if_otus.c projects/vnet/sys/dev/pci/pcireg.h projects/vnet/sys/dev/pty/pty.c projects/vnet/sys/dev/puc/pucdata.c projects/vnet/sys/dev/ral/rt2560.c projects/vnet/sys/dev/ral/rt2661.c projects/vnet/sys/dev/ral/rt2860.c projects/vnet/sys/dev/rt/if_rt.c projects/vnet/sys/dev/sec/sec.c projects/vnet/sys/dev/sfxge/common/ef10_tlv_layout.h projects/vnet/sys/dev/sfxge/common/efsys.h projects/vnet/sys/dev/sfxge/common/efx.h projects/vnet/sys/dev/sfxge/common/efx_bootcfg.c projects/vnet/sys/dev/sfxge/common/efx_check.h projects/vnet/sys/dev/sfxge/common/efx_crc32.c projects/vnet/sys/dev/sfxge/common/efx_ev.c projects/vnet/sys/dev/sfxge/common/efx_filter.c projects/vnet/sys/dev/sfxge/common/efx_hash.c projects/vnet/sys/dev/sfxge/common/efx_impl.h projects/vnet/sys/dev/sfxge/common/efx_intr.c projects/vnet/sys/dev/sfxge/common/efx_mac.c projects/vnet/sys/dev/sfxge/common/efx_mcdi.c projects/vnet/sys/dev/sfxge/common/efx_mcdi.h projects/vnet/sys/dev/sfxge/common/efx_mon.c projects/vnet/sys/dev/sfxge/common/efx_nic.c projects/vnet/sys/dev/sfxge/common/efx_nvram.c projects/vnet/sys/dev/sfxge/common/efx_phy.c projects/vnet/sys/dev/sfxge/common/efx_port.c projects/vnet/sys/dev/sfxge/common/efx_regs_ef10.h projects/vnet/sys/dev/sfxge/common/efx_regs_mcdi.h projects/vnet/sys/dev/sfxge/common/efx_rx.c projects/vnet/sys/dev/sfxge/common/efx_sram.c projects/vnet/sys/dev/sfxge/common/efx_tx.c projects/vnet/sys/dev/sfxge/common/efx_types.h projects/vnet/sys/dev/sfxge/common/efx_vpd.c projects/vnet/sys/dev/sfxge/common/efx_wol.c projects/vnet/sys/dev/sfxge/common/hunt_ev.c projects/vnet/sys/dev/sfxge/common/hunt_filter.c projects/vnet/sys/dev/sfxge/common/hunt_impl.h projects/vnet/sys/dev/sfxge/common/hunt_intr.c projects/vnet/sys/dev/sfxge/common/hunt_mac.c projects/vnet/sys/dev/sfxge/common/hunt_mcdi.c projects/vnet/sys/dev/sfxge/common/hunt_nic.c projects/vnet/sys/dev/sfxge/common/hunt_nvram.c projects/vnet/sys/dev/sfxge/common/hunt_phy.c projects/vnet/sys/dev/sfxge/common/hunt_rx.c projects/vnet/sys/dev/sfxge/common/hunt_sram.c projects/vnet/sys/dev/sfxge/common/hunt_tx.c projects/vnet/sys/dev/sfxge/common/hunt_vpd.c projects/vnet/sys/dev/sfxge/common/mcdi_mon.c projects/vnet/sys/dev/sfxge/common/siena_flash.h projects/vnet/sys/dev/sfxge/common/siena_impl.h projects/vnet/sys/dev/sfxge/common/siena_mac.c projects/vnet/sys/dev/sfxge/common/siena_mcdi.c projects/vnet/sys/dev/sfxge/common/siena_nic.c projects/vnet/sys/dev/sfxge/common/siena_nvram.c projects/vnet/sys/dev/sfxge/common/siena_phy.c projects/vnet/sys/dev/sfxge/common/siena_sram.c projects/vnet/sys/dev/sfxge/common/siena_vpd.c projects/vnet/sys/dev/sfxge/sfxge.h projects/vnet/sys/dev/sfxge/sfxge_tx.c projects/vnet/sys/dev/sfxge/sfxge_tx.h projects/vnet/sys/dev/sfxge/sfxge_version.h projects/vnet/sys/dev/ti/if_ti.c projects/vnet/sys/dev/tsec/if_tsec.c projects/vnet/sys/dev/uart/uart_bus.h projects/vnet/sys/dev/uart/uart_core.c projects/vnet/sys/dev/uart/uart_cpu_fdt.c projects/vnet/sys/dev/uart/uart_dev_ns8250.c projects/vnet/sys/dev/uart/uart_tty.c projects/vnet/sys/dev/usb/controller/dwc_otg.c projects/vnet/sys/dev/usb/controller/ehci_mv.c projects/vnet/sys/dev/usb/net/if_axe.c projects/vnet/sys/dev/usb/serial/usb_serial.c projects/vnet/sys/dev/usb/usb_device.c projects/vnet/sys/dev/usb/usb_lookup.c projects/vnet/sys/dev/usb/usbdevs projects/vnet/sys/dev/usb/usbdi.h projects/vnet/sys/dev/usb/wlan/if_rsu.c projects/vnet/sys/dev/usb/wlan/if_rum.c projects/vnet/sys/dev/usb/wlan/if_run.c projects/vnet/sys/dev/usb/wlan/if_uath.c projects/vnet/sys/dev/usb/wlan/if_upgt.c projects/vnet/sys/dev/usb/wlan/if_ural.c projects/vnet/sys/dev/usb/wlan/if_urtw.c projects/vnet/sys/dev/usb/wlan/if_urtwn.c projects/vnet/sys/dev/usb/wlan/if_urtwnreg.h projects/vnet/sys/dev/usb/wlan/if_urtwnvar.h projects/vnet/sys/dev/usb/wlan/if_zyd.c projects/vnet/sys/dev/vt/hw/ofwfb/ofwfb.c projects/vnet/sys/dev/wpi/if_wpi.c projects/vnet/sys/dev/xen/blkfront/blkfront.c projects/vnet/sys/dev/xen/netfront/netfront.c projects/vnet/sys/fs/devfs/devfs_vnops.c projects/vnet/sys/fs/ext2fs/ext2_bmap.c projects/vnet/sys/fs/ext2fs/ext2_dir.h projects/vnet/sys/fs/ext2fs/ext2_extents.c projects/vnet/sys/fs/ext2fs/ext2_extents.h projects/vnet/sys/fs/ext2fs/ext2_extern.h projects/vnet/sys/fs/ext2fs/ext2_lookup.c projects/vnet/sys/fs/ext2fs/ext2_vfsops.c projects/vnet/sys/fs/ext2fs/ext2_vnops.c projects/vnet/sys/fs/ext2fs/ext2fs.h projects/vnet/sys/fs/nandfs/nandfs_segment.c projects/vnet/sys/fs/nfs/nfs_var.h projects/vnet/sys/fs/nfsclient/nfs_clport.c projects/vnet/sys/fs/nfsclient/nfs_clrpcops.c projects/vnet/sys/fs/nullfs/null_vnops.c projects/vnet/sys/fs/smbfs/smbfs_smb.c projects/vnet/sys/fs/smbfs/smbfs_subr.h projects/vnet/sys/fs/smbfs/smbfs_vnops.c projects/vnet/sys/geom/eli/g_eli.c projects/vnet/sys/geom/eli/g_eli.h projects/vnet/sys/geom/eli/g_eli_crypto.c projects/vnet/sys/geom/eli/g_eli_key_cache.c projects/vnet/sys/geom/eli/pkcs5v2.c projects/vnet/sys/geom/geom_disk.c projects/vnet/sys/i386/i386/elf_machdep.c projects/vnet/sys/i386/i386/machdep.c projects/vnet/sys/i386/ibcs2/ibcs2_sysvec.c projects/vnet/sys/i386/include/metadata.h projects/vnet/sys/i386/isa/npx.c projects/vnet/sys/i386/linux/linux_proto.h projects/vnet/sys/i386/linux/linux_syscall.h projects/vnet/sys/i386/linux/linux_syscalls.c projects/vnet/sys/i386/linux/linux_sysent.c projects/vnet/sys/i386/linux/linux_sysvec.c projects/vnet/sys/i386/linux/syscalls.master projects/vnet/sys/kern/imgact_aout.c projects/vnet/sys/kern/init_main.c projects/vnet/sys/kern/kern_condvar.c projects/vnet/sys/kern/kern_conf.c projects/vnet/sys/kern/kern_environment.c projects/vnet/sys/kern/kern_exit.c projects/vnet/sys/kern/kern_fork.c projects/vnet/sys/kern/kern_ktr.c projects/vnet/sys/kern/kern_proc.c projects/vnet/sys/kern/kern_prot.c projects/vnet/sys/kern/kern_sig.c projects/vnet/sys/kern/kern_thr.c projects/vnet/sys/kern/kern_thread.c projects/vnet/sys/kern/subr_bus_dma.c projects/vnet/sys/kern/sys_process.c projects/vnet/sys/kern/tty.c projects/vnet/sys/kern/uipc_mbuf.c projects/vnet/sys/kern/uipc_sockbuf.c projects/vnet/sys/kern/uipc_syscalls.c projects/vnet/sys/kern/uipc_usrreq.c projects/vnet/sys/kern/vfs_aio.c projects/vnet/sys/kern/vfs_cache.c projects/vnet/sys/kern/vfs_default.c projects/vnet/sys/kern/vfs_subr.c projects/vnet/sys/kern/vfs_vnops.c projects/vnet/sys/kgssapi/gss_impl.c projects/vnet/sys/mips/beri/beri_machdep.c projects/vnet/sys/mips/include/asm.h projects/vnet/sys/mips/mips/elf_machdep.c projects/vnet/sys/mips/mips/freebsd32_machdep.c projects/vnet/sys/mips/nlm/xlp_machdep.c projects/vnet/sys/modules/Makefile projects/vnet/sys/modules/ext2fs/Makefile projects/vnet/sys/modules/geom/geom_eli/Makefile projects/vnet/sys/modules/hyperv/vmbus/Makefile projects/vnet/sys/modules/i2c/iicbb/Makefile projects/vnet/sys/modules/ix/Makefile projects/vnet/sys/modules/ixlv/Makefile projects/vnet/sys/modules/ixv/Makefile projects/vnet/sys/modules/sfxge/Makefile projects/vnet/sys/modules/syscons/Makefile projects/vnet/sys/net/bpf.c projects/vnet/sys/net/flowtable.c projects/vnet/sys/net/if.c projects/vnet/sys/net/if_arcsubr.c projects/vnet/sys/net/if_ethersubr.c projects/vnet/sys/net/if_fddisubr.c projects/vnet/sys/net/if_fwsubr.c projects/vnet/sys/net/if_gif.c projects/vnet/sys/net/if_gre.c projects/vnet/sys/net/if_iso88025subr.c projects/vnet/sys/net/if_llatbl.c projects/vnet/sys/net/if_llatbl.h projects/vnet/sys/net/if_loop.c projects/vnet/sys/net/if_var.h projects/vnet/sys/net/radix_mpath.c projects/vnet/sys/net/radix_mpath.h projects/vnet/sys/net/route.c projects/vnet/sys/net/route.h projects/vnet/sys/net/rtsock.c projects/vnet/sys/net80211/ieee80211_freebsd.c projects/vnet/sys/net80211/ieee80211_freebsd.h projects/vnet/sys/net80211/ieee80211_scan_sw.c projects/vnet/sys/net80211/ieee80211_var.h projects/vnet/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/vnet/sys/netgraph/netflow/netflow.c projects/vnet/sys/netgraph/netflow/netflow_v9.c projects/vnet/sys/netgraph/netflow/ng_netflow.c projects/vnet/sys/netinet/cc/cc.c projects/vnet/sys/netinet/cc/cc_cdg.c projects/vnet/sys/netinet/cc/cc_chd.c projects/vnet/sys/netinet/cc/cc_cubic.c projects/vnet/sys/netinet/cc/cc_dctcp.c projects/vnet/sys/netinet/cc/cc_hd.c projects/vnet/sys/netinet/cc/cc_htcp.c projects/vnet/sys/netinet/cc/cc_newreno.c projects/vnet/sys/netinet/cc/cc_vegas.c projects/vnet/sys/netinet/if_ether.c projects/vnet/sys/netinet/if_ether.h projects/vnet/sys/netinet/in.c projects/vnet/sys/netinet/in_fib.c projects/vnet/sys/netinet/in_pcb.c projects/vnet/sys/netinet/in_rmx.c projects/vnet/sys/netinet/in_var.h projects/vnet/sys/netinet/ip_encap.c projects/vnet/sys/netinet/ip_mroute.c projects/vnet/sys/netinet/ip_output.c projects/vnet/sys/netinet/raw_ip.c projects/vnet/sys/netinet/sctp_pcb.c projects/vnet/sys/netinet/sctp_structs.h projects/vnet/sys/netinet/sctp_usrreq.c projects/vnet/sys/netinet/sctputil.c projects/vnet/sys/netinet/tcp.h projects/vnet/sys/netinet/tcp_input.c projects/vnet/sys/netinet/tcp_lro.c projects/vnet/sys/netinet/tcp_lro.h projects/vnet/sys/netinet/tcp_output.c projects/vnet/sys/netinet/tcp_reass.c projects/vnet/sys/netinet/tcp_stacks/fastpath.c projects/vnet/sys/netinet/tcp_subr.c projects/vnet/sys/netinet/tcp_timer.c projects/vnet/sys/netinet/tcp_usrreq.c projects/vnet/sys/netinet/tcp_var.h projects/vnet/sys/netinet/toecore.c projects/vnet/sys/netinet6/frag6.c projects/vnet/sys/netinet6/icmp6.c projects/vnet/sys/netinet6/in6.c projects/vnet/sys/netinet6/in6.h projects/vnet/sys/netinet6/in6_fib.c projects/vnet/sys/netinet6/in6_pcb.c projects/vnet/sys/netinet6/in6_rmx.c projects/vnet/sys/netinet6/in6_src.c projects/vnet/sys/netinet6/ip6_forward.c projects/vnet/sys/netinet6/ip6_output.c projects/vnet/sys/netinet6/ip6_var.h projects/vnet/sys/netinet6/nd6.c projects/vnet/sys/netinet6/nd6.h projects/vnet/sys/netinet6/nd6_nbr.c projects/vnet/sys/netinet6/raw_ip6.c projects/vnet/sys/netinet6/sctp6_usrreq.c projects/vnet/sys/netinet6/udp6_usrreq.c projects/vnet/sys/netpfil/ipfw/ip_fw_table.c projects/vnet/sys/netpfil/ipfw/ip_fw_table_algo.c projects/vnet/sys/netpfil/ipfw/ip_fw_table_value.c projects/vnet/sys/netpfil/pf/pf.c projects/vnet/sys/netpfil/pf/pf_if.c projects/vnet/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/vnet/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/vnet/sys/opencrypto/skipjack.h projects/vnet/sys/opencrypto/xform.c projects/vnet/sys/opencrypto/xform.h projects/vnet/sys/powerpc/aim/aim_machdep.c projects/vnet/sys/powerpc/aim/locore32.S projects/vnet/sys/powerpc/aim/locore64.S projects/vnet/sys/powerpc/aim/mp_cpudep.c projects/vnet/sys/powerpc/aim/trap_subr64.S projects/vnet/sys/powerpc/booke/booke_machdep.c projects/vnet/sys/powerpc/booke/locore.S projects/vnet/sys/powerpc/booke/machdep_e500.c projects/vnet/sys/powerpc/booke/pmap.c projects/vnet/sys/powerpc/include/cpu.h projects/vnet/sys/powerpc/include/intr_machdep.h projects/vnet/sys/powerpc/include/pcb.h projects/vnet/sys/powerpc/include/platform.h projects/vnet/sys/powerpc/include/setjmp.h projects/vnet/sys/powerpc/include/vmparam.h projects/vnet/sys/powerpc/mpc85xx/lbc.c projects/vnet/sys/powerpc/mpc85xx/mpc85xx.c projects/vnet/sys/powerpc/mpc85xx/mpc85xx.h projects/vnet/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/vnet/sys/powerpc/mpc85xx/platform_mpc85xx.c projects/vnet/sys/powerpc/ofw/ofw_pci.c projects/vnet/sys/powerpc/ofw/ofw_pci.h projects/vnet/sys/powerpc/ofw/rtas.c projects/vnet/sys/powerpc/powermac/grackle.c projects/vnet/sys/powerpc/powerpc/copyinout.c projects/vnet/sys/powerpc/powerpc/cpu.c projects/vnet/sys/powerpc/powerpc/elf32_machdep.c projects/vnet/sys/powerpc/powerpc/elf64_machdep.c projects/vnet/sys/powerpc/powerpc/intr_machdep.c projects/vnet/sys/powerpc/powerpc/machdep.c projects/vnet/sys/powerpc/powerpc/mp_machdep.c projects/vnet/sys/powerpc/powerpc/platform.c projects/vnet/sys/powerpc/powerpc/platform_if.m projects/vnet/sys/powerpc/powerpc/setjmp.S projects/vnet/sys/powerpc/powerpc/trap.c projects/vnet/sys/powerpc/pseries/rtas_pci.c projects/vnet/sys/riscv/include/riscvreg.h projects/vnet/sys/security/audit/audit_pipe.c projects/vnet/sys/security/audit/audit_worker.c projects/vnet/sys/sparc64/include/atomic.h projects/vnet/sys/sparc64/include/ktr.h projects/vnet/sys/sparc64/include/ofw_machdep.h projects/vnet/sys/sparc64/sparc64/elf_machdep.c projects/vnet/sys/sparc64/sparc64/exception.S projects/vnet/sys/sparc64/sparc64/machdep.c projects/vnet/sys/sparc64/sparc64/mp_exception.S projects/vnet/sys/sparc64/sparc64/pmap.c projects/vnet/sys/sparc64/sparc64/swtch.S projects/vnet/sys/sys/conf.h projects/vnet/sys/sys/copyright.h projects/vnet/sys/sys/elf_common.h projects/vnet/sys/sys/fcntl.h projects/vnet/sys/sys/mbuf.h projects/vnet/sys/sys/nv.h projects/vnet/sys/sys/param.h projects/vnet/sys/sys/priv.h projects/vnet/sys/sys/proc.h projects/vnet/sys/sys/ptrace.h projects/vnet/sys/sys/sf_buf.h projects/vnet/sys/sys/sockbuf.h projects/vnet/sys/sys/socket.h projects/vnet/sys/sys/sysent.h projects/vnet/sys/sys/ttydevsw.h projects/vnet/sys/sys/ucred.h projects/vnet/sys/sys/vnode.h projects/vnet/sys/vm/vm_domain.c projects/vnet/sys/vm/vm_extern.h projects/vnet/sys/vm/vm_map.c projects/vnet/sys/vm/vm_phys.c projects/vnet/sys/x86/include/specialreg.h projects/vnet/sys/x86/x86/identcpu.c projects/vnet/sys/x86/xen/pv.c projects/vnet/sys/xen/xenbus/xenbusb.c projects/vnet/sys/xen/xenbus/xenbusvar.h projects/vnet/targets/pseudo/userland/lib/Makefile.depend projects/vnet/tests/sys/Makefile projects/vnet/tests/sys/kern/Makefile projects/vnet/tests/sys/kern/ptrace_test.c projects/vnet/tools/build/check-links.sh projects/vnet/tools/build/mk/OptionalObsoleteFiles.inc projects/vnet/tools/regression/posixsem2/semtest.c projects/vnet/tools/regression/sockets/accf_data_attach/accf_data_attach.c projects/vnet/tools/regression/sockets/reconnect/reconnect.c projects/vnet/tools/regression/sockets/rtsocket/rtsocket.c projects/vnet/tools/regression/sockets/sendfile/sendfile.c projects/vnet/tools/regression/sockets/so_setfib/so_setfib.c projects/vnet/tools/regression/sockets/unix_gc/Makefile projects/vnet/tools/regression/sockets/unix_gc/unix_gc.c projects/vnet/tools/regression/sockets/unix_socket/unix_socket.c projects/vnet/tools/regression/sockets/zerosend/Makefile projects/vnet/tools/regression/sockets/zerosend/zerosend.c projects/vnet/tools/tools/nanobsd/defaults.sh projects/vnet/tools/tools/nanobsd/embedded/common projects/vnet/tools/tools/nanobsd/embedded/rpi2.cfg projects/vnet/usr.bin/cap_mkdb/cap_mkdb.c projects/vnet/usr.bin/clang/clang/Makefile projects/vnet/usr.bin/clang/lldb/Makefile projects/vnet/usr.bin/column/column.c projects/vnet/usr.bin/dtc/Makefile projects/vnet/usr.bin/dtc/checking.cc projects/vnet/usr.bin/dtc/checking.hh projects/vnet/usr.bin/dtc/dtb.hh projects/vnet/usr.bin/dtc/fdt.cc projects/vnet/usr.bin/dtc/fdt.hh projects/vnet/usr.bin/dtc/input_buffer.cc projects/vnet/usr.bin/dtc/input_buffer.hh projects/vnet/usr.bin/finger/net.c projects/vnet/usr.bin/iscsictl/iscsictl.8 projects/vnet/usr.bin/kdump/Makefile.depend projects/vnet/usr.bin/less/defines.h projects/vnet/usr.bin/less/lesspipe.sh projects/vnet/usr.bin/locate/locate/util.c projects/vnet/usr.bin/m4/misc.c projects/vnet/usr.bin/mandoc/Makefile projects/vnet/usr.bin/netstat/mbuf.c projects/vnet/usr.bin/nfsstat/Makefile.depend projects/vnet/usr.bin/numactl/numactl.c projects/vnet/usr.bin/truncate/tests/truncate_test.sh projects/vnet/usr.bin/truss/Makefile.depend.amd64 projects/vnet/usr.bin/unzip/unzip.1 projects/vnet/usr.bin/unzip/unzip.c projects/vnet/usr.bin/xargs/xargs.c projects/vnet/usr.sbin/bhyve/bhyverun.c projects/vnet/usr.sbin/bhyve/pci_emul.c projects/vnet/usr.sbin/bhyve/pci_virtio_net.c projects/vnet/usr.sbin/bhyvectl/Makefile projects/vnet/usr.sbin/boot0cfg/boot0cfg.c projects/vnet/usr.sbin/bsdconfig/share/dialog.subr projects/vnet/usr.sbin/bsdinstall/scripts/auto projects/vnet/usr.sbin/bsdinstall/scripts/zfsboot projects/vnet/usr.sbin/camdd/camdd.c projects/vnet/usr.sbin/cron/crontab/crontab.5 projects/vnet/usr.sbin/gssd/gssd.c projects/vnet/usr.sbin/jail/command.c projects/vnet/usr.sbin/jail/config.c projects/vnet/usr.sbin/jls/Makefile.depend projects/vnet/usr.sbin/jls/jls.8 projects/vnet/usr.sbin/kbdcontrol/kbdmap.5 projects/vnet/usr.sbin/makefs/makefs.c projects/vnet/usr.sbin/mountd/exports.5 projects/vnet/usr.sbin/mountd/mountd.c projects/vnet/usr.sbin/mpsutil/mps_cmd.c projects/vnet/usr.sbin/ntp/config.h projects/vnet/usr.sbin/ntp/doc/ntp-keygen.8 projects/vnet/usr.sbin/ntp/doc/ntp.conf.5 projects/vnet/usr.sbin/ntp/doc/ntp.keys.5 projects/vnet/usr.sbin/ntp/doc/ntpd.8 projects/vnet/usr.sbin/ntp/doc/ntpdc.8 projects/vnet/usr.sbin/ntp/doc/ntpq.8 projects/vnet/usr.sbin/ntp/doc/sntp.8 projects/vnet/usr.sbin/ntp/libntp/Makefile projects/vnet/usr.sbin/ntp/scripts/mkver projects/vnet/usr.sbin/pkg/config.c projects/vnet/usr.sbin/pw/pw_conf.c projects/vnet/usr.sbin/pw/pw_group.c projects/vnet/usr.sbin/pw/pw_vpw.c projects/vnet/usr.sbin/rpc.lockd/lockd.c projects/vnet/usr.sbin/rpc.statd/statd.c projects/vnet/usr.sbin/rpcbind/Makefile projects/vnet/usr.sbin/rpcbind/check_bound.c projects/vnet/usr.sbin/rpcbind/rpcbind.h projects/vnet/usr.sbin/rpcbind/util.c projects/vnet/usr.sbin/rtsold/rtsold.c projects/vnet/usr.sbin/services_mkdb/services_mkdb.c projects/vnet/usr.sbin/sesutil/Makefile.depend projects/vnet/usr.sbin/vidcontrol/vidcontrol.1 projects/vnet/usr.sbin/vidcontrol/vidcontrol.c projects/vnet/usr.sbin/ypldap/yp.c projects/vnet/usr.sbin/ypldap/ypldap.conf.5 Directory Properties: projects/vnet/ (props changed) projects/vnet/cddl/ (props changed) projects/vnet/cddl/contrib/opensolaris/ (props changed) projects/vnet/contrib/binutils/ (props changed) projects/vnet/contrib/less/ (props changed) projects/vnet/contrib/llvm/ (props changed) projects/vnet/contrib/llvm/projects/libunwind/ (props changed) projects/vnet/contrib/llvm/tools/clang/ (props changed) projects/vnet/contrib/mdocml/ (props changed) projects/vnet/contrib/ntp/ (props changed) projects/vnet/contrib/pf/ (props changed) projects/vnet/crypto/openssh/ (props changed) projects/vnet/crypto/openssh/contrib/ssh-copy-id.1 (props changed) projects/vnet/crypto/openssh/moduli.5 (props changed) projects/vnet/crypto/openssh/openbsd-compat/ (props changed) projects/vnet/crypto/openssh/openbsd-compat/regress/ (props changed) projects/vnet/crypto/openssh/ssh-keysign.8 (props changed) projects/vnet/crypto/openssh/ssh-pkcs11-helper.8 (props changed) projects/vnet/gnu/lib/ (props changed) projects/vnet/gnu/usr.bin/binutils/ (props changed) projects/vnet/include/ (props changed) projects/vnet/lib/libc/ (props changed) projects/vnet/sbin/ (props changed) projects/vnet/share/ (props changed) projects/vnet/share/man/man4/ (props changed) projects/vnet/sys/ (props changed) projects/vnet/sys/boot/ (props changed) projects/vnet/sys/boot/powerpc/boot1.chrp/ (props changed) projects/vnet/sys/cddl/contrib/opensolaris/ (props changed) projects/vnet/sys/conf/ (props changed) projects/vnet/sys/contrib/ipfilter/ (props changed) projects/vnet/sys/dev/hyperv/ (props changed) projects/vnet/sys/modules/hyperv/ (props changed) projects/vnet/targets/ (props changed) projects/vnet/usr.sbin/bhyve/ (props changed) projects/vnet/usr.sbin/bhyvectl/ (props changed) projects/vnet/usr.sbin/jail/ (props changed) projects/vnet/usr.sbin/rtsold/ (props changed) Modified: projects/vnet/COPYRIGHT ============================================================================== --- projects/vnet/COPYRIGHT Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/COPYRIGHT Fri Jan 22 15:11:40 2016 (r294568) @@ -4,7 +4,7 @@ The compilation of software known as FreeBSD is distributed under the following terms: -Copyright (c) 1992-2015 The FreeBSD Project. All rights reserved. +Copyright (c) 1992-2016 The FreeBSD Project. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions Modified: projects/vnet/Makefile ============================================================================== --- projects/vnet/Makefile Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/Makefile Fri Jan 22 15:11:40 2016 (r294568) @@ -205,7 +205,7 @@ _TARGET_ARCH?= ${MACHINE_ARCH} # The user can define ALWAYS_CHECK_MAKE to have this check performed # for all targets. # -.if defined(ALWAYS_CHECK_MAKE) +.if defined(ALWAYS_CHECK_MAKE) || !defined(.PARSEDIR) ${TGTS}: upgrade_checks .else buildworld: upgrade_checks Modified: projects/vnet/Makefile.inc1 ============================================================================== --- projects/vnet/Makefile.inc1 Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/Makefile.inc1 Fri Jan 22 15:11:40 2016 (r294568) @@ -569,10 +569,9 @@ _worldtmp: .PHONY .endif .else rm -rf ${WORLDTMP}/legacy/usr/include -# XXX - These three can depend on any header file. - rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c +# XXX - These can depend on any header file. + rm -f ${OBJTREE}${.CURDIR}/lib/libsysdecode/ioctl.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c - rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ lib usr legacy/bin legacy/usr @@ -1230,7 +1229,7 @@ reinstallkernel reinstallkernel.debug: _ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} .endif -.if ${BUILDKERNELS:[#]} > 1 +.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS) .for _kernel in ${BUILDKERNELS:[2..-1]} @echo "--------------------------------------------------------------" @echo ">>> Installing kernel ${_kernel}" @@ -1261,7 +1260,7 @@ distributekernel distributekernel.debug: ${DESTDIR}/${DISTDIR}/kernel.meta .endif .endif -.if ${BUILDKERNELS:[#]} > 1 +.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS) .for _kernel in ${BUILDKERNELS:[2..-1]} .if defined(NO_ROOT) echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta @@ -1284,27 +1283,43 @@ packagekernel: .if defined(NO_ROOT) .if !defined(NO_INSTALLKERNEL) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \ + tar cvf - --exclude '*.debug' \ + @${DESTDIR}/${DISTDIR}/kernel.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz .endif -.if ${BUILDKERNELS:[#]} > 1 + cd ${DESTDIR}/${DISTDIR}/kernel; \ + tar cvf - --include '*/*/*.debug' \ + @${DESTDIR}/${DISTDIR}/kernel.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz +.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS) .for _kernel in ${BUILDKERNELS:[2..-1]} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + tar cvf - --exclude '*.debug' \ + @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz + cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ + tar cvf - --include '*/*/*.debug' \ + @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz .endfor .endif .else .if !defined(NO_INSTALLKERNEL) cd ${DESTDIR}/${DISTDIR}/kernel; \ - tar cvf - . | \ + tar cvf - --exclude '*.debug' . | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz .endif -.if ${BUILDKERNELS:[#]} > 1 + cd ${DESTDIR}/${DISTDIR}/kernel; \ + tar cvf - --include '*/*/*.debug' $$(eval find .) | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz +.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS) .for _kernel in ${BUILDKERNELS:[2..-1]} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ - tar cvf - . | \ + tar cvf - --exclude '*.debug' . | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz + cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ + tar cvf - --include '*/*/*.debug' $$(eval find .) | \ + ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz .endfor .endif .endif @@ -1409,11 +1424,13 @@ _vtfontcvt= usr.bin/vtfontcvt _sed= usr.bin/sed .endif -.if ${BOOTSTRAPPING} < 1000002 +.if ${BOOTSTRAPPING} < 1000033 _libopenbsd= lib/libopenbsd _m4= usr.bin/m4 +_lex= usr.bin/lex ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd +${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 .endif .if ${BOOTSTRAPPING} < 1000026 @@ -1427,12 +1444,6 @@ ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libne _cat= bin/cat .endif -.if ${BOOTSTRAPPING} < 1000033 -_lex= usr.bin/lex - -${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 -.endif - # r277259 crunchide: Correct 64-bit section header offset # r281674 crunchide: always include both 32- and 64-bit ELF support # r285986 crunchen: use STRIPBIN rather than STRIP Modified: projects/vnet/ObsoleteFiles.inc ============================================================================== --- projects/vnet/ObsoleteFiles.inc Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/ObsoleteFiles.inc Fri Jan 22 15:11:40 2016 (r294568) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20160116: Update mandoc to cvs snapshot 20160116 +OLD_FILES+=usr/share/mdocml/example.style.css +OLD_FILES+=usr/share/mdocml/style.css +OLD_DIRS+=usr/share/mdocml # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h @@ -105,6 +109,8 @@ OLD_FILES+=usr/lib/clang/3.7.0/include/x OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h OLD_DIRS+=usr/lib/clang/3.7.0/include OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a Modified: projects/vnet/UPDATING ============================================================================== --- projects/vnet/UPDATING Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/UPDATING Fri Jan 22 15:11:40 2016 (r294568) @@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160119: + The NONE and HPN patches has been removed from OpenSSH. They are + still available in the security/openssh-portable port. + +20160113: + With the addition of ypldap(8), a new _ypldap user is now required + during installworld. "mergemaster -p" can be used to add the user + prior to installworld, as documented in the handbook. + 20151216: The tftp loader (pxeboot) now uses the option root-path directive. As a consequence it no longer looks for a pxeboot.4th file on the tftp Modified: projects/vnet/bin/pax/pat_rep.c ============================================================================== --- projects/vnet/bin/pax/pat_rep.c Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/bin/pax/pat_rep.c Fri Jan 22 15:11:40 2016 (r294568) @@ -878,7 +878,7 @@ rep_name(char *name, int *nlen, int prnt * (the user already saw that substitution go by) */ pt = rephead; - (void)strcpy(buf1, name); + (void)strlcpy(buf1, name, sizeof(buf1)); inpt = buf1; outpt = nname; endpt = outpt + PAXPATHLEN; Modified: projects/vnet/bin/sh/eval.c ============================================================================== --- projects/vnet/bin/sh/eval.c Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/bin/sh/eval.c Fri Jan 22 15:11:40 2016 (r294568) @@ -496,10 +496,12 @@ exphere(union node *redir, struct arglis struct jmploc *savehandler; struct localvar *savelocalvars; int need_longjmp = 0; + unsigned char saveoptreset; redir->nhere.expdoc = ""; savelocalvars = localvars; localvars = NULL; + saveoptreset = shellparam.reset; forcelocal++; savehandler = handler; if (setjmp(jmploc.loc)) @@ -514,6 +516,7 @@ exphere(union node *redir, struct arglis forcelocal--; poplocalvars(); localvars = savelocalvars; + shellparam.reset = saveoptreset; if (need_longjmp) longjmp(handler->loc, 1); INTON; @@ -647,6 +650,7 @@ evalbackcmd(union node *n, struct backcm struct jmploc jmploc; struct jmploc *savehandler; struct localvar *savelocalvars; + unsigned char saveoptreset; result->fd = -1; result->buf = NULL; @@ -661,6 +665,7 @@ evalbackcmd(union node *n, struct backcm if (is_valid_fast_cmdsubst(n)) { savelocalvars = localvars; localvars = NULL; + saveoptreset = shellparam.reset; forcelocal++; savehandler = handler; if (setjmp(jmploc.loc)) { @@ -671,6 +676,7 @@ evalbackcmd(union node *n, struct backcm forcelocal--; poplocalvars(); localvars = savelocalvars; + shellparam.reset = saveoptreset; longjmp(handler->loc, 1); } } else { @@ -681,6 +687,7 @@ evalbackcmd(union node *n, struct backcm forcelocal--; poplocalvars(); localvars = savelocalvars; + shellparam.reset = saveoptreset; } else { if (pipe(pip) < 0) error("Pipe call failed: %s", strerror(errno)); @@ -1032,12 +1039,12 @@ evalcommand(union node *cmd, int flags, reffunc(cmdentry.u.func); savehandler = handler; if (setjmp(jmploc.loc)) { - freeparam(&shellparam); - shellparam = saveparam; popredir(); unreffunc(cmdentry.u.func); poplocalvars(); localvars = savelocalvars; + freeparam(&shellparam); + shellparam = saveparam; funcnest--; handler = savehandler; longjmp(handler->loc, 1); Modified: projects/vnet/bin/sh/exec.c ============================================================================== --- projects/vnet/bin/sh/exec.c Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/bin/sh/exec.c Fri Jan 22 15:11:40 2016 (r294568) @@ -439,12 +439,14 @@ success: int find_builtin(const char *name, int *special) { - const struct builtincmd *bp; + const unsigned char *bp; + size_t len; - for (bp = builtincmd ; bp->name ; bp++) { - if (*bp->name == *name && equal(bp->name, name)) { - *special = bp->special; - return bp->code; + len = strlen(name); + for (bp = builtincmd ; *bp ; bp += 2 + bp[0]) { + if (bp[0] == len && memcmp(bp + 2, name, len) == 0) { + *special = (bp[1] & BUILTIN_SPECIAL) != 0; + return bp[1] & ~BUILTIN_SPECIAL; } } return -1; Modified: projects/vnet/bin/sh/expand.c ============================================================================== --- projects/vnet/bin/sh/expand.c Fri Jan 22 15:03:22 2016 (r294567) +++ projects/vnet/bin/sh/expand.c Fri Jan 22 15:11:40 2016 (r294568) @@ -3,6 +3,8 @@ * The Regents of the University of California. All rights reserved. * Copyright (c) 1997-2005 * Herbert Xu . All rights reserved. + * Copyright (c) 2010-2015 + * Jilles Tjoelker . All rights reserved. * * This code is derived from software contributed to Berkeley by * Kenneth Almquist. @@ -79,41 +81,32 @@ __FBSDID("$FreeBSD$"); #include "show.h" #include "builtins.h" -/* - * Structure specifying which parts of the string should be searched - * for IFS characters. - */ +enum wordstate { WORD_IDLE, WORD_WS_DELIMITED, WORD_QUOTEMARK }; -struct ifsregion { - struct ifsregion *next; /* next region in list */ - int begoff; /* offset of start of region */ - int endoff; /* offset of end of region */ - int inquotes; /* search for nul bytes only */ +struct worddest { + struct arglist *list; + enum wordstate state; }; - static char *expdest; /* output of current string */ static struct nodelist *argbackq; /* list of back quote expressions */ -static struct ifsregion ifsfirst; /* first struct in list of ifs regions */ -static struct ifsregion *ifslastp; /* last struct in list */ -static char *argstr(char *, int); +static char *argstr(char *, int, struct worddest *); static char *exptilde(char *, int); -static char *expari(char *); -static void expbackq(union node *, int, int); -static int subevalvar(char *, char *, int, int, int, int, int); -static char *evalvar(char *, int); +static char *expari(char *, int, struct worddest *); +static void expbackq(union node *, int, int, struct worddest *); +static void subevalvar_trim(char *, int, int, int); +static int subevalvar_misc(char *, const char *, int, int, int); +static char *evalvar(char *, int, struct worddest *); static int varisset(const char *, int); -static void strtodest(const char *, int, int, int); -static void varvalue(const char *, int, int, int); -static void recordregion(int, int, int); -static void removerecordregions(int); -static void ifsbreakup(char *, struct arglist *); -static void expandmeta(struct arglist *, struct arglist *); +static void strtodest(const char *, int, int, int, struct worddest *); +static void reprocess(int, int, int, int, struct worddest *); +static void varvalue(const char *, int, int, int, struct worddest *); +static void expandmeta(char *, struct arglist *); static void expmeta(char *, char *, struct arglist *); static int expsortcmp(const void *, const void *); -static int patmatch(const char *, const char *, int); -static char *cvtnum(int, char *); +static int patmatch(const char *, const char *); +static void cvtnum(int, char *); static int collate_range_cmp(wchar_t, wchar_t); void @@ -168,6 +161,53 @@ stputs_quotes(const char *data, const ch } #define STPUTS_QUOTES(data, syntax, p) p = stputs_quotes((data), syntax, p) +static char * +nextword(char c, int flag, char *p, struct worddest *dst) +{ + int is_ws; + + is_ws = c == '\t' || c == '\n' || c == ' '; + if (p != stackblock() || (is_ws ? dst->state == WORD_QUOTEMARK : + dst->state != WORD_WS_DELIMITED) || c == '\0') { + STPUTC('\0', p); + if (flag & EXP_GLOB) + expandmeta(grabstackstr(p), dst->list); + else + appendarglist(dst->list, grabstackstr(p)); + dst->state = is_ws ? WORD_WS_DELIMITED : WORD_IDLE; + } else if (!is_ws && dst->state == WORD_WS_DELIMITED) + dst->state = WORD_IDLE; + /* Reserve space while the stack string is empty. */ + appendarglist(dst->list, NULL); + dst->list->count--; + STARTSTACKSTR(p); + return p; +} +#define NEXTWORD(c, flag, p, dstlist) p = nextword(c, flag, p, dstlist) + +static char * +stputs_split(const char *data, const char *syntax, int flag, char *p, + struct worddest *dst) +{ + const char *ifs; + char c; + + ifs = ifsset() ? ifsval() : " \t\n"; + while (*data) { + CHECKSTRSPACE(2, p); + c = *data++; + if (strchr(ifs, c) != NULL) { + NEXTWORD(c, flag, p, dst); + continue; + } + if (flag & EXP_GLOB && syntax[(int)c] == CCTL) + USTPUTC(CTLESC, p); + USTPUTC(c, p); + } + return (p); +} +#define STPUTS_SPLIT(data, syntax, flag, p, dst) p = stputs_split((data), syntax, flag, p, dst) + /* * Perform expansions on an argument, placing the resulting list of arguments * in arglist. Parameter expansion, command substitution and arithmetic @@ -183,34 +223,31 @@ stputs_quotes(const char *data, const ch void expandarg(union node *arg, struct arglist *arglist, int flag) { - struct arglist exparg; - char *p; + struct worddest exparg; + if (fflag) + flag &= ~EXP_GLOB; argbackq = arg->narg.backquote; + exparg.list = arglist; + exparg.state = WORD_IDLE; STARTSTACKSTR(expdest); - ifsfirst.next = NULL; - ifslastp = NULL; - argstr(arg->narg.text, flag); + argstr(arg->narg.text, flag, &exparg); if (arglist == NULL) { STACKSTRNUL(expdest); return; /* here document expanded */ } - STPUTC('\0', expdest); - p = grabstackstr(expdest); - emptyarglist(&exparg); - if (flag & EXP_FULL) { - ifsbreakup(p, &exparg); - expandmeta(&exparg, arglist); - } else - appendarglist(arglist, p); - while (ifsfirst.next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifsfirst.next->next; - ckfree(ifsfirst.next); - ifsfirst.next = ifsp; - INTON; + if ((flag & EXP_SPLIT) == 0 || expdest != stackblock() || + exparg.state == WORD_QUOTEMARK) { + STPUTC('\0', expdest); + if (flag & EXP_SPLIT) { + if (flag & EXP_GLOB) + expandmeta(grabstackstr(expdest), exparg.list); + else + appendarglist(exparg.list, grabstackstr(expdest)); + } } + if ((flag & EXP_SPLIT) == 0) + appendarglist(arglist, grabstackstr(expdest)); } @@ -220,15 +257,16 @@ expandarg(union node *arg, struct arglis * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE. * Processing ends at a CTLENDVAR or CTLENDARI character as well as '\0'. * This is used to expand word in ${var+word} etc. - * If EXP_FULL or EXP_CASE are set, keep and/or generate CTLESC + * If EXP_GLOB or EXP_CASE are set, keep and/or generate CTLESC * characters to allow for further processing. - * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. + * + * If EXP_SPLIT is set, dst receives any complete words produced. */ static char * -argstr(char *p, int flag) +argstr(char *p, int flag, struct worddest *dst) { char c; - int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */ + int quotes = flag & (EXP_GLOB | EXP_CASE); /* do CTLESC */ int firsteq = 1; int split_lit; int lit_quoted; @@ -252,32 +290,33 @@ argstr(char *p, int flag) if (p[0] == CTLVAR && (p[1] & VSQUOTE) != 0 && p[2] == '@' && p[3] == '=') break; - if ((flag & EXP_FULL) != 0) - USTPUTC(c, expdest); + if ((flag & EXP_SPLIT) != 0 && expdest == stackblock()) + dst->state = WORD_QUOTEMARK; break; case CTLQUOTEEND: lit_quoted = 0; break; case CTLESC: - if (quotes) - USTPUTC(c, expdest); c = *p++; + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } + if (quotes) + USTPUTC(CTLESC, expdest); USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - - (quotes ? 2 : 1), - expdest - stackblock(), 0); break; case CTLVAR: - p = evalvar(p, flag); + p = evalvar(p, flag, dst); break; case CTLBACKQ: case CTLBACKQ|CTLQUOTE: - expbackq(argbackq->n, c & CTLQUOTE, flag); + expbackq(argbackq->n, c & CTLQUOTE, flag, dst); argbackq = argbackq->next; break; case CTLARI: - p = expari(p); + p = expari(p, flag, dst); break; case ':': case '=': @@ -285,10 +324,12 @@ argstr(char *p, int flag) * sort of a hack - expand tildes in variable * assignments (after the first '=' and after ':'s). */ + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - 1, - expdest - stackblock(), 0); if (flag & EXP_VARTILDE && *p == '~' && (c != '=' || firsteq)) { if (c == '=') @@ -297,10 +338,12 @@ argstr(char *p, int flag) } break; default: + if (split_lit && !lit_quoted && + strchr(ifsset() ? ifsval() : " \t\n", c) != NULL) { + NEXTWORD(c, flag, expdest, dst); + break; + } USTPUTC(c, expdest); - if (split_lit && !lit_quoted) - recordregion(expdest - stackblock() - 1, - expdest - stackblock(), 0); } } } @@ -344,7 +387,7 @@ exptilde(char *p, int flag) *p = c; if (home == NULL || *home == '\0') return (startp); - strtodest(home, flag, VSNORMAL, 1); + strtodest(home, flag, VSNORMAL, 1, NULL); return (p); } p++; @@ -352,51 +395,11 @@ exptilde(char *p, int flag) } -static void -removerecordregions(int endoff) -{ - if (ifslastp == NULL) - return; - - if (ifsfirst.endoff > endoff) { - while (ifsfirst.next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifsfirst.next->next; - ckfree(ifsfirst.next); - ifsfirst.next = ifsp; - INTON; - } - if (ifsfirst.begoff > endoff) - ifslastp = NULL; - else { - ifslastp = &ifsfirst; - ifsfirst.endoff = endoff; - } - return; - } - - ifslastp = &ifsfirst; - while (ifslastp->next && ifslastp->next->begoff < endoff) - ifslastp=ifslastp->next; - while (ifslastp->next != NULL) { - struct ifsregion *ifsp; - INTOFF; - ifsp = ifslastp->next->next; - ckfree(ifslastp->next); - ifslastp->next = ifsp; - INTON; - } - if (ifslastp->endoff > endoff) - ifslastp->endoff = endoff; -} - /* * Expand arithmetic expression. - * Note that flag is not required as digits never require CTLESC characters. */ static char * -expari(char *p) +expari(char *p, int flag, struct worddest *dst) { char *q, *start; arith_t result; @@ -406,8 +409,7 @@ expari(char *p) quoted = *p++ == '"'; begoff = expdest - stackblock(); - p = argstr(p, 0); - removerecordregions(begoff); + p = argstr(p, 0, NULL); STPUTC('\0', expdest); start = stackblock() + begoff; @@ -424,7 +426,7 @@ expari(char *p) adj = strlen(expdest); STADJUST(adj, expdest); if (!quoted) - recordregion(begoff, expdest - stackblock(), 0); + reprocess(expdest - adj - stackblock(), flag, VSNORMAL, 0, dst); return p; } @@ -433,35 +435,34 @@ expari(char *p) * Perform command substitution. */ static void -expbackq(union node *cmd, int quoted, int flag) +expbackq(union node *cmd, int quoted, int flag, struct worddest *dst) { struct backcmd in; int i; char buf[128]; char *p; char *dest = expdest; - struct ifsregion saveifs, *savelastp; struct nodelist *saveargbackq; char lastc; - int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; - int quotes = flag & (EXP_FULL | EXP_CASE); + int quotes = flag & (EXP_GLOB | EXP_CASE); size_t nnl; + const char *ifs; INTOFF; - saveifs = ifsfirst; - savelastp = ifslastp; saveargbackq = argbackq; p = grabstackstr(dest); evalbackcmd(cmd, &in); ungrabstackstr(p, dest); - ifsfirst = saveifs; - ifslastp = savelastp; argbackq = saveargbackq; p = in.buf; lastc = '\0'; nnl = 0; + if (!quoted && flag & EXP_SPLIT) + ifs = ifsset() ? ifsval() : " \t\n"; + else + ifs = ""; /* Don't copy trailing newlines */ for (;;) { if (--in.nleft < 0) { @@ -475,15 +476,27 @@ expbackq(union node *cmd, int quoted, in in.nleft = i - 1; } lastc = *p++; - if (lastc != '\0') { - if (lastc == '\n') { - nnl++; - } else { - CHECKSTRSPACE(nnl + 2, dest); - while (nnl > 0) { - nnl--; - USTPUTC('\n', dest); + if (lastc == '\0') + continue; + if (lastc == '\n') { + nnl++; + } else { + if (nnl > 0) { + if (strchr(ifs, '\n') != NULL) { + NEXTWORD('\n', flag, dest, dst); + nnl = 0; + } else { + CHECKSTRSPACE(nnl + 2, dest); + while (nnl > 0) { + nnl--; + USTPUTC('\n', dest); + } } + } + if (strchr(ifs, lastc) != NULL) + NEXTWORD(lastc, flag, dest, dst); + else { + CHECKSTRSPACE(2, dest); if (quotes && syntax[(int)lastc] == CCTL) USTPUTC(CTLESC, dest); USTPUTC(lastc, dest); @@ -497,8 +510,6 @@ expbackq(union node *cmd, int quoted, in ckfree(in.buf); if (in.jp) exitstatus = waitforjob(in.jp, (int *)NULL); - if (quoted == 0) - recordregion(startloc, dest - stackblock(), 0); TRACE(("expbackq: size=%td: \"%.*s\"\n", ((dest - stackblock()) - startloc), (int)((dest - stackblock()) - startloc), @@ -520,113 +531,112 @@ recordleft(const char *str, const char * *startp++ = *loc++; } -static int -subevalvar(char *p, char *str, int strloc, int subtype, int startloc, - int varflags, int quotes) +static void +subevalvar_trim(char *p, int strloc, int subtype, int startloc) { char *startp; char *loc = NULL; - char *q; + char *str; int c = 0; struct nodelist *saveargbackq = argbackq; int amount; - argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX || - subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ? - EXP_CASE : 0) | EXP_TILDE); + argstr(p, EXP_CASE | EXP_TILDE, NULL); STACKSTRNUL(expdest); argbackq = saveargbackq; startp = stackblock() + startloc; - if (str == NULL) - str = stackblock() + strloc; + str = stackblock() + strloc; switch (subtype) { - case VSASSIGN: - setvar(str, startp, 0); - amount = startp - expdest; - STADJUST(amount, expdest); - varflags &= ~VSNUL; - return 1; - - case VSQUESTION: - if (*p != CTLENDVAR) { - outfmt(out2, "%s\n", startp); - error((char *)NULL); - } - error("%.*s: parameter %snot set", (int)(p - str - 1), - str, (varflags & VSNUL) ? "null or " : ""); - return 0; - case VSTRIMLEFT: for (loc = startp; loc < str; loc++) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, quotes)) { + if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return 1; + return; } *loc = c; - if (quotes && *loc == CTLESC) - loc++; } - return 0; + break; case VSTRIMLEFTMAX: for (loc = str - 1; loc >= startp;) { c = *loc; *loc = '\0'; - if (patmatch(str, startp, quotes)) { + if (patmatch(str, startp)) { *loc = c; recordleft(str, loc, startp); - return 1; + return; } *loc = c; loc--; - if (quotes && loc > startp && *(loc - 1) == CTLESC) { - for (q = startp; q < loc; q++) - if (*q == CTLESC) - q++; - if (q > loc) - loc--; - } } - return 0; + break; case VSTRIMRIGHT: for (loc = str - 1; loc >= startp;) { - if (patmatch(str, loc, quotes)) { + if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return 1; + return; } loc--; - if (quotes && loc > startp && *(loc - 1) == CTLESC) { - for (q = startp; q < loc; q++) - if (*q == CTLESC) - q++; - if (q > loc) - loc--; - } } - return 0; + break; case VSTRIMRIGHTMAX: for (loc = startp; loc < str - 1; loc++) { - if (patmatch(str, loc, quotes)) { + if (patmatch(str, loc)) { amount = loc - expdest; STADJUST(amount, expdest); - return 1; + return; } - if (quotes && *loc == CTLESC) - loc++; } - return 0; + break; default: abort(); } + amount = (expdest - stackblock() - strloc) + 1; + STADJUST(-amount, expdest); +} + + +static int +subevalvar_misc(char *p, const char *var, int subtype, int startloc, + int varflags) +{ + char *startp; + struct nodelist *saveargbackq = argbackq; + int amount; + + argstr(p, EXP_TILDE, NULL); + STACKSTRNUL(expdest); + argbackq = saveargbackq; + startp = stackblock() + startloc; + + switch (subtype) { + case VSASSIGN: + setvar(var, startp, 0); + amount = startp - expdest; + STADJUST(amount, expdest); + return 1; + + case VSQUESTION: + if (*p != CTLENDVAR) { + outfmt(out2, "%s\n", startp); + error((char *)NULL); + } + error("%.*s: parameter %snot set", (int)(p - var - 1), + var, (varflags & VSNUL) ? "null or " : ""); + return 0; + + default: + abort(); + } } @@ -636,7 +646,7 @@ subevalvar(char *p, char *str, int strlo */ static char * -evalvar(char *p, int flag) +evalvar(char *p, int flag, struct worddest *dst) { int subtype; int varflags; @@ -649,9 +659,7 @@ evalvar(char *p, int flag) int startloc; int varlen; int varlenb; - int easy; - int quotes = flag & (EXP_FULL | EXP_CASE); - int record = 0; + char buf[21]; varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -693,10 +701,16 @@ again: /* jump here after setting a vari if (set && subtype != VSPLUS) { /* insert the value of the variable */ if (special) { - if (varflags & VSLINENO) - STPUTBIN(var, p - var - 1, expdest); - else - varvalue(var, varflags & VSQUOTE, subtype, flag); + if (varflags & VSLINENO) { + if (p - var > (ptrdiff_t)sizeof(buf)) + abort(); + memcpy(buf, var, p - var - 1); + buf[p - var - 1] = '\0'; + strtodest(buf, flag, subtype, + varflags & VSQUOTE, dst); + } else + varvalue(var, varflags & VSQUOTE, subtype, flag, + dst); if (subtype == VSLENGTH) { varlenb = expdest - stackblock() - startloc; varlen = varlenb; @@ -717,35 +731,29 @@ again: /* jump here after setting a vari } else strtodest(val, flag, subtype, - varflags & VSQUOTE); + varflags & VSQUOTE, dst); } } if (subtype == VSPLUS) set = ! set; - easy = ((varflags & VSQUOTE) == 0 || - (*var == '@' && shellparam.nparam != 1)); - - switch (subtype) { case VSLENGTH: - expdest = cvtnum(varlen, expdest); - record = 1; + cvtnum(varlen, buf); + strtodest(buf, flag, VSNORMAL, varflags & VSQUOTE, dst); break; case VSNORMAL: - record = easy; break; case VSPLUS: case VSMINUS: if (!set) { - argstr(p, flag | (flag & EXP_FULL ? EXP_SPLIT_LIT : 0) | - (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0)); + argstr(p, flag | (flag & EXP_SPLIT ? EXP_SPLIT_LIT : 0) | + (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0), dst); break; } - record = easy; break; case VSTRIMLEFT: @@ -760,32 +768,22 @@ again: /* jump here after setting a vari */ STPUTC('\0', expdest); patloc = expdest - stackblock(); - if (subevalvar(p, NULL, patloc, subtype, - startloc, varflags, quotes) == 0) { - int amount = (expdest - stackblock() - patloc) + 1; - STADJUST(-amount, expdest); - } - /* Remove any recorded regions beyond start of variable */ - removerecordregions(startloc); - record = 1; + subevalvar_trim(p, patloc, subtype, startloc); + reprocess(startloc, flag, VSNORMAL, varflags & VSQUOTE, dst); + if (flag & EXP_SPLIT && *var == '@' && varflags & VSQUOTE) + dst->state = WORD_QUOTEMARK; break; case VSASSIGN: case VSQUESTION: if (!set) { - if (subevalvar(p, var, 0, subtype, startloc, varflags, - quotes)) { + if (subevalvar_misc(p, var, subtype, startloc, + varflags)) { varflags &= ~VSNUL; - /* - * Remove any recorded regions beyond - * start of variable - */ - removerecordregions(startloc); goto again; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Fri Jan 22 18:06:11 2016 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 6A208A8C8C4 for ; Fri, 22 Jan 2016 18:06:11 +0000 (UTC) (envelope-from gjb@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 3DC641A8C; Fri, 22 Jan 2016 18:06:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MI6A4R070209; Fri, 22 Jan 2016 18:06:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MI6AcP070208; Fri, 22 Jan 2016 18:06:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601221806.u0MI6AcP070208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 22 Jan 2016 18:06:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294580 - projects/release-pkg X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:06:11 -0000 Author: gjb Date: Fri Jan 22 18:06:09 2016 New Revision: 294580 URL: https://svnweb.freebsd.org/changeset/base/294580 Log: Create a _pkgbootstrap target, and remove the env(1) prefix to pkg(8) commands. Move the resulting packages outside STAGEDIR to minimize pollution. When invoking 'pkg create', include the ABI in the REPODIR path so the correct hierarchy is created for cross-builds. Move the STAGEDIR and REPODIR declarations above the targets that use them to keep things cleaner, and move the packages target. Include '-o ABIFILE=DESTDIR/bin/sh' in pkg(8) invocations in the create-kernel-packages target. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Fri Jan 22 17:17:27 2016 (r294579) +++ projects/release-pkg/Makefile.inc1 Fri Jan 22 18:06:09 2016 (r294580) @@ -1357,7 +1357,19 @@ packagekernel: .endif .endif -create-world-packages: +STAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/stage +REPODIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo + +_pkgbootstrap: + @env ASSUME_ALWAYS_YES=YES pkg bootstrap + +packages: _pkgbootstrap + @mkdir -p ${STAGEDIR} ${REPODIR} + ${_+_}@cd ${.CURDIR}; \ + ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} -DNO_ROOT -B stageworld ; \ + ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages + +create-world-packages: _pkgbootstrap @rm -f ${DESTDIR}/*.plist 2>/dev/null || : @cd ${DESTDIR} ; \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ @@ -1384,21 +1396,13 @@ create-world-packages: /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${DESTDIR}/$${pkgname}.ucl ; \ - env ASSUME_ALWAYS_YES="YES" pkg -o ABI_FILE=${DESTDIR}/bin/sh \ + pkg -o ABI_FILE=${DESTDIR}/bin/sh \ create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ - -r ${DESTDIR} -o ${DESTDIR} ; \ + -r ${DESTDIR} -o ${REPODIR}/$$(pkg config ABI)/latest ; \ done -STAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/stage - -packages: - @mkdir -p ${MAKEOBJDIRPREFIX}${.CURDIR}/stage - ${_+_}@cd ${.CURDIR}; \ - ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} -DNO_ROOT -B stageworld ; \ - ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages - -create-kernel-packages: +create-kernel-packages: _pkgbootstrap @cd ${DESTDIR}/${DISTDIR} ; \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ ${DESTDIR}/${DISTDIR}/kernel.meta @@ -1415,7 +1419,7 @@ create-kernel-packages: ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST - @env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ + @pkg -o ABI_FILE=${DESTDIR}/bin/sh create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -r ${DESTDIR}/${DISTDIR}/kernel \ -o ${DESTDIR} @@ -1438,7 +1442,7 @@ create-kernel-packages: ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST - @env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ + @pkg -o ABI_FILE=${DESTDIR}/bin/sh create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \ -o ${DESTDIR} From owner-svn-src-projects@freebsd.org Fri Jan 22 18:09:27 2016 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 5D730A8CA9A for ; Fri, 22 Jan 2016 18:09:27 +0000 (UTC) (envelope-from bz@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 30E9D1D55; Fri, 22 Jan 2016 18:09:27 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MI9Qen070349; Fri, 22 Jan 2016 18:09:26 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MI9QSU070347; Fri, 22 Jan 2016 18:09:26 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221809.u0MI9QSU070347@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 18:09:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294581 - projects/vnet/sys/netinet6 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:09:27 -0000 Author: bz Date: Fri Jan 22 18:09:25 2016 New Revision: 294581 URL: https://svnweb.freebsd.org/changeset/base/294581 Log: MFp4 @180892: With pr_destroy being gone, call ip6_destroy from an ordered NET_SYSUNINT. Make ip6_destroy() static as well. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet6/ip6_input.c projects/vnet/sys/netinet6/ip6_var.h Modified: projects/vnet/sys/netinet6/ip6_input.c ============================================================================== --- projects/vnet/sys/netinet6/ip6_input.c Fri Jan 22 18:06:09 2016 (r294580) +++ projects/vnet/sys/netinet6/ip6_input.c Fri Jan 22 18:09:25 2016 (r294581) @@ -305,8 +305,8 @@ ip6proto_unregister(short ip6proto) } #ifdef VIMAGE -void -ip6_destroy() +static void +ip6_destroy(void *unused __unused) { int error; @@ -329,6 +329,8 @@ ip6_destroy() nd6_destroy(); in6_ifattach_destroy(); } + +VNET_SYSUNINIT(inet6, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, ip6_destroy, NULL); #endif static int Modified: projects/vnet/sys/netinet6/ip6_var.h ============================================================================== --- projects/vnet/sys/netinet6/ip6_var.h Fri Jan 22 18:06:09 2016 (r294580) +++ projects/vnet/sys/netinet6/ip6_var.h Fri Jan 22 18:09:25 2016 (r294581) @@ -354,9 +354,6 @@ int icmp6_ctloutput(struct socket *, str struct in6_ifaddr; void ip6_init(void); -#ifdef VIMAGE -void ip6_destroy(void); -#endif int ip6proto_register(short); int ip6proto_unregister(short); From owner-svn-src-projects@freebsd.org Fri Jan 22 18:22:05 2016 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 6CDDFA8D0A6 for ; Fri, 22 Jan 2016 18:22:05 +0000 (UTC) (envelope-from bz@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 3C2C117E3; Fri, 22 Jan 2016 18:22:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MIM44S075268; Fri, 22 Jan 2016 18:22:04 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MIM4DL075266; Fri, 22 Jan 2016 18:22:04 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221822.u0MIM4DL075266@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 18:22:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294583 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:22:05 -0000 Author: bz Date: Fri Jan 22 18:22:03 2016 New Revision: 294583 URL: https://svnweb.freebsd.org/changeset/base/294583 Log: MFp4 @180887: With pr_destroy being gone, call ip_destroy from an ordered VNET_SYSUNINT. Make ip_destroy() static. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/ip_input.c projects/vnet/sys/netinet/ip_var.h Modified: projects/vnet/sys/netinet/ip_input.c ============================================================================== --- projects/vnet/sys/netinet/ip_input.c Fri Jan 22 18:10:36 2016 (r294582) +++ projects/vnet/sys/netinet/ip_input.c Fri Jan 22 18:22:03 2016 (r294583) @@ -361,8 +361,8 @@ ip_init(void) } #ifdef VIMAGE -void -ip_destroy(void) +static void +ip_destroy(void *unused __unused) { int error; @@ -388,6 +388,8 @@ ip_destroy(void) /* Destroy IP reassembly queue. */ ipreass_destroy(); } + +VNET_SYSUNINIT(ip, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, ip_destroy, NULL); #endif #ifdef RSS Modified: projects/vnet/sys/netinet/ip_var.h ============================================================================== --- projects/vnet/sys/netinet/ip_var.h Fri Jan 22 18:10:36 2016 (r294582) +++ projects/vnet/sys/netinet/ip_var.h Fri Jan 22 18:22:03 2016 (r294583) @@ -209,9 +209,6 @@ int ip_fragment(struct ip *ip, struct mb u_long if_hwassist_flags); void ip_forward(struct mbuf *m, int srcrt); void ip_init(void); -#ifdef VIMAGE -void ip_destroy(void); -#endif extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); From owner-svn-src-projects@freebsd.org Fri Jan 22 18:26:59 2016 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 797EDA8D188 for ; Fri, 22 Jan 2016 18:26:59 +0000 (UTC) (envelope-from bz@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 4F0CE19EC; Fri, 22 Jan 2016 18:26:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MIQwJ7076066; Fri, 22 Jan 2016 18:26:58 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MIQwjt076065; Fri, 22 Jan 2016 18:26:58 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221826.u0MIQwjt076065@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 18:26:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294584 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:26:59 -0000 Author: bz Date: Fri Jan 22 18:26:58 2016 New Revision: 294584 URL: https://svnweb.freebsd.org/changeset/base/294584 Log: Correct function arguments for SYSUNINITs. Obtained from: p4 @180886 Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/udp_usrreq.c Modified: projects/vnet/sys/netinet/udp_usrreq.c ============================================================================== --- projects/vnet/sys/netinet/udp_usrreq.c Fri Jan 22 18:22:03 2016 (r294583) +++ projects/vnet/sys/netinet/udp_usrreq.c Fri Jan 22 18:26:58 2016 (r294584) @@ -270,7 +270,7 @@ udp_discardcb(struct udpcb *up) #ifdef VIMAGE static void -udp_destroy(void) +udp_destroy(void *unused __unused) { in_pcbinfo_destroy(&V_udbinfo); @@ -279,7 +279,7 @@ udp_destroy(void) VNET_SYSUNINIT(udp, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, udp_destroy, NULL); static void -udplite_destroy(void) +udplite_destroy(void *unused __unused) { in_pcbinfo_destroy(&V_ulitecbinfo); From owner-svn-src-projects@freebsd.org Fri Jan 22 18:29:03 2016 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 8BBF8A8D210 for ; Fri, 22 Jan 2016 18:29:03 +0000 (UTC) (envelope-from bz@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 6096E1C86; Fri, 22 Jan 2016 18:29:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MIT2RQ076173; Fri, 22 Jan 2016 18:29:02 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MIT2p5076172; Fri, 22 Jan 2016 18:29:02 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221829.u0MIT2p5076172@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 18:29:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294585 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:29:03 -0000 Author: bz Date: Fri Jan 22 18:29:02 2016 New Revision: 294585 URL: https://svnweb.freebsd.org/changeset/base/294585 Log: Correct function arguments for SYSUNINITs. Obtained from: p4 @180885 Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/tcp_subr.c Modified: projects/vnet/sys/netinet/tcp_subr.c ============================================================================== --- projects/vnet/sys/netinet/tcp_subr.c Fri Jan 22 18:26:58 2016 (r294584) +++ projects/vnet/sys/netinet/tcp_subr.c Fri Jan 22 18:29:02 2016 (r294585) @@ -717,7 +717,7 @@ tcp_init(void) #ifdef VIMAGE static void -tcp_destroy(void) +tcp_destroy(void *unused __unused) { int error; From owner-svn-src-projects@freebsd.org Fri Jan 22 18:35:12 2016 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 919BCA8D434 for ; Fri, 22 Jan 2016 18:35:12 +0000 (UTC) (envelope-from bz@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 64A331FEB; Fri, 22 Jan 2016 18:35:12 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MIZBa0078860; Fri, 22 Jan 2016 18:35:11 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MIZBGp078859; Fri, 22 Jan 2016 18:35:11 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221835.u0MIZBGp078859@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 18:35:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294586 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:35:12 -0000 Author: bz Date: Fri Jan 22 18:35:11 2016 New Revision: 294586 URL: https://svnweb.freebsd.org/changeset/base/294586 Log: Correct function arguments for SYSUNINITs. Add #ifdef VIMAGE, as in other cases it's dead code. Obtained from: p4 @180832 Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/sctp_usrreq.c Modified: projects/vnet/sys/netinet/sctp_usrreq.c ============================================================================== --- projects/vnet/sys/netinet/sctp_usrreq.c Fri Jan 22 18:29:02 2016 (r294585) +++ projects/vnet/sys/netinet/sctp_usrreq.c Fri Jan 22 18:35:11 2016 (r294586) @@ -89,13 +89,14 @@ sctp_init(void) #endif } +#ifdef VIMAGE static void -sctp_finish(void) +sctp_finish(void *unused __unused) { sctp_pcb_finish(); } VNET_SYSUNINIT(sctp, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, sctp_finish, NULL); - +#endif void sctp_pathmtu_adjustment(struct sctp_tcb *stcb, uint16_t nxtsz) From owner-svn-src-projects@freebsd.org Fri Jan 22 18:37:18 2016 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 DDD4AA8D4E8 for ; Fri, 22 Jan 2016 18:37:18 +0000 (UTC) (envelope-from bz@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 ACC1E1288; Fri, 22 Jan 2016 18:37:18 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MIbHwC078973; Fri, 22 Jan 2016 18:37:17 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MIbH9A078972; Fri, 22 Jan 2016 18:37:17 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221837.u0MIbH9A078972@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 18:37:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294587 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:37:19 -0000 Author: bz Date: Fri Jan 22 18:37:17 2016 New Revision: 294587 URL: https://svnweb.freebsd.org/changeset/base/294587 Log: Correct function arguments for SYSUNINITs. Obtained from: p4 @180834 Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/raw_ip.c Modified: projects/vnet/sys/netinet/raw_ip.c ============================================================================== --- projects/vnet/sys/netinet/raw_ip.c Fri Jan 22 18:35:11 2016 (r294586) +++ projects/vnet/sys/netinet/raw_ip.c Fri Jan 22 18:37:17 2016 (r294587) @@ -217,7 +217,7 @@ rip_init(void) #ifdef VIMAGE static void -rip_destroy(void) +rip_destroy(void *unused __unused) { in_pcbinfo_destroy(&V_ripcbinfo); From owner-svn-src-projects@freebsd.org Fri Jan 22 18:39:24 2016 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 7BBC0A8D631 for ; Fri, 22 Jan 2016 18:39:24 +0000 (UTC) (envelope-from bz@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 4A8A2159C; Fri, 22 Jan 2016 18:39:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MIdNm1079130; Fri, 22 Jan 2016 18:39:23 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MIdNNl079129; Fri, 22 Jan 2016 18:39:23 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221839.u0MIdNNl079129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 18:39:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294589 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 18:39:24 -0000 Author: bz Date: Fri Jan 22 18:39:23 2016 New Revision: 294589 URL: https://svnweb.freebsd.org/changeset/base/294589 Log: Correct function arguments for SYSUNINITs. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/ip_divert.c Modified: projects/vnet/sys/netinet/ip_divert.c ============================================================================== --- projects/vnet/sys/netinet/ip_divert.c Fri Jan 22 18:38:52 2016 (r294588) +++ projects/vnet/sys/netinet/ip_divert.c Fri Jan 22 18:39:23 2016 (r294589) @@ -163,7 +163,7 @@ div_init(void) } static void -div_destroy(void) +div_destroy(void *unused __unused) { in_pcbinfo_destroy(&V_divcbinfo); From owner-svn-src-projects@freebsd.org Fri Jan 22 19:43:27 2016 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 D5143A8EADF for ; Fri, 22 Jan 2016 19:43:27 +0000 (UTC) (envelope-from bz@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 A2CE019AE; Fri, 22 Jan 2016 19:43:27 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MJhQQX099654; Fri, 22 Jan 2016 19:43:26 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MJhQ87099653; Fri, 22 Jan 2016 19:43:26 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601221943.u0MJhQ87099653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Fri, 22 Jan 2016 19:43:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294592 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 19:43:27 -0000 Author: bz Date: Fri Jan 22 19:43:26 2016 New Revision: 294592 URL: https://svnweb.freebsd.org/changeset/base/294592 Log: Fix build and avoid a double-free in the VIMAGE case. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/ip_divert.c Modified: projects/vnet/sys/netinet/ip_divert.c ============================================================================== --- projects/vnet/sys/netinet/ip_divert.c Fri Jan 22 19:06:43 2016 (r294591) +++ projects/vnet/sys/netinet/ip_divert.c Fri Jan 22 19:43:26 2016 (r294592) @@ -811,7 +811,9 @@ div_modevent(module_t mod, int type, voi ip_divert_ptr = NULL; err = pf_proto_unregister(PF_INET, IPPROTO_DIVERT, SOCK_RAW); INP_INFO_WUNLOCK(&V_divcbinfo); - div_destroy(); +#ifndef VIMAGE + div_destroy(NULL); +#endif EVENTHANDLER_DEREGISTER(maxsockets_change, ip_divert_event_tag); break; default: From owner-svn-src-projects@freebsd.org Fri Jan 22 20:42:01 2016 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 98302A8DF57 for ; Fri, 22 Jan 2016 20:42:01 +0000 (UTC) (envelope-from dim@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 21C5F1D82; Fri, 22 Jan 2016 20:42:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MKg04G015529; Fri, 22 Jan 2016 20:42:00 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MKfvk7015498; Fri, 22 Jan 2016 20:41:57 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601222041.u0MKfvk7015498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 22 Jan 2016 20:41:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294599 - in projects/clang380-import: . bin/sh bin/sh/tests/builtins contrib/bsnmp/snmp_mibII contrib/compiler-rt/lib/builtins contrib/compiler-rt/lib/sanitizer_common contrib/jemalloc... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 20:42:01 -0000 Author: dim Date: Fri Jan 22 20:41:56 2016 New Revision: 294599 URL: https://svnweb.freebsd.org/changeset/base/294599 Log: Merge ^/head r294169 through r294598. Added: projects/clang380-import/bin/sh/tests/builtins/local6.0 - copied unchanged from r294598, head/bin/sh/tests/builtins/local6.0 projects/clang380-import/bin/sh/tests/builtins/local7.0 - copied unchanged from r294598, head/bin/sh/tests/builtins/local7.0 projects/clang380-import/contrib/ntp/include/ntp_keyacc.h - copied unchanged from r294598, head/contrib/ntp/include/ntp_keyacc.h projects/clang380-import/contrib/ntp/libntp/is_ip_address.c - copied unchanged from r294598, head/contrib/ntp/libntp/is_ip_address.c projects/clang380-import/crypto/openssh/.cvsignore - copied unchanged from r294598, head/crypto/openssh/.cvsignore projects/clang380-import/crypto/openssh/bitmap.c - copied unchanged from r294598, head/crypto/openssh/bitmap.c projects/clang380-import/crypto/openssh/bitmap.h - copied unchanged from r294598, head/crypto/openssh/bitmap.h projects/clang380-import/crypto/openssh/cipher-aesctr.c - copied unchanged from r294598, head/crypto/openssh/cipher-aesctr.c projects/clang380-import/crypto/openssh/cipher-aesctr.h - copied unchanged from r294598, head/crypto/openssh/cipher-aesctr.h projects/clang380-import/crypto/openssh/opacket.c - copied unchanged from r294598, head/crypto/openssh/opacket.c projects/clang380-import/crypto/openssh/opacket.h - copied unchanged from r294598, head/crypto/openssh/opacket.h projects/clang380-import/crypto/openssh/openbsd-compat/.cvsignore - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/.cvsignore projects/clang380-import/crypto/openssh/openbsd-compat/kludge-fd_set.c - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/kludge-fd_set.c projects/clang380-import/crypto/openssh/openbsd-compat/md5.c - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/md5.c projects/clang380-import/crypto/openssh/openbsd-compat/md5.h - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/md5.h projects/clang380-import/crypto/openssh/openbsd-compat/reallocarray.c - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/reallocarray.c projects/clang380-import/crypto/openssh/openbsd-compat/regress/.cvsignore - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/regress/.cvsignore projects/clang380-import/crypto/openssh/openbsd-compat/regress/opensslvertest.c - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/regress/opensslvertest.c projects/clang380-import/crypto/openssh/openbsd-compat/rmd160.c - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/rmd160.c projects/clang380-import/crypto/openssh/openbsd-compat/rmd160.h - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/rmd160.h projects/clang380-import/crypto/openssh/openbsd-compat/sha1.c - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/sha1.c projects/clang380-import/crypto/openssh/openbsd-compat/sha1.h - copied unchanged from r294598, head/crypto/openssh/openbsd-compat/sha1.h projects/clang380-import/crypto/openssh/regress/.cvsignore - copied unchanged from r294598, head/crypto/openssh/regress/.cvsignore projects/clang380-import/crypto/openssh/regress/cfgparse.sh - copied unchanged from r294598, head/crypto/openssh/regress/cfgparse.sh projects/clang380-import/crypto/openssh/regress/hostkey-agent.sh - copied unchanged from r294598, head/crypto/openssh/regress/hostkey-agent.sh projects/clang380-import/crypto/openssh/regress/hostkey-rotate.sh - copied unchanged from r294598, head/crypto/openssh/regress/hostkey-rotate.sh projects/clang380-import/crypto/openssh/regress/keygen-knownhosts.sh - copied unchanged from r294598, head/crypto/openssh/regress/keygen-knownhosts.sh projects/clang380-import/crypto/openssh/regress/limit-keytype.sh - copied unchanged from r294598, head/crypto/openssh/regress/limit-keytype.sh projects/clang380-import/crypto/openssh/regress/multipubkey.sh - copied unchanged from r294598, head/crypto/openssh/regress/multipubkey.sh projects/clang380-import/crypto/openssh/regress/netcat.c - copied unchanged from r294598, head/crypto/openssh/regress/netcat.c projects/clang380-import/crypto/openssh/regress/principals-command.sh - copied unchanged from r294598, head/crypto/openssh/regress/principals-command.sh projects/clang380-import/crypto/openssh/regress/t11.ok - copied unchanged from r294598, head/crypto/openssh/regress/t11.ok projects/clang380-import/crypto/openssh/regress/unittests/ - copied from r294598, head/crypto/openssh/regress/unittests/ projects/clang380-import/crypto/openssh/regress/valgrind-unit.sh - copied unchanged from r294598, head/crypto/openssh/regress/valgrind-unit.sh projects/clang380-import/crypto/openssh/scard/.cvsignore - copied unchanged from r294598, head/crypto/openssh/scard/.cvsignore projects/clang380-import/crypto/openssh/ssh_api.c - copied unchanged from r294598, head/crypto/openssh/ssh_api.c projects/clang380-import/crypto/openssh/ssh_api.h - copied unchanged from r294598, head/crypto/openssh/ssh_api.h projects/clang380-import/crypto/openssh/sshbuf-getput-basic.c - copied unchanged from r294598, head/crypto/openssh/sshbuf-getput-basic.c projects/clang380-import/crypto/openssh/sshbuf-getput-crypto.c - copied unchanged from r294598, head/crypto/openssh/sshbuf-getput-crypto.c projects/clang380-import/crypto/openssh/sshbuf-misc.c - copied unchanged from r294598, head/crypto/openssh/sshbuf-misc.c projects/clang380-import/crypto/openssh/sshbuf.c - copied unchanged from r294598, head/crypto/openssh/sshbuf.c projects/clang380-import/crypto/openssh/sshbuf.h - copied unchanged from r294598, head/crypto/openssh/sshbuf.h projects/clang380-import/crypto/openssh/ssherr.c - copied unchanged from r294598, head/crypto/openssh/ssherr.c projects/clang380-import/crypto/openssh/ssherr.h - copied unchanged from r294598, head/crypto/openssh/ssherr.h projects/clang380-import/crypto/openssh/sshkey.c - copied unchanged from r294598, head/crypto/openssh/sshkey.c projects/clang380-import/crypto/openssh/sshkey.h - copied unchanged from r294598, head/crypto/openssh/sshkey.h projects/clang380-import/lib/libc/riscv/SYS.h - copied unchanged from r294598, head/lib/libc/riscv/SYS.h projects/clang380-import/lib/libc/riscv/Symbol.map - copied unchanged from r294598, head/lib/libc/riscv/Symbol.map projects/clang380-import/lib/libc/riscv/_fpmath.h - copied unchanged from r294598, head/lib/libc/riscv/_fpmath.h projects/clang380-import/lib/libc/riscv/arith.h - copied unchanged from r294598, head/lib/libc/riscv/arith.h projects/clang380-import/lib/libc/riscv/gd_qnan.h - copied unchanged from r294598, head/lib/libc/riscv/gd_qnan.h projects/clang380-import/lib/libc/riscv/gen/ - copied from r294598, head/lib/libc/riscv/gen/ projects/clang380-import/lib/libc/riscv/sys/ - copied from r294598, head/lib/libc/riscv/sys/ projects/clang380-import/share/dtrace/watch_execve - copied unchanged from r294598, head/share/dtrace/watch_execve projects/clang380-import/share/dtrace/watch_kill - copied unchanged from r294598, head/share/dtrace/watch_kill projects/clang380-import/share/dtrace/watch_vop_remove - copied unchanged from r294598, head/share/dtrace/watch_vop_remove projects/clang380-import/share/man/man4/cfi.4 - copied unchanged from r294598, head/share/man/man4/cfi.4 projects/clang380-import/sys/arm/conf/ARMADA38X - copied unchanged from r294598, head/sys/arm/conf/ARMADA38X projects/clang380-import/sys/arm/mv/armada38x/ - copied from r294598, head/sys/arm/mv/armada38x/ projects/clang380-import/sys/boot/fdt/dts/arm/armada-380.dtsi - copied unchanged from r294598, head/sys/boot/fdt/dts/arm/armada-380.dtsi projects/clang380-import/sys/boot/fdt/dts/arm/armada-385.dtsi - copied unchanged from r294598, head/sys/boot/fdt/dts/arm/armada-385.dtsi projects/clang380-import/sys/boot/fdt/dts/arm/armada-388-gp.dts - copied unchanged from r294598, head/sys/boot/fdt/dts/arm/armada-388-gp.dts projects/clang380-import/sys/boot/fdt/dts/arm/armada-388.dtsi - copied unchanged from r294598, head/sys/boot/fdt/dts/arm/armada-388.dtsi projects/clang380-import/sys/boot/fdt/dts/arm/armada-38x.dtsi - copied unchanged from r294598, head/sys/boot/fdt/dts/arm/armada-38x.dtsi projects/clang380-import/sys/compat/linuxkpi/common/include/asm/atomic64.h - copied unchanged from r294598, head/sys/compat/linuxkpi/common/include/asm/atomic64.h projects/clang380-import/sys/fs/ext2fs/ext2_hash.c - copied unchanged from r294598, head/sys/fs/ext2fs/ext2_hash.c projects/clang380-import/sys/fs/ext2fs/ext2_htree.c - copied unchanged from r294598, head/sys/fs/ext2fs/ext2_htree.c projects/clang380-import/sys/kern/kern_sendfile.c - copied unchanged from r294598, head/sys/kern/kern_sendfile.c projects/clang380-import/sys/netinet/tcp_cc.h - copied unchanged from r294598, head/sys/netinet/tcp_cc.h projects/clang380-import/usr.bin/xlint/arch/riscv/ - copied from r294598, head/usr.bin/xlint/arch/riscv/ Deleted: projects/clang380-import/crypto/openssh/README.hpn projects/clang380-import/crypto/openssh/compress.c projects/clang380-import/crypto/openssh/compress.h projects/clang380-import/crypto/openssh/config.h.in projects/clang380-import/crypto/openssh/configure projects/clang380-import/crypto/openssh/contrib/caldera/ projects/clang380-import/crypto/openssh/moduli.0 projects/clang380-import/crypto/openssh/scp.0 projects/clang380-import/crypto/openssh/sftp-server.0 projects/clang380-import/crypto/openssh/sftp.0 projects/clang380-import/crypto/openssh/ssh-add.0 projects/clang380-import/crypto/openssh/ssh-agent.0 projects/clang380-import/crypto/openssh/ssh-keygen.0 projects/clang380-import/crypto/openssh/ssh-keyscan.0 projects/clang380-import/crypto/openssh/ssh-keysign.0 projects/clang380-import/crypto/openssh/ssh-pkcs11-helper.0 projects/clang380-import/crypto/openssh/ssh.0 projects/clang380-import/crypto/openssh/ssh_config.0 projects/clang380-import/crypto/openssh/sshd.0 projects/clang380-import/crypto/openssh/sshd_config.0 projects/clang380-import/sys/dev/fdt/fdt_arm64.c projects/clang380-import/sys/dev/fdt/fdt_mips.c projects/clang380-import/sys/dev/fdt/fdt_x86.c projects/clang380-import/sys/netinet/cc.h Modified: projects/clang380-import/ObsoleteFiles.inc projects/clang380-import/UPDATING projects/clang380-import/bin/sh/options.c projects/clang380-import/bin/sh/options.h projects/clang380-import/bin/sh/tests/builtins/Makefile projects/clang380-import/bin/sh/var.c projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.h projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_interfaces.c projects/clang380-import/contrib/compiler-rt/lib/builtins/int_lib.h projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h projects/clang380-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/clang380-import/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h projects/clang380-import/contrib/llvm/projects/libunwind/include/libunwind.h projects/clang380-import/contrib/llvm/projects/libunwind/src/Registers.hpp projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S projects/clang380-import/contrib/llvm/projects/libunwind/src/config.h projects/clang380-import/contrib/llvm/projects/libunwind/src/libunwind.cpp projects/clang380-import/contrib/mdocml/main.c projects/clang380-import/contrib/ntp/ChangeLog projects/clang380-import/contrib/ntp/CommitLog projects/clang380-import/contrib/ntp/NEWS projects/clang380-import/contrib/ntp/configure projects/clang380-import/contrib/ntp/html/miscopt.html projects/clang380-import/contrib/ntp/include/Makefile.am projects/clang380-import/contrib/ntp/include/Makefile.in projects/clang380-import/contrib/ntp/include/ntp.h projects/clang380-import/contrib/ntp/include/ntp_io.h projects/clang380-import/contrib/ntp/include/ntp_stdlib.h projects/clang380-import/contrib/ntp/include/ntp_types.h projects/clang380-import/contrib/ntp/include/ntp_worker.h projects/clang380-import/contrib/ntp/include/parse.h projects/clang380-import/contrib/ntp/libntp/Makefile.am projects/clang380-import/contrib/ntp/libntp/Makefile.in projects/clang380-import/contrib/ntp/libntp/authkeys.c projects/clang380-import/contrib/ntp/libntp/authreadkeys.c projects/clang380-import/contrib/ntp/libntp/authusekey.c projects/clang380-import/contrib/ntp/libntp/ntp_worker.c projects/clang380-import/contrib/ntp/libntp/systime.c projects/clang380-import/contrib/ntp/libntp/work_thread.c projects/clang380-import/contrib/ntp/ntpd/invoke-ntp.conf.texi projects/clang380-import/contrib/ntp/ntpd/invoke-ntp.keys.texi projects/clang380-import/contrib/ntp/ntpd/invoke-ntpd.texi projects/clang380-import/contrib/ntp/ntpd/keyword-gen-utd projects/clang380-import/contrib/ntp/ntpd/keyword-gen.c projects/clang380-import/contrib/ntp/ntpd/ntp.conf.5man projects/clang380-import/contrib/ntp/ntpd/ntp.conf.5mdoc projects/clang380-import/contrib/ntp/ntpd/ntp.conf.def projects/clang380-import/contrib/ntp/ntpd/ntp.conf.html projects/clang380-import/contrib/ntp/ntpd/ntp.conf.man.in projects/clang380-import/contrib/ntp/ntpd/ntp.conf.mdoc.in projects/clang380-import/contrib/ntp/ntpd/ntp.keys.5man projects/clang380-import/contrib/ntp/ntpd/ntp.keys.5mdoc projects/clang380-import/contrib/ntp/ntpd/ntp.keys.def projects/clang380-import/contrib/ntp/ntpd/ntp.keys.html projects/clang380-import/contrib/ntp/ntpd/ntp.keys.man.in projects/clang380-import/contrib/ntp/ntpd/ntp.keys.mdoc.in projects/clang380-import/contrib/ntp/ntpd/ntp_config.c projects/clang380-import/contrib/ntp/ntpd/ntp_control.c projects/clang380-import/contrib/ntp/ntpd/ntp_crypto.c projects/clang380-import/contrib/ntp/ntpd/ntp_io.c projects/clang380-import/contrib/ntp/ntpd/ntp_keyword.h projects/clang380-import/contrib/ntp/ntpd/ntp_parser.c projects/clang380-import/contrib/ntp/ntpd/ntp_parser.h projects/clang380-import/contrib/ntp/ntpd/ntp_proto.c projects/clang380-import/contrib/ntp/ntpd/ntp_request.c projects/clang380-import/contrib/ntp/ntpd/ntp_scanner.c projects/clang380-import/contrib/ntp/ntpd/ntp_timer.c projects/clang380-import/contrib/ntp/ntpd/ntpd-opts.c projects/clang380-import/contrib/ntp/ntpd/ntpd-opts.h projects/clang380-import/contrib/ntp/ntpd/ntpd.1ntpdman projects/clang380-import/contrib/ntp/ntpd/ntpd.1ntpdmdoc projects/clang380-import/contrib/ntp/ntpd/ntpd.c projects/clang380-import/contrib/ntp/ntpd/ntpd.html projects/clang380-import/contrib/ntp/ntpd/ntpd.man.in projects/clang380-import/contrib/ntp/ntpd/ntpd.mdoc.in projects/clang380-import/contrib/ntp/ntpd/refclock_chu.c projects/clang380-import/contrib/ntp/ntpd/refclock_gpsdjson.c projects/clang380-import/contrib/ntp/ntpd/refclock_jjy.c projects/clang380-import/contrib/ntp/ntpd/refclock_shm.c projects/clang380-import/contrib/ntp/ntpdc/invoke-ntpdc.texi projects/clang380-import/contrib/ntp/ntpdc/ntpdc-opts.c projects/clang380-import/contrib/ntp/ntpdc/ntpdc-opts.h projects/clang380-import/contrib/ntp/ntpdc/ntpdc.1ntpdcman projects/clang380-import/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc projects/clang380-import/contrib/ntp/ntpdc/ntpdc.c projects/clang380-import/contrib/ntp/ntpdc/ntpdc.html projects/clang380-import/contrib/ntp/ntpdc/ntpdc.man.in projects/clang380-import/contrib/ntp/ntpdc/ntpdc.mdoc.in projects/clang380-import/contrib/ntp/ntpq/invoke-ntpq.texi projects/clang380-import/contrib/ntp/ntpq/ntpq-opts.c projects/clang380-import/contrib/ntp/ntpq/ntpq-opts.h projects/clang380-import/contrib/ntp/ntpq/ntpq-subs.c projects/clang380-import/contrib/ntp/ntpq/ntpq.1ntpqman projects/clang380-import/contrib/ntp/ntpq/ntpq.1ntpqmdoc projects/clang380-import/contrib/ntp/ntpq/ntpq.c projects/clang380-import/contrib/ntp/ntpq/ntpq.html projects/clang380-import/contrib/ntp/ntpq/ntpq.man.in projects/clang380-import/contrib/ntp/ntpq/ntpq.mdoc.in projects/clang380-import/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi projects/clang380-import/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c projects/clang380-import/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h projects/clang380-import/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman projects/clang380-import/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc projects/clang380-import/contrib/ntp/ntpsnmpd/ntpsnmpd.html projects/clang380-import/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in projects/clang380-import/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in projects/clang380-import/contrib/ntp/packageinfo.sh projects/clang380-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman projects/clang380-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc projects/clang380-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html projects/clang380-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in projects/clang380-import/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in projects/clang380-import/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi projects/clang380-import/contrib/ntp/scripts/invoke-plot_summary.texi projects/clang380-import/contrib/ntp/scripts/invoke-summary.texi projects/clang380-import/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi projects/clang380-import/contrib/ntp/scripts/ntp-wait/ntp-wait-opts projects/clang380-import/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman projects/clang380-import/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc projects/clang380-import/contrib/ntp/scripts/ntp-wait/ntp-wait.html projects/clang380-import/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in projects/clang380-import/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in projects/clang380-import/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi projects/clang380-import/contrib/ntp/scripts/ntpsweep/ntpsweep-opts projects/clang380-import/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman projects/clang380-import/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc projects/clang380-import/contrib/ntp/scripts/ntpsweep/ntpsweep.html projects/clang380-import/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in projects/clang380-import/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in projects/clang380-import/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi projects/clang380-import/contrib/ntp/scripts/ntptrace/ntptrace-opts projects/clang380-import/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman projects/clang380-import/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc projects/clang380-import/contrib/ntp/scripts/ntptrace/ntptrace.html projects/clang380-import/contrib/ntp/scripts/ntptrace/ntptrace.man.in projects/clang380-import/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in projects/clang380-import/contrib/ntp/scripts/plot_summary-opts projects/clang380-import/contrib/ntp/scripts/plot_summary.1plot_summaryman projects/clang380-import/contrib/ntp/scripts/plot_summary.1plot_summarymdoc projects/clang380-import/contrib/ntp/scripts/plot_summary.html projects/clang380-import/contrib/ntp/scripts/plot_summary.man.in projects/clang380-import/contrib/ntp/scripts/plot_summary.mdoc.in projects/clang380-import/contrib/ntp/scripts/summary-opts projects/clang380-import/contrib/ntp/scripts/summary.1summaryman projects/clang380-import/contrib/ntp/scripts/summary.1summarymdoc projects/clang380-import/contrib/ntp/scripts/summary.html projects/clang380-import/contrib/ntp/scripts/summary.man.in projects/clang380-import/contrib/ntp/scripts/summary.mdoc.in projects/clang380-import/contrib/ntp/scripts/update-leap/invoke-update-leap.texi projects/clang380-import/contrib/ntp/scripts/update-leap/update-leap-opts projects/clang380-import/contrib/ntp/scripts/update-leap/update-leap.1update-leapman projects/clang380-import/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc projects/clang380-import/contrib/ntp/scripts/update-leap/update-leap.html projects/clang380-import/contrib/ntp/scripts/update-leap/update-leap.man.in projects/clang380-import/contrib/ntp/scripts/update-leap/update-leap.mdoc.in projects/clang380-import/contrib/ntp/sntp/configure projects/clang380-import/contrib/ntp/sntp/crypto.c projects/clang380-import/contrib/ntp/sntp/crypto.h projects/clang380-import/contrib/ntp/sntp/include/copyright.def projects/clang380-import/contrib/ntp/sntp/include/version.def projects/clang380-import/contrib/ntp/sntp/include/version.texi projects/clang380-import/contrib/ntp/sntp/invoke-sntp.texi projects/clang380-import/contrib/ntp/sntp/libopts/configfile.c projects/clang380-import/contrib/ntp/sntp/libopts/enum.c projects/clang380-import/contrib/ntp/sntp/libopts/find.c projects/clang380-import/contrib/ntp/sntp/libopts/init.c projects/clang380-import/contrib/ntp/sntp/libopts/load.c projects/clang380-import/contrib/ntp/sntp/libopts/makeshell.c projects/clang380-import/contrib/ntp/sntp/libopts/nested.c projects/clang380-import/contrib/ntp/sntp/libopts/parse-duration.c projects/clang380-import/contrib/ntp/sntp/libopts/reset.c projects/clang380-import/contrib/ntp/sntp/libopts/save.c projects/clang380-import/contrib/ntp/sntp/libopts/tokenize.c projects/clang380-import/contrib/ntp/sntp/m4/version.m4 projects/clang380-import/contrib/ntp/sntp/main.c projects/clang380-import/contrib/ntp/sntp/networking.c projects/clang380-import/contrib/ntp/sntp/sntp-opts.c projects/clang380-import/contrib/ntp/sntp/sntp-opts.h projects/clang380-import/contrib/ntp/sntp/sntp.1sntpman projects/clang380-import/contrib/ntp/sntp/sntp.1sntpmdoc projects/clang380-import/contrib/ntp/sntp/sntp.html projects/clang380-import/contrib/ntp/sntp/sntp.man.in projects/clang380-import/contrib/ntp/sntp/sntp.mdoc.in projects/clang380-import/contrib/ntp/sntp/tests/crypto.c projects/clang380-import/contrib/ntp/sntp/tests/fileHandlingTest.c projects/clang380-import/contrib/ntp/sntp/tests/fileHandlingTest.h.in projects/clang380-import/contrib/ntp/sntp/tests/keyFile.c projects/clang380-import/contrib/ntp/sntp/tests/packetHandling.c projects/clang380-import/contrib/ntp/sntp/tests/packetProcessing.c projects/clang380-import/contrib/ntp/sntp/tests/run-packetProcessing.c projects/clang380-import/contrib/ntp/sntp/unity/unity_internals.h projects/clang380-import/contrib/ntp/sntp/version.c projects/clang380-import/contrib/ntp/tests/libntp/authkeys.c projects/clang380-import/contrib/ntp/tests/libntp/decodenetnum.c projects/clang380-import/contrib/ntp/tests/libntp/run-authkeys.c projects/clang380-import/contrib/ntp/tests/libntp/run-decodenetnum.c projects/clang380-import/contrib/ntp/tests/libntp/run-socktoa.c projects/clang380-import/contrib/ntp/tests/libntp/socktoa.c projects/clang380-import/contrib/ntp/tests/ntpd/t-ntp_signd.c projects/clang380-import/contrib/ntp/util/invoke-ntp-keygen.texi projects/clang380-import/contrib/ntp/util/ntp-keygen-opts.c projects/clang380-import/contrib/ntp/util/ntp-keygen-opts.h projects/clang380-import/contrib/ntp/util/ntp-keygen.1ntp-keygenman projects/clang380-import/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc projects/clang380-import/contrib/ntp/util/ntp-keygen.html projects/clang380-import/contrib/ntp/util/ntp-keygen.man.in projects/clang380-import/contrib/ntp/util/ntp-keygen.mdoc.in projects/clang380-import/crypto/openssh/ChangeLog projects/clang380-import/crypto/openssh/FREEBSD-upgrade projects/clang380-import/crypto/openssh/INSTALL projects/clang380-import/crypto/openssh/Makefile.in projects/clang380-import/crypto/openssh/OVERVIEW projects/clang380-import/crypto/openssh/PROTOCOL projects/clang380-import/crypto/openssh/PROTOCOL.agent projects/clang380-import/crypto/openssh/PROTOCOL.krl projects/clang380-import/crypto/openssh/PROTOCOL.mux projects/clang380-import/crypto/openssh/README projects/clang380-import/crypto/openssh/addrmatch.c projects/clang380-import/crypto/openssh/atomicio.c projects/clang380-import/crypto/openssh/auth-bsdauth.c projects/clang380-import/crypto/openssh/auth-chall.c projects/clang380-import/crypto/openssh/auth-krb5.c projects/clang380-import/crypto/openssh/auth-options.c projects/clang380-import/crypto/openssh/auth-options.h projects/clang380-import/crypto/openssh/auth-pam.c projects/clang380-import/crypto/openssh/auth-passwd.c projects/clang380-import/crypto/openssh/auth-rh-rsa.c projects/clang380-import/crypto/openssh/auth-rhosts.c projects/clang380-import/crypto/openssh/auth-rsa.c projects/clang380-import/crypto/openssh/auth.c projects/clang380-import/crypto/openssh/auth.h projects/clang380-import/crypto/openssh/auth1.c projects/clang380-import/crypto/openssh/auth2-chall.c projects/clang380-import/crypto/openssh/auth2-gss.c projects/clang380-import/crypto/openssh/auth2-hostbased.c projects/clang380-import/crypto/openssh/auth2-kbdint.c projects/clang380-import/crypto/openssh/auth2-none.c projects/clang380-import/crypto/openssh/auth2-passwd.c projects/clang380-import/crypto/openssh/auth2-pubkey.c projects/clang380-import/crypto/openssh/auth2.c projects/clang380-import/crypto/openssh/authfd.c projects/clang380-import/crypto/openssh/authfd.h projects/clang380-import/crypto/openssh/authfile.c projects/clang380-import/crypto/openssh/authfile.h projects/clang380-import/crypto/openssh/bufaux.c projects/clang380-import/crypto/openssh/bufbn.c projects/clang380-import/crypto/openssh/bufec.c projects/clang380-import/crypto/openssh/buffer.c (contents, props changed) projects/clang380-import/crypto/openssh/buffer.h (contents, props changed) projects/clang380-import/crypto/openssh/canohost.c projects/clang380-import/crypto/openssh/chacha.h projects/clang380-import/crypto/openssh/channels.c (contents, props changed) projects/clang380-import/crypto/openssh/channels.h (contents, props changed) projects/clang380-import/crypto/openssh/cipher-3des1.c projects/clang380-import/crypto/openssh/cipher-bf1.c projects/clang380-import/crypto/openssh/cipher-chachapoly.c projects/clang380-import/crypto/openssh/cipher-chachapoly.h projects/clang380-import/crypto/openssh/cipher-ctr.c projects/clang380-import/crypto/openssh/cipher.c (contents, props changed) projects/clang380-import/crypto/openssh/cipher.h projects/clang380-import/crypto/openssh/clientloop.c (contents, props changed) projects/clang380-import/crypto/openssh/compat.c (contents, props changed) projects/clang380-import/crypto/openssh/compat.h (contents, props changed) projects/clang380-import/crypto/openssh/config.guess projects/clang380-import/crypto/openssh/config.h projects/clang380-import/crypto/openssh/configure.ac (contents, props changed) projects/clang380-import/crypto/openssh/contrib/Makefile projects/clang380-import/crypto/openssh/contrib/README projects/clang380-import/crypto/openssh/contrib/cygwin/README projects/clang380-import/crypto/openssh/contrib/cygwin/ssh-host-config projects/clang380-import/crypto/openssh/contrib/cygwin/ssh-user-config projects/clang380-import/crypto/openssh/contrib/redhat/openssh.spec projects/clang380-import/crypto/openssh/contrib/suse/openssh.spec projects/clang380-import/crypto/openssh/deattack.c projects/clang380-import/crypto/openssh/deattack.h projects/clang380-import/crypto/openssh/defines.h projects/clang380-import/crypto/openssh/dh.c projects/clang380-import/crypto/openssh/dh.h projects/clang380-import/crypto/openssh/digest-libc.c projects/clang380-import/crypto/openssh/digest-openssl.c projects/clang380-import/crypto/openssh/digest.h projects/clang380-import/crypto/openssh/dispatch.c projects/clang380-import/crypto/openssh/dispatch.h projects/clang380-import/crypto/openssh/dns.c projects/clang380-import/crypto/openssh/dns.h projects/clang380-import/crypto/openssh/entropy.c projects/clang380-import/crypto/openssh/freebsd-configure.sh projects/clang380-import/crypto/openssh/freebsd-post-merge.sh projects/clang380-import/crypto/openssh/freebsd-pre-merge.sh projects/clang380-import/crypto/openssh/ge25519.h projects/clang380-import/crypto/openssh/groupaccess.c projects/clang380-import/crypto/openssh/gss-genr.c projects/clang380-import/crypto/openssh/gss-serv-krb5.c projects/clang380-import/crypto/openssh/gss-serv.c projects/clang380-import/crypto/openssh/hmac.c projects/clang380-import/crypto/openssh/hmac.h projects/clang380-import/crypto/openssh/hostfile.c projects/clang380-import/crypto/openssh/hostfile.h projects/clang380-import/crypto/openssh/includes.h projects/clang380-import/crypto/openssh/kex.c (contents, props changed) projects/clang380-import/crypto/openssh/kex.h (contents, props changed) projects/clang380-import/crypto/openssh/kexc25519.c projects/clang380-import/crypto/openssh/kexc25519c.c projects/clang380-import/crypto/openssh/kexc25519s.c projects/clang380-import/crypto/openssh/kexdh.c projects/clang380-import/crypto/openssh/kexdhc.c projects/clang380-import/crypto/openssh/kexdhs.c projects/clang380-import/crypto/openssh/kexecdh.c projects/clang380-import/crypto/openssh/kexecdhc.c projects/clang380-import/crypto/openssh/kexecdhs.c projects/clang380-import/crypto/openssh/kexgex.c projects/clang380-import/crypto/openssh/kexgexc.c projects/clang380-import/crypto/openssh/kexgexs.c projects/clang380-import/crypto/openssh/key.c projects/clang380-import/crypto/openssh/key.h projects/clang380-import/crypto/openssh/krl.c projects/clang380-import/crypto/openssh/krl.h projects/clang380-import/crypto/openssh/log.c projects/clang380-import/crypto/openssh/loginrec.c projects/clang380-import/crypto/openssh/mac.c projects/clang380-import/crypto/openssh/mac.h projects/clang380-import/crypto/openssh/match.c projects/clang380-import/crypto/openssh/match.h projects/clang380-import/crypto/openssh/misc.c (contents, props changed) projects/clang380-import/crypto/openssh/misc.h (contents, props changed) projects/clang380-import/crypto/openssh/moduli projects/clang380-import/crypto/openssh/moduli.c projects/clang380-import/crypto/openssh/monitor.c projects/clang380-import/crypto/openssh/monitor.h projects/clang380-import/crypto/openssh/monitor_fdpass.c projects/clang380-import/crypto/openssh/monitor_mm.c projects/clang380-import/crypto/openssh/monitor_wrap.c projects/clang380-import/crypto/openssh/monitor_wrap.h projects/clang380-import/crypto/openssh/msg.c projects/clang380-import/crypto/openssh/msg.h projects/clang380-import/crypto/openssh/mux.c projects/clang380-import/crypto/openssh/myproposal.h projects/clang380-import/crypto/openssh/openbsd-compat/Makefile.in projects/clang380-import/crypto/openssh/openbsd-compat/arc4random.c projects/clang380-import/crypto/openssh/openbsd-compat/bcrypt_pbkdf.c projects/clang380-import/crypto/openssh/openbsd-compat/blowfish.c (contents, props changed) projects/clang380-import/crypto/openssh/openbsd-compat/bsd-cygwin_util.c projects/clang380-import/crypto/openssh/openbsd-compat/bsd-cygwin_util.h projects/clang380-import/crypto/openssh/openbsd-compat/bsd-misc.c projects/clang380-import/crypto/openssh/openbsd-compat/bsd-misc.h (contents, props changed) projects/clang380-import/crypto/openssh/openbsd-compat/bsd-snprintf.c projects/clang380-import/crypto/openssh/openbsd-compat/explicit_bzero.c projects/clang380-import/crypto/openssh/openbsd-compat/fake-rfc2553.h projects/clang380-import/crypto/openssh/openbsd-compat/getrrsetbyname-ldns.c projects/clang380-import/crypto/openssh/openbsd-compat/openbsd-compat.h projects/clang380-import/crypto/openssh/openbsd-compat/openssl-compat.c projects/clang380-import/crypto/openssh/openbsd-compat/openssl-compat.h projects/clang380-import/crypto/openssh/openbsd-compat/port-linux.c projects/clang380-import/crypto/openssh/openbsd-compat/port-tun.c projects/clang380-import/crypto/openssh/openbsd-compat/port-uw.c projects/clang380-import/crypto/openssh/openbsd-compat/readpassphrase.c projects/clang380-import/crypto/openssh/openbsd-compat/realpath.c projects/clang380-import/crypto/openssh/openbsd-compat/regress/Makefile.in projects/clang380-import/crypto/openssh/openbsd-compat/sha2.c projects/clang380-import/crypto/openssh/openbsd-compat/sha2.h projects/clang380-import/crypto/openssh/openbsd-compat/xcrypt.c projects/clang380-import/crypto/openssh/opensshd.init.in projects/clang380-import/crypto/openssh/packet.c projects/clang380-import/crypto/openssh/packet.h (contents, props changed) projects/clang380-import/crypto/openssh/platform.c projects/clang380-import/crypto/openssh/poly1305.h projects/clang380-import/crypto/openssh/progressmeter.c projects/clang380-import/crypto/openssh/progressmeter.h projects/clang380-import/crypto/openssh/readconf.c projects/clang380-import/crypto/openssh/readconf.h projects/clang380-import/crypto/openssh/regress/Makefile projects/clang380-import/crypto/openssh/regress/README.regress projects/clang380-import/crypto/openssh/regress/agent-pkcs11.sh projects/clang380-import/crypto/openssh/regress/agent-timeout.sh projects/clang380-import/crypto/openssh/regress/agent.sh projects/clang380-import/crypto/openssh/regress/broken-pipe.sh projects/clang380-import/crypto/openssh/regress/cert-hostkey.sh projects/clang380-import/crypto/openssh/regress/cert-userkey.sh projects/clang380-import/crypto/openssh/regress/cfgmatch.sh projects/clang380-import/crypto/openssh/regress/cipher-speed.sh projects/clang380-import/crypto/openssh/regress/connect-privsep.sh projects/clang380-import/crypto/openssh/regress/connect.sh projects/clang380-import/crypto/openssh/regress/dhgex.sh projects/clang380-import/crypto/openssh/regress/dynamic-forward.sh projects/clang380-import/crypto/openssh/regress/exit-status.sh projects/clang380-import/crypto/openssh/regress/forcecommand.sh projects/clang380-import/crypto/openssh/regress/forward-control.sh projects/clang380-import/crypto/openssh/regress/forwarding.sh projects/clang380-import/crypto/openssh/regress/host-expand.sh projects/clang380-import/crypto/openssh/regress/integrity.sh projects/clang380-import/crypto/openssh/regress/kextype.sh projects/clang380-import/crypto/openssh/regress/key-options.sh projects/clang380-import/crypto/openssh/regress/keygen-change.sh projects/clang380-import/crypto/openssh/regress/keys-command.sh projects/clang380-import/crypto/openssh/regress/keyscan.sh projects/clang380-import/crypto/openssh/regress/keytype.sh projects/clang380-import/crypto/openssh/regress/krl.sh projects/clang380-import/crypto/openssh/regress/localcommand.sh projects/clang380-import/crypto/openssh/regress/login-timeout.sh projects/clang380-import/crypto/openssh/regress/multiplex.sh projects/clang380-import/crypto/openssh/regress/proto-mismatch.sh projects/clang380-import/crypto/openssh/regress/proto-version.sh projects/clang380-import/crypto/openssh/regress/proxy-connect.sh projects/clang380-import/crypto/openssh/regress/reconfigure.sh projects/clang380-import/crypto/openssh/regress/reexec.sh projects/clang380-import/crypto/openssh/regress/rekey.sh projects/clang380-import/crypto/openssh/regress/ssh-com.sh projects/clang380-import/crypto/openssh/regress/ssh2putty.sh projects/clang380-import/crypto/openssh/regress/sshd-log-wrapper.sh projects/clang380-import/crypto/openssh/regress/stderr-data.sh projects/clang380-import/crypto/openssh/regress/t4.ok projects/clang380-import/crypto/openssh/regress/test-exec.sh projects/clang380-import/crypto/openssh/regress/transfer.sh projects/clang380-import/crypto/openssh/regress/try-ciphers.sh projects/clang380-import/crypto/openssh/regress/yes-head.sh projects/clang380-import/crypto/openssh/rijndael.c projects/clang380-import/crypto/openssh/rijndael.h projects/clang380-import/crypto/openssh/roaming_client.c projects/clang380-import/crypto/openssh/roaming_common.c projects/clang380-import/crypto/openssh/roaming_dummy.c projects/clang380-import/crypto/openssh/rsa.c projects/clang380-import/crypto/openssh/rsa.h projects/clang380-import/crypto/openssh/sandbox-seccomp-filter.c projects/clang380-import/crypto/openssh/sandbox-systrace.c projects/clang380-import/crypto/openssh/scp.1 (contents, props changed) projects/clang380-import/crypto/openssh/scp.c projects/clang380-import/crypto/openssh/servconf.c projects/clang380-import/crypto/openssh/servconf.h (contents, props changed) projects/clang380-import/crypto/openssh/serverloop.c (contents, props changed) projects/clang380-import/crypto/openssh/session.c projects/clang380-import/crypto/openssh/sftp-client.c projects/clang380-import/crypto/openssh/sftp-client.h projects/clang380-import/crypto/openssh/sftp-common.c projects/clang380-import/crypto/openssh/sftp-common.h projects/clang380-import/crypto/openssh/sftp-glob.c projects/clang380-import/crypto/openssh/sftp-server.8 (contents, props changed) projects/clang380-import/crypto/openssh/sftp-server.c projects/clang380-import/crypto/openssh/sftp.1 (contents, props changed) projects/clang380-import/crypto/openssh/sftp.c (contents, props changed) projects/clang380-import/crypto/openssh/ssh-add.1 (contents, props changed) projects/clang380-import/crypto/openssh/ssh-add.c projects/clang380-import/crypto/openssh/ssh-agent.1 projects/clang380-import/crypto/openssh/ssh-agent.c projects/clang380-import/crypto/openssh/ssh-dss.c projects/clang380-import/crypto/openssh/ssh-ecdsa.c projects/clang380-import/crypto/openssh/ssh-ed25519.c projects/clang380-import/crypto/openssh/ssh-keygen.1 (contents, props changed) projects/clang380-import/crypto/openssh/ssh-keygen.c projects/clang380-import/crypto/openssh/ssh-keyscan.1 (contents, props changed) projects/clang380-import/crypto/openssh/ssh-keyscan.c projects/clang380-import/crypto/openssh/ssh-keysign.c projects/clang380-import/crypto/openssh/ssh-pkcs11-client.c projects/clang380-import/crypto/openssh/ssh-pkcs11-helper.c projects/clang380-import/crypto/openssh/ssh-pkcs11.c projects/clang380-import/crypto/openssh/ssh-pkcs11.h projects/clang380-import/crypto/openssh/ssh-rsa.c projects/clang380-import/crypto/openssh/ssh.1 projects/clang380-import/crypto/openssh/ssh.c projects/clang380-import/crypto/openssh/ssh.h projects/clang380-import/crypto/openssh/ssh_config projects/clang380-import/crypto/openssh/ssh_config.5 projects/clang380-import/crypto/openssh/ssh_namespace.h projects/clang380-import/crypto/openssh/sshconnect.c projects/clang380-import/crypto/openssh/sshconnect1.c projects/clang380-import/crypto/openssh/sshconnect2.c (contents, props changed) projects/clang380-import/crypto/openssh/sshd.8 projects/clang380-import/crypto/openssh/sshd.c projects/clang380-import/crypto/openssh/sshd_config projects/clang380-import/crypto/openssh/sshd_config.5 projects/clang380-import/crypto/openssh/sshlogin.c projects/clang380-import/crypto/openssh/sshpty.c projects/clang380-import/crypto/openssh/uidswap.c projects/clang380-import/crypto/openssh/umac.c projects/clang380-import/crypto/openssh/uuencode.c projects/clang380-import/crypto/openssh/version.h projects/clang380-import/crypto/openssh/xmalloc.c projects/clang380-import/crypto/openssh/xmalloc.h projects/clang380-import/etc/defaults/rc.conf projects/clang380-import/etc/mtree/BSD.include.dist projects/clang380-import/etc/rc.d/ldconfig projects/clang380-import/etc/rc.d/sshd projects/clang380-import/gnu/lib/libgcc/Makefile projects/clang380-import/include/Makefile projects/clang380-import/lib/clang/clang.lib.mk projects/clang380-import/lib/libc/Makefile projects/clang380-import/lib/libc/gen/sem_new.c projects/clang380-import/lib/libc/gen/tls.c projects/clang380-import/lib/libc/gmon/gmon.c projects/clang380-import/lib/libc/mips/SYS.h projects/clang380-import/lib/libc/riscv/Makefile.inc projects/clang380-import/lib/libc/stdlib/jemalloc/Makefile.inc projects/clang380-import/lib/libc/string/strtok.3 projects/clang380-import/lib/libc/sys/utimensat.2 projects/clang380-import/lib/libc/sys/utrace.2 projects/clang380-import/lib/libc/xdr/xdr_float.c projects/clang380-import/lib/libelftc/elftc_version.c projects/clang380-import/lib/libfetch/common.c projects/clang380-import/lib/libpam/modules/pam_ssh/pam_ssh.c projects/clang380-import/lib/libstand/Makefile projects/clang380-import/libexec/rtld-elf/aarch64/reloc.c projects/clang380-import/libexec/rtld-elf/amd64/reloc.c projects/clang380-import/libexec/rtld-elf/arm/reloc.c projects/clang380-import/libexec/rtld-elf/debug.c projects/clang380-import/libexec/rtld-elf/i386/reloc.c projects/clang380-import/libexec/rtld-elf/paths.h projects/clang380-import/libexec/rtld-elf/powerpc/reloc.c projects/clang380-import/libexec/rtld-elf/powerpc64/reloc.c projects/clang380-import/libexec/rtld-elf/riscv/reloc.c projects/clang380-import/libexec/rtld-elf/rtld.c projects/clang380-import/libexec/rtld-elf/rtld.h projects/clang380-import/libexec/rtld-elf/sparc64/reloc.c projects/clang380-import/sbin/ldconfig/ldconfig.c projects/clang380-import/secure/lib/libssh/Makefile projects/clang380-import/secure/usr.sbin/sshd/Makefile projects/clang380-import/share/dtrace/Makefile projects/clang380-import/share/man/man4/Makefile projects/clang380-import/share/man/man4/mod_cc.4 projects/clang380-import/share/man/man4/tcp.4 projects/clang380-import/share/man/man7/tuning.7 projects/clang380-import/share/man/man9/mod_cc.9 projects/clang380-import/share/man/man9/vref.9 projects/clang380-import/share/misc/committers-src.dot projects/clang380-import/share/misc/organization.dot projects/clang380-import/share/mk/bsd.dep.mk projects/clang380-import/share/mk/bsd.lib.mk projects/clang380-import/share/mk/bsd.subdir.mk projects/clang380-import/share/mk/local.init.mk projects/clang380-import/share/mk/local.sys.mk projects/clang380-import/share/mk/sys.mk projects/clang380-import/sys/amd64/amd64/fpu.c projects/clang380-import/sys/amd64/include/atomic.h projects/clang380-import/sys/arm/arm/gic.c projects/clang380-import/sys/arm/arm/physmem.c projects/clang380-import/sys/arm/conf/DB-78XXX projects/clang380-import/sys/arm/conf/DB-88F5XXX projects/clang380-import/sys/arm/conf/DB-88F6XXX projects/clang380-import/sys/arm/conf/DOCKSTAR projects/clang380-import/sys/arm/conf/DREAMPLUG-1001 projects/clang380-import/sys/arm/conf/SHEEVAPLUG projects/clang380-import/sys/arm/conf/TS7800 projects/clang380-import/sys/arm/freescale/imx/imx_sdhci.c projects/clang380-import/sys/arm/mv/armadaxp/armadaxp.c projects/clang380-import/sys/arm/mv/files.mv projects/clang380-import/sys/arm/mv/mv_common.c projects/clang380-import/sys/arm/mv/mv_machdep.c projects/clang380-import/sys/arm/mv/mv_pci.c projects/clang380-import/sys/arm/mv/mvreg.h projects/clang380-import/sys/arm/mv/mvvar.h projects/clang380-import/sys/arm/mv/mvwin.h projects/clang380-import/sys/arm/mv/timer.c projects/clang380-import/sys/arm/mv/twsi.c projects/clang380-import/sys/arm/ti/ti_common.c projects/clang380-import/sys/arm64/arm64/gic_fdt.c projects/clang380-import/sys/arm64/arm64/gic_v3_fdt.c projects/clang380-import/sys/arm64/arm64/machdep.c projects/clang380-import/sys/arm64/arm64/nexus.c projects/clang380-import/sys/arm64/cavium/thunder_pcie.c projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.c projects/clang380-import/sys/arm64/cavium/thunder_pcie_common.h projects/clang380-import/sys/arm64/cavium/thunder_pcie_pem.c projects/clang380-import/sys/boot/common/console.c projects/clang380-import/sys/boot/common/ufsread.c projects/clang380-import/sys/boot/efi/boot1/Makefile projects/clang380-import/sys/boot/efi/boot1/boot1.c projects/clang380-import/sys/boot/efi/boot1/boot_module.h projects/clang380-import/sys/boot/efi/boot1/ufs_module.c projects/clang380-import/sys/boot/efi/boot1/zfs_module.c projects/clang380-import/sys/boot/fdt/dts/arm/db78460.dts projects/clang380-import/sys/boot/fdt/dts/arm/rk3188.dtsi projects/clang380-import/sys/boot/fdt/dts/arm/sun4i-a10.dtsi projects/clang380-import/sys/boot/fdt/dts/arm/sun7i-a20.dtsi projects/clang380-import/sys/boot/kshim/bsd_global.h projects/clang380-import/sys/boot/kshim/bsd_kernel.c projects/clang380-import/sys/boot/kshim/bsd_kernel.h projects/clang380-import/sys/boot/mips/beri/boot2/flashboot.ldscript projects/clang380-import/sys/boot/mips/beri/boot2/jtagboot.ldscript projects/clang380-import/sys/cam/ctl/ctl_ha.c projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/clang380-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/clang380-import/sys/compat/linux/linux_socket.c projects/clang380-import/sys/compat/linuxkpi/common/include/asm/atomic-long.h projects/clang380-import/sys/compat/linuxkpi/common/include/asm/atomic.h projects/clang380-import/sys/compat/linuxkpi/common/include/linux/idr.h projects/clang380-import/sys/compat/linuxkpi/common/include/linux/mutex.h projects/clang380-import/sys/compat/linuxkpi/common/src/linux_compat.c projects/clang380-import/sys/compat/linuxkpi/common/src/linux_idr.c projects/clang380-import/sys/conf/files projects/clang380-import/sys/conf/files.amd64 projects/clang380-import/sys/conf/files.arm64 projects/clang380-import/sys/conf/files.i386 projects/clang380-import/sys/conf/files.mips projects/clang380-import/sys/conf/options.arm projects/clang380-import/sys/dev/cxgb/cxgb_sge.c projects/clang380-import/sys/dev/cxgbe/iw_cxgbe/cm.c projects/clang380-import/sys/dev/cxgbe/t4_sge.c projects/clang380-import/sys/dev/e1000/if_igb.c projects/clang380-import/sys/dev/fdt/fdt_common.c projects/clang380-import/sys/dev/fdt/fdt_common.h projects/clang380-import/sys/dev/flash/mx25l.c projects/clang380-import/sys/dev/hwpmc/hwpmc_e500.c projects/clang380-import/sys/dev/hwpmc/hwpmc_powerpc.c projects/clang380-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang380-import/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/clang380-import/sys/dev/hyperv/vmbus/hv_channel_mgmt.c projects/clang380-import/sys/dev/hyperv/vmbus/hv_connection.c projects/clang380-import/sys/dev/hyperv/vmbus/hv_vmbus_priv.h projects/clang380-import/sys/dev/iwm/if_iwm.c projects/clang380-import/sys/dev/ixgbe/if_ix.c projects/clang380-import/sys/dev/ixgbe/if_ixv.c projects/clang380-import/sys/dev/mlx5/mlx5_en/en.h projects/clang380-import/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c projects/clang380-import/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/clang380-import/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c projects/clang380-import/sys/dev/mxge/if_mxge.c projects/clang380-import/sys/dev/ofw/ofw_bus_subr.c projects/clang380-import/sys/dev/ofw/ofw_fdt.c projects/clang380-import/sys/dev/pci/pcireg.h projects/clang380-import/sys/dev/pty/pty.c projects/clang380-import/sys/dev/sfxge/common/ef10_tlv_layout.h projects/clang380-import/sys/dev/sfxge/common/efsys.h projects/clang380-import/sys/dev/sfxge/common/efx.h projects/clang380-import/sys/dev/sfxge/common/efx_impl.h projects/clang380-import/sys/dev/sfxge/common/efx_mac.c projects/clang380-import/sys/dev/sfxge/common/efx_nvram.c projects/clang380-import/sys/dev/sfxge/common/efx_regs_ef10.h projects/clang380-import/sys/dev/sfxge/common/hunt_ev.c projects/clang380-import/sys/dev/sfxge/common/hunt_impl.h projects/clang380-import/sys/dev/sfxge/common/hunt_mac.c projects/clang380-import/sys/dev/sfxge/common/hunt_nic.c projects/clang380-import/sys/dev/sfxge/common/hunt_nvram.c projects/clang380-import/sys/dev/sfxge/common/siena_flash.h projects/clang380-import/sys/dev/sfxge/common/siena_impl.h projects/clang380-import/sys/dev/sfxge/common/siena_nvram.c projects/clang380-import/sys/dev/sfxge/sfxge_version.h projects/clang380-import/sys/dev/uart/uart_cpu_fdt.c projects/clang380-import/sys/dev/uart/uart_dev_ns8250.c projects/clang380-import/sys/dev/uart/uart_tty.c projects/clang380-import/sys/dev/usb/controller/ehci_mv.c projects/clang380-import/sys/dev/usb/serial/usb_serial.c projects/clang380-import/sys/dev/usb/wlan/if_urtwn.c projects/clang380-import/sys/dev/usb/wlan/if_urtwnreg.h projects/clang380-import/sys/dev/usb/wlan/if_urtwnvar.h projects/clang380-import/sys/dev/xen/netfront/netfront.c projects/clang380-import/sys/fs/devfs/devfs_devs.c projects/clang380-import/sys/fs/devfs/devfs_vnops.c projects/clang380-import/sys/fs/ext2fs/ext2_dir.h projects/clang380-import/sys/fs/ext2fs/ext2_extern.h projects/clang380-import/sys/fs/ext2fs/ext2_lookup.c projects/clang380-import/sys/fs/ext2fs/ext2_vfsops.c projects/clang380-import/sys/fs/ext2fs/ext2fs.h projects/clang380-import/sys/fs/nandfs/nandfs_segment.c projects/clang380-import/sys/i386/isa/npx.c projects/clang380-import/sys/kern/kern_exit.c projects/clang380-import/sys/kern/kern_proc.c projects/clang380-import/sys/kern/tty.c projects/clang380-import/sys/kern/uipc_syscalls.c projects/clang380-import/sys/kern/vfs_aio.c projects/clang380-import/sys/kern/vfs_cache.c projects/clang380-import/sys/kern/vfs_subr.c projects/clang380-import/sys/kern/vfs_vnops.c projects/clang380-import/sys/mips/include/asm.h projects/clang380-import/sys/mips/nlm/xlp_machdep.c projects/clang380-import/sys/modules/ext2fs/Makefile projects/clang380-import/sys/modules/i2c/iicbb/Makefile projects/clang380-import/sys/modules/ix/Makefile projects/clang380-import/sys/modules/ixlv/Makefile projects/clang380-import/sys/modules/ixv/Makefile projects/clang380-import/sys/netinet/cc/cc.c projects/clang380-import/sys/netinet/cc/cc_cdg.c projects/clang380-import/sys/netinet/cc/cc_chd.c projects/clang380-import/sys/netinet/cc/cc_cubic.c projects/clang380-import/sys/netinet/cc/cc_dctcp.c projects/clang380-import/sys/netinet/cc/cc_hd.c projects/clang380-import/sys/netinet/cc/cc_htcp.c projects/clang380-import/sys/netinet/cc/cc_newreno.c projects/clang380-import/sys/netinet/cc/cc_vegas.c projects/clang380-import/sys/netinet/igmp.c projects/clang380-import/sys/netinet/tcp.h projects/clang380-import/sys/netinet/tcp_input.c projects/clang380-import/sys/netinet/tcp_lro.c projects/clang380-import/sys/netinet/tcp_lro.h projects/clang380-import/sys/netinet/tcp_output.c projects/clang380-import/sys/netinet/tcp_stacks/fastpath.c projects/clang380-import/sys/netinet/tcp_subr.c projects/clang380-import/sys/netinet/tcp_timer.c projects/clang380-import/sys/netinet/tcp_usrreq.c projects/clang380-import/sys/netinet6/ip6_forward.c projects/clang380-import/sys/netpfil/ipfw/ip_fw_table_value.c projects/clang380-import/sys/powerpc/booke/pmap.c projects/clang380-import/sys/powerpc/include/vmparam.h projects/clang380-import/sys/powerpc/ofw/ofw_pci.c projects/clang380-import/sys/powerpc/ofw/ofw_pci.h projects/clang380-import/sys/powerpc/pseries/rtas_pci.c projects/clang380-import/sys/riscv/include/riscvreg.h projects/clang380-import/sys/sparc64/include/atomic.h projects/clang380-import/sys/sys/elf_common.h projects/clang380-import/sys/sys/fcntl.h projects/clang380-import/sys/sys/param.h projects/clang380-import/sys/sys/priv.h projects/clang380-import/sys/sys/proc.h projects/clang380-import/sys/sys/ttydevsw.h projects/clang380-import/sys/sys/vnode.h projects/clang380-import/sys/vm/vm_extern.h projects/clang380-import/sys/vm/vm_map.c projects/clang380-import/tools/build/check-links.sh projects/clang380-import/tools/regression/posixsem2/semtest.c projects/clang380-import/usr.bin/finger/net.c projects/clang380-import/usr.bin/iscsictl/iscsictl.8 projects/clang380-import/usr.bin/m4/misc.c projects/clang380-import/usr.bin/truncate/tests/truncate_test.sh projects/clang380-import/usr.bin/whois/whois.1 projects/clang380-import/usr.bin/whois/whois.c projects/clang380-import/usr.bin/xlint/lint1/param.h projects/clang380-import/usr.sbin/bsdinstall/scripts/zfsboot projects/clang380-import/usr.sbin/jail/command.c projects/clang380-import/usr.sbin/jail/config.c projects/clang380-import/usr.sbin/jls/jls.8 projects/clang380-import/usr.sbin/ntp/config.h projects/clang380-import/usr.sbin/ntp/doc/ntp-keygen.8 projects/clang380-import/usr.sbin/ntp/doc/ntp.conf.5 projects/clang380-import/usr.sbin/ntp/doc/ntp.keys.5 projects/clang380-import/usr.sbin/ntp/doc/ntpd.8 projects/clang380-import/usr.sbin/ntp/doc/ntpdc.8 projects/clang380-import/usr.sbin/ntp/doc/ntpq.8 projects/clang380-import/usr.sbin/ntp/doc/sntp.8 projects/clang380-import/usr.sbin/ntp/libntp/Makefile projects/clang380-import/usr.sbin/ntp/scripts/mkver projects/clang380-import/usr.sbin/vidcontrol/vidcontrol.1 projects/clang380-import/usr.sbin/vidcontrol/vidcontrol.c projects/clang380-import/usr.sbin/ypldap/yp.c Directory Properties: projects/clang380-import/ (props changed) projects/clang380-import/contrib/compiler-rt/ (props changed) projects/clang380-import/contrib/llvm/ (props changed) projects/clang380-import/contrib/llvm/projects/libunwind/ (props changed) projects/clang380-import/contrib/mdocml/ (props changed) projects/clang380-import/contrib/ntp/ (props changed) projects/clang380-import/crypto/openssh/ (props changed) projects/clang380-import/crypto/openssh/contrib/ssh-copy-id.1 (props changed) projects/clang380-import/crypto/openssh/moduli.5 (props changed) projects/clang380-import/crypto/openssh/openbsd-compat/ (props changed) projects/clang380-import/crypto/openssh/openbsd-compat/regress/ (props changed) projects/clang380-import/crypto/openssh/ssh-keysign.8 (props changed) projects/clang380-import/crypto/openssh/ssh-pkcs11-helper.8 (props changed) projects/clang380-import/gnu/lib/ (props changed) projects/clang380-import/include/ (props changed) projects/clang380-import/lib/libc/ (props changed) projects/clang380-import/sbin/ (props changed) projects/clang380-import/share/ (props changed) projects/clang380-import/share/man/man4/ (props changed) projects/clang380-import/sys/ (props changed) projects/clang380-import/sys/boot/ (props changed) projects/clang380-import/sys/cddl/contrib/opensolaris/ (props changed) projects/clang380-import/sys/conf/ (props changed) projects/clang380-import/sys/dev/hyperv/ (props changed) projects/clang380-import/usr.sbin/jail/ (props changed) Modified: projects/clang380-import/ObsoleteFiles.inc ============================================================================== --- projects/clang380-import/ObsoleteFiles.inc Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/ObsoleteFiles.inc Fri Jan 22 20:41:56 2016 (r294599) @@ -122,9 +122,9 @@ OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebs OLD_DIRS+=usr/lib/clang/3.7.1/lib OLD_DIRS+=usr/lib/clang/3.7.1 # 20160116: Update mandoc to cvs snapshot 20160116 -OLD_FILES+=/usr/share/mdocml/example.style.css -OLD_FILES+=/usr/share/mdocml/style.css -OLD_DIRS+=/usr/share/mdocml +OLD_FILES+=usr/share/mdocml/example.style.css +OLD_FILES+=usr/share/mdocml/style.css +OLD_DIRS+=usr/share/mdocml # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h Modified: projects/clang380-import/UPDATING ============================================================================== --- projects/clang380-import/UPDATING Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/UPDATING Fri Jan 22 20:41:56 2016 (r294599) @@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160119: + The NONE and HPN patches has been removed from OpenSSH. They are + still available in the security/openssh-portable port. + 20160113: With the addition of ypldap(8), a new _ypldap user is now required during installworld. "mergemaster -p" can be used to add the user Modified: projects/clang380-import/bin/sh/options.c ============================================================================== --- projects/clang380-import/bin/sh/options.c Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/bin/sh/options.c Fri Jan 22 20:41:56 2016 (r294599) @@ -74,6 +74,7 @@ static void options(int); static void minus_o(char *, int); static void setoption(int, int); static void setoptionbyindex(int, int); +static void setparam(int, char **); static int getopts(char *, char *, char **, char ***, char **); @@ -224,7 +225,7 @@ end_options1: end_options2: if (!cmdline) { if (*argptr == NULL) - setparam(argptr); + setparam(0, argptr); return; } @@ -318,22 +319,20 @@ setoption(int flag, int val) * Set the shell parameters. */ -void -setparam(char **argv) +static void +setparam(int argc, char **argv) { char **newparam; char **ap; - int nparam; - for (nparam = 0 ; argv[nparam] ; nparam++); - ap = newparam = ckmalloc((nparam + 1) * sizeof *ap); + ap = newparam = ckmalloc((argc + 1) * sizeof *ap); while (*argv) { *ap++ = savestr(*argv++); } *ap = NULL; freeparam(&shellparam); shellparam.malloc = 1; - shellparam.nparam = nparam; + shellparam.nparam = argc; shellparam.p = newparam; shellparam.optp = NULL; shellparam.reset = 1; @@ -371,8 +370,7 @@ freeparam(struct shparam *param) int shiftcmd(int argc, char **argv) { - int n; - char **ap1, **ap2; + int i, n; n = 1; if (argc > 1) @@ -381,12 +379,11 @@ shiftcmd(int argc, char **argv) return 1; INTOFF; shellparam.nparam -= n; - for (ap1 = shellparam.p ; --n >= 0 ; ap1++) { - if (shellparam.malloc) - ckfree(*ap1); - } - ap2 = shellparam.p; - while ((*ap2++ = *ap1++) != NULL); + if (shellparam.malloc) + for (i = 0; i < n; i++) + ckfree(shellparam.p[i]); + memmove(shellparam.p, shellparam.p + n, + (shellparam.nparam + 1) * sizeof(shellparam.p[0])); shellparam.reset = 1; INTON; return 0; @@ -407,7 +404,7 @@ setcmd(int argc, char **argv) options(0); optschanged(); if (*argptr != NULL) { - setparam(argptr); + setparam(argc - (argptr - argv), argptr); } INTON; return 0; Modified: projects/clang380-import/bin/sh/options.h ============================================================================== --- projects/clang380-import/bin/sh/options.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/bin/sh/options.h Fri Jan 22 20:41:56 2016 (r294599) @@ -108,7 +108,6 @@ extern char *nextopt_optptr; /* used by void procargs(int, char **); void optschanged(void); -void setparam(char **); void freeparam(struct shparam *); int nextopt(const char *); void getoptsreset(const char *); Modified: projects/clang380-import/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/clang380-import/bin/sh/tests/builtins/Makefile Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/bin/sh/tests/builtins/Makefile Fri Jan 22 20:41:56 2016 (r294599) @@ -112,6 +112,8 @@ FILES+= local2.0 FILES+= local3.0 FILES+= local4.0 FILES+= local5.0 +FILES+= local6.0 +FILES+= local7.0 .if ${MK_NLS} != "no" FILES+= locale1.0 .endif Copied: projects/clang380-import/bin/sh/tests/builtins/local6.0 (from r294598, head/bin/sh/tests/builtins/local6.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/bin/sh/tests/builtins/local6.0 Fri Jan 22 20:41:56 2016 (r294599, copy of r294598, head/bin/sh/tests/builtins/local6.0) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +f() { + local x + readonly x=2 +} +x=3 +f +x=4 +[ "$x" = 4 ] Copied: projects/clang380-import/bin/sh/tests/builtins/local7.0 (from r294598, head/bin/sh/tests/builtins/local7.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang380-import/bin/sh/tests/builtins/local7.0 Fri Jan 22 20:41:56 2016 (r294599, copy of r294598, head/bin/sh/tests/builtins/local7.0) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +f() { + local x + readonly x=2 +} +unset x +f +x=4 +[ "$x" = 4 ] Modified: projects/clang380-import/bin/sh/var.c ============================================================================== --- projects/clang380-import/bin/sh/var.c Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/bin/sh/var.c Fri Jan 22 20:41:56 2016 (r294599) @@ -802,6 +802,7 @@ poplocalvars(void) ckfree(lvp->text); optschanged(); } else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) { + vp->flags &= ~VREADONLY; (void)unsetvar(vp->text); } else { islocalevar = (vp->flags | lvp->flags) & VEXPORT && Modified: projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c ============================================================================== --- projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.c Fri Jan 22 20:41:56 2016 (r294599) @@ -443,6 +443,7 @@ mib_fetch_ifmib(struct mibif *ifp) size_t len; void *newmib; struct ifmibdata oldmib = ifp->mib; + struct ifreq irr; if (fetch_generic_mib(ifp, &oldmib) == -1) return (-1); @@ -514,6 +515,18 @@ mib_fetch_ifmib(struct mibif *ifp) } out: + strncpy(irr.ifr_name, ifp->name, sizeof(irr.ifr_name)); + irr.ifr_buffer.buffer = MIBIF_PRIV(ifp)->alias; + irr.ifr_buffer.length = sizeof(MIBIF_PRIV(ifp)->alias); + if (ioctl(mib_netsock, SIOCGIFDESCR, &irr) == -1) { + MIBIF_PRIV(ifp)->alias[0] = 0; + if (errno != ENOMSG) + syslog(LOG_WARNING, "SIOCGIFDESCR (%s): %m", ifp->name); + } else if (irr.ifr_buffer.buffer == NULL) { + MIBIF_PRIV(ifp)->alias[0] = 0; + syslog(LOG_WARNING, "SIOCGIFDESCR (%s): too long (%zu)", + ifp->name, irr.ifr_buffer.length); + } ifp->mibtick = get_ticks(); return (0); } Modified: projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.h ============================================================================== --- projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII.h Fri Jan 22 20:41:56 2016 (r294599) @@ -57,6 +57,9 @@ #include "snmp_mibII.h" #include "mibII_tree.h" +/* maximum size of the interface alias */ +#define MIBIF_ALIAS_SIZE (64 + 1) + /* * Interface list and flags. */ @@ -77,6 +80,9 @@ struct mibif_private { uint64_t hc_opackets; uint64_t hc_imcasts; uint64_t hc_ipackets; + + /* this should be made public */ + char alias[MIBIF_ALIAS_SIZE]; }; #define MIBIF_PRIV(IFP) ((struct mibif_private *)((IFP)->private)) Modified: projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_interfaces.c ============================================================================== --- projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/bsnmp/snmp_mibII/mibII_interfaces.c Fri Jan 22 20:41:56 2016 (r294599) @@ -528,7 +528,7 @@ op_ifxtable(struct snmp_context *ctx, st break; case LEAF_ifAlias: - ret = string_get(value, "", -1); + ret = string_get(value, MIBIF_PRIV(ifp)->alias, -1); break; case LEAF_ifCounterDiscontinuityTime: Modified: projects/clang380-import/contrib/compiler-rt/lib/builtins/int_lib.h ============================================================================== --- projects/clang380-import/contrib/compiler-rt/lib/builtins/int_lib.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/compiler-rt/lib/builtins/int_lib.h Fri Jan 22 20:41:56 2016 (r294599) @@ -74,11 +74,13 @@ * global header to prevent other C files from making the detour * through __c?zdi2() as well. * - * This problem has only been observed on FreeBSD for sparc64 and - * mips64 with GCC 4.2.1. + * This problem has been observed on FreeBSD for sparc64 and + * mips64 with GCC 4.2.1, and for riscv with GCC 5.2.0. + * Presumably it's any version of GCC, and targeting an arch that + * does not have dedicated bit counting instructions. */ #if defined(__FreeBSD__) && (defined(__sparc64__) || \ - defined(__mips_n64) || defined(__mips_o64)) + defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__)) si_int __clzsi2(si_int); si_int __ctzsi2(si_int); #define __builtin_clz __clzsi2 Modified: projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ============================================================================== --- projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h Fri Jan 22 20:41:56 2016 (r294599) @@ -76,6 +76,10 @@ namespace __sanitizer { #elif defined(__powerpc64__) const unsigned struct_kernel_stat_sz = 144; const unsigned struct_kernel_stat64_sz = 104; +#elif defined(__riscv__) + /* RISCVTODO: check that these values are correct */ + const unsigned struct_kernel_stat_sz = 128; + const unsigned struct_kernel_stat64_sz = 128; #elif defined(__mips__) #if SANITIZER_WORDSIZE == 64 const unsigned struct_kernel_stat_sz = 216; @@ -103,7 +107,7 @@ namespace __sanitizer { #if SANITIZER_LINUX || SANITIZER_FREEBSD -#if defined(__powerpc64__) +#if defined(__powerpc64__) || defined(__riscv__) const unsigned struct___old_kernel_stat_sz = 0; #else const unsigned struct___old_kernel_stat_sz = 32; @@ -481,7 +485,7 @@ namespace __sanitizer { typedef long __sanitizer___kernel_off_t; #endif -#if defined(__powerpc__) || defined(__mips__) +#if defined(__powerpc__) || defined(__mips__) || defined(__riscv__) typedef unsigned int __sanitizer___kernel_old_uid_t; typedef unsigned int __sanitizer___kernel_old_gid_t; #else Modified: projects/clang380-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h ============================================================================== --- projects/clang380-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h Fri Jan 22 20:41:56 2016 (r294599) @@ -253,6 +253,9 @@ typedef unsigned szind_t; # ifdef __powerpc__ # define LG_QUANTUM 4 # endif +# ifdef __riscv__ +# define LG_QUANTUM 4 +# endif # ifdef __s390__ # define LG_QUANTUM 4 # endif Modified: projects/clang380-import/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h ============================================================================== --- projects/clang380-import/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Fri Jan 22 20:41:56 2016 (r294599) @@ -52,6 +52,9 @@ #elif defined(__powerpc__) # define LG_SIZEOF_PTR 2 #endif +#ifdef __riscv__ +# define LG_SIZEOF_PTR 3 +#endif #ifndef JEMALLOC_TLS_MODEL # define JEMALLOC_TLS_MODEL /* Default. */ Modified: projects/clang380-import/contrib/llvm/projects/libunwind/include/libunwind.h ============================================================================== --- projects/clang380-import/contrib/llvm/projects/libunwind/include/libunwind.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/llvm/projects/libunwind/include/libunwind.h Fri Jan 22 20:41:56 2016 (r294599) @@ -295,6 +295,77 @@ enum { UNW_PPC_SPEFSCR = 112 }; +// 64-bit RISC-V registers +enum { + UNW_RISCV_X0 = 0, + UNW_RISCV_X1 = 1, + UNW_RISCV_RA = 1, + UNW_RISCV_X2 = 2, + UNW_RISCV_SP = 2, + UNW_RISCV_X3 = 3, + UNW_RISCV_X4 = 4, + UNW_RISCV_X5 = 5, + UNW_RISCV_X6 = 6, + UNW_RISCV_X7 = 7, + UNW_RISCV_X8 = 8, + UNW_RISCV_X9 = 9, + UNW_RISCV_X10 = 10, + UNW_RISCV_X11 = 11, + UNW_RISCV_X12 = 12, + UNW_RISCV_X13 = 13, + UNW_RISCV_X14 = 14, + UNW_RISCV_X15 = 15, + UNW_RISCV_X16 = 16, + UNW_RISCV_X17 = 17, + UNW_RISCV_X18 = 18, + UNW_RISCV_X19 = 19, + UNW_RISCV_X20 = 20, + UNW_RISCV_X21 = 21, + UNW_RISCV_X22 = 22, + UNW_RISCV_X23 = 23, + UNW_RISCV_X24 = 24, + UNW_RISCV_X25 = 25, + UNW_RISCV_X26 = 26, + UNW_RISCV_X27 = 27, + UNW_RISCV_X28 = 28, + UNW_RISCV_X29 = 29, + UNW_RISCV_X30 = 30, + UNW_RISCV_X31 = 31, + // reserved block + UNW_RISCV_D0 = 64, + UNW_RISCV_D1 = 65, + UNW_RISCV_D2 = 66, + UNW_RISCV_D3 = 67, + UNW_RISCV_D4 = 68, + UNW_RISCV_D5 = 69, + UNW_RISCV_D6 = 70, + UNW_RISCV_D7 = 71, + UNW_RISCV_D8 = 72, + UNW_RISCV_D9 = 73, + UNW_RISCV_D10 = 74, + UNW_RISCV_D11 = 75, + UNW_RISCV_D12 = 76, + UNW_RISCV_D13 = 77, + UNW_RISCV_D14 = 78, + UNW_RISCV_D15 = 79, + UNW_RISCV_D16 = 80, + UNW_RISCV_D17 = 81, + UNW_RISCV_D18 = 82, + UNW_RISCV_D19 = 83, + UNW_RISCV_D20 = 84, + UNW_RISCV_D21 = 85, + UNW_RISCV_D22 = 86, + UNW_RISCV_D23 = 87, + UNW_RISCV_D24 = 88, + UNW_RISCV_D25 = 89, + UNW_RISCV_D26 = 90, + UNW_RISCV_D27 = 91, + UNW_RISCV_D28 = 92, + UNW_RISCV_D29 = 93, + UNW_RISCV_D30 = 94, + UNW_RISCV_D31 = 95, +}; + // 64-bit ARM64 registers enum { UNW_ARM64_X0 = 0, Modified: projects/clang380-import/contrib/llvm/projects/libunwind/src/Registers.hpp ============================================================================== --- projects/clang380-import/contrib/llvm/projects/libunwind/src/Registers.hpp Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/llvm/projects/libunwind/src/Registers.hpp Fri Jan 22 20:41:56 2016 (r294599) @@ -1024,6 +1024,264 @@ inline const char *Registers_ppc::getReg } +/// Registers_riscv holds the register state of a thread in a 64-bit RISC-V +/// process. +class _LIBUNWIND_HIDDEN Registers_riscv { +public: + Registers_riscv(); + Registers_riscv(const void *registers); + + bool validRegister(int num) const; + uint64_t getRegister(int num) const; + void setRegister(int num, uint64_t value); + bool validFloatRegister(int num) const; + double getFloatRegister(int num) const; + void setFloatRegister(int num, double value); + bool validVectorRegister(int num) const; + v128 getVectorRegister(int num) const; + void setVectorRegister(int num, v128 value); + const char *getRegisterName(int num); + void jumpto(); + static int lastDwarfRegNum() { return 95; } + + uint64_t getSP() const { return _registers.__x[2]; } + void setSP(uint64_t value) { _registers.__x[2] = value; } + uint64_t getIP() const { return _registers.__x[1]; } + void setIP(uint64_t value) { _registers.__x[1] = value; } + +private: + struct GPRs { + uint64_t __x[32]; // x0-x31 + }; + + GPRs _registers; + double _vectorHalfRegisters[32]; + // Currently only the lower double in 128-bit vectore registers + // is perserved during unwinding. We could define new register + // numbers (> 96) which mean whole vector registers, then this + // struct would need to change to contain whole vector registers. +}; + +inline Registers_riscv::Registers_riscv(const void *registers) { + static_assert(sizeof(Registers_riscv) < sizeof(unw_context_t), + "riscv registers do not fit into unw_context_t"); + memcpy(&_registers, registers, sizeof(_registers)); + static_assert(sizeof(GPRs) == 0x100, + "expected VFP registers to be at offset 256"); + memcpy(_vectorHalfRegisters, + static_cast(registers) + sizeof(GPRs), + sizeof(_vectorHalfRegisters)); +} + +inline Registers_riscv::Registers_riscv() { + memset(&_registers, 0, sizeof(_registers)); + memset(&_vectorHalfRegisters, 0, sizeof(_vectorHalfRegisters)); +} + +inline bool Registers_riscv::validRegister(int regNum) const { + if (regNum == UNW_REG_IP) + return true; + if (regNum == UNW_REG_SP) + return true; + if (regNum < 0) + return false; + if (regNum > 95) + return false; + if ((regNum > 31) && (regNum < 64)) + return false; + return true; +} + +inline uint64_t Registers_riscv::getRegister(int regNum) const { + if (regNum == UNW_REG_IP) + return _registers.__x[1]; + if (regNum == UNW_REG_SP) + return _registers.__x[2]; + if ((regNum >= 0) && (regNum < 32)) + return _registers.__x[regNum]; + _LIBUNWIND_ABORT("unsupported riscv register"); +} + +inline void Registers_riscv::setRegister(int regNum, uint64_t value) { + if (regNum == UNW_REG_IP) + _registers.__x[1] = value; + else if (regNum == UNW_REG_SP) + _registers.__x[2] = value; + else if ((regNum >= 0) && (regNum < 32)) + _registers.__x[regNum] = value; + else + _LIBUNWIND_ABORT("unsupported riscv register"); +} + +inline const char *Registers_riscv::getRegisterName(int regNum) { + switch (regNum) { + case UNW_REG_IP: + return "ra"; + case UNW_REG_SP: + return "sp"; + case UNW_RISCV_X0: + return "x0"; + case UNW_RISCV_X1: + return "ra"; + case UNW_RISCV_X2: + return "sp"; + case UNW_RISCV_X3: + return "x3"; + case UNW_RISCV_X4: + return "x4"; + case UNW_RISCV_X5: + return "x5"; + case UNW_RISCV_X6: + return "x6"; + case UNW_RISCV_X7: + return "x7"; + case UNW_RISCV_X8: + return "x8"; + case UNW_RISCV_X9: + return "x9"; + case UNW_RISCV_X10: + return "x10"; + case UNW_RISCV_X11: + return "x11"; + case UNW_RISCV_X12: + return "x12"; + case UNW_RISCV_X13: + return "x13"; + case UNW_RISCV_X14: + return "x14"; + case UNW_RISCV_X15: + return "x15"; + case UNW_RISCV_X16: + return "x16"; + case UNW_RISCV_X17: + return "x17"; + case UNW_RISCV_X18: + return "x18"; + case UNW_RISCV_X19: + return "x19"; + case UNW_RISCV_X20: + return "x20"; + case UNW_RISCV_X21: + return "x21"; + case UNW_RISCV_X22: + return "x22"; + case UNW_RISCV_X23: + return "x23"; + case UNW_RISCV_X24: + return "x24"; + case UNW_RISCV_X25: + return "x25"; + case UNW_RISCV_X26: + return "x26"; + case UNW_RISCV_X27: + return "x27"; + case UNW_RISCV_X28: + return "x28"; + case UNW_RISCV_X29: + return "x29"; + case UNW_RISCV_X30: + return "x30"; + case UNW_RISCV_X31: + return "x31"; + case UNW_RISCV_D0: + return "d0"; + case UNW_RISCV_D1: + return "d1"; + case UNW_RISCV_D2: + return "d2"; + case UNW_RISCV_D3: + return "d3"; + case UNW_RISCV_D4: + return "d4"; + case UNW_RISCV_D5: + return "d5"; + case UNW_RISCV_D6: + return "d6"; + case UNW_RISCV_D7: + return "d7"; + case UNW_RISCV_D8: + return "d8"; + case UNW_RISCV_D9: + return "d9"; + case UNW_RISCV_D10: + return "d10"; + case UNW_RISCV_D11: + return "d11"; + case UNW_RISCV_D12: + return "d12"; + case UNW_RISCV_D13: + return "d13"; + case UNW_RISCV_D14: + return "d14"; + case UNW_RISCV_D15: + return "d15"; + case UNW_RISCV_D16: + return "d16"; + case UNW_RISCV_D17: + return "d17"; + case UNW_RISCV_D18: + return "d18"; + case UNW_RISCV_D19: + return "d19"; + case UNW_RISCV_D20: + return "d20"; + case UNW_RISCV_D21: + return "d21"; + case UNW_RISCV_D22: + return "d22"; + case UNW_RISCV_D23: + return "d23"; + case UNW_RISCV_D24: + return "d24"; + case UNW_RISCV_D25: + return "d25"; + case UNW_RISCV_D26: + return "d26"; + case UNW_RISCV_D27: + return "d27"; + case UNW_RISCV_D28: + return "d28"; + case UNW_RISCV_D29: + return "d29"; + case UNW_RISCV_D30: + return "d30"; + case UNW_RISCV_D31: + return "d31"; + default: + return "unknown register"; + } +} + +inline bool Registers_riscv::validFloatRegister(int regNum) const { + if (regNum < UNW_RISCV_D0) + return false; + if (regNum > UNW_RISCV_D31) + return false; + return true; +} + +inline double Registers_riscv::getFloatRegister(int regNum) const { + assert(validFloatRegister(regNum)); + return _vectorHalfRegisters[regNum - UNW_RISCV_D0]; +} + +inline void Registers_riscv::setFloatRegister(int regNum, double value) { + assert(validFloatRegister(regNum)); + _vectorHalfRegisters[regNum - UNW_RISCV_D0] = value; +} + +inline bool Registers_riscv::validVectorRegister(int) const { + return false; +} + +inline v128 Registers_riscv::getVectorRegister(int) const { + _LIBUNWIND_ABORT("no riscv vector register support yet"); +} + +inline void Registers_riscv::setVectorRegister(int, v128) { + _LIBUNWIND_ABORT("no riscv vector register support yet"); +} + /// Registers_arm64 holds the register state of a thread in a 64-bit arm /// process. Modified: projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp ============================================================================== --- projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp Fri Jan 22 20:41:56 2016 (r294599) @@ -562,6 +562,10 @@ private: compact_unwind_encoding_t dwarfEncoding(Registers_or1k &) const { return 0; } + + compact_unwind_encoding_t dwarfEncoding(Registers_riscv &) const { + return 0; + } #endif // _LIBUNWIND_SUPPORT_DWARF_UNWIND Modified: projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S ============================================================================== --- projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S Fri Jan 22 20:41:56 2016 (r294599) @@ -478,4 +478,8 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9li l.jr r9 l.nop +#elif defined(__riscv__) + +/* RISCVTODO */ + #endif Modified: projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S ============================================================================== --- projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S Fri Jan 22 20:41:56 2016 (r294599) @@ -463,4 +463,9 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext l.sw 116(r3), r29 l.sw 120(r3), r30 l.sw 124(r3), r31 + +#elif defined(__riscv__) + +/* RISCVTODO */ + #endif Modified: projects/clang380-import/contrib/llvm/projects/libunwind/src/config.h ============================================================================== --- projects/clang380-import/contrib/llvm/projects/libunwind/src/config.h Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/llvm/projects/libunwind/src/config.h Fri Jan 22 20:41:56 2016 (r294599) @@ -74,7 +74,8 @@ #define _LIBUNWIND_BUILD_ZERO_COST_APIS (defined(__i386__) || \ defined(__x86_64__) || \ defined(__arm__) || \ - defined(__aarch64__)) + defined(__aarch64__) || \ + defined(__riscv__)) #define _LIBUNWIND_BUILD_SJLJ_APIS 0 #define _LIBUNWIND_SUPPORT_FRAME_APIS (defined(__i386__) || \ defined(__x86_64__)) Modified: projects/clang380-import/contrib/llvm/projects/libunwind/src/libunwind.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/projects/libunwind/src/libunwind.cpp Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/llvm/projects/libunwind/src/libunwind.cpp Fri Jan 22 20:41:56 2016 (r294599) @@ -66,6 +66,9 @@ _LIBUNWIND_EXPORT int unw_init_local(unw context, LocalAddressSpace::sThisAddressSpace); #elif defined(__mips__) #warning The MIPS architecture is not supported. +#elif defined(__riscv__) + new ((void *)cursor) UnwindCursor( + context, LocalAddressSpace::sThisAddressSpace); #else #error Architecture not supported #endif Modified: projects/clang380-import/contrib/mdocml/main.c ============================================================================== --- projects/clang380-import/contrib/mdocml/main.c Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/mdocml/main.c Fri Jan 22 20:41:56 2016 (r294599) @@ -720,7 +720,7 @@ parse(struct curparse *curp, int fd, con /* Begin by parsing the file itself. */ assert(file); - assert(fd > 0); + assert(fd >= 0); rctmp = mparse_readfd(curp->mp, fd, file); if (fd != STDIN_FILENO) Modified: projects/clang380-import/contrib/ntp/ChangeLog ============================================================================== --- projects/clang380-import/contrib/ntp/ChangeLog Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/ntp/ChangeLog Fri Jan 22 20:41:56 2016 (r294599) @@ -1,4 +1,38 @@ --- +(4.2.8p6) 2016/01/20 Released by Harlan Stenn + +* [Sec 2935] Deja Vu: Replay attack on authenticated broadcast mode. HStenn. +* [Sec 2936] Skeleton Key: Any trusted key system can serve time. HStenn. +* [Sec 2937] ntpq: nextvar() missing length check. perlinger@ntp.org +* [Sec 2938] ntpq saveconfig command allows dangerous characters + in filenames. perlinger@ntp.org +* [Sec 2939] reslist NULL pointer dereference. perlinger@ntp.org +* [Sec 2940] Stack exhaustion in recursive traversal of restriction + list. perlinger@ntp.org +* [Sec 2942]: Off-path DoS attack on auth broadcast mode. HStenn. +* [Sec 2945] Zero Origin Timestamp Bypass. perlinger@ntp.org +* [Sec 2948] Potential Infinite Loop in ntpq ( and ntpdc) perlinger@ntp.org +* [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org +* [Bug 2814] msyslog deadlock when signaled. perlinger@ntp.org + - applied patch by shenpeng11@huawei.com with minor adjustments +* [Bug 2882] Look at ntp_request.c:list_peers_sum(). perlinger@ntp.org +* [Bug 2891] Deadlock in deferred DNS lookup framework. perlinger@ntp.org +* [Bug 2892] Several test cases assume IPv6 capabilities even when + IPv6 is disabled in the build. perlinger@ntp.org + - Found this already fixed, but validation led to cleanup actions. +* [Bug 2905] DNS lookups broken. perlinger@ntp.org + - added limits to stack consumption, fixed some return code handling +* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call + - changed stacked/nested handling of CTRL-C. perlinger@ntp.org + - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org +* [Bug 2980] reduce number of warnings. perlinger@ntp.org + - integrated several patches from Havard Eidnes (he@uninett.no) +* [Bug 2985] bogus calculation in authkeys.c perlinger@ntp.org + - implement 'auth_log2()' using integer bithack instead of float calculation +* Make leapsec_query debug messages less verbose. Harlan Stenn. +* Disable incomplete t-ntp_signd.c test. Harlan Stenn. + +--- (4.2.8p5) 2016/01/07 Released by Harlan Stenn * [Sec 2956] small-step/big-step. Close the panic gate earlier. HStenn. @@ -47,6 +81,7 @@ lots of clients. perlinger@ntp.org * [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call - changed stacked/nested handling of CTRL-C. perlinger@ntp.org + - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org * Unity cleanup for FreeBSD-6.4. Harlan Stenn. * Unity test cleanup. Harlan Stenn. * Libevent autoconf pthread fixes for FreeBSD-10. Harlan Stenn. @@ -55,9 +90,8 @@ * Quiet a warning from clang. Harlan Stenn. * Update the NEWS file. Harlan Stenn. * Update scripts/calc_tickadj/Makefile.am. Harlan Stenn. + --- -(4.2.8p4) 2015/10/21 Released by Harlan Stenn -(4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn * [Sec 2899] CVE-2014-9297 perlinger@ntp.org * [Sec 2901] Drop invalid packet before checking KoD. Check for all KoD's. Modified: projects/clang380-import/contrib/ntp/CommitLog ============================================================================== --- projects/clang380-import/contrib/ntp/CommitLog Fri Jan 22 20:38:46 2016 (r294598) +++ projects/clang380-import/contrib/ntp/CommitLog Fri Jan 22 20:41:56 2016 (r294599) @@ -1,8 +1,633 @@ -ChangeSet@1.3623, 2016-01-07 23:33:11+00:00, stenn@deacon.udel.edu +ChangeSet@1.3628, 2016-01-20 04:20:12-05:00, stenn@deacon.udel.edu + NTP_4_2_8P6 + TAG: NTP_4_2_8P6 + + ChangeLog@1.1793 +1 -0 + NTP_4_2_8P6 + + ntpd/invoke-ntp.conf.texi@1.196 +1 -1 + NTP_4_2_8P6 + + ntpd/invoke-ntp.keys.texi@1.188 +1 -1 + NTP_4_2_8P6 + + ntpd/invoke-ntpd.texi@1.504 +2 -2 + NTP_4_2_8P6 + + ntpd/ntp.conf.5man@1.230 +3 -3 + NTP_4_2_8P6 + + ntpd/ntp.conf.5mdoc@1.230 +2 -3 + NTP_4_2_8P6 + + ntpd/ntp.conf.html@1.183 +60 -2 + NTP_4_2_8P6 + + ntpd/ntp.conf.man.in@1.230 +3 -3 + NTP_4_2_8P6 + + ntpd/ntp.conf.mdoc.in@1.230 +2 -3 + NTP_4_2_8P6 + + ntpd/ntp.keys.5man@1.222 +2 -2 + NTP_4_2_8P6 + + ntpd/ntp.keys.5mdoc@1.222 +3 -3 + NTP_4_2_8P6 + + ntpd/ntp.keys.html@1.184 +21 -33 + NTP_4_2_8P6 + + ntpd/ntp.keys.man.in@1.222 +2 -2 + NTP_4_2_8P6 + + ntpd/ntp.keys.mdoc.in@1.222 +3 -3 + NTP_4_2_8P6 + + ntpd/ntpd-opts.c@1.526 +10 -10 + NTP_4_2_8P6 + + ntpd/ntpd-opts.h@1.525 +4 -4 + NTP_4_2_8P6 + + ntpd/ntpd.1ntpdman@1.333 +4 -4 + NTP_4_2_8P6 + + ntpd/ntpd.1ntpdmdoc@1.333 +3 -3 + NTP_4_2_8P6 + + ntpd/ntpd.html@1.177 +2 -2 + NTP_4_2_8P6 + + ntpd/ntpd.man.in@1.333 +4 -4 + NTP_4_2_8P6 + + ntpd/ntpd.mdoc.in@1.333 +3 -3 + NTP_4_2_8P6 + + ntpdc/invoke-ntpdc.texi@1.501 +2 -2 + NTP_4_2_8P6 + + ntpdc/ntpdc-opts.c@1.519 +10 -10 + NTP_4_2_8P6 + + ntpdc/ntpdc-opts.h@1.518 +4 -4 + NTP_4_2_8P6 + + ntpdc/ntpdc.1ntpdcman@1.332 +4 -4 + NTP_4_2_8P6 + + ntpdc/ntpdc.1ntpdcmdoc@1.332 +3 -3 + NTP_4_2_8P6 + + ntpdc/ntpdc.html@1.345 +2 -2 + NTP_4_2_8P6 + + ntpdc/ntpdc.man.in@1.332 +4 -4 + NTP_4_2_8P6 + + ntpdc/ntpdc.mdoc.in@1.332 +3 -3 + NTP_4_2_8P6 + + ntpq/invoke-ntpq.texi@1.508 +2 -2 + NTP_4_2_8P6 + + ntpq/ntpq-opts.c@1.525 +10 -10 + NTP_4_2_8P6 + + ntpq/ntpq-opts.h@1.523 +4 -4 + NTP_4_2_8P6 + + ntpq/ntpq.1ntpqman@1.336 +4 -4 + NTP_4_2_8P6 + + ntpq/ntpq.1ntpqmdoc@1.336 +3 -3 + NTP_4_2_8P6 + + ntpq/ntpq.html@1.174 +2 -2 + NTP_4_2_8P6 + + ntpq/ntpq.man.in@1.336 +4 -4 + NTP_4_2_8P6 + + ntpq/ntpq.mdoc.in@1.336 +3 -3 + NTP_4_2_8P6 + + ntpsnmpd/invoke-ntpsnmpd.texi@1.503 +2 -2 + NTP_4_2_8P6 + + ntpsnmpd/ntpsnmpd-opts.c@1.521 +10 -10 + NTP_4_2_8P6 + + ntpsnmpd/ntpsnmpd-opts.h@1.520 +4 -4 + NTP_4_2_8P6 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdman@1.332 +4 -4 + NTP_4_2_8P6 + + ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc@1.332 +3 -3 + NTP_4_2_8P6 + + ntpsnmpd/ntpsnmpd.html@1.172 +1 -1 + NTP_4_2_8P6 + + ntpsnmpd/ntpsnmpd.man.in@1.332 +4 -4 + NTP_4_2_8P6 + + ntpsnmpd/ntpsnmpd.mdoc.in@1.332 +3 -3 + NTP_4_2_8P6 + + packageinfo.sh@1.524 +2 -2 + NTP_4_2_8P6 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjman@1.93 +3 -3 + NTP_4_2_8P6 + + scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc@1.94 +2 -2 + NTP_4_2_8P6 + + scripts/calc_tickadj/calc_tickadj.html@1.95 +1 -1 + NTP_4_2_8P6 + + scripts/calc_tickadj/calc_tickadj.man.in@1.92 +3 -3 + NTP_4_2_8P6 + + scripts/calc_tickadj/calc_tickadj.mdoc.in@1.94 +2 -2 + NTP_4_2_8P6 + + scripts/calc_tickadj/invoke-calc_tickadj.texi@1.97 +1 -1 + NTP_4_2_8P6 + + scripts/invoke-plot_summary.texi@1.114 +2 -2 + NTP_4_2_8P6 + + scripts/invoke-summary.texi@1.114 +2 -2 + NTP_4_2_8P6 + + scripts/ntp-wait/invoke-ntp-wait.texi@1.324 +2 -2 + NTP_4_2_8P6 + + scripts/ntp-wait/ntp-wait-opts@1.60 +2 -2 + NTP_4_2_8P6 + + scripts/ntp-wait/ntp-wait.1ntp-waitman@1.321 +3 -3 + NTP_4_2_8P6 + + scripts/ntp-wait/ntp-wait.1ntp-waitmdoc@1.322 +2 -2 + NTP_4_2_8P6 + + scripts/ntp-wait/ntp-wait.html@1.341 +2 -2 + NTP_4_2_8P6 + + scripts/ntp-wait/ntp-wait.man.in@1.321 +3 -3 + NTP_4_2_8P6 + + scripts/ntp-wait/ntp-wait.mdoc.in@1.322 +2 -2 + NTP_4_2_8P6 + + scripts/ntpsweep/invoke-ntpsweep.texi@1.112 +2 -2 + NTP_4_2_8P6 + + scripts/ntpsweep/ntpsweep-opts@1.62 +2 -2 + NTP_4_2_8P6 + + scripts/ntpsweep/ntpsweep.1ntpsweepman@1.100 +3 -3 + NTP_4_2_8P6 + + scripts/ntpsweep/ntpsweep.1ntpsweepmdoc@1.100 +2 -2 + NTP_4_2_8P6 + + scripts/ntpsweep/ntpsweep.html@1.113 +2 -2 + NTP_4_2_8P6 + + scripts/ntpsweep/ntpsweep.man.in@1.100 +3 -3 + NTP_4_2_8P6 + + scripts/ntpsweep/ntpsweep.mdoc.in@1.101 +2 -2 + NTP_4_2_8P6 + + scripts/ntptrace/invoke-ntptrace.texi@1.113 +2 -2 + NTP_4_2_8P6 + + scripts/ntptrace/ntptrace-opts@1.62 +2 -2 + NTP_4_2_8P6 + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Fri Jan 22 21:50:11 2016 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 7FA60A8D4F3 for ; Fri, 22 Jan 2016 21:50:11 +0000 (UTC) (envelope-from dim@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 1C1DD18A9; Fri, 22 Jan 2016 21:50:11 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MLoAdB035929; Fri, 22 Jan 2016 21:50:10 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MLo85o035913; Fri, 22 Jan 2016 21:50:08 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601222150.u0MLo85o035913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 22 Jan 2016 21:50:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294609 - in projects/clang380-import: contrib/llvm/include/llvm/CodeGen contrib/llvm/include/llvm/Transforms/Utils contrib/llvm/lib/CodeGen contrib/llvm/lib/CodeGen/SelectionDAG contri... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 22 Jan 2016 21:50:11 -0000 Author: dim Date: Fri Jan 22 21:50:08 2016 New Revision: 294609 URL: https://svnweb.freebsd.org/changeset/base/294609 Log: Update llvm and clang to release_38 branch r258549. Modified: projects/clang380-import/contrib/llvm/include/llvm/CodeGen/MachineFunction.h projects/clang380-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/Local.h projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h projects/clang380-import/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp projects/clang380-import/contrib/llvm/lib/CodeGen/MachineFunction.cpp projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp projects/clang380-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp projects/clang380-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp projects/clang380-import/contrib/llvm/lib/Target/X86/X86CallingConv.td projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/clang380-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp projects/clang380-import/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp projects/clang380-import/contrib/llvm/lib/Transforms/Utils/Local.cpp projects/clang380-import/contrib/llvm/lib/Transforms/Utils/SimplifyLibCalls.cpp projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/CGOpenMPRuntime.cpp projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp projects/clang380-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h projects/clang380-import/contrib/llvm/tools/lli/lli.cpp projects/clang380-import/lib/clang/include/clang/Basic/Version.inc Directory Properties: projects/clang380-import/contrib/llvm/ (props changed) projects/clang380-import/contrib/llvm/tools/clang/ (props changed) Modified: projects/clang380-import/contrib/llvm/include/llvm/CodeGen/MachineFunction.h ============================================================================== --- projects/clang380-import/contrib/llvm/include/llvm/CodeGen/MachineFunction.h Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/include/llvm/CodeGen/MachineFunction.h Fri Jan 22 21:50:08 2016 (r294609) @@ -295,7 +295,7 @@ public: } /// Should we be emitting segmented stack stuff for the function - bool shouldSplitStack(); + bool shouldSplitStack() const; /// getNumBlockIDs - Return the number of MBB ID's allocated. /// Modified: projects/clang380-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h ============================================================================== --- projects/clang380-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h Fri Jan 22 21:50:08 2016 (r294609) @@ -369,6 +369,18 @@ public: (UnsafeAlgebra << 3) | (NoNaNs << 4) | (NoInfs << 5) | (NoSignedZeros << 6) | (AllowReciprocal << 7); } + + /// Clear any flags in this flag set that aren't also set in Flags. + void intersectWith(const SDNodeFlags *Flags) { + NoUnsignedWrap &= Flags->NoUnsignedWrap; + NoSignedWrap &= Flags->NoSignedWrap; + Exact &= Flags->Exact; + UnsafeAlgebra &= Flags->UnsafeAlgebra; + NoNaNs &= Flags->NoNaNs; + NoInfs &= Flags->NoInfs; + NoSignedZeros &= Flags->NoSignedZeros; + AllowReciprocal &= Flags->AllowReciprocal; + } }; /// Represents one node in the SelectionDAG. @@ -682,6 +694,9 @@ public: /// and directly, but it is not to avoid creating a vtable for this class. const SDNodeFlags *getFlags() const; + /// Clear any flags in this node that aren't also set in Flags. + void intersectFlagsWith(const SDNodeFlags *Flags); + /// Return the number of values defined/returned by this operator. unsigned getNumValues() const { return NumValues; } Modified: projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/Local.h ============================================================================== --- projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/Local.h Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/Local.h Fri Jan 22 21:50:08 2016 (r294609) @@ -331,6 +331,25 @@ unsigned replaceDominatedUsesWith(Value /// during lowering by the GC infrastructure. bool callsGCLeafFunction(ImmutableCallSite CS); +//===----------------------------------------------------------------------===// +// Intrinsic pattern matching +// + +/// Try and match a bitreverse or bswap idiom. +/// +/// If an idiom is matched, an intrinsic call is inserted before \c I. Any added +/// instructions are returned in \c InsertedInsts. They will all have been added +/// to a basic block. +/// +/// A bitreverse idiom normally requires around 2*BW nodes to be searched (where +/// BW is the bitwidth of the integer type). A bswap idiom requires anywhere up +/// to BW / 4 nodes to be searched, so is significantly faster. +/// +/// This function returns true on a successful match or false otherwise. +bool recognizeBitReverseOrBSwapIdiom( + Instruction *I, bool MatchBSwaps, bool MatchBitReversals, + SmallVectorImpl &InsertedInsts); + } // End llvm namespace #endif Modified: projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h ============================================================================== --- projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/include/llvm/Transforms/Utils/SimplifyLibCalls.h Fri Jan 22 21:50:08 2016 (r294609) @@ -125,8 +125,6 @@ private: Value *optimizeStringMemoryLibCall(CallInst *CI, IRBuilder<> &B); // Math Library Optimizations - Value *optimizeUnaryDoubleFP(CallInst *CI, IRBuilder<> &B, bool CheckRetType); - Value *optimizeBinaryDoubleFP(CallInst *CI, IRBuilder<> &B); Value *optimizeCos(CallInst *CI, IRBuilder<> &B); Value *optimizePow(CallInst *CI, IRBuilder<> &B); Value *optimizeExp2(CallInst *CI, IRBuilder<> &B); Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/CodeGen/CodeGenPrepare.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -5211,6 +5211,24 @@ bool CodeGenPrepare::optimizeInst(Instru return false; } +/// Given an OR instruction, check to see if this is a bitreverse +/// idiom. If so, insert the new intrinsic and return true. +static bool makeBitReverse(Instruction &I, const DataLayout &DL, + const TargetLowering &TLI) { + if (!I.getType()->isIntegerTy() || + !TLI.isOperationLegalOrCustom(ISD::BITREVERSE, + TLI.getValueType(DL, I.getType(), true))) + return false; + + SmallVector Insts; + if (!recognizeBitReverseOrBSwapIdiom(&I, false, true, Insts)) + return false; + Instruction *LastInst = Insts.back(); + I.replaceAllUsesWith(LastInst); + RecursivelyDeleteTriviallyDeadInstructions(&I); + return true; +} + // In this pass we look for GEP and cast instructions that are used // across basic blocks and rewrite them to improve basic-block-at-a-time // selection. @@ -5224,8 +5242,19 @@ bool CodeGenPrepare::optimizeBlock(Basic if (ModifiedDT) return true; } - MadeChange |= dupRetToEnableTailCallOpts(&BB); + bool MadeBitReverse = true; + while (TLI && MadeBitReverse) { + MadeBitReverse = false; + for (auto &I : reverse(BB)) { + if (makeBitReverse(I, *DL, *TLI)) { + MadeBitReverse = MadeChange = true; + break; + } + } + } + MadeChange |= dupRetToEnableTailCallOpts(&BB); + return MadeChange; } Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/MachineFunction.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/CodeGen/MachineFunction.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/CodeGen/MachineFunction.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -163,7 +163,7 @@ getOrCreateJumpTableInfo(unsigned EntryK } /// Should we be emitting segmented stack stuff for the function -bool MachineFunction::shouldSplitStack() { +bool MachineFunction::shouldSplitStack() const { return getFunction()->hasFnAttribute("split-stack"); } Modified: projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -377,22 +377,6 @@ static void AddNodeIDOperands(FoldingSet } } -/// Add logical or fast math flag values to FoldingSetNodeID value. -static void AddNodeIDFlags(FoldingSetNodeID &ID, unsigned Opcode, - const SDNodeFlags *Flags) { - if (!isBinOpWithFlags(Opcode)) - return; - - unsigned RawFlags = 0; - if (Flags) - RawFlags = Flags->getRawFlags(); - ID.AddInteger(RawFlags); -} - -static void AddNodeIDFlags(FoldingSetNodeID &ID, const SDNode *N) { - AddNodeIDFlags(ID, N->getOpcode(), N->getFlags()); -} - static void AddNodeIDNode(FoldingSetNodeID &ID, unsigned short OpC, SDVTList VTList, ArrayRef OpList) { AddNodeIDOpcode(ID, OpC); @@ -528,8 +512,6 @@ static void AddNodeIDCustom(FoldingSetNo } } // end switch (N->getOpcode()) - AddNodeIDFlags(ID, N); - // Target specific memory nodes could also have address spaces to check. if (N->isTargetMemoryOpcode()) ID.AddInteger(cast(N)->getPointerInfo().getAddrSpace()); @@ -851,6 +833,9 @@ SDNode *SelectionDAG::FindModifiedNodeSl AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops); AddNodeIDCustom(ID, N); SDNode *Node = FindNodeOrInsertPos(ID, N->getDebugLoc(), InsertPos); + if (Node) + if (const SDNodeFlags *Flags = N->getFlags()) + Node->intersectFlagsWith(Flags); return Node; } @@ -869,6 +854,9 @@ SDNode *SelectionDAG::FindModifiedNodeSl AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops); AddNodeIDCustom(ID, N); SDNode *Node = FindNodeOrInsertPos(ID, N->getDebugLoc(), InsertPos); + if (Node) + if (const SDNodeFlags *Flags = N->getFlags()) + Node->intersectFlagsWith(Flags); return Node; } @@ -886,6 +874,9 @@ SDNode *SelectionDAG::FindModifiedNodeSl AddNodeIDNode(ID, N->getOpcode(), N->getVTList(), Ops); AddNodeIDCustom(ID, N); SDNode *Node = FindNodeOrInsertPos(ID, N->getDebugLoc(), InsertPos); + if (Node) + if (const SDNodeFlags *Flags = N->getFlags()) + Node->intersectFlagsWith(Flags); return Node; } @@ -3892,10 +3883,12 @@ SDValue SelectionDAG::getNode(unsigned O SDValue Ops[] = {N1, N2}; FoldingSetNodeID ID; AddNodeIDNode(ID, Opcode, VTs, Ops); - AddNodeIDFlags(ID, Opcode, Flags); void *IP = nullptr; - if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP)) + if (SDNode *E = FindNodeOrInsertPos(ID, DL.getDebugLoc(), IP)) { + if (Flags) + E->intersectFlagsWith(Flags); return SDValue(E, 0); + } N = GetBinarySDNode(Opcode, DL, VTs, N1, N2, Flags); @@ -6249,10 +6242,12 @@ SDNode *SelectionDAG::getNodeIfExists(un if (VTList.VTs[VTList.NumVTs - 1] != MVT::Glue) { FoldingSetNodeID ID; AddNodeIDNode(ID, Opcode, VTList, Ops); - AddNodeIDFlags(ID, Opcode, Flags); void *IP = nullptr; - if (SDNode *E = FindNodeOrInsertPos(ID, DebugLoc(), IP)) + if (SDNode *E = FindNodeOrInsertPos(ID, DebugLoc(), IP)) { + if (Flags) + E->intersectFlagsWith(Flags); return E; + } } return nullptr; } @@ -6948,6 +6943,11 @@ const SDNodeFlags *SDNode::getFlags() co return nullptr; } +void SDNode::intersectFlagsWith(const SDNodeFlags *Flags) { + if (auto *FlagsNode = dyn_cast(this)) + FlagsNode->Flags.intersectWith(Flags); +} + SDValue SelectionDAG::UnrollVectorOp(SDNode *N, unsigned ResNE) { assert(N->getNumValues() == 1 && "Can't unroll a vector with multiple results!"); Modified: projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -10133,6 +10133,7 @@ void AArch64TargetLowering::insertCopies const TargetInstrInfo *TII = Subtarget->getInstrInfo(); MachineRegisterInfo *MRI = &Entry->getParent()->getRegInfo(); + MachineBasicBlock::iterator MBBI = Entry->begin(); for (const MCPhysReg *I = IStart; *I; ++I) { const TargetRegisterClass *RC = nullptr; if (AArch64::GPR64RegClass.contains(*I)) @@ -10152,13 +10153,13 @@ void AArch64TargetLowering::insertCopies Attribute::NoUnwind) && "Function should be nounwind in insertCopiesSplitCSR!"); Entry->addLiveIn(*I); - BuildMI(*Entry, Entry->begin(), DebugLoc(), TII->get(TargetOpcode::COPY), - NewVR) + BuildMI(*Entry, MBBI, DebugLoc(), TII->get(TargetOpcode::COPY), NewVR) .addReg(*I); + // Insert the copy-back instructions right before the terminator. for (auto *Exit : Exits) - BuildMI(*Exit, Exit->begin(), DebugLoc(), TII->get(TargetOpcode::COPY), - *I) + BuildMI(*Exit, Exit->getFirstTerminator(), DebugLoc(), + TII->get(TargetOpcode::COPY), *I) .addReg(NewVR); } } Modified: projects/clang380-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -112,9 +112,21 @@ public: MCELFStreamer::EmitInstruction(Inst, STI); } + /// Emit a 32-bit value as an instruction. This is only used for the .inst + /// directive, EmitInstruction should be used in other cases. void emitInst(uint32_t Inst) { + char Buffer[4]; + + // We can't just use EmitIntValue here, as that will emit a data mapping + // symbol, and swap the endianness on big-endian systems (instructions are + // always little-endian). + for (unsigned I = 0; I < 4; ++I) { + Buffer[I] = uint8_t(Inst); + Inst >>= 8; + } + EmitA64MappingSymbol(); - MCELFStreamer::EmitIntValue(Inst, 4); + MCELFStreamer::EmitBytes(StringRef(Buffer, 4)); } /// This is one of the functions used to emit data into an ELF section, so the Modified: projects/clang380-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -12423,6 +12423,7 @@ void ARMTargetLowering::insertCopiesSpli const TargetInstrInfo *TII = Subtarget->getInstrInfo(); MachineRegisterInfo *MRI = &Entry->getParent()->getRegInfo(); + MachineBasicBlock::iterator MBBI = Entry->begin(); for (const MCPhysReg *I = IStart; *I; ++I) { const TargetRegisterClass *RC = nullptr; if (ARM::GPRRegClass.contains(*I)) @@ -12442,13 +12443,13 @@ void ARMTargetLowering::insertCopiesSpli Attribute::NoUnwind) && "Function should be nounwind in insertCopiesSplitCSR!"); Entry->addLiveIn(*I); - BuildMI(*Entry, Entry->begin(), DebugLoc(), TII->get(TargetOpcode::COPY), - NewVR) + BuildMI(*Entry, MBBI, DebugLoc(), TII->get(TargetOpcode::COPY), NewVR) .addReg(*I); + // Insert the copy-back instructions right before the terminator. for (auto *Exit : Exits) - BuildMI(*Exit, Exit->begin(), DebugLoc(), TII->get(TargetOpcode::COPY), - *I) + BuildMI(*Exit, Exit->getFirstTerminator(), DebugLoc(), + TII->get(TargetOpcode::COPY), *I) .addReg(NewVR); } } Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86CallingConv.td ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Target/X86/X86CallingConv.td Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86CallingConv.td Fri Jan 22 21:50:08 2016 (r294609) @@ -832,10 +832,10 @@ def CSR_64_TLS_Darwin : CalleeSavedRegs< R8, R9, R10, R11)>; // CSRs that are handled by prologue, epilogue. -def CSR_64_CXX_TLS_Darwin_PE : CalleeSavedRegs<(add)>; +def CSR_64_CXX_TLS_Darwin_PE : CalleeSavedRegs<(add RBP)>; // CSRs that are handled explicitly via copies. -def CSR_64_CXX_TLS_Darwin_ViaCopy : CalleeSavedRegs<(add CSR_64_TLS_Darwin)>; +def CSR_64_CXX_TLS_Darwin_ViaCopy : CalleeSavedRegs<(sub CSR_64_TLS_Darwin, RBP)>; // All GPRs - except r11 def CSR_64_RT_MostRegs : CalleeSavedRegs<(add CSR_64, RAX, RCX, RDX, RSI, RDI, Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86FrameLowering.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -2031,6 +2031,10 @@ void X86FrameLowering::adjustForSegmente unsigned TlsReg, TlsOffset; DebugLoc DL; + // To support shrink-wrapping we would need to insert the new blocks + // at the right place and update the branches to PrologueMBB. + assert(&(*MF.begin()) == &PrologueMBB && "Shrink-wrapping not supported yet"); + unsigned ScratchReg = GetScratchRegister(Is64Bit, IsLP64, MF, true); assert(!MF.getRegInfo().isLiveIn(ScratchReg) && "Scratch register is live-in"); @@ -2271,6 +2275,11 @@ void X86FrameLowering::adjustForHiPEProl MachineFunction &MF, MachineBasicBlock &PrologueMBB) const { MachineFrameInfo *MFI = MF.getFrameInfo(); DebugLoc DL; + + // To support shrink-wrapping we would need to insert the new blocks + // at the right place and update the branches to PrologueMBB. + assert(&(*MF.begin()) == &PrologueMBB && "Shrink-wrapping not supported yet"); + // HiPE-specific values const unsigned HipeLeafWords = 24; const unsigned CCRegisteredArgs = Is64Bit ? 6 : 5; @@ -2584,7 +2593,14 @@ bool X86FrameLowering::canUseAsEpilogue( bool X86FrameLowering::enableShrinkWrapping(const MachineFunction &MF) const { // If we may need to emit frameless compact unwind information, give // up as this is currently broken: PR25614. - return MF.getFunction()->hasFnAttribute(Attribute::NoUnwind) || hasFP(MF); + return (MF.getFunction()->hasFnAttribute(Attribute::NoUnwind) || hasFP(MF)) && + // The lowering of segmented stack and HiPE only support entry blocks + // as prologue blocks: PR26107. + // This limitation may be lifted if we fix: + // - adjustForSegmentedStacks + // - adjustForHiPEPrologue + MF.getFunction()->getCallingConv() != CallingConv::HiPE && + !MF.shouldSplitStack(); } MachineBasicBlock::iterator X86FrameLowering::restoreWin32EHStackPointers( Modified: projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -28908,6 +28908,7 @@ void X86TargetLowering::insertCopiesSpli const TargetInstrInfo *TII = Subtarget->getInstrInfo(); MachineRegisterInfo *MRI = &Entry->getParent()->getRegInfo(); + MachineBasicBlock::iterator MBBI = Entry->begin(); for (const MCPhysReg *I = IStart; *I; ++I) { const TargetRegisterClass *RC = nullptr; if (X86::GR64RegClass.contains(*I)) @@ -28925,13 +28926,13 @@ void X86TargetLowering::insertCopiesSpli Attribute::NoUnwind) && "Function should be nounwind in insertCopiesSplitCSR!"); Entry->addLiveIn(*I); - BuildMI(*Entry, Entry->begin(), DebugLoc(), TII->get(TargetOpcode::COPY), - NewVR) + BuildMI(*Entry, MBBI, DebugLoc(), TII->get(TargetOpcode::COPY), NewVR) .addReg(*I); + // Insert the copy-back instructions right before the terminator. for (auto *Exit : Exits) - BuildMI(*Exit, Exit->begin(), DebugLoc(), TII->get(TargetOpcode::COPY), - *I) + BuildMI(*Exit, Exit->getFirstTerminator(), DebugLoc(), + TII->get(TargetOpcode::COPY), *I) .addReg(NewVR); } } Modified: projects/clang380-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -17,6 +17,7 @@ #include "llvm/IR/Intrinsics.h" #include "llvm/IR/PatternMatch.h" #include "llvm/Transforms/Utils/CmpInstAnalysis.h" +#include "llvm/Transforms/Utils/Local.h" using namespace llvm; using namespace PatternMatch; @@ -1565,190 +1566,18 @@ Instruction *InstCombiner::visitAnd(Bina return Changed ? &I : nullptr; } - -/// Analyze the specified subexpression and see if it is capable of providing -/// pieces of a bswap or bitreverse. The subexpression provides a potential -/// piece of a bswap or bitreverse if it can be proven that each non-zero bit in -/// the output of the expression came from a corresponding bit in some other -/// value. This function is recursive, and the end result is a mapping of -/// (value, bitnumber) to bitnumber. It is the caller's responsibility to -/// validate that all `value`s are identical and that the bitnumber to bitnumber -/// mapping is correct for a bswap or bitreverse. -/// -/// For example, if the current subexpression if "(shl i32 %X, 24)" then we know -/// that the expression deposits the low byte of %X into the high byte of the -/// result and that all other bits are zero. This expression is accepted, -/// BitValues[24-31] are set to %X and BitProvenance[24-31] are set to [0-7]. -/// -/// This function returns true if the match was unsuccessful and false if so. -/// On entry to the function the "OverallLeftShift" is a signed integer value -/// indicating the number of bits that the subexpression is later shifted. For -/// example, if the expression is later right shifted by 16 bits, the -/// OverallLeftShift value would be -16 on entry. This is used to specify which -/// bits of BitValues are actually being set. -/// -/// Similarly, BitMask is a bitmask where a bit is clear if its corresponding -/// bit is masked to zero by a user. For example, in (X & 255), X will be -/// processed with a bytemask of 255. BitMask is always in the local -/// (OverallLeftShift) coordinate space. -/// -static bool CollectBitParts(Value *V, int OverallLeftShift, APInt BitMask, - SmallVectorImpl &BitValues, - SmallVectorImpl &BitProvenance) { - if (Instruction *I = dyn_cast(V)) { - // If this is an or instruction, it may be an inner node of the bswap. - if (I->getOpcode() == Instruction::Or) - return CollectBitParts(I->getOperand(0), OverallLeftShift, BitMask, - BitValues, BitProvenance) || - CollectBitParts(I->getOperand(1), OverallLeftShift, BitMask, - BitValues, BitProvenance); - - // If this is a logical shift by a constant, recurse with OverallLeftShift - // and BitMask adjusted. - if (I->isLogicalShift() && isa(I->getOperand(1))) { - unsigned ShAmt = - cast(I->getOperand(1))->getLimitedValue(~0U); - // Ensure the shift amount is defined. - if (ShAmt > BitValues.size()) - return true; - - unsigned BitShift = ShAmt; - if (I->getOpcode() == Instruction::Shl) { - // X << C -> collect(X, +C) - OverallLeftShift += BitShift; - BitMask = BitMask.lshr(BitShift); - } else { - // X >>u C -> collect(X, -C) - OverallLeftShift -= BitShift; - BitMask = BitMask.shl(BitShift); - } - - if (OverallLeftShift >= (int)BitValues.size()) - return true; - if (OverallLeftShift <= -(int)BitValues.size()) - return true; - - return CollectBitParts(I->getOperand(0), OverallLeftShift, BitMask, - BitValues, BitProvenance); - } - - // If this is a logical 'and' with a mask that clears bits, clear the - // corresponding bits in BitMask. - if (I->getOpcode() == Instruction::And && - isa(I->getOperand(1))) { - unsigned NumBits = BitValues.size(); - APInt Bit(I->getType()->getPrimitiveSizeInBits(), 1); - const APInt &AndMask = cast(I->getOperand(1))->getValue(); - - for (unsigned i = 0; i != NumBits; ++i, Bit <<= 1) { - // If this bit is masked out by a later operation, we don't care what - // the and mask is. - if (BitMask[i] == 0) - continue; - - // If the AndMask is zero for this bit, clear the bit. - APInt MaskB = AndMask & Bit; - if (MaskB == 0) { - BitMask.clearBit(i); - continue; - } - - // Otherwise, this bit is kept. - } - - return CollectBitParts(I->getOperand(0), OverallLeftShift, BitMask, - BitValues, BitProvenance); - } - } - - // Okay, we got to something that isn't a shift, 'or' or 'and'. This must be - // the input value to the bswap/bitreverse. To be part of a bswap or - // bitreverse we must be demanding a contiguous range of bits from it. - unsigned InputBitLen = BitMask.countPopulation(); - unsigned InputBitNo = BitMask.countTrailingZeros(); - if (BitMask.getBitWidth() - BitMask.countLeadingZeros() - InputBitNo != - InputBitLen) - // Not a contiguous set range of bits! - return true; - - // We know we're moving a contiguous range of bits from the input to the - // output. Record which bits in the output came from which bits in the input. - unsigned DestBitNo = InputBitNo + OverallLeftShift; - for (unsigned I = 0; I < InputBitLen; ++I) - BitProvenance[DestBitNo + I] = InputBitNo + I; - - // If the destination bit value is already defined, the values are or'd - // together, which isn't a bswap/bitreverse (unless it's an or of the same - // bits). - if (BitValues[DestBitNo] && BitValues[DestBitNo] != V) - return true; - for (unsigned I = 0; I < InputBitLen; ++I) - BitValues[DestBitNo + I] = V; - - return false; -} - -static bool bitTransformIsCorrectForBSwap(unsigned From, unsigned To, - unsigned BitWidth) { - if (From % 8 != To % 8) - return false; - // Convert from bit indices to byte indices and check for a byte reversal. - From >>= 3; - To >>= 3; - BitWidth >>= 3; - return From == BitWidth - To - 1; -} - -static bool bitTransformIsCorrectForBitReverse(unsigned From, unsigned To, - unsigned BitWidth) { - return From == BitWidth - To - 1; -} - /// Given an OR instruction, check to see if this is a bswap or bitreverse /// idiom. If so, insert the new intrinsic and return it. Instruction *InstCombiner::MatchBSwapOrBitReverse(BinaryOperator &I) { - IntegerType *ITy = dyn_cast(I.getType()); - if (!ITy) - return nullptr; // Can't do vectors. - unsigned BW = ITy->getBitWidth(); - - /// We keep track of which bit (BitProvenance) inside which value (BitValues) - /// defines each bit in the result. - SmallVector BitValues(BW, nullptr); - SmallVector BitProvenance(BW, -1); - - // Try to find all the pieces corresponding to the bswap. - APInt BitMask = APInt::getAllOnesValue(BitValues.size()); - if (CollectBitParts(&I, 0, BitMask, BitValues, BitProvenance)) - return nullptr; - - // Check to see if all of the bits come from the same value. - Value *V = BitValues[0]; - if (!V) return nullptr; // Didn't find a bit? Must be zero. - - if (!std::all_of(BitValues.begin(), BitValues.end(), - [&](const Value *X) { return X == V; })) - return nullptr; - - // Now, is the bit permutation correct for a bswap or a bitreverse? We can - // only byteswap values with an even number of bytes. - bool OKForBSwap = BW % 16 == 0, OKForBitReverse = true;; - for (unsigned i = 0, e = BitValues.size(); i != e; ++i) { - OKForBSwap &= bitTransformIsCorrectForBSwap(BitProvenance[i], i, BW); - OKForBitReverse &= - bitTransformIsCorrectForBitReverse(BitProvenance[i], i, BW); - } - - Intrinsic::ID Intrin; - if (OKForBSwap) - Intrin = Intrinsic::bswap; - else if (OKForBitReverse) - Intrin = Intrinsic::bitreverse; - else + SmallVector Insts; + if (!recognizeBitReverseOrBSwapIdiom(&I, true, false, Insts)) return nullptr; + Instruction *LastInst = Insts.pop_back_val(); + LastInst->removeFromParent(); - Function *F = Intrinsic::getDeclaration(I.getModule(), Intrin, ITy); - return CallInst::Create(F, V); + for (auto *Inst : Insts) + Worklist.Add(Inst); + return LastInst; } /// We have an expression of the form (A&C)|(B&D). Check if A is (cond?-1:0) Modified: projects/clang380-import/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp ============================================================================== --- projects/clang380-import/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp Fri Jan 22 21:33:27 2016 (r294608) +++ projects/clang380-import/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp Fri Jan 22 21:50:08 2016 (r294609) @@ -179,13 +179,244 @@ void LandingPadInliningInfo::forwardResu RI->eraseFromParent(); } +/// Helper for getUnwindDestToken/getUnwindDestTokenHelper. +static Value *getParentPad(Value *EHPad) { + if (auto *FPI = dyn_cast(EHPad)) + return FPI->getParentPad(); + return cast(EHPad)->getParentPad(); +} + +typedef DenseMap UnwindDestMemoTy; + +/// Helper for getUnwindDestToken that does the descendant-ward part of +/// the search. +static Value *getUnwindDestTokenHelper(Instruction *EHPad, + UnwindDestMemoTy &MemoMap) { + SmallVector Worklist(1, EHPad); + + while (!Worklist.empty()) { + Instruction *CurrentPad = Worklist.pop_back_val(); + // We only put pads on the worklist that aren't in the MemoMap. When + // we find an unwind dest for a pad we may update its ancestors, but + // the queue only ever contains uncles/great-uncles/etc. of CurrentPad, + // so they should never get updated while queued on the worklist. + assert(!MemoMap.count(CurrentPad)); + Value *UnwindDestToken = nullptr; + if (auto *CatchSwitch = dyn_cast(CurrentPad)) { + if (CatchSwitch->hasUnwindDest()) { + UnwindDestToken = CatchSwitch->getUnwindDest()->getFirstNonPHI(); + } else { + // Catchswitch doesn't have a 'nounwind' variant, and one might be + // annotated as "unwinds to caller" when really it's nounwind (see + // e.g. SimplifyCFGOpt::SimplifyUnreachable), so we can't infer the + // parent's unwind dest from this. We can check its catchpads' + // descendants, since they might include a cleanuppad with an + // "unwinds to caller" cleanupret, which can be trusted. + for (auto HI = CatchSwitch->handler_begin(), + HE = CatchSwitch->handler_end(); + HI != HE && !UnwindDestToken; ++HI) { + BasicBlock *HandlerBlock = *HI; + auto *CatchPad = cast(HandlerBlock->getFirstNonPHI()); + for (User *Child : CatchPad->users()) { + // Intentionally ignore invokes here -- since the catchswitch is + // marked "unwind to caller", it would be a verifier error if it + // contained an invoke which unwinds out of it, so any invoke we'd + // encounter must unwind to some child of the catch. + if (!isa(Child) && !isa(Child)) + continue; + + Instruction *ChildPad = cast(Child); + auto Memo = MemoMap.find(ChildPad); + if (Memo == MemoMap.end()) { + // Haven't figure out this child pad yet; queue it. + Worklist.push_back(ChildPad); + continue; + } + // We've already checked this child, but might have found that + // it offers no proof either way. + Value *ChildUnwindDestToken = Memo->second; + if (!ChildUnwindDestToken) + continue; + // We already know the child's unwind dest, which can either + // be ConstantTokenNone to indicate unwind to caller, or can + // be another child of the catchpad. Only the former indicates + // the unwind dest of the catchswitch. + if (isa(ChildUnwindDestToken)) { + UnwindDestToken = ChildUnwindDestToken; + break; + } + assert(getParentPad(ChildUnwindDestToken) == CatchPad); + } + } + } + } else { + auto *CleanupPad = cast(CurrentPad); + for (User *U : CleanupPad->users()) { + if (auto *CleanupRet = dyn_cast(U)) { + if (BasicBlock *RetUnwindDest = CleanupRet->getUnwindDest()) + UnwindDestToken = RetUnwindDest->getFirstNonPHI(); + else + UnwindDestToken = ConstantTokenNone::get(CleanupPad->getContext()); + break; + } + Value *ChildUnwindDestToken; + if (auto *Invoke = dyn_cast(U)) { + ChildUnwindDestToken = Invoke->getUnwindDest()->getFirstNonPHI(); + } else if (isa(U) || isa(U)) { + Instruction *ChildPad = cast(U); + auto Memo = MemoMap.find(ChildPad); + if (Memo == MemoMap.end()) { + // Haven't resolved this child yet; queue it and keep searching. + Worklist.push_back(ChildPad); + continue; + } + // We've checked this child, but still need to ignore it if it + // had no proof either way. + ChildUnwindDestToken = Memo->second; + if (!ChildUnwindDestToken) + continue; + } else { + // Not a relevant user of the cleanuppad + continue; + } + // In a well-formed program, the child/invoke must either unwind to + // an(other) child of the cleanup, or exit the cleanup. In the + // first case, continue searching. + if (isa(ChildUnwindDestToken) && + getParentPad(ChildUnwindDestToken) == CleanupPad) + continue; + UnwindDestToken = ChildUnwindDestToken; + break; + } + } + // If we haven't found an unwind dest for CurrentPad, we may have queued its + // children, so move on to the next in the worklist. + if (!UnwindDestToken) + continue; + + // Now we know that CurrentPad unwinds to UnwindDestToken. It also exits + // any ancestors of CurrentPad up to but not including UnwindDestToken's + // parent pad. Record this in the memo map, and check to see if the + // original EHPad being queried is one of the ones exited. + Value *UnwindParent; + if (auto *UnwindPad = dyn_cast(UnwindDestToken)) + UnwindParent = getParentPad(UnwindPad); + else + UnwindParent = nullptr; + bool ExitedOriginalPad = false; + for (Instruction *ExitedPad = CurrentPad; + ExitedPad && ExitedPad != UnwindParent; + ExitedPad = dyn_cast(getParentPad(ExitedPad))) { + // Skip over catchpads since they just follow their catchswitches. + if (isa(ExitedPad)) + continue; + MemoMap[ExitedPad] = UnwindDestToken; + ExitedOriginalPad |= (ExitedPad == EHPad); + } + + if (ExitedOriginalPad) + return UnwindDestToken; + + // Continue the search. + } + + // No definitive information is contained within this funclet. + return nullptr; +} + +/// Given an EH pad, find where it unwinds. If it unwinds to an EH pad, +/// return that pad instruction. If it unwinds to caller, return +/// ConstantTokenNone. If it does not have a definitive unwind destination, +/// return nullptr. +/// +/// This routine gets invoked for calls in funclets in inlinees when inlining +/// an invoke. Since many funclets don't have calls inside them, it's queried +/// on-demand rather than building a map of pads to unwind dests up front. +/// Determining a funclet's unwind dest may require recursively searching its +/// descendants, and also ancestors and cousins if the descendants don't provide +/// an answer. Since most funclets will have their unwind dest immediately +/// available as the unwind dest of a catchswitch or cleanupret, this routine +/// searches top-down from the given pad and then up. To avoid worst-case +/// quadratic run-time given that approach, it uses a memo map to avoid +/// re-processing funclet trees. The callers that rewrite the IR as they go +/// take advantage of this, for correctness, by checking/forcing rewritten +/// pads' entries to match the original callee view. +static Value *getUnwindDestToken(Instruction *EHPad, + UnwindDestMemoTy &MemoMap) { + // Catchpads unwind to the same place as their catchswitch; + // redirct any queries on catchpads so the code below can + // deal with just catchswitches and cleanuppads. + if (auto *CPI = dyn_cast(EHPad)) + EHPad = CPI->getCatchSwitch(); + + // Check if we've already determined the unwind dest for this pad. + auto Memo = MemoMap.find(EHPad); + if (Memo != MemoMap.end()) + return Memo->second; + + // Search EHPad and, if necessary, its descendants. + Value *UnwindDestToken = getUnwindDestTokenHelper(EHPad, MemoMap); + assert((UnwindDestToken == nullptr) != (MemoMap.count(EHPad) != 0)); + if (UnwindDestToken) + return UnwindDestToken; + + // No information is available for this EHPad from itself or any of its + // descendants. An unwind all the way out to a pad in the caller would + // need also to agree with the unwind dest of the parent funclet, so + // search up the chain to try to find a funclet with information. Put + // null entries in the memo map to avoid re-processing as we go up. + MemoMap[EHPad] = nullptr; + Instruction *LastUselessPad = EHPad; + Value *AncestorToken; + for (AncestorToken = getParentPad(EHPad); + auto *AncestorPad = dyn_cast(AncestorToken); + AncestorToken = getParentPad(AncestorToken)) { + // Skip over catchpads since they just follow their catchswitches. + if (isa(AncestorPad)) + continue; + assert(!MemoMap.count(AncestorPad) || MemoMap[AncestorPad]); + auto AncestorMemo = MemoMap.find(AncestorPad); + if (AncestorMemo == MemoMap.end()) { + UnwindDestToken = getUnwindDestTokenHelper(AncestorPad, MemoMap); + } else { + UnwindDestToken = AncestorMemo->second; + } + if (UnwindDestToken) + break; + LastUselessPad = AncestorPad; + } + + // Since the whole tree under LastUselessPad has no information, it all must + // match UnwindDestToken; record that to avoid repeating the search. + SmallVector Worklist(1, LastUselessPad); + while (!Worklist.empty()) { + Instruction *UselessPad = Worklist.pop_back_val(); + assert(!MemoMap.count(UselessPad) || MemoMap[UselessPad] == nullptr); + MemoMap[UselessPad] = UnwindDestToken; + if (auto *CatchSwitch = dyn_cast(UselessPad)) { + for (BasicBlock *HandlerBlock : CatchSwitch->handlers()) + for (User *U : HandlerBlock->getFirstNonPHI()->users()) + if (isa(U) || isa(U)) + Worklist.push_back(cast(U)); + } else { + assert(isa(UselessPad)); + for (User *U : UselessPad->users()) + if (isa(U) || isa(U)) + Worklist.push_back(cast(U)); + } + } + + return UnwindDestToken; +} + /// When we inline a basic block into an invoke, /// we have to turn all of the calls that can throw into invokes. /// This function analyze BB to see if there are any calls, and if so, /// it rewrites them to be invokes that jump to InvokeDest and fills in the PHI /// nodes in that block with the values specified in InvokeDestPHIValues. -static BasicBlock * -HandleCallsInBlockInlinedThroughInvoke(BasicBlock *BB, BasicBlock *UnwindEdge) { +static BasicBlock *HandleCallsInBlockInlinedThroughInvoke( + BasicBlock *BB, BasicBlock *UnwindEdge, + UnwindDestMemoTy *FuncletUnwindMap = nullptr) { for (BasicBlock::iterator BBI = BB->begin(), E = BB->end(); BBI != E; ) { Instruction *I = &*BBI++; @@ -196,6 +427,31 @@ HandleCallsInBlockInlinedThroughInvoke(B if (!CI || CI->doesNotThrow() || isa(CI->getCalledValue())) continue; + if (auto FuncletBundle = CI->getOperandBundle(LLVMContext::OB_funclet)) { + // This call is nested inside a funclet. If that funclet has an unwind + // destination within the inlinee, then unwinding out of this call would + // be UB. Rewriting this call to an invoke which targets the inlined + // invoke's unwind dest would give the call's parent funclet multiple + // unwind destinations, which is something that subsequent EH table + // generation can't handle and that the veirifer rejects. So when we + // see such a call, leave it as a call. + auto *FuncletPad = cast(FuncletBundle->Inputs[0]); + Value *UnwindDestToken = + getUnwindDestToken(FuncletPad, *FuncletUnwindMap); + if (UnwindDestToken && !isa(UnwindDestToken)) + continue; +#ifndef NDEBUG + Instruction *MemoKey; + if (auto *CatchPad = dyn_cast(FuncletPad)) + MemoKey = CatchPad->getCatchSwitch(); + else + MemoKey = FuncletPad; + assert(FuncletUnwindMap->count(MemoKey) && + (*FuncletUnwindMap)[MemoKey] == UnwindDestToken && + "must get memoized to avoid confusing later searches"); +#endif // NDEBUG + } + // Convert this function call into an invoke instruction. First, split the // basic block. BasicBlock *Split = @@ -328,13 +584,23 @@ static void HandleInlinedEHPad(InvokeIns // This connects all the instructions which 'unwind to caller' to the invoke // destination. + UnwindDestMemoTy FuncletUnwindMap; for (Function::iterator BB = FirstNewBlock->getIterator(), E = Caller->end(); BB != E; ++BB) { if (auto *CRI = dyn_cast(BB->getTerminator())) { if (CRI->unwindsToCaller()) { - CleanupReturnInst::Create(CRI->getCleanupPad(), UnwindDest, CRI); + auto *CleanupPad = CRI->getCleanupPad(); + CleanupReturnInst::Create(CleanupPad, UnwindDest, CRI); CRI->eraseFromParent(); UpdatePHINodes(&*BB); + // Finding a cleanupret with an unwind destination would confuse + // subsequent calls to getUnwindDestToken, so map the cleanuppad + // to short-circuit any such calls and recognize this as an "unwind + // to caller" cleanup. + assert(!FuncletUnwindMap.count(CleanupPad) || + isa(FuncletUnwindMap[CleanupPad])); + FuncletUnwindMap[CleanupPad] = + ConstantTokenNone::get(Caller->getContext()); } } @@ -345,12 +611,41 @@ static void HandleInlinedEHPad(InvokeIns Instruction *Replacement = nullptr; if (auto *CatchSwitch = dyn_cast(I)) { if (CatchSwitch->unwindsToCaller()) { + Value *UnwindDestToken; + if (auto *ParentPad = + dyn_cast(CatchSwitch->getParentPad())) { + // This catchswitch is nested inside another funclet. If that + // funclet has an unwind destination within the inlinee, then + // unwinding out of this catchswitch would be UB. Rewriting this + // catchswitch to unwind to the inlined invoke's unwind dest would + // give the parent funclet multiple unwind destinations, which is + // something that subsequent EH table generation can't handle and + // that the veirifer rejects. So when we see such a call, leave it + // as "unwind to caller". + UnwindDestToken = getUnwindDestToken(ParentPad, FuncletUnwindMap); + if (UnwindDestToken && !isa(UnwindDestToken)) + continue; + } else { + // This catchswitch has no parent to inherit constraints from, and + // none of its descendants can have an unwind edge that exits it and + // targets another funclet in the inlinee. It may or may not have a + // descendant that definitively has an unwind to caller. In either + // case, we'll have to assume that any unwinds out of it may need to + // be routed to the caller, so treat it as though it has a definitive + // unwind to caller. + UnwindDestToken = ConstantTokenNone::get(Caller->getContext()); + } auto *NewCatchSwitch = CatchSwitchInst::Create( CatchSwitch->getParentPad(), UnwindDest, CatchSwitch->getNumHandlers(), CatchSwitch->getName(), CatchSwitch); for (BasicBlock *PadBB : CatchSwitch->handlers()) NewCatchSwitch->addHandler(PadBB); + // Propagate info for the old catchswitch over to the new one in + // the unwind map. This also serves to short-circuit any subsequent + // checks for the unwind dest of this catchswitch, which would get + // confused if they found the outer handler in the callee. + FuncletUnwindMap[NewCatchSwitch] = UnwindDestToken; Replacement = NewCatchSwitch; } } else if (!isa(I)) { @@ -369,8 +664,8 @@ static void HandleInlinedEHPad(InvokeIns for (Function::iterator BB = FirstNewBlock->getIterator(), E = Caller->end(); BB != E; ++BB) - if (BasicBlock *NewBB = - HandleCallsInBlockInlinedThroughInvoke(&*BB, UnwindDest)) + if (BasicBlock *NewBB = HandleCallsInBlockInlinedThroughInvoke( + &*BB, UnwindDest, &FuncletUnwindMap)) // Update any PHI nodes in the exceptional block to indicate that there // is now a new entry in them. UpdatePHINodes(NewBB); @@ -1415,6 +1710,20 @@ bool llvm::InlineFunction(CallSite CS, I } } + // If we are inlining for an invoke instruction, we must make sure to rewrite + // any call instructions into invoke instructions. This is sensitive to which + // funclet pads were top-level in the inlinee, so must be done before + // rewriting the "parent pad" links. + if (auto *II = dyn_cast(TheCall)) { + BasicBlock *UnwindDest = II->getUnwindDest(); + Instruction *FirstNonPHI = UnwindDest->getFirstNonPHI(); + if (isa(FirstNonPHI)) { + HandleInlinedLandingPad(II, &*FirstNewBlock, InlinedFunctionInfo); + } else { + HandleInlinedEHPad(II, &*FirstNewBlock, InlinedFunctionInfo); + } + } + // Update the lexical scopes of the new funclets and callsites. // Anything that had 'none' as its parent is now nested inside the callsite's // EHPad. @@ -1472,18 +1781,6 @@ bool llvm::InlineFunction(CallSite CS, I *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Jan 23 11:05:15 2016 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 28112A8E635 for ; Sat, 23 Jan 2016 11:05:15 +0000 (UTC) (envelope-from bz@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 037EF19B5; Sat, 23 Jan 2016 11:05:14 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NB5Ecb072564; Sat, 23 Jan 2016 11:05:14 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NB5DAW072559; Sat, 23 Jan 2016 11:05:13 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601231105.u0NB5DAW072559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 23 Jan 2016 11:05:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294622 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 23 Jan 2016 11:05:15 -0000 Author: bz Date: Sat Jan 23 11:05:13 2016 New Revision: 294622 URL: https://svnweb.freebsd.org/changeset/base/294622 Log: Try to catch a couple of SCTP teardown race conditions. Saw all the printfs already. Note: not sure the atomics are needed but without them, the condition would never trigger, and we'd still see panics (which could have been due to the insert race). Will work my way backwards in case this stays stable. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/sctp_asconf.c projects/vnet/sys/netinet/sctp_bsd_addr.c projects/vnet/sys/netinet/sctp_pcb.c projects/vnet/sys/netinet/sctp_structs.h projects/vnet/sys/netinet/sctputil.c Modified: projects/vnet/sys/netinet/sctp_asconf.c ============================================================================== --- projects/vnet/sys/netinet/sctp_asconf.c Sat Jan 23 08:08:06 2016 (r294621) +++ projects/vnet/sys/netinet/sctp_asconf.c Sat Jan 23 11:05:13 2016 (r294622) @@ -3248,6 +3248,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb * } else { struct sctp_asconf_iterator *asc; struct sctp_laddr *wi; + int ret; SCTP_MALLOC(asc, struct sctp_asconf_iterator *, sizeof(struct sctp_asconf_iterator), @@ -3269,7 +3270,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb * wi->action = type; atomic_add_int(&ifa->refcount, 1); LIST_INSERT_HEAD(&asc->list_of_work, wi, sctp_nxt_addr); - (void)sctp_initiate_iterator(sctp_asconf_iterator_ep, + ret = sctp_initiate_iterator(sctp_asconf_iterator_ep, sctp_asconf_iterator_stcb, sctp_asconf_iterator_ep_end, SCTP_PCB_ANY_FLAGS, @@ -3277,6 +3278,15 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb * SCTP_ASOC_ANY_STATE, (void *)asc, 0, sctp_asconf_iterator_end, inp, 0); + if (ret) { + SCTP_PRINTF("Failed to initiate iterator for addr_mgmt_ep_sa\n"); + SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_ASCONF, EFAULT); + atomic_add_int(&ifa->refcount, -1); + SCTP_DECR_LADDR_COUNT(); + SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_laddr), wi); + SCTP_FREE(asc, SCTP_M_ASC_IT); + return (EFAULT); + } } return (0); } else { Modified: projects/vnet/sys/netinet/sctp_bsd_addr.c ============================================================================== --- projects/vnet/sys/netinet/sctp_bsd_addr.c Sat Jan 23 08:08:06 2016 (r294621) +++ projects/vnet/sys/netinet/sctp_bsd_addr.c Sat Jan 23 11:05:13 2016 (r294622) @@ -77,7 +77,7 @@ struct iterator_control sctp_it_ctl; void sctp_wakeup_iterator(void) { - wakeup(&sctp_it_ctl.iterator_running); + wakeup(&sctp_it_ctl.iterator_flags); } static void @@ -86,7 +86,7 @@ sctp_iterator_thread(void *v SCTP_UNUSED SCTP_IPI_ITERATOR_WQ_LOCK(); /* In FreeBSD this thread never terminates. */ for (;;) { - msleep(&sctp_it_ctl.iterator_running, + msleep(&sctp_it_ctl.iterator_flags, &sctp_it_ctl.ipi_iterator_wq_mtx, 0, "waiting_for_work", 0); sctp_iterator_worker(); Modified: projects/vnet/sys/netinet/sctp_pcb.c ============================================================================== --- projects/vnet/sys/netinet/sctp_pcb.c Sat Jan 23 08:08:06 2016 (r294621) +++ projects/vnet/sys/netinet/sctp_pcb.c Sat Jan 23 11:05:13 2016 (r294622) @@ -5929,6 +5929,7 @@ sctp_pcb_finish(void) struct sctp_tagblock *twait_block, *prev_twait_block; struct sctp_laddr *wi, *nwi; int i; + unsigned int r; struct sctp_iterator *it, *nit; if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) { @@ -5943,8 +5944,6 @@ sctp_pcb_finish(void) * still add the ifdef to make it compile on old versions. */ retry: - while (sctp_it_ctl.iterator_running != 0) - DELAY(1); SCTP_IPI_ITERATOR_WQ_LOCK(); /* * sctp_iterator_worker() might be working on an it entry without @@ -5953,10 +5952,13 @@ retry: * avoid the race condition as sctp_iterator_worker() will have to * wait to re-aquire the lock. */ - if (sctp_it_ctl.cur_it != NULL || sctp_it_ctl.iterator_running != 0) { + r = atomic_fetchadd_int(&sctp_it_ctl.iterator_running, 0); + if (r != 0 || sctp_it_ctl.cur_it != NULL) { SCTP_IPI_ITERATOR_WQ_UNLOCK(); - printf("%s: Iterator running while we held the lock. Retry.\n", - __func__); + /* XXX-BZ make this a statistics variable. */ + printf("%s: Iterator running while we held the lock. Retry. " + "r=%u cur_it=%p\n", __func__, r, sctp_it_ctl.cur_it); + DELAY(10); goto retry; } TAILQ_FOREACH_SAFE(it, &sctp_it_ctl.iteratorhead, sctp_nxt_itr, nit) { @@ -7022,6 +7024,11 @@ sctp_initiate_iterator(inp_func inpf, if (af == NULL) { return (-1); } + if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) { + printf("%s: abort on initialize being %d\n", __func__, + SCTP_BASE_VAR(sctp_pcb_initialized)); + return (-1); + } SCTP_MALLOC(it, struct sctp_iterator *, sizeof(struct sctp_iterator), SCTP_M_ITER); if (it == NULL) { @@ -7060,9 +7067,16 @@ sctp_initiate_iterator(inp_func inpf, } SCTP_IPI_ITERATOR_WQ_LOCK(); + if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) { + SCTP_IPI_ITERATOR_WQ_UNLOCK(); + printf("%s: rollback on initialize being %d it=%p\n", __func__, + SCTP_BASE_VAR(sctp_pcb_initialized), it); + SCTP_FREE(it, SCTP_M_ITER); + return (-1); + } TAILQ_INSERT_TAIL(&sctp_it_ctl.iteratorhead, it, sctp_nxt_itr); - if (sctp_it_ctl.iterator_running == 0) { + if (atomic_fetchadd_int(&sctp_it_ctl.iterator_running, 0) == 0) { sctp_wakeup_iterator(); } SCTP_IPI_ITERATOR_WQ_UNLOCK(); Modified: projects/vnet/sys/netinet/sctp_structs.h ============================================================================== --- projects/vnet/sys/netinet/sctp_structs.h Sat Jan 23 08:08:06 2016 (r294621) +++ projects/vnet/sys/netinet/sctp_structs.h Sat Jan 23 11:05:13 2016 (r294622) @@ -180,7 +180,7 @@ struct iterator_control { SCTP_PROCESS_STRUCT thread_proc; struct sctpiterators iteratorhead; struct sctp_iterator *cur_it; - uint32_t iterator_running; + volatile uint32_t iterator_running; uint32_t iterator_flags; }; Modified: projects/vnet/sys/netinet/sctputil.c ============================================================================== --- projects/vnet/sys/netinet/sctputil.c Sat Jan 23 08:08:06 2016 (r294621) +++ projects/vnet/sys/netinet/sctputil.c Sat Jan 23 11:05:13 2016 (r294622) @@ -1421,7 +1421,7 @@ sctp_iterator_worker(void) /* This function is called with the WQ lock in place */ - sctp_it_ctl.iterator_running = 1; + atomic_store_rel_int(&sctp_it_ctl.iterator_running, 1); TAILQ_FOREACH_SAFE(it, &sctp_it_ctl.iteratorhead, sctp_nxt_itr, nit) { sctp_it_ctl.cur_it = it; /* now lets work on this one */ @@ -1434,7 +1434,7 @@ sctp_iterator_worker(void) SCTP_IPI_ITERATOR_WQ_LOCK(); /* sa_ignore FREED_MEMORY */ } - sctp_it_ctl.iterator_running = 0; + atomic_store_rel_int(&sctp_it_ctl.iterator_running, 0); return; } From owner-svn-src-projects@freebsd.org Sat Jan 23 12:50:04 2016 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 23053A8C14B for ; Sat, 23 Jan 2016 12:50:04 +0000 (UTC) (envelope-from bz@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 E128010AA; Sat, 23 Jan 2016 12:50:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NCo26p002253; Sat, 23 Jan 2016 12:50:02 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NCo2sY002252; Sat, 23 Jan 2016 12:50:02 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601231250.u0NCo2sY002252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 23 Jan 2016 12:50:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294628 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 23 Jan 2016 12:50:04 -0000 Author: bz Date: Sat Jan 23 12:50:02 2016 New Revision: 294628 URL: https://svnweb.freebsd.org/changeset/base/294628 Log: Use sctp_asconf_iterator_end() rather than doing the cleanup manually. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/sctp_asconf.c Modified: projects/vnet/sys/netinet/sctp_asconf.c ============================================================================== --- projects/vnet/sys/netinet/sctp_asconf.c Sat Jan 23 12:25:24 2016 (r294627) +++ projects/vnet/sys/netinet/sctp_asconf.c Sat Jan 23 12:50:02 2016 (r294628) @@ -3281,10 +3281,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb * if (ret) { SCTP_PRINTF("Failed to initiate iterator for addr_mgmt_ep_sa\n"); SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_ASCONF, EFAULT); - atomic_add_int(&ifa->refcount, -1); - SCTP_DECR_LADDR_COUNT(); - SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_laddr), wi); - SCTP_FREE(asc, SCTP_M_ASC_IT); + sctp_asconf_iterator_end(asc); return (EFAULT); } } From owner-svn-src-projects@freebsd.org Sat Jan 23 12:51:13 2016 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 A245BA8C1F3 for ; Sat, 23 Jan 2016 12:51:13 +0000 (UTC) (envelope-from bz@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 73BBE1440; Sat, 23 Jan 2016 12:51:13 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NCpCMM004385; Sat, 23 Jan 2016 12:51:12 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NCpCRC004384; Sat, 23 Jan 2016 12:51:12 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601231251.u0NCpCRC004384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 23 Jan 2016 12:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294629 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 23 Jan 2016 12:51:13 -0000 Author: bz Date: Sat Jan 23 12:51:12 2016 New Revision: 294629 URL: https://svnweb.freebsd.org/changeset/base/294629 Log: Try to prevent an address (assoc) leak in one way or another when sctp_initiate_iterator() fails. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/sctputil.c Modified: projects/vnet/sys/netinet/sctputil.c ============================================================================== --- projects/vnet/sys/netinet/sctputil.c Sat Jan 23 12:50:02 2016 (r294628) +++ projects/vnet/sys/netinet/sctputil.c Sat Jan 23 12:51:12 2016 (r294629) @@ -1470,7 +1470,9 @@ sctp_handle_addr_wq(void) if (asc->cnt == 0) { SCTP_FREE(asc, SCTP_M_ASC_IT); } else { - (void)sctp_initiate_iterator(sctp_asconf_iterator_ep, + int ret; + + ret = sctp_initiate_iterator(sctp_asconf_iterator_ep, sctp_asconf_iterator_stcb, NULL, /* No ep end for boundall */ SCTP_PCB_FLAGS_BOUNDALL, @@ -1478,6 +1480,21 @@ sctp_handle_addr_wq(void) SCTP_ASOC_ANY_STATE, (void *)asc, 0, sctp_asconf_iterator_end, NULL, 0); + if (ret) { + SCTP_PRINTF("Failed to initiate iterator for handle_addr_wq\n"); + SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTPUTIL, EFAULT); + /* XXX-BZ Freeing if we are stopping or put back on the addr_wq. */ + if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) { + sctp_asconf_iterator_end(asc); + } else { + SCTP_WQ_ADDR_LOCK(); + LIST_FOREACH(wi, &asc->list_of_work, sctp_nxt_addr) { + LIST_INSERT_HEAD(&SCTP_BASE_INFO(addr_wq), wi, sctp_nxt_addr); + } + SCTP_WQ_ADDR_UNLOCK(); + SCTP_FREE(asc, SCTP_M_ASC_IT); + } + } } } From owner-svn-src-projects@freebsd.org Sat Jan 23 12:52:09 2016 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 E6590A8C22E for ; Sat, 23 Jan 2016 12:52:09 +0000 (UTC) (envelope-from bz@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 A1872178F; Sat, 23 Jan 2016 12:52:09 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NCq8lW005075; Sat, 23 Jan 2016 12:52:08 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NCq8EN005074; Sat, 23 Jan 2016 12:52:08 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601231252.u0NCq8EN005074@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 23 Jan 2016 12:52:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294630 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 23 Jan 2016 12:52:10 -0000 Author: bz Date: Sat Jan 23 12:52:08 2016 New Revision: 294630 URL: https://svnweb.freebsd.org/changeset/base/294630 Log: Noisy comments (not sure if the static would be valid for all SCTP implementations). Reorder some cleanup just to match the general order we normally use. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/sctp_pcb.c Modified: projects/vnet/sys/netinet/sctp_pcb.c ============================================================================== --- projects/vnet/sys/netinet/sctp_pcb.c Sat Jan 23 12:51:12 2016 (r294629) +++ projects/vnet/sys/netinet/sctp_pcb.c Sat Jan 23 12:52:08 2016 (r294630) @@ -5524,7 +5524,7 @@ sctp_add_local_addr_restricted(struct sc /* * insert an laddr entry with the given ifa for the desired list */ -int +/* static in FreeBSD */ int sctp_insert_laddr(struct sctpladdr *list, struct sctp_ifa *ifa, uint32_t act) { struct sctp_laddr *laddr; @@ -5550,7 +5550,7 @@ sctp_insert_laddr(struct sctpladdr *list /* * Remove an laddr entry from the local address list (on an assoc) */ -void +/* static in FreeBSD */ void sctp_remove_laddr(struct sctp_laddr *laddr) { @@ -6045,6 +6045,14 @@ retry: SCTP_WQ_ADDR_DESTROY(); + /* Get rid of other stuff too. */ + if (SCTP_BASE_INFO(sctp_asochash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); + if (SCTP_BASE_INFO(sctp_ephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); + if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) + SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); + SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_ep)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asoc)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_laddr)); @@ -6054,13 +6062,7 @@ retry: SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_strmoq)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf)); SCTP_ZONE_DESTROY(SCTP_BASE_INFO(ipi_zone_asconf_ack)); - /* Get rid of other stuff to */ - if (SCTP_BASE_INFO(sctp_asochash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_asochash), SCTP_BASE_INFO(hashasocmark)); - if (SCTP_BASE_INFO(sctp_ephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_ephash), SCTP_BASE_INFO(hashmark)); - if (SCTP_BASE_INFO(sctp_tcpephash) != NULL) - SCTP_HASH_FREE(SCTP_BASE_INFO(sctp_tcpephash), SCTP_BASE_INFO(hashtcpmark)); + #if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT) SCTP_FREE(SCTP_BASE_STATS, SCTP_M_MCORE); #endif From owner-svn-src-projects@freebsd.org Sat Jan 23 12:56:30 2016 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 399B8A8C434 for ; Sat, 23 Jan 2016 12:56:30 +0000 (UTC) (envelope-from bz@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 0CD68195B; Sat, 23 Jan 2016 12:56:29 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NCuTAQ005289; Sat, 23 Jan 2016 12:56:29 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NCuSQ0005287; Sat, 23 Jan 2016 12:56:28 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201601231256.u0NCuSQ0005287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 23 Jan 2016 12:56:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294631 - projects/vnet/sys/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 23 Jan 2016 12:56:30 -0000 Author: bz Date: Sat Jan 23 12:56:28 2016 New Revision: 294631 URL: https://svnweb.freebsd.org/changeset/base/294631 Log: sctp_asconf_iterator_end() has an unused second argument; compiles better if you add it. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/netinet/sctp_asconf.c projects/vnet/sys/netinet/sctputil.c Modified: projects/vnet/sys/netinet/sctp_asconf.c ============================================================================== --- projects/vnet/sys/netinet/sctp_asconf.c Sat Jan 23 12:52:08 2016 (r294630) +++ projects/vnet/sys/netinet/sctp_asconf.c Sat Jan 23 12:56:28 2016 (r294631) @@ -3281,7 +3281,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb * if (ret) { SCTP_PRINTF("Failed to initiate iterator for addr_mgmt_ep_sa\n"); SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_ASCONF, EFAULT); - sctp_asconf_iterator_end(asc); + sctp_asconf_iterator_end(asc, 0); return (EFAULT); } } Modified: projects/vnet/sys/netinet/sctputil.c ============================================================================== --- projects/vnet/sys/netinet/sctputil.c Sat Jan 23 12:52:08 2016 (r294630) +++ projects/vnet/sys/netinet/sctputil.c Sat Jan 23 12:56:28 2016 (r294631) @@ -1485,7 +1485,7 @@ sctp_handle_addr_wq(void) SCTP_LTRACE_ERR_RET(NULL, NULL, NULL, SCTP_FROM_SCTPUTIL, EFAULT); /* XXX-BZ Freeing if we are stopping or put back on the addr_wq. */ if (SCTP_BASE_VAR(sctp_pcb_initialized) == 0) { - sctp_asconf_iterator_end(asc); + sctp_asconf_iterator_end(asc, 0); } else { SCTP_WQ_ADDR_LOCK(); LIST_FOREACH(wi, &asc->list_of_work, sctp_nxt_addr) { From owner-svn-src-projects@freebsd.org Sat Jan 23 14:17:22 2016 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 8CE22A8E35F for ; Sat, 23 Jan 2016 14:17:22 +0000 (UTC) (envelope-from dim@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 5A5C619F0; Sat, 23 Jan 2016 14:17:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NEHLw2030614; Sat, 23 Jan 2016 14:17:21 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NEHL9A030613; Sat, 23 Jan 2016 14:17:21 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201601231417.u0NEHL9A030613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 23 Jan 2016 14:17:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294633 - projects/clang380-import/lib/clang X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 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, 23 Jan 2016 14:17:22 -0000 Author: dim Date: Sat Jan 23 14:17:21 2016 New Revision: 294633 URL: https://svnweb.freebsd.org/changeset/base/294633 Log: Undo r294499 for now (which disabled -mlong-calls), so arm builds can succeed again. Modified: projects/clang380-import/lib/clang/clang.lib.mk Modified: projects/clang380-import/lib/clang/clang.lib.mk ============================================================================== --- projects/clang380-import/lib/clang/clang.lib.mk Sat Jan 23 13:34:55 2016 (r294632) +++ projects/clang380-import/lib/clang/clang.lib.mk Sat Jan 23 14:17:21 2016 (r294633) @@ -7,8 +7,7 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/l INTERNALLIB= .if ${MACHINE_CPUARCH} == "arm" -# This will need to be enabled to link clang 3.8 -#STATIC_CXXFLAGS+= -mlong-calls +STATIC_CXXFLAGS+= -mlong-calls .endif .include