From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:03:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A7D2CAD; Sun, 30 Nov 2014 00:03:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 47060887; Sun, 30 Nov 2014 00:03:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU03SKs095895; Sun, 30 Nov 2014 00:03:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU03Rjk095891; Sun, 30 Nov 2014 00:03:27 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300003.sAU03Rjk095891@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:03:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275279 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:03:28 -0000 Author: ngie Date: Sun Nov 30 00:03:27 2014 New Revision: 275279 URL: https://svnweb.freebsd.org/changeset/base/275279 Log: Make kdc run before SERVERS so kdc can be decoupled from the build Modified: projects/building-blocks/etc/rc.d/SERVERS projects/building-blocks/etc/rc.d/kdc Modified: projects/building-blocks/etc/rc.d/SERVERS ============================================================================== --- projects/building-blocks/etc/rc.d/SERVERS Sat Nov 29 23:59:51 2014 (r275278) +++ projects/building-blocks/etc/rc.d/SERVERS Sun Nov 30 00:03:27 2014 (r275279) @@ -4,7 +4,7 @@ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote abi ldconfig savecore watchdogd kdc +# REQUIRE: mountcritremote abi ldconfig savecore watchdogd # This is a dummy dependency, for early-start servers relying on # some basic configuration. Modified: projects/building-blocks/etc/rc.d/kdc ============================================================================== --- projects/building-blocks/etc/rc.d/kdc Sat Nov 29 23:59:51 2014 (r275278) +++ projects/building-blocks/etc/rc.d/kdc Sun Nov 30 00:03:27 2014 (r275279) @@ -5,6 +5,7 @@ # PROVIDE: kdc # REQUIRE: NETWORKING +# BEFORE: SERVERS # KEYWORD: shutdown . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:08:15 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA539EEE; Sun, 30 Nov 2014 00:08:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 9BFAA8B2; Sun, 30 Nov 2014 00:08:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU08Fll096744; Sun, 30 Nov 2014 00:08:15 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU08F3B096743; Sun, 30 Nov 2014 00:08:15 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411300008.sAU08F3B096743@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 30 Nov 2014 00:08:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275280 - projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:08:15 -0000 Author: dim Date: Sun Nov 30 00:08:14 2014 New Revision: 275280 URL: https://svnweb.freebsd.org/changeset/base/275280 Log: Pull in r215811 from upstream llvm trunk (by Nico Weber): arm asm: Let .fpu enable instructions, PR20447. I'm not very happy with duplicating the fpu->feature mapping in ARMAsmParser.cpp and in clang's driver. See the bug for a patch that doesn't do that, and the review thread [1] for why this duplication exists. 1: http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20140811/231052.html This makes the .fpu directive work properly, so we can successfully assemble several .S files using the directive, under lib/libc/arm. Modified: projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Modified: projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Sun Nov 30 00:03:27 2014 (r275279) +++ projects/clang350-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp Sun Nov 30 00:08:14 2014 (r275280) @@ -8621,6 +8621,30 @@ bool ARMAsmParser::parseDirectiveCPU(SML return false; } +// FIXME: This is duplicated in getARMFPUFeatures() in +// tools/clang/lib/Driver/Tools.cpp +static const struct { + const unsigned Fpu; + const uint64_t Enabled; + const uint64_t Disabled; +} Fpus[] = { + {ARM::VFP, ARM::FeatureVFP2, ARM::FeatureNEON}, + {ARM::VFPV2, ARM::FeatureVFP2, ARM::FeatureNEON}, + {ARM::VFPV3, ARM::FeatureVFP3, ARM::FeatureNEON}, + {ARM::VFPV3_D16, ARM::FeatureVFP3 | ARM::FeatureD16, ARM::FeatureNEON}, + {ARM::VFPV4, ARM::FeatureVFP4, ARM::FeatureNEON}, + {ARM::VFPV4_D16, ARM::FeatureVFP4 | ARM::FeatureD16, ARM::FeatureNEON}, + {ARM::FP_ARMV8, ARM::FeatureFPARMv8, + ARM::FeatureNEON | ARM::FeatureCrypto}, + {ARM::NEON, ARM::FeatureNEON, 0}, + {ARM::NEON_VFPV4, ARM::FeatureVFP4 | ARM::FeatureNEON, 0}, + {ARM::NEON_FP_ARMV8, ARM::FeatureFPARMv8 | ARM::FeatureNEON, + ARM::FeatureCrypto}, + {ARM::CRYPTO_NEON_FP_ARMV8, + ARM::FeatureFPARMv8 | ARM::FeatureNEON | ARM::FeatureCrypto, 0}, + {ARM::SOFTVFP, 0, 0}, +}; + /// parseDirectiveFPU /// ::= .fpu str bool ARMAsmParser::parseDirectiveFPU(SMLoc L) { @@ -8636,6 +8660,18 @@ bool ARMAsmParser::parseDirectiveFPU(SML return false; } + for (const auto &Fpu : Fpus) { + if (Fpu.Fpu != ID) + continue; + + // Need to toggle features that should be on but are off and that + // should off but are on. + unsigned Toggle = (Fpu.Enabled & ~STI.getFeatureBits()) | + (Fpu.Disabled & STI.getFeatureBits()); + setAvailableFeatures(ComputeAvailableFeatures(STI.ToggleFeature(Toggle))); + break; + } + getTargetStreamer().emitFPU(ID); return false; } From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:09:27 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55D17FE3; Sun, 30 Nov 2014 00:09:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4243B8C9; Sun, 30 Nov 2014 00:09:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU09R4s096922; Sun, 30 Nov 2014 00:09:27 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU09R85096921; Sun, 30 Nov 2014 00:09:27 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411300009.sAU09R85096921@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 30 Nov 2014 00:09:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275281 - projects/clang350-import/contrib/llvm/patches 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:09:27 -0000 Author: dim Date: Sun Nov 30 00:09:26 2014 New Revision: 275281 URL: https://svnweb.freebsd.org/changeset/base/275281 Log: Add patch file for r275280. Added: projects/clang350-import/contrib/llvm/patches/patch-19-llvm-r215811-arm-fpu-directive.diff Added: projects/clang350-import/contrib/llvm/patches/patch-19-llvm-r215811-arm-fpu-directive.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/patches/patch-19-llvm-r215811-arm-fpu-directive.diff Sun Nov 30 00:09:26 2014 (r275281) @@ -0,0 +1,90 @@ +Pull in r215811 from upstream llvm trunk (by Nico Weber): + + arm asm: Let .fpu enable instructions, PR20447. + + I'm not very happy with duplicating the fpu->feature mapping in ARMAsmParser.cpp + and in clang's driver. See the bug for a patch that doesn't do that, and the + review thread [1] for why this duplication exists. + + 1: http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20140811/231052.html + +This makes the .fpu directive work properly, so we can successfully +assemble several .S files using the directive, under lib/libc/arm. + +Introduced here: http://svnweb.freebsd.org/changeset/base/275280 + +Index: lib/Target/ARM/AsmParser/ARMAsmParser.cpp +=================================================================== +--- lib/Target/ARM/AsmParser/ARMAsmParser.cpp ++++ lib/Target/ARM/AsmParser/ARMAsmParser.cpp +@@ -8621,6 +8621,30 @@ bool ARMAsmParser::parseDirectiveCPU(SMLoc L) { + return false; + } + ++// FIXME: This is duplicated in getARMFPUFeatures() in ++// tools/clang/lib/Driver/Tools.cpp ++static const struct { ++ const unsigned Fpu; ++ const uint64_t Enabled; ++ const uint64_t Disabled; ++} Fpus[] = { ++ {ARM::VFP, ARM::FeatureVFP2, ARM::FeatureNEON}, ++ {ARM::VFPV2, ARM::FeatureVFP2, ARM::FeatureNEON}, ++ {ARM::VFPV3, ARM::FeatureVFP3, ARM::FeatureNEON}, ++ {ARM::VFPV3_D16, ARM::FeatureVFP3 | ARM::FeatureD16, ARM::FeatureNEON}, ++ {ARM::VFPV4, ARM::FeatureVFP4, ARM::FeatureNEON}, ++ {ARM::VFPV4_D16, ARM::FeatureVFP4 | ARM::FeatureD16, ARM::FeatureNEON}, ++ {ARM::FP_ARMV8, ARM::FeatureFPARMv8, ++ ARM::FeatureNEON | ARM::FeatureCrypto}, ++ {ARM::NEON, ARM::FeatureNEON, 0}, ++ {ARM::NEON_VFPV4, ARM::FeatureVFP4 | ARM::FeatureNEON, 0}, ++ {ARM::NEON_FP_ARMV8, ARM::FeatureFPARMv8 | ARM::FeatureNEON, ++ ARM::FeatureCrypto}, ++ {ARM::CRYPTO_NEON_FP_ARMV8, ++ ARM::FeatureFPARMv8 | ARM::FeatureNEON | ARM::FeatureCrypto, 0}, ++ {ARM::SOFTVFP, 0, 0}, ++}; ++ + /// parseDirectiveFPU + /// ::= .fpu str + bool ARMAsmParser::parseDirectiveFPU(SMLoc L) { +@@ -8636,6 +8660,18 @@ bool ARMAsmParser::parseDirectiveFPU(SMLoc L) { + return false; + } + ++ for (const auto &Fpu : Fpus) { ++ if (Fpu.Fpu != ID) ++ continue; ++ ++ // Need to toggle features that should be on but are off and that ++ // should off but are on. ++ unsigned Toggle = (Fpu.Enabled & ~STI.getFeatureBits()) | ++ (Fpu.Disabled & STI.getFeatureBits()); ++ setAvailableFeatures(ComputeAvailableFeatures(STI.ToggleFeature(Toggle))); ++ break; ++ } ++ + getTargetStreamer().emitFPU(ID); + return false; + } +Index: test/MC/ARM/directive-fpu-instrs.s +=================================================================== +--- test/MC/ARM/directive-fpu-instrs.s ++++ test/MC/ARM/directive-fpu-instrs.s +@@ -0,0 +1,16 @@ ++// RUN: llvm-mc -triple armv7-unknown-linux-gnueabi -mattr=+vfp3,+d16,-neon %s ++ ++.fpu neon ++VAND d3, d5, d5 ++vldr d21, [r7, #296] ++ ++@ .thumb should not disable the prior .fpu neon ++.thumb ++ ++vmov q4, q11 @ v4si ++str r6, [r7, #264] ++mov r6, r5 ++vldr d21, [r7, #296] ++add r9, r7, #216 ++ ++fstmfdd sp!, {d8, d9, d10, d11, d12, d13, d14, d15} From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:20:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D03CD26B; Sun, 30 Nov 2014 00:20:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A3B7BA10; Sun, 30 Nov 2014 00:20:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0KKJM001879; Sun, 30 Nov 2014 00:20:20 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0KKEn001878; Sun, 30 Nov 2014 00:20:20 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411300020.sAU0KKEn001878@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 00:20:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275282 - in projects/bmake: pkgs targets 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:20:20 -0000 Author: sjg Date: Sun Nov 30 00:20:20 2014 New Revision: 275282 URL: https://svnweb.freebsd.org/changeset/base/275282 Log: Rename pkgs to more generic targets (that's what they are) Reviewed by: marcel Added: projects/bmake/targets/ - copied from r275280, projects/bmake/pkgs/ Deleted: projects/bmake/pkgs/ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:21:08 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B216D351; Sun, 30 Nov 2014 00:21:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 84955A14; Sun, 30 Nov 2014 00:21:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0L839002489; Sun, 30 Nov 2014 00:21:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0L78q002483; Sun, 30 Nov 2014 00:21:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300021.sAU0L78q002483@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:21:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275283 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:21:08 -0000 Author: ngie Date: Sun Nov 30 00:21:06 2014 New Revision: 275283 URL: https://svnweb.freebsd.org/changeset/base/275283 Log: Rework rc.d requirements so zfs and zvol come before relevant services so they can be decoupled from the build Modified: projects/building-blocks/etc/rc.d/FILESYSTEMS projects/building-blocks/etc/rc.d/dumpon projects/building-blocks/etc/rc.d/var projects/building-blocks/etc/rc.d/zfs projects/building-blocks/etc/rc.d/zvol Modified: projects/building-blocks/etc/rc.d/FILESYSTEMS ============================================================================== --- projects/building-blocks/etc/rc.d/FILESYSTEMS Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/FILESYSTEMS Sun Nov 30 00:21:06 2014 (r275283) @@ -4,7 +4,7 @@ # # PROVIDE: FILESYSTEMS -# REQUIRE: root mountcritlocal cleanvar zfs +# REQUIRE: root mountcritlocal cleanvar # This is a dummy dependency, for services which require file systems # to be mounted before starting. It also serves as the default early / Modified: projects/building-blocks/etc/rc.d/dumpon ============================================================================== --- projects/building-blocks/etc/rc.d/dumpon Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/dumpon Sun Nov 30 00:21:06 2014 (r275283) @@ -4,7 +4,6 @@ # # PROVIDE: dumpon -# REQUIRE: zvol # BEFORE: disks # KEYWORD: nojail Modified: projects/building-blocks/etc/rc.d/var ============================================================================== --- projects/building-blocks/etc/rc.d/var Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/var Sun Nov 30 00:21:06 2014 (r275283) @@ -28,7 +28,7 @@ # # PROVIDE: var -# REQUIRE: mountcritlocal zfs +# REQUIRE: mountcritlocal # NFS /var is not supported, unless NFS /var is part of diskless NFS / Modified: projects/building-blocks/etc/rc.d/zfs ============================================================================== --- projects/building-blocks/etc/rc.d/zfs Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/zfs Sun Nov 30 00:21:06 2014 (r275283) @@ -5,6 +5,7 @@ # PROVIDE: zfs # REQUIRE: mountcritlocal +# BEFORE: FILESYSTEMS var . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/zvol ============================================================================== --- projects/building-blocks/etc/rc.d/zvol Sun Nov 30 00:20:20 2014 (r275282) +++ projects/building-blocks/etc/rc.d/zvol Sun Nov 30 00:21:06 2014 (r275283) @@ -5,6 +5,7 @@ # PROVIDE: zvol # REQUIRE: hostid +# BEFORE: dumpon # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:23:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 26A4B45B; Sun, 30 Nov 2014 00:23:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 12CB2A34; Sun, 30 Nov 2014 00:23:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0NZvJ005726; Sun, 30 Nov 2014 00:23:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0NZmT005723; Sun, 30 Nov 2014 00:23:35 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300023.sAU0NZmT005723@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:23:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275284 - in projects/building-blocks: etc etc/rc.d tools/build/mk 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:23:36 -0000 Author: ngie Date: Sun Nov 30 00:23:34 2014 New Revision: 275284 URL: https://svnweb.freebsd.org/changeset/base/275284 Log: Better honor the following MK_ flags in etc/Makefile and etc/rc.d/Makefile: - MK_AMD - MK_ATM - MK_AUDIT - MK_BOOT - MK_GSSAPI - MK_JAIL - MK_LPR - MK_SENDMAIL - MK_VI - MK_WIRELESS - MK_ZFS Modified: projects/building-blocks/etc/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Sun Nov 30 00:21:06 2014 (r275283) +++ projects/building-blocks/etc/Makefile Sun Nov 30 00:23:34 2014 (r275284) @@ -41,7 +41,6 @@ BIN1= crontab \ rc.bsdextended \ rc.firewall \ rc.initdiskless \ - rc.sendmail \ rc.shutdown \ rc.subr \ remote \ @@ -141,6 +140,10 @@ BIN1+= portsnap.conf BIN1+= pf.os .endif +.if ${MK_SENDMAIL} != "no" +BIN1+= rc.sendmail +.endif + .if ${MK_TCSH} != "no" BIN1+= csh.cshrc csh.login csh.logout .endif Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 00:21:06 2014 (r275283) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 00:23:34 2014 (r275284) @@ -12,11 +12,6 @@ FILES= DAEMON \ adjkerntz \ amd \ archdep \ - atm1 \ - atm2 \ - atm3 \ - auditd \ - auditdistd \ bgfsck \ ${_bluetooth} \ bridge \ @@ -39,11 +34,8 @@ FILES= DAEMON \ gbde \ geli \ geli2 \ - gptboot \ growfs \ - gssd \ ${_hcsecd} \ - hostapd \ hostid \ hostid_save \ hostname \ @@ -54,10 +46,7 @@ FILES= DAEMON \ ipfw \ ipmon \ ipnat \ - ipropd_master \ - ipropd_slave \ ipsec \ - jail \ ${_kadmind} \ ${_kdc} \ ${_kfd} \ @@ -68,7 +57,6 @@ FILES= DAEMON \ local \ localpkg \ lockd \ - lpd \ mixer \ motd \ mountcritlocal \ @@ -92,8 +80,6 @@ FILES= DAEMON \ nisdomain \ ${_nscd} \ nsswitch \ - ntpd \ - ntpdate \ ${_opensm} \ ${_othermta} \ pf \ @@ -120,7 +106,6 @@ FILES= DAEMON \ savecore \ sdpd \ securelevel \ - sendmail \ serial \ sppp \ ${_sshd} \ @@ -138,27 +123,38 @@ FILES= DAEMON \ ${_unbound} \ ${_utx} \ var \ - virecover \ watchdogd \ - wpa_supplicant \ ypbind \ yppasswdd \ ypserv \ ypset \ ypupdated \ ypxfrd \ - zfs \ - zvol .if ${MK_ACCT} != "no" FILES+= accounting .endif +.if ${MK_AMD} != "no" +FILES+= amd +.endif + .if ${MK_APM} != "no" FILES+= apm FILES+= apmd .endif +.if ${MK_ATM} != "no" +FILES+= atm1 +FILES+= atm2 +FILES+= atm3 +.endif + +.if ${MK_AUDIT} != "no" +FILES+= auditd +FILES+= auditdistd +.endif + .if ${MK_AUTOFS} != "no" FILES+= automount FILES+= automountd @@ -172,6 +168,10 @@ _hcsecd= hcsecd _ubthidhci= ubthidhci .endif +.if ${MK_BOOT} != "no" +FILES+= gptboot +.endif + .if ${MK_BOOTPARAMD} != "no" FILES+= bootparams .endif @@ -188,6 +188,10 @@ _casperd= casperd FILES+= ftpd .endif +.if ${MK_GSSAPI} != "no" +FILES+= gssd +.endif + .if ${MK_HAST} != "no" FILES+= hastd .endif @@ -201,16 +205,26 @@ FILES+= iscsictl FILES+= iscsid .endif +.if ${MK_JAIL} != "no" +FILES+= jail +.endif + .if ${MK_LEGACY_CONSOLE} != "no" FILES+= moused FILES+= syscons .endif +.if ${MK_LPR} != "no" +FILES+= lpd +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif .if ${MK_KERBEROS} != "no" +FILES+= ipropd_master +FILES+= ipropd_slave _kadmind= kadmind _kdc= kdc _kfd= kfd @@ -241,6 +255,10 @@ FILES+= ftp-proxy FILES+= rwho .endif +.if ${MK_SENDMAIL} != "no" +FILES+= sendmail +.endif + .if ${MK_TIMED} != "no" FILES+= timed .endif @@ -253,6 +271,20 @@ _unbound= local_unbound _utx= utx .endif +.if ${MK_VI} != "no" +FILES+= virecover +.endif + +.if ${MK_WIRELESS} != "no" +FILES+= hostapd +FILES+= wpa_supplicant +.endif + +.if ${MK_ZFS} != "no" +FILES+= zfs +FILES+= zvol +.endif + FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 00:21:06 2014 (r275283) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 00:23:34 2014 (r275284) @@ -27,6 +27,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz .if ${MK_AMD} == no OLD_FILES+=etc/amd.map +OLD_FILES+=etc/rc.d/amd OLD_FILES+=usr/bin/pawd OLD_FILES+=usr/sbin/amd OLD_FILES+=usr/sbin/amq @@ -77,6 +78,9 @@ OLD_FILES+=usr/share/man/man8/atrun.8.gz .endif .if ${MK_ATM} == no +OLD_FILES+=etc/rc.d/atm1 +OLD_FILES+=etc/rc.d/atm2 +OLD_FILES+=etc/rc.d/atm3 OLD_FILES+=rescue/atmconfig OLD_FILES+=sbin/atmconfig OLD_FILES+=usr/bin/sscop @@ -135,6 +139,8 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-A .endif .if ${MK_AUDIT} == no +OLD_FILES+=etc/rc.d/auditd +OLD_FILES+=etc/rc.d/auditdistd OLD_FILES+=usr/sbin/audit OLD_FILES+=usr/sbin/auditd OLD_FILES+=usr/sbin/auditreduce @@ -344,6 +350,7 @@ OLD_FILES+=boot/userboot.so OLD_FILES+=boot/version.4th OLD_FILES+=boot/zfsboot OLD_FILES+=boot/zfsloader +OLD_FILES+=etc/rc.d/gptboot OLD_FILES+=usr/lib/kgzldr.o OLD_FILES+=usr/share/man/man5/loader.conf.5.gz OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz @@ -891,6 +898,8 @@ OLD_FILES+=boot/zfsloader OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs OLD_FILES+=etc/periodic/daily/800.scrub-zfs +OLD_FILES+=etc/rc.d/zfs +OLD_FILES+=etc/rc.d/zvol OLD_LIBS+=lib/libzfs.so.2 OLD_LIBS+=lib/libzfs_core.so.2 OLD_LIBS+=lib/libzpool.so.2 @@ -2355,6 +2364,7 @@ OLD_DIRS+=usr/share/tmac .endif .if ${MK_GSSAPI} == no +OLD_FILES+=etc/rc.d/gssd OLD_FILES+=usr/include/gssapi/gssapi.h OLD_DIRS+=usr/include/gssapi OLD_FILES+=usr/include/gssapi.h @@ -2664,6 +2674,7 @@ OLD_FILES+=usr/share/man/man8/iscsid.8.g .endif .if ${MK_JAIL} == no +OLD_FILES+=etc/rc.d/jail OLD_FILES+=usr/sbin/jail OLD_FILES+=usr/sbin/jexec OLD_FILES+=usr/sbin/jls @@ -2673,6 +2684,8 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz .endif .if ${MK_KERBEROS} == no +OLD_FILES+=etc/rc.d/ipropd_master +OLD_FILES+=etc/rc.d/ipropd_slave OLD_FILES+=usr/bin/compile_et OLD_FILES+=usr/bin/hxtool OLD_FILES+=usr/bin/kadmin @@ -3830,6 +3843,7 @@ OLD_FILES+=usr/share/man/man8/updatedb.8 .if ${MK_LPR} == no OLD_FILES+=etc/hosts.lpd OLD_FILES+=etc/printcap +OLD_FILES+=etc/rc.d/lpd OLD_FILES+=usr/bin/lp OLD_FILES+=usr/bin/lpq OLD_FILES+=usr/bin/lpr @@ -4596,6 +4610,8 @@ OLD_FILES+=etc/periodic/daily/150.clean- OLD_FILES+=etc/periodic/daily/440.status-mailq OLD_FILES+=etc/periodic/daily/460.status-mail-rejects OLD_FILES+=etc/periodic/daily/500.queuerun +OLD_FILES+=etc/rc.sendmail +OLD_FILES+=etc/rc.d/sendmail .if ${MK_MAILWRAPPER} == no OLD_FILES+=bin/rmail .endif @@ -6065,6 +6081,7 @@ OLD_FILES+=usr/share/man/man8/utx.8.gz .endif .if ${MK_VI} == no +OLD_FILES+=etc/rc.d/virecover OLD_FILES+=usr/bin/ex OLD_FILES+=usr/bin/nex OLD_FILES+=usr/bin/nvi From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:25:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D63D7560; Sun, 30 Nov 2014 00:25:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 C327BA41; Sun, 30 Nov 2014 00:25:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0Plum006051; Sun, 30 Nov 2014 00:25:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0Pl18006049; Sun, 30 Nov 2014 00:25:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300025.sAU0Pl18006049@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:25:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275285 - projects/building-blocks/etc 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:25:47 -0000 Author: ngie Date: Sun Nov 30 00:25:47 2014 New Revision: 275285 URL: https://svnweb.freebsd.org/changeset/base/275285 Log: Honor MK_GSSAPI and MK_PKGBOOTSTRAP a bit better in etc/Makefile Modified: projects/building-blocks/etc/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Sun Nov 30 00:23:34 2014 (r275284) +++ projects/building-blocks/etc/Makefile Sun Nov 30 00:25:47 2014 (r275285) @@ -252,9 +252,13 @@ distribution: .if ${MK_DMAGENT} != "no" ${_+_}cd ${.CURDIR}/dma; ${MAKE} install .endif +.if ${MK_GSSAPI} != "no" ${_+_}cd ${.CURDIR}/gss; ${MAKE} install +.endif ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install +.if ${MK_PKGBOOTSTRAP} != "no" ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install +.endif ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:26:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3863364D; Sun, 30 Nov 2014 00:26:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 250F6A4D; Sun, 30 Nov 2014 00:26:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0QpUm006217; Sun, 30 Nov 2014 00:26:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0QpNv006216; Sun, 30 Nov 2014 00:26:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300026.sAU0QpNv006216@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:26:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275286 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:26:51 -0000 Author: ngie Date: Sun Nov 30 00:26:50 2014 New Revision: 275286 URL: https://svnweb.freebsd.org/changeset/base/275286 Log: Add MK_NTP block to etc/rc.d/Makefile Modified: projects/building-blocks/etc/rc.d/Makefile Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 00:25:47 2014 (r275285) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 00:26:50 2014 (r275286) @@ -235,6 +235,11 @@ _kpasswdd= kpasswdd _othermta= othermta .endif +.if ${MK_NTP} != "no" +FILES+= ntpd +FILES+= ntpdate +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:45:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE092872; Sun, 30 Nov 2014 00:45:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A071EBD9; Sun, 30 Nov 2014 00:45:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0jYAf015378; Sun, 30 Nov 2014 00:45:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0jXw6015374; Sun, 30 Nov 2014 00:45:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300045.sAU0jXw6015374@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:45:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275287 - in projects/building-blocks: share/mk tools/build/options 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:45:34 -0000 Author: ngie Date: Sun Nov 30 00:45:33 2014 New Revision: 275287 URL: https://svnweb.freebsd.org/changeset/base/275287 Log: Add MK_FILE and MK_SQLITE3 - MK_FILE will conditionalize building lib/libmagic and usr.bin/file - MK_SQLITE3 will conditionalize building lib/libsqlite3, and will disable MK_SVN/MK_SVNLITE by proxy Added: projects/building-blocks/tools/build/options/WITHOUT_FILE (contents, props changed) projects/building-blocks/tools/build/options/WITHOUT_SQLITE3 (contents, props changed) Modified: projects/building-blocks/share/mk/src.opts.mk Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Sun Nov 30 00:26:50 2014 (r275286) +++ projects/building-blocks/share/mk/src.opts.mk Sun Nov 30 00:45:33 2014 (r275287) @@ -81,6 +81,7 @@ __DEFAULT_YES_OPTIONS = \ EE \ EXAMPLES \ FDT \ + FILE \ FINGER \ FLOPPY \ FMTREE \ @@ -151,6 +152,7 @@ __DEFAULT_YES_OPTIONS = \ SOURCELESS \ SOURCELESS_HOST \ SOURCELESS_UCODE \ + SQLITE3 \ SVNLITE \ SYSCALL_COMPAT \ SYSCONS \ @@ -327,6 +329,11 @@ MK_KERBEROS:= no MK_AUTHPF:= no .endif +.if ${MK_SQLITE3} == "no" +MK_SVN:= no +MK_SVNLITE:= no +.endif + .if ${MK_TEXTPROC} == "no" MK_GROFF:= no .endif Added: projects/building-blocks/tools/build/options/WITHOUT_FILE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_FILE Sun Nov 30 00:45:33 2014 (r275287) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr file 1 +and related programs. Added: projects/building-blocks/tools/build/options/WITHOUT_SQLITE3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_SQLITE3 Sun Nov 30 00:45:33 2014 (r275287) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build all sqlite3 applications and libraries. From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:49:07 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E63897A; Sun, 30 Nov 2014 00:49:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 51DCBBEE; Sun, 30 Nov 2014 00:49:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0n7PC015820; Sun, 30 Nov 2014 00:49:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0n7Nv015819; Sun, 30 Nov 2014 00:49:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300049.sAU0n7Nv015819@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:49:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275288 - projects/building-blocks/lib 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:49:07 -0000 Author: ngie Date: Sun Nov 30 00:49:06 2014 New Revision: 275288 URL: https://svnweb.freebsd.org/changeset/base/275288 Log: Honor MK_AUDIT, MK_FILE, MK_GPIO, and MK_SQLITE3 lib/libgpio is a standalone library, but it seems logical to conditionalize it with MK_GPIO Modified: projects/building-blocks/lib/Makefile Modified: projects/building-blocks/lib/Makefile ============================================================================== --- projects/building-blocks/lib/Makefile Sun Nov 30 00:45:33 2014 (r275287) +++ projects/building-blocks/lib/Makefile Sun Nov 30 00:49:06 2014 (r275288) @@ -25,7 +25,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libalias \ libarchive \ ${_libatm} \ - libauditd \ + ${_libauditd} \ libbegemot \ libblocksruntime \ ${_libbluetooth} \ @@ -52,7 +52,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libfigpar \ libgeom \ ${_libgpib} \ - libgpio \ + ${_libgpio} \ ${_libgssapi} \ ${_librpcsec_gss} \ ${_libiconv_modules} \ @@ -62,7 +62,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libkvm \ ${_libldns} \ liblzma \ - libmagic \ + ${_libmagic} \ libmandoc \ libmemstat \ libmd \ @@ -91,7 +91,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ - libsqlite3 \ + ${_libsqlite3} \ libstand \ libstdbuf \ libstdthreads \ @@ -168,6 +168,10 @@ _csu=csu _libngatm= libngatm .endif +.if ${MK_AUDIT} != "no" +_libauditd= libauditd +.endif + .if ${MK_BHYVE} != "no" _libvmmapi= libvmmapi .endif @@ -194,10 +198,18 @@ _clang= clang _cuse= libcuse .endif +.if ${MK_FILE} != "no" +_libmagic= libmagic +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif +.if ${MK_GPIO} != "no" +_libgpio= libgpio +.endif + .if ${MK_GSSAPI} != "no" _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss @@ -281,6 +293,10 @@ _libsmdb= libsmdb _libsmutil= libsmutil .endif +.if ${MK_SQLITE3} != "no" +_libsqlite3= libsqlite3 +.endif + .if ${MK_TELNET} != "no" _libtelnet= libtelnet .endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:49:25 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60C26A5A; Sun, 30 Nov 2014 00:49:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4D6F3BEF; Sun, 30 Nov 2014 00:49:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0nPpO015897; Sun, 30 Nov 2014 00:49:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0nPqu015896; Sun, 30 Nov 2014 00:49:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300049.sAU0nPqu015896@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:49:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275289 - projects/building-blocks/usr.bin 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:49:25 -0000 Author: ngie Date: Sun Nov 30 00:49:24 2014 New Revision: 275289 URL: https://svnweb.freebsd.org/changeset/base/275289 Log: Honor MK_FILE Modified: projects/building-blocks/usr.bin/Makefile Modified: projects/building-blocks/usr.bin/Makefile ============================================================================== --- projects/building-blocks/usr.bin/Makefile Sun Nov 30 00:49:06 2014 (r275288) +++ projects/building-blocks/usr.bin/Makefile Sun Nov 30 00:49:24 2014 (r275289) @@ -46,7 +46,6 @@ SUBDIR= alias \ expand \ false \ fetch \ - file \ find \ fmt \ fold \ @@ -234,6 +233,10 @@ _clang= clang SUBDIR+= ee .endif +.if ${MK_FILE} != "no" +SUBDIR+= file +.endif + .if ${MK_FINGER} != "no" SUBDIR+= finger .endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:49:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0FB67B44; Sun, 30 Nov 2014 00:49:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 F1010BF5; Sun, 30 Nov 2014 00:49:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0nvWR015991; Sun, 30 Nov 2014 00:49:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0nve1015990; Sun, 30 Nov 2014 00:49:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300049.sAU0nve1015990@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:49:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275290 - projects/building-blocks/include 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:49:58 -0000 Author: ngie Date: Sun Nov 30 00:49:57 2014 New Revision: 275290 URL: https://svnweb.freebsd.org/changeset/base/275290 Log: Install bsm headers if MK_AUDIT != no Modified: projects/building-blocks/include/Makefile Modified: projects/building-blocks/include/Makefile ============================================================================== --- projects/building-blocks/include/Makefile Sun Nov 30 00:49:24 2014 (r275289) +++ projects/building-blocks/include/Makefile Sun Nov 30 00:49:57 2014 (r275290) @@ -36,7 +36,7 @@ PHDRS= sched.h _semaphore.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \ syslog.h ucontext.h -LDIRS= bsm cam geom net net80211 netinet netinet6 \ +LDIRS= cam geom net net80211 netinet netinet6 \ netipsec netsmb nfs nfsclient nfsserver sys vm LSUBDIRS= cam/ata cam/scsi \ @@ -62,6 +62,10 @@ LDIRS+= netnatm LSUBDIRS+= netgraph/atm .endif +.if ${MK_AUDIT} != "no" +LDIRS+= bsm +.endif + .if ${MK_BLUETOOTH} != "no" LSUBSUBDIRS+= netgraph/bluetooth/include .endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:51:00 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDAF1C2D; Sun, 30 Nov 2014 00:51:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DA924C82; Sun, 30 Nov 2014 00:51:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0p0ni017135; Sun, 30 Nov 2014 00:51:00 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0p0uX017134; Sun, 30 Nov 2014 00:51:00 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300051.sAU0p0uX017134@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:51:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275291 - projects/building-blocks/etc/pam.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:51:01 -0000 Author: ngie Date: Sun Nov 30 00:51:00 2014 New Revision: 275291 URL: https://svnweb.freebsd.org/changeset/base/275291 Log: Honor MK_AT, MK_FTP, MK_MAIL, and MK_OPENSSH Modified: projects/building-blocks/etc/pam.d/Makefile Modified: projects/building-blocks/etc/pam.d/Makefile ============================================================================== --- projects/building-blocks/etc/pam.d/Makefile Sun Nov 30 00:49:57 2014 (r275290) +++ projects/building-blocks/etc/pam.d/Makefile Sun Nov 30 00:51:00 2014 (r275291) @@ -5,16 +5,34 @@ NO_OBJ= .include FILES= README \ - atrun \ cron \ - ftpd \ - imap \ login \ other \ - passwd pop3 \ - sshd su system \ + passwd \ + su \ + system \ xdm +LINKS= + +.if ${MK_AT} != "no" +FILES+= atrun +.endif + +.if ${MK_FTP} != "no" +FILES+= ftpd +LINKS+= ${FILESDIR}/ftpd ${FILESDIR}/ftp +.endif + +.if ${MK_MAIL} != "no" +FILES+= imap +FILES+= pop3 +.endif + +.if ${MK_OPENSSH} != "no" +FILES+= sshd +.endif + .if ${MK_RCMDS} != "no" FILES+= rsh .endif @@ -26,6 +44,5 @@ FILES+= telnetd FILESDIR= /etc/pam.d FILESMODE= 644 FILESMODE_README= 444 -LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp .include From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:55:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D780ED87; Sun, 30 Nov 2014 00:55:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 C2084C99; Sun, 30 Nov 2014 00:55:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0toWN020203; Sun, 30 Nov 2014 00:55:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0tov2020202; Sun, 30 Nov 2014 00:55:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300055.sAU0tov2020202@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:55:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275292 - projects/building-blocks/tools/build/mk 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:55:50 -0000 Author: ngie Date: Sun Nov 30 00:55:50 2014 New Revision: 275292 URL: https://svnweb.freebsd.org/changeset/base/275292 Log: - Fill in MK_FILE, MK_PMC, MK_SQLITE3, and MK_ZONEINFO - Fill in etc/pam.d entries per r275291 - Fill in lib/libaudit entries - Fill in more MK_NTP entries Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 00:51:00 2014 (r275291) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 00:55:50 2014 (r275292) @@ -65,6 +65,7 @@ OLD_FILES+=usr/share/man/man8/zzz.8.gz .endif .if ${MK_AT} == no +OLD_FILES+=etc/pam.d/atrun OLD_FILES+=usr/bin/at OLD_FILES+=usr/bin/atq OLD_FILES+=usr/bin/atrm @@ -141,14 +142,128 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-A .if ${MK_AUDIT} == no OLD_FILES+=etc/rc.d/auditd OLD_FILES+=etc/rc.d/auditdistd +OLD_FILES+=usr/include/bsm/audit_uevents.h +OLD_FILES+=usr/include/bsm/libbsm.h +OLD_FILES+=usr/lib/libauditd.a +OLD_LIBS+=usr/lib/libauditd.so.5 +OLD_FILES+=usr/lib/libauditd_p.a +OLD_FILES+=usr/lib/libbsm.a +OLD_LIBS+=usr/lib/libbsm.so.3 +OLD_FILES+=usr/lib/libbsm_p.a OLD_FILES+=usr/sbin/audit OLD_FILES+=usr/sbin/auditd OLD_FILES+=usr/sbin/auditreduce OLD_FILES+=usr/sbin/praudit OLD_FILES+=usr/share/man/man1/auditreduce.1.gz OLD_FILES+=usr/share/man/man1/praudit.1.gz +OLD_FILES+=usr/share/man/man2/audit.2.gz +OLD_FILES+=usr/share/man/man2/auditctl.2.gz +OLD_FILES+=usr/share/man/man2/auditon.2.gz +OLD_FILES+=usr/share/man/man2/getaudit.2.gz +OLD_FILES+=usr/share/man/man2/getaudit_addr.2.gz +OLD_FILES+=usr/share/man/man2/getauid.2.gz +OLD_FILES+=usr/share/man/man2/setaudit.2.gz +OLD_FILES+=usr/share/man/man2/setaudit_addr.2.gz +OLD_FILES+=usr/share/man/man2/setauid.2.gz +OLD_FILES+=usr/share/man/man3/au_bsm_to_domain.3.gz +OLD_FILES+=usr/share/man/man3/au_bsm_to_errno.3.gz +OLD_FILES+=usr/share/man/man3/au_bsm_to_fcntl_cmd.3.gz +OLD_FILES+=usr/share/man/man3/au_bsm_to_socket_type.3.gz +OLD_FILES+=usr/share/man/man3/au_class.3.gz +OLD_FILES+=usr/share/man/man3/au_close.3.gz +OLD_FILES+=usr/share/man/man3/au_close_buffer.3.gz +OLD_FILES+=usr/share/man/man3/au_close_token.3.gz +OLD_FILES+=usr/share/man/man3/au_control.3.gz +OLD_FILES+=usr/share/man/man3/au_domain.3.gz +OLD_FILES+=usr/share/man/man3/au_domain_to_bsm.3.gz +OLD_FILES+=usr/share/man/man3/au_errno.3.gz +OLD_FILES+=usr/share/man/man3/au_errno_to_bsm.3.gz +OLD_FILES+=usr/share/man/man3/au_event.3.gz +OLD_FILES+=usr/share/man/man3/au_fcntl_cmd.3.gz +OLD_FILES+=usr/share/man/man3/au_fcntl_cmd_t_bsm.3.gz +OLD_FILES+=usr/share/man/man3/au_fetch_tok.3.gz +OLD_FILES+=usr/share/man/man3/au_free_token.3.gz +OLD_FILES+=usr/share/man/man3/au_io.3.gz +OLD_FILES+=usr/share/man/man3/au_mask.3.gz +OLD_FILES+=usr/share/man/man3/au_open.3.gz +OLD_FILES+=usr/share/man/man3/au_poltostr.3.gz +OLD_FILES+=usr/share/man/man3/au_preselect.3.gz +OLD_FILES+=usr/share/man/man3/au_print_tok.3.gz +OLD_FILES+=usr/share/man/man3/au_read_rec.3.gz +OLD_FILES+=usr/share/man/man3/au_socket_type.3.gz +OLD_FILES+=usr/share/man/man3/au_socket_type_to_bsm.3.gz +OLD_FILES+=usr/share/man/man3/au_strerror.3.gz +OLD_FILES+=usr/share/man/man3/au_strtopol.3.gz +OLD_FILES+=usr/share/man/man3/au_to_arg.3.gz +OLD_FILES+=usr/share/man/man3/au_to_arg32.3.gz +OLD_FILES+=usr/share/man/man3/au_to_arg64.3.gz +OLD_FILES+=usr/share/man/man3/au_to_attr64.3.gz +OLD_FILES+=usr/share/man/man3/au_to_data.3.gz +OLD_FILES+=usr/share/man/man3/au_to_exec_args.3.gz +OLD_FILES+=usr/share/man/man3/au_to_exec_env.3.gz +OLD_FILES+=usr/share/man/man3/au_to_exit.3.gz +OLD_FILES+=usr/share/man/man3/au_to_file.3.gz +OLD_FILES+=usr/share/man/man3/au_to_groups.3.gz +OLD_FILES+=usr/share/man/man3/au_to_header.3.gz +OLD_FILES+=usr/share/man/man3/au_to_header32.3.gz +OLD_FILES+=usr/share/man/man3/au_to_subject.3.gz +OLD_FILES+=usr/share/man/man3/au_to_subject32.3.gz +OLD_FILES+=usr/share/man/man3/au_to_subject32_ex.3.gz +OLD_FILES+=usr/share/man/man3/au_to_subject64.3.gz +OLD_FILES+=usr/share/man/man3/au_to_subject64_ex.3.gz +OLD_FILES+=usr/share/man/man3/au_to_subject_ex.3.gz +OLD_FILES+=usr/share/man/man3/au_to_text.3.gz +OLD_FILES+=usr/share/man/man3/au_to_trailer.3.gz +OLD_FILES+=usr/share/man/man3/au_to_zonename.3.gz +OLD_FILES+=usr/share/man/man3/au_token.3.gz +OLD_FILES+=usr/share/man/man3/au_user.3.gz +OLD_FILES+=usr/share/man/man3/au_user_mask.3.gz +OLD_FILES+=usr/share/man/man3/au_write.3.gz +OLD_FILES+=usr/share/man/man3/audit_submit.3.gz +OLD_FILES+=usr/share/man/man3/bsm.3.gz +OLD_FILES+=usr/share/man/man3/endac.3.gz +OLD_FILES+=usr/share/man/man3/endauclass.3.gz +OLD_FILES+=usr/share/man/man3/endauevent.3.gz +OLD_FILES+=usr/share/man/man3/endauuser.3.gz +OLD_FILES+=usr/share/man/man3/getacdir.3.gz +OLD_FILES+=usr/share/man/man3/getacfilesz.3.gz +OLD_FILES+=usr/share/man/man3/getacflg.3.gz +OLD_FILES+=usr/share/man/man3/getacmin.3.gz +OLD_FILES+=usr/share/man/man3/getacna.3.gz +OLD_FILES+=usr/share/man/man3/getacpol.3.gz +OLD_FILES+=usr/share/man/man3/getauclassent.3.gz +OLD_FILES+=usr/share/man/man3/getauclassent_r.3.gz +OLD_FILES+=usr/share/man/man3/getauclassnam.3.gz +OLD_FILES+=usr/share/man/man3/getauclassnam_3.3.gz +OLD_FILES+=usr/share/man/man3/getauditflagsbin.3.gz +OLD_FILES+=usr/share/man/man3/getauditflagschar.3.gz +OLD_FILES+=usr/share/man/man3/getauevent.3.gz +OLD_FILES+=usr/share/man/man3/getauevent_r.3.gz +OLD_FILES+=usr/share/man/man3/getauevnam.3.gz +OLD_FILES+=usr/share/man/man3/getauevnam_r.3.gz +OLD_FILES+=usr/share/man/man3/getauevnonam.3.gz +OLD_FILES+=usr/share/man/man3/getauevnonam_r.3.gz +OLD_FILES+=usr/share/man/man3/getauevnum.3.gz +OLD_FILES+=usr/share/man/man3/getauevnum_r.3.gz +OLD_FILES+=usr/share/man/man3/getauuserent.3.gz +OLD_FILES+=usr/share/man/man3/getauuserent_r.3.gz +OLD_FILES+=usr/share/man/man3/getauusernam.3.gz +OLD_FILES+=usr/share/man/man3/getauusernam_R.3.gz +OLD_FILES+=usr/share/man/man3/getfauditflags.3.gz +OLD_FILES+=usr/share/man/man3/libbsm.3.gz +OLD_FILES+=usr/share/man/man3/setac.3.gz +OLD_FILES+=usr/share/man/man3/setauclass.3.gz +OLD_FILES+=usr/share/man/man3/setauevent.3.gz +OLD_FILES+=usr/share/man/man3/setauuser.3.gz +OLD_FILES+=usr/share/man/man5/audit.log.5.gz +OLD_FILES+=usr/share/man/man5/audit_class.5.gz +OLD_FILES+=usr/share/man/man5/audit_control.5.gz +OLD_FILES+=usr/share/man/man5/audit_event.5.gz +OLD_FILES+=usr/share/man/man5/audit_user.5.gz +OLD_FILES+=usr/share/man/man5/audit_warn.5.gz OLD_FILES+=usr/share/man/man8/audit.8.gz OLD_FILES+=usr/share/man/man8/auditd.8.gz +OLD_DIRS+=usr/include/bsm .endif .if ${MK_AUTHPF} == no @@ -1095,6 +1210,19 @@ OLD_FILES+=usr/share/man/man1/gperf.1.gz .endif .endif +.if ${MK_FILE} == no +OLD_FILES+=usr/bin/file +OLD_FILES+=usr/include/magic.h +OLD_FILES+=usr/lib/libmagic.a +OLD_LIBS+=usr/lib/libmagic.so.4 +OLD_FILES+=usr/lib/libmagic_p.a +OLD_FILES+=usr/share/man/man1/file.1.gz +OLD_FILES+=usr/share/man/man3/libmagic.3.gz +OLD_FILES+=usr/share/man/man5/magic.5.gz +OLD_FILES+=usr/share/misc/magic +OLD_FILES+=usr/share/misc/magic.mgc +.endif + .if ${MK_FINGER} == no OLD_FILES+=usr/bin/finger OLD_FILES+=usr/libexec/fingerd @@ -1737,6 +1865,8 @@ OLD_FILES+=usr/share/man/man8/freebsd-up .endif .if ${MK_FTP} == no +OLD_FILES+=etc/pam.d/ftp +OLD_FILES+=etc/pam.d/ftpd OLD_FILES+=usr/bin/ftp OLD_FILES+=usr/bin/gate-ftp OLD_FILES+=usr/bin/pftp @@ -1876,7 +2006,32 @@ OLD_FILES+=usr/lib32/libgpib_p.a .endif .if ${MK_GPIO} == no +OLD_FILES+=usr/include/libgpio.h +OLD_FILES+=usr/lib/libgpio.a +OLD_LIBS+=usr/lib/libgpio.so.0 +OLD_FILES+=usr/lib/libgpio_p.a OLD_FILES+=usr/sbin/gpioctl +OLD_FILES+=usr/share/man/man3/gpio.3.gz +OLD_FILES+=usr/share/man/man3/gpio_close.3.gz +OLD_FILES+=usr/share/man/man3/gpio_open.3.gz +OLD_FILES+=usr/share/man/man3/gpio_open_device.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_config.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_get.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_high.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_input.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_invin.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_invout.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_list.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_low.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_opendrain.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_output.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_pulldown.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_pullup.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_pulsate.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_pushpull.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_set.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_set_flags.3.gz +OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz OLD_FILES+=usr/share/man/man8/gpioctl.8.gz .endif @@ -2364,6 +2519,9 @@ OLD_DIRS+=usr/share/tmac .endif .if ${MK_GSSAPI} == no +OLD_FILES+=etc/gss/mech +OLD_FILES+=etc/gss/qop +OLD_DIRS+=etc/gss OLD_FILES+=etc/rc.d/gssd OLD_FILES+=usr/include/gssapi/gssapi.h OLD_DIRS+=usr/include/gssapi @@ -3876,6 +4034,8 @@ OLD_FILES+=usr/share/man/man8/pac.8.gz .endif .if ${MK_MAIL} == no +OLD_FILES+=etc/pam.d/imap +OLD_FILES+=etc/pam.d/pop3 OLD_FILES+=etc/periodic/daily/130.clean-msgs OLD_FILES+=usr/bin/Mail OLD_FILES+=usr/bin/biff @@ -4054,6 +4214,25 @@ OLD_FILES+=usr/include/netgraph/ng_tee.h OLD_FILES+=usr/include/netgraph/ng_tty.h OLD_FILES+=usr/include/netgraph/ng_vjc.h OLD_FILES+=usr/include/netgraph/ng_vlan.h +OLD_FILES+=usr/include/netgraph.h +OLD_FILES+=usr/lib/libnetgraph.a +OLD_LIBS+=usr/lib/libnetgraph.so.4 +OLD_FILES+=usr/lib/libnetgraph_p.a +OLD_FILES+=usr/share/man/man3/NgAllocRecvAsciiMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgAllocRecvData.3.gz +OLD_FILES+=usr/share/man/man3/NgAllocRecvMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgMkSockNode.3.gz +OLD_FILES+=usr/share/man/man3/NgNameNode.3.gz +OLD_FILES+=usr/share/man/man3/NgRecvAsciiMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgRecvData.3.gz +OLD_FILES+=usr/share/man/man3/NgRecvMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgSendAsciiMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgSendData.3.gz +OLD_FILES+=usr/share/man/man3/NgSendMsg.3.gz +OLD_FILES+=usr/share/man/man3/NgSendMsgReply.3.gz +OLD_FILES+=usr/share/man/man3/NgSetDebug.3.gz +OLD_FILES+=usr/share/man/man3/NgSetErrLog.3.gz +OLD_FILES+=usr/share/man/man3/netgraph.3.gz OLD_DIRS+=usr/include/netgraph/atm OLD_DIRS+=usr/include/netgraph/netflow OLD_DIRS+=usr/include/netgraph @@ -4121,6 +4300,9 @@ OLD_FILES+=usr/tests/bin/sh/builtins/loc .if ${MK_NTP} == no OLD_FILES+=etc/ntp.conf +OLD_DIRS+=etc/ntp +OLD_FILES+=etc/rc.d/ntpd +OLD_FILES+=etc/rc.d/ntpdate OLD_FILES+=etc/periodic/daily/480.status-ntpd OLD_FILES+=usr/bin/ntpq OLD_FILES+=usr/sbin/ntp-keygen @@ -4212,6 +4394,7 @@ OLD_FILES+=usr/share/man/man8/ntptime.8. #.endif .if ${MK_OPENSSH} == no +OLD_FILES+=etc/pam.d/sshd OLD_FILES+=usr/bin/sftp OLD_FILES+=usr/bin/ssh OLD_FILES+=usr/bin/ssh-add @@ -4328,6 +4511,85 @@ OLD_DIRS+=usr/share/pc-sysinstall OLD_DIRS+=usr/share/examples/pc-sysinstall .endif +.if ${MK_PMC} == no +OLD_FILES+=usr/include/pmc.h +OLD_FILES+=usr/include/pmclog.h +OLD_FILES+=usr/lib/libpmc.a +OLD_LIBS+=usr/lib/libpmc.so.5 +OLD_FILES+=usr/lib/libpmc_p.a +OLD_FILES+=usr/sbin/pmcannotate +OLD_FILES+=usr/sbin/pmccontrol +OLD_FILES+=usr/sbin/pmcstat +OLD_FILES+=usr/share/man/man3/pmc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz +OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz +OLD_FILES+=usr/share/man/man3/pmc.core.3.gz +OLD_FILES+=usr/share/man/man3/pmc.core2.3.gz +OLD_FILES+=usr/share/man/man3/pmc.corei7.3.gz +OLD_FILES+=usr/share/man/man3/pmc.corei7uc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.haswell.3.gz +OLD_FILES+=usr/share/man/man3/pmc.haswelluc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz +OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz +OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz +OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz +OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz +OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz +OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz +OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz +OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz +OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz +OLD_FILES+=usr/share/man/man3/pmc.sandybridge.3.gz +OLD_FILES+=usr/share/man/man3/pmc.sandybridgeuc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.sandybridgexeon.3.gz +OLD_FILES+=usr/share/man/man3/pmc.soft.3.gz +OLD_FILES+=usr/share/man/man3/pmc.tsc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.ucf.3.gz +OLD_FILES+=usr/share/man/man3/pmc.westmere.3.gz +OLD_FILES+=usr/share/man/man3/pmc.westmereuc.3.gz +OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz +OLD_FILES+=usr/share/man/man3/pmc_allocate.3.gz +OLD_FILES+=usr/share/man/man3/pmc_attach.3.gz +OLD_FILES+=usr/share/man/man3/pmc_capabilities.3.gz +OLD_FILES+=usr/share/man/man3/pmc_configure_logfile.3.gz +OLD_FILES+=usr/share/man/man3/pmc_cpuinfo.3.gz +OLD_FILES+=usr/share/man/man3/pmc_detach.3.gz +OLD_FILES+=usr/share/man/man3/pmc_disable.3.gz +OLD_FILES+=usr/share/man/man3/pmc_enable.3.gz +OLD_FILES+=usr/share/man/man3/pmc_event_names_of_class.3.gz +OLD_FILES+=usr/share/man/man3/pmc_flush_logfile.3.gz +OLD_FILES+=usr/share/man/man3/pmc_get_driver_stats.3.gz +OLD_FILES+=usr/share/man/man3/pmc_get_msr.3.gz +OLD_FILES+=usr/share/man/man3/pmc_init.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_capability.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_class.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_cputype.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_disposition.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_event.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_mode.3.gz +OLD_FILES+=usr/share/man/man3/pmc_name_of_state.3.gz +OLD_FILES+=usr/share/man/man3/pmc_ncpu.3.gz +OLD_FILES+=usr/share/man/man3/pmc_npmc.3.gz +OLD_FILES+=usr/share/man/man3/pmc_pmcinfo.3.gz +OLD_FILES+=usr/share/man/man3/pmc_read.3.gz +OLD_FILES+=usr/share/man/man3/pmc_release.3.gz +OLD_FILES+=usr/share/man/man3/pmc_rw.3.gz +OLD_FILES+=usr/share/man/man3/pmc_set.3.gz +OLD_FILES+=usr/share/man/man3/pmc_start.3.gz +OLD_FILES+=usr/share/man/man3/pmc_stop.3.gz +OLD_FILES+=usr/share/man/man3/pmc_width.3.gz +OLD_FILES+=usr/share/man/man3/pmc_write.3.gz +OLD_FILES+=usr/share/man/man3/pmc_writelog.3.gz +OLD_FILES+=usr/share/man/man3/pmclog.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_close.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_feed.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_open.3.gz +OLD_FILES+=usr/share/man/man3/pmclog_read.3.gz +OLD_FILES+=usr/share/man/man8/pmcannotate.8.gz +OLD_FILES+=usr/share/man/man8/pmccontrol.8.gz +OLD_FILES+=usr/share/man/man8/pmcstat.8.gz +.endif + .if ${MK_PF} == no OLD_FILES+=etc/periodic/security/520.pfdenied OLD_FILES+=etc/pf.os @@ -4360,6 +4622,7 @@ OLD_FILES+=usr/share/man/man8/tftp-proxy .endif .if ${MK_PKGBOOTSTRAP} == no +OLD_FILES+=etc/pkg/FreeBSD.conf OLD_FILES+=usr/sbin/pkg OLD_FILES+=usr/share/man/man7/pkg.7.gz .endif @@ -4849,6 +5112,10 @@ OLD_FILES+=usr/share/doc/pjdfstest/READM OLD_DIRS+=usr/share/doc/pjdfstest .endif +.if ${MK_SQLITE3} == no +OLD_LIBS+=usr/lib/private/libsqlite3.so.0 +.endif + .if ${MK_SYSCONS} == no OLD_FILES+=usr/share/man/man4/syscons.4.gz OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts @@ -6208,6 +6475,495 @@ OLD_FILES+=usr/share/man/man8/wpa_passph OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz .endif +.if ${MK_ZONEINFO} == no +OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan +OLD_FILES+=usr/share/zoneinfo/Africa/Accra +OLD_FILES+=usr/share/zoneinfo/Africa/Addis_Ababa +OLD_FILES+=usr/share/zoneinfo/Africa/Algiers +OLD_FILES+=usr/share/zoneinfo/Africa/Asmara +OLD_FILES+=usr/share/zoneinfo/Africa/Bamako +OLD_FILES+=usr/share/zoneinfo/Africa/Bangui +OLD_FILES+=usr/share/zoneinfo/Africa/Banjul +OLD_FILES+=usr/share/zoneinfo/Africa/Bissau +OLD_FILES+=usr/share/zoneinfo/Africa/Blantyre +OLD_FILES+=usr/share/zoneinfo/Africa/Brazzaville +OLD_FILES+=usr/share/zoneinfo/Africa/Bujumbura +OLD_FILES+=usr/share/zoneinfo/Africa/Cairo +OLD_FILES+=usr/share/zoneinfo/Africa/Casablanca +OLD_FILES+=usr/share/zoneinfo/Africa/Ceuta +OLD_FILES+=usr/share/zoneinfo/Africa/Conakry +OLD_FILES+=usr/share/zoneinfo/Africa/Dakar +OLD_FILES+=usr/share/zoneinfo/Africa/Dar_es_Salaam +OLD_FILES+=usr/share/zoneinfo/Africa/Djibouti +OLD_FILES+=usr/share/zoneinfo/Africa/Douala +OLD_FILES+=usr/share/zoneinfo/Africa/El_Aaiun +OLD_FILES+=usr/share/zoneinfo/Africa/Freetown +OLD_FILES+=usr/share/zoneinfo/Africa/Gaborone +OLD_FILES+=usr/share/zoneinfo/Africa/Harare +OLD_FILES+=usr/share/zoneinfo/Africa/Johannesburg +OLD_FILES+=usr/share/zoneinfo/Africa/Juba +OLD_FILES+=usr/share/zoneinfo/Africa/Kampala +OLD_FILES+=usr/share/zoneinfo/Africa/Khartoum +OLD_FILES+=usr/share/zoneinfo/Africa/Kigali +OLD_FILES+=usr/share/zoneinfo/Africa/Kinshasa +OLD_FILES+=usr/share/zoneinfo/Africa/Lagos +OLD_FILES+=usr/share/zoneinfo/Africa/Libreville +OLD_FILES+=usr/share/zoneinfo/Africa/Lome +OLD_FILES+=usr/share/zoneinfo/Africa/Luanda +OLD_FILES+=usr/share/zoneinfo/Africa/Lubumbashi +OLD_FILES+=usr/share/zoneinfo/Africa/Lusaka +OLD_FILES+=usr/share/zoneinfo/Africa/Malabo +OLD_FILES+=usr/share/zoneinfo/Africa/Maputo +OLD_FILES+=usr/share/zoneinfo/Africa/Maseru +OLD_FILES+=usr/share/zoneinfo/Africa/Mbabane +OLD_FILES+=usr/share/zoneinfo/Africa/Mogadishu +OLD_FILES+=usr/share/zoneinfo/Africa/Monrovia +OLD_FILES+=usr/share/zoneinfo/Africa/Nairobi +OLD_FILES+=usr/share/zoneinfo/Africa/Ndjamena +OLD_FILES+=usr/share/zoneinfo/Africa/Niamey +OLD_FILES+=usr/share/zoneinfo/Africa/Nouakchott +OLD_FILES+=usr/share/zoneinfo/Africa/Ouagadougou +OLD_FILES+=usr/share/zoneinfo/Africa/Porto-Novo +OLD_FILES+=usr/share/zoneinfo/Africa/Sao_Tome +OLD_FILES+=usr/share/zoneinfo/Africa/Tripoli +OLD_FILES+=usr/share/zoneinfo/Africa/Tunis +OLD_FILES+=usr/share/zoneinfo/Africa/Windhoek +OLD_FILES+=usr/share/zoneinfo/America/Adak +OLD_FILES+=usr/share/zoneinfo/America/Anchorage +OLD_FILES+=usr/share/zoneinfo/America/Anguilla +OLD_FILES+=usr/share/zoneinfo/America/Antigua +OLD_FILES+=usr/share/zoneinfo/America/Araguaina +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Buenos_Aires +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Catamarca +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Cordoba +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Jujuy +OLD_FILES+=usr/share/zoneinfo/America/Argentina/La_Rioja +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Mendoza +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Rio_Gallegos +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Salta +OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Juan +OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Luis +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Tucuman +OLD_FILES+=usr/share/zoneinfo/America/Argentina/Ushuaia +OLD_FILES+=usr/share/zoneinfo/America/Aruba +OLD_FILES+=usr/share/zoneinfo/America/Asuncion +OLD_FILES+=usr/share/zoneinfo/America/Atikokan +OLD_FILES+=usr/share/zoneinfo/America/Bahia +OLD_FILES+=usr/share/zoneinfo/America/Bahia_Banderas +OLD_FILES+=usr/share/zoneinfo/America/Barbados +OLD_FILES+=usr/share/zoneinfo/America/Belem +OLD_FILES+=usr/share/zoneinfo/America/Belize +OLD_FILES+=usr/share/zoneinfo/America/Blanc-Sablon +OLD_FILES+=usr/share/zoneinfo/America/Boa_Vista +OLD_FILES+=usr/share/zoneinfo/America/Bogota +OLD_FILES+=usr/share/zoneinfo/America/Boise +OLD_FILES+=usr/share/zoneinfo/America/Cambridge_Bay +OLD_FILES+=usr/share/zoneinfo/America/Campo_Grande +OLD_FILES+=usr/share/zoneinfo/America/Cancun +OLD_FILES+=usr/share/zoneinfo/America/Caracas +OLD_FILES+=usr/share/zoneinfo/America/Cayenne +OLD_FILES+=usr/share/zoneinfo/America/Cayman +OLD_FILES+=usr/share/zoneinfo/America/Chicago +OLD_FILES+=usr/share/zoneinfo/America/Chihuahua +OLD_FILES+=usr/share/zoneinfo/America/Costa_Rica +OLD_FILES+=usr/share/zoneinfo/America/Creston +OLD_FILES+=usr/share/zoneinfo/America/Cuiaba +OLD_FILES+=usr/share/zoneinfo/America/Curacao +OLD_FILES+=usr/share/zoneinfo/America/Danmarkshavn +OLD_FILES+=usr/share/zoneinfo/America/Dawson +OLD_FILES+=usr/share/zoneinfo/America/Dawson_Creek +OLD_FILES+=usr/share/zoneinfo/America/Denver +OLD_FILES+=usr/share/zoneinfo/America/Detroit +OLD_FILES+=usr/share/zoneinfo/America/Dominica +OLD_FILES+=usr/share/zoneinfo/America/Edmonton +OLD_FILES+=usr/share/zoneinfo/America/Eirunepe +OLD_FILES+=usr/share/zoneinfo/America/El_Salvador +OLD_FILES+=usr/share/zoneinfo/America/Fortaleza +OLD_FILES+=usr/share/zoneinfo/America/Glace_Bay +OLD_FILES+=usr/share/zoneinfo/America/Godthab +OLD_FILES+=usr/share/zoneinfo/America/Goose_Bay +OLD_FILES+=usr/share/zoneinfo/America/Grand_Turk +OLD_FILES+=usr/share/zoneinfo/America/Grenada +OLD_FILES+=usr/share/zoneinfo/America/Guadeloupe +OLD_FILES+=usr/share/zoneinfo/America/Guatemala +OLD_FILES+=usr/share/zoneinfo/America/Guayaquil +OLD_FILES+=usr/share/zoneinfo/America/Guyana +OLD_FILES+=usr/share/zoneinfo/America/Halifax +OLD_FILES+=usr/share/zoneinfo/America/Havana +OLD_FILES+=usr/share/zoneinfo/America/Hermosillo +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Indianapolis +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Knox +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Marengo +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Petersburg +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Tell_City +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vevay +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vincennes +OLD_FILES+=usr/share/zoneinfo/America/Indiana/Winamac +OLD_FILES+=usr/share/zoneinfo/America/Inuvik +OLD_FILES+=usr/share/zoneinfo/America/Iqaluit +OLD_FILES+=usr/share/zoneinfo/America/Jamaica +OLD_FILES+=usr/share/zoneinfo/America/Juneau +OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Louisville +OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Monticello +OLD_FILES+=usr/share/zoneinfo/America/Kralendijk +OLD_FILES+=usr/share/zoneinfo/America/La_Paz +OLD_FILES+=usr/share/zoneinfo/America/Lima +OLD_FILES+=usr/share/zoneinfo/America/Los_Angeles +OLD_FILES+=usr/share/zoneinfo/America/Lower_Princes +OLD_FILES+=usr/share/zoneinfo/America/Maceio +OLD_FILES+=usr/share/zoneinfo/America/Managua +OLD_FILES+=usr/share/zoneinfo/America/Manaus +OLD_FILES+=usr/share/zoneinfo/America/Marigot +OLD_FILES+=usr/share/zoneinfo/America/Martinique +OLD_FILES+=usr/share/zoneinfo/America/Matamoros +OLD_FILES+=usr/share/zoneinfo/America/Mazatlan +OLD_FILES+=usr/share/zoneinfo/America/Menominee +OLD_FILES+=usr/share/zoneinfo/America/Merida +OLD_FILES+=usr/share/zoneinfo/America/Metlakatla +OLD_FILES+=usr/share/zoneinfo/America/Mexico_City +OLD_FILES+=usr/share/zoneinfo/America/Miquelon +OLD_FILES+=usr/share/zoneinfo/America/Moncton +OLD_FILES+=usr/share/zoneinfo/America/Monterrey +OLD_FILES+=usr/share/zoneinfo/America/Montevideo +OLD_FILES+=usr/share/zoneinfo/America/Montreal +OLD_FILES+=usr/share/zoneinfo/America/Montserrat +OLD_FILES+=usr/share/zoneinfo/America/Nassau +OLD_FILES+=usr/share/zoneinfo/America/New_York +OLD_FILES+=usr/share/zoneinfo/America/Nipigon +OLD_FILES+=usr/share/zoneinfo/America/Nome +OLD_FILES+=usr/share/zoneinfo/America/Noronha +OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Beulah +OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Center +OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/New_Salem +OLD_FILES+=usr/share/zoneinfo/America/Ojinaga +OLD_FILES+=usr/share/zoneinfo/America/Panama +OLD_FILES+=usr/share/zoneinfo/America/Pangnirtung +OLD_FILES+=usr/share/zoneinfo/America/Paramaribo +OLD_FILES+=usr/share/zoneinfo/America/Phoenix +OLD_FILES+=usr/share/zoneinfo/America/Port-au-Prince +OLD_FILES+=usr/share/zoneinfo/America/Port_of_Spain +OLD_FILES+=usr/share/zoneinfo/America/Porto_Velho +OLD_FILES+=usr/share/zoneinfo/America/Puerto_Rico +OLD_FILES+=usr/share/zoneinfo/America/Rainy_River +OLD_FILES+=usr/share/zoneinfo/America/Rankin_Inlet +OLD_FILES+=usr/share/zoneinfo/America/Recife +OLD_FILES+=usr/share/zoneinfo/America/Regina +OLD_FILES+=usr/share/zoneinfo/America/Resolute +OLD_FILES+=usr/share/zoneinfo/America/Rio_Branco +OLD_FILES+=usr/share/zoneinfo/America/Santa_Isabel +OLD_FILES+=usr/share/zoneinfo/America/Santarem +OLD_FILES+=usr/share/zoneinfo/America/Santiago +OLD_FILES+=usr/share/zoneinfo/America/Santo_Domingo +OLD_FILES+=usr/share/zoneinfo/America/Sao_Paulo +OLD_FILES+=usr/share/zoneinfo/America/Scoresbysund +OLD_FILES+=usr/share/zoneinfo/America/Sitka +OLD_FILES+=usr/share/zoneinfo/America/St_Barthelemy +OLD_FILES+=usr/share/zoneinfo/America/St_Johns +OLD_FILES+=usr/share/zoneinfo/America/St_Kitts +OLD_FILES+=usr/share/zoneinfo/America/St_Lucia +OLD_FILES+=usr/share/zoneinfo/America/St_Thomas +OLD_FILES+=usr/share/zoneinfo/America/St_Vincent +OLD_FILES+=usr/share/zoneinfo/America/Swift_Current +OLD_FILES+=usr/share/zoneinfo/America/Tegucigalpa +OLD_FILES+=usr/share/zoneinfo/America/Thule +OLD_FILES+=usr/share/zoneinfo/America/Thunder_Bay +OLD_FILES+=usr/share/zoneinfo/America/Tijuana +OLD_FILES+=usr/share/zoneinfo/America/Toronto +OLD_FILES+=usr/share/zoneinfo/America/Tortola +OLD_FILES+=usr/share/zoneinfo/America/Vancouver +OLD_FILES+=usr/share/zoneinfo/America/Whitehorse +OLD_FILES+=usr/share/zoneinfo/America/Winnipeg +OLD_FILES+=usr/share/zoneinfo/America/Yakutat +OLD_FILES+=usr/share/zoneinfo/America/Yellowknife +OLD_FILES+=usr/share/zoneinfo/Antarctica/Casey +OLD_FILES+=usr/share/zoneinfo/Antarctica/Davis +OLD_FILES+=usr/share/zoneinfo/Antarctica/DumontDUrville +OLD_FILES+=usr/share/zoneinfo/Antarctica/Macquarie +OLD_FILES+=usr/share/zoneinfo/Antarctica/Mawson +OLD_FILES+=usr/share/zoneinfo/Antarctica/McMurdo +OLD_FILES+=usr/share/zoneinfo/Antarctica/Palmer +OLD_FILES+=usr/share/zoneinfo/Antarctica/Rothera +OLD_FILES+=usr/share/zoneinfo/Antarctica/Syowa +OLD_FILES+=usr/share/zoneinfo/Antarctica/Troll +OLD_FILES+=usr/share/zoneinfo/Antarctica/Vostok +OLD_FILES+=usr/share/zoneinfo/Arctic/Longyearbyen +OLD_FILES+=usr/share/zoneinfo/Asia/Aden +OLD_FILES+=usr/share/zoneinfo/Asia/Almaty +OLD_FILES+=usr/share/zoneinfo/Asia/Amman +OLD_FILES+=usr/share/zoneinfo/Asia/Anadyr +OLD_FILES+=usr/share/zoneinfo/Asia/Aqtau +OLD_FILES+=usr/share/zoneinfo/Asia/Aqtobe +OLD_FILES+=usr/share/zoneinfo/Asia/Ashgabat +OLD_FILES+=usr/share/zoneinfo/Asia/Baghdad +OLD_FILES+=usr/share/zoneinfo/Asia/Bahrain +OLD_FILES+=usr/share/zoneinfo/Asia/Baku +OLD_FILES+=usr/share/zoneinfo/Asia/Bangkok +OLD_FILES+=usr/share/zoneinfo/Asia/Beirut +OLD_FILES+=usr/share/zoneinfo/Asia/Bishkek +OLD_FILES+=usr/share/zoneinfo/Asia/Brunei +OLD_FILES+=usr/share/zoneinfo/Asia/Chita +OLD_FILES+=usr/share/zoneinfo/Asia/Choibalsan +OLD_FILES+=usr/share/zoneinfo/Asia/Colombo +OLD_FILES+=usr/share/zoneinfo/Asia/Damascus +OLD_FILES+=usr/share/zoneinfo/Asia/Dhaka +OLD_FILES+=usr/share/zoneinfo/Asia/Dili +OLD_FILES+=usr/share/zoneinfo/Asia/Dubai +OLD_FILES+=usr/share/zoneinfo/Asia/Dushanbe +OLD_FILES+=usr/share/zoneinfo/Asia/Gaza +OLD_FILES+=usr/share/zoneinfo/Asia/Hebron +OLD_FILES+=usr/share/zoneinfo/Asia/Ho_Chi_Minh +OLD_FILES+=usr/share/zoneinfo/Asia/Hong_Kong +OLD_FILES+=usr/share/zoneinfo/Asia/Hovd +OLD_FILES+=usr/share/zoneinfo/Asia/Irkutsk +OLD_FILES+=usr/share/zoneinfo/Asia/Istanbul +OLD_FILES+=usr/share/zoneinfo/Asia/Jakarta +OLD_FILES+=usr/share/zoneinfo/Asia/Jayapura +OLD_FILES+=usr/share/zoneinfo/Asia/Jerusalem +OLD_FILES+=usr/share/zoneinfo/Asia/Kabul +OLD_FILES+=usr/share/zoneinfo/Asia/Kamchatka +OLD_FILES+=usr/share/zoneinfo/Asia/Karachi +OLD_FILES+=usr/share/zoneinfo/Asia/Kathmandu +OLD_FILES+=usr/share/zoneinfo/Asia/Khandyga +OLD_FILES+=usr/share/zoneinfo/Asia/Kolkata +OLD_FILES+=usr/share/zoneinfo/Asia/Krasnoyarsk +OLD_FILES+=usr/share/zoneinfo/Asia/Kuala_Lumpur +OLD_FILES+=usr/share/zoneinfo/Asia/Kuching +OLD_FILES+=usr/share/zoneinfo/Asia/Kuwait +OLD_FILES+=usr/share/zoneinfo/Asia/Macau +OLD_FILES+=usr/share/zoneinfo/Asia/Magadan +OLD_FILES+=usr/share/zoneinfo/Asia/Makassar +OLD_FILES+=usr/share/zoneinfo/Asia/Manila +OLD_FILES+=usr/share/zoneinfo/Asia/Muscat +OLD_FILES+=usr/share/zoneinfo/Asia/Nicosia +OLD_FILES+=usr/share/zoneinfo/Asia/Novokuznetsk +OLD_FILES+=usr/share/zoneinfo/Asia/Novosibirsk +OLD_FILES+=usr/share/zoneinfo/Asia/Omsk +OLD_FILES+=usr/share/zoneinfo/Asia/Oral +OLD_FILES+=usr/share/zoneinfo/Asia/Phnom_Penh +OLD_FILES+=usr/share/zoneinfo/Asia/Pontianak +OLD_FILES+=usr/share/zoneinfo/Asia/Pyongyang +OLD_FILES+=usr/share/zoneinfo/Asia/Qatar +OLD_FILES+=usr/share/zoneinfo/Asia/Qyzylorda +OLD_FILES+=usr/share/zoneinfo/Asia/Rangoon +OLD_FILES+=usr/share/zoneinfo/Asia/Riyadh +OLD_FILES+=usr/share/zoneinfo/Asia/Sakhalin +OLD_FILES+=usr/share/zoneinfo/Asia/Samarkand +OLD_FILES+=usr/share/zoneinfo/Asia/Seoul +OLD_FILES+=usr/share/zoneinfo/Asia/Shanghai +OLD_FILES+=usr/share/zoneinfo/Asia/Singapore +OLD_FILES+=usr/share/zoneinfo/Asia/Srednekolymsk +OLD_FILES+=usr/share/zoneinfo/Asia/Taipei +OLD_FILES+=usr/share/zoneinfo/Asia/Tashkent +OLD_FILES+=usr/share/zoneinfo/Asia/Tbilisi +OLD_FILES+=usr/share/zoneinfo/Asia/Tehran +OLD_FILES+=usr/share/zoneinfo/Asia/Thimphu +OLD_FILES+=usr/share/zoneinfo/Asia/Tokyo +OLD_FILES+=usr/share/zoneinfo/Asia/Ulaanbaatar +OLD_FILES+=usr/share/zoneinfo/Asia/Urumqi +OLD_FILES+=usr/share/zoneinfo/Asia/Ust-Nera +OLD_FILES+=usr/share/zoneinfo/Asia/Vientiane +OLD_FILES+=usr/share/zoneinfo/Asia/Vladivostok +OLD_FILES+=usr/share/zoneinfo/Asia/Yakutsk +OLD_FILES+=usr/share/zoneinfo/Asia/Yekaterinburg +OLD_FILES+=usr/share/zoneinfo/Asia/Yerevan +OLD_FILES+=usr/share/zoneinfo/Atlantic/Azores +OLD_FILES+=usr/share/zoneinfo/Atlantic/Bermuda +OLD_FILES+=usr/share/zoneinfo/Atlantic/Canary +OLD_FILES+=usr/share/zoneinfo/Atlantic/Cape_Verde +OLD_FILES+=usr/share/zoneinfo/Atlantic/Faroe +OLD_FILES+=usr/share/zoneinfo/Atlantic/Madeira +OLD_FILES+=usr/share/zoneinfo/Atlantic/Reykjavik +OLD_FILES+=usr/share/zoneinfo/Atlantic/South_Georgia +OLD_FILES+=usr/share/zoneinfo/Atlantic/St_Helena +OLD_FILES+=usr/share/zoneinfo/Atlantic/Stanley +OLD_FILES+=usr/share/zoneinfo/Australia/Adelaide +OLD_FILES+=usr/share/zoneinfo/Australia/Brisbane +OLD_FILES+=usr/share/zoneinfo/Australia/Broken_Hill +OLD_FILES+=usr/share/zoneinfo/Australia/Currie +OLD_FILES+=usr/share/zoneinfo/Australia/Darwin +OLD_FILES+=usr/share/zoneinfo/Australia/Eucla +OLD_FILES+=usr/share/zoneinfo/Australia/Hobart +OLD_FILES+=usr/share/zoneinfo/Australia/Lindeman +OLD_FILES+=usr/share/zoneinfo/Australia/Lord_Howe +OLD_FILES+=usr/share/zoneinfo/Australia/Melbourne +OLD_FILES+=usr/share/zoneinfo/Australia/Perth +OLD_FILES+=usr/share/zoneinfo/Australia/Sydney +OLD_FILES+=usr/share/zoneinfo/CET +OLD_FILES+=usr/share/zoneinfo/CST6CDT +OLD_FILES+=usr/share/zoneinfo/EET +OLD_FILES+=usr/share/zoneinfo/EST +OLD_FILES+=usr/share/zoneinfo/EST5EDT +OLD_FILES+=usr/share/zoneinfo/Etc/GMT +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+0 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+1 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+10 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+11 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+12 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+2 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+3 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+4 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+5 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+6 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+7 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+8 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT+9 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-0 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-1 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-10 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-11 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-12 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-13 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-14 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-2 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-3 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-4 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-5 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-6 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-7 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-8 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT-9 +OLD_FILES+=usr/share/zoneinfo/Etc/GMT0 +OLD_FILES+=usr/share/zoneinfo/Etc/Greenwich +OLD_FILES+=usr/share/zoneinfo/Etc/UCT +OLD_FILES+=usr/share/zoneinfo/Etc/UTC +OLD_FILES+=usr/share/zoneinfo/Etc/Universal +OLD_FILES+=usr/share/zoneinfo/Etc/Zulu +OLD_FILES+=usr/share/zoneinfo/Europe/Amsterdam +OLD_FILES+=usr/share/zoneinfo/Europe/Andorra +OLD_FILES+=usr/share/zoneinfo/Europe/Athens +OLD_FILES+=usr/share/zoneinfo/Europe/Belgrade +OLD_FILES+=usr/share/zoneinfo/Europe/Berlin +OLD_FILES+=usr/share/zoneinfo/Europe/Bratislava +OLD_FILES+=usr/share/zoneinfo/Europe/Brussels +OLD_FILES+=usr/share/zoneinfo/Europe/Bucharest +OLD_FILES+=usr/share/zoneinfo/Europe/Budapest +OLD_FILES+=usr/share/zoneinfo/Europe/Busingen +OLD_FILES+=usr/share/zoneinfo/Europe/Chisinau +OLD_FILES+=usr/share/zoneinfo/Europe/Copenhagen +OLD_FILES+=usr/share/zoneinfo/Europe/Dublin +OLD_FILES+=usr/share/zoneinfo/Europe/Gibraltar +OLD_FILES+=usr/share/zoneinfo/Europe/Guernsey +OLD_FILES+=usr/share/zoneinfo/Europe/Helsinki +OLD_FILES+=usr/share/zoneinfo/Europe/Isle_of_Man +OLD_FILES+=usr/share/zoneinfo/Europe/Istanbul +OLD_FILES+=usr/share/zoneinfo/Europe/Jersey +OLD_FILES+=usr/share/zoneinfo/Europe/Kaliningrad +OLD_FILES+=usr/share/zoneinfo/Europe/Kiev +OLD_FILES+=usr/share/zoneinfo/Europe/Lisbon +OLD_FILES+=usr/share/zoneinfo/Europe/Ljubljana +OLD_FILES+=usr/share/zoneinfo/Europe/London +OLD_FILES+=usr/share/zoneinfo/Europe/Luxembourg +OLD_FILES+=usr/share/zoneinfo/Europe/Madrid +OLD_FILES+=usr/share/zoneinfo/Europe/Malta +OLD_FILES+=usr/share/zoneinfo/Europe/Mariehamn +OLD_FILES+=usr/share/zoneinfo/Europe/Minsk +OLD_FILES+=usr/share/zoneinfo/Europe/Monaco +OLD_FILES+=usr/share/zoneinfo/Europe/Moscow +OLD_FILES+=usr/share/zoneinfo/Europe/Nicosia +OLD_FILES+=usr/share/zoneinfo/Europe/Oslo +OLD_FILES+=usr/share/zoneinfo/Europe/Paris +OLD_FILES+=usr/share/zoneinfo/Europe/Podgorica +OLD_FILES+=usr/share/zoneinfo/Europe/Prague +OLD_FILES+=usr/share/zoneinfo/Europe/Riga +OLD_FILES+=usr/share/zoneinfo/Europe/Rome +OLD_FILES+=usr/share/zoneinfo/Europe/Samara +OLD_FILES+=usr/share/zoneinfo/Europe/San_Marino +OLD_FILES+=usr/share/zoneinfo/Europe/Sarajevo +OLD_FILES+=usr/share/zoneinfo/Europe/Simferopol +OLD_FILES+=usr/share/zoneinfo/Europe/Skopje +OLD_FILES+=usr/share/zoneinfo/Europe/Sofia +OLD_FILES+=usr/share/zoneinfo/Europe/Stockholm +OLD_FILES+=usr/share/zoneinfo/Europe/Tallinn +OLD_FILES+=usr/share/zoneinfo/Europe/Tirane +OLD_FILES+=usr/share/zoneinfo/Europe/Uzhgorod +OLD_FILES+=usr/share/zoneinfo/Europe/Vaduz +OLD_FILES+=usr/share/zoneinfo/Europe/Vatican +OLD_FILES+=usr/share/zoneinfo/Europe/Vienna +OLD_FILES+=usr/share/zoneinfo/Europe/Vilnius +OLD_FILES+=usr/share/zoneinfo/Europe/Volgograd +OLD_FILES+=usr/share/zoneinfo/Europe/Warsaw +OLD_FILES+=usr/share/zoneinfo/Europe/Zagreb +OLD_FILES+=usr/share/zoneinfo/Europe/Zaporozhye +OLD_FILES+=usr/share/zoneinfo/Europe/Zurich +OLD_FILES+=usr/share/zoneinfo/Factory +OLD_FILES+=usr/share/zoneinfo/HST +OLD_FILES+=usr/share/zoneinfo/Indian/Antananarivo +OLD_FILES+=usr/share/zoneinfo/Indian/Chagos +OLD_FILES+=usr/share/zoneinfo/Indian/Christmas +OLD_FILES+=usr/share/zoneinfo/Indian/Cocos +OLD_FILES+=usr/share/zoneinfo/Indian/Comoro +OLD_FILES+=usr/share/zoneinfo/Indian/Kerguelen +OLD_FILES+=usr/share/zoneinfo/Indian/Mahe +OLD_FILES+=usr/share/zoneinfo/Indian/Maldives +OLD_FILES+=usr/share/zoneinfo/Indian/Mauritius +OLD_FILES+=usr/share/zoneinfo/Indian/Mayotte +OLD_FILES+=usr/share/zoneinfo/Indian/Reunion +OLD_FILES+=usr/share/zoneinfo/MET +OLD_FILES+=usr/share/zoneinfo/MST +OLD_FILES+=usr/share/zoneinfo/MST7MDT +OLD_FILES+=usr/share/zoneinfo/PST8PDT +OLD_FILES+=usr/share/zoneinfo/Pacific/Apia +OLD_FILES+=usr/share/zoneinfo/Pacific/Auckland +OLD_FILES+=usr/share/zoneinfo/Pacific/Bougainville +OLD_FILES+=usr/share/zoneinfo/Pacific/Chatham +OLD_FILES+=usr/share/zoneinfo/Pacific/Chuuk +OLD_FILES+=usr/share/zoneinfo/Pacific/Easter +OLD_FILES+=usr/share/zoneinfo/Pacific/Efate +OLD_FILES+=usr/share/zoneinfo/Pacific/Enderbury +OLD_FILES+=usr/share/zoneinfo/Pacific/Fakaofo +OLD_FILES+=usr/share/zoneinfo/Pacific/Fiji +OLD_FILES+=usr/share/zoneinfo/Pacific/Funafuti +OLD_FILES+=usr/share/zoneinfo/Pacific/Galapagos +OLD_FILES+=usr/share/zoneinfo/Pacific/Gambier +OLD_FILES+=usr/share/zoneinfo/Pacific/Guadalcanal +OLD_FILES+=usr/share/zoneinfo/Pacific/Guam +OLD_FILES+=usr/share/zoneinfo/Pacific/Honolulu +OLD_FILES+=usr/share/zoneinfo/Pacific/Johnston +OLD_FILES+=usr/share/zoneinfo/Pacific/Kiritimati +OLD_FILES+=usr/share/zoneinfo/Pacific/Kosrae +OLD_FILES+=usr/share/zoneinfo/Pacific/Kwajalein +OLD_FILES+=usr/share/zoneinfo/Pacific/Majuro +OLD_FILES+=usr/share/zoneinfo/Pacific/Marquesas +OLD_FILES+=usr/share/zoneinfo/Pacific/Midway +OLD_FILES+=usr/share/zoneinfo/Pacific/Nauru +OLD_FILES+=usr/share/zoneinfo/Pacific/Niue +OLD_FILES+=usr/share/zoneinfo/Pacific/Norfolk +OLD_FILES+=usr/share/zoneinfo/Pacific/Noumea +OLD_FILES+=usr/share/zoneinfo/Pacific/Pago_Pago +OLD_FILES+=usr/share/zoneinfo/Pacific/Palau +OLD_FILES+=usr/share/zoneinfo/Pacific/Pitcairn +OLD_FILES+=usr/share/zoneinfo/Pacific/Pohnpei +OLD_FILES+=usr/share/zoneinfo/Pacific/Port_Moresby +OLD_FILES+=usr/share/zoneinfo/Pacific/Rarotonga +OLD_FILES+=usr/share/zoneinfo/Pacific/Saipan +OLD_FILES+=usr/share/zoneinfo/Pacific/Tahiti +OLD_FILES+=usr/share/zoneinfo/Pacific/Tarawa +OLD_FILES+=usr/share/zoneinfo/Pacific/Tongatapu +OLD_FILES+=usr/share/zoneinfo/Pacific/Wake +OLD_FILES+=usr/share/zoneinfo/Pacific/Wallis +OLD_FILES+=usr/share/zoneinfo/UTC +OLD_FILES+=usr/share/zoneinfo/WET +OLD_FILES+=usr/share/zoneinfo/posixrules +OLD_FILES+=usr/share/zoneinfo/zone.tab +OLD_DIRS+=usr/share/zoneinfo/Africa +OLD_DIRS+=usr/share/zoneinfo/America/Argentina +OLD_DIRS+=usr/share/zoneinfo/America/Indiana +OLD_DIRS+=usr/share/zoneinfo/America/Kentucky +OLD_DIRS+=usr/share/zoneinfo/America/North_Dakota +OLD_DIRS+=usr/share/zoneinfo/America +OLD_DIRS+=usr/share/zoneinfo/Antarctica +OLD_DIRS+=usr/share/zoneinfo/Arctic +OLD_DIRS+=usr/share/zoneinfo/Asia +OLD_DIRS+=usr/share/zoneinfo/Atlantic +OLD_DIRS+=usr/share/zoneinfo/Australia +OLD_DIRS+=usr/share/zoneinfo/Etc +OLD_DIRS+=usr/share/zoneinfo/Europe +OLD_DIRS+=usr/share/zoneinfo/Indian +OLD_DIRS+=usr/share/zoneinfo/Pacific +OLD_DIRS+=usr/share/zoneinfo/SystemV +OLD_DIRS+=usr/share/zoneinfo +.endif + .if ${MK_SVNLITE} == no || ${MK_SVN} == yes OLD_FILES+=usr/bin/svnlite OLD_FILES+=usr/bin/svnliteadmin From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 01:42:56 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6343A257; Sun, 30 Nov 2014 01:42:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 359A5B6; Sun, 30 Nov 2014 01:42:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU1gu2m042944; Sun, 30 Nov 2014 01:42:56 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU1gtpD042942; Sun, 30 Nov 2014 01:42:55 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300142.sAU1gtpD042942@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 01:42:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275293 - in projects/building-blocks: etc tools/build/mk 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 01:42:56 -0000 Author: ngie Date: Sun Nov 30 01:42:55 2014 New Revision: 275293 URL: https://svnweb.freebsd.org/changeset/base/275293 Log: Honor MK_AUDIT with respect to etc/security Modified: projects/building-blocks/etc/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Sun Nov 30 00:55:50 2014 (r275292) +++ projects/building-blocks/etc/Makefile Sun Nov 30 01:42:55 2014 (r275293) @@ -263,12 +263,14 @@ distribution: ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install +.if ${MK_AUDIT} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \ ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} +.endif .if ${MK_UNBOUND} != "no" if [ ! -e ${DESTDIR}/etc/unbound ]; then \ ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 00:55:50 2014 (r275292) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 01:42:55 2014 (r275293) @@ -142,6 +142,11 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-A .if ${MK_AUDIT} == no OLD_FILES+=etc/rc.d/auditd OLD_FILES+=etc/rc.d/auditdistd +OLD_FILES+=etc/security/audit_class +OLD_FILES+=etc/security/audit_control +OLD_FILES+=etc/security/audit_event +OLD_FILES+=etc/security/audit_user +OLD_FILES+=etc/security/audit_warn OLD_FILES+=usr/include/bsm/audit_uevents.h OLD_FILES+=usr/include/bsm/libbsm.h OLD_FILES+=usr/lib/libauditd.a @@ -263,6 +268,7 @@ OLD_FILES+=usr/share/man/man5/audit_user OLD_FILES+=usr/share/man/man5/audit_warn.5.gz OLD_FILES+=usr/share/man/man8/audit.8.gz OLD_FILES+=usr/share/man/man8/auditd.8.gz +OLD_DIRS+=etc/security OLD_DIRS+=usr/include/bsm .endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 02:27:38 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B533A740; Sun, 30 Nov 2014 02:27:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A259A5F0; Sun, 30 Nov 2014 02:27:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU2Rc4x062090; Sun, 30 Nov 2014 02:27:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU2Rbeu062087; Sun, 30 Nov 2014 02:27:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300227.sAU2Rbeu062087@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 02:27:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275294 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 02:27:38 -0000 Author: ngie Date: Sun Nov 30 02:27:37 2014 New Revision: 275294 URL: https://svnweb.freebsd.org/changeset/base/275294 Log: Move nfsd requirement in lockd/statd to BEFORE: stanza in nfsd so the nfs server can be made optional Modified: projects/building-blocks/etc/rc.d/lockd projects/building-blocks/etc/rc.d/nfsd projects/building-blocks/etc/rc.d/statd Modified: projects/building-blocks/etc/rc.d/lockd ============================================================================== --- projects/building-blocks/etc/rc.d/lockd Sun Nov 30 01:42:55 2014 (r275293) +++ projects/building-blocks/etc/rc.d/lockd Sun Nov 30 02:27:37 2014 (r275294) @@ -5,7 +5,7 @@ # # PROVIDE: lockd -# REQUIRE: nfsclient nfsd rpcbind statd +# REQUIRE: nfsclient rpcbind statd # BEFORE: DAEMON # KEYWORD: nojail shutdown Modified: projects/building-blocks/etc/rc.d/nfsd ============================================================================== --- projects/building-blocks/etc/rc.d/nfsd Sun Nov 30 01:42:55 2014 (r275293) +++ projects/building-blocks/etc/rc.d/nfsd Sun Nov 30 02:27:37 2014 (r275294) @@ -5,6 +5,7 @@ # PROVIDE: nfsd # REQUIRE: mountd hostname nfsuserd +# BEFORE: lockd statd # KEYWORD: nojail shutdown . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/statd ============================================================================== --- projects/building-blocks/etc/rc.d/statd Sun Nov 30 01:42:55 2014 (r275293) +++ projects/building-blocks/etc/rc.d/statd Sun Nov 30 02:27:37 2014 (r275294) @@ -5,7 +5,7 @@ # # PROVIDE: statd -# REQUIRE: nfsclient nfsd rpcbind +# REQUIRE: nfsclient rpcbind # BEFORE: DAEMON # KEYWORD: nojail shutdown From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 02:31:39 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2614884; Sun, 30 Nov 2014 02:31:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 CDD8C699; Sun, 30 Nov 2014 02:31:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU2Vdm1066093; Sun, 30 Nov 2014 02:31:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU2VbOB066085; Sun, 30 Nov 2014 02:31:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300231.sAU2VbOB066085@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 02:31:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275295 - in projects/building-blocks: etc/rc.d include share/mk sys/conf sys/modules tools/build/mk tools/build/options usr.sbin 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 02:31:40 -0000 Author: ngie Date: Sun Nov 30 02:31:37 2014 New Revision: 275295 URL: https://svnweb.freebsd.org/changeset/base/275295 Log: Make nfs server components conditional according to MK_NFS_SERVER Added: projects/building-blocks/tools/build/options/WITHOUT_NFS_SERVER (contents, props changed) Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/include/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/sys/conf/kern.opts.mk projects/building-blocks/sys/modules/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 02:27:37 2014 (r275294) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 02:31:37 2014 (r275295) @@ -74,9 +74,6 @@ FILES= DAEMON \ netwait \ newsyslog \ nfsclient \ - nfscbd \ - nfsd \ - nfsuserd \ nisdomain \ ${_nscd} \ nsswitch \ @@ -235,6 +232,12 @@ _kpasswdd= kpasswdd _othermta= othermta .endif +.if ${MK_NFS_SERVER} != "no" +FILES+= nfscbd +FILES+= nfsd +FILES+= nfsuserd +.endif + .if ${MK_NTP} != "no" FILES+= ntpd FILES+= ntpdate Modified: projects/building-blocks/include/Makefile ============================================================================== --- projects/building-blocks/include/Makefile Sun Nov 30 02:27:37 2014 (r275294) +++ projects/building-blocks/include/Makefile Sun Nov 30 02:31:37 2014 (r275295) @@ -37,7 +37,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set. syslog.h ucontext.h LDIRS= cam geom net net80211 netinet netinet6 \ - netipsec netsmb nfs nfsclient nfsserver sys vm + netipsec netsmb nfs nfsclient sys vm LSUBDIRS= cam/ata cam/scsi \ dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \ @@ -79,6 +79,10 @@ LDIRS+= netgraph LSUBDIRS+= netgraph/netflow .endif +.if ${MK_NFS_SERVER} != "no" +LDIRS+= nfsserver +.endif + .if ${MK_USB} != "no" LSUBDIRS+= dev/usb .endif Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Sun Nov 30 02:27:37 2014 (r275294) +++ projects/building-blocks/share/mk/src.opts.mk Sun Nov 30 02:31:37 2014 (r275295) @@ -128,6 +128,7 @@ __DEFAULT_YES_OPTIONS = \ NETCAT \ NETGRAPH \ NETGRAPH_SUPPORT \ + NFS_SERVER \ NLS_CATALOGS \ NS_CACHING \ NTP \ Modified: projects/building-blocks/sys/conf/kern.opts.mk ============================================================================== --- projects/building-blocks/sys/conf/kern.opts.mk Sun Nov 30 02:27:37 2014 (r275294) +++ projects/building-blocks/sys/conf/kern.opts.mk Sun Nov 30 02:31:37 2014 (r275295) @@ -34,6 +34,7 @@ __DEFAULT_YES_OPTIONS = \ IPFILTER \ KERNEL_SYMBOLS \ NETGRAPH \ + NFS_SERVER \ PF \ SOURCELESS_HOST \ SOURCELESS_UCODE \ Modified: projects/building-blocks/sys/modules/Makefile ============================================================================== --- projects/building-blocks/sys/modules/Makefile Sun Nov 30 02:27:37 2014 (r275294) +++ projects/building-blocks/sys/modules/Makefile Sun Nov 30 02:31:37 2014 (r275295) @@ -251,10 +251,8 @@ SUBDIR= \ nfscl \ nfsclient \ nfscommon \ - nfsd \ nfslock \ nfslockd \ - nfsserver \ nfssvc \ nge \ nmdm \ @@ -441,6 +439,11 @@ _nandsim= nandsim _netgraph= netgraph .endif +.if ${MK_NFS_SERVER} != "no" || defined(ALL_MODULES) +SUBDIR+= nfsd +SUBDIR+= nfsserver +.endif + .if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \ ${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES) _pf= pf Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 02:27:37 2014 (r275294) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 02:31:37 2014 (r275295) @@ -4083,6 +4083,24 @@ OLD_FILES+=usr/share/man/man8/ndisgen.8. OLD_FILES+=usr/share/misc/windrv_stub.c .endif +.if ${MK_NFS_SERVER} == no +OLD_FILES+=etc/rc.d/nfscbd +OLD_FILES+=etc/rc.d/nfsd +OLD_FILES+=etc/rc.d/nfsuserd +OLD_FILES+=usr/sbin/nfscbd +OLD_FILES+=usr/sbin/nfsd +OLD_FILES+=usr/sbin/nfsdumpstate +OLD_FILES+=usr/sbin/nfsrevoke +OLD_FILES+=usr/sbin/nfsuserd +OLD_FILES+=usr/share/man/man4/nfsv4.4.gz +OLD_FILES+=usr/share/man/man5/stablerestart.5.gz +OLD_FILES+=usr/share/man/man8/nfscbd.8.gz +OLD_FILES+=usr/share/man/man8/nfsd.8.gz +OLD_FILES+=usr/share/man/man8/nfsdumpstate.8.gz +OLD_FILES+=usr/share/man/man8/nfsrevoke.8.gz +OLD_FILES+=usr/share/man/man8/nfsuserd.8.gz +.endif + .if ${MK_NETCAT} == no OLD_FILES+=usr/bin/nc OLD_FILES+=usr/share/man/man1/nc.1.gz Added: projects/building-blocks/tools/build/options/WITHOUT_NFS_SERVER ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_NFS_SERVER Sun Nov 30 02:31:37 2014 (r275295) @@ -0,0 +1,6 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr nfsd 8 , +.Xr nfsdumpstate 8 , +.Xr nfsuserd 8 , +and associated programs. Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Sun Nov 30 02:27:37 2014 (r275294) +++ projects/building-blocks/usr.sbin/Makefile Sun Nov 30 02:31:37 2014 (r275295) @@ -45,17 +45,11 @@ SUBDIR= adduser \ mtest \ ${_mtree} \ newsyslog \ - nfscbd \ - nfsd \ - nfsdumpstate \ - nfsrevoke \ - nfsuserd \ nmtree \ nologin \ ${_pc_sysinstall} \ pciconf \ periodic \ - powerd \ procctl \ pstat \ pw \ @@ -96,6 +90,11 @@ SUBDIR+= accton SUBDIR+= sa .endif +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" +SUBDIR+= powerd +SUBDIR+= zzz +.endif + .if ${MK_AMD} != "no" SUBDIR+= amd .endif @@ -234,6 +233,14 @@ SUBDIR+= ngctl SUBDIR+= nghook .endif +.if ${MK_NFS_SERVER} != "no" +SUBDIR+= nfscbd +SUBDIR+= nfsd +SUBDIR+= nfsdumpstate +SUBDIR+= nfsrevoke +SUBDIR+= nfsuserd +.endif + .if ${MK_NIS} != "no" SUBDIR+= rpc.yppasswdd SUBDIR+= rpc.ypupdated From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 03:00:40 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EA498D60; Sun, 30 Nov 2014 03:00:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D7BA38AE; Sun, 30 Nov 2014 03:00:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU30eki076537; Sun, 30 Nov 2014 03:00:40 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU30eOh076536; Sun, 30 Nov 2014 03:00:40 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300300.sAU30eOh076536@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 03:00:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275296 - in projects/building-blocks/etc: defaults rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 03:00:41 -0000 Author: ngie Date: Sun Nov 30 03:00:40 2014 New Revision: 275296 URL: https://svnweb.freebsd.org/changeset/base/275296 Log: Remove etc/rc.d/mrouted The rc.d script has been incorporated into net/mrouted for some time Deleted: projects/building-blocks/etc/rc.d/mrouted Modified: projects/building-blocks/etc/defaults/rc.conf Modified: projects/building-blocks/etc/defaults/rc.conf ============================================================================== --- projects/building-blocks/etc/defaults/rc.conf Sun Nov 30 02:31:37 2014 (r275295) +++ projects/building-blocks/etc/defaults/rc.conf Sun Nov 30 03:00:40 2014 (r275296) @@ -390,12 +390,6 @@ gateway_enable="NO" # Set to YES if thi routed_enable="NO" # Set to YES to enable a routing daemon. routed_program="/sbin/routed" # Name of routing daemon to use if enabled. routed_flags="-q" # Flags for routing daemon. -mrouted_enable="NO" # Do IPv4 multicast routing. -mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast - # routing daemon. You need to - # install it from package or - # port. -mrouted_flags="" # Flags for multicast routing daemon. arpproxy_all="NO" # replaces obsolete kernel option ARP_PROXYALL. forward_sourceroute="NO" # do source routing (only if gateway_enable is set to "YES") accept_sourceroute="NO" # accept source routed packets to us From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 03:02:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 27AD3FD3; Sun, 30 Nov 2014 03:02:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 13D2CA66; Sun, 30 Nov 2014 03:02:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU32KQL081216; Sun, 30 Nov 2014 03:02:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU32K5L081215; Sun, 30 Nov 2014 03:02:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300302.sAU32K5L081215@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 03:02:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275297 - projects/building-blocks 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 03:02:21 -0000 Author: ngie Date: Sun Nov 30 03:02:20 2014 New Revision: 275297 URL: https://svnweb.freebsd.org/changeset/base/275297 Log: Followup to r275296: add an ObsoleteFiles.inc entry Modified: projects/building-blocks/ObsoleteFiles.inc Modified: projects/building-blocks/ObsoleteFiles.inc ============================================================================== --- projects/building-blocks/ObsoleteFiles.inc Sun Nov 30 03:00:40 2014 (r275296) +++ projects/building-blocks/ObsoleteFiles.inc Sun Nov 30 03:02:20 2014 (r275297) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20141129: mrouted rc.d scripts removed from base +OLD_FILES+=etc/rc.d/mrouted # 20141126: convert sbin/mdconfig/tests to ATF format tests OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 06:08:28 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FC6BBD7; Sun, 30 Nov 2014 06:08:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 31877A8A; Sun, 30 Nov 2014 06:08:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU68SGp064968; Sun, 30 Nov 2014 06:08:28 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU68NZN064945; Sun, 30 Nov 2014 06:08:23 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300608.sAU68NZN064945@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 06:08:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275300 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 06:08:28 -0000 Author: ngie Date: Sun Nov 30 06:08:22 2014 New Revision: 275300 URL: https://svnweb.freebsd.org/changeset/base/275300 Log: Fill in MK_ACPI, (MK_ACPI && MK_APM), MK_INET6, MK_PPP, and MK_ROUTED Rework script dependencies to allow everything made optional to more optional Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/etc/rc.d/NETWORKING projects/building-blocks/etc/rc.d/bridge projects/building-blocks/etc/rc.d/defaultroute projects/building-blocks/etc/rc.d/gssd projects/building-blocks/etc/rc.d/ipfw projects/building-blocks/etc/rc.d/local_unbound projects/building-blocks/etc/rc.d/netif projects/building-blocks/etc/rc.d/nsswitch projects/building-blocks/etc/rc.d/ppp projects/building-blocks/etc/rc.d/resolv projects/building-blocks/etc/rc.d/route6d projects/building-blocks/etc/rc.d/routed projects/building-blocks/etc/rc.d/routing projects/building-blocks/etc/rc.d/static_arp projects/building-blocks/etc/rc.d/static_ndp projects/building-blocks/etc/rc.d/stf Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 06:08:22 2014 (r275300) @@ -40,7 +40,6 @@ FILES= DAEMON \ hostid_save \ hostname \ ${_inetd} \ - ip6addrctl \ ipfilter \ ipfs \ ipfw \ @@ -65,8 +64,6 @@ FILES= DAEMON \ mdconfig \ mdconfig2 \ mountd \ - mroute6d \ - mrouted \ msgs \ natd \ netif \ @@ -82,34 +79,21 @@ FILES= DAEMON \ pf \ pflog \ pfsync \ - powerd \ - power_profile \ - ppp \ - pppoed \ pwcheck \ quota \ random \ rarpd \ rctl \ resolv \ - rfcomm_pppd_server \ root \ - route6d \ - routed \ routing \ rpcbind \ - rtadvd \ - rtsold \ savecore \ - sdpd \ securelevel \ serial \ - sppp \ ${_sshd} \ statd \ static_arp \ - static_ndp \ - stf \ swap \ swaplate \ sysctl \ @@ -132,6 +116,14 @@ FILES= DAEMON \ FILES+= accounting .endif +.if ${MK_ACPI} != "no" +FILES+= power_profile +.endif + +.if ${MK_ACPI} != "no" || ${MK_APM} != "no" +FILES+= powerd +.endif + .if ${MK_AMD} != "no" FILES+= amd .endif @@ -162,6 +154,8 @@ FILES+= autounmountd _bluetooth= bluetooth _bthidd= bthidd _hcsecd= hcsecd +FILES+= rfcomm_pppd_server +FILES+= sdpd _ubthidhci= ubthidhci .endif @@ -197,6 +191,16 @@ FILES+= hastd _inetd= inetd .endif +.if ${MK_INET6} != "no" +FILES+= ip6addrctl +FILES+= mroute6d +FILES+= route6d +FILES+= stf +FILES+= rtadvd +FILES+= rtsold +FILES+= static_ndp +.endif + .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid @@ -259,10 +263,20 @@ _sshd= sshd FILES+= ftp-proxy .endif +.if ${MK_PPP} != "no" +FILES+= ppp +FILES+= pppoed +FILES+= sppp +.endif + .if ${MK_RCMDS} != "no" FILES+= rwho .endif +.if ${MK_ROUTED} != "no" +FILES+= routed +.endif + .if ${MK_SENDMAIL} != "no" FILES+= sendmail .endif Modified: projects/building-blocks/etc/rc.d/NETWORKING ============================================================================== --- projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 06:08:22 2014 (r275300) @@ -4,9 +4,9 @@ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: netif netoptions routing ppp ipfw stf -# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge -# REQUIRE: static_arp static_ndp +# REQUIRE: netif netoptions routing ipfw +# REQUIRE: defaultroute resolv bridge +# REQUIRE: static_arp # This is a dummy dependency, for services which require networking # to be operational before starting. Modified: projects/building-blocks/etc/rc.d/bridge ============================================================================== --- projects/building-blocks/etc/rc.d/bridge Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/bridge Sun Nov 30 06:08:22 2014 (r275300) @@ -26,7 +26,7 @@ # # PROVIDE: bridge -# REQUIRE: netif ppp stf +# REQUIRE: netif # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/defaultroute ============================================================================== --- projects/building-blocks/etc/rc.d/defaultroute Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/defaultroute Sun Nov 30 06:08:22 2014 (r275300) @@ -6,7 +6,7 @@ # # PROVIDE: defaultroute -# REQUIRE: devd netif stf +# REQUIRE: devd netif # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/gssd ============================================================================== --- projects/building-blocks/etc/rc.d/gssd Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/gssd Sun Nov 30 06:08:22 2014 (r275300) @@ -5,7 +5,7 @@ # PROVIDE: gssd # REQUIRE: root -# BEFORE: nfsd +# BEFORE: nfsd nfsuserd # KEYWORD: nojail shutdown . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/ipfw ============================================================================== --- projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,6 @@ # # PROVIDE: ipfw -# REQUIRE: ppp # KEYWORD: nojailvnet . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/local_unbound ============================================================================== --- projects/building-blocks/etc/rc.d/local_unbound Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/local_unbound Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,7 @@ # # PROVIDE: local_unbound -# REQUIRE: FILESYSTEMS netif resolv +# REQUIRE: FILESYSTEMS netif resolv routing # BEFORE: NETWORKING # KEYWORD: shutdown Modified: projects/building-blocks/etc/rc.d/netif ============================================================================== --- projects/building-blocks/etc/rc.d/netif Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/netif Sun Nov 30 06:08:22 2014 (r275300) @@ -26,7 +26,7 @@ # # PROVIDE: netif -# REQUIRE: FILESYSTEMS serial sppp sysctl +# REQUIRE: FILESYSTEMS serial sysctl # REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet Modified: projects/building-blocks/etc/rc.d/nsswitch ============================================================================== --- projects/building-blocks/etc/rc.d/nsswitch Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/nsswitch Sun Nov 30 06:08:22 2014 (r275300) @@ -27,7 +27,7 @@ # # PROVIDE: nsswitch -# REQUIRE: root +# REQUIRE: root routing # BEFORE: NETWORK . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/ppp ============================================================================== --- projects/building-blocks/etc/rc.d/ppp Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/ppp Sun Nov 30 06:08:22 2014 (r275300) @@ -5,6 +5,7 @@ # PROVIDE: ppp # REQUIRE: netif +# BEFORE: bridge ipfw routing # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/resolv ============================================================================== --- projects/building-blocks/etc/rc.d/resolv Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/resolv Sun Nov 30 06:08:22 2014 (r275300) @@ -28,7 +28,7 @@ # # PROVIDE: resolv -# REQUIRE: netif FILESYSTEMS +# REQUIRE: netif FILESYSTEMS routing # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/route6d ============================================================================== --- projects/building-blocks/etc/rc.d/route6d Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/route6d Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,8 @@ # # PROVIDE: route6d -# REQUIRE: netif routing +# REQUIRE: bridge netif routing +# BEFORE: NETWORKING # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/routed ============================================================================== --- projects/building-blocks/etc/rc.d/routed Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/routed Sun Nov 30 06:08:22 2014 (r275300) @@ -4,7 +4,8 @@ # # PROVIDE: routed -# REQUIRE: netif routing +# REQUIRE: bridge netif routing +# BEFORE: NETWORKING # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/routing ============================================================================== --- projects/building-blocks/etc/rc.d/routing Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/routing Sun Nov 30 06:08:22 2014 (r275300) @@ -6,7 +6,7 @@ # # PROVIDE: routing -# REQUIRE: netif ppp stf +# REQUIRE: netif # KEYWORD: nojailvnet . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/static_arp ============================================================================== --- projects/building-blocks/etc/rc.d/static_arp Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/static_arp Sun Nov 30 06:08:22 2014 (r275300) @@ -30,7 +30,7 @@ # # PROVIDE: static_arp -# REQUIRE: netif +# REQUIRE: netif routing # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/static_ndp ============================================================================== --- projects/building-blocks/etc/rc.d/static_ndp Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/static_ndp Sun Nov 30 06:08:22 2014 (r275300) @@ -30,7 +30,8 @@ # # PROVIDE: static_ndp -# REQUIRE: netif +# REQUIRE: netif routing +# BEFORE: NETWORKING # KEYWORD: nojail . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/stf ============================================================================== --- projects/building-blocks/etc/rc.d/stf Sun Nov 30 06:03:59 2014 (r275299) +++ projects/building-blocks/etc/rc.d/stf Sun Nov 30 06:08:22 2014 (r275300) @@ -4,6 +4,7 @@ # PROVIDE: stf # REQUIRE: netif +# BEFORE: bridge defaultroute NETWORKING routing # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 08:34:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D12A47F8; Sun, 30 Nov 2014 08:34:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BD2A7883; Sun, 30 Nov 2014 08:34:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU8YlRe033516; Sun, 30 Nov 2014 08:34:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU8YlMQ033514; Sun, 30 Nov 2014 08:34:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300834.sAU8YlMQ033514@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 08:34:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275304 - in projects/building-blocks: sbin tools/build/mk 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 08:34:47 -0000 Author: ngie Date: Sun Nov 30 08:34:46 2014 New Revision: 275304 URL: https://svnweb.freebsd.org/changeset/base/275304 Log: Build spppcontrol if MK_PPP != no Modified: projects/building-blocks/sbin/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/sbin/Makefile ============================================================================== --- projects/building-blocks/sbin/Makefile Sun Nov 30 06:48:37 2014 (r275303) +++ projects/building-blocks/sbin/Makefile Sun Nov 30 08:34:46 2014 (r275304) @@ -65,7 +65,6 @@ SUBDIR=adjkerntz \ savecore \ setkey \ shutdown \ - spppcontrol \ swapon \ sysctl \ tunefs \ @@ -111,6 +110,10 @@ SUBDIR+= pfctl SUBDIR+= pflogd .endif +.if ${MK_PPP} != "no" +SUBDIR+= spppcontrol +.endif + .if ${MK_INET6} != "no" SUBDIR+= ping6 SUBDIR+= rtsol Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 06:48:37 2014 (r275303) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 30 08:34:46 2014 (r275304) @@ -4682,10 +4682,12 @@ OLD_DIRS+=etc/ppp OLD_FILES+=etc/rc.d/ppp OLD_FILES+=etc/rc.d/pppoed OLD_FILES+=etc/rc.d/sppp +OLD_FILES+=sbin/spppcontrol OLD_FILES+=usr/sbin/ppp OLD_FILES+=usr/sbin/pppctl OLD_FILES+=usr/share/man/man8/ppp.8.gz OLD_FILES+=usr/share/man/man8/pppctl.8.gz +OLD_FILES+=usr/share/man/man8/spppcontrol.8.gz .endif .if ${MK_PROFILE} == no From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 09:03:35 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7281CC0A; Sun, 30 Nov 2014 09:03:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 5E5B5ACE; Sun, 30 Nov 2014 09:03:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU93ZuD047420; Sun, 30 Nov 2014 09:03:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU93YVp047418; Sun, 30 Nov 2014 09:03:34 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300903.sAU93YVp047418@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 09:03:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275306 - projects/building-blocks/sbin/rcorder 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 09:03:35 -0000 Author: ngie Date: Sun Nov 30 09:03:34 2014 New Revision: 275306 URL: https://svnweb.freebsd.org/changeset/base/275306 Log: Fix CFLAGS+=-DDEBUG by using the right header for libutil (libutil.h, not util.h) Modified: projects/building-blocks/sbin/rcorder/Makefile projects/building-blocks/sbin/rcorder/rcorder.c Modified: projects/building-blocks/sbin/rcorder/Makefile ============================================================================== --- projects/building-blocks/sbin/rcorder/Makefile Sun Nov 30 08:43:55 2014 (r275305) +++ projects/building-blocks/sbin/rcorder/Makefile Sun Nov 30 09:03:34 2014 (r275306) @@ -7,13 +7,11 @@ MAN= rcorder.8 LIBADD= util -# XXX hack for make's hash.[ch] -CFLAGS+= -DORDER -I. +CFLAGS+= -DORDER -SRCS+= util.h -CLEANFILES+= util.h - -util.h: - ln -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET} +#CFLAGS+= -DDEBUG +.if ${CFLAGS:M*-DDEBUG} +CFLAGS+= -I${.CURDIR}/../../usr.bin/make +.endif .include Modified: projects/building-blocks/sbin/rcorder/rcorder.c ============================================================================== --- projects/building-blocks/sbin/rcorder/rcorder.c Sun Nov 30 08:43:55 2014 (r275305) +++ projects/building-blocks/sbin/rcorder/rcorder.c Sun Nov 30 09:03:34 2014 (r275306) @@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include -#include #include "ealloc.h" #include "sprite.h" From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 09:04:25 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74E26CEE; Sun, 30 Nov 2014 09:04:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6125CAD1; Sun, 30 Nov 2014 09:04:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU94PEX047575; Sun, 30 Nov 2014 09:04:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU94PFZ047574; Sun, 30 Nov 2014 09:04:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300904.sAU94PFZ047574@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 09:04:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275307 - projects/building-blocks/sbin/rcorder 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 09:04:25 -0000 Author: ngie Date: Sun Nov 30 09:04:24 2014 New Revision: 275307 URL: https://svnweb.freebsd.org/changeset/base/275307 Log: Remove the unnecessary glob Modified: projects/building-blocks/sbin/rcorder/Makefile Modified: projects/building-blocks/sbin/rcorder/Makefile ============================================================================== --- projects/building-blocks/sbin/rcorder/Makefile Sun Nov 30 09:03:34 2014 (r275306) +++ projects/building-blocks/sbin/rcorder/Makefile Sun Nov 30 09:04:24 2014 (r275307) @@ -10,7 +10,7 @@ LIBADD= util CFLAGS+= -DORDER #CFLAGS+= -DDEBUG -.if ${CFLAGS:M*-DDEBUG} +.if ${CFLAGS:M-DDEBUG} CFLAGS+= -I${.CURDIR}/../../usr.bin/make .endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 09:45:35 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C50D27A; Sun, 30 Nov 2014 09:45:35 +0000 (UTC) Received: from mail-wg0-x22c.google.com (mail-wg0-x22c.google.com [IPv6:2a00:1450:400c:c00::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CF5BDDFF; Sun, 30 Nov 2014 09:45:34 +0000 (UTC) Received: by mail-wg0-f44.google.com with SMTP id b13so11931917wgh.31 for ; Sun, 30 Nov 2014 01:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=zzzY2N9j4CBNo2QsA1rvVgCy+Xr60XM39fk65y/aPto=; b=SDRKmDh4+nSFxQj2iVV77e5A8A8P4nMbWdb+NvLM6yA8QZfDAufsIPBTr/nazorG5L 2elgTcqTzhFmUYyU1+VYH5AZs+xuKYIM+DvbihreNC5BireCrt3WyuVamKyflwNi5yMw HNp3LXLKIrlVVcsyjr0NcPAcUSd0FzoVslgln3QMvaQJs4/Zz60ota9sH442GA80ng9s jjb0SfLMXT1LnlCFu04nEAZ8s/Dw2zrZEaoINtKVcpmKeqePFz+e+eqiLrQsSj704kkA hzWFwUq7Vq5y4QGpzHdBlrp+t96Z9vBfV2Oc4wEO6owZxhH32GV/ds6Yz7uLN0ivwo9T nGLw== X-Received: by 10.180.85.33 with SMTP id e1mr35433823wiz.61.1417340733125; Sun, 30 Nov 2014 01:45:33 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id ep6sm16920048wib.0.2014.11.30.01.45.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Nov 2014 01:45:32 -0800 (PST) Sender: Baptiste Daroussin Date: Sun, 30 Nov 2014 10:45:30 +0100 From: Baptiste Daroussin To: Garrett Cooper Subject: Re: svn commit: r275287 - in projects/building-blocks: share/mk tools/build/options Message-ID: <20141130094530.GI88765@ivaldir.etoilebsd.net> References: <201411300045.sAU0jXw6015374@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jaTU8Y2VLE5tlY1O" Content-Disposition: inline In-Reply-To: <201411300045.sAU0jXw6015374@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 09:45:35 -0000 --jaTU8Y2VLE5tlY1O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 30, 2014 at 12:45:33AM +0000, Garrett Cooper wrote: > Author: ngie > Date: Sun Nov 30 00:45:33 2014 > New Revision: 275287 > URL: https://svnweb.freebsd.org/changeset/base/275287 >=20 > Log: > Add MK_FILE and MK_SQLITE3 > =20 > - MK_FILE will conditionalize building lib/libmagic and usr.bin/file > - MK_SQLITE3 will conditionalize building lib/libsqlite3, and will disa= ble > MK_SVN/MK_SVNLITE by proxy Please avoid the MK_SQLITE3 except if you do plan to be able to ship freebsd without a manpage reader, newer mandoc which I'm planning to import soon is using sqlite3 and this is why I extracted it from svn(lite) Regards, Bapt --jaTU8Y2VLE5tlY1O Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlR65zcACgkQ8kTtMUmk6EwYmgCeM8F8AK1qNInFT6SZQae/H0rU ECIAniNMBHG/ZoSs02DanZZmICETyGuQ =m1yX -----END PGP SIGNATURE----- --jaTU8Y2VLE5tlY1O-- From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 09:54:25 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 98D4B3B1; Sun, 30 Nov 2014 09:54:25 +0000 (UTC) Received: from mail-pa0-x235.google.com (mail-pa0-x235.google.com [IPv6:2607:f8b0:400e:c03::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5EACCEB6; Sun, 30 Nov 2014 09:54:25 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id kq14so9213577pab.40 for ; Sun, 30 Nov 2014 01:54:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=PGhOmKKYmq2SFHNqrIZSqmyFbnjvL3JSkA6Ffnbfeic=; b=Zayi6ROOXwHd0ytn3m3kbVJOidHYI9hiX5sJ+ytn8mFTCLcvq1vwvBaQo+cDWvI8BB kLkzDhWrhkzulOiO9v3bL9bWZhQ/r34K7LcAeidRMs6z4uz02gMZXKf6nCUmJai1WVw3 YZYPKLcTv1rvZHpAxZG1xUMIAspJthI1cZDcplsTwF8KH8d4QXLx/hICkWEud5OnkwAb 4/1k8DjTVI+k9287aGV6q3r5f8yHM94mRa2ahSsw8TC848aw5js9pV8hxa2qDkBOkqgd guRyAPWAqVT+ylZ95OMVSmSNaBJiOwmlpH7a05tDFFuAySxOWTEpw9jmLIVM4zn73l+u pX7A== X-Received: by 10.66.253.230 with SMTP id ad6mr89634553pad.85.1417341265011; Sun, 30 Nov 2014 01:54:25 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:dd30:9970:a48e:8fe4? ([2601:8:ab80:7d6:dd30:9970:a48e:8fe4]) by mx.google.com with ESMTPSA id ri3sm1101657pdb.58.2014.11.30.01.54.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 01:54:24 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_F9E2AB45-5E87-4C96-9B7D-131F387FA0C5"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r275287 - in projects/building-blocks: share/mk tools/build/options From: Garrett Cooper In-Reply-To: <20141130094530.GI88765@ivaldir.etoilebsd.net> Date: Sun, 30 Nov 2014 01:54:24 -0800 Message-Id: <440D86F6-7005-43A2-96CE-6E7159ED653A@gmail.com> References: <201411300045.sAU0jXw6015374@svn.freebsd.org> <20141130094530.GI88765@ivaldir.etoilebsd.net> To: Baptiste Daroussin X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Garrett Cooper X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 09:54:25 -0000 --Apple-Mail=_F9E2AB45-5E87-4C96-9B7D-131F387FA0C5 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Nov 30, 2014, at 1:45, Baptiste Daroussin wrote: > On Sun, Nov 30, 2014 at 12:45:33AM +0000, Garrett Cooper wrote: >> Author: ngie >> Date: Sun Nov 30 00:45:33 2014 >> New Revision: 275287 >> URL: https://svnweb.freebsd.org/changeset/base/275287 >>=20 >> Log: >> Add MK_FILE and MK_SQLITE3 >>=20 >> - MK_FILE will conditionalize building lib/libmagic and usr.bin/file >> - MK_SQLITE3 will conditionalize building lib/libsqlite3, and will = disable >> MK_SVN/MK_SVNLITE by proxy >=20 > Please avoid the MK_SQLITE3 except if you do plan to be able to ship = freebsd > without a manpage reader, newer mandoc which I'm planning to import = soon is > using sqlite3 and this is why I extracted it from svn(lite) There=92s MK_MAN/MK_MAN_UTILS =97 I=92m ok with making MK_SQLITE3 set = either one of these variables so man(1) isn=92t installed on the image. The reason why I was looking at removing it is that it adds ~1MB to = install images: $ ls -hl /scratch/1/usr/lib/private/libsqlite3.so.0 = = =20 -r--r--r-- 1 ngie wheel 1.0M Nov 30 00:16 = /scratch/1/usr/lib/private/libsqlite3.so.0 $ du -sh /scratch/[12]/lib/libc.so.7 1.6M /scratch/1/lib/libc.so.7 This is a fair amount of space compared to a lot of other libraries, and = the savings is pretty huge given how far I=92ve whittled down a make = installworld/mergemaster-only install (the first directory was produced = with SRCCONF=3D/dev/null, the second is my stripped down SRCCONF, which = is sans bootloaders): $ du -sh /scratch/[12] 404M /scratch/1 32M /scratch/2 Cheers! --Apple-Mail=_F9E2AB45-5E87-4C96-9B7D-131F387FA0C5 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJUeulQAAoJEMZr5QU6S73ed+sIAKnSsiJG+HdgcV28N474MqPA 9s9nk+BKyFW7PSqVHIprqNZ3YB3MeuUoW7xcx2E3U+wZw2IY1f1Buhtb4rR/zwJl bpVrMKLYdtJf0dKJJ4tqm0HG7hbN1MEAIwfMDAd2Ok/iL8wBni2aj0qOmo0gXdV1 uL/lwyzNocKc++lISVkRqKeIAnozCVAn+YY72MByAlPMznJ9kGuw/7wQKKtjYRGC 7JpwD/KX6t+X5ZqWoBNlNpo5MjZBNuH/0IXx+2DIBLLVoMWbTYYjLpZOs5adQaXu wLuakOxBXM9yU8eZCs03DGddJ0SxX/pOh18r5U919KkuafJPtiJBVIgkZboebLs= =mdxx -----END PGP SIGNATURE----- --Apple-Mail=_F9E2AB45-5E87-4C96-9B7D-131F387FA0C5-- From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 09:56:14 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1F4FB49F; Sun, 30 Nov 2014 09:56:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 0B186EBB; Sun, 30 Nov 2014 09:56:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU9uDi0071043; Sun, 30 Nov 2014 09:56:13 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU9uD6o071042; Sun, 30 Nov 2014 09:56:13 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411300956.sAU9uD6o071042@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 30 Nov 2014 09:56:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275308 - projects/sendfile/sys/kern 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 09:56:14 -0000 Author: glebius Date: Sun Nov 30 09:56:13 2014 New Revision: 275308 URL: https://svnweb.freebsd.org/changeset/base/275308 Log: Pager limits our readahead count to MAXPHYS, so do not try to pre-allocate larger vector. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_syscalls.c Modified: projects/sendfile/sys/kern/uipc_syscalls.c ============================================================================== --- projects/sendfile/sys/kern/uipc_syscalls.c Sun Nov 30 09:04:24 2014 (r275307) +++ projects/sendfile/sys/kern/uipc_syscalls.c Sun Nov 30 09:56:13 2014 (r275308) @@ -2467,11 +2467,13 @@ retry_space: /* * Calculate maximum allowed number of pages for readahead * at this iteration. First, we allow readahead up to "rem". - * If application wants more, let it be. But check against - * "obj_size", since vm_pager_has_page() can hint beyond EOF. + * If application wants more, let it be, but there is no + * reason to go above MAXPHYS. Also check against "obj_size", + * since vm_pager_has_page() can hint beyond EOF. */ rhpages = howmany(rem + (off & PAGE_MASK), PAGE_SIZE) - npages; rhpages = max(SF_READAHEAD(flags), rhpages); + rhpages = min(howmany(MAXPHYS, PAGE_SIZE), rhpages); rhpages = min(howmany(obj_size - trunc_page(off), PAGE_SIZE) - npages, rhpages); From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 10:01:47 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E57855A6; Sun, 30 Nov 2014 10:01:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D1950F5C; Sun, 30 Nov 2014 10:01:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUA1lJR074638; Sun, 30 Nov 2014 10:01:47 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUA1lwC074637; Sun, 30 Nov 2014 10:01:47 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301001.sAUA1lwC074637@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 10:01:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275309 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 10:01:48 -0000 Author: ngie Date: Sun Nov 30 10:01:47 2014 New Revision: 275309 URL: https://svnweb.freebsd.org/changeset/base/275309 Log: Remove duplicate FILESYSTEMS REQUIRE Modified: projects/building-blocks/etc/rc.d/ipmon Modified: projects/building-blocks/etc/rc.d/ipmon ============================================================================== --- projects/building-blocks/etc/rc.d/ipmon Sun Nov 30 09:56:13 2014 (r275308) +++ projects/building-blocks/etc/rc.d/ipmon Sun Nov 30 10:01:47 2014 (r275309) @@ -4,7 +4,7 @@ # # PROVIDE: ipmon -# REQUIRE: FILESYSTEMS hostname sysctl FILESYSTEMS ipfilter +# REQUIRE: FILESYSTEMS hostname sysctl ipfilter # BEFORE: SERVERS # KEYWORD: nojail From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 10:19:14 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B65F3980; Sun, 30 Nov 2014 10:19:14 +0000 (UTC) Received: from mail-wg0-x22d.google.com (mail-wg0-x22d.google.com [IPv6:2a00:1450:400c:c00::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3F510B8; Sun, 30 Nov 2014 10:19:14 +0000 (UTC) Received: by mail-wg0-f45.google.com with SMTP id b13so11949333wgh.18 for ; Sun, 30 Nov 2014 02:19:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=3yP/37E5XACMXtLtU5SvkOCy5+4gDIV++Y5idOtlgxM=; b=xCy9Rsv/SNx/6fzmPulsxt08kzZGAD7focTUn+mZ6LKf1tOHKwIawvBTpVGq22eiRn h/euJ04WkM/a8+EoEgJzW3Oh4ZktDl+CTwr0yw1SFpxMtjXiZYpJg8ZZtxMQ19beWMAN 9vt1xEYP6KZa1rYzbwSPWKjq8SqyPcn8Fk7VNKAAiN5CMgGlyj5g8jGza6wX4WN/pL9k GvAATmL8lfgIvwGszzE+HsmEU4RxzExqrPF0bNLUwUjxZAHgYgeVPIsBmntMAtr7cwu4 0bFT0ThMfjyWwCFiXMAdjtRHekKxsdJgo4C4Q10ywQvOl4aOkaiGCYk6funEGLsKuBBk 8X4w== X-Received: by 10.180.96.42 with SMTP id dp10mr66558929wib.38.1417342752212; Sun, 30 Nov 2014 02:19:12 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by mx.google.com with ESMTPSA id t10sm19325377wix.15.2014.11.30.02.19.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Nov 2014 02:19:11 -0800 (PST) Sender: Baptiste Daroussin Date: Sun, 30 Nov 2014 11:19:09 +0100 From: Baptiste Daroussin To: Garrett Cooper Subject: Re: svn commit: r275287 - in projects/building-blocks: share/mk tools/build/options Message-ID: <20141130101909.GJ88765@ivaldir.etoilebsd.net> References: <201411300045.sAU0jXw6015374@svn.freebsd.org> <20141130094530.GI88765@ivaldir.etoilebsd.net> <440D86F6-7005-43A2-96CE-6E7159ED653A@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9Q2l3mYpK16UQ/iv" Content-Disposition: inline In-Reply-To: <440D86F6-7005-43A2-96CE-6E7159ED653A@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Garrett Cooper X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 10:19:14 -0000 --9Q2l3mYpK16UQ/iv Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 30, 2014 at 01:54:24AM -0800, Garrett Cooper wrote: > On Nov 30, 2014, at 1:45, Baptiste Daroussin wrote: >=20 > > On Sun, Nov 30, 2014 at 12:45:33AM +0000, Garrett Cooper wrote: > >> Author: ngie > >> Date: Sun Nov 30 00:45:33 2014 > >> New Revision: 275287 > >> URL: https://svnweb.freebsd.org/changeset/base/275287 > >>=20 > >> Log: > >> Add MK_FILE and MK_SQLITE3 > >>=20 > >> - MK_FILE will conditionalize building lib/libmagic and usr.bin/file > >> - MK_SQLITE3 will conditionalize building lib/libsqlite3, and will di= sable > >> MK_SVN/MK_SVNLITE by proxy > >=20 > > Please avoid the MK_SQLITE3 except if you do plan to be able to ship fr= eebsd > > without a manpage reader, newer mandoc which I'm planning to import soo= n is > > using sqlite3 and this is why I extracted it from svn(lite) >=20 > There=E2=80=99s MK_MAN/MK_MAN_UTILS =E2=80=94 I=E2=80=99m ok with making = MK_SQLITE3 set either one of these variables so man(1) isn=E2=80=99t instal= led on the image. Sure, I may update mandoc in the next couple of days so you will be able to= do that. >=20 > The reason why I was looking at removing it is that it adds ~1MB to insta= ll images: >=20 > $ ls -hl /scratch/1/usr/lib/private/libsqlite3.so.0 = = =20 > -r--r--r-- 1 ngie wheel 1.0M Nov 30 00:16 /scratch/1/usr/lib/private/= libsqlite3.so.0 > $ du -sh /scratch/[12]/lib/libc.so.7 > 1.6M /scratch/1/lib/libc.so.7 Sure btw sqlite3 is also hidden in kerberos I was willing to make kerberos = use the private sqlite3 but somehow I have never managed to convince Makefile.i= nc1 that it can use a private library don't know why. Regards, Bapt --9Q2l3mYpK16UQ/iv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlR67xoACgkQ8kTtMUmk6EyQCwCeLwXP77prvBy+rV/ztOlIqTW7 W1QAmwREOxSBDzTpbEGVANNwinVslHrk =g655 -----END PGP SIGNATURE----- --9Q2l3mYpK16UQ/iv-- From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 10:55:02 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C457DFA4; Sun, 30 Nov 2014 10:55:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B10C35E5; Sun, 30 Nov 2014 10:55:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUAt2Gk098875; Sun, 30 Nov 2014 10:55:02 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUAt28c098874; Sun, 30 Nov 2014 10:55:02 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301055.sAUAt28c098874@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 10:55:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275311 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 10:55:02 -0000 Author: ngie Date: Sun Nov 30 10:55:01 2014 New Revision: 275311 URL: https://svnweb.freebsd.org/changeset/base/275311 Log: Remove duplicate FILESYSTEMS REQUIRE Modified: projects/building-blocks/etc/rc.d/pflog Modified: projects/building-blocks/etc/rc.d/pflog ============================================================================== --- projects/building-blocks/etc/rc.d/pflog Sun Nov 30 10:36:29 2014 (r275310) +++ projects/building-blocks/etc/rc.d/pflog Sun Nov 30 10:55:01 2014 (r275311) @@ -4,7 +4,7 @@ # # PROVIDE: pflog -# REQUIRE: FILESYSTEMS netif FILESYSTEMS +# REQUIRE: FILESYSTEMS netif # KEYWORD: nojail . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 11:07:55 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E84D398; Sun, 30 Nov 2014 11:07:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2B22A6CB; Sun, 30 Nov 2014 11:07:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUB7tRS004208; Sun, 30 Nov 2014 11:07:55 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUB7sHP004206; Sun, 30 Nov 2014 11:07:54 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301107.sAUB7sHP004206@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 11:07:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275313 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 11:07:55 -0000 Author: ngie Date: Sun Nov 30 11:07:54 2014 New Revision: 275313 URL: https://svnweb.freebsd.org/changeset/base/275313 Log: Make quota come before ypset so ypset can be decoupled from the build Modified: projects/building-blocks/etc/rc.d/quota projects/building-blocks/etc/rc.d/ypset Modified: projects/building-blocks/etc/rc.d/quota ============================================================================== --- projects/building-blocks/etc/rc.d/quota Sun Nov 30 11:02:07 2014 (r275312) +++ projects/building-blocks/etc/rc.d/quota Sun Nov 30 11:07:54 2014 (r275313) @@ -6,7 +6,7 @@ # Enable/Check the quotas (must be after ypbind if using NIS) # PROVIDE: quota -# REQUIRE: mountcritremote ypset +# REQUIRE: mountcritremote # BEFORE: DAEMON # KEYWORD: nojail Modified: projects/building-blocks/etc/rc.d/ypset ============================================================================== --- projects/building-blocks/etc/rc.d/ypset Sun Nov 30 11:02:07 2014 (r275312) +++ projects/building-blocks/etc/rc.d/ypset Sun Nov 30 11:07:54 2014 (r275313) @@ -5,6 +5,7 @@ # PROVIDE: ypset # REQUIRE: ypbind +# BEFORE: quota # KEYWORD: shutdown . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 11:14:52 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75D484DB; Sun, 30 Nov 2014 11:14:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 554217D3; Sun, 30 Nov 2014 11:14:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUBEqPJ008516; Sun, 30 Nov 2014 11:14:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUBEoaI008505; Sun, 30 Nov 2014 11:14:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301114.sAUBEoaI008505@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 11:14:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275314 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 11:14:52 -0000 Author: ngie Date: Sun Nov 30 11:14:49 2014 New Revision: 275314 URL: https://svnweb.freebsd.org/changeset/base/275314 Log: - Make NETWORKING depend on DNS/FIREWALL - Make local_unbound provide DNS - Make ipfs, ipfw, and pf provide FIREWALL - Make securelevel require FIREWALL - Remove ipfs/ipfilter requirement from netif to avoid circular dependency with those services Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/etc/rc.d/NETWORKING projects/building-blocks/etc/rc.d/ipfs projects/building-blocks/etc/rc.d/ipfw projects/building-blocks/etc/rc.d/local_unbound projects/building-blocks/etc/rc.d/netif projects/building-blocks/etc/rc.d/pf projects/building-blocks/etc/rc.d/securelevel Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:14:49 2014 (r275314) @@ -40,11 +40,6 @@ FILES= DAEMON \ hostid_save \ hostname \ ${_inetd} \ - ipfilter \ - ipfs \ - ipfw \ - ipmon \ - ipnat \ ipsec \ ${_kadmind} \ ${_kdc} \ @@ -76,9 +71,6 @@ FILES= DAEMON \ nsswitch \ ${_opensm} \ ${_othermta} \ - pf \ - pflog \ - pfsync \ pwcheck \ quota \ random \ @@ -201,6 +193,17 @@ FILES+= rtsold FILES+= static_ndp .endif +.if ${MK_IPFILTER} != "no" +FILES+= ipfilter +FILES+= ipmon +FILES+= ipnat +FILES+= ipfs +.endif + +.if ${MK_IPFW} != "no" +FILES+= ipfw +.endif + .if ${MK_ISCSI} != "no" FILES+= iscsictl FILES+= iscsid @@ -242,6 +245,16 @@ FILES+= nfsd FILES+= nfsuserd .endif +.if ${MK_NIS} != "no" +FILES+= nisdomain +FILES+= ypbind +FILES+= yppasswdd +FILES+= ypserv +FILES+= ypset +FILES+= ypupdated +FILES+= ypxfrd +.endif + .if ${MK_NTP} != "no" FILES+= ntpd FILES+= ntpdate @@ -261,6 +274,9 @@ _sshd= sshd .if ${MK_PF} != "no" FILES+= ftp-proxy +FILES+= pf +FILES+= pflog +FILES+= pfsync .endif .if ${MK_PPP} != "no" Modified: projects/building-blocks/etc/rc.d/NETWORKING ============================================================================== --- projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/NETWORKING Sun Nov 30 11:14:49 2014 (r275314) @@ -4,7 +4,7 @@ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: netif netoptions routing ipfw +# REQUIRE: netif netoptions routing DNS FIREWALL # REQUIRE: defaultroute resolv bridge # REQUIRE: static_arp Modified: projects/building-blocks/etc/rc.d/ipfs ============================================================================== --- projects/building-blocks/etc/rc.d/ipfs Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/ipfs Sun Nov 30 11:14:49 2014 (r275314) @@ -3,7 +3,7 @@ # $FreeBSD$ # -# PROVIDE: ipfs +# PROVIDE: ipfs FIREWALL # REQUIRE: ipnat # KEYWORD: nojail shutdown Modified: projects/building-blocks/etc/rc.d/ipfw ============================================================================== --- projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/ipfw Sun Nov 30 11:14:49 2014 (r275314) @@ -3,7 +3,8 @@ # $FreeBSD$ # -# PROVIDE: ipfw +# PROVIDE: ipfw FIREWALL +# REQUIRE: defaultroute # KEYWORD: nojailvnet . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/local_unbound ============================================================================== --- projects/building-blocks/etc/rc.d/local_unbound Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/local_unbound Sun Nov 30 11:14:49 2014 (r275314) @@ -3,9 +3,8 @@ # $FreeBSD$ # -# PROVIDE: local_unbound +# PROVIDE: local_unbound DNS # REQUIRE: FILESYSTEMS netif resolv routing -# BEFORE: NETWORKING # KEYWORD: shutdown . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/netif ============================================================================== --- projects/building-blocks/etc/rc.d/netif Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/netif Sun Nov 30 11:14:49 2014 (r275314) @@ -27,7 +27,6 @@ # PROVIDE: netif # REQUIRE: FILESYSTEMS serial sysctl -# REQUIRE: ipfilter ipfs # KEYWORD: nojailvnet . /etc/rc.subr Modified: projects/building-blocks/etc/rc.d/pf ============================================================================== --- projects/building-blocks/etc/rc.d/pf Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/pf Sun Nov 30 11:14:49 2014 (r275314) @@ -3,7 +3,7 @@ # $FreeBSD$ # -# PROVIDE: pf +# PROVIDE: pf FIREWALL # REQUIRE: FILESYSTEMS netif pflog pfsync # BEFORE: routing # KEYWORD: nojail Modified: projects/building-blocks/etc/rc.d/securelevel ============================================================================== --- projects/building-blocks/etc/rc.d/securelevel Sun Nov 30 11:07:54 2014 (r275313) +++ projects/building-blocks/etc/rc.d/securelevel Sun Nov 30 11:14:49 2014 (r275314) @@ -4,7 +4,7 @@ # # PROVIDE: securelevel -# REQUIRE: adjkerntz ipfw ipfilter pf +# REQUIRE: adjkerntz FIREWALL . /etc/rc.subr From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 11:28:42 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D846CA84; Sun, 30 Nov 2014 11:28:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 C15CD8EB; Sun, 30 Nov 2014 11:28:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUBSgYS014163; Sun, 30 Nov 2014 11:28:42 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUBSajW014128; Sun, 30 Nov 2014 11:28:36 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411301128.sAUBSajW014128@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 30 Nov 2014 11:28:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275316 - in projects/sendfile: . etc/defaults etc/rc.d lib/libc/arm/string share/man/man4 sys/arm/include sys/boot/common sys/boot/i386/boot2 sys/kern sys/powerpc/aim sys/powerpc/inclu... 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 11:28:42 -0000 Author: glebius Date: Sun Nov 30 11:28:35 2014 New Revision: 275316 URL: https://svnweb.freebsd.org/changeset/base/275316 Log: Merge head r258543 through r275315. Deleted: projects/sendfile/etc/rc.d/mrouted Modified: projects/sendfile/ObsoleteFiles.inc projects/sendfile/etc/defaults/rc.conf projects/sendfile/etc/rc.d/Makefile projects/sendfile/etc/rc.d/NETWORKING projects/sendfile/lib/libc/arm/string/ffs.S projects/sendfile/lib/libc/arm/string/memcmp.S projects/sendfile/lib/libc/arm/string/memcpy_arm.S projects/sendfile/lib/libc/arm/string/memcpy_xscale.S projects/sendfile/lib/libc/arm/string/memmove.S projects/sendfile/lib/libc/arm/string/memset.S projects/sendfile/lib/libc/arm/string/strlen.S projects/sendfile/share/man/man4/tap.4 projects/sendfile/share/man/man4/tun.4 projects/sendfile/sys/arm/include/asm.h projects/sendfile/sys/boot/common/module.c projects/sendfile/sys/boot/i386/boot2/boot2.c projects/sendfile/sys/kern/kern_linker.c projects/sendfile/sys/kern/sys_pipe.c projects/sendfile/sys/powerpc/aim/machdep.c projects/sendfile/sys/powerpc/aim/trap.c projects/sendfile/sys/powerpc/aim/trap_subr32.S projects/sendfile/sys/powerpc/aim/trap_subr64.S projects/sendfile/sys/powerpc/include/trap.h projects/sendfile/sys/sys/linker.h Directory Properties: projects/sendfile/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/lib/libc/ (props changed) projects/sendfile/share/ (props changed) projects/sendfile/share/man/man4/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/boot/ (props changed) Modified: projects/sendfile/ObsoleteFiles.inc ============================================================================== --- projects/sendfile/ObsoleteFiles.inc Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/ObsoleteFiles.inc Sun Nov 30 11:28:35 2014 (r275316) @@ -38,6 +38,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20141129: mrouted rc.d scripts removed from base +OLD_FILES+=etc/rc.d/mrouted # 20141126: convert sbin/mdconfig/tests to ATF format tests OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test Modified: projects/sendfile/etc/defaults/rc.conf ============================================================================== --- projects/sendfile/etc/defaults/rc.conf Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/etc/defaults/rc.conf Sun Nov 30 11:28:35 2014 (r275316) @@ -390,12 +390,6 @@ gateway_enable="NO" # Set to YES if thi routed_enable="NO" # Set to YES to enable a routing daemon. routed_program="/sbin/routed" # Name of routing daemon to use if enabled. routed_flags="-q" # Flags for routing daemon. -mrouted_enable="NO" # Do IPv4 multicast routing. -mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast - # routing daemon. You need to - # install it from package or - # port. -mrouted_flags="" # Flags for multicast routing daemon. arpproxy_all="NO" # replaces obsolete kernel option ARP_PROXYALL. forward_sourceroute="NO" # do source routing (only if gateway_enable is set to "YES") accept_sourceroute="NO" # accept source routed packets to us Modified: projects/sendfile/etc/rc.d/Makefile ============================================================================== --- projects/sendfile/etc/rc.d/Makefile Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/etc/rc.d/Makefile Sun Nov 30 11:28:35 2014 (r275316) @@ -90,7 +90,6 @@ FILES= DAEMON \ mountd \ moused \ mroute6d \ - mrouted \ msgs \ natd \ netif \ Modified: projects/sendfile/etc/rc.d/NETWORKING ============================================================================== --- projects/sendfile/etc/rc.d/NETWORKING Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/etc/rc.d/NETWORKING Sun Nov 30 11:28:35 2014 (r275316) @@ -5,7 +5,7 @@ # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netoptions routing ppp ipfw stf -# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge +# REQUIRE: defaultroute routed route6d mroute6d resolv bridge # REQUIRE: static_arp static_ndp local_unbound # This is a dummy dependency, for services which require networking Modified: projects/sendfile/lib/libc/arm/string/ffs.S ============================================================================== --- projects/sendfile/lib/libc/arm/string/ffs.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/lib/libc/arm/string/ffs.S Sun Nov 30 11:28:35 2014 (r275316) @@ -32,6 +32,8 @@ __FBSDID("$FreeBSD$"); +.syntax unified + /* * ffs - find first set bit, this algorithm isolates the first set * bit, then multiplies the number by 0x0450fbaf which leaves the top @@ -60,7 +62,7 @@ ENTRY(ffs) rsbne r0, r0, r0, lsl #16 /* r0 = X * 0x0450fbaf */ /* now lookup in table indexed on top 6 bits of r0 */ - ldrneb r0, [ r2, r0, lsr #26 ] + ldrbne r0, [ r2, r0, lsr #26 ] RET .text; Modified: projects/sendfile/lib/libc/arm/string/memcmp.S ============================================================================== --- projects/sendfile/lib/libc/arm/string/memcmp.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/lib/libc/arm/string/memcmp.S Sun Nov 30 11:28:35 2014 (r275316) @@ -66,6 +66,8 @@ __FBSDID("$FreeBSD$"); +.syntax unified + ENTRY(memcmp) mov ip, r0 #if defined(_KERNEL) && !defined(_STANDALONE) @@ -76,7 +78,7 @@ ENTRY(memcmp) /* Are both addresses aligned the same way? */ cmp r2, #0x00 - eornes r3, ip, r1 + eorsne r3, ip, r1 RETeq /* len == 0, or same addresses! */ tst r3, #0x03 subne r2, r2, #0x01 Modified: projects/sendfile/lib/libc/arm/string/memcpy_arm.S ============================================================================== --- projects/sendfile/lib/libc/arm/string/memcpy_arm.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/lib/libc/arm/string/memcpy_arm.S Sun Nov 30 11:28:35 2014 (r275316) @@ -31,6 +31,9 @@ #include __FBSDID("$FreeBSD$"); + +.syntax unified + /* * This is one fun bit of code ... * Some easy listening music is suggested while trying to understand this @@ -91,8 +94,8 @@ ENTRY(memcpy) bge .Lmemcpy_loop32 cmn r2, #0x10 - ldmgeia r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ - stmgeia r0!, {r3, r4, r12, lr} + ldmiage r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ + stmiage r0!, {r3, r4, r12, lr} subge r2, r2, #0x10 ldmia sp!, {r4} /* return r4 */ @@ -101,9 +104,9 @@ ENTRY(memcpy) /* blat 12 bytes at a time */ .Lmemcpy_loop12: - ldmgeia r1!, {r3, r12, lr} - stmgeia r0!, {r3, r12, lr} - subges r2, r2, #0x0c + ldmiage r1!, {r3, r12, lr} + stmiage r0!, {r3, r12, lr} + subsge r2, r2, #0x0c bge .Lmemcpy_loop12 .Lmemcpy_l12: @@ -113,26 +116,26 @@ ENTRY(memcpy) subs r2, r2, #4 ldrlt r3, [r1], #4 strlt r3, [r0], #4 - ldmgeia r1!, {r3, r12} - stmgeia r0!, {r3, r12} + ldmiage r1!, {r3, r12} + stmiage r0!, {r3, r12} subge r2, r2, #4 .Lmemcpy_l4: /* less than 4 bytes to go */ adds r2, r2, #4 #ifdef __APCS_26_ - ldmeqia sp!, {r0, pc}^ /* done */ + ldmiaeq sp!, {r0, pc}^ /* done */ #else - ldmeqia sp!, {r0, pc} /* done */ + ldmiaeq sp!, {r0, pc} /* done */ #endif /* copy the crud byte at a time */ cmp r2, #2 ldrb r3, [r1], #1 strb r3, [r0], #1 - ldrgeb r3, [r1], #1 - strgeb r3, [r0], #1 - ldrgtb r3, [r1], #1 - strgtb r3, [r0], #1 + ldrbge r3, [r1], #1 + strbge r3, [r0], #1 + ldrbgt r3, [r1], #1 + strbgt r3, [r0], #1 ldmia sp!, {r0, pc} /* erg - unaligned destination */ @@ -143,10 +146,10 @@ ENTRY(memcpy) /* align destination with byte copies */ ldrb r3, [r1], #1 strb r3, [r0], #1 - ldrgeb r3, [r1], #1 - strgeb r3, [r0], #1 - ldrgtb r3, [r1], #1 - strgtb r3, [r0], #1 + ldrbge r3, [r1], #1 + strbge r3, [r0], #1 + ldrbgt r3, [r1], #1 + strbgt r3, [r0], #1 subs r2, r2, r12 blt .Lmemcpy_l4 /* less the 4 bytes */ Modified: projects/sendfile/lib/libc/arm/string/memcpy_xscale.S ============================================================================== --- projects/sendfile/lib/libc/arm/string/memcpy_xscale.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/lib/libc/arm/string/memcpy_xscale.S Sun Nov 30 11:28:35 2014 (r275316) @@ -38,6 +38,8 @@ #include __FBSDID("$FreeBSD$"); +.syntax unified + /* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */ ENTRY(memcpy) pld [r1] @@ -52,12 +54,12 @@ ENTRY(memcpy) ldrb ip, [r1], #0x01 sub r2, r2, #0x01 strb ip, [r3], #0x01 - ldrleb ip, [r1], #0x01 + ldrble ip, [r1], #0x01 suble r2, r2, #0x01 - strleb ip, [r3], #0x01 - ldrltb ip, [r1], #0x01 + strble ip, [r3], #0x01 + ldrblt ip, [r1], #0x01 sublt r2, r2, #0x01 - strltb ip, [r3], #0x01 + strblt ip, [r3], #0x01 /* Destination buffer is now word aligned */ .Lmemcpy_wordaligned: @@ -134,7 +136,7 @@ ENTRY(memcpy) .Lmemcpy_w_lessthan128: adds r2, r2, #0x80 /* Adjust for extra sub */ - ldmeqfd sp!, {r4-r9} + ldmfdeq sp!, {r4-r9} bxeq lr /* Return now if done */ subs r2, r2, #0x20 blt .Lmemcpy_w_lessthan32 @@ -159,7 +161,7 @@ ENTRY(memcpy) .Lmemcpy_w_lessthan32: adds r2, r2, #0x20 /* Adjust for extra sub */ - ldmeqfd sp!, {r4-r9} + ldmfdeq sp!, {r4-r9} bxeq lr /* Return now if done */ and r4, r2, #0x18 @@ -195,11 +197,11 @@ ENTRY(memcpy) addlt r2, r2, #0x04 ldrb ip, [r1], #0x01 cmp r2, #0x02 - ldrgeb r2, [r1], #0x01 + ldrbge r2, [r1], #0x01 strb ip, [r3], #0x01 - ldrgtb ip, [r1] - strgeb r2, [r3], #0x01 - strgtb ip, [r3] + ldrbgt ip, [r1] + strbge r2, [r3], #0x01 + strbgt ip, [r3] bx lr @@ -253,7 +255,7 @@ ENTRY(memcpy) bge .Lmemcpy_bad1_loop16 adds r2, r2, #0x10 - ldmeqfd sp!, {r4-r7} + ldmfdeq sp!, {r4-r7} bxeq lr /* Return now if done */ subs r2, r2, #0x04 sublt r1, r1, #0x03 @@ -314,7 +316,7 @@ ENTRY(memcpy) bge .Lmemcpy_bad2_loop16 adds r2, r2, #0x10 - ldmeqfd sp!, {r4-r7} + ldmfdeq sp!, {r4-r7} bxeq lr /* Return now if done */ subs r2, r2, #0x04 sublt r1, r1, #0x02 @@ -375,7 +377,7 @@ ENTRY(memcpy) bge .Lmemcpy_bad3_loop16 adds r2, r2, #0x10 - ldmeqfd sp!, {r4-r7} + ldmfdeq sp!, {r4-r7} bxeq lr /* Return now if done */ subs r2, r2, #0x04 sublt r1, r1, #0x01 @@ -404,11 +406,11 @@ ENTRY(memcpy) bxeq lr ldrb ip, [r1], #0x01 cmp r2, #0x02 - ldrgeb r2, [r1], #0x01 + ldrbge r2, [r1], #0x01 strb ip, [r3], #0x01 - ldrgtb ip, [r1] - strgeb r2, [r3], #0x01 - strgtb ip, [r3] + ldrbgt ip, [r1] + strbge r2, [r3], #0x01 + strbgt ip, [r3] bx lr @@ -440,7 +442,7 @@ ENTRY(memcpy) ldrb ip, [r1], #0x01 1: subs r2, r2, #0x01 strb ip, [r3], #0x01 - ldrneb ip, [r1], #0x01 + ldrbne ip, [r1], #0x01 bne 1b bx lr Modified: projects/sendfile/lib/libc/arm/string/memmove.S ============================================================================== --- projects/sendfile/lib/libc/arm/string/memmove.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/lib/libc/arm/string/memmove.S Sun Nov 30 11:28:35 2014 (r275316) @@ -32,6 +32,8 @@ #include __FBSDID("$FreeBSD$"); +.syntax unified + #ifndef _BCOPY /* LINTSTUB: Func: void *memmove(void *, const void *, size_t) */ ENTRY(memmove) @@ -86,8 +88,8 @@ ENTRY(bcopy) bge .Lmemmove_floop32 cmn r2, #0x10 - ldmgeia r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ - stmgeia r0!, {r3, r4, r12, lr} + ldmiage r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ + stmiage r0!, {r3, r4, r12, lr} subge r2, r2, #0x10 ldmia sp!, {r4} /* return r4 */ @@ -96,9 +98,9 @@ ENTRY(bcopy) /* blat 12 bytes at a time */ .Lmemmove_floop12: - ldmgeia r1!, {r3, r12, lr} - stmgeia r0!, {r3, r12, lr} - subges r2, r2, #0x0c + ldmiage r1!, {r3, r12, lr} + stmiage r0!, {r3, r12, lr} + subsge r2, r2, #0x0c bge .Lmemmove_floop12 .Lmemmove_fl12: @@ -108,23 +110,23 @@ ENTRY(bcopy) subs r2, r2, #4 ldrlt r3, [r1], #4 strlt r3, [r0], #4 - ldmgeia r1!, {r3, r12} - stmgeia r0!, {r3, r12} + ldmiage r1!, {r3, r12} + stmiage r0!, {r3, r12} subge r2, r2, #4 .Lmemmove_fl4: /* less than 4 bytes to go */ adds r2, r2, #4 - ldmeqia sp!, {r0, pc} /* done */ + ldmiaeq sp!, {r0, pc} /* done */ /* copy the crud byte at a time */ cmp r2, #2 ldrb r3, [r1], #1 strb r3, [r0], #1 - ldrgeb r3, [r1], #1 - strgeb r3, [r0], #1 - ldrgtb r3, [r1], #1 - strgtb r3, [r0], #1 + ldrbge r3, [r1], #1 + strbge r3, [r0], #1 + ldrbgt r3, [r1], #1 + strbgt r3, [r0], #1 ldmia sp!, {r0, pc} /* erg - unaligned destination */ @@ -135,10 +137,10 @@ ENTRY(bcopy) /* align destination with byte copies */ ldrb r3, [r1], #1 strb r3, [r0], #1 - ldrgeb r3, [r1], #1 - strgeb r3, [r0], #1 - ldrgtb r3, [r1], #1 - strgtb r3, [r0], #1 + ldrbge r3, [r1], #1 + strbge r3, [r0], #1 + ldrbgt r3, [r1], #1 + strbgt r3, [r0], #1 subs r2, r2, r12 blt .Lmemmove_fl4 /* less the 4 bytes */ @@ -353,12 +355,12 @@ ENTRY(bcopy) .Lmemmove_bl32: cmn r2, #0x10 - ldmgedb r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ - stmgedb r0!, {r3, r4, r12, lr} + ldmdbge r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ + stmdbge r0!, {r3, r4, r12, lr} subge r2, r2, #0x10 adds r2, r2, #0x14 - ldmgedb r1!, {r3, r12, lr} /* blat a remaining 12 bytes */ - stmgedb r0!, {r3, r12, lr} + ldmdbge r1!, {r3, r12, lr} /* blat a remaining 12 bytes */ + stmdbge r0!, {r3, r12, lr} subge r2, r2, #0x0c ldmia sp!, {r4, lr} @@ -368,8 +370,8 @@ ENTRY(bcopy) subs r2, r2, #4 ldrlt r3, [r1, #-4]! strlt r3, [r0, #-4]! - ldmgedb r1!, {r3, r12} - stmgedb r0!, {r3, r12} + ldmdbge r1!, {r3, r12} + stmdbge r0!, {r3, r12} subge r2, r2, #4 .Lmemmove_bl4: @@ -381,10 +383,10 @@ ENTRY(bcopy) cmp r2, #2 ldrb r3, [r1, #-1]! strb r3, [r0, #-1]! - ldrgeb r3, [r1, #-1]! - strgeb r3, [r0, #-1]! - ldrgtb r3, [r1, #-1]! - strgtb r3, [r0, #-1]! + ldrbge r3, [r1, #-1]! + strbge r3, [r0, #-1]! + ldrbgt r3, [r1, #-1]! + strbgt r3, [r0, #-1]! RET /* erg - unaligned destination */ @@ -394,10 +396,10 @@ ENTRY(bcopy) /* align destination with byte copies */ ldrb r3, [r1, #-1]! strb r3, [r0, #-1]! - ldrgeb r3, [r1, #-1]! - strgeb r3, [r0, #-1]! - ldrgtb r3, [r1, #-1]! - strgtb r3, [r0, #-1]! + ldrbge r3, [r1, #-1]! + strbge r3, [r0, #-1]! + ldrbgt r3, [r1, #-1]! + strbgt r3, [r0, #-1]! subs r2, r2, r12 blt .Lmemmove_bl4 /* less than 4 bytes to go */ ands r12, r1, #3 Modified: projects/sendfile/lib/libc/arm/string/memset.S ============================================================================== --- projects/sendfile/lib/libc/arm/string/memset.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/lib/libc/arm/string/memset.S Sun Nov 30 11:28:35 2014 (r275316) @@ -69,6 +69,8 @@ #include __FBSDID("$FreeBSD$"); +.syntax unified + /* * memset: Sets a block of memory to the specified value * @@ -125,39 +127,39 @@ ENTRY(memset) .Lmemset_loop128: subs r1, r1, #0x80 #ifdef _ARM_ARCH_5E - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 -#else - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 +#else + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} #endif bgt .Lmemset_loop128 RETeq /* Zero length so just exit */ @@ -168,15 +170,15 @@ ENTRY(memset) .Lmemset_loop32: subs r1, r1, #0x20 #ifdef _ARM_ARCH_5E - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 -#else - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 +#else + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} #endif bgt .Lmemset_loop32 RETeq /* Zero length so just exit */ @@ -185,11 +187,11 @@ ENTRY(memset) /* Deal with 16 bytes or more */ #ifdef _ARM_ARCH_5E - strged r2, [ip], #0x08 - strged r2, [ip], #0x08 + strdge r2, [ip], #0x08 + strdge r2, [ip], #0x08 #else - stmgeia ip!, {r2-r3} - stmgeia ip!, {r2-r3} + stmiage ip!, {r2-r3} + stmiage ip!, {r2-r3} #endif RETeq /* Zero length so just exit */ @@ -212,17 +214,17 @@ ENTRY(memset) #endif strb r3, [ip], #0x01 /* Set 1 byte */ - strgeb r3, [ip], #0x01 /* Set another byte */ - strgtb r3, [ip] /* and a third */ + strbge r3, [ip], #0x01 /* Set another byte */ + strbgt r3, [ip] /* and a third */ RET /* Exit */ .Lmemset_wordunaligned: rsb r2, r2, #0x004 strb r3, [ip], #0x01 /* Set 1 byte */ cmp r2, #0x02 - strgeb r3, [ip], #0x01 /* Set another byte */ + strbge r3, [ip], #0x01 /* Set another byte */ sub r1, r1, r2 - strgtb r3, [ip], #0x01 /* and a third */ + strbgt r3, [ip], #0x01 /* and a third */ cmp r1, #0x04 /* More than 4 bytes left? */ bge .Lmemset_wordaligned /* Yup */ @@ -231,8 +233,8 @@ ENTRY(memset) RETeq /* Zero length so exit */ strb r3, [ip], #0x01 /* Set 1 byte */ cmp r1, #0x02 - strgeb r3, [ip], #0x01 /* Set another byte */ - strgtb r3, [ip] /* and a third */ + strbge r3, [ip], #0x01 /* Set another byte */ + strbgt r3, [ip] /* and a third */ RET /* Exit */ #ifdef _BZERO END(bzero) Modified: projects/sendfile/lib/libc/arm/string/strlen.S ============================================================================== --- projects/sendfile/lib/libc/arm/string/strlen.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/lib/libc/arm/string/strlen.S Sun Nov 30 11:28:35 2014 (r275316) @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD$"); +.syntax unified + ENTRY(strlen) mov r1, #0 /* Check that the pointer is aligned on 32 bits. */ @@ -53,23 +55,23 @@ ENTRY(strlen) addne r1, r1, #1 .Ldo_3: #ifndef __ARMEB__ - andnes r3, r2, #0x0000ff00 + andsne r3, r2, #0x0000ff00 #else - andnes r3, r2, #0x00ff0000 + andsne r3, r2, #0x00ff0000 #endif addne r1, r1, #1 .Ldo_2: #ifndef __ARMEB__ - andnes r3, r2, #0x00ff0000 + andsne r3, r2, #0x00ff0000 #else - andnes r3, r2, #0x0000ff00 + andsne r3, r2, #0x0000ff00 #endif addne r1, r1, #1 .Ldo_1: #ifndef __ARMEB__ - andnes r3, r2, #0xff000000 + andsne r3, r2, #0xff000000 #else - andnes r3, r2, #0x000000ff + andsne r3, r2, #0x000000ff #endif addne r1, r1, #1 bne .Loop Modified: projects/sendfile/share/man/man4/tap.4 ============================================================================== --- projects/sendfile/share/man/man4/tap.4 Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/share/man/man4/tap.4 Sun Nov 30 11:28:35 2014 (r275316) @@ -1,7 +1,7 @@ .\" $FreeBSD$ .\" Based on PR#2411 .\" -.Dd November 4, 2014 +.Dd November 30, 2014 .Dt TAP 4 .Os .Sh NAME @@ -34,6 +34,17 @@ or a terminal for and a character-special device .Dq control interface. +A client program transfers Ethernet frames to or from the +.Nm +.Dq control +interface. +The +.Xr tun 4 +interface provides similar functionality at the network layer: +a client will transfer IP (by default) packets to or from a +.Xr tun 4 +.Dq control +interface. .Pp The network interfaces are named .Dq Li tap0 , @@ -314,4 +325,5 @@ VMware .El .Sh SEE ALSO .Xr inet 4 , -.Xr intro 4 +.Xr intro 4 , +.Xr tun 4 Modified: projects/sendfile/share/man/man4/tun.4 ============================================================================== --- projects/sendfile/share/man/man4/tun.4 Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/share/man/man4/tun.4 Sun Nov 30 11:28:35 2014 (r275316) @@ -2,7 +2,7 @@ .\" $FreeBSD$ .\" Based on PR#2411 .\" -.Dd February 4, 2007 +.Dd November 30, 2014 .Dt TUN 4 .Os .Sh NAME @@ -35,6 +35,17 @@ or a terminal for and a character-special device .Dq control interface. +A client program transfers IP (by default) packets to or from the +.Nm +.Dq control +interface. +The +.Xr tap 4 +interface provides similar functionality at the Ethernet layer: +a client will transfer Ethernet frames to or from a +.Xr tap 4 +.Dq control +interface. .Pp The network interfaces are named .Dq Li tun0 , @@ -307,6 +318,7 @@ them pile up. .Xr inet 4 , .Xr intro 4 , .Xr pty 4 , +.Xr tap 4 , .Xr ifconfig 8 .Sh AUTHORS This manual page was originally obtained from Modified: projects/sendfile/sys/arm/include/asm.h ============================================================================== --- projects/sendfile/sys/arm/include/asm.h Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/arm/include/asm.h Sun Nov 30 11:28:35 2014 (r275316) @@ -58,6 +58,18 @@ #endif /* + * EENTRY()/EEND() mark "extra" entry/exit points from a function. + * The unwind info cannot handle the concept of a nested function, or a function + * with multiple .fnstart directives, but some of our assembler code is written + * with multiple labels to allow entry at several points. The EENTRY() macro + * defines such an extra entry point without a new .fnstart, so that it's + * basically just a label that you can jump to. The EEND() macro does nothing + * at all, except document the exit point associated with the same-named entry. + */ +#define _EENTRY(x) .globl x; .type x,_ASM_TYPE_FUNCTION; x: +#define _EEND(x) /* nothing */ + +/* * gas/arm uses @ as a single comment character and thus cannot be used here * Instead it recognised the # instead of an @ symbols in .type directives * We define a couple of macros so that assembly code will not be dependent @@ -66,22 +78,10 @@ #define _ASM_TYPE_FUNCTION #function #define _ASM_TYPE_OBJECT #object #define GLOBAL(X) .globl x -#define _ENTRY(x) \ - .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: _FNSTART +#define _ENTRY(x) \ + .text; _ALIGN_TEXT; _EENTRY(x) _FNSTART #define _END(x) .size x, . - x; _FNEND -/* - * EENTRY()/EEND() mark "extra" entry/exit points from a function. - * The unwind info cannot handle the concept of a nested function, or a function - * with multiple .fnstart directives, but some of our assembler code is written - * with multiple labels to allow entry at several points. The EENTRY() macro - * defines such an extra entry point without a new .fnstart, so that it's - * basically just a label that you can jump to. The EEND() macro does nothing - * at all, except document the exit point associated with the same-named entry. - */ -#define _EENTRY(x) .globl x; .type x,_ASM_TYPE_FUNCTION; x: -#define _EEND(x) /* nothing */ - #ifdef GPROF # define _PROF_PROLOGUE \ mov ip, lr; bl __mcount Modified: projects/sendfile/sys/boot/common/module.c ============================================================================== --- projects/sendfile/sys/boot/common/module.c Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/boot/common/module.c Sun Nov 30 11:28:35 2014 (r275316) @@ -938,7 +938,7 @@ moduledir_readhints(struct moduledir *md path = moduledir_fullpath(mdp, "linker.hints"); if (stat(path, &st) != 0 || st.st_size < (ssize_t)(sizeof(version) + sizeof(int)) || - st.st_size > 100 * 1024 || (fd = open(path, O_RDONLY)) < 0) { + st.st_size > LINKER_HINTS_MAX || (fd = open(path, O_RDONLY)) < 0) { free(path); mdp->d_flags |= MDIR_NOHINTS; return; Modified: projects/sendfile/sys/boot/i386/boot2/boot2.c ============================================================================== --- projects/sendfile/sys/boot/i386/boot2/boot2.c Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/boot/i386/boot2/boot2.c Sun Nov 30 11:28:35 2014 (r275316) @@ -418,7 +418,7 @@ parse() #if SERIAL } else if (c == 'S') { j = 0; - while ((i = *arg++ - '0') <= 9) + while ((unsigned int)(i = *arg++ - '0') <= 9) j = j * 10 + i; if (j > 0 && i == -'0') { comspeed = j; Modified: projects/sendfile/sys/kern/kern_linker.c ============================================================================== --- projects/sendfile/sys/kern/kern_linker.c Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/kern/kern_linker.c Sun Nov 30 11:28:35 2014 (r275316) @@ -1752,7 +1752,7 @@ linker_hints_lookup(const char *path, in /* * XXX: we need to limit this number to some reasonable value */ - if (vattr.va_size > 100 * 1024) { + if (vattr.va_size > LINKER_HINTS_MAX) { printf("hints file too large %ld\n", (long)vattr.va_size); goto bad; } Modified: projects/sendfile/sys/kern/sys_pipe.c ============================================================================== --- projects/sendfile/sys/kern/sys_pipe.c Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/kern/sys_pipe.c Sun Nov 30 11:28:35 2014 (r275316) @@ -318,7 +318,7 @@ pipe_zone_init(void *mem, int size, int pp = (struct pipepair *)mem; - mtx_init(&pp->pp_mtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE); + mtx_init(&pp->pp_mtx, "pipe mutex", NULL, MTX_DEF); return (0); } @@ -1792,7 +1792,7 @@ filt_piperead(struct knote *kn, long hin struct pipe *wpipe = rpipe->pipe_peer; int ret; - PIPE_LOCK(rpipe); + PIPE_LOCK_ASSERT(rpipe, MA_OWNED); kn->kn_data = rpipe->pipe_buffer.cnt; if ((kn->kn_data == 0) && (rpipe->pipe_state & PIPE_DIRECTW)) kn->kn_data = rpipe->pipe_map.cnt; @@ -1801,11 +1801,9 @@ filt_piperead(struct knote *kn, long hin wpipe->pipe_present != PIPE_ACTIVE || (wpipe->pipe_state & PIPE_EOF)) { kn->kn_flags |= EV_EOF; - PIPE_UNLOCK(rpipe); return (1); } ret = kn->kn_data > 0; - PIPE_UNLOCK(rpipe); return ret; } @@ -1816,12 +1814,11 @@ filt_pipewrite(struct knote *kn, long hi struct pipe *wpipe; wpipe = kn->kn_hook; - PIPE_LOCK(wpipe); + PIPE_LOCK_ASSERT(wpipe, MA_OWNED); if (wpipe->pipe_present != PIPE_ACTIVE || (wpipe->pipe_state & PIPE_EOF)) { kn->kn_data = 0; kn->kn_flags |= EV_EOF; - PIPE_UNLOCK(wpipe); return (1); } kn->kn_data = (wpipe->pipe_buffer.size > 0) ? @@ -1829,7 +1826,6 @@ filt_pipewrite(struct knote *kn, long hi if (wpipe->pipe_state & PIPE_DIRECTW) kn->kn_data = 0; - PIPE_UNLOCK(wpipe); return (kn->kn_data >= PIPE_BUF); } Modified: projects/sendfile/sys/powerpc/aim/machdep.c ============================================================================== --- projects/sendfile/sys/powerpc/aim/machdep.c Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/powerpc/aim/machdep.c Sun Nov 30 11:28:35 2014 (r275316) @@ -757,6 +757,10 @@ db_trap_glue(struct trapframe *frame) || frame->exc == EXC_BPT || frame->exc == EXC_DSI)) { int type = frame->exc; + + /* Ignore DTrace traps. */ + if (*(uint32_t *)frame->srr0 == EXC_DTRACE) + return (0); if (type == EXC_PGM && (frame->srr1 & 0x20000)) { type = T_BREAKPOINT; } Modified: projects/sendfile/sys/powerpc/aim/trap.c ============================================================================== --- projects/sendfile/sys/powerpc/aim/trap.c Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/powerpc/aim/trap.c Sun Nov 30 11:28:35 2014 (r275316) @@ -258,7 +258,8 @@ trap(struct trapframe *frame) if (frame->srr1 & EXC_PGM_TRAP) { #ifdef KDTRACE_HOOKS inst = fuword32((const void *)frame->srr0); - if (inst == 0x0FFFDDDD && dtrace_pid_probe_ptr != NULL) { + if (inst == 0x0FFFDDDD && + dtrace_pid_probe_ptr != NULL) { struct reg regs; fill_regs(td, ®s); (*dtrace_pid_probe_ptr)(®s); @@ -301,7 +302,7 @@ trap(struct trapframe *frame) #ifdef KDTRACE_HOOKS case EXC_PGM: if (frame->srr1 & EXC_PGM_TRAP) { - if (*(uint32_t *)frame->srr0 == 0x7c810808) { + if (*(uint32_t *)frame->srr0 == EXC_DTRACE) { if (dtrace_invop_jump_addr != NULL) { dtrace_invop_jump_addr(frame); return; Modified: projects/sendfile/sys/powerpc/aim/trap_subr32.S ============================================================================== --- projects/sendfile/sys/powerpc/aim/trap_subr32.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/powerpc/aim/trap_subr32.S Sun Nov 30 11:28:35 2014 (r275316) @@ -890,8 +890,7 @@ CNAME(dblow): mfcr %r29 /* save CR in r29 */ mfsrr1 %r1 mtcr %r1 - bf 17,2f /* branch if privileged */ -1: + bf 17,1f /* branch if privileged */ /* Unprivileged case */ mtcr %r29 /* put the condition register back */ mfsprg2 %r29 /* ... and r29 */ @@ -900,19 +899,7 @@ CNAME(dblow): li %r1, 0 /* How to get the vector from LR */ bla generictrap /* and we look like a generic trap */ -2: -#ifdef KDTRACE_HOOKS - /* Privileged, so drop to KDB */ - mfsrr0 %r1 - mtsprg3 %r3 - lwz %r1,0(%r1) - /* Check if it's a DTrace trap. */ - li %r3,0x0808 - addis %r3,%r3,0x7c81 - cmplw %cr0,%r3,%r1 - mfsprg3 %r3 - beq %cr0,1b -#endif +1: /* Privileged, so drop to KDB */ GET_CPUINFO(%r1) stw %r28,(PC_DBSAVE+CPUSAVE_R28)(%r1) /* free r28 */ Modified: projects/sendfile/sys/powerpc/aim/trap_subr64.S ============================================================================== --- projects/sendfile/sys/powerpc/aim/trap_subr64.S Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/powerpc/aim/trap_subr64.S Sun Nov 30 11:28:35 2014 (r275316) @@ -799,9 +799,8 @@ CNAME(dblow): mfcr %r29 /* save CR in r29 */ mfsrr1 %r1 mtcr %r1 - bf 17,2f /* branch if privileged */ + bf 17,1f /* branch if privileged */ -1: /* Unprivileged case */ mtcr %r29 /* put the condition register back */ mfsprg2 %r29 /* ... and r29 */ @@ -810,19 +809,7 @@ CNAME(dblow): li %r1, 0 /* How to get the vector from LR */ bla generictrap /* and we look like a generic trap */ -2: -#ifdef KDTRACE_HOOKS - /* Privileged, so drop to KDB */ - mfsrr0 %r1 - mtsprg3 %r3 - lwz %r1,0(%r1) - /* Check if it's a DTrace trap. */ - li %r3,0x0808 - addis %r3,%r3,0x7c81 - cmplw %cr0,%r3,%r1 - mfsprg3 %r3 - beq %cr0,1b -#endif +1: GET_CPUINFO(%r1) std %r27,(PC_DBSAVE+CPUSAVE_R27)(%r1) /* free r27 */ std %r28,(PC_DBSAVE+CPUSAVE_R28)(%r1) /* free r28 */ Modified: projects/sendfile/sys/powerpc/include/trap.h ============================================================================== --- projects/sendfile/sys/powerpc/include/trap.h Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/powerpc/include/trap.h Sun Nov 30 11:28:35 2014 (r275316) @@ -120,6 +120,9 @@ #define EXC_PGM_PRIV (1UL << 18) #define EXC_PGM_TRAP (1UL << 17) +/* DTrace trap opcode. */ +#define EXC_DTRACE 0x7c810808 + #ifndef LOCORE struct trapframe; struct pcb; Modified: projects/sendfile/sys/sys/linker.h ============================================================================== --- projects/sendfile/sys/sys/linker.h Sun Nov 30 11:22:39 2014 (r275315) +++ projects/sendfile/sys/sys/linker.h Sun Nov 30 11:28:35 2014 (r275316) @@ -228,6 +228,7 @@ void *linker_hwpmc_list_objects(void); #endif #define LINKER_HINTS_VERSION 1 /* linker.hints file version */ +#define LINKER_HINTS_MAX (1 << 20) /* Allow at most 1MB for linker.hints */ #ifdef _KERNEL From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 11:38:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 514E1BB7; Sun, 30 Nov 2014 11:38:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 3E3599A1; Sun, 30 Nov 2014 11:38:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUBcYx3018844; Sun, 30 Nov 2014 11:38:34 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUBcXBu018841; Sun, 30 Nov 2014 11:38:33 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301138.sAUBcXBu018841@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 11:38:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275317 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 11:38:34 -0000 Author: ngie Date: Sun Nov 30 11:38:32 2014 New Revision: 275317 URL: https://svnweb.freebsd.org/changeset/base/275317 Log: Add dummy providers for DNS/FIREWALL Added: projects/building-blocks/etc/rc.d/DNS projects/building-blocks/etc/rc.d/FIREWALL Modified: projects/building-blocks/etc/rc.d/Makefile Added: projects/building-blocks/etc/rc.d/DNS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/etc/rc.d/DNS Sun Nov 30 11:38:32 2014 (r275317) @@ -0,0 +1,6 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: DNS Added: projects/building-blocks/etc/rc.d/FIREWALL ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/etc/rc.d/FIREWALL Sun Nov 30 11:38:32 2014 (r275317) @@ -0,0 +1,6 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: FIREWALL Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:28:35 2014 (r275316) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:38:32 2014 (r275317) @@ -3,7 +3,9 @@ .include FILES= DAEMON \ + DNS \ FILESYSTEMS \ + FIREWALL \ LOGIN \ NETWORKING \ SERVERS \ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 11:55:46 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 500A0DDB; Sun, 30 Nov 2014 11:55:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 3D221B14; Sun, 30 Nov 2014 11:55:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUBtkIT027714; Sun, 30 Nov 2014 11:55:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUBtkcs027713; Sun, 30 Nov 2014 11:55:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301155.sAUBtkcs027713@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 11:55:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275318 - projects/building-blocks/etc/rc.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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 11:55:46 -0000 Author: ngie Date: Sun Nov 30 11:55:45 2014 New Revision: 275318 URL: https://svnweb.freebsd.org/changeset/base/275318 Log: mountd should also be optional based on MK_NFS_SERVER Modified: projects/building-blocks/etc/rc.d/Makefile Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:38:32 2014 (r275317) +++ projects/building-blocks/etc/rc.d/Makefile Sun Nov 30 11:55:45 2014 (r275318) @@ -60,7 +60,6 @@ FILES= DAEMON \ mountlate \ mdconfig \ mdconfig2 \ - mountd \ msgs \ natd \ netif \ @@ -242,6 +241,7 @@ _othermta= othermta .endif .if ${MK_NFS_SERVER} != "no" +FILES+= mountd FILES+= nfscbd FILES+= nfsd FILES+= nfsuserd From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 11:59:20 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6AC1EDD; Sun, 30 Nov 2014 11:59:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D3A1BB29; Sun, 30 Nov 2014 11:59:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUBxK8L028156; Sun, 30 Nov 2014 11:59:20 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUBxKRs028155; Sun, 30 Nov 2014 11:59:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301159.sAUBxKRs028155@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 11:59:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275319 - projects/building-blocks/etc 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 11:59:21 -0000 Author: ngie Date: Sun Nov 30 11:59:20 2014 New Revision: 275319 URL: https://svnweb.freebsd.org/changeset/base/275319 Log: Honor MK_IPFW with rc.firewall, MK_LOCATE with /var/db/locate.db, and MK_MAN with creating manpage symlinks Modified: projects/building-blocks/etc/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Sun Nov 30 11:55:45 2014 (r275318) +++ projects/building-blocks/etc/Makefile Sun Nov 30 11:59:20 2014 (r275319) @@ -39,7 +39,6 @@ BIN1= crontab \ protocols \ rc \ rc.bsdextended \ - rc.firewall \ rc.initdiskless \ rc.shutdown \ rc.subr \ @@ -99,6 +98,10 @@ BIN1+= ftpusers BIN1+= inetd.conf .endif +.if ${MK_IPFW} != "no" +BIN1+= rc.firewall +.endif + .if ${MK_LOCATE} != "no" BIN1+= ${.CURDIR}/../usr.bin/locate/locate/locate.rc .endif @@ -322,8 +325,10 @@ distribution: .endif ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates +.if ${MK_LOCATE} != "no" ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/db/locate.database +.endif ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ ${DESTDIR}/var/crash cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ @@ -389,6 +394,7 @@ distrib-dirs: ${MTREES:N/*} done; true .endif ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys +.if ${MK_MAN} != "no" cd ${DESTDIR}/usr/share/man; \ for mandir in man*; do \ ${INSTALL_SYMLINK} ../$$mandir \ @@ -412,6 +418,7 @@ distrib-dirs: ${MTREES:N/*} fi; \ shift; shift; \ done +.endif .if ${MK_NLS} != "no" set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \ while [ $$# -gt 0 ] ; do \ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 12:37:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6ACCDC87; Sun, 30 Nov 2014 12:37:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 56923E7C; Sun, 30 Nov 2014 12:37:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUCbNcx046986; Sun, 30 Nov 2014 12:37:23 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUCbLBx046976; Sun, 30 Nov 2014 12:37:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411301237.sAUCbLBx046976@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 12:37:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275325 - in projects/building-blocks/sys: arm/arm boot/i386/boot2 kern netinet 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 12:37:23 -0000 Author: ngie Date: Sun Nov 30 12:37:20 2014 New Revision: 275325 URL: https://svnweb.freebsd.org/changeset/base/275325 Log: MFhead @ r275324 Modified: projects/building-blocks/sys/arm/arm/cpufunc_asm_armv5.S projects/building-blocks/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/building-blocks/sys/arm/arm/fusu.S projects/building-blocks/sys/arm/arm/support.S projects/building-blocks/sys/boot/i386/boot2/boot2.c projects/building-blocks/sys/kern/uipc_sockbuf.c projects/building-blocks/sys/netinet/tcp_usrreq.c projects/building-blocks/sys/sys/sockbuf.h Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/etc/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/boot/ (props changed) Modified: projects/building-blocks/sys/arm/arm/cpufunc_asm_armv5.S ============================================================================== --- projects/building-blocks/sys/arm/arm/cpufunc_asm_armv5.S Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/arm/arm/cpufunc_asm_armv5.S Sun Nov 30 12:37:20 2014 (r275325) @@ -194,7 +194,6 @@ ENTRY(armv5_idcache_wbinv_range) END(armv5_idcache_wbinv_range) ENTRY_NP(armv5_idcache_wbinv_all) -armv5_idcache_wbinv_all: .Larmv5_idcache_wbinv_all: /* * We assume that the code here can never be out of sync with the Modified: projects/building-blocks/sys/arm/arm/cpufunc_asm_xscale_c3.S ============================================================================== --- projects/building-blocks/sys/arm/arm/cpufunc_asm_xscale_c3.S Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/arm/arm/cpufunc_asm_xscale_c3.S Sun Nov 30 12:37:20 2014 (r275325) @@ -144,7 +144,6 @@ __FBSDID("$FreeBSD$"); ENTRY_NP(xscalec3_cache_syncI) -xscalec3_cache_purgeID: EENTRY_NP(xscalec3_cache_purgeID) mcr p15, 0, r0, c7, c5, 0 /* flush I cache (D cleaned below) */ EENTRY_NP(xscalec3_cache_cleanID) Modified: projects/building-blocks/sys/arm/arm/fusu.S ============================================================================== --- projects/building-blocks/sys/arm/arm/fusu.S Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/arm/arm/fusu.S Sun Nov 30 12:37:20 2014 (r275325) @@ -129,7 +129,7 @@ EENTRY_NP(fuword32) str r1, [r2, #PCB_ONFAULT] mov r0, r3 RET -END(fuword32) +EEND(fuword32) END(fuword) /* @@ -295,7 +295,7 @@ EENTRY_NP(suword32) mov r0, #0x00000000 str r0, [r2, #PCB_ONFAULT] RET -END(suword32) +EEND(suword32) END(suword) /* Modified: projects/building-blocks/sys/arm/arm/support.S ============================================================================== --- projects/building-blocks/sys/arm/arm/support.S Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/arm/arm/support.S Sun Nov 30 12:37:20 2014 (r275325) @@ -130,7 +130,7 @@ ENTRY(bzero) .Lnormal0: mov r3, #0x00 b do_memset -EEND(bzero) +END(bzero) /* LINTSTUB: Func: void *memset(void *, int, size_t) */ ENTRY(memset) and r3, r1, #0xff /* We deal with bytes */ Modified: projects/building-blocks/sys/boot/i386/boot2/boot2.c ============================================================================== --- projects/building-blocks/sys/boot/i386/boot2/boot2.c Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/boot/i386/boot2/boot2.c Sun Nov 30 12:37:20 2014 (r275325) @@ -418,7 +418,7 @@ parse() #if SERIAL } else if (c == 'S') { j = 0; - while ((i = *arg++ - '0') <= 9) + while ((unsigned int)(i = *arg++ - '0') <= 9) j = j * 10 + i; if (j > 0 && i == -'0') { comspeed = j; Modified: projects/building-blocks/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/building-blocks/sys/kern/uipc_sockbuf.c Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/kern/uipc_sockbuf.c Sun Nov 30 12:37:20 2014 (r275325) @@ -69,6 +69,60 @@ static struct mbuf *sbcut_internal(struc static void sbflush_internal(struct sockbuf *sb); /* + * Adjust sockbuf state reflecting allocation of m. + */ +void +sballoc(struct sockbuf *sb, struct mbuf *m) +{ + + SOCKBUF_LOCK_ASSERT(sb); + + sb->sb_cc += m->m_len; + + if (m->m_type != MT_DATA && m->m_type != MT_OOBDATA) + sb->sb_ctl += m->m_len; + + sb->sb_mbcnt += MSIZE; + sb->sb_mcnt += 1; + + if (m->m_flags & M_EXT) { + sb->sb_mbcnt += m->m_ext.ext_size; + sb->sb_ccnt += 1; + } +} + +/* + * Adjust sockbuf state reflecting freeing of m. + */ +void +sbfree(struct sockbuf *sb, struct mbuf *m) +{ + +#if 0 /* XXX: not yet: soclose() call path comes here w/o lock. */ + SOCKBUF_LOCK_ASSERT(sb); +#endif + + sb->sb_cc -= m->m_len; + + if (m->m_type != MT_DATA && m->m_type != MT_OOBDATA) + sb->sb_ctl -= m->m_len; + + sb->sb_mbcnt -= MSIZE; + sb->sb_mcnt -= 1; + if (m->m_flags & M_EXT) { + sb->sb_mbcnt -= m->m_ext.ext_size; + sb->sb_ccnt -= 1; + } + + if (sb->sb_sndptr == m) { + sb->sb_sndptr = NULL; + sb->sb_sndptroff = 0; + } + if (sb->sb_sndptroff != 0) + sb->sb_sndptroff -= m->m_len; +} + +/* * Socantsendmore indicates that no more data will be sent on the socket; it * would normally be applied to a socket when the user informs the system * that no more data is to be sent, by the protocol code (in case @@ -553,28 +607,36 @@ sbappendstream(struct sockbuf *sb, struc #ifdef SOCKBUF_DEBUG void -sbcheck(struct sockbuf *sb) +sbcheck(struct sockbuf *sb, const char *file, int line) { - struct mbuf *m; - struct mbuf *n = 0; - u_long len = 0, mbcnt = 0; + struct mbuf *m, *n; + u_long cc, mbcnt; SOCKBUF_LOCK_ASSERT(sb); + cc = mbcnt = 0; + for (m = sb->sb_mb; m; m = n) { n = m->m_nextpkt; for (; m; m = m->m_next) { - len += m->m_len; + if (m->m_len == 0) { + printf("sb %p empty mbuf %p\n", sb, m); + goto fail; + } + cc += m->m_len; mbcnt += MSIZE; if (m->m_flags & M_EXT) /*XXX*/ /* pretty sure this is bogus */ mbcnt += m->m_ext.ext_size; } } - if (len != sb->sb_cc || mbcnt != sb->sb_mbcnt) { - printf("cc %ld != %u || mbcnt %ld != %u\n", len, sb->sb_cc, + if (cc != sb->sb_cc || mbcnt != sb->sb_mbcnt) { + printf("cc %ld != %u || mbcnt %ld != %u\n", cc, sb->sb_cc, mbcnt, sb->sb_mbcnt); - panic("sbcheck"); + goto fail; } + return; +fail: + panic("%s from %s:%u", __func__, file, line); } #endif Modified: projects/building-blocks/sys/netinet/tcp_usrreq.c ============================================================================== --- projects/building-blocks/sys/netinet/tcp_usrreq.c Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/netinet/tcp_usrreq.c Sun Nov 30 12:37:20 2014 (r275325) @@ -925,7 +925,7 @@ tcp_usr_send(struct socket *so, int flag tp->snd_wnd = TTCP_CLIENT_SND_WND; tcp_mss(tp, -1); } - tp->snd_up = tp->snd_una + so->so_snd.sb_cc; + tp->snd_up = tp->snd_una + sbavail(&so->so_snd); tp->t_flags |= TF_FORCEDATA; error = tcp_output(tp); tp->t_flags &= ~TF_FORCEDATA; Modified: projects/building-blocks/sys/sys/sockbuf.h ============================================================================== --- projects/building-blocks/sys/sys/sockbuf.h Sun Nov 30 12:34:48 2014 (r275324) +++ projects/building-blocks/sys/sys/sockbuf.h Sun Nov 30 12:37:20 2014 (r275325) @@ -136,7 +136,6 @@ int sbappendcontrol_locked(struct sockbu struct mbuf *control); void sbappendrecord(struct sockbuf *sb, struct mbuf *m0); void sbappendrecord_locked(struct sockbuf *sb, struct mbuf *m0); -void sbcheck(struct sockbuf *sb); void sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n); struct mbuf * sbcreatecontrol(caddr_t p, int size, int type, int level); @@ -164,6 +163,8 @@ void sbtoxsockbuf(struct sockbuf *sb, st int sbwait(struct sockbuf *sb); int sblock(struct sockbuf *sb, int flags); void sbunlock(struct sockbuf *sb); +void sballoc(struct sockbuf *, struct mbuf *); +void sbfree(struct sockbuf *, struct mbuf *); /* * Return how much data is available to be taken out of socket @@ -213,38 +214,6 @@ sbspace(struct sockbuf *sb) return((bleft < mleft) ? bleft : mleft); } -/* adjust counters in sb reflecting allocation of m */ -#define sballoc(sb, m) { \ - (sb)->sb_cc += (m)->m_len; \ - if ((m)->m_type != MT_DATA && (m)->m_type != MT_OOBDATA) \ - (sb)->sb_ctl += (m)->m_len; \ - (sb)->sb_mbcnt += MSIZE; \ - (sb)->sb_mcnt += 1; \ - if ((m)->m_flags & M_EXT) { \ - (sb)->sb_mbcnt += (m)->m_ext.ext_size; \ - (sb)->sb_ccnt += 1; \ - } \ -} - -/* adjust counters in sb reflecting freeing of m */ -#define sbfree(sb, m) { \ - (sb)->sb_cc -= (m)->m_len; \ - if ((m)->m_type != MT_DATA && (m)->m_type != MT_OOBDATA) \ - (sb)->sb_ctl -= (m)->m_len; \ - (sb)->sb_mbcnt -= MSIZE; \ - (sb)->sb_mcnt -= 1; \ - if ((m)->m_flags & M_EXT) { \ - (sb)->sb_mbcnt -= (m)->m_ext.ext_size; \ - (sb)->sb_ccnt -= 1; \ - } \ - if ((sb)->sb_sndptr == (m)) { \ - (sb)->sb_sndptr = NULL; \ - (sb)->sb_sndptroff = 0; \ - } \ - if ((sb)->sb_sndptroff != 0) \ - (sb)->sb_sndptroff -= (m)->m_len; \ -} - #define SB_EMPTY_FIXUP(sb) do { \ if ((sb)->sb_mb == NULL) { \ (sb)->sb_mbtail = NULL; \ @@ -254,13 +223,15 @@ sbspace(struct sockbuf *sb) #ifdef SOCKBUF_DEBUG void sblastrecordchk(struct sockbuf *, const char *, int); -#define SBLASTRECORDCHK(sb) sblastrecordchk((sb), __FILE__, __LINE__) - void sblastmbufchk(struct sockbuf *, const char *, int); +void sbcheck(struct sockbuf *, const char *, int); +#define SBLASTRECORDCHK(sb) sblastrecordchk((sb), __FILE__, __LINE__) #define SBLASTMBUFCHK(sb) sblastmbufchk((sb), __FILE__, __LINE__) +#define SBCHECK(sb) sbcheck((sb), __FILE__, __LINE__) #else -#define SBLASTRECORDCHK(sb) /* nothing */ -#define SBLASTMBUFCHK(sb) /* nothing */ +#define SBLASTRECORDCHK(sb) do {} while (0) +#define SBLASTMBUFCHK(sb) do {} while (0) +#define SBCHECK(sb) do {} while (0) #endif /* SOCKBUF_DEBUG */ #endif /* _KERNEL */ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 13:03:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C6EB19F; Sun, 30 Nov 2014 13:03:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 49018105; Sun, 30 Nov 2014 13:03:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUD3mqV060623; Sun, 30 Nov 2014 13:03:48 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUD3kd8060612; Sun, 30 Nov 2014 13:03:46 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411301303.sAUD3kd8060612@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 30 Nov 2014 13:03:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275327 - in projects/sendfile: etc/rc.d sys/arm/arm 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 13:03:48 -0000 Author: glebius Date: Sun Nov 30 13:03:46 2014 New Revision: 275327 URL: https://svnweb.freebsd.org/changeset/base/275327 Log: Merge head up to r275326. Modified: projects/sendfile/etc/rc.d/ipmon projects/sendfile/etc/rc.d/pflog projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/sendfile/sys/arm/arm/fusu.S projects/sendfile/sys/arm/arm/support.S Directory Properties: projects/sendfile/ (props changed) projects/sendfile/etc/ (props changed) projects/sendfile/sys/ (props changed) Modified: projects/sendfile/etc/rc.d/ipmon ============================================================================== --- projects/sendfile/etc/rc.d/ipmon Sun Nov 30 12:52:33 2014 (r275326) +++ projects/sendfile/etc/rc.d/ipmon Sun Nov 30 13:03:46 2014 (r275327) @@ -4,7 +4,7 @@ # # PROVIDE: ipmon -# REQUIRE: FILESYSTEMS hostname sysctl FILESYSTEMS ipfilter +# REQUIRE: FILESYSTEMS hostname sysctl ipfilter # BEFORE: SERVERS # KEYWORD: nojail Modified: projects/sendfile/etc/rc.d/pflog ============================================================================== --- projects/sendfile/etc/rc.d/pflog Sun Nov 30 12:52:33 2014 (r275326) +++ projects/sendfile/etc/rc.d/pflog Sun Nov 30 13:03:46 2014 (r275327) @@ -4,7 +4,7 @@ # # PROVIDE: pflog -# REQUIRE: FILESYSTEMS netif FILESYSTEMS +# REQUIRE: FILESYSTEMS netif # KEYWORD: nojail . /etc/rc.subr Modified: projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S ============================================================================== --- projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S Sun Nov 30 12:52:33 2014 (r275326) +++ projects/sendfile/sys/arm/arm/cpufunc_asm_armv5.S Sun Nov 30 13:03:46 2014 (r275327) @@ -194,7 +194,6 @@ ENTRY(armv5_idcache_wbinv_range) END(armv5_idcache_wbinv_range) ENTRY_NP(armv5_idcache_wbinv_all) -armv5_idcache_wbinv_all: .Larmv5_idcache_wbinv_all: /* * We assume that the code here can never be out of sync with the Modified: projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S ============================================================================== --- projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S Sun Nov 30 12:52:33 2014 (r275326) +++ projects/sendfile/sys/arm/arm/cpufunc_asm_xscale_c3.S Sun Nov 30 13:03:46 2014 (r275327) @@ -144,7 +144,6 @@ __FBSDID("$FreeBSD$"); ENTRY_NP(xscalec3_cache_syncI) -xscalec3_cache_purgeID: EENTRY_NP(xscalec3_cache_purgeID) mcr p15, 0, r0, c7, c5, 0 /* flush I cache (D cleaned below) */ EENTRY_NP(xscalec3_cache_cleanID) Modified: projects/sendfile/sys/arm/arm/fusu.S ============================================================================== --- projects/sendfile/sys/arm/arm/fusu.S Sun Nov 30 12:52:33 2014 (r275326) +++ projects/sendfile/sys/arm/arm/fusu.S Sun Nov 30 13:03:46 2014 (r275327) @@ -129,7 +129,7 @@ EENTRY_NP(fuword32) str r1, [r2, #PCB_ONFAULT] mov r0, r3 RET -END(fuword32) +EEND(fuword32) END(fuword) /* @@ -295,7 +295,7 @@ EENTRY_NP(suword32) mov r0, #0x00000000 str r0, [r2, #PCB_ONFAULT] RET -END(suword32) +EEND(suword32) END(suword) /* Modified: projects/sendfile/sys/arm/arm/support.S ============================================================================== --- projects/sendfile/sys/arm/arm/support.S Sun Nov 30 12:52:33 2014 (r275326) +++ projects/sendfile/sys/arm/arm/support.S Sun Nov 30 13:03:46 2014 (r275327) @@ -130,7 +130,7 @@ ENTRY(bzero) .Lnormal0: mov r3, #0x00 b do_memset -EEND(bzero) +END(bzero) /* LINTSTUB: Func: void *memset(void *, int, size_t) */ ENTRY(memset) and r3, r1, #0xff /* We deal with bytes */ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 13:28:23 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59AF9912; Sun, 30 Nov 2014 13:28:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2D71F2E5; Sun, 30 Nov 2014 13:28:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUDSN2Q070598; Sun, 30 Nov 2014 13:28:23 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUDSM3s070592; Sun, 30 Nov 2014 13:28:22 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411301328.sAUDSM3s070592@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 30 Nov 2014 13:28:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275331 - in projects/sendfile/contrib/ofed/librdmacm/examples/build: cmatose mckey rping udaddy 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 13:28:23 -0000 Author: glebius Date: Sun Nov 30 13:28:21 2014 New Revision: 275331 URL: https://svnweb.freebsd.org/changeset/base/275331 Log: Merge head r275327 through r275329. Modified: projects/sendfile/contrib/ofed/librdmacm/examples/build/cmatose/Makefile projects/sendfile/contrib/ofed/librdmacm/examples/build/mckey/Makefile projects/sendfile/contrib/ofed/librdmacm/examples/build/rping/Makefile projects/sendfile/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sys/ (props changed) Modified: projects/sendfile/contrib/ofed/librdmacm/examples/build/cmatose/Makefile ============================================================================== --- projects/sendfile/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Sun Nov 30 13:27:58 2014 (r275330) +++ projects/sendfile/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Sun Nov 30 13:28:21 2014 (r275331) @@ -6,5 +6,6 @@ PROG= cmatose MAN= SRCS= cmatose.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: projects/sendfile/contrib/ofed/librdmacm/examples/build/mckey/Makefile ============================================================================== --- projects/sendfile/contrib/ofed/librdmacm/examples/build/mckey/Makefile Sun Nov 30 13:27:58 2014 (r275330) +++ projects/sendfile/contrib/ofed/librdmacm/examples/build/mckey/Makefile Sun Nov 30 13:28:21 2014 (r275331) @@ -6,5 +6,6 @@ PROG= mckey MAN= SRCS= mckey.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: projects/sendfile/contrib/ofed/librdmacm/examples/build/rping/Makefile ============================================================================== --- projects/sendfile/contrib/ofed/librdmacm/examples/build/rping/Makefile Sun Nov 30 13:27:58 2014 (r275330) +++ projects/sendfile/contrib/ofed/librdmacm/examples/build/rping/Makefile Sun Nov 30 13:28:21 2014 (r275331) @@ -6,5 +6,6 @@ PROG= rping MAN= SRCS= rping.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: projects/sendfile/contrib/ofed/librdmacm/examples/build/udaddy/Makefile ============================================================================== --- projects/sendfile/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Sun Nov 30 13:27:58 2014 (r275330) +++ projects/sendfile/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Sun Nov 30 13:28:21 2014 (r275331) @@ -6,5 +6,6 @@ PROG= udaddy MAN= SRCS= udaddy.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 14:35:04 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25128489; Sun, 30 Nov 2014 14:35:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1105AA8D; Sun, 30 Nov 2014 14:35:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUEZ4Jr002556; Sun, 30 Nov 2014 14:35:04 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUEZ2F7002543; Sun, 30 Nov 2014 14:35:02 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201411301435.sAUEZ2F7002543@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 30 Nov 2014 14:35:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275334 - in projects/routing/sys: net netinet 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 14:35:04 -0000 Author: melifaro Date: Sun Nov 30 14:35:01 2014 New Revision: 275334 URL: https://svnweb.freebsd.org/changeset/base/275334 Log: * Unify lle table dump/prefix removal code. * Rename lla_XXX -> lltable_XXX_lle to reduce number of name prefixes used by lltable code. Modified: projects/routing/sys/net/if_llatbl.c projects/routing/sys/net/if_llatbl.h projects/routing/sys/net/rt_nhops.c projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet/toecore.c projects/routing/sys/netinet6/in6.c projects/routing/sys/netinet6/nd6.c Modified: projects/routing/sys/net/if_llatbl.c ============================================================================== --- projects/routing/sys/net/if_llatbl.c Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/net/if_llatbl.c Sun Nov 30 14:35:01 2014 (r275334) @@ -72,8 +72,33 @@ struct rwlock lltable_rwlock; RW_SYSINIT(lltable_rwlock, &lltable_rwlock, "lltable_rwlock"); /* - * Dump arp state for a specific address family. + * Dump lle state for a specific address family. */ +static int +lltable_dump_af(struct lltable *llt, struct sysctl_req *wr) +{ + struct llentry *lle; + int i, error; + + LLTABLE_LOCK_ASSERT(); + + if (llt->llt_ifp->if_flags & IFF_LOOPBACK) + return (0); + error = 0; + + IF_AFDATA_CFG_RLOCK(llt->llt_ifp); + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { + error = llt->llt_dump_entry(llt, lle, wr); + if (error != 0) + break; + } + } + IF_AFDATA_CFG_RUNLOCK(llt->llt_ifp); + + return (error); +} + int lltable_sysctl_dumparp(int af, struct sysctl_req *wr) { @@ -83,7 +108,7 @@ lltable_sysctl_dumparp(int af, struct sy LLTABLE_RLOCK(); SLIST_FOREACH(llt, &V_lltables, llt_link) { if (llt->llt_af == af) { - error = llt->llt_dump(llt, wr); + error = lltable_dump_af(llt, wr); if (error != 0) goto done; } @@ -186,12 +211,12 @@ llentry_alloc(struct ifnet *ifp, struct struct llentry *la; IF_AFDATA_RLOCK(ifp); - la = lla_lookup(lt, LLE_EXCLUSIVE, (struct sockaddr *)dst); + la = lt->llt_lookup(lt, LLE_EXCLUSIVE, (struct sockaddr *)dst); IF_AFDATA_RUNLOCK(ifp); if ((la == NULL) && (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) == 0) { IF_AFDATA_CFG_WLOCK(ifp); - la = lla_create(lt, 0, (struct sockaddr *)dst); + la = lt->llt_create(lt, 0, (struct sockaddr *)dst); if (la != NULL) { IF_AFDATA_RUN_WLOCK(ifp); llentry_link(lt, la); @@ -229,10 +254,7 @@ lltable_free(struct lltable *llt) for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { LLE_WLOCK(lle); - if (callout_stop(&lle->la_timer)) { - LLE_REMREF(lle); - lle->la_flags &= ~LLE_CALLOUTREF; - } + llt->llt_stop_timers(lle); LIST_INSERT_HEAD(&dchain, lle, lle_chain); } } @@ -246,6 +268,33 @@ lltable_free(struct lltable *llt) free(llt, M_LLTABLE); } +static void +lltable_prefix_free_af(struct lltable *llt, const struct sockaddr *prefix, + const struct sockaddr *mask, u_int flags) +{ + struct llentries dchain; + struct llentry *lle, *next; + int i; + + LIST_INIT(&dchain); + IF_AFDATA_CFG_WLOCK(llt->llt_ifp); + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { + if (llt->llt_match_prefix(prefix, mask, flags, lle)) { + LLE_WLOCK(lle); + llt->llt_stop_timers(lle); + LIST_INSERT_HEAD(&dchain, lle, lle_chain); + } + } + } + IF_AFDATA_RUN_WLOCK(llt->llt_ifp); + llentries_unlink(&dchain); + IF_AFDATA_RUN_WUNLOCK(llt->llt_ifp); + LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) + llentry_free(lle); + IF_AFDATA_CFG_WUNLOCK(llt->llt_ifp); +} + #if 0 void lltable_drain(int af) @@ -285,7 +334,7 @@ lltable_prefix_free(int af, struct socka if (llt->llt_af != af) continue; - llt->llt_prefix_free(llt, prefix, mask, flags); + lltable_prefix_free_af(llt, prefix, mask, flags); } LLTABLE_RUNLOCK(); } @@ -356,7 +405,7 @@ lla_rt_output(struct rt_msghdr *rtm, str case RTM_ADD: /* Add static LLE */ IF_AFDATA_CFG_WLOCK(ifp); - lle = lla_create(llt, 0, dst); + lle = llt->llt_create(llt, 0, dst); if (lle == NULL) { IF_AFDATA_CFG_WUNLOCK(ifp); return (ENOMEM); @@ -403,7 +452,7 @@ lla_rt_output(struct rt_msghdr *rtm, str case RTM_DELETE: IF_AFDATA_CFG_WLOCK(ifp); - error = lla_delete(llt, 0, dst); + error = (llt->llt_delete(llt, 0, dst)); IF_AFDATA_CFG_WUNLOCK(ifp); return (error == 0 ? 0 : ENOENT); Modified: projects/routing/sys/net/if_llatbl.h ============================================================================== --- projects/routing/sys/net/if_llatbl.h Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/net/if_llatbl.h Sun Nov 30 14:35:01 2014 (r275334) @@ -153,10 +153,12 @@ typedef struct llentry *(llt_create_t)(s const struct sockaddr *l3addr); typedef int (llt_delete_t)(struct lltable *, u_int flags, const struct sockaddr *l3addr); -typedef void (llt_prefix_free_t)(struct lltable *, - const struct sockaddr *prefix, const struct sockaddr *mask, u_int flags); -typedef int (llt_dump_t)(struct lltable *, struct sysctl_req *); +typedef int (llt_dump_entry_t)(struct lltable *, struct llentry *, + struct sysctl_req *); typedef uint32_t (llt_hash_t)(const struct llentry *); +typedef int (llt_match_prefix_t)(const struct sockaddr *, + const struct sockaddr *, u_int, struct llentry *); +typedef void (llt_stop_timers_t)(struct llentry *lle); struct lltable { SLIST_ENTRY(lltable) llt_link; @@ -167,9 +169,10 @@ struct lltable { llt_lookup_t *llt_lookup; llt_create_t *llt_create; llt_delete_t *llt_delete; - llt_prefix_free_t *llt_prefix_free; - llt_dump_t *llt_dump; + llt_dump_entry_t *llt_dump_entry; llt_hash_t *llt_hash; + llt_match_prefix_t *llt_match_prefix; + llt_stop_timers_t *llt_stop_timers; }; MALLOC_DECLARE(M_LLTABLE); @@ -216,21 +219,24 @@ struct llentry *llentry_alloc(struct if * Generic link layer address lookup function. */ static __inline struct llentry * -lla_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) +lltable_lookup_lle(struct lltable *llt, u_int flags, + const struct sockaddr *l3addr) { return llt->llt_lookup(llt, flags, l3addr); } static __inline struct llentry * -lla_create(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) +lltable_create_lle(struct lltable *llt, u_int flags, + const struct sockaddr *l3addr) { return llt->llt_create(llt, flags, l3addr); } static __inline int -lla_delete(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) +lltable_delete_lle(struct lltable *llt, u_int flags, + const struct sockaddr *l3addr) { return llt->llt_delete(llt, flags, l3addr); Modified: projects/routing/sys/net/rt_nhops.c ============================================================================== --- projects/routing/sys/net/rt_nhops.c Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/net/rt_nhops.c Sun Nov 30 14:35:01 2014 (r275334) @@ -699,7 +699,8 @@ fib6_storelladdr(struct ifnet *ifp, stru * the entry should have been created in nd6_store_lladdr */ IF_AFDATA_RUN_RLOCK(ifp); - ln = lla_lookup(LLTABLE6(ifp), LLE_UNLOCKED, (struct sockaddr *)&dst_sa); + ln = lltable_lookup_lle(LLTABLE6(ifp), LLE_UNLOCKED, + (struct sockaddr *)&dst_sa); /* * Perform fast path for the following cases: Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/netinet/if_ether.c Sun Nov 30 14:35:01 2014 (r275334) @@ -164,7 +164,8 @@ arp_ifscrub(struct ifnet *ifp, uint32_t addr4.sin_family = AF_INET; addr4.sin_addr.s_addr = addr; IF_AFDATA_CFG_WLOCK(ifp); - lla_delete(LLTABLE(ifp), LLE_IFADDR, (struct sockaddr *)&addr4); + lltable_delete_lle(LLTABLE(ifp), LLE_IFADDR, + (struct sockaddr *)&addr4); IF_AFDATA_CFG_WUNLOCK(ifp); } #endif @@ -258,6 +259,11 @@ arptimer(void *arg) lle->la_flags &= ~LLE_CALLOUTREF; } + /* Unlink entry */ + IF_AFDATA_RUN_WLOCK(ifp); + llentry_unlink(lle); + IF_AFDATA_RUN_WUNLOCK(ifp); + pkts_dropped = llentry_free(lle); ARPSTAT_ADD(dropped, pkts_dropped); @@ -373,7 +379,7 @@ arpresolve_fast(struct ifnet *ifp, struc sa_dst = (const struct sockaddr *)&sin; IF_AFDATA_RUN_RLOCK(ifp); - la = lla_lookup(LLTABLE(ifp), LLE_UNLOCKED, sa_dst); + la = lltable_lookup_lle(LLTABLE(ifp), LLE_UNLOCKED, sa_dst); if (la != NULL && (la->r_flags & RLLE_VALID) != 0) { /* Entry found, let's copy lle info */ bcopy(&la->ll_addr, dst_addr, ifp->if_addrlen); @@ -458,7 +464,7 @@ arpresolve(struct ifnet *ifp, struct rte } IF_AFDATA_RUN_RLOCK(ifp); - la = lla_lookup(LLTABLE(ifp), LLE_UNLOCKED, dst); + la = lltable_lookup_lle(LLTABLE(ifp), LLE_UNLOCKED, dst); if (la != NULL && (la->r_flags & RLLE_VALID) != 0) { /* Entry found, let's copy lle info */ bcopy(&la->ll_addr, desten, ifp->if_addrlen); @@ -487,12 +493,12 @@ arpresolve_slow(struct ifnet *ifp, int i *lle = NULL; IF_AFDATA_RLOCK(ifp); - la = lla_lookup(LLTABLE(ifp), LLE_EXCLUSIVE, dst); + la = lltable_lookup_lle(LLTABLE(ifp), LLE_EXCLUSIVE, dst); IF_AFDATA_RUNLOCK(ifp); if (la == NULL && (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) == 0) { create = 1; IF_AFDATA_CFG_WLOCK(ifp); - la = lla_create(LLTABLE(ifp), 0, dst); + la = lltable_create_lle(LLTABLE(ifp), 0, dst); if (la != NULL) { IF_AFDATA_RUN_WLOCK(ifp); llentry_link(LLTABLE(ifp), la); @@ -858,9 +864,11 @@ match: flags = LLE_EXCLUSIVE; IF_AFDATA_CFG_WLOCK(ifp); if (create != 0) { - la = lla_create(LLTABLE(ifp), 0, (struct sockaddr *)&sin); + la = lltable_create_lle(LLTABLE(ifp), 0, + (struct sockaddr *)&sin); } else - la = lla_lookup(LLTABLE(ifp), flags, (struct sockaddr *)&sin); + la = lltable_lookup_lle(LLTABLE(ifp), flags, + (struct sockaddr *)&sin); IF_AFDATA_CFG_WUNLOCK(ifp); if (la != NULL) { /* the following is not an error when doing bridging */ @@ -989,7 +997,8 @@ reply: sin.sin_addr = itaddr; IF_AFDATA_RLOCK(ifp); - lle = lla_lookup(LLTABLE(ifp), 0, (struct sockaddr *)&sin); + lle = lltable_lookup_lle(LLTABLE(ifp), 0, + (struct sockaddr *)&sin); IF_AFDATA_RUNLOCK(ifp); if ((lle != NULL) && (lle->la_flags & LLE_PUB)) { @@ -1093,7 +1102,7 @@ arp_ifinit(struct ifnet *ifp, struct ifa * that L2 entry as permanent */ IF_AFDATA_CFG_WLOCK(ifp); - lle = lla_create(LLTABLE(ifp), LLE_IFADDR | LLE_STATIC, + lle = lltable_create_lle(LLTABLE(ifp), LLE_IFADDR | LLE_STATIC, (struct sockaddr *)IA_SIN(ifa)); if (lle != NULL) { IF_AFDATA_RUN_WLOCK(ifp); Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/netinet/in.c Sun Nov 30 14:35:01 2014 (r275334) @@ -1035,51 +1035,37 @@ in_lltable_new(const struct sockaddr *l3 return (&lle->base); } +static void +in_lltable_stop_timers(struct llentry *lle) +{ + + LLE_WLOCK_ASSERT(lle); + if (callout_stop(&lle->la_timer)) { + LLE_REMREF(lle); + lle->la_flags &= ~LLE_CALLOUTREF; + } +} + #define IN_ARE_MASKED_ADDR_EQUAL(d, a, m) ( \ (((ntohl((d)->sin_addr.s_addr) ^ (a)->sin_addr.s_addr) & (m)->sin_addr.s_addr)) == 0 ) -static void -in_lltable_prefix_free(struct lltable *llt, const struct sockaddr *prefix, - const struct sockaddr *mask, u_int flags) +static int +in_lltable_match_prefix(const struct sockaddr *prefix, + const struct sockaddr *mask, u_int flags, struct llentry *lle) { const struct sockaddr_in *pfx = (const struct sockaddr_in *)prefix; const struct sockaddr_in *msk = (const struct sockaddr_in *)mask; - struct llentry *lle, *next; - struct llentries dchain; - int i; - size_t pkts_dropped; - - LIST_INIT(&dchain); - IF_AFDATA_CFG_WLOCK(llt->llt_ifp); - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { - /* - * (flags & LLE_STATIC) means deleting all entries - * including static ARP entries. - */ - if (IN_ARE_MASKED_ADDR_EQUAL(satosin(L3_ADDR(lle)), - pfx, msk) && ((flags & LLE_STATIC) || - !(lle->la_flags & LLE_STATIC))) { - LLE_WLOCK(lle); - if (callout_stop(&lle->la_timer)) { - LLE_REMREF(lle); - lle->la_flags &= ~LLE_CALLOUTREF; - } - LIST_INSERT_HEAD(&dchain, lle, lle_chain); - } - } - } - /* Unlink chain */ - IF_AFDATA_RUN_WLOCK(llt->llt_ifp); - llentries_unlink(&dchain); - IF_AFDATA_RUN_WUNLOCK(llt->llt_ifp); - LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) { - pkts_dropped = llentry_free(lle); - ARPSTAT_ADD(dropped, pkts_dropped); - } - IF_AFDATA_CFG_WUNLOCK(llt->llt_ifp); -} + /* + * (flags & LLE_STATIC) means deleting all entries + * including static ARP entries. + */ + if (IN_ARE_MASKED_ADDR_EQUAL(satosin(L3_ADDR(lle)), pfx, msk) && + ((flags & LLE_STATIC) || !(lle->la_flags & LLE_STATIC))) + return (1); + + return (0); +} static int in_lltable_rtcheck(struct ifnet *ifp, u_int flags, const struct sockaddr *l3addr) @@ -1265,29 +1251,22 @@ in_lltable_lookup(struct lltable *llt, u } static int -in_lltable_dump(struct lltable *llt, struct sysctl_req *wr) +in_lltable_dump_entry(struct lltable *llt, struct llentry *lle, + struct sysctl_req *wr) { -#define SIN(lle) ((struct sockaddr_in *) L3_ADDR(lle)) struct ifnet *ifp = llt->llt_ifp; - struct llentry *lle; /* XXX stack use */ struct { struct rt_msghdr rtm; struct sockaddr_in sin; struct sockaddr_dl sdl; } arpc; - int error, i; - - LLTABLE_LOCK_ASSERT(); - - error = 0; - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { - struct sockaddr_dl *sdl; + struct sockaddr_dl *sdl; + int error; /* Skip if jailed and not a valid IP of the prison. */ if (prison_if(wr->td->td_ucred, L3_ADDR(lle)) != 0) - continue; + return (0); /* * produce a msg made of: * struct rt_msghdr; @@ -1302,7 +1281,7 @@ in_lltable_dump(struct lltable *llt, str arpc.rtm.rtm_addrs = RTA_DST | RTA_GATEWAY; arpc.sin.sin_family = AF_INET; arpc.sin.sin_len = sizeof(arpc.sin); - arpc.sin.sin_addr.s_addr = SIN(lle)->sin_addr.s_addr; + arpc.sin.sin_addr.s_addr = lle->r_l3addr.addr4.s_addr; /* publish */ if (lle->la_flags & LLE_PUB) @@ -1328,12 +1307,8 @@ in_lltable_dump(struct lltable *llt, str arpc.rtm.rtm_flags |= RTF_STATIC; arpc.rtm.rtm_index = ifp->if_index; error = SYSCTL_OUT(wr, &arpc, sizeof(arpc)); - if (error) - break; - } - } - return error; -#undef SIN + + return (error); } void * @@ -1346,12 +1321,13 @@ in_domifattach(struct ifnet *ifp) llt = lltable_init(ifp, AF_INET); if (llt != NULL) { - llt->llt_prefix_free = in_lltable_prefix_free; llt->llt_lookup = in_lltable_lookup; llt->llt_create = in_lltable_create; llt->llt_delete = in_lltable_delete; - llt->llt_dump = in_lltable_dump; + llt->llt_dump_entry = in_lltable_dump_entry; llt->llt_hash = in_lltable_hash; + llt->llt_stop_timers = in_lltable_stop_timers; + llt->llt_match_prefix = in_lltable_match_prefix; } ii->ii_llt = llt; Modified: projects/routing/sys/netinet/toecore.c ============================================================================== --- projects/routing/sys/netinet/toecore.c Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/netinet/toecore.c Sun Nov 30 14:35:01 2014 (r275334) @@ -459,7 +459,7 @@ toe_nd6_resolve(struct ifnet *ifp, struc restart: IF_AFDATA_RLOCK(ifp); - lle = lla_lookup(LLTABLE6(ifp), flags, sa); + lle = lltable_lookup_lle(LLTABLE6(ifp), flags, sa); IF_AFDATA_RUNLOCK(ifp); if (lle == NULL) { IF_AFDATA_CFG_WLOCK(ifp); Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/netinet6/in6.c Sun Nov 30 14:35:01 2014 (r275334) @@ -2088,43 +2088,29 @@ in6_lltable_new(const struct sockaddr *l } static void -in6_lltable_prefix_free(struct lltable *llt, const struct sockaddr *prefix, - const struct sockaddr *mask, u_int flags) +in6_lltable_stop_timers(struct llentry *lle) +{ + + LLE_WLOCK_ASSERT(lle); + if (callout_stop(&lle->la_timer)) { + LLE_REMREF(lle); + lle->la_flags &= ~LLE_CALLOUTREF; + } +} + +static int +in6_lltable_match_prefix(const struct sockaddr *prefix, + const struct sockaddr *mask, u_int flags, struct llentry *lle) { const struct sockaddr_in6 *pfx = (const struct sockaddr_in6 *)prefix; const struct sockaddr_in6 *msk = (const struct sockaddr_in6 *)mask; - struct llentries dchain; - struct llentry *lle, *next; - int i; - /* - * (flags & LLE_STATIC) means deleting all entries - * including static ND6 entries. - */ - LIST_INIT(&dchain); - IF_AFDATA_CFG_WLOCK(llt->llt_ifp); - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { - if (IN6_ARE_MASKED_ADDR_EQUAL( - &satosin6(L3_ADDR(lle))->sin6_addr, - &pfx->sin6_addr, &msk->sin6_addr) && - ((flags & LLE_STATIC) || - !(lle->la_flags & LLE_STATIC))) { - LLE_WLOCK(lle); - if (callout_stop(&lle->la_timer)) { - LLE_REMREF(lle); - lle->la_flags &= ~LLE_CALLOUTREF; - } - LIST_INSERT_HEAD(&dchain, lle, lle_chain); - } - } - } - IF_AFDATA_RUN_WLOCK(llt->llt_ifp); - llentries_unlink(&dchain); - IF_AFDATA_RUN_WUNLOCK(llt->llt_ifp); - LIST_FOREACH_SAFE(lle, &dchain, lle_chain, next) - llentry_free(lle); - IF_AFDATA_CFG_WUNLOCK(llt->llt_ifp); + if (IN6_ARE_MASKED_ADDR_EQUAL(&satosin6(L3_ADDR(lle))->sin6_addr, + &pfx->sin6_addr, &msk->sin6_addr) && + ((flags & LLE_STATIC) || !(lle->la_flags & LLE_STATIC))) + return (1); + + return (0); } static int @@ -2296,10 +2282,10 @@ in6_lltable_lookup(struct lltable *llt, } static int -in6_lltable_dump(struct lltable *llt, struct sysctl_req *wr) +in6_lltable_dump_entry(struct lltable *llt, struct llentry *lle, + struct sysctl_req *wr) { struct ifnet *ifp = llt->llt_ifp; - struct llentry *lle; /* XXX stack use */ struct { struct rt_msghdr rtm; @@ -2312,24 +2298,15 @@ in6_lltable_dump(struct lltable *llt, st #endif struct sockaddr_dl sdl; } ndpc; - int i, error; - - if (ifp->if_flags & IFF_LOOPBACK) - return 0; - - LLTABLE_LOCK_ASSERT(); - - error = 0; - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { - struct sockaddr_dl *sdl; + struct sockaddr_dl *sdl; + int error; /* skip invalid entries */ if ((lle->la_flags & LLE_VALID) == 0) - continue; + return (0); /* Skip if jailed and not a valid IP of the prison. */ if (prison_if(wr->td->td_ucred, L3_ADDR(lle)) != 0) - continue; + return (0); /* * produce a msg made of: * struct rt_msghdr; @@ -2366,11 +2343,8 @@ in6_lltable_dump(struct lltable *llt, st ndpc.rtm.rtm_flags |= RTF_STATIC; ndpc.rtm.rtm_index = ifp->if_index; error = SYSCTL_OUT(wr, &ndpc, sizeof(ndpc)); - if (error) - break; - } - } - return error; + + return (error); } void * @@ -2403,12 +2377,13 @@ in6_domifattach(struct ifnet *ifp) ext->scope6_id = scope6_ifattach(ifp); ext->lltable = lltable_init(ifp, AF_INET6); if (ext->lltable != NULL) { - ext->lltable->llt_prefix_free = in6_lltable_prefix_free; ext->lltable->llt_lookup = in6_lltable_lookup; ext->lltable->llt_create = in6_lltable_create; ext->lltable->llt_delete = in6_lltable_delete; - ext->lltable->llt_dump = in6_lltable_dump; + ext->lltable->llt_dump_entry = in6_lltable_dump_entry; ext->lltable->llt_hash = in6_lltable_hash; + ext->lltable->llt_stop_timers = in6_lltable_stop_timers; + ext->lltable->llt_match_prefix = in6_lltable_match_prefix; } ext->mld_ifinfo = mld_domifattach(ifp); Modified: projects/routing/sys/netinet6/nd6.c ============================================================================== --- projects/routing/sys/netinet6/nd6.c Sun Nov 30 13:43:52 2014 (r275333) +++ projects/routing/sys/netinet6/nd6.c Sun Nov 30 14:35:01 2014 (r275334) @@ -860,7 +860,8 @@ nd6_lookup(struct in6_addr *addr6, int f */ llflags = (flags & ND6_EXCLUSIVE) ? LLE_EXCLUSIVE : 0; - ln = lla_lookup(LLTABLE6(ifp), llflags, (struct sockaddr *)&sin6); + ln = lltable_lookup_lle(LLTABLE6(ifp), llflags, + (struct sockaddr *)&sin6); return (ln); } @@ -882,7 +883,7 @@ nd6_create(struct in6_addr *addr6, int f IF_AFDATA_CFG_WLOCK_ASSERT(ifp); - ln = lla_create(LLTABLE6(ifp), 0, (struct sockaddr *)&sin6); + ln = lltable_create_lle(LLTABLE6(ifp), 0, (struct sockaddr *)&sin6); if (ln != NULL) { IF_AFDATA_RUN_WLOCK(ifp); ln->ln_state = ND6_LLINFO_NOSTATE; @@ -2269,7 +2270,7 @@ nd6_add_ifa_lle(struct in6_ifaddr *ia) ifp = ia->ia_ifa.ifa_ifp; IF_AFDATA_CFG_WLOCK(ifp); - ln = lla_create(LLTABLE6(ifp), LLE_IFADDR, + ln = lltable_create_lle(LLTABLE6(ifp), LLE_IFADDR, (struct sockaddr *)&ia->ia_addr); if (ln != NULL) { IF_AFDATA_RUN_WLOCK(ifp); @@ -2366,7 +2367,7 @@ nd6_storelladdr(struct ifnet *ifp, struc * the entry should have been created in nd6_store_lladdr */ IF_AFDATA_RLOCK(ifp); - ln = lla_lookup(LLTABLE6(ifp), 0, dst); + ln = lltable_lookup_lle(LLTABLE6(ifp), 0, dst); IF_AFDATA_RUNLOCK(ifp); if ((ln == NULL) || !(ln->la_flags & LLE_VALID)) { if (ln != NULL) From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:42:30 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1DEE75F; Sun, 30 Nov 2014 18:42:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 8380E315; Sun, 30 Nov 2014 18:42:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUIgUO6019026; Sun, 30 Nov 2014 18:42:30 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUIgTp1019021; Sun, 30 Nov 2014 18:42:29 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301842.sAUIgTp1019021@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:42:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275338 - in projects/bmake/lib/csu: . amd64 i386-elf 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:42:30 -0000 Author: sjg Date: Sun Nov 30 18:42:29 2014 New Revision: 275338 URL: https://svnweb.freebsd.org/changeset/base/275338 Log: Put lib/csu/amd64/Makefile back the way it is in head and handle staging via ../Makefile.inc Modified: projects/bmake/lib/csu/Makefile.inc projects/bmake/lib/csu/amd64/Makefile projects/bmake/lib/csu/i386-elf/Makefile.depend Modified: projects/bmake/lib/csu/Makefile.inc ============================================================================== --- projects/bmake/lib/csu/Makefile.inc Sun Nov 30 17:29:49 2014 (r275337) +++ projects/bmake/lib/csu/Makefile.inc Sun Nov 30 18:42:29 2014 (r275338) @@ -7,3 +7,8 @@ SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/ NO_WMISSING_VARIABLE_DECLARATIONS= .include "../Makefile.inc" + +.if ${MK_STAGING} == "yes" && ${.TARGETS:Nall} == "" +FILES?= ${OBJS} +FILESDIR?= ${LIBDIR} +.endif Modified: projects/bmake/lib/csu/amd64/Makefile ============================================================================== --- projects/bmake/lib/csu/amd64/Makefile Sun Nov 30 17:29:49 2014 (r275337) +++ projects/bmake/lib/csu/amd64/Makefile Sun Nov 30 18:42:29 2014 (r275338) @@ -9,12 +9,6 @@ CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include CFLAGS+= -fno-omit-frame-pointer -FILES= ${OBJS} -FILESOWN= ${LIBOWN} -FILESGRP= ${LIBGRP} -FILESMODE= ${LIBMODE} -FILESDIR= ${LIBDIR} - all: ${OBJS} CLEANFILES= ${OBJS} @@ -44,5 +38,8 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s +realinstall: + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${OBJS} ${DESTDIR}${LIBDIR} -.include +.include Modified: projects/bmake/lib/csu/i386-elf/Makefile.depend ============================================================================== --- projects/bmake/lib/csu/i386-elf/Makefile.depend Sun Nov 30 17:29:49 2014 (r275337) +++ projects/bmake/lib/csu/i386-elf/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:45:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08ABD87A; Sun, 30 Nov 2014 18:45:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DD41D334; Sun, 30 Nov 2014 18:45:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUIjnp2019579; Sun, 30 Nov 2014 18:45:49 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUIjlYY019567; Sun, 30 Nov 2014 18:45:47 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301845.sAUIjlYY019567@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:45:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275339 - in projects/bmake: share/mk targets targets/pseudo/the-lot targets/pseudo/toolchain targets/pseudo/universe targets/pseudo/userland 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:45:50 -0000 Author: sjg Date: Sun Nov 30 18:45:46 2014 New Revision: 275339 URL: https://svnweb.freebsd.org/changeset/base/275339 Log: Renamed pkgs/ targets/ Modified: projects/bmake/share/mk/local.dirdeps.mk projects/bmake/share/mk/local.gendirdeps.mk projects/bmake/targets/Makefile projects/bmake/targets/Makefile.inc projects/bmake/targets/pseudo/the-lot/Makefile.depend projects/bmake/targets/pseudo/toolchain/Makefile.depend projects/bmake/targets/pseudo/universe/Makefile projects/bmake/targets/pseudo/universe/Makefile.depend projects/bmake/targets/pseudo/userland/Makefile.depend Modified: projects/bmake/share/mk/local.dirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.dirdeps.mk Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/share/mk/local.dirdeps.mk Sun Nov 30 18:45:46 2014 (r275339) @@ -17,6 +17,12 @@ DIRDEPS := ${.TARGETS:M*/*} ${.TARGETS:Nall}: all .endif +# making universe is special +.if defined(UNIVERSE_GUARD) +# these should be done by now +DIRDEPS_FILTER+= N*.host +.endif + # pseudo machines get no qualification .for m in host common M_dep_qual_fixes += C;($m),[^/.,]*$$;\1; @@ -75,9 +81,9 @@ DIRDEPS += \ DIRDEPS+= lib/clang/include .endif -# we need pkgs/pseudo/stage to prep the stage tree -.if ${DEP_RELDIR} != "pkgs/pseudo/stage" -DIRDEPS += pkgs/pseudo/stage +# we need targets/pseudo/stage to prep the stage tree +.if ${DEP_RELDIR} != "targets/pseudo/stage" +DIRDEPS += targets/pseudo/stage .endif CSU_DIR.i386 = csu/i386-elf Modified: projects/bmake/share/mk/local.gendirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.gendirdeps.mk Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/share/mk/local.gendirdeps.mk Sun Nov 30 18:45:46 2014 (r275339) @@ -5,10 +5,10 @@ GENDIRDEPS_FILTER+= \ Ncddl/usr.bin/ctf* \ Nlib/clang/include \ Nlib/libc_nonshared \ - Npkgs/pseudo/stage* \ + Ntargets/pseudo/stage* \ Ntools/* -.if ${RELDIR:Mpkgs*} == "" +.if ${RELDIR:Mtargets*} == "" GENDIRDEPS_FILTER+= \ Nusr.bin/clang/clang.host \ Ngnu/usr.bin/cc* \ Modified: projects/bmake/targets/Makefile ============================================================================== --- projects/bmake/targets/Makefile Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/Makefile Sun Nov 30 18:45:46 2014 (r275339) @@ -35,23 +35,23 @@ # this is our top-level makefile .if make(pkg-*) -DIRDEPS_FILTER = Mpkgs/* +DIRDEPS_FILTER = Mtargets/* .endif # in theory, this is what we want -target_dirs = pkgs pkgs/pseudo +target_dirs = targets targets/pseudo # these tweak how we do it target_prefix = pkg- build- DIRDEPS := ${.TARGETS:Nall:${target_prefix:@p@S,^$p,,@:ts:}:@t@${target_dirs:@d@$d/$t@}@:@d@${exists(${SRCTOP}/$d):?$d:}@} -.if ${DIRDEPS:Mpkgs/pseudo/*} != "" +.if ${DIRDEPS:Mtargets/pseudo/*} != "" # all bets are off PKG_MACHINE_LIST = ${ALL_MACHINE_LIST} .endif .if make(check-commit) # a special case -DIRDEPS = pkgs/pseudo/check-commit +DIRDEPS = targets/pseudo/check-commit .if defined(ALL_MACHINES) CHECK_MACHINE_LIST = all .undef ALL_MACHINES @@ -127,16 +127,15 @@ start_utc := ${now_utc} _begin = count-makefiles -# by default, we clean pkgs/ which can otherwise accumulate a lot of cruft -.if ${NEED_CLEAN_PKGS:Uyes:tl} != "no" -_begin += clean-pkgs -.endif -.if defined(SHIPDIR) && ${NEED_CLEAN_SHIPDIR:Uno:tl} != "no" && exists(${SHIPDIR}) -_begin += clean-shipdir -.endif -.if ${NEED_CLEAN_ERROR_LOGS:Uyes:tl} == "yes" +__DEFAULT_YES_OPTIONS+= \ + CLEAN_ERROR_LOGS + +.include + +.if ${MK_CLEAN_ERROR_LOGS} == "yes" _begin += clean-error-logs .endif + .if !empty(_begin) && !make(clean*) dirdeps: ${_begin} .WAIT .endif @@ -167,12 +166,6 @@ _build_failed: .NOMETA clean-error-logs: .NOMETA @test ! -d ${meta_error_log:H} || rm -f ${meta_error_log:H}/*log -clean-pkgs: .NOMETA - @rm -rf ${ALL_MACHINE_LIST:N${MACHINE}:@m@${OBJROOT}$m/pkgs@} ${OBJROOT}${MACHINE}/pkgs/* - -clean-shipdir: .NOMETA - ${"${SHIPDIR:tl:Nno:N*\:*}":?rm -f ${SHIPDIR}/*:} - .if !target(_DIRDEP_USE) # we did not read dirdeps.mk above, the target may be here .include "Makefile.xtras" Modified: projects/bmake/targets/Makefile.inc ============================================================================== --- projects/bmake/targets/Makefile.inc Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/Makefile.inc Sun Nov 30 18:45:46 2014 (r275339) @@ -6,9 +6,9 @@ __${_this}__: _CURDIR ?= ${.CURDIR} _OBJDIR ?= ${.OBJDIR} -.if ${RELDIR:Mpkgs/*} != "" || ${RELDIR} == "." +.if ${RELDIR:Mtargets/*} != "" || ${RELDIR} == "." -.if ${.MAKE.LEVEL} == 0 && ${RELDIR:Mpkgs/*} != "" +.if ${.MAKE.LEVEL} == 0 && ${RELDIR:Mtargets/*} != "" .if make(bootstrap*) || !exists(${_CURDIR}/${.MAKE.DEPENDFILE:T}) _bootstrap_dirdeps = yes .else Modified: projects/bmake/targets/pseudo/the-lot/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/the-lot/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/the-lot/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -5,8 +5,8 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - pkgs/pseudo/kernel \ - pkgs/pseudo/toolchain \ - pkgs/pseudo/userland \ + targets/pseudo/kernel \ + targets/pseudo/toolchain \ + targets/pseudo/userland \ .include Modified: projects/bmake/targets/pseudo/toolchain/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/toolchain/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/toolchain/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -10,10 +10,10 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, DIRDEPS= usr.bin/xinstall .if ${MK_CLANG} == "yes" -DIRDEPS+= pkgs/pseudo/clang +DIRDEPS+= targets/pseudo/clang .endif .if ${MK_GCC} == "yes" -DIRDEPS+= pkgs/pseudo/gcc +DIRDEPS+= targets/pseudo/gcc .endif .include Modified: projects/bmake/targets/pseudo/universe/Makefile ============================================================================== --- projects/bmake/targets/pseudo/universe/Makefile Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/universe/Makefile Sun Nov 30 18:45:46 2014 (r275339) @@ -32,7 +32,7 @@ # # this is the RELDIR of the target we build -UNIVERSE_TARGET_RELDIR?= pkgs/pseudo/the-lot +UNIVERSE_TARGET_RELDIR?= targets/pseudo/the-lot # the list of machines TARGET_MACHINE_LIST = i386 amd64 Modified: projects/bmake/targets/pseudo/universe/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/universe/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/universe/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -8,7 +8,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, # our role here is to build all the host tools etc. DIRDEPS = \ - pkgs/pseudo/hosttools.host \ + targets/pseudo/hosttools.host \ .include Modified: projects/bmake/targets/pseudo/userland/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/userland/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/userland/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -7,18 +7,18 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, DEP_MACHINE := ${.PARSEFILE:E} DIRDEPS = \ - pkgs/pseudo/bin \ - pkgs/pseudo/cddl \ - pkgs/pseudo/games \ - pkgs/pseudo/gnu \ - pkgs/pseudo/include \ - pkgs/pseudo/kerberos5 \ - pkgs/pseudo/lib \ - pkgs/pseudo/libexec \ - pkgs/pseudo/sbin \ - pkgs/pseudo/secure \ - pkgs/pseudo/share \ - pkgs/pseudo/usr.bin \ - pkgs/pseudo/usr.sbin \ + targets/pseudo/bin \ + targets/pseudo/cddl \ + targets/pseudo/games \ + targets/pseudo/gnu \ + targets/pseudo/include \ + targets/pseudo/kerberos5 \ + targets/pseudo/lib \ + targets/pseudo/libexec \ + targets/pseudo/sbin \ + targets/pseudo/secure \ + targets/pseudo/share \ + targets/pseudo/usr.bin \ + targets/pseudo/usr.sbin \ .include From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:46:35 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E86B096A; Sun, 30 Nov 2014 18:46:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BC1A733C; Sun, 30 Nov 2014 18:46:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUIkZEF019732; Sun, 30 Nov 2014 18:46:35 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUIkZed019731; Sun, 30 Nov 2014 18:46:35 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301846.sAUIkZed019731@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:46:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275340 - projects/bmake/gnu/lib/csu 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:46:36 -0000 Author: sjg Date: Sun Nov 30 18:46:34 2014 New Revision: 275340 URL: https://svnweb.freebsd.org/changeset/base/275340 Log: all is MAIN target Modified: projects/bmake/gnu/lib/csu/Makefile Modified: projects/bmake/gnu/lib/csu/Makefile ============================================================================== --- projects/bmake/gnu/lib/csu/Makefile Sun Nov 30 18:45:46 2014 (r275339) +++ projects/bmake/gnu/lib/csu/Makefile Sun Nov 30 18:46:34 2014 (r275340) @@ -1,5 +1,7 @@ # $FreeBSD$ +.MAIN: all + .include MK_SSP= no From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:48:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 60898A79; Sun, 30 Nov 2014 18:48:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 410EF354; Sun, 30 Nov 2014 18:48:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUImLSR019993; Sun, 30 Nov 2014 18:48:21 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUImIEY019983; Sun, 30 Nov 2014 18:48:18 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301848.sAUImIEY019983@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:48:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275341 - in projects/bmake/lib/libpam/modules: pam_krb5 pam_ksu pam_nologin pam_opie pam_opieaccess pam_passwdqc pam_radius pam_ssh pam_tacplus pam_unix 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:48:21 -0000 Author: sjg Date: Sun Nov 30 18:48:17 2014 New Revision: 275341 URL: https://svnweb.freebsd.org/changeset/base/275341 Log: Need headers staged by libpam Modified: projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend Modified: projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -16,6 +16,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libpam/libpam \ secure/lib/libcrypto \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -16,6 +16,7 @@ DIRDEPS = \ lib/libcom_err \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libpam/libpam \ secure/lib/libcrypto \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libpam/libpam \ lib/libutil \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -11,6 +11,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libopie \ + lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libopie \ + lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -11,6 +11,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libpam/libpam \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libpam/libpam \ lib/libradius \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libpam/libpam \ lib/libutil \ secure/lib/libcrypto \ secure/lib/libssh \ Modified: projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/${CSU_DIR} \ lib/libc \ lib/libcompiler_rt \ + lib/libpam/libpam \ lib/libtacplus \ usr.bin/xinstall.host \ Modified: projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend ============================================================================== --- projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend Sun Nov 30 18:46:34 2014 (r275340) +++ projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) @@ -12,6 +12,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libcrypt \ + lib/libpam/libpam \ lib/libutil \ lib/libypclnt \ usr.bin/xinstall.host \ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:48:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E201BB2; Sun, 30 Nov 2014 18:48:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6A95E35E; Sun, 30 Nov 2014 18:48:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUImwhI020117; Sun, 30 Nov 2014 18:48:58 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUImwIf020116; Sun, 30 Nov 2014 18:48:58 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301848.sAUImwIf020116@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:48:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275342 - projects/bmake/include 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:48:58 -0000 Author: sjg Date: Sun Nov 30 18:48:57 2014 New Revision: 275342 URL: https://svnweb.freebsd.org/changeset/base/275342 Log: update dependencies Modified: projects/bmake/include/Makefile.depend Modified: projects/bmake/include/Makefile.depend ============================================================================== --- projects/bmake/include/Makefile.depend Sun Nov 30 18:48:17 2014 (r275341) +++ projects/bmake/include/Makefile.depend Sun Nov 30 18:48:57 2014 (r275342) @@ -3,7 +3,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - bin/cat.host \ usr.bin/xinstall.host \ From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:50:16 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05880CB3; Sun, 30 Nov 2014 18:50:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 E6675370; Sun, 30 Nov 2014 18:50:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUIoF7C021452; Sun, 30 Nov 2014 18:50:15 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUIoFvn021451; Sun, 30 Nov 2014 18:50:15 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301850.sAUIoFvn021451@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:50:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275343 - projects/bmake 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:50:16 -0000 Author: sjg Date: Sun Nov 30 18:50:15 2014 New Revision: 275343 URL: https://svnweb.freebsd.org/changeset/base/275343 Log: If we are doing META_MODE use targets/Makefile as top-level since this one isn't suitable. Modified: projects/bmake/Makefile Modified: projects/bmake/Makefile ============================================================================== --- projects/bmake/Makefile Sun Nov 30 18:48:57 2014 (r275342) +++ projects/bmake/Makefile Sun Nov 30 18:50:15 2014 (r275343) @@ -99,6 +99,11 @@ # # For more information, see the build(7) manual page. # +.if ${MK_META_MODE} == "yes" +# targets/Makefile plays the role of top-level +.include "targets/Makefile" +.else + TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir \ @@ -527,3 +532,4 @@ MAKE_JOB_ERROR_TOKEN= no .export MAKE_JOB_ERROR_TOKEN .endif .endif +.endif From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:51:11 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 052C6D9E; Sun, 30 Nov 2014 18:51:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 E616D37A; Sun, 30 Nov 2014 18:51:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUIpAUr021602; Sun, 30 Nov 2014 18:51:10 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUIpAWD021601; Sun, 30 Nov 2014 18:51:10 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301851.sAUIpAWD021601@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:51:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275344 - projects/bmake/share/mk 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.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:51:11 -0000 Author: sjg Date: Sun Nov 30 18:51:10 2014 New Revision: 275344 URL: https://svnweb.freebsd.org/changeset/base/275344 Log: Add STALE_STAGED as default no Modified: projects/bmake/share/mk/src.opts.mk Modified: projects/bmake/share/mk/src.opts.mk ============================================================================== --- projects/bmake/share/mk/src.opts.mk Sun Nov 30 18:50:15 2014 (r275343) +++ projects/bmake/share/mk/src.opts.mk Sun Nov 30 18:51:10 2014 (r275344) @@ -170,6 +170,7 @@ __DEFAULT_NO_OPTIONS = \ SHARED_TOOLCHAIN \ SORT_THREADS \ SVN \ + STALE_STAGED \ SYSROOT # From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 20:25:25 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66C15AA3; Sun, 30 Nov 2014 20:25:25 +0000 (UTC) Received: from mx1.stack.nl (relay04.stack.nl [IPv6:2001:610:1108:5010::107]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mailhost.stack.nl", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 2B9D8EC1; Sun, 30 Nov 2014 20:25:25 +0000 (UTC) Received: from snail.stack.nl (snail.stack.nl [IPv6:2001:610:1108:5010::131]) by mx1.stack.nl (Postfix) with ESMTP id 37507B8091; Sun, 30 Nov 2014 21:25:22 +0100 (CET) Received: by snail.stack.nl (Postfix, from userid 1677) id 23CC628494; Sun, 30 Nov 2014 21:25:22 +0100 (CET) Date: Sun, 30 Nov 2014 21:25:22 +0100 From: Jilles Tjoelker To: Garrett Cooper Subject: Re: svn commit: r275219 - projects/building-blocks/share/skel Message-ID: <20141130202521.GA1103@stack.nl> References: <201411282207.sASM7Gq7055794@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201411282207.sASM7Gq7055794@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 20:25:25 -0000 On Fri, Nov 28, 2014 at 10:07:16PM +0000, Garrett Cooper wrote: > Author: ngie > Date: Fri Nov 28 22:07:16 2014 > New Revision: 275219 > URL: https://svnweb.freebsd.org/changeset/base/275219 > Log: > Install skeleton files based on the values of MK_MAIL and MK_TCSH > Customize according to MK_GAMES and MK_VI, in particular comment out lines > that would change behavior > Change dot.cshrc and dot.profile to not check for /usr/games/fortune based > on the new behavior in customizing the files Hmm, this assumes a rather specific use case: selecting a particular combination of options, building everything and installing everything what was built. In particular, the run-time check for /usr/games/fortune was there because a user might not install /usr/games, even though it was part of the built release. With "packaged base", this possibility will remain important. Also, dotfiles might be shared between systems by users. This is an objection against customizing dot.* file contents depending on options, not against conditionally installing dot.* files. -- Jilles Tjoelker From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 04:27:10 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B8216AD; Mon, 1 Dec 2014 04:27:10 +0000 (UTC) Received: from mail-pa0-x230.google.com (mail-pa0-x230.google.com [IPv6:2607:f8b0:400e:c03::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42266182; Mon, 1 Dec 2014 04:27:10 +0000 (UTC) Received: by mail-pa0-f48.google.com with SMTP id rd3so10246694pab.7 for ; Sun, 30 Nov 2014 20:27:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=cF6/wermR8pKROPFiE0rWFP1T22B9395xAW6vb6u/wY=; b=i/bMChk4r/8BgEiVKDV/OI73kjGaNGA8eE/NpkO4pTZjDkhQoeP2z7kwaTc1xM3rGc hWSE0O6sPD5GWL27QupKfREHQ/Vw5tQM941E54gkXyIDA8dxRiFpI4OSTQvbamzIAKfp ZHJ3dRIcd1kz7EYug/OSuCn36fKune4z15RvqH2tTovz9YG2ueu9PY0wieqdwjgYZKWu mzYAjRn4Ohk7w9HHO+I1kkMMrm3Pr3mI6nEFb5JiRfUSxWkJ2+2r+aHjuWqZ659zNDPP 5b4IBKBm+HzbWlu6TOXUGiRlibx1PD4SZotoms9Tmi+ygYaPz9fyhSMgndaUgjgh++Oy L42g== X-Received: by 10.66.228.72 with SMTP id sg8mr97062731pac.139.1417408029867; Sun, 30 Nov 2014 20:27:09 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:c83a:80c2:a7e8:2844? ([2601:8:ab80:7d6:c83a:80c2:a7e8:2844]) by mx.google.com with ESMTPSA id ht3sm16260624pad.18.2014.11.30.20.27.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 20:27:09 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_B3082485-0599-454F-BA89-A36E7077B6EB"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r275219 - projects/building-blocks/share/skel From: Garrett Cooper In-Reply-To: <20141130202521.GA1103@stack.nl> Date: Sun, 30 Nov 2014 20:27:07 -0800 Message-Id: References: <201411282207.sASM7Gq7055794@svn.freebsd.org> <20141130202521.GA1103@stack.nl> To: Jilles Tjoelker X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Garrett Cooper X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 04:27:10 -0000 --Apple-Mail=_B3082485-0599-454F-BA89-A36E7077B6EB Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Nov 30, 2014, at 12:25, Jilles Tjoelker wrote: > On Fri, Nov 28, 2014 at 10:07:16PM +0000, Garrett Cooper wrote: >> Author: ngie >> Date: Fri Nov 28 22:07:16 2014 >> New Revision: 275219 >> URL: https://svnweb.freebsd.org/changeset/base/275219 >=20 >> Log: >> Install skeleton files based on the values of MK_MAIL and MK_TCSH >=20 >> Customize according to MK_GAMES and MK_VI, in particular comment out = lines >> that would change behavior >=20 >> Change dot.cshrc and dot.profile to not check for /usr/games/fortune = based >> on the new behavior in customizing the files >=20 > Hmm, this assumes a rather specific use case: selecting a particular > combination of options, building everything and installing everything > what was built. >=20 > In particular, the run-time check for /usr/games/fortune was there > because a user might not install /usr/games, even though it was part = of > the built release. With "packaged base", this possibility will remain > important. Good point. What triggered this commit was something I noticed when I fixed =93MK_VI = =3D=3D no=94 to delete vi in base, which in turn breaks the default dot = files, i.e. 'export EDITOR=3Dvi=92. MK_VI =3D=3D no doesn=92t install vi = with installworld, but it doesn=92t clean it up on head if you run make = delete-old either, so this issue wasn=92t apparent until I started this = work (and I guess no one complained about the MK_VI =3D=3D no case = before now). To err on the safe side, I can add a `if [ -x /usr/bin/vi = ]; then ; fi` around the export EDITOR line if you like =97 however many = other OS distros (Fedora Linux, IllumOS, Ubuntu Linux, etc) don=92t ship = with defaults =97 is this something we should do as well? vi is also implicitly required for the build when building some files in = share/termcap, as the build calls ex on the files, but that=92s a = sidenote. > Also, dotfiles might be shared between systems by users. Yes, but shouldn=92t the person customizing the system know what files = are being distributed? > This is an objection against customizing dot.* file contents depending > on options, not against conditionally installing dot.* files. Ok. Something else that needs to be discussed is /usr/games being in = $PATH and a few other things, because this could slow down path lookups, = even if it=92s a small amount (I realize the namei cache is supposed to = make this less noticeable, but every little bit counts IMHO). Thanks for the input :)! --Apple-Mail=_B3082485-0599-454F-BA89-A36E7077B6EB Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJUe+4bAAoJEMZr5QU6S73eXQcH/1MJAAIDld3cu8FlalP/z6ZV HJmFNMOr3DOXHGLsX6ccjYZIpFVoSCGrD7A1RNsl5g2mY9uzAnvmqhZ07hF/yush MpHm51d2iNjvHPdOp3Wk8SP3Ng7gzQqTrKwP8mzg5m7NYitO9XKaodGq3xQO7ODr FqiQWsSFbSJJ3xS/1LZ9e3dJLK5ubLk4rqMfUepP+PEjqpAD5fpGVggIMB5cUXiC RAhC83JIxQkSR8OsjWZ9zK+gPTEqYlw6sehAPhqV5+WNFOK3zjHuYQBqsyZ3yk3r vryAXLossDpjs7djfbq/5Uo2JfwHrIK0WdM+/b9a4eJOHrE3CUp/ysJuRN3bL7o= =6o6n -----END PGP SIGNATURE----- --Apple-Mail=_B3082485-0599-454F-BA89-A36E7077B6EB-- From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 06:52:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 819A712A; Mon, 1 Dec 2014 06:52:36 +0000 (UTC) Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46AF9A7D; Mon, 1 Dec 2014 06:52:36 +0000 (UTC) Received: by mail-pa0-f49.google.com with SMTP id eu11so10344192pac.8 for ; Sun, 30 Nov 2014 22:52:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=alfgVxhqQcEOp26TqNlhPnw9JLgaApk9vWAWsQ0yuVw=; b=uveqVeXmJnIUOa8oMSQ8+iK6jK9ldVvugYvZx2s873VX89oKzq7Wvv5cG8gpNXInxb tfUlrKkwou7mpW06L3LpS7FcpgP2kO2cFBWtyzFKip6v6W3NcP9Z5QM9xrunjK6EhviT D2AN1il1E+kp1bFDFilE4AW5dcPAjg2kqVW2EIRmFOF3pFyH+9kFWW3+d2VKfkkbwtIs MfIReBwWS7R16b8a8Wi6HIVmisQoFFgczQAN/3aCO7iPNYOn/pwE4yPPdsJcbgncmQKq bNH8wZw6Og/ws0k10DK7EcZgGnEjsvvSaa6+LMDMOIqWnbGg1OLKcpQ0eQnIwb1f3j1C /58Q== X-Received: by 10.70.138.104 with SMTP id qp8mr95197542pdb.99.1417416754188; Sun, 30 Nov 2014 22:52:34 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:c83a:80c2:a7e8:2844? ([2601:8:ab80:7d6:c83a:80c2:a7e8:2844]) by mx.google.com with ESMTPSA id j9sm268554pdl.72.2014.11.30.22.52.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 30 Nov 2014 22:52:33 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_E278F624-48C4-4AF0-B813-DCCCE6B59319"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r275219 - projects/building-blocks/share/skel From: Garrett Cooper In-Reply-To: Date: Sun, 30 Nov 2014 22:52:31 -0800 Message-Id: References: <201411282207.sASM7Gq7055794@svn.freebsd.org> <20141130202521.GA1103@stack.nl> To: Adrian Chadd X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-projects@freebsd.org, "src-committers@freebsd.org" , Garrett Cooper , Jilles Tjoelker X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 06:52:36 -0000 --Apple-Mail=_E278F624-48C4-4AF0-B813-DCCCE6B59319 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Nov 30, 2014, at 22:51, Adrian Chadd wrote: > .. is vi marked as a tool required for building (ie, ex) ? Nope. That=92s why I had to add it on my branch: = https://svnweb.freebsd.org/base/projects/building-blocks/Makefile.inc1?rev= ision=3D275224&view=3Dmarkup --Apple-Mail=_E278F624-48C4-4AF0-B813-DCCCE6B59319 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQEcBAEBCgAGBQJUfBAvAAoJEMZr5QU6S73e87UH/2MgueXY8I+7qCYp9Xrk1Jly dAg5rw8hrL7/oV8JGSaiQ+MSiGTaEgaZ6IWH5fFRukcv3xVoKIQZkZGUYTAhpxoT llIyToYvtmgfT0vJhPoUWrtgRnW4lqgoYcjzrpixIc+sIEO9IapRI2r4w7f5aG7h 3puYRoNbQX7rsONmvV/Oecaza5siLHqruHDOUqUMgUZXFMlBsYiiE8ck543OBItk Ar8dtUCdoV6wpNTnfqiBomNvliXYGPhCPcDBZTRZOO4XjFBj6R+/tIAlmh71QCgo uAdebzguDQFlwkgjakoX/23ky032V+UGsvdoO/itxrPEXpFDXqOIH3bY9Jd5rqU= =uYD9 -----END PGP SIGNATURE----- --Apple-Mail=_E278F624-48C4-4AF0-B813-DCCCE6B59319-- From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 06:51:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 02D47F51; Mon, 1 Dec 2014 06:51:12 +0000 (UTC) Received: from mail-wi0-x232.google.com (mail-wi0-x232.google.com [IPv6:2a00:1450:400c:c05::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 847D19DA; Mon, 1 Dec 2014 06:51:11 +0000 (UTC) Received: by mail-wi0-f178.google.com with SMTP id hi2so16187223wib.5 for ; Sun, 30 Nov 2014 22:51:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=RXpsEyvzvSuY1/UZnh3+fhoWm65r3xHXJ8/G+i3w+24=; b=G2oW64C9B2f61Gzy7NtUuKWzncmxiJYltEL2TC4IhZf5jDAzZrigcgEFfQHR5zfF2X umJplYcB9ypV0rMmTtPgJbl1loX8EBUg8PJ5koujBDhm+EOLVbOmavLj2dARsMNMc4mS EwO+K894MXJJGSmw+W9UGvEnHhXxbWVYS+YvUgogFgoBMDcmULeWYQGf9orwCx3q241D RQzGm7gkUHjtnSdNe99Xp1q/Zq4b+zTge4D1T61t2jpJc6cLlZK1L9cWB16xzZgcQrex PtlHRAEaKZERqodmcAEcon+KaY0HngB9ZJfuyoekQnNyYLjPdO/+jbR/lA7TS5hy9y6+ tWHQ== MIME-Version: 1.0 X-Received: by 10.194.24.103 with SMTP id t7mr71303730wjf.15.1417416669950; Sun, 30 Nov 2014 22:51:09 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.216.106.195 with HTTP; Sun, 30 Nov 2014 22:51:09 -0800 (PST) In-Reply-To: References: <201411282207.sASM7Gq7055794@svn.freebsd.org> <20141130202521.GA1103@stack.nl> Date: Sun, 30 Nov 2014 22:51:09 -0800 X-Google-Sender-Auth: 2_nqwJ-21kuaDJLvG6wZ2MaEoII Message-ID: Subject: Re: svn commit: r275219 - projects/building-blocks/share/skel From: Adrian Chadd To: Garrett Cooper Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-projects@freebsd.org, "src-committers@freebsd.org" , Garrett Cooper , Jilles Tjoelker X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 06:51:12 -0000 .. is vi marked as a tool required for building (ie, ex) ? -a On 30 November 2014 at 20:27, Garrett Cooper wrote: > On Nov 30, 2014, at 12:25, Jilles Tjoelker wrote: > >> On Fri, Nov 28, 2014 at 10:07:16PM +0000, Garrett Cooper wrote: >>> Author: ngie >>> Date: Fri Nov 28 22:07:16 2014 >>> New Revision: 275219 >>> URL: https://svnweb.freebsd.org/changeset/base/275219 >> >>> Log: >>> Install skeleton files based on the values of MK_MAIL and MK_TCSH >> >>> Customize according to MK_GAMES and MK_VI, in particular comment out l= ines >>> that would change behavior >> >>> Change dot.cshrc and dot.profile to not check for /usr/games/fortune b= ased >>> on the new behavior in customizing the files >> >> Hmm, this assumes a rather specific use case: selecting a particular >> combination of options, building everything and installing everything >> what was built. >> >> In particular, the run-time check for /usr/games/fortune was there >> because a user might not install /usr/games, even though it was part of >> the built release. With "packaged base", this possibility will remain >> important. > > Good point. > > What triggered this commit was something I noticed when I fixed =E2=80=9C= MK_VI =3D=3D no=E2=80=9D to delete vi in base, which in turn breaks the def= ault dot files, i.e. 'export EDITOR=3Dvi=E2=80=99. MK_VI =3D=3D no doesn=E2= =80=99t install vi with installworld, but it doesn=E2=80=99t clean it up on= head if you run make delete-old either, so this issue wasn=E2=80=99t appar= ent until I started this work (and I guess no one complained about the MK_V= I =3D=3D no case before now). To err on the safe side, I can add a `if [ -x= /usr/bin/vi ]; then ; fi` around the export EDITOR line if you like =E2=80= =94 however many other OS distros (Fedora Linux, IllumOS, Ubuntu Linux, etc= ) don=E2=80=99t ship with defaults =E2=80=94 is this something we should do= as well? > > vi is also implicitly required for the build when building some files in = share/termcap, as the build calls ex on the files, but that=E2=80=99s a sid= enote. > >> Also, dotfiles might be shared between systems by users. > > Yes, but shouldn=E2=80=99t the person customizing the system know what fi= les are being distributed? > >> This is an objection against customizing dot.* file contents depending >> on options, not against conditionally installing dot.* files. > > Ok. Something else that needs to be discussed is /usr/games being in $PAT= H and a few other things, because this could slow down path lookups, even i= f it=E2=80=99s a small amount (I realize the namei cache is supposed to mak= e this less noticeable, but every little bit counts IMHO). > > Thanks for the input :)! From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 11:28:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2618063A; Mon, 1 Dec 2014 11:28:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 0F735E37; Mon, 1 Dec 2014 11:28:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1BS9ne083943; Mon, 1 Dec 2014 11:28:09 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1BS5FH083915; Mon, 1 Dec 2014 11:28:05 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201412011128.sB1BS5FH083915@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 1 Dec 2014 11:28:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275356 - in projects/sendfile: bin/sh contrib/binutils/bfd contrib/gcc/config/arm contrib/ofed/management/infiniband-diags/src contrib/ofed/usr.bin sys/dev/virtio/block sys/kern sys/vm... 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.18-1 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, 01 Dec 2014 11:28:09 -0000 Author: glebius Date: Mon Dec 1 11:28:05 2014 New Revision: 275356 URL: https://svnweb.freebsd.org/changeset/base/275356 Log: Merge head r258543 through r275355. Modified: projects/sendfile/bin/sh/eval.c projects/sendfile/bin/sh/output.c projects/sendfile/contrib/binutils/bfd/elf32-arm.c projects/sendfile/contrib/gcc/config/arm/lib1funcs.asm projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibroute.c projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibtracert.c projects/sendfile/contrib/ofed/management/infiniband-diags/src/saquery.c projects/sendfile/contrib/ofed/management/infiniband-diags/src/smpquery.c projects/sendfile/contrib/ofed/usr.bin/Makefile.inc projects/sendfile/sys/dev/virtio/block/virtio_blk.c projects/sendfile/sys/kern/subr_taskqueue.c projects/sendfile/sys/vm/uma_core.c projects/sendfile/tools/tools/shlib-compat/shlib-compat.py projects/sendfile/tools/tools/shlib-compat/test/Makefile.inc projects/sendfile/tools/tools/shlib-compat/test/regress.sh projects/sendfile/tools/tools/sysbuild/sysbuild.sh Directory Properties: projects/sendfile/ (props changed) projects/sendfile/contrib/binutils/ (props changed) projects/sendfile/contrib/gcc/ (props changed) projects/sendfile/sys/ (props changed) Modified: projects/sendfile/bin/sh/eval.c ============================================================================== --- projects/sendfile/bin/sh/eval.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/bin/sh/eval.c Mon Dec 1 11:28:05 2014 (r275356) @@ -774,15 +774,7 @@ xtracecommand(struct arglist *varlist, s for (sp = arglist->list ; sp ; sp = sp->next) { if (sep != 0) out2c(' '); - /* Disambiguate command looking like assignment. */ - if (sp == arglist->list && - strchr(sp->text, '=') != NULL && - strchr(sp->text, '\'') == NULL) { - out2c('\''); - out2str(sp->text); - out2c('\''); - } else - out2qstr(sp->text); + out2qstr(sp->text); sep = ' '; } out2c('\n'); Modified: projects/sendfile/bin/sh/output.c ============================================================================== --- projects/sendfile/bin/sh/output.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/bin/sh/output.c Mon Dec 1 11:28:05 2014 (r275356) @@ -122,8 +122,7 @@ outqstr(const char *p, struct output *fi outstr("''", file); return; } - /* Caller will handle '=' if necessary */ - if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#")] == '\0' || + if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#=")] == '\0' || strcmp(p, "[") == 0) { outstr(p, file); return; Modified: projects/sendfile/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/sendfile/contrib/binutils/bfd/elf32-arm.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/binutils/bfd/elf32-arm.c Mon Dec 1 11:28:05 2014 (r275356) @@ -4960,7 +4960,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -4998,7 +4998,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -5984,7 +5984,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_n, in encoded constant-with-rotation format. */ - g_n = calculate_group_reloc_mask (abs (signed_value), group, + g_n = calculate_group_reloc_mask (llabs (signed_value), group, &residual); /* Check for overflow if required. */ @@ -5998,7 +5998,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6077,7 +6077,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x1000) @@ -6085,7 +6085,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6160,7 +6160,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x100) @@ -6168,7 +6168,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6243,7 +6243,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. (The absolute value to go in the place must be divisible by four and, after having been divided by four, must @@ -6253,7 +6253,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } Modified: projects/sendfile/contrib/gcc/config/arm/lib1funcs.asm ============================================================================== --- projects/sendfile/contrib/gcc/config/arm/lib1funcs.asm Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/gcc/config/arm/lib1funcs.asm Mon Dec 1 11:28:05 2014 (r275356) @@ -980,8 +980,6 @@ LSYM(Lover12): RET - FUNC_END aeabi_ldiv0 - FUNC_END aeabi_idiv0 FUNC_END div0 #endif /* L_divmodsi_tools */ Modified: projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c ============================================================================== --- projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c Mon Dec 1 11:28:05 2014 (r275356) @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "ibnetdiscover.h" #include "grouping.h" Modified: projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibroute.c ============================================================================== --- projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibroute.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibroute.c Mon Dec 1 11:28:05 2014 (r275356) @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c ============================================================================== --- projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Mon Dec 1 11:28:05 2014 (r275356) @@ -43,7 +43,7 @@ #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibtracert.c ============================================================================== --- projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibtracert.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/ofed/management/infiniband-diags/src/ibtracert.c Mon Dec 1 11:28:05 2014 (r275356) @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/sendfile/contrib/ofed/management/infiniband-diags/src/saquery.c ============================================================================== --- projects/sendfile/contrib/ofed/management/infiniband-diags/src/saquery.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/ofed/management/infiniband-diags/src/saquery.c Mon Dec 1 11:28:05 2014 (r275356) @@ -50,12 +50,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include Modified: projects/sendfile/contrib/ofed/management/infiniband-diags/src/smpquery.c ============================================================================== --- projects/sendfile/contrib/ofed/management/infiniband-diags/src/smpquery.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/ofed/management/infiniband-diags/src/smpquery.c Mon Dec 1 11:28:05 2014 (r275356) @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/sendfile/contrib/ofed/usr.bin/Makefile.inc ============================================================================== --- projects/sendfile/contrib/ofed/usr.bin/Makefile.inc Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/contrib/ofed/usr.bin/Makefile.inc Mon Dec 1 11:28:05 2014 (r275356) @@ -1,4 +1,9 @@ DIAGPATH= ${.CURDIR}/../../management/infiniband-diags BINDIR?= /usr/bin CFLAGS+= -I${.CURDIR}/../../include/infiniband +CFLAGS+= -I${.CURDIR}/../../include CFLAGS+= -I${.CURDIR}/../../management/opensm/include/ +CFLAGS+= -I${.CURDIR}/../../management/opensm +CFLAGS+= -I${.CURDIR}/../../management/libibcommon/include +CFLAGS+= -I${.CURDIR}/../../management/libibumad/include +CFLAGS+= -I${.CURDIR}/../../management/libibmad/include Modified: projects/sendfile/sys/dev/virtio/block/virtio_blk.c ============================================================================== --- projects/sendfile/sys/dev/virtio/block/virtio_blk.c Mon Dec 1 10:17:23 2014 (r275355) +++ projects/sendfile/sys/dev/virtio/block/virtio_blk.c Mon Dec 1 11:28:05 2014 (r275356) @@ -58,7 +58,6 @@ struct vtblk_request { struct virtio_blk_outhdr vbr_hdr; struct bio *vbr_bp; uint8_t vbr_ack; - TAILQ_ENTRY(vtblk_request) vbr_link; }; @@ -132,53 +131,60 @@ static int vtblk_dump(void *, void *, vm static void vtblk_strategy(struct bio *); static void vtblk_negotiate_features(struct vtblk_softc *); +static void vtblk_setup_features(struct vtblk_softc *); static int vtblk_maximum_segments(struct vtblk_softc *, struct virtio_blk_config *); static int vtblk_alloc_virtqueue(struct vtblk_softc *); static void vtblk_resize_disk(struct vtblk_softc *, uint64_t); -static void vtblk_set_write_cache(struct vtblk_softc *, int); -static int vtblk_write_cache_enabled(struct vtblk_softc *sc, - struct virtio_blk_config *); -static int vtblk_write_cache_sysctl(SYSCTL_HANDLER_ARGS); static void vtblk_alloc_disk(struct vtblk_softc *, struct virtio_blk_config *); static void vtblk_create_disk(struct vtblk_softc *); -static int vtblk_quiesce(struct vtblk_softc *); -static void vtblk_startio(struct vtblk_softc *); -static struct vtblk_request * vtblk_bio_request(struct vtblk_softc *); -static int vtblk_execute_request(struct vtblk_softc *, +static int vtblk_request_prealloc(struct vtblk_softc *); +static void vtblk_request_free(struct vtblk_softc *); +static struct vtblk_request * + vtblk_request_dequeue(struct vtblk_softc *); +static void vtblk_request_enqueue(struct vtblk_softc *, struct vtblk_request *); +static struct vtblk_request * + vtblk_request_next_ready(struct vtblk_softc *); +static void vtblk_request_requeue_ready(struct vtblk_softc *, + struct vtblk_request *); +static struct vtblk_request * + vtblk_request_next(struct vtblk_softc *); +static struct vtblk_request * + vtblk_request_bio(struct vtblk_softc *); +static int vtblk_request_execute(struct vtblk_softc *, + struct vtblk_request *); +static int vtblk_request_error(struct vtblk_request *); -static void vtblk_vq_intr(void *); +static void vtblk_queue_completed(struct vtblk_softc *, + struct bio_queue *); +static void vtblk_done_completed(struct vtblk_softc *, + struct bio_queue *); +static void vtblk_drain_vq(struct vtblk_softc *, int); +static void vtblk_drain(struct vtblk_softc *); -static void vtblk_stop(struct vtblk_softc *); +static void vtblk_startio(struct vtblk_softc *); +static void vtblk_bio_done(struct vtblk_softc *, struct bio *, int); static void vtblk_read_config(struct vtblk_softc *, struct virtio_blk_config *); -static void vtblk_get_ident(struct vtblk_softc *); -static void vtblk_prepare_dump(struct vtblk_softc *); -static int vtblk_write_dump(struct vtblk_softc *, void *, off_t, size_t); -static int vtblk_flush_dump(struct vtblk_softc *); +static void vtblk_ident(struct vtblk_softc *); static int vtblk_poll_request(struct vtblk_softc *, struct vtblk_request *); +static int vtblk_quiesce(struct vtblk_softc *); +static void vtblk_vq_intr(void *); +static void vtblk_stop(struct vtblk_softc *); -static void vtblk_finish_completed(struct vtblk_softc *); -static void vtblk_drain_vq(struct vtblk_softc *, int); -static void vtblk_drain(struct vtblk_softc *); - -static int vtblk_alloc_requests(struct vtblk_softc *); -static void vtblk_free_requests(struct vtblk_softc *); -static struct vtblk_request * vtblk_dequeue_request(struct vtblk_softc *); -static void vtblk_enqueue_request(struct vtblk_softc *, - struct vtblk_request *); - -static struct vtblk_request * vtblk_dequeue_ready(struct vtblk_softc *); -static void vtblk_enqueue_ready(struct vtblk_softc *, - struct vtblk_request *); +static void vtblk_dump_prepare(struct vtblk_softc *); +static int vtblk_dump_write(struct vtblk_softc *, void *, off_t, size_t); +static int vtblk_dump_flush(struct vtblk_softc *); -static int vtblk_request_error(struct vtblk_request *); -static void vtblk_finish_bio(struct bio *, int); +static void vtblk_set_write_cache(struct vtblk_softc *, int); +static int vtblk_write_cache_enabled(struct vtblk_softc *sc, + struct virtio_blk_config *); +static int vtblk_write_cache_sysctl(SYSCTL_HANDLER_ARGS); static void vtblk_setup_sysctl(struct vtblk_softc *); static int vtblk_tunable_int(struct vtblk_softc *, const char *, int); @@ -290,30 +296,18 @@ vtblk_attach(device_t dev) struct virtio_blk_config blkcfg; int error; + virtio_set_feature_desc(dev, vtblk_feature_desc); + sc = device_get_softc(dev); sc->vtblk_dev = dev; - VTBLK_LOCK_INIT(sc, device_get_nameunit(dev)); - bioq_init(&sc->vtblk_bioq); TAILQ_INIT(&sc->vtblk_req_free); TAILQ_INIT(&sc->vtblk_req_ready); - virtio_set_feature_desc(dev, vtblk_feature_desc); - vtblk_negotiate_features(sc); - - if (virtio_with_feature(dev, VIRTIO_RING_F_INDIRECT_DESC)) - sc->vtblk_flags |= VTBLK_FLAG_INDIRECT; - if (virtio_with_feature(dev, VIRTIO_BLK_F_RO)) - sc->vtblk_flags |= VTBLK_FLAG_READONLY; - if (virtio_with_feature(dev, VIRTIO_BLK_F_BARRIER)) - sc->vtblk_flags |= VTBLK_FLAG_BARRIER; - if (virtio_with_feature(dev, VIRTIO_BLK_F_CONFIG_WCE)) - sc->vtblk_flags |= VTBLK_FLAG_WC_CONFIG; - vtblk_setup_sysctl(sc); + vtblk_setup_features(sc); - /* Get local copy of config. */ vtblk_read_config(sc, &blkcfg); /* @@ -352,7 +346,7 @@ vtblk_attach(device_t dev) goto fail; } - error = vtblk_alloc_requests(sc); + error = vtblk_request_prealloc(sc); if (error) { device_printf(dev, "cannot preallocate requests\n"); goto fail; @@ -519,14 +513,14 @@ vtblk_dump(void *arg, void *virtual, vm_ VTBLK_LOCK(sc); if ((sc->vtblk_flags & VTBLK_FLAG_DUMPING) == 0) { - vtblk_prepare_dump(sc); + vtblk_dump_prepare(sc); sc->vtblk_flags |= VTBLK_FLAG_DUMPING; } if (length > 0) - error = vtblk_write_dump(sc, virtual, offset, length); + error = vtblk_dump_write(sc, virtual, offset, length); else if (virtual == NULL && offset == 0) - error = vtblk_flush_dump(sc); + error = vtblk_dump_flush(sc); else { error = EINVAL; sc->vtblk_flags &= ~VTBLK_FLAG_DUMPING; @@ -543,7 +537,7 @@ vtblk_strategy(struct bio *bp) struct vtblk_softc *sc; if ((sc = bp->bio_disk->d_drv1) == NULL) { - vtblk_finish_bio(bp, EINVAL); + vtblk_bio_done(NULL, bp, EINVAL); return; } @@ -553,37 +547,21 @@ vtblk_strategy(struct bio *bp) */ if (sc->vtblk_flags & VTBLK_FLAG_READONLY && (bp->bio_cmd == BIO_WRITE || bp->bio_cmd == BIO_FLUSH)) { - vtblk_finish_bio(bp, EROFS); + vtblk_bio_done(sc, bp, EROFS); return; } -#ifdef INVARIANTS - /* - * Prevent read/write buffers spanning too many segments from - * getting into the queue. This should only trip if d_maxsize - * was incorrectly set. - */ - if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) { - int nsegs, max_nsegs; - - nsegs = sglist_count(bp->bio_data, bp->bio_bcount); - max_nsegs = sc->vtblk_max_nsegs - VTBLK_MIN_SEGMENTS; + VTBLK_LOCK(sc); - KASSERT(nsegs <= max_nsegs, - ("%s: bio %p spanned too many segments: %d, max: %d", - __func__, bp, nsegs, max_nsegs)); + if (sc->vtblk_flags & VTBLK_FLAG_DETACH) { + VTBLK_UNLOCK(sc); + vtblk_bio_done(sc, bp, ENXIO); + return; } -#endif - VTBLK_LOCK(sc); - if (sc->vtblk_flags & VTBLK_FLAG_DETACH) - vtblk_finish_bio(bp, ENXIO); - else { - bioq_insert_tail(&sc->vtblk_bioq, bp); + bioq_insert_tail(&sc->vtblk_bioq, bp); + vtblk_startio(sc); - if ((sc->vtblk_flags & VTBLK_FLAG_SUSPEND) == 0) - vtblk_startio(sc); - } VTBLK_UNLOCK(sc); } @@ -599,6 +577,25 @@ vtblk_negotiate_features(struct vtblk_so sc->vtblk_features = virtio_negotiate_features(dev, features); } +static void +vtblk_setup_features(struct vtblk_softc *sc) +{ + device_t dev; + + dev = sc->vtblk_dev; + + vtblk_negotiate_features(sc); + + if (virtio_with_feature(dev, VIRTIO_RING_F_INDIRECT_DESC)) + sc->vtblk_flags |= VTBLK_FLAG_INDIRECT; + if (virtio_with_feature(dev, VIRTIO_BLK_F_RO)) + sc->vtblk_flags |= VTBLK_FLAG_READONLY; + if (virtio_with_feature(dev, VIRTIO_BLK_F_BARRIER)) + sc->vtblk_flags |= VTBLK_FLAG_BARRIER; + if (virtio_with_feature(dev, VIRTIO_BLK_F_CONFIG_WCE)) + sc->vtblk_flags |= VTBLK_FLAG_WC_CONFIG; +} + static int vtblk_maximum_segments(struct vtblk_softc *sc, struct virtio_blk_config *blkcfg) @@ -660,59 +657,6 @@ vtblk_resize_disk(struct vtblk_softc *sc } static void -vtblk_set_write_cache(struct vtblk_softc *sc, int wc) -{ - - /* Set either writeback (1) or writethrough (0) mode. */ - virtio_write_dev_config_1(sc->vtblk_dev, - offsetof(struct virtio_blk_config, writeback), wc); -} - -static int -vtblk_write_cache_enabled(struct vtblk_softc *sc, - struct virtio_blk_config *blkcfg) -{ - int wc; - - if (sc->vtblk_flags & VTBLK_FLAG_WC_CONFIG) { - wc = vtblk_tunable_int(sc, "writecache_mode", - vtblk_writecache_mode); - if (wc >= 0 && wc < VTBLK_CACHE_MAX) - vtblk_set_write_cache(sc, wc); - else - wc = blkcfg->writeback; - } else - wc = virtio_with_feature(sc->vtblk_dev, VIRTIO_BLK_F_WCE); - - return (wc); -} - -static int -vtblk_write_cache_sysctl(SYSCTL_HANDLER_ARGS) -{ - struct vtblk_softc *sc; - int wc, error; - - sc = oidp->oid_arg1; - wc = sc->vtblk_write_cache; - - error = sysctl_handle_int(oidp, &wc, 0, req); - if (error || req->newptr == NULL) - return (error); - if ((sc->vtblk_flags & VTBLK_FLAG_WC_CONFIG) == 0) - return (EPERM); - if (wc < 0 || wc >= VTBLK_CACHE_MAX) - return (EINVAL); - - VTBLK_LOCK(sc); - sc->vtblk_write_cache = wc; - vtblk_set_write_cache(sc, sc->vtblk_write_cache); - VTBLK_UNLOCK(sc); - - return (0); -} - -static void vtblk_alloc_disk(struct vtblk_softc *sc, struct virtio_blk_config *blkcfg) { device_t dev; @@ -728,7 +672,8 @@ vtblk_alloc_disk(struct vtblk_softc *sc, dp->d_name = VTBLK_DISK_NAME; dp->d_unit = device_get_unit(dev); dp->d_drv1 = sc; - dp->d_flags = DISKFLAG_CANFLUSHCACHE | DISKFLAG_UNMAPPED_BIO; + dp->d_flags = DISKFLAG_CANFLUSHCACHE | DISKFLAG_UNMAPPED_BIO | + DISKFLAG_DIRECT_COMPLETION; dp->d_hba_vendor = virtio_get_vendor(dev); dp->d_hba_device = virtio_get_device(dev); dp->d_hba_subvendor = virtio_get_subvendor(dev); @@ -789,11 +734,7 @@ vtblk_create_disk(struct vtblk_softc *sc dp = sc->vtblk_disk; - /* - * Retrieving the identification string must be done after - * the virtqueue interrupt is setup otherwise it will hang. - */ - vtblk_get_ident(sc); + vtblk_ident(sc); device_printf(sc->vtblk_dev, "%juMB (%ju %u byte sectors)\n", (uintmax_t) dp->d_mediasize >> 20, @@ -804,57 +745,107 @@ vtblk_create_disk(struct vtblk_softc *sc } static int -vtblk_quiesce(struct vtblk_softc *sc) +vtblk_request_prealloc(struct vtblk_softc *sc) { - int error; + struct vtblk_request *req; + int i, nreqs; - error = 0; + nreqs = virtqueue_size(sc->vtblk_vq); - VTBLK_LOCK_ASSERT(sc); + /* + * Preallocate sufficient requests to keep the virtqueue full. Each + * request consumes VTBLK_MIN_SEGMENTS or more descriptors so reduce + * the number allocated when indirect descriptors are not available. + */ + if ((sc->vtblk_flags & VTBLK_FLAG_INDIRECT) == 0) + nreqs /= VTBLK_MIN_SEGMENTS; - while (!virtqueue_empty(sc->vtblk_vq)) { - if (mtx_sleep(&sc->vtblk_vq, VTBLK_MTX(sc), PRIBIO, "vtblkq", - VTBLK_QUIESCE_TIMEOUT) == EWOULDBLOCK) { - error = EBUSY; - break; - } + for (i = 0; i < nreqs; i++) { + req = malloc(sizeof(struct vtblk_request), M_DEVBUF, M_NOWAIT); + if (req == NULL) + return (ENOMEM); + + MPASS(sglist_count(&req->vbr_hdr, sizeof(req->vbr_hdr)) == 1); + MPASS(sglist_count(&req->vbr_ack, sizeof(req->vbr_ack)) == 1); + + sc->vtblk_request_count++; + vtblk_request_enqueue(sc, req); } - return (error); + return (0); } static void -vtblk_startio(struct vtblk_softc *sc) +vtblk_request_free(struct vtblk_softc *sc) { - struct virtqueue *vq; struct vtblk_request *req; - int enq; - vq = sc->vtblk_vq; - enq = 0; + MPASS(TAILQ_EMPTY(&sc->vtblk_req_ready)); - VTBLK_LOCK_ASSERT(sc); + while ((req = vtblk_request_dequeue(sc)) != NULL) { + sc->vtblk_request_count--; + free(req, M_DEVBUF); + } - while (!virtqueue_full(vq)) { - if ((req = vtblk_dequeue_ready(sc)) == NULL) - req = vtblk_bio_request(sc); - if (req == NULL) - break; + KASSERT(sc->vtblk_request_count == 0, + ("%s: leaked %d requests", __func__, sc->vtblk_request_count)); +} - if (vtblk_execute_request(sc, req) != 0) { - vtblk_enqueue_ready(sc, req); - break; - } +static struct vtblk_request * +vtblk_request_dequeue(struct vtblk_softc *sc) +{ + struct vtblk_request *req; - enq++; + req = TAILQ_FIRST(&sc->vtblk_req_free); + if (req != NULL) { + TAILQ_REMOVE(&sc->vtblk_req_free, req, vbr_link); + bzero(req, sizeof(struct vtblk_request)); } - if (enq > 0) - virtqueue_notify(vq); + return (req); +} + +static void +vtblk_request_enqueue(struct vtblk_softc *sc, struct vtblk_request *req) +{ + + TAILQ_INSERT_HEAD(&sc->vtblk_req_free, req, vbr_link); +} + +static struct vtblk_request * +vtblk_request_next_ready(struct vtblk_softc *sc) +{ + struct vtblk_request *req; + + req = TAILQ_FIRST(&sc->vtblk_req_ready); + if (req != NULL) + TAILQ_REMOVE(&sc->vtblk_req_ready, req, vbr_link); + + return (req); +} + +static void +vtblk_request_requeue_ready(struct vtblk_softc *sc, struct vtblk_request *req) +{ + + /* NOTE: Currently, there will be at most one request in the queue. */ + TAILQ_INSERT_HEAD(&sc->vtblk_req_ready, req, vbr_link); +} + +static struct vtblk_request * +vtblk_request_next(struct vtblk_softc *sc) +{ + struct vtblk_request *req; + + req = vtblk_request_next_ready(sc); + if (req != NULL) + return (req); + + return (vtblk_request_bio(sc)); } static struct vtblk_request * -vtblk_bio_request(struct vtblk_softc *sc) +vtblk_request_bio(struct vtblk_softc *sc) { struct bio_queue_head *bioq; struct vtblk_request *req; @@ -865,7 +856,7 @@ vtblk_bio_request(struct vtblk_softc *sc if (bioq_first(bioq) == NULL) return (NULL); - req = vtblk_dequeue_request(sc); + req = vtblk_request_dequeue(sc); if (req == NULL) return (NULL); @@ -890,11 +881,14 @@ vtblk_bio_request(struct vtblk_softc *sc panic("%s: bio with unhandled cmd: %d", __func__, bp->bio_cmd); } + if (bp->bio_flags & BIO_ORDERED) + req->vbr_hdr.type |= VIRTIO_BLK_T_BARRIER; + return (req); } static int -vtblk_execute_request(struct vtblk_softc *sc, struct vtblk_request *req) +vtblk_request_execute(struct vtblk_softc *sc, struct vtblk_request *req) { struct virtqueue *vq; struct sglist *sg; @@ -907,26 +901,20 @@ vtblk_execute_request(struct vtblk_softc ordered = 0; writable = 0; - VTBLK_LOCK_ASSERT(sc); - /* - * Wait until the ordered request completes before - * executing subsequent requests. + * Some hosts (such as bhyve) do not implement the barrier feature, + * so we emulate it in the driver by allowing the barrier request + * to be the only one in flight. */ - if (sc->vtblk_req_ordered != NULL) - return (EBUSY); - - if (bp->bio_flags & BIO_ORDERED) { - if ((sc->vtblk_flags & VTBLK_FLAG_BARRIER) == 0) { - /* - * This request will be executed once all - * the in-flight requests are completed. - */ + if ((sc->vtblk_flags & VTBLK_FLAG_BARRIER) == 0) { + if (sc->vtblk_req_ordered != NULL) + return (EBUSY); + if (bp->bio_flags & BIO_ORDERED) { if (!virtqueue_empty(vq)) return (EBUSY); ordered = 1; - } else - req->vbr_hdr.type |= VIRTIO_BLK_T_BARRIER; + req->vbr_hdr.type &= ~VIRTIO_BLK_T_BARRIER; + } } sglist_reset(sg); @@ -935,7 +923,7 @@ vtblk_execute_request(struct vtblk_softc if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) { error = sglist_append_bio(sg, bp); if (error || sg->sg_nseg == sg->sg_maxseg) { - panic("%s: data buffer too big bio:%p error:%d", + panic("%s: bio %p data buffer too big %d", __func__, bp, error); } @@ -955,44 +943,156 @@ vtblk_execute_request(struct vtblk_softc return (error); } -static void -vtblk_vq_intr(void *xsc) +static int +vtblk_request_error(struct vtblk_request *req) { - struct vtblk_softc *sc; - struct virtqueue *vq; - - sc = xsc; - vq = sc->vtblk_vq; + int error; -again: - VTBLK_LOCK(sc); - if (sc->vtblk_flags & VTBLK_FLAG_DETACH) { - VTBLK_UNLOCK(sc); - return; + switch (req->vbr_ack) { + case VIRTIO_BLK_S_OK: + error = 0; + break; + case VIRTIO_BLK_S_UNSUPP: + error = ENOTSUP; + break; + default: + error = EIO; + break; } - vtblk_finish_completed(sc); + return (error); +} - if ((sc->vtblk_flags & VTBLK_FLAG_SUSPEND) == 0) - vtblk_startio(sc); - else - wakeup(&sc->vtblk_vq); +static void +vtblk_queue_completed(struct vtblk_softc *sc, struct bio_queue *queue) +{ + struct vtblk_request *req; + struct bio *bp; - if (virtqueue_enable_intr(vq) != 0) { - virtqueue_disable_intr(vq); - VTBLK_UNLOCK(sc); - goto again; + while ((req = virtqueue_dequeue(sc->vtblk_vq, NULL)) != NULL) { + if (sc->vtblk_req_ordered != NULL) { + MPASS(sc->vtblk_req_ordered == req); + sc->vtblk_req_ordered = NULL; + } + + bp = req->vbr_bp; + bp->bio_error = vtblk_request_error(req); + TAILQ_INSERT_TAIL(queue, bp, bio_queue); + + vtblk_request_enqueue(sc, req); } +} - VTBLK_UNLOCK(sc); +static void +vtblk_done_completed(struct vtblk_softc *sc, struct bio_queue *queue) +{ + struct bio *bp, *tmp; + + TAILQ_FOREACH_SAFE(bp, queue, bio_queue, tmp) { + if (bp->bio_error != 0) + disk_err(bp, "hard error", -1, 1); + vtblk_bio_done(sc, bp, bp->bio_error); + } } static void -vtblk_stop(struct vtblk_softc *sc) +vtblk_drain_vq(struct vtblk_softc *sc, int skip_done) { + struct virtqueue *vq; + struct vtblk_request *req; + int last; - virtqueue_disable_intr(sc->vtblk_vq); - virtio_stop(sc->vtblk_dev); + vq = sc->vtblk_vq; + last = 0; + + while ((req = virtqueue_drain(vq, &last)) != NULL) { + if (!skip_done) + vtblk_bio_done(sc, req->vbr_bp, ENXIO); + + vtblk_request_enqueue(sc, req); + } + + sc->vtblk_req_ordered = NULL; + KASSERT(virtqueue_empty(vq), ("virtqueue not empty")); +} + +static void +vtblk_drain(struct vtblk_softc *sc) +{ + struct bio_queue queue; + struct bio_queue_head *bioq; + struct vtblk_request *req; + struct bio *bp; + + bioq = &sc->vtblk_bioq; + TAILQ_INIT(&queue); + + if (sc->vtblk_vq != NULL) { + vtblk_queue_completed(sc, &queue); + vtblk_done_completed(sc, &queue); + + vtblk_drain_vq(sc, 0); + } + + while ((req = vtblk_request_next_ready(sc)) != NULL) { + vtblk_bio_done(sc, req->vbr_bp, ENXIO); + vtblk_request_enqueue(sc, req); + } + + while (bioq_first(bioq) != NULL) { + bp = bioq_takefirst(bioq); + vtblk_bio_done(sc, bp, ENXIO); + } + + vtblk_request_free(sc); +} + +static void +vtblk_startio(struct vtblk_softc *sc) +{ + struct virtqueue *vq; + struct vtblk_request *req; + int enq; + + VTBLK_LOCK_ASSERT(sc); + vq = sc->vtblk_vq; + enq = 0; + + if (sc->vtblk_flags & VTBLK_FLAG_SUSPEND) + return; + + while (!virtqueue_full(vq)) { + req = vtblk_request_next(sc); + if (req == NULL) + break; + + if (vtblk_request_execute(sc, req) != 0) { + vtblk_request_requeue_ready(sc, req); + break; + } + + enq++; + } + + if (enq > 0) + virtqueue_notify(vq); +} + +static void +vtblk_bio_done(struct vtblk_softc *sc, struct bio *bp, int error) +{ + + /* Because of GEOM direct dispatch, we cannot hold any locks. */ + if (sc != NULL) + VTBLK_LOCK_ASSERT_NOTOWNED(sc); + + if (error) { + bp->bio_resid = bp->bio_bcount; + bp->bio_error = error; + bp->bio_flags |= BIO_ERROR; + } + + biodone(bp); } #define VTBLK_GET_CONFIG(_dev, _feature, _field, _cfg) \ @@ -1027,7 +1127,7 @@ vtblk_read_config(struct vtblk_softc *sc #undef VTBLK_GET_CONFIG static void -vtblk_get_ident(struct vtblk_softc *sc) +vtblk_ident(struct vtblk_softc *sc) { struct bio buf; struct disk *dp; @@ -1040,7 +1140,7 @@ vtblk_get_ident(struct vtblk_softc *sc) if (vtblk_tunable_int(sc, "no_ident", vtblk_no_ident) != 0) return; - req = vtblk_dequeue_request(sc); + req = vtblk_request_dequeue(sc); if (req == NULL) return; @@ -1060,7 +1160,7 @@ vtblk_get_ident(struct vtblk_softc *sc) error = vtblk_poll_request(sc, req); VTBLK_UNLOCK(sc); - vtblk_enqueue_request(sc, req); + vtblk_request_enqueue(sc, req); if (error) { device_printf(sc->vtblk_dev, @@ -1068,77 +1168,6 @@ vtblk_get_ident(struct vtblk_softc *sc) } } -static void -vtblk_prepare_dump(struct vtblk_softc *sc) -{ - device_t dev; - struct virtqueue *vq; - - dev = sc->vtblk_dev; - vq = sc->vtblk_vq; - - vtblk_stop(sc); - - /* - * Drain all requests caught in-flight in the virtqueue, - * skipping biodone(). When dumping, only one request is - * outstanding at a time, and we just poll the virtqueue - * for the response. - */ - vtblk_drain_vq(sc, 1); - - if (virtio_reinit(dev, sc->vtblk_features) != 0) { - panic("%s: cannot reinit VirtIO block device during dump", - device_get_nameunit(dev)); - } - - virtqueue_disable_intr(vq); - virtio_reinit_complete(dev); -} - -static int -vtblk_write_dump(struct vtblk_softc *sc, void *virtual, off_t offset, - size_t length) -{ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 11:34:45 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 93E2D89E; Mon, 1 Dec 2014 11:34:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 80BDDF24; Mon, 1 Dec 2014 11:34:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1BYjI8088190; Mon, 1 Dec 2014 11:34:45 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1BYjU9088189; Mon, 1 Dec 2014 11:34:45 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201412011134.sB1BYjU9088189@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 1 Dec 2014 11:34:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275357 - projects/sendfile/sys/kern 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.18-1 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, 01 Dec 2014 11:34:45 -0000 Author: glebius Date: Mon Dec 1 11:34:44 2014 New Revision: 275357 URL: https://svnweb.freebsd.org/changeset/base/275357 Log: Remove uipc_ready from not SOCK_STREAM protocols. Modified: projects/sendfile/sys/kern/uipc_usrreq.c Modified: projects/sendfile/sys/kern/uipc_usrreq.c ============================================================================== --- projects/sendfile/sys/kern/uipc_usrreq.c Mon Dec 1 11:28:05 2014 (r275356) +++ projects/sendfile/sys/kern/uipc_usrreq.c Mon Dec 1 11:34:44 2014 (r275357) @@ -1143,7 +1143,6 @@ static struct pr_usrreqs uipc_usrreqs_dg .pru_peeraddr = uipc_peeraddr, .pru_rcvd = uipc_rcvd, .pru_send = uipc_send, - .pru_ready = uipc_ready, .pru_sense = uipc_sense, .pru_shutdown = uipc_shutdown, .pru_sockaddr = uipc_sockaddr, @@ -1166,7 +1165,6 @@ static struct pr_usrreqs uipc_usrreqs_se .pru_peeraddr = uipc_peeraddr, .pru_rcvd = uipc_rcvd, .pru_send = uipc_send, - .pru_ready = uipc_ready, .pru_sense = uipc_sense, .pru_shutdown = uipc_shutdown, .pru_sockaddr = uipc_sockaddr, From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 12:59:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D11BD28C; Mon, 1 Dec 2014 12:59:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BE538AF8; Mon, 1 Dec 2014 12:59:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1CxLc1025871; Mon, 1 Dec 2014 12:59:21 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1CxLLb025870; Mon, 1 Dec 2014 12:59:21 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412011259.sB1CxLLb025870@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Dec 2014 12:59:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275362 - projects/clang350-import/contrib/llvm/lib/Target/ARM 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.18-1 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, 01 Dec 2014 12:59:21 -0000 Author: dim Date: Mon Dec 1 12:59:21 2014 New Revision: 275362 URL: https://svnweb.freebsd.org/changeset/base/275362 Log: For now, enable the clrex instruction for armv6, until upstream implements this properly. Submitted by: andrew Modified: projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td Modified: projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td ============================================================================== --- projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td Mon Dec 1 12:59:16 2014 (r275361) +++ projects/clang350-import/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td Mon Dec 1 12:59:21 2014 (r275362) @@ -4615,7 +4615,7 @@ def STLEXD : AIstlex<0b01, (outs GPR:$Rd def CLREX : AXI<(outs), (ins), MiscFrm, NoItinerary, "clrex", [(int_arm_clrex)]>, - Requires<[IsARM, HasV7]> { + Requires<[IsARM, HasV6]> { let Inst{31-0} = 0b11110101011111111111000000011111; } From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 13:06:07 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C766E5DB; Mon, 1 Dec 2014 13:06:07 +0000 (UTC) Received: from nibbler.fubar.geek.nz (nibbler.fubar.geek.nz [199.48.134.198]) by mx1.freebsd.org (Postfix) with ESMTP id ABF5EBF6; Mon, 1 Dec 2014 13:06:06 +0000 (UTC) Received: from bender.lan (97e078e7.skybroadband.com [151.224.120.231]) by nibbler.fubar.geek.nz (Postfix) with ESMTPSA id 8B7C67328F; Mon, 1 Dec 2014 13:06:05 +0000 (UTC) Date: Mon, 1 Dec 2014 13:05:52 +0000 From: Andrew Turner To: Dimitry Andric Subject: Re: svn commit: r275362 - projects/clang350-import/contrib/llvm/lib/Target/ARM Message-ID: <20141201130552.3e78a97d@bender.lan> In-Reply-To: <201412011259.sB1CxLLb025870@svn.freebsd.org> References: <201412011259.sB1CxLLb025870@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 13:06:07 -0000 On Mon, 1 Dec 2014 12:59:21 +0000 (UTC) Dimitry Andric wrote: > Author: dim > Date: Mon Dec 1 12:59:21 2014 > New Revision: 275362 > URL: https://svnweb.freebsd.org/changeset/base/275362 > > Log: > For now, enable the clrex instruction for armv6, until upstream > implements this properly. > > Submitted by: andrew This was submitted by rdivacky, I just pointed to it. Andrew From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 13:07:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A0A66E2; Mon, 1 Dec 2014 13:07:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2777FC0E; Mon, 1 Dec 2014 13:07:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1D7oWW030532; Mon, 1 Dec 2014 13:07:50 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1D7om8030531; Mon, 1 Dec 2014 13:07:50 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412011307.sB1D7om8030531@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Dec 2014 13:07:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275363 - projects/clang350-import/contrib/llvm/patches 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.18-1 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, 01 Dec 2014 13:07:50 -0000 Author: dim Date: Mon Dec 1 13:07:49 2014 New Revision: 275363 URL: https://svnweb.freebsd.org/changeset/base/275363 Log: Add patch file for r275362. Added: projects/clang350-import/contrib/llvm/patches/patch-20-enable-armv6-clrex.diff Added: projects/clang350-import/contrib/llvm/patches/patch-20-enable-armv6-clrex.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/contrib/llvm/patches/patch-20-enable-armv6-clrex.diff Mon Dec 1 13:07:49 2014 (r275363) @@ -0,0 +1,20 @@ +For now, enable the clrex instruction for armv6, until upstream +implements this properly. + +Submitted by: rdivacky + +Introduced here: http://svnweb.freebsd.org/changeset/base/275362 + +Index: lib/Target/ARM/ARMInstrInfo.td +=================================================================== +--- lib/Target/ARM/ARMInstrInfo.td (revision 20) ++++ lib/Target/ARM/ARMInstrInfo.td (revision 21) +@@ -4615,7 +4615,7 @@ def STLEXD : AIstlex<0b01, (outs GPR:$Rd), + + def CLREX : AXI<(outs), (ins), MiscFrm, NoItinerary, "clrex", + [(int_arm_clrex)]>, +- Requires<[IsARM, HasV7]> { ++ Requires<[IsARM, HasV6]> { + let Inst{31-0} = 0b11110101011111111111000000011111; + } + From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 13:10:37 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E030B941; Mon, 1 Dec 2014 13:10:37 +0000 (UTC) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 9FFCEC31; Mon, 1 Dec 2014 13:10:37 +0000 (UTC) Received: from nine.des.no (smtp.des.no [194.63.250.102]) by smtp-int.des.no (Postfix) with ESMTP id 5CE3BA61F; Mon, 1 Dec 2014 13:10:36 +0000 (UTC) Received: by nine.des.no (Postfix, from userid 1001) id 7E19C1778; Mon, 1 Dec 2014 14:10:30 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Garrett Cooper Subject: Re: svn commit: r275219 - projects/building-blocks/share/skel References: <201411282207.sASM7Gq7055794@svn.freebsd.org> <20141130202521.GA1103@stack.nl> Date: Mon, 01 Dec 2014 14:10:30 +0100 In-Reply-To: (Garrett Cooper's message of "Sun, 30 Nov 2014 20:27:07 -0800") Message-ID: <86r3wjfrcp.fsf@nine.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Garrett Cooper , Jilles Tjoelker X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 13:10:38 -0000 Garrett Cooper writes: > Ok. Something else that needs to be discussed is /usr/games being in > $PATH and a few other things, because this could slow down path > lookups, even if it=E2=80=99s a small amount (I realize the namei cache is > supposed to make this less noticeable, but every little bit counts > IMHO). At the Sofia DevSummit, we came up with a loose plan to move useful programs from /usr/games to /usr/bin and kill whatever remains. This would also eliminate the "games" distribution and the GAMES build option. Unfortunately, nobody was taking notes, so the plan fell by the wayside. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 13:14:54 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC094A6E; Mon, 1 Dec 2014 13:14:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B569DCE6; Mon, 1 Dec 2014 13:14:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1DEs3S034906; Mon, 1 Dec 2014 13:14:54 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1DEeJK034832; Mon, 1 Dec 2014 13:14:40 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412011314.sB1DEeJK034832@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Dec 2014 13:14:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275364 - in projects/clang350-import: . bin/sh contrib/binutils/bfd contrib/gcc/config/arm contrib/ofed/librdmacm/examples/build/cmatose contrib/ofed/librdmacm/examples/build/mckey con... 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.18-1 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, 01 Dec 2014 13:14:54 -0000 Author: dim Date: Mon Dec 1 13:14:39 2014 New Revision: 275364 URL: https://svnweb.freebsd.org/changeset/base/275364 Log: Merge ^/head r275262 through r275363. Deleted: projects/clang350-import/etc/rc.d/mrouted Modified: projects/clang350-import/ObsoleteFiles.inc projects/clang350-import/bin/sh/eval.c projects/clang350-import/bin/sh/output.c projects/clang350-import/contrib/binutils/bfd/elf32-arm.c projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc projects/clang350-import/etc/defaults/rc.conf projects/clang350-import/etc/rc projects/clang350-import/etc/rc.d/Makefile projects/clang350-import/etc/rc.d/NETWORKING projects/clang350-import/etc/rc.d/ipmon projects/clang350-import/etc/rc.d/pflog projects/clang350-import/etc/rc.subr projects/clang350-import/sbin/ifconfig/Makefile projects/clang350-import/share/man/man4/tap.4 projects/clang350-import/share/man/man4/tun.4 projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/clang350-import/sys/arm/arm/fusu.S projects/clang350-import/sys/arm/arm/support.S projects/clang350-import/sys/arm/include/asm.h projects/clang350-import/sys/boot/i386/boot2/boot2.c projects/clang350-import/sys/dev/bxe/bxe.c projects/clang350-import/sys/dev/cxgb/cxgb_sge.c projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/clang350-import/sys/dev/cxgbe/t4_main.c projects/clang350-import/sys/dev/cxgbe/t4_sge.c projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c projects/clang350-import/sys/dev/e1000/if_igb.c projects/clang350-import/sys/dev/ixgbe/ixgbe.c projects/clang350-import/sys/dev/ixgbe/ixv.c projects/clang350-import/sys/dev/ixl/ixl_txrx.c projects/clang350-import/sys/dev/mxge/if_mxge.c projects/clang350-import/sys/dev/netmap/netmap_freebsd.c projects/clang350-import/sys/dev/oce/oce_if.c projects/clang350-import/sys/dev/qlxgbe/ql_isr.c projects/clang350-import/sys/dev/qlxgbe/ql_os.c projects/clang350-import/sys/dev/qlxge/qls_isr.c projects/clang350-import/sys/dev/qlxge/qls_os.c projects/clang350-import/sys/dev/sfxge/sfxge_rx.c projects/clang350-import/sys/dev/sfxge/sfxge_tx.c projects/clang350-import/sys/dev/virtio/block/virtio_blk.c projects/clang350-import/sys/dev/virtio/network/if_vtnet.c projects/clang350-import/sys/dev/vmware/vmxnet3/if_vmx.c projects/clang350-import/sys/dev/vxge/vxge.c projects/clang350-import/sys/kern/subr_taskqueue.c projects/clang350-import/sys/kern/uipc_debug.c projects/clang350-import/sys/kern/uipc_domain.c projects/clang350-import/sys/kern/uipc_mbuf.c projects/clang350-import/sys/kern/uipc_sockbuf.c projects/clang350-import/sys/kern/uipc_socket.c projects/clang350-import/sys/kern/uipc_usrreq.c projects/clang350-import/sys/net/flowtable.c projects/clang350-import/sys/net/ieee8023ad_lacp.c projects/clang350-import/sys/net/if_lagg.c projects/clang350-import/sys/net/if_lagg.h projects/clang350-import/sys/net/if_vxlan.c projects/clang350-import/sys/net/netisr.c projects/clang350-import/sys/netinet/in_pcb.h projects/clang350-import/sys/netinet/in_rss.c projects/clang350-import/sys/netinet/ip_input.c projects/clang350-import/sys/netinet/ip_output.c projects/clang350-import/sys/netinet/sctp_indata.c projects/clang350-import/sys/netinet/sctp_input.c projects/clang350-import/sys/netinet/sctp_os_bsd.h projects/clang350-import/sys/netinet/sctp_output.c projects/clang350-import/sys/netinet/sctp_pcb.c projects/clang350-import/sys/netinet/sctp_pcb.h projects/clang350-import/sys/netinet/sctp_structs.h projects/clang350-import/sys/netinet/sctp_usrreq.c projects/clang350-import/sys/netinet/sctp_var.h projects/clang350-import/sys/netinet/sctputil.c projects/clang350-import/sys/netinet/sctputil.h projects/clang350-import/sys/netinet/tcp_input.c projects/clang350-import/sys/netinet/tcp_reass.c projects/clang350-import/sys/netinet/tcp_syncache.c projects/clang350-import/sys/netinet/tcp_usrreq.c projects/clang350-import/sys/netinet/udp_usrreq.c projects/clang350-import/sys/netinet6/in6_pcb.c projects/clang350-import/sys/netinet6/ip6_output.c projects/clang350-import/sys/netinet6/udp6_usrreq.c projects/clang350-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/clang350-import/sys/ofed/drivers/net/mlx4/en_rx.c projects/clang350-import/sys/ofed/drivers/net/mlx4/en_tx.c projects/clang350-import/sys/powerpc/aim/machdep.c projects/clang350-import/sys/powerpc/aim/trap.c projects/clang350-import/sys/powerpc/aim/trap_subr32.S projects/clang350-import/sys/powerpc/aim/trap_subr64.S projects/clang350-import/sys/powerpc/include/trap.h projects/clang350-import/sys/sys/mbuf.h projects/clang350-import/sys/sys/protosw.h projects/clang350-import/sys/sys/sockbuf.h projects/clang350-import/sys/vm/uma_core.c projects/clang350-import/tools/tools/shlib-compat/shlib-compat.py projects/clang350-import/tools/tools/shlib-compat/test/Makefile.inc projects/clang350-import/tools/tools/shlib-compat/test/regress.sh projects/clang350-import/tools/tools/sysbuild/sysbuild.sh projects/clang350-import/usr.bin/bluetooth/btsockstat/btsockstat.c projects/clang350-import/usr.bin/netstat/inet.c projects/clang350-import/usr.bin/netstat/netgraph.c projects/clang350-import/usr.bin/netstat/unix.c projects/clang350-import/usr.bin/systat/netstat.c Directory Properties: projects/clang350-import/ (props changed) projects/clang350-import/contrib/binutils/ (props changed) projects/clang350-import/contrib/gcc/ (props changed) projects/clang350-import/etc/ (props changed) projects/clang350-import/sbin/ (props changed) projects/clang350-import/share/ (props changed) projects/clang350-import/share/man/man4/ (props changed) projects/clang350-import/sys/ (props changed) projects/clang350-import/sys/boot/ (props changed) Modified: projects/clang350-import/ObsoleteFiles.inc ============================================================================== --- projects/clang350-import/ObsoleteFiles.inc Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/ObsoleteFiles.inc Mon Dec 1 13:14:39 2014 (r275364) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# 20141128: new clang import which bumps version from 3.4.1 to 3.5.0. +# 20141201: new clang import which bumps version from 3.4.1 to 3.5.0. OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h OLD_FILES+=usr/include/clang/3.4.1/altivec.h @@ -74,6 +74,8 @@ OLD_FILES+=usr/include/clang/3.4.1/x86in OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h OLD_DIRS+=usr/include/clang/3.4.1 +# 20141129: mrouted rc.d scripts removed from base +OLD_FILES+=etc/rc.d/mrouted # 20141126: convert sbin/mdconfig/tests to ATF format tests OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test Modified: projects/clang350-import/bin/sh/eval.c ============================================================================== --- projects/clang350-import/bin/sh/eval.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/bin/sh/eval.c Mon Dec 1 13:14:39 2014 (r275364) @@ -774,15 +774,7 @@ xtracecommand(struct arglist *varlist, s for (sp = arglist->list ; sp ; sp = sp->next) { if (sep != 0) out2c(' '); - /* Disambiguate command looking like assignment. */ - if (sp == arglist->list && - strchr(sp->text, '=') != NULL && - strchr(sp->text, '\'') == NULL) { - out2c('\''); - out2str(sp->text); - out2c('\''); - } else - out2qstr(sp->text); + out2qstr(sp->text); sep = ' '; } out2c('\n'); Modified: projects/clang350-import/bin/sh/output.c ============================================================================== --- projects/clang350-import/bin/sh/output.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/bin/sh/output.c Mon Dec 1 13:14:39 2014 (r275364) @@ -122,8 +122,7 @@ outqstr(const char *p, struct output *fi outstr("''", file); return; } - /* Caller will handle '=' if necessary */ - if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#")] == '\0' || + if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#=")] == '\0' || strcmp(p, "[") == 0) { outstr(p, file); return; Modified: projects/clang350-import/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/clang350-import/contrib/binutils/bfd/elf32-arm.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/binutils/bfd/elf32-arm.c Mon Dec 1 13:14:39 2014 (r275364) @@ -4960,7 +4960,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -4998,7 +4998,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -5984,7 +5984,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_n, in encoded constant-with-rotation format. */ - g_n = calculate_group_reloc_mask (abs (signed_value), group, + g_n = calculate_group_reloc_mask (llabs (signed_value), group, &residual); /* Check for overflow if required. */ @@ -5998,7 +5998,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6077,7 +6077,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x1000) @@ -6085,7 +6085,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6160,7 +6160,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x100) @@ -6168,7 +6168,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6243,7 +6243,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. (The absolute value to go in the place must be divisible by four and, after having been divided by four, must @@ -6253,7 +6253,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } Modified: projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm ============================================================================== --- projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/gcc/config/arm/lib1funcs.asm Mon Dec 1 13:14:39 2014 (r275364) @@ -980,8 +980,6 @@ LSYM(Lover12): RET - FUNC_END aeabi_ldiv0 - FUNC_END aeabi_idiv0 FUNC_END div0 #endif /* L_divmodsi_tools */ Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile ============================================================================== --- projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/cmatose/Makefile Mon Dec 1 13:14:39 2014 (r275364) @@ -6,5 +6,6 @@ PROG= cmatose MAN= SRCS= cmatose.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile ============================================================================== --- projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/mckey/Makefile Mon Dec 1 13:14:39 2014 (r275364) @@ -6,5 +6,6 @@ PROG= mckey MAN= SRCS= mckey.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile ============================================================================== --- projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/rping/Makefile Mon Dec 1 13:14:39 2014 (r275364) @@ -6,5 +6,6 @@ PROG= rping MAN= SRCS= rping.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile ============================================================================== --- projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/librdmacm/examples/build/udaddy/Makefile Mon Dec 1 13:14:39 2014 (r275364) @@ -6,5 +6,6 @@ PROG= udaddy MAN= SRCS= udaddy.c LDADD+= -libverbs -lrdmacm -lpthread +LDADD+= -lmlx4 .include Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c ============================================================================== --- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c Mon Dec 1 13:14:39 2014 (r275364) @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "ibnetdiscover.h" #include "grouping.h" Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c ============================================================================== --- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibroute.c Mon Dec 1 13:14:39 2014 (r275364) @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c ============================================================================== --- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c Mon Dec 1 13:14:39 2014 (r275364) @@ -43,7 +43,7 @@ #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c ============================================================================== --- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/ibtracert.c Mon Dec 1 13:14:39 2014 (r275364) @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c ============================================================================== --- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/saquery.c Mon Dec 1 13:14:39 2014 (r275364) @@ -50,12 +50,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include Modified: projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c ============================================================================== --- projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/management/infiniband-diags/src/smpquery.c Mon Dec 1 13:14:39 2014 (r275364) @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "ibdiag_common.h" Modified: projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc ============================================================================== --- projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/contrib/ofed/usr.bin/Makefile.inc Mon Dec 1 13:14:39 2014 (r275364) @@ -1,4 +1,9 @@ DIAGPATH= ${.CURDIR}/../../management/infiniband-diags BINDIR?= /usr/bin CFLAGS+= -I${.CURDIR}/../../include/infiniband +CFLAGS+= -I${.CURDIR}/../../include CFLAGS+= -I${.CURDIR}/../../management/opensm/include/ +CFLAGS+= -I${.CURDIR}/../../management/opensm +CFLAGS+= -I${.CURDIR}/../../management/libibcommon/include +CFLAGS+= -I${.CURDIR}/../../management/libibumad/include +CFLAGS+= -I${.CURDIR}/../../management/libibmad/include Modified: projects/clang350-import/etc/defaults/rc.conf ============================================================================== --- projects/clang350-import/etc/defaults/rc.conf Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/etc/defaults/rc.conf Mon Dec 1 13:14:39 2014 (r275364) @@ -390,12 +390,6 @@ gateway_enable="NO" # Set to YES if thi routed_enable="NO" # Set to YES to enable a routing daemon. routed_program="/sbin/routed" # Name of routing daemon to use if enabled. routed_flags="-q" # Flags for routing daemon. -mrouted_enable="NO" # Do IPv4 multicast routing. -mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast - # routing daemon. You need to - # install it from package or - # port. -mrouted_flags="" # Flags for multicast routing daemon. arpproxy_all="NO" # replaces obsolete kernel option ARP_PROXYALL. forward_sourceroute="NO" # do source routing (only if gateway_enable is set to "YES") accept_sourceroute="NO" # accept source routed packets to us Modified: projects/clang350-import/etc/rc ============================================================================== --- projects/clang350-import/etc/rc Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/etc/rc Mon Dec 1 13:14:39 2014 (r275364) @@ -69,19 +69,16 @@ fi # and to make the configuration file variables available to rc itself. # . /etc/rc.subr -load_rc_config 'XXX' +load_rc_config # If we receive a SIGALRM, re-source /etc/rc.conf; this allows rc.d # scripts to perform "boot-time configuration" including enabling and # disabling rc.d scripts which appear later in the boot order. -trap "_rc_conf_loaded=false; load_rc_config 'XXX'" ALRM +trap "_rc_conf_loaded=false; load_rc_config" ALRM skip="-s nostart" if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then skip="$skip -s nojail" - if [ "$early_late_divider" = "FILESYSTEMS" ]; then - early_late_divider=NETWORKING - fi if [ `/sbin/sysctl -n security.jail.vnet` -ne 1 ]; then skip="$skip -s nojailvnet" fi Modified: projects/clang350-import/etc/rc.d/Makefile ============================================================================== --- projects/clang350-import/etc/rc.d/Makefile Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/etc/rc.d/Makefile Mon Dec 1 13:14:39 2014 (r275364) @@ -90,7 +90,6 @@ FILES= DAEMON \ mountd \ moused \ mroute6d \ - mrouted \ msgs \ natd \ netif \ Modified: projects/clang350-import/etc/rc.d/NETWORKING ============================================================================== --- projects/clang350-import/etc/rc.d/NETWORKING Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/etc/rc.d/NETWORKING Mon Dec 1 13:14:39 2014 (r275364) @@ -5,7 +5,7 @@ # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netoptions routing ppp ipfw stf -# REQUIRE: defaultroute routed mrouted route6d mroute6d resolv bridge +# REQUIRE: defaultroute routed route6d mroute6d resolv bridge # REQUIRE: static_arp static_ndp local_unbound # This is a dummy dependency, for services which require networking Modified: projects/clang350-import/etc/rc.d/ipmon ============================================================================== --- projects/clang350-import/etc/rc.d/ipmon Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/etc/rc.d/ipmon Mon Dec 1 13:14:39 2014 (r275364) @@ -4,7 +4,7 @@ # # PROVIDE: ipmon -# REQUIRE: FILESYSTEMS hostname sysctl FILESYSTEMS ipfilter +# REQUIRE: FILESYSTEMS hostname sysctl ipfilter # BEFORE: SERVERS # KEYWORD: nojail Modified: projects/clang350-import/etc/rc.d/pflog ============================================================================== --- projects/clang350-import/etc/rc.d/pflog Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/etc/rc.d/pflog Mon Dec 1 13:14:39 2014 (r275364) @@ -4,7 +4,7 @@ # # PROVIDE: pflog -# REQUIRE: FILESYSTEMS netif FILESYSTEMS +# REQUIRE: FILESYSTEMS netif # KEYWORD: nojail . /etc/rc.subr Modified: projects/clang350-import/etc/rc.subr ============================================================================== --- projects/clang350-import/etc/rc.subr Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/etc/rc.subr Mon Dec 1 13:14:39 2014 (r275364) @@ -1315,9 +1315,6 @@ load_rc_config() { local _name _rcvar_val _var _defval _v _msg _new _d _name=$1 - if [ -z "$_name" ]; then - err 3 'USAGE: load_rc_config name' - fi if ${_rc_conf_loaded:-false}; then : @@ -1333,20 +1330,24 @@ load_rc_config() _rc_conf_loaded=true fi - for _d in /etc ${local_startup%*/rc.d}; do - if [ -f ${_d}/rc.conf.d/"$_name" ]; then - debug "Sourcing ${_d}/rc.conf.d/$_name" - . ${_d}/rc.conf.d/"$_name" - elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then - local _rc - for _rc in ${_d}/rc.conf.d/"$_name"/* ; do - if [ -f "$_rc" ] ; then - debug "Sourcing $_rc" - . "$_rc" - fi - done - fi - done + # If a service name was specified, attempt to load + # service-specific configuration + if [ -n "$_name" ] ; then + for _d in /etc ${local_startup%*/rc.d}; do + if [ -f ${_d}/rc.conf.d/"$_name" ]; then + debug "Sourcing ${_d}/rc.conf.d/$_name" + . ${_d}/rc.conf.d/"$_name" + elif [ -d ${_d}/rc.conf.d/"$_name" ] ; then + local _rc + for _rc in ${_d}/rc.conf.d/"$_name"/* ; do + if [ -f "$_rc" ] ; then + debug "Sourcing $_rc" + . "$_rc" + fi + done + fi + done + fi # Set defaults if defined. for _var in $rcvar $rcvars; do Modified: projects/clang350-import/sbin/ifconfig/Makefile ============================================================================== --- projects/clang350-import/sbin/ifconfig/Makefile Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sbin/ifconfig/Makefile Mon Dec 1 13:14:39 2014 (r275364) @@ -30,7 +30,7 @@ SRCS+= ifmac.c # MAC support SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support SRCS+= iffib.c # non-default FIB support SRCS+= ifvlan.c # SIOC[GS]ETVLAN support -SRCS+= ifvxlan.c # VXLAN support +#SRCS+= ifvxlan.c # VXLAN support SRCS+= ifgre.c # GRE keys etc SRCS+= ifgif.c # GIF reversed header workaround Modified: projects/clang350-import/share/man/man4/tap.4 ============================================================================== --- projects/clang350-import/share/man/man4/tap.4 Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/share/man/man4/tap.4 Mon Dec 1 13:14:39 2014 (r275364) @@ -1,7 +1,7 @@ .\" $FreeBSD$ .\" Based on PR#2411 .\" -.Dd November 4, 2014 +.Dd November 30, 2014 .Dt TAP 4 .Os .Sh NAME @@ -34,6 +34,17 @@ or a terminal for and a character-special device .Dq control interface. +A client program transfers Ethernet frames to or from the +.Nm +.Dq control +interface. +The +.Xr tun 4 +interface provides similar functionality at the network layer: +a client will transfer IP (by default) packets to or from a +.Xr tun 4 +.Dq control +interface. .Pp The network interfaces are named .Dq Li tap0 , @@ -314,4 +325,5 @@ VMware .El .Sh SEE ALSO .Xr inet 4 , -.Xr intro 4 +.Xr intro 4 , +.Xr tun 4 Modified: projects/clang350-import/share/man/man4/tun.4 ============================================================================== --- projects/clang350-import/share/man/man4/tun.4 Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/share/man/man4/tun.4 Mon Dec 1 13:14:39 2014 (r275364) @@ -2,7 +2,7 @@ .\" $FreeBSD$ .\" Based on PR#2411 .\" -.Dd February 4, 2007 +.Dd November 30, 2014 .Dt TUN 4 .Os .Sh NAME @@ -35,6 +35,17 @@ or a terminal for and a character-special device .Dq control interface. +A client program transfers IP (by default) packets to or from the +.Nm +.Dq control +interface. +The +.Xr tap 4 +interface provides similar functionality at the Ethernet layer: +a client will transfer Ethernet frames to or from a +.Xr tap 4 +.Dq control +interface. .Pp The network interfaces are named .Dq Li tun0 , @@ -307,6 +318,7 @@ them pile up. .Xr inet 4 , .Xr intro 4 , .Xr pty 4 , +.Xr tap 4 , .Xr ifconfig 8 .Sh AUTHORS This manual page was originally obtained from Modified: projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S ============================================================================== --- projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5.S Mon Dec 1 13:14:39 2014 (r275364) @@ -194,7 +194,6 @@ ENTRY(armv5_idcache_wbinv_range) END(armv5_idcache_wbinv_range) ENTRY_NP(armv5_idcache_wbinv_all) -armv5_idcache_wbinv_all: .Larmv5_idcache_wbinv_all: /* * We assume that the code here can never be out of sync with the Modified: projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S ============================================================================== --- projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/arm/arm/cpufunc_asm_xscale_c3.S Mon Dec 1 13:14:39 2014 (r275364) @@ -144,7 +144,6 @@ __FBSDID("$FreeBSD$"); ENTRY_NP(xscalec3_cache_syncI) -xscalec3_cache_purgeID: EENTRY_NP(xscalec3_cache_purgeID) mcr p15, 0, r0, c7, c5, 0 /* flush I cache (D cleaned below) */ EENTRY_NP(xscalec3_cache_cleanID) Modified: projects/clang350-import/sys/arm/arm/fusu.S ============================================================================== --- projects/clang350-import/sys/arm/arm/fusu.S Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/arm/arm/fusu.S Mon Dec 1 13:14:39 2014 (r275364) @@ -129,7 +129,7 @@ EENTRY_NP(fuword32) str r1, [r2, #PCB_ONFAULT] mov r0, r3 RET -END(fuword32) +EEND(fuword32) END(fuword) /* @@ -295,7 +295,7 @@ EENTRY_NP(suword32) mov r0, #0x00000000 str r0, [r2, #PCB_ONFAULT] RET -END(suword32) +EEND(suword32) END(suword) /* Modified: projects/clang350-import/sys/arm/arm/support.S ============================================================================== --- projects/clang350-import/sys/arm/arm/support.S Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/arm/arm/support.S Mon Dec 1 13:14:39 2014 (r275364) @@ -130,7 +130,7 @@ ENTRY(bzero) .Lnormal0: mov r3, #0x00 b do_memset -EEND(bzero) +END(bzero) /* LINTSTUB: Func: void *memset(void *, int, size_t) */ ENTRY(memset) and r3, r1, #0xff /* We deal with bytes */ Modified: projects/clang350-import/sys/arm/include/asm.h ============================================================================== --- projects/clang350-import/sys/arm/include/asm.h Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/arm/include/asm.h Mon Dec 1 13:14:39 2014 (r275364) @@ -58,6 +58,18 @@ #endif /* + * EENTRY()/EEND() mark "extra" entry/exit points from a function. + * The unwind info cannot handle the concept of a nested function, or a function + * with multiple .fnstart directives, but some of our assembler code is written + * with multiple labels to allow entry at several points. The EENTRY() macro + * defines such an extra entry point without a new .fnstart, so that it's + * basically just a label that you can jump to. The EEND() macro does nothing + * at all, except document the exit point associated with the same-named entry. + */ +#define _EENTRY(x) .globl x; .type x,_ASM_TYPE_FUNCTION; x: +#define _EEND(x) /* nothing */ + +/* * gas/arm uses @ as a single comment character and thus cannot be used here * Instead it recognised the # instead of an @ symbols in .type directives * We define a couple of macros so that assembly code will not be dependent @@ -66,22 +78,10 @@ #define _ASM_TYPE_FUNCTION #function #define _ASM_TYPE_OBJECT #object #define GLOBAL(X) .globl x -#define _ENTRY(x) \ - .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: _FNSTART +#define _ENTRY(x) \ + .text; _ALIGN_TEXT; _EENTRY(x) _FNSTART #define _END(x) .size x, . - x; _FNEND -/* - * EENTRY()/EEND() mark "extra" entry/exit points from a function. - * The unwind info cannot handle the concept of a nested function, or a function - * with multiple .fnstart directives, but some of our assembler code is written - * with multiple labels to allow entry at several points. The EENTRY() macro - * defines such an extra entry point without a new .fnstart, so that it's - * basically just a label that you can jump to. The EEND() macro does nothing - * at all, except document the exit point associated with the same-named entry. - */ -#define _EENTRY(x) .globl x; .type x,_ASM_TYPE_FUNCTION; x: -#define _EEND(x) /* nothing */ - #ifdef GPROF # define _PROF_PROLOGUE \ mov ip, lr; bl __mcount Modified: projects/clang350-import/sys/boot/i386/boot2/boot2.c ============================================================================== --- projects/clang350-import/sys/boot/i386/boot2/boot2.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/boot/i386/boot2/boot2.c Mon Dec 1 13:14:39 2014 (r275364) @@ -418,7 +418,7 @@ parse() #if SERIAL } else if (c == 'S') { j = 0; - while ((i = *arg++ - '0') <= 9) + while ((unsigned int)(i = *arg++ - '0') <= 9) j = j * 10 + i; if (j > 0 && i == -'0') { comspeed = j; Modified: projects/clang350-import/sys/dev/bxe/bxe.c ============================================================================== --- projects/clang350-import/sys/dev/bxe/bxe.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/bxe/bxe.c Mon Dec 1 13:14:39 2014 (r275364) @@ -3219,7 +3219,7 @@ bxe_tpa_stop(struct bxe_softc * #if __FreeBSD_version >= 800000 /* specify what RSS queue was used for this flow */ m->m_pkthdr.flowid = fp->index; - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); #endif if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); @@ -3454,7 +3454,7 @@ bxe_rxeof(struct bxe_softc *sc, #if __FreeBSD_version >= 800000 /* specify what RSS queue was used for this flow */ m->m_pkthdr.flowid = fp->index; - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); #endif next_rx: @@ -6037,10 +6037,9 @@ bxe_tx_mq_start(struct ifnet *ifp, fp_index = 0; /* default is the first queue */ - /* change the queue if using flow ID */ - if ((m->m_flags & M_FLOWID) != 0) { + /* check if flowid is set */ + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) fp_index = (m->m_pkthdr.flowid % sc->num_queues); - } fp = &sc->fp[fp_index]; Modified: projects/clang350-import/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- projects/clang350-import/sys/dev/cxgb/cxgb_sge.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/cxgb/cxgb_sge.c Mon Dec 1 13:14:39 2014 (r275364) @@ -1733,8 +1733,9 @@ cxgb_transmit(struct ifnet *ifp, struct m_freem(m); return (0); } - - if (m->m_flags & M_FLOWID) + + /* check if flowid is set */ + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) qidx = (m->m_pkthdr.flowid % pi->nqsets) + pi->first_qset; qs = &pi->adapter->sge.qs[qidx]; @@ -2899,9 +2900,10 @@ process_responses(adapter_t *adap, struc eop = get_packet(adap, drop_thresh, qs, mh, r); if (eop) { - if (r->rss_hdr.hash_type && !adap->timestamp) - mh->mh_head->m_flags |= M_FLOWID; - mh->mh_head->m_pkthdr.flowid = rss_hash; + if (r->rss_hdr.hash_type && !adap->timestamp) { + M_HASHTYPE_SET(mh->mh_head, M_HASHTYPE_OPAQUE); + mh->mh_head->m_pkthdr.flowid = rss_hash; + } } ethpad = 2; Modified: projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c ============================================================================== --- projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Mon Dec 1 13:14:39 2014 (r275364) @@ -1199,7 +1199,7 @@ do_rx_data(struct sge_qset *qs, struct r } toep->tp_enqueued += m->m_pkthdr.len; - sbappendstream_locked(so_rcv, m); + sbappendstream_locked(so_rcv, m, 0); sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(so_rcv); Modified: projects/clang350-import/sys/dev/cxgbe/t4_main.c ============================================================================== --- projects/clang350-import/sys/dev/cxgbe/t4_main.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/cxgbe/t4_main.c Mon Dec 1 13:14:39 2014 (r275364) @@ -1440,7 +1440,8 @@ cxgbe_transmit(struct ifnet *ifp, struct return (ENETDOWN); } - if (m->m_flags & M_FLOWID) + /* check if flowid is set */ + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) txq += ((m->m_pkthdr.flowid % (pi->ntxq - pi->rsrv_noflowq)) + pi->rsrv_noflowq); br = txq->br; Modified: projects/clang350-import/sys/dev/cxgbe/t4_sge.c ============================================================================== --- projects/clang350-import/sys/dev/cxgbe/t4_sge.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/cxgbe/t4_sge.c Mon Dec 1 13:14:39 2014 (r275364) @@ -1734,7 +1734,7 @@ t4_eth_rx(struct sge_iq *iq, const struc m0->m_data += fl_pktshift; m0->m_pkthdr.rcvif = ifp; - m0->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m0, M_HASHTYPE_OPAQUE); m0->m_pkthdr.flowid = be32toh(rss->hash_val); if (cpl->csum_calc && !cpl->err_vec) { Modified: projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/cxgbe/tom/t4_cpl_io.c Mon Dec 1 13:14:39 2014 (r275364) @@ -1086,7 +1086,7 @@ do_peer_close(struct sge_iq *iq, const s #ifdef USE_DDP_RX_FLOW_CONTROL toep->rx_credits -= m->m_len; /* adjust for F_RX_FC_DDP */ #endif - sbappendstream_locked(sb, m); + sbappendstream_locked(sb, m, 0); toep->sb_cc = sbused(sb); } socantrcvmore_locked(so); /* unlocks the sockbuf */ @@ -1586,7 +1586,7 @@ do_rx_data(struct sge_iq *iq, const stru ("%s: sb %p has more data (%d) than last time (%d).", __func__, sb, sbused(sb), toep->sb_cc)); toep->rx_credits += toep->sb_cc - sbused(sb); - sbappendstream_locked(sb, m); + sbappendstream_locked(sb, m, 0); toep->sb_cc = sbused(sb); sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(sb); Modified: projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c ============================================================================== --- projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/cxgbe/tom/t4_ddp.c Mon Dec 1 13:14:39 2014 (r275364) @@ -231,7 +231,7 @@ insert_ddp_data(struct toepcb *toep, uin #ifdef USE_DDP_RX_FLOW_CONTROL toep->rx_credits -= n; /* adjust for F_RX_FC_DDP */ #endif - sbappendstream_locked(sb, m); + sbappendstream_locked(sb, m, 0); toep->sb_cc = sbused(sb); } @@ -466,7 +466,7 @@ handle_ddp_data(struct toepcb *toep, __b #ifdef USE_DDP_RX_FLOW_CONTROL toep->rx_credits -= len; /* adjust for F_RX_FC_DDP */ #endif - sbappendstream_locked(sb, m); + sbappendstream_locked(sb, m, 0); toep->sb_cc = sbused(sb); wakeup: KASSERT(toep->ddp_flags & db_flag, @@ -971,8 +971,9 @@ handle_ddp(struct socket *so, struct uio */ rc = sbwait(sb); while (toep->ddp_flags & buf_flag) { + /* XXXGL: shouldn't here be sbwait() call? */ sb->sb_flags |= SB_WAIT; - msleep(&sb->sb_cc, &sb->sb_mtx, PSOCK , "sbwait", 0); + msleep(&sb->sb_acc, &sb->sb_mtx, PSOCK , "sbwait", 0); } unwire_ddp_buffer(db); return (rc); Modified: projects/clang350-import/sys/dev/e1000/if_igb.c ============================================================================== --- projects/clang350-import/sys/dev/e1000/if_igb.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/e1000/if_igb.c Mon Dec 1 13:14:39 2014 (r275364) @@ -990,7 +990,7 @@ igb_mq_start(struct ifnet *ifp, struct m * If everything is setup correctly, it should be the * same bucket that the current CPU we're on is. */ - if ((m->m_flags & M_FLOWID) != 0) { + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { #ifdef RSS if (rss_hash2bucket(m->m_pkthdr.flowid, M_HASHTYPE_GET(m), &bucket_id) == 0) { @@ -5166,7 +5166,6 @@ igb_rxeof(struct igb_queue *que, int cou /* XXX set flowtype once this works right */ rxr->fmp->m_pkthdr.flowid = le32toh(cur->wb.lower.hi_dword.rss); - rxr->fmp->m_flags |= M_FLOWID; switch (pkt_info & E1000_RXDADV_RSSTYPE_MASK) { case E1000_RXDADV_RSSTYPE_IPV4_TCP: M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV4); @@ -5196,11 +5195,11 @@ igb_rxeof(struct igb_queue *que, int cou default: /* XXX fallthrough */ - M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_NONE); + M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_OPAQUE); } #elif !defined(IGB_LEGACY_TX) rxr->fmp->m_pkthdr.flowid = que->msix; - rxr->fmp->m_flags |= M_FLOWID; + M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_OPAQUE); #endif sendmp = rxr->fmp; /* Make sure to set M_PKTHDR. */ Modified: projects/clang350-import/sys/dev/ixgbe/ixgbe.c ============================================================================== --- projects/clang350-import/sys/dev/ixgbe/ixgbe.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/ixgbe/ixgbe.c Mon Dec 1 13:14:39 2014 (r275364) @@ -833,7 +833,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct * If everything is setup correctly, it should be the * same bucket that the current CPU we're on is. */ - if ((m->m_flags & M_FLOWID) != 0) { + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { #ifdef RSS if (rss_hash2bucket(m->m_pkthdr.flowid, M_HASHTYPE_GET(m), &bucket_id) == 0) { @@ -4764,7 +4764,6 @@ ixgbe_rxeof(struct ix_queue *que) #ifdef RSS sendmp->m_pkthdr.flowid = le32toh(cur->wb.lower.hi_dword.rss); - sendmp->m_flags |= M_FLOWID; switch (pkt_info & IXGBE_RXDADV_RSSTYPE_MASK) { case IXGBE_RXDADV_RSSTYPE_IPV4_TCP: M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_TCP_IPV4); @@ -4795,11 +4794,12 @@ ixgbe_rxeof(struct ix_queue *que) break; default: /* XXX fallthrough */ - M_HASHTYPE_SET(sendmp, M_HASHTYPE_NONE); + M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE); + break; } #else /* RSS */ sendmp->m_pkthdr.flowid = que->msix; - sendmp->m_flags |= M_FLOWID; + M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE); #endif /* RSS */ #endif /* FreeBSD_version */ } Modified: projects/clang350-import/sys/dev/ixgbe/ixv.c ============================================================================== --- projects/clang350-import/sys/dev/ixgbe/ixv.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/ixgbe/ixv.c Mon Dec 1 13:14:39 2014 (r275364) @@ -580,7 +580,7 @@ ixv_mq_start(struct ifnet *ifp, struct m int i = 0, err = 0; /* Which queue to use */ - if ((m->m_flags & M_FLOWID) != 0) + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) i = m->m_pkthdr.flowid % adapter->num_queues; txr = &adapter->tx_rings[i]; @@ -3464,7 +3464,7 @@ ixv_rxeof(struct ix_queue *que, int coun ixv_rx_checksum(staterr, sendmp, ptype); #if __FreeBSD_version >= 800000 sendmp->m_pkthdr.flowid = que->msix; - sendmp->m_flags |= M_FLOWID; + M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE); #endif } next_desc: Modified: projects/clang350-import/sys/dev/ixl/ixl_txrx.c ============================================================================== --- projects/clang350-import/sys/dev/ixl/ixl_txrx.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/ixl/ixl_txrx.c Mon Dec 1 13:14:39 2014 (r275364) @@ -66,8 +66,8 @@ ixl_mq_start(struct ifnet *ifp, struct m struct tx_ring *txr; int err, i; - /* Which queue to use */ - if ((m->m_flags & M_FLOWID) != 0) + /* check if flowid is set */ + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) i = m->m_pkthdr.flowid % vsi->num_queues; else i = curcpu % vsi->num_queues; @@ -1543,7 +1543,7 @@ ixl_rxeof(struct ixl_queue *que, int cou if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) ixl_rx_checksum(sendmp, status, error, ptype); sendmp->m_pkthdr.flowid = que->msix; - sendmp->m_flags |= M_FLOWID; + M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE); } next_desc: bus_dmamap_sync(rxr->dma.tag, rxr->dma.map, Modified: projects/clang350-import/sys/dev/mxge/if_mxge.c ============================================================================== --- projects/clang350-import/sys/dev/mxge/if_mxge.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/mxge/if_mxge.c Mon Dec 1 13:14:39 2014 (r275364) @@ -2719,7 +2719,7 @@ mxge_rx_done_big(struct mxge_slice_state /* flowid only valid if RSS hashing is enabled */ if (sc->num_slices > 1) { m->m_pkthdr.flowid = (ss - sc->ss); - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); } /* pass the frame up the stack */ (*ifp->if_input)(ifp, m); @@ -2787,7 +2787,7 @@ mxge_rx_done_small(struct mxge_slice_sta /* flowid only valid if RSS hashing is enabled */ if (sc->num_slices > 1) { m->m_pkthdr.flowid = (ss - sc->ss); - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); } /* pass the frame up the stack */ (*ifp->if_input)(ifp, m); Modified: projects/clang350-import/sys/dev/netmap/netmap_freebsd.c ============================================================================== --- projects/clang350-import/sys/dev/netmap/netmap_freebsd.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/netmap/netmap_freebsd.c Mon Dec 1 13:14:39 2014 (r275364) @@ -204,7 +204,7 @@ netmap_catch_tx(struct netmap_generic_ad * of the transmission does not consume resources. * * On FreeBSD, and on multiqueue cards, we can force the queue using - * if ((m->m_flags & M_FLOWID) != 0) + * if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) * i = m->m_pkthdr.flowid % adapter->num_queues; * else * i = curcpu % adapter->num_queues; @@ -240,7 +240,7 @@ generic_xmit_frame(struct ifnet *ifp, st m->m_len = m->m_pkthdr.len = len; // inc refcount. All ours, we could skip the atomic atomic_fetchadd_int(PNT_MBUF_REFCNT(m), 1); - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); m->m_pkthdr.flowid = ring_nr; m->m_pkthdr.rcvif = ifp; /* used for tx notification */ ret = NA(ifp)->if_transmit(ifp, m); Modified: projects/clang350-import/sys/dev/oce/oce_if.c ============================================================================== --- projects/clang350-import/sys/dev/oce/oce_if.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/oce/oce_if.c Mon Dec 1 13:14:39 2014 (r275364) @@ -563,7 +563,7 @@ oce_multiq_start(struct ifnet *ifp, stru int queue_index = 0; int status = 0; - if ((m->m_flags & M_FLOWID) != 0) + if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) queue_index = m->m_pkthdr.flowid % sc->nwqs; wq = sc->wq[queue_index]; @@ -1374,7 +1374,7 @@ oce_rx(struct oce_rq *rq, uint32_t rqe_i m->m_pkthdr.flowid = (rq->queue_index - 1); else m->m_pkthdr.flowid = rq->queue_index; - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); #endif /* This deternies if vlan tag is Valid */ if (oce_cqe_vtp_valid(sc, cqe)) { Modified: projects/clang350-import/sys/dev/qlxgbe/ql_isr.c ============================================================================== --- projects/clang350-import/sys/dev/qlxgbe/ql_isr.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/qlxgbe/ql_isr.c Mon Dec 1 13:14:39 2014 (r275364) @@ -159,7 +159,7 @@ qla_rx_intr(qla_host_t *ha, qla_sgl_rcv_ if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); mpf->m_pkthdr.flowid = sgc->rss_hash; - mpf->m_flags |= M_FLOWID; + M_HASHTYPE_SET(mpf, M_HASHTYPE_OPAQUE); (*ifp->if_input)(ifp, mpf); @@ -324,7 +324,7 @@ qla_lro_intr(qla_host_t *ha, qla_sgl_lro mpf->m_pkthdr.csum_data = 0xFFFF; mpf->m_pkthdr.flowid = sgc->rss_hash; - mpf->m_flags |= M_FLOWID; + M_HASHTYPE_SET(mpf, M_HASHTYPE_OPAQUE); if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); Modified: projects/clang350-import/sys/dev/qlxgbe/ql_os.c ============================================================================== --- projects/clang350-import/sys/dev/qlxgbe/ql_os.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/qlxgbe/ql_os.c Mon Dec 1 13:14:39 2014 (r275364) @@ -1140,7 +1140,8 @@ qla_send(qla_host_t *ha, struct mbuf **m QL_DPRINT8(ha, (ha->pci_dev, "%s: enter\n", __func__)); - if (m_head->m_flags & M_FLOWID) + /* check if flowid is set */ + if (M_HASHTYPE_GET(m_head) != M_HASHTYPE_NONE) txr_idx = m_head->m_pkthdr.flowid & (ha->hw.num_tx_rings - 1); tx_idx = ha->hw.tx_cntxt[txr_idx].txr_next; Modified: projects/clang350-import/sys/dev/qlxge/qls_isr.c ============================================================================== --- projects/clang350-import/sys/dev/qlxge/qls_isr.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/qlxge/qls_isr.c Mon Dec 1 13:14:39 2014 (r275364) @@ -190,7 +190,7 @@ qls_rx_comp(qla_host_t *ha, uint32_t rxr if ((cq_e->flags1 & Q81_RX_FLAGS1_RSS_MATCH_MASK)) { rxr->rss_int++; mp->m_pkthdr.flowid = cq_e->rss; - mp->m_flags |= M_FLOWID; + M_HASHTYPE_SET(mp, M_HASHTYPE_OPAQUE); } if (cq_e->flags0 & (Q81_RX_FLAGS0_TE | Q81_RX_FLAGS0_NU | Q81_RX_FLAGS0_IE)) { Modified: projects/clang350-import/sys/dev/qlxge/qls_os.c ============================================================================== --- projects/clang350-import/sys/dev/qlxge/qls_os.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/qlxge/qls_os.c Mon Dec 1 13:14:39 2014 (r275364) @@ -1136,7 +1136,8 @@ qls_send(qla_host_t *ha, struct mbuf **m QL_DPRINT8((ha->pci_dev, "%s: enter\n", __func__)); - if (m_head->m_flags & M_FLOWID) + /* check if flowid is set */ + if (M_HASHTYPE_GET(m_head) != M_HASHTYPE_NONE) txr_idx = m_head->m_pkthdr.flowid & (ha->num_tx_rings - 1); tx_idx = ha->tx_ring[txr_idx].txr_next; Modified: projects/clang350-import/sys/dev/sfxge/sfxge_rx.c ============================================================================== --- projects/clang350-import/sys/dev/sfxge/sfxge_rx.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/sfxge/sfxge_rx.c Mon Dec 1 13:14:39 2014 (r275364) @@ -302,7 +302,7 @@ sfxge_rx_deliver(struct sfxge_softc *sc, if (rx_desc->flags & EFX_PKT_TCP) { m->m_pkthdr.flowid = EFX_RX_HASH_VALUE(EFX_RX_HASHALG_TOEPLITZ, mtod(m, uint8_t *)); - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); } #endif m->m_data += sc->rx_prefix_size; @@ -353,7 +353,7 @@ sfxge_lro_deliver(struct sfxge_lro_state #ifdef SFXGE_HAVE_MQ m->m_pkthdr.flowid = c->conn_hash; - m->m_flags |= M_FLOWID; + M_HASHTYPE_SET(m, M_HASHTYPE_OPAQUE); #endif m->m_pkthdr.csum_flags = csum_flags; __sfxge_rx_deliver(sc, m); Modified: projects/clang350-import/sys/dev/sfxge/sfxge_tx.c ============================================================================== --- projects/clang350-import/sys/dev/sfxge/sfxge_tx.c Mon Dec 1 13:07:49 2014 (r275363) +++ projects/clang350-import/sys/dev/sfxge/sfxge_tx.c Mon Dec 1 13:14:39 2014 (r275364) @@ -631,7 +631,8 @@ sfxge_if_transmit(struct ifnet *ifp, str if (m->m_pkthdr.csum_flags & (CSUM_DELAY_DATA | CSUM_TSO)) { int index = 0; - if (m->m_flags & M_FLOWID) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 14:48:40 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DE44C13; Mon, 1 Dec 2014 14:48:40 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 467E2885; Mon, 1 Dec 2014 14:48:40 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 4E521B999; Mon, 1 Dec 2014 09:48:39 -0500 (EST) From: John Baldwin To: Dimitry Andric Subject: Re: svn commit: r275122 - in projects/clang350-import: contrib/ipfilter contrib/llvm/lib/Target/Sparc/AsmParser contrib/llvm/lib/Target/Sparc/Disassembler contrib/llvm/lib/Target/Sparc/InstPrinter cont... Date: Mon, 01 Dec 2014 09:05:32 -0500 Message-ID: <5196246.smYqWMH2Lk@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <201411261436.sAQEa5v1084618@svn.freebsd.org> References: <201411261436.sAQEa5v1084618@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 01 Dec 2014 09:48:39 -0500 (EST) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 14:48:40 -0000 On Wednesday, November 26, 2014 02:36:05 PM Dimitry Andric wrote: > Author: dim > Date: Wed Nov 26 14:36:04 2014 > New Revision: 275122 > URL: https://svnweb.freebsd.org/changeset/base/275122 > > Log: > After some horrible wrestling with Subversion's worthless merge > implementation, merge ^/head r275078 through r275117. > > Note that all the extraneous mergeinfo is there because Subversion > created it. I'll hopefully be able to remove it again when merging back > to head. To be honest, for merging back to HEAD, I'd probably just do it by hand. We've been burned in the past by svn thinking it should copy modified files from the projects branch into HEAD instead of doing a merge thus losing history in HEAD. Probably what I would recommend is trying to do a merge, but reading the diff very carefully to ensure no modified files are added wholesale and then explicitly remove any mergeinfo before comitting (assuming you will only do a single merge at the end in which case the mergeinfo would be useless anyway) -- John Baldwin From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 15:11:30 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 80F4F849; Mon, 1 Dec 2014 15:11:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6BA0DB62; Mon, 1 Dec 2014 15:11:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1FBUmh090141; Mon, 1 Dec 2014 15:11:30 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1FBT8B090136; Mon, 1 Dec 2014 15:11:29 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412011511.sB1FBT8B090136@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 1 Dec 2014 15:11:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275367 - in projects/clang350-import: contrib/libc++/include sys/cam/ctl 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.18-1 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, 01 Dec 2014 15:11:30 -0000 Author: dim Date: Mon Dec 1 15:11:29 2014 New Revision: 275367 URL: https://svnweb.freebsd.org/changeset/base/275367 Log: Merge ^/head r274961 through r275366. Modified: projects/clang350-import/contrib/libc++/include/type_traits projects/clang350-import/sys/cam/ctl/scsi_ctl.c Directory Properties: projects/clang350-import/ (props changed) projects/clang350-import/contrib/libc++/ (props changed) projects/clang350-import/sys/ (props changed) Modified: projects/clang350-import/contrib/libc++/include/type_traits ============================================================================== --- projects/clang350-import/contrib/libc++/include/type_traits Mon Dec 1 15:02:49 2014 (r275366) +++ projects/clang350-import/contrib/libc++/include/type_traits Mon Dec 1 15:11:29 2014 (r275367) @@ -439,8 +439,26 @@ template struct _LIBCPP_TYPE // is_member_function_pointer -template struct __libcpp_is_member_function_pointer : public false_type {}; -template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +// template struct __libcpp_is_member_function_pointer : public false_type {}; +// template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +// + +template +struct __member_pointer_traits_imp +{ // forward declaration; specializations later +}; + + +namespace __libcpp_is_member_function_pointer_imp { + template + char __test(typename std::__member_pointer_traits_imp<_Tp, true, false>::_FnType *); + + template + std::__two __test(...); +}; + +template struct __libcpp_is_member_function_pointer + : public integral_constant(nullptr)) == 1> {}; template struct _LIBCPP_TYPE_VIS_ONLY is_member_function_pointer : public __libcpp_is_member_function_pointer::type> {}; @@ -1593,11 +1611,6 @@ __decay_copy(const _Tp& __t) #endif -template -struct __member_pointer_traits_imp -{ -}; - #ifndef _LIBCPP_HAS_NO_VARIADICS template @@ -1605,6 +1618,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1612,6 +1626,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1619,6 +1634,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1626,6 +1642,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; #if __has_feature(cxx_reference_qualified_functions) @@ -1635,6 +1652,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1642,6 +1660,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1649,6 +1668,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1656,6 +1676,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1663,6 +1684,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1670,6 +1692,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1677,6 +1700,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1684,6 +1708,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; #endif // __has_feature(cxx_reference_qualified_functions) @@ -1695,6 +1720,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1702,6 +1728,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1709,6 +1736,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1716,6 +1744,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template @@ -1723,6 +1752,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1730,6 +1760,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1737,6 +1768,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1744,6 +1776,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template @@ -1751,6 +1784,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1758,6 +1792,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1765,6 +1800,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1772,6 +1808,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template @@ -1779,6 +1816,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1786,6 +1824,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1793,6 +1832,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1800,6 +1840,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; #endif // _LIBCPP_HAS_NO_VARIADICS @@ -1819,6 +1860,7 @@ struct __member_pointer_traits { // typedef ... _ClassType; // typedef ... _ReturnType; +// typedef ... _FnType; }; // result_of @@ -2526,6 +2568,15 @@ template struct _LIBCPP_TYPE // is_nothrow_constructible +#if 0 +template +struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible + : public integral_constant +{ +}; + +#else + #ifndef _LIBCPP_HAS_NO_VARIADICS #if __has_feature(cxx_noexcept) @@ -2664,6 +2715,7 @@ struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_ }; #endif // _LIBCPP_HAS_NO_VARIADICS +#endif // __has_feature(is_nothrow_constructible) // is_nothrow_default_constructible Modified: projects/clang350-import/sys/cam/ctl/scsi_ctl.c ============================================================================== --- projects/clang350-import/sys/cam/ctl/scsi_ctl.c Mon Dec 1 15:02:49 2014 (r275366) +++ projects/clang350-import/sys/cam/ctl/scsi_ctl.c Mon Dec 1 15:11:29 2014 (r275367) @@ -622,6 +622,9 @@ ctlferegister(struct cam_periph *periph, "notify CCBs, status 0x%x\n", __func__, status); return (CAM_REQ_CMP_ERR); } + mtx_lock(&bus_softc->lun_softc_mtx); + STAILQ_INSERT_TAIL(&bus_softc->lun_softc_list, softc, links); + mtx_unlock(&bus_softc->lun_softc_mtx); return (CAM_REQ_CMP); } @@ -1573,12 +1576,7 @@ ctlfe_onoffline(void *arg, int online) printf("%s: unable to create path!\n", __func__); return; } - ccb = (union ccb *)malloc(sizeof(*ccb), M_TEMP, M_NOWAIT | M_ZERO); - if (ccb == NULL) { - printf("%s: unable to malloc CCB!\n", __func__); - xpt_free_path(path); - return; - } + ccb = xpt_alloc_ccb(); xpt_setup_ccb(&ccb->ccb_h, path, CAM_PRIORITY_NONE); /* @@ -1711,10 +1709,7 @@ ctlfe_onoffline(void *arg, int online) } xpt_free_path(path); - - free(ccb, M_TEMP); - - return; + xpt_free_ccb(ccb); } static void @@ -1740,14 +1735,7 @@ ctlfe_online(void *arg) return; } - lun_softc = malloc(sizeof(*lun_softc), M_CTLFE, - M_NOWAIT | M_ZERO); - if (lun_softc == NULL) { - xpt_print(path, "%s: unable to allocate softc for " - "wildcard periph\n", __func__); - xpt_free_path(path); - return; - } + lun_softc = malloc(sizeof(*lun_softc), M_CTLFE, M_WAITOK | M_ZERO); xpt_path_lock(path); periph = cam_periph_find(path, "ctl"); @@ -1780,14 +1768,10 @@ ctlfe_online(void *arg) "cam_periph_alloc()\n", __func__, (entry != NULL) ? entry->status_text : "Unknown", status); free(lun_softc, M_CTLFE); - } else { - mtx_lock(&bus_softc->lun_softc_mtx); - STAILQ_INSERT_TAIL(&bus_softc->lun_softc_list, lun_softc, links); - mtx_unlock(&bus_softc->lun_softc_mtx); - ctlfe_onoffline(arg, /*online*/ 1); } xpt_path_unlock(path); + ctlfe_onoffline(arg, /*online*/ 1); xpt_free_path(path); } @@ -1801,6 +1785,8 @@ ctlfe_offline(void *arg) bus_softc = (struct ctlfe_softc *)arg; + ctlfe_onoffline(arg, /*online*/ 0); + /* * Disable the wildcard LUN for this port now that we have taken * the port offline. @@ -1813,14 +1799,9 @@ ctlfe_offline(void *arg) __func__); return; } - xpt_path_lock(path); - - ctlfe_onoffline(arg, /*online*/ 0); - if ((periph = cam_periph_find(path, "ctl")) != NULL) cam_periph_invalidate(periph); - xpt_path_unlock(path); xpt_free_path(path); } @@ -1881,10 +1862,6 @@ ctlfe_lun_enable(void *arg, struct ctl_i "cam_periph_alloc()\n", __func__, (entry != NULL) ? entry->status_text : "Unknown", status); free(softc, M_CTLFE); - } else { - mtx_lock(&bus_softc->lun_softc_mtx); - STAILQ_INSERT_TAIL(&bus_softc->lun_softc_list, softc, links); - mtx_unlock(&bus_softc->lun_softc_mtx); } xpt_path_unlock(path); From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 16:27:19 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 179D4792; Mon, 1 Dec 2014 16:27:19 +0000 (UTC) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id E75DF5EA; Mon, 1 Dec 2014 16:27:18 +0000 (UTC) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.14.9/8.14.9) with ESMTP id sB1G3YAW084937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 1 Dec 2014 08:03:34 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.14.9/8.14.9/Submit) id sB1G3Y1o084936; Mon, 1 Dec 2014 08:03:34 -0800 (PST) (envelope-from sgk) Date: Mon, 1 Dec 2014 08:03:34 -0800 From: Steve Kargl To: John Baldwin Subject: Re: svn commit: r275122 - in projects/clang350-import: contrib/ipfilter contrib/llvm/lib/Target/Sparc/AsmParser contrib/llvm/lib/Target/Sparc/Disassembler contrib/llvm/lib/Target/Sparc/InstPrinter cont... Message-ID: <20141201160334.GA84795@troutmask.apl.washington.edu> References: <201411261436.sAQEa5v1084618@svn.freebsd.org> <5196246.smYqWMH2Lk@ralph.baldwin.cx> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5196246.smYqWMH2Lk@ralph.baldwin.cx> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Dimitry Andric X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 16:27:19 -0000 On Mon, Dec 01, 2014 at 09:05:32AM -0500, John Baldwin wrote: > On Wednesday, November 26, 2014 02:36:05 PM Dimitry Andric wrote: > > Author: dim > > Date: Wed Nov 26 14:36:04 2014 > > New Revision: 275122 > > URL: https://svnweb.freebsd.org/changeset/base/275122 > > > > Log: > > After some horrible wrestling with Subversion's worthless merge > > implementation, merge ^/head r275078 through r275117. > > > > Note that all the extraneous mergeinfo is there because Subversion > > created it. I'll hopefully be able to remove it again when merging back > > to head. > > To be honest, for merging back to HEAD, I'd probably just do it by hand. > We've been burned in the past by svn thinking it should copy modified > files from the projects branch into HEAD instead of doing a merge thus > losing history in HEAD. Probably what I would recommend is trying to do > a merge, but reading the diff very carefully to ensure no modified files > are added wholesale and then explicitly remove any mergeinfo before > comitting (assuming you will only do a single merge at the end in which > case the mergeinfo would be useless anyway) > Isn't this backwards? The initial commit (and testing) should be done in HEAD, and once it is proven to work, the commit is then merged into the branches. -- Steve From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 16:49:21 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 342552DF; Mon, 1 Dec 2014 16:49:21 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 09AA3888; Mon, 1 Dec 2014 16:49:21 +0000 (UTC) Received: from ralph.baldwin.cx (pool-173-70-85-31.nwrknj.fios.verizon.net [173.70.85.31]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 049B1B913; Mon, 1 Dec 2014 11:49:20 -0500 (EST) From: John Baldwin To: Steve Kargl Subject: Re: svn commit: r275122 - in projects/clang350-import: contrib/ipfilter contrib/llvm/lib/Target/Sparc/AsmParser contrib/llvm/lib/Target/Sparc/Disassembler contrib/llvm/lib/Target/Sparc/InstPrinter cont... Date: Mon, 01 Dec 2014 11:47:17 -0500 Message-ID: <1739096.Nn18UPux8P@ralph.baldwin.cx> User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; ) In-Reply-To: <20141201160334.GA84795@troutmask.apl.washington.edu> References: <201411261436.sAQEa5v1084618@svn.freebsd.org> <5196246.smYqWMH2Lk@ralph.baldwin.cx> <20141201160334.GA84795@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 01 Dec 2014 11:49:20 -0500 (EST) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org, Dimitry Andric X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 16:49:21 -0000 On Monday, December 01, 2014 08:03:34 AM Steve Kargl wrote: > On Mon, Dec 01, 2014 at 09:05:32AM -0500, John Baldwin wrote: > > On Wednesday, November 26, 2014 02:36:05 PM Dimitry Andric wrote: > > > Author: dim > > > Date: Wed Nov 26 14:36:04 2014 > > > New Revision: 275122 > > > URL: https://svnweb.freebsd.org/changeset/base/275122 > > > > > > Log: > > > After some horrible wrestling with Subversion's worthless merge > > > implementation, merge ^/head r275078 through r275117. > > > > > > Note that all the extraneous mergeinfo is there because Subversion > > > created it. I'll hopefully be able to remove it again when merging > > > back > > > to head. > > > > To be honest, for merging back to HEAD, I'd probably just do it by hand. > > We've been burned in the past by svn thinking it should copy modified > > files from the projects branch into HEAD instead of doing a merge thus > > losing history in HEAD. Probably what I would recommend is trying to do > > a merge, but reading the diff very carefully to ensure no modified files > > are added wholesale and then explicitly remove any mergeinfo before > > comitting (assuming you will only do a single merge at the end in which > > case the mergeinfo would be useless anyway) > > Isn't this backwards? The initial commit (and testing) should be > done in HEAD, and once it is proven to work, the commit is then > merged into the branches. This is for a projects branch (such as the one here where dim@ is testing the clang3.5 import), not for stable branches. For stable branches, yes changes must go through HEAD first. -- John Baldwin From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 18:31:32 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 169A8E88; Mon, 1 Dec 2014 18:31:32 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "funkthat.com", Issuer "funkthat.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id DF07C359; Mon, 1 Dec 2014 18:31:31 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id sB1IVLfF073744 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 1 Dec 2014 10:31:22 -0800 (PST) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id sB1IVKJr073743; Mon, 1 Dec 2014 10:31:20 -0800 (PST) (envelope-from jmg) Date: Mon, 1 Dec 2014 10:31:20 -0800 From: John-Mark Gurney To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Subject: Re: svn commit: r275219 - projects/building-blocks/share/skel Message-ID: <20141201183120.GY99957@funkthat.com> References: <201411282207.sASM7Gq7055794@svn.freebsd.org> <20141130202521.GA1103@stack.nl> <86r3wjfrcp.fsf@nine.des.no> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86r3wjfrcp.fsf@nine.des.no> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-TipJar: bitcoin:13Qmb6AeTgQecazTWph4XasEsP7nGRbAPE X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Mon, 01 Dec 2014 10:31:22 -0800 (PST) Cc: svn-src-projects@freebsd.org, Garrett Cooper , src-committers@freebsd.org, Jilles Tjoelker , Garrett Cooper X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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, 01 Dec 2014 18:31:32 -0000 Dag-Erling Smrgrav wrote this message on Mon, Dec 01, 2014 at 14:10 +0100: > Garrett Cooper writes: > > Ok. Something else that needs to be discussed is /usr/games being in > > $PATH and a few other things, because this could slow down path > > lookups, even if it???s a small amount (I realize the namei cache is > > supposed to make this less noticeable, but every little bit counts > > IMHO). > > At the Sofia DevSummit, we came up with a loose plan to move useful > programs from /usr/games to /usr/bin and kill whatever remains. This > would also eliminate the "games" distribution and the GAMES build > option. Unfortunately, nobody was taking notes, so the plan fell by the > wayside. Colin is still aware of the issue, and when he gets time, he plans on making it happen... I remeber the specifics if people would like to know more about it... -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 21:33:29 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C6AB685; Mon, 1 Dec 2014 21:33:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2689DBD6; Mon, 1 Dec 2014 21:33:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1LXTdJ071742; Mon, 1 Dec 2014 21:33:29 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1LXTS2071741; Mon, 1 Dec 2014 21:33:29 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201412012133.sB1LXTS2071741@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 1 Dec 2014 21:33:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275381 - projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/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.18-1 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, 01 Dec 2014 21:33:29 -0000 Author: andrew Date: Mon Dec 1 21:33:28 2014 New Revision: 275381 URL: https://svnweb.freebsd.org/changeset/base/275381 Log: Apply the same fix in r274697 to the ARM case. Modified: projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h Modified: projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h ============================================================================== --- projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h Mon Dec 1 21:13:47 2014 (r275380) +++ projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h Mon Dec 1 21:33:28 2014 (r275381) @@ -377,7 +377,9 @@ extern "C" { /* * Define the appropriate "implementation choices". */ +#if !defined(_ILP32) #define _ILP32 +#endif #if !defined(_I32LPx) && defined(_KERNEL) #define _I32LPx #endif From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 21:43:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F7D4A60; Mon, 1 Dec 2014 21:43:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4AACECB8; Mon, 1 Dec 2014 21:43:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1Lho5Q076560; Mon, 1 Dec 2014 21:43:50 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1LhnAb076557; Mon, 1 Dec 2014 21:43:49 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201412012143.sB1LhnAb076557@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 1 Dec 2014 21:43:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275382 - in projects/routing/sys: netinet 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.18-1 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, 01 Dec 2014 21:43:50 -0000 Author: melifaro Date: Mon Dec 1 21:43:48 2014 New Revision: 275382 URL: https://svnweb.freebsd.org/changeset/base/275382 Log: Do more fine-grained locking in lltable code: lltable_create_lle() does actual new lle creation without extensive locking and existing lle search. Move lle updating code from gigantic in_arpinput() to arp_update_llle() and some other functions. IPv6 changes to follow. Modified: projects/routing/sys/netinet/if_ether.c projects/routing/sys/netinet/in.c projects/routing/sys/netinet6/in6.c Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Mon Dec 1 21:33:28 2014 (r275381) +++ projects/routing/sys/netinet/if_ether.c Mon Dec 1 21:43:48 2014 (r275382) @@ -138,6 +138,11 @@ static void arpintr(struct mbuf *); static void arptimer(void *); #ifdef INET static void in_arpinput(struct mbuf *); +static void arp_set_lle_reachable(struct llentry *); +static void arp_update_lle_addr(struct arphdr *, struct ifnet *, + struct llentry *); +static void arp_update_lle(struct arphdr *, struct in_addr, struct ifnet *, + int , struct llentry *); #endif static int arpresolve_slow(struct ifnet *, int is_gw, struct mbuf *, const struct sockaddr *, u_char *, struct llentry **); @@ -254,6 +259,7 @@ arptimer(void *arg) * Note other thread could have removed given entry * stopping callout and removing LLE reference. */ + //llt->llt_stop_timers(lle); if ((lle->la_flags & LLE_CALLOUTREF) != 0) { LLE_REMREF(lle); lle->la_flags &= ~LLE_CALLOUTREF; @@ -484,7 +490,7 @@ static int arpresolve_slow(struct ifnet *ifp, int is_gw, struct mbuf *m, const struct sockaddr *dst, u_char *desten, struct llentry **lle) { - struct llentry *la = 0; + struct llentry *la, *la_tmp; struct mbuf *curr = NULL; struct mbuf *next = NULL; int create, error; @@ -497,14 +503,28 @@ arpresolve_slow(struct ifnet *ifp, int i IF_AFDATA_RUNLOCK(ifp); if (la == NULL && (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) == 0) { create = 1; - IF_AFDATA_CFG_WLOCK(ifp); la = lltable_create_lle(LLTABLE(ifp), 0, dst); if (la != NULL) { - IF_AFDATA_RUN_WLOCK(ifp); - llentry_link(LLTABLE(ifp), la); - IF_AFDATA_RUN_WUNLOCK(ifp); + IF_AFDATA_CFG_WLOCK(ifp); + LLE_WLOCK(la); + la_tmp = lltable_lookup_lle(LLTABLE(ifp), LLE_EXCLUSIVE, + dst); + if (la_tmp == NULL) { + /* + * No entry has been found. Link new one. + */ + IF_AFDATA_RUN_WLOCK(ifp); + llentry_link(LLTABLE(ifp), la); + IF_AFDATA_RUN_WUNLOCK(ifp); + } + IF_AFDATA_CFG_WUNLOCK(ifp); + + if (la_tmp != NULL) { + LLE_FREE_LOCKED(la); + la = la_tmp; + la_tmp = NULL; + } } - IF_AFDATA_CFG_WUNLOCK(ifp); } if (la == NULL) { if (create != 0) @@ -704,13 +724,14 @@ in_arpinput(struct mbuf *m) struct sockaddr sa; struct in_addr isaddr, itaddr, myaddr; u_int8_t *enaddr = NULL; - int op, flags; + int op; int req_len; int bridged = 0, is_bridge = 0; - int canceled, carped, create; - int wtime; + int carped; struct nhop4_extended nh_ext; struct sockaddr_in sin; + struct llentry *la_tmp; + sin.sin_len = sizeof(struct sockaddr_in); sin.sin_family = AF_INET; sin.sin_addr.s_addr = 0; @@ -838,6 +859,15 @@ match: "%s!\n", inet_ntoa(isaddr)); goto drop; } + + if (ifp->if_addrlen != ah->ar_hln) { + ARP_LOG(LOG_WARNING, "from %*D: addr len: new %d, " + "i/f %d (ignored)\n", ifp->if_addrlen, + (u_char *) ar_sha(ah), ":", ah->ar_hln, + ifp->if_addrlen); + goto drop; + } + /* * Warn if another host is using the same IP address, but only if the * IP address isn't 0.0.0.0, which is used for DHCP only, in which @@ -860,128 +890,46 @@ match: sin.sin_len = sizeof(struct sockaddr_in); sin.sin_family = AF_INET; sin.sin_addr = isaddr; - create = (itaddr.s_addr == myaddr.s_addr) ? 1 : 0; - flags = LLE_EXCLUSIVE; - IF_AFDATA_CFG_WLOCK(ifp); - if (create != 0) { - la = lltable_create_lle(LLTABLE(ifp), 0, - (struct sockaddr *)&sin); - } else - la = lltable_lookup_lle(LLTABLE(ifp), flags, - (struct sockaddr *)&sin); - IF_AFDATA_CFG_WUNLOCK(ifp); - if (la != NULL) { - /* the following is not an error when doing bridging */ - if (!bridged && la->lle_tbl && la->lle_tbl->llt_ifp != ifp) { - if (log_arp_wrong_iface) - ARP_LOG(LOG_WARNING, "%s is on %s " - "but got reply from %*D on %s\n", - inet_ntoa(isaddr), - la->lle_tbl->llt_ifp->if_xname, - ifp->if_addrlen, (u_char *)ar_sha(ah), ":", - ifp->if_xname); - LLE_WUNLOCK(la); - goto reply; - } - if ((la->la_flags & LLE_VALID) && - bcmp(ar_sha(ah), &la->ll_addr, ifp->if_addrlen)) { - if (la->la_flags & LLE_STATIC) { - LLE_WUNLOCK(la); - if (log_arp_permanent_modify) - ARP_LOG(LOG_ERR, - "%*D attempts to modify " - "permanent entry for %s on %s\n", - ifp->if_addrlen, - (u_char *)ar_sha(ah), ":", - inet_ntoa(isaddr), ifp->if_xname); - goto reply; - } - if (log_arp_movements) { - ARP_LOG(LOG_INFO, "%s moved from %*D " - "to %*D on %s\n", - inet_ntoa(isaddr), - ifp->if_addrlen, - (u_char *)&la->ll_addr, ":", - ifp->if_addrlen, (u_char *)ar_sha(ah), ":", - ifp->if_xname); - } - } - - if (ifp->if_addrlen != ah->ar_hln) { - LLE_WUNLOCK(la); - ARP_LOG(LOG_WARNING, "from %*D: addr len: new %d, " - "i/f %d (ignored)\n", ifp->if_addrlen, - (u_char *) ar_sha(ah), ":", ah->ar_hln, - ifp->if_addrlen); - goto drop; - } - - /* Check if something has changed */ - if (memcmp(&la->ll_addr, ar_sha(ah), ifp->if_addrlen) != 0 || - (la->la_flags & LLE_VALID) == 0 || - la->la_expire != time_uptime + V_arpt_keep) { - /* use afdata WLOCK to update fields */ - LLE_ADDREF(la); - LLE_WUNLOCK(la); - IF_AFDATA_CFG_WLOCK(ifp); - LLE_WLOCK(la); - /* Update data */ - IF_AFDATA_RUN_WLOCK(ifp); - memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen); - la->la_flags |= LLE_VALID; - la->r_flags |= RLLE_VALID; - if ((la->la_flags & LLE_STATIC) == 0) - la->la_expire = time_uptime + V_arpt_keep; - llentry_link(LLTABLE(ifp), la); - IF_AFDATA_RUN_WUNLOCK(ifp); - - IF_AFDATA_CFG_WUNLOCK(ifp); - LLE_REMREF(la); - } - - la->ln_state = ARP_LLINFO_REACHABLE; - EVENTHANDLER_INVOKE(lle_event, la, LLENTRY_RESOLVED); + IF_AFDATA_CFG_RLOCK(ifp); + la = lltable_lookup_lle(LLTABLE(ifp), LLE_EXCLUSIVE, + (struct sockaddr *)&sin); + IF_AFDATA_CFG_RUNLOCK(ifp); + if (la != NULL) + arp_update_lle(ah, isaddr, ifp, bridged, la); + else if (itaddr.s_addr == myaddr.s_addr) { - if (!(la->la_flags & LLE_STATIC)) { - wtime = V_arpt_keep - V_arp_maxtries; - if (wtime < 0) - wtime = V_arpt_keep; - - LLE_ADDREF(la); - canceled = callout_reset(&la->la_timer, - hz * wtime, arptimer, la); - if (canceled) - LLE_REMREF(la); - else - la->la_flags |= LLE_CALLOUTREF; - } - la->la_asked = 0; - la->la_preempt = V_arp_maxtries; /* - * The packets are all freed within the call to the output - * routine. - * - * NB: The lock MUST be released before the call to the - * output routine. + * Reply to our address, but no lle exists yet. + * do we really have to create an entry? */ - if (la->la_hold != NULL) { - struct mbuf *m_hold, *m_hold_next; - - m_hold = la->la_hold; - la->la_hold = NULL; - la->la_numheld = 0; - memcpy(&sa, L3_ADDR(la), sizeof(sa)); - LLE_WUNLOCK(la); - for (; m_hold != NULL; m_hold = m_hold_next) { - m_hold_next = m_hold->m_nextpkt; - m_hold->m_nextpkt = NULL; - /* Avoid confusing lower layers. */ - m_clrprotoflags(m_hold); - (*ifp->if_output)(ifp, m_hold, &sa, NULL); + la = lltable_create_lle(LLTABLE(ifp), 0, + (struct sockaddr *)&sin); + if (la != NULL) { + IF_AFDATA_CFG_WLOCK(ifp); + LLE_WLOCK(la); + /* Let's try to search another time */ + la_tmp = lltable_lookup_lle(LLTABLE(ifp), LLE_EXCLUSIVE, + (struct sockaddr *)&sin); + if (la_tmp != NULL) { + /* + * Someone has already inserted another entry. + * Let's use it. + */ + IF_AFDATA_CFG_WUNLOCK(ifp); + arp_update_lle(ah, isaddr, ifp, bridged,la_tmp); + LLE_FREE_LOCKED(la); + } else { + /* + * Use new entry. Skip all checks, update + * immediately + */ + arp_update_lle_addr(ah, ifp, la); + IF_AFDATA_CFG_WUNLOCK(ifp); + arp_set_lle_reachable(la); + LLE_WUNLOCK(la); } - } else - LLE_WUNLOCK(la); + } } reply: if (op != ARPOP_REQUEST) @@ -1085,41 +1033,202 @@ drop: } #endif -void -arp_ifinit(struct ifnet *ifp, struct ifaddr *ifa) +static void +arp_update_lle_addr(struct arphdr *ah, struct ifnet *ifp, struct llentry *la) { - struct llentry *lle; - if (ifa->ifa_carp != NULL) + LLE_WLOCK_ASSERT(la); + + /* Update data */ + IF_AFDATA_RUN_WLOCK(ifp); + memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen); + la->la_flags |= LLE_VALID; + la->r_flags |= RLLE_VALID; + if ((la->la_flags & LLE_STATIC) == 0) + la->la_expire = time_uptime + V_arpt_keep; + llentry_link(LLTABLE(ifp), la); + IF_AFDATA_RUN_WUNLOCK(ifp); +} + +static void +arp_set_lle_reachable(struct llentry *la) +{ + int canceled, wtime; + + la->ln_state = ARP_LLINFO_REACHABLE; + EVENTHANDLER_INVOKE(lle_event, la, LLENTRY_RESOLVED); + + if (!(la->la_flags & LLE_STATIC)) { + wtime = V_arpt_keep - V_arp_maxtries; + if (wtime < 0) + wtime = V_arpt_keep; + + LLE_ADDREF(la); + canceled = callout_reset(&la->la_timer, + hz * wtime, arptimer, la); + if (canceled) + LLE_REMREF(la); + else + la->la_flags |= LLE_CALLOUTREF; + } + la->la_asked = 0; + la->la_preempt = V_arp_maxtries; +} + +static void +arp_update_lle(struct arphdr *ah, struct in_addr isaddr, struct ifnet *ifp, + int bridged, struct llentry *la) +{ + struct sockaddr_in sin; + struct mbuf *m_hold, *m_hold_next; + + LLE_WLOCK_ASSERT(la); + + /* the following is not an error when doing bridging */ + if (!bridged && la->lle_tbl && la->lle_tbl->llt_ifp != ifp) { + if (log_arp_wrong_iface) + ARP_LOG(LOG_WARNING, "%s is on %s " + "but got reply from %*D on %s\n", + inet_ntoa(isaddr), + la->lle_tbl->llt_ifp->if_xname, + ifp->if_addrlen, (u_char *)ar_sha(ah), ":", + ifp->if_xname); + LLE_WUNLOCK(la); return; + } + if ((la->la_flags & LLE_VALID) && + bcmp(ar_sha(ah), &la->ll_addr, ifp->if_addrlen)) { + if (la->la_flags & LLE_STATIC) { + LLE_WUNLOCK(la); + if (log_arp_permanent_modify) + ARP_LOG(LOG_ERR, + "%*D attempts to modify " + "permanent entry for %s on %s\n", + ifp->if_addrlen, + (u_char *)ar_sha(ah), ":", + inet_ntoa(isaddr), ifp->if_xname); + return; + } + if (log_arp_movements) { + ARP_LOG(LOG_INFO, "%s moved from %*D " + "to %*D on %s\n", + inet_ntoa(isaddr), + ifp->if_addrlen, + (u_char *)&la->ll_addr, ":", + ifp->if_addrlen, (u_char *)ar_sha(ah), ":", + ifp->if_xname); + } + } + + /* Check if something has changed */ + if (memcmp(&la->ll_addr, ar_sha(ah), ifp->if_addrlen) != 0 || + (la->la_flags & LLE_VALID) == 0 || + la->la_expire != time_uptime + V_arpt_keep) { + /* Perform real LLE update */ + /* use afdata WLOCK to update fields */ + LLE_ADDREF(la); + LLE_WUNLOCK(la); + IF_AFDATA_CFG_WLOCK(ifp); + LLE_WLOCK(la); - if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY) { - arprequest(ifp, &IA_SIN(ifa)->sin_addr, - &IA_SIN(ifa)->sin_addr, IF_LLADDR(ifp)); /* - * interface address is considered static entry - * because the output of the arp utility shows - * that L2 entry as permanent + * Since we droppped LLE lock, other thread might have deleted + * this lle. Check and return */ - IF_AFDATA_CFG_WLOCK(ifp); - lle = lltable_create_lle(LLTABLE(ifp), LLE_IFADDR | LLE_STATIC, - (struct sockaddr *)IA_SIN(ifa)); - if (lle != NULL) { - IF_AFDATA_RUN_WLOCK(ifp); - bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); - lle->la_flags |= (LLE_VALID | LLE_STATIC); - lle->r_flags |= RLLE_VALID; - llentry_link(LLTABLE(ifp), lle); - IF_AFDATA_RUN_WUNLOCK(ifp); + if ((la->la_flags & LLE_DELETED) != 0) { + IF_AFDATA_CFG_WUNLOCK(ifp); + LLE_FREE_LOCKED(la); + return; } + + /* Update data */ + arp_update_lle_addr(ah, ifp, la); + IF_AFDATA_CFG_WUNLOCK(ifp); - if (lle == NULL) - log(LOG_INFO, "arp_ifinit: cannot create arp " - "entry for interface address\n"); - else - LLE_WUNLOCK(lle); + LLE_REMREF(la); } + + arp_set_lle_reachable(la); + + /* + * The packets are all freed within the call to the output + * routine. + * + * NB: The lock MUST be released before the call to the + * output routine. + */ + if (la->la_hold != NULL) { + + m_hold = la->la_hold; + la->la_hold = NULL; + la->la_numheld = 0; + memcpy(&sin, L3_ADDR(la), sizeof(sin)); + LLE_WUNLOCK(la); + for (; m_hold != NULL; m_hold = m_hold_next) { + m_hold_next = m_hold->m_nextpkt; + m_hold->m_nextpkt = NULL; + /* Avoid confusing lower layers. */ + m_clrprotoflags(m_hold); + (*ifp->if_output)(ifp, m_hold, (struct sockaddr *)&sin, NULL); + } + } else + LLE_WUNLOCK(la); +} + +void +arp_ifinit(struct ifnet *ifp, struct ifaddr *ifa) +{ + struct llentry *lle; + struct in_addr addr; + + if (ifa->ifa_carp != NULL) + return; + ifa->ifa_rtrequest = NULL; + addr = IA_SIN(ifa)->sin_addr; + + if (ntohl(addr.s_addr) == INADDR_ANY) { + /* XXX-ME why? */ + return; + } + + arprequest(ifp, &addr, &addr, IF_LLADDR(ifp)); + + /* + * interface address is considered static entry + * because the output of the arp utility shows + * that L2 entry as permanent + */ + lle = lltable_create_lle(LLTABLE(ifp), LLE_IFADDR | LLE_STATIC, + (struct sockaddr *)IA_SIN(ifa)); + if (lle == NULL) { + log(LOG_INFO, "arp_ifinit: cannot create arp " + "entry for interface address\n"); + return; + } + + IF_AFDATA_CFG_WLOCK(ifp); + + /* Lock or new shiny lle */ + LLE_WLOCK(lle); + + /* + * Check if we already have some corresponding entry. + * Instead of dealing with callouts/flags/etc we simply + * delete it and add new one. + */ + lltable_delete_lle(LLTABLE(ifp), LLE_IFADDR, + (struct sockaddr *)IA_SIN(ifa)); + + IF_AFDATA_RUN_WLOCK(ifp); + bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); + lle->la_flags |= (LLE_VALID | LLE_STATIC); + lle->r_flags |= RLLE_VALID; + llentry_link(LLTABLE(ifp), lle); + IF_AFDATA_RUN_WUNLOCK(ifp); + + IF_AFDATA_CFG_WUNLOCK(ifp); + LLE_WUNLOCK(lle); } void Modified: projects/routing/sys/netinet/in.c ============================================================================== --- projects/routing/sys/netinet/in.c Mon Dec 1 21:33:28 2014 (r275381) +++ projects/routing/sys/netinet/in.c Mon Dec 1 21:43:48 2014 (r275382) @@ -1036,7 +1036,7 @@ in_lltable_new(const struct sockaddr *l3 } static void -in_lltable_stop_timers(struct llentry *lle) +in_lltable_stop_timers(struct llentry *lle) { LLE_WLOCK_ASSERT(lle); @@ -1181,23 +1181,12 @@ in_lltable_delete(struct lltable *llt, u static struct llentry * in_lltable_create(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) { - const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr; struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_CFG_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET, ("sin_family %d", l3addr->sa_family)); - lle = in_lltable_find_dst(llt, sin->sin_addr); - - if (lle != NULL) { - LLE_WLOCK(lle); - return (lle); - } - - /* no existing record, we need to create new one */ - /* * A route that covers the given address must have * been installed 1st because we are doing a resolution, @@ -1213,7 +1202,6 @@ in_lltable_create(struct lltable *llt, u return (NULL); } lle->la_flags = flags; - LLE_WLOCK(lle); return (lle); } Modified: projects/routing/sys/netinet6/in6.c ============================================================================== --- projects/routing/sys/netinet6/in6.c Mon Dec 1 21:33:28 2014 (r275381) +++ projects/routing/sys/netinet6/in6.c Mon Dec 1 21:43:48 2014 (r275382) @@ -2223,7 +2223,6 @@ in6_lltable_create(struct lltable *llt, struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - IF_AFDATA_CFG_WLOCK_ASSERT(ifp); KASSERT(l3addr->sa_family == AF_INET6, ("sin_family %d", l3addr->sa_family)); From owner-svn-src-projects@FreeBSD.ORG Mon Dec 1 22:37:37 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B92ED6A2; Mon, 1 Dec 2014 22:37:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A5D49214; Mon, 1 Dec 2014 22:37:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1MbbRp000809; Mon, 1 Dec 2014 22:37:37 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1MbbQO000808; Mon, 1 Dec 2014 22:37:37 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201412012237.sB1MbbQO000808@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Mon, 1 Dec 2014 22:37:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275383 - projects/routing/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.18-1 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, 01 Dec 2014 22:37:37 -0000 Author: melifaro Date: Mon Dec 1 22:37:36 2014 New Revision: 275383 URL: https://svnweb.freebsd.org/changeset/base/275383 Log: Put bandaid on arptimer-derived crashed for 'arp -da' deleted records. The proper fix will arrive after convering lltable 'delete' method. Modified: projects/routing/sys/netinet/if_ether.c Modified: projects/routing/sys/netinet/if_ether.c ============================================================================== --- projects/routing/sys/netinet/if_ether.c Mon Dec 1 21:43:48 2014 (r275382) +++ projects/routing/sys/netinet/if_ether.c Mon Dec 1 22:37:36 2014 (r275383) @@ -192,6 +192,27 @@ arptimer(void *arg) return; } + if (lle->la_falgs & LLE_DELETED) { + /* XXX: Temporary */ + /* We have been deleted. Drop callref and return */ + if ((lle->la_flags & LLE_CALLOUTREF) != 0) { + LLE_REMREF(lle); + lle->la_flags &= ~LLE_CALLOUTREF; + } + + pkts_dropped = llentry_free(lle); + ARPSTAT_ADD(dropped, pkts_dropped); + return; + } + + /* Unlink entry */ + IF_AFDATA_RUN_WLOCK(ifp); + llentry_unlink(lle); + IF_AFDATA_RUN_WUNLOCK(ifp); + + pkts_dropped = llentry_free(lle); + ARPSTAT_ADD(dropped, pkts_dropped); + la_flags = lle->la_flags; state = (la_flags & LLE_DELETED) ? ARP_LLINFO_DELETED : lle->ln_state; ifp = lle->lle_tbl->llt_ifp; From owner-svn-src-projects@FreeBSD.ORG Tue Dec 2 01:45:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3B6DFED; Tue, 2 Dec 2014 01:45:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 AD989A0B; Tue, 2 Dec 2014 01:45:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB21jCdi091261; Tue, 2 Dec 2014 01:45:12 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB21j504091217; Tue, 2 Dec 2014 01:45:05 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412020145.sB21j504091217@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 2 Dec 2014 01:45:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275387 - in projects/clang350-import: . contrib/binutils/bfd contrib/binutils/bfd/po contrib/elftoolchain/elfcopy contrib/elftoolchain/libelftc contrib/elftoolchain/nm contrib/elftoolc... 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.18-1 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, 02 Dec 2014 01:45:12 -0000 Author: dim Date: Tue Dec 2 01:45:04 2014 New Revision: 275387 URL: https://svnweb.freebsd.org/changeset/base/275387 Log: Merge ^/head r274961 through r275386. Added: projects/clang350-import/lib/libelftc/ - copied from r275386, head/lib/libelftc/ projects/clang350-import/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS - copied unchanged from r275386, head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS projects/clang350-import/usr.bin/addr2line/ - copied from r275386, head/usr.bin/addr2line/ projects/clang350-import/usr.bin/elfcopy/ - copied from r275386, head/usr.bin/elfcopy/ projects/clang350-import/usr.bin/nm/ - copied from r275386, head/usr.bin/nm/ projects/clang350-import/usr.bin/size/ - copied from r275386, head/usr.bin/size/ projects/clang350-import/usr.bin/strings/ - copied from r275386, head/usr.bin/strings/ Modified: projects/clang350-import/Makefile.inc1 projects/clang350-import/contrib/binutils/bfd/elflink.c projects/clang350-import/contrib/binutils/bfd/po/bfd.pot projects/clang350-import/contrib/elftoolchain/elfcopy/archive.c projects/clang350-import/contrib/elftoolchain/elfcopy/ascii.c projects/clang350-import/contrib/elftoolchain/elfcopy/segments.c projects/clang350-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c projects/clang350-import/contrib/elftoolchain/nm/nm.c projects/clang350-import/contrib/elftoolchain/size/size.c projects/clang350-import/contrib/elftoolchain/strings/strings.c projects/clang350-import/contrib/gcc/config/arm/libunwind.S projects/clang350-import/contrib/subversion/subversion/svn/util.c projects/clang350-import/gnu/usr.bin/binutils/Makefile projects/clang350-import/lib/Makefile projects/clang350-import/sbin/sysctl/sysctl.c projects/clang350-import/share/man/man4/isp.4 projects/clang350-import/share/mk/bsd.cpu.mk projects/clang350-import/share/mk/src.libnames.mk projects/clang350-import/share/mk/src.opts.mk projects/clang350-import/sys/arm/include/asm.h projects/clang350-import/sys/arm/ti/ti_pruss.c projects/clang350-import/sys/cam/cam_xpt.c projects/clang350-import/sys/kern/kern_mutex.c projects/clang350-import/sys/kern/kern_proc.c projects/clang350-import/tools/tools/nanobsd/fill_pkg.sh projects/clang350-import/usr.bin/Makefile Directory Properties: projects/clang350-import/ (props changed) projects/clang350-import/contrib/binutils/ (props changed) projects/clang350-import/contrib/gcc/ (props changed) projects/clang350-import/contrib/subversion/ (props changed) projects/clang350-import/gnu/usr.bin/binutils/ (props changed) projects/clang350-import/sbin/ (props changed) projects/clang350-import/share/ (props changed) projects/clang350-import/share/man/man4/ (props changed) projects/clang350-import/sys/ (props changed) Modified: projects/clang350-import/Makefile.inc1 ============================================================================== --- projects/clang350-import/Makefile.inc1 Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/Makefile.inc1 Tue Dec 2 01:45:04 2014 (r275387) @@ -1415,6 +1415,14 @@ _kgzip= usr.sbin/kgzip # If we're given an XAS, don't build binutils. .if ${XAS:M/*} == "" && ${MK_BINUTILS_BOOTSTRAP} != "no" _binutils= gnu/usr.bin/binutils +.if ${MK_ELFTOOLCHAIN_TOOLS} != "no" +_elftctools= lib/libelftc \ + usr.bin/addr2line \ + usr.bin/elfcopy \ + usr.bin/nm \ + usr.bin/size \ + usr.bin/strings +.endif .endif # If an full path to an external cross compiler is given, don't build @@ -1434,6 +1442,7 @@ cross-tools: .MAKE ${_clang_libs} \ ${_clang} \ ${_binutils} \ + ${_elftctools} \ ${_cc} \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ @@ -1491,6 +1500,7 @@ native-xtools: .MAKE ${_clang_tblgen} \ usr.bin/ar \ ${_binutils} \ + ${_elftctools} \ ${_cc} \ ${_gcc_tools} \ ${_clang_libs} \ @@ -2045,6 +2055,7 @@ _xb-build-tools: _xb-cross-tools: .for _tool in \ ${_binutils} \ + ${_elftctools} \ usr.bin/ar \ ${_clang_libs} \ ${_clang} \ @@ -2077,6 +2088,7 @@ _xi-cross-tools: @echo "_xi-cross-tools" .for _tool in \ ${_binutils} \ + ${_elftctools} \ usr.bin/ar \ ${_clang_libs} \ ${_clang} \ Modified: projects/clang350-import/contrib/binutils/bfd/elflink.c ============================================================================== --- projects/clang350-import/contrib/binutils/bfd/elflink.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/binutils/bfd/elflink.c Tue Dec 2 01:45:04 2014 (r275387) @@ -4356,9 +4356,38 @@ elf_link_add_object_symbols (bfd *abfd, --no-add-needed is used. */ if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) { + bfd_boolean looks_soish; + const char *print_name; + int print_len; + size_t len, lend = 0; + + looks_soish = FALSE; + print_name = soname; + print_len = strlen(soname); + if (strncmp(soname, "lib", 3) == 0) + { + len = print_len; + if (len > 5 && strcmp(soname + len - 2, ".a") == 0) + lend = len - 5; + else + { + while (len > 6 && (ISDIGIT(soname[len - 1]) || + soname[len - 1] == '.')) + len--; + if (strncmp(soname + len - 3, ".so", 3) == 0) + lend = len - 6; + } + if (lend != 0) + { + print_name = soname + 3; + print_len = lend; + looks_soish = TRUE; + } + } + (*_bfd_error_handler) - (_("%B: invalid DSO for symbol `%s' definition"), - abfd, name); + (_("undefined reference to symbol `%s' (try adding -l%s%.*s)"), + name, looks_soish? "" : ":", print_len, print_name); bfd_set_error (bfd_error_bad_value); goto error_free_vers; } Modified: projects/clang350-import/contrib/binutils/bfd/po/bfd.pot ============================================================================== --- projects/clang350-import/contrib/binutils/bfd/po/bfd.pot Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/binutils/bfd/po/bfd.pot Tue Dec 2 01:45:04 2014 (r275387) @@ -2438,9 +2438,9 @@ msgstr "" msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B" msgstr "" -#: elflink.c:4309 +#: elflink.c:4389 #, c-format -msgid "%B: invalid DSO for symbol `%s' definition" +msgid "undefined reference to symbol `%s' (try adding -l%s%.*s)" msgstr "" #: elflink.c:5535 Modified: projects/clang350-import/contrib/elftoolchain/elfcopy/archive.c ============================================================================== --- projects/clang350-import/contrib/elftoolchain/elfcopy/archive.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/elftoolchain/elfcopy/archive.c Tue Dec 2 01:45:04 2014 (r275387) @@ -350,12 +350,12 @@ ac_detect_ar(int ifd) r = -1; if ((a = archive_read_new()) == NULL) return (0); - archive_read_support_compression_none(a); + archive_read_support_filter_none(a); archive_read_support_format_ar(a); if (archive_read_open_fd(a, ifd, 10240) == ARCHIVE_OK) r = archive_read_next_header(a, &entry); archive_read_close(a); - archive_read_finish(a); + archive_read_free(a); return (r == ARCHIVE_OK); } @@ -386,7 +386,7 @@ ac_read_objs(struct elfcopy *ecp, int if err(EXIT_FAILURE, "lseek failed"); if ((a = archive_read_new()) == NULL) errx(EXIT_FAILURE, "%s", archive_error_string(a)); - archive_read_support_compression_none(a); + archive_read_support_filter_none(a); archive_read_support_format_ar(a); AC(archive_read_open_fd(a, ifd, 10240)); for(;;) { @@ -435,7 +435,7 @@ ac_read_objs(struct elfcopy *ecp, int if } } AC(archive_read_close(a)); - ACV(archive_read_finish(a)); + ACV(archive_read_free(a)); } static void @@ -449,7 +449,7 @@ ac_write_objs(struct elfcopy *ecp, int o if ((a = archive_write_new()) == NULL) errx(EXIT_FAILURE, "%s", archive_error_string(a)); archive_write_set_format_ar_svr4(a); - archive_write_set_compression_none(a); + archive_write_add_filter_none(a); AC(archive_write_open_fd(a, ofd)); /* Write the archive symbol table, even if it's empty. */ @@ -491,7 +491,7 @@ ac_write_objs(struct elfcopy *ecp, int o } AC(archive_write_close(a)); - ACV(archive_write_finish(a)); + ACV(archive_write_free(a)); } static void Modified: projects/clang350-import/contrib/elftoolchain/elfcopy/ascii.c ============================================================================== --- projects/clang350-import/contrib/elftoolchain/elfcopy/ascii.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/elftoolchain/elfcopy/ascii.c Tue Dec 2 01:45:04 2014 (r275387) @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include Modified: projects/clang350-import/contrib/elftoolchain/elfcopy/segments.c ============================================================================== --- projects/clang350-import/contrib/elftoolchain/elfcopy/segments.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/elftoolchain/elfcopy/segments.c Tue Dec 2 01:45:04 2014 (r275387) @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include Modified: projects/clang350-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c ============================================================================== --- projects/clang350-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Tue Dec 2 01:45:04 2014 (r275387) @@ -156,7 +156,7 @@ static int vector_type_qualifier_init(st static int vector_type_qualifier_push(struct vector_type_qualifier *, enum type_qualifier); -int cpp_demangle_gnu3_push_head; +static int cpp_demangle_gnu3_push_head; /** * @brief Decode the input string by IA-64 C++ ABI style. Modified: projects/clang350-import/contrib/elftoolchain/nm/nm.c ============================================================================== --- projects/clang350-import/contrib/elftoolchain/nm/nm.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/elftoolchain/nm/nm.c Tue Dec 2 01:45:04 2014 (r275387) @@ -65,7 +65,7 @@ typedef void (*fn_sym_print)(const GElf_ typedef int (*fn_filter)(char, const GElf_Sym *, const char *); /* output filter list */ -SLIST_HEAD(filter_head, filter_entry) nm_out_filter = +static SLIST_HEAD(filter_head, filter_entry) nm_out_filter = SLIST_HEAD_INITIALIZER(nm_out_filter); struct filter_entry { Modified: projects/clang350-import/contrib/elftoolchain/size/size.c ============================================================================== --- projects/clang350-import/contrib/elftoolchain/size/size.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/elftoolchain/size/size.c Tue Dec 2 01:45:04 2014 (r275387) @@ -269,7 +269,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el static pid_t pid; uintptr_t ver; Elf32_Nhdr *nhdr, nhdr_l; - static int reg_pseudo = 0, reg2_pseudo = 0, regxfp_pseudo = 0; + static int reg_pseudo = 0, reg2_pseudo = 0 /*, regxfp_pseudo = 0*/; char buf[BUF_SIZE], *data, *name; if (elf == NULL || elfhdr == NULL || phdr == NULL) @@ -360,6 +360,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el text_size_total += nhdr_l.n_descsz; } break; +#if 0 case NT_AUXV: if (style == STYLE_SYSV) { tbl_append(); @@ -390,6 +391,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el } break; case NT_PSINFO: +#endif case NT_PRPSINFO: { /* FreeBSD 64-bit */ if (nhdr_l.n_descsz == 0x78 && @@ -415,8 +417,10 @@ handle_core_note(Elf *elf, GElf_Ehdr *el } break; } +#if 0 case NT_PSTATUS: case NT_LWPSTATUS: +#endif default: break; } Modified: projects/clang350-import/contrib/elftoolchain/strings/strings.c ============================================================================== --- projects/clang350-import/contrib/elftoolchain/strings/strings.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/elftoolchain/strings/strings.c Tue Dec 2 01:45:04 2014 (r275387) @@ -75,9 +75,9 @@ enum encoding_style { (encoding == ENCODING_8BIT && (c) > 127))) -int encoding_size, entire_file, min_len, show_filename, show_loc; -enum encoding_style encoding; -enum radix_style radix; +static int encoding_size, entire_file, min_len, show_filename, show_loc; +static enum encoding_style encoding; +static enum radix_style radix; static struct option strings_longopts[] = { { "all", no_argument, NULL, 'a'}, Modified: projects/clang350-import/contrib/gcc/config/arm/libunwind.S ============================================================================== --- projects/clang350-import/contrib/gcc/config/arm/libunwind.S Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/gcc/config/arm/libunwind.S Tue Dec 2 01:45:04 2014 (r275387) @@ -26,6 +26,13 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + +/* Allow the use of VFP instructions */ +#if __ARM_ARCH >= 7 +.fpu vfp +#endif + #ifndef __symbian__ #include "lib1funcs.asm" @@ -66,14 +73,22 @@ ARM_FUNC_START restore_core_regs ARM_FUNC_START gnu_Unwind_Restore_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ +#if __ARM_ARCH >= 7 + fldmiax r0, {d0-d15} +#else ldc p11,cr0,[r0],{0x21} /* fldmiax r0, {d0-d15} */ +#endif RET /* Store VFR regsters d0-d15 to the address in r0. */ ARM_FUNC_START gnu_Unwind_Save_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ +#if __ARM_ARCH >= 7 + fstmiax r0, {d0-d15} +#else stc p11,cr0,[r0],{0x21} /* fstmiax r0, {d0-d15} */ +#endif RET /* Wrappers to save core registers, then call the real routine. */ Modified: projects/clang350-import/contrib/subversion/subversion/svn/util.c ============================================================================== --- projects/clang350-import/contrib/subversion/subversion/svn/util.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/contrib/subversion/subversion/svn/util.c Tue Dec 2 01:45:04 2014 (r275387) @@ -333,11 +333,13 @@ truncate_buffer_at_prefix(apr_size_t *ne static const char *prefixes[] = { "PR:", + "Differential Revision:", "Submitted by:", "Reviewed by:", "Approved by:", "Obtained from:", "MFC after:", + "MFH:", "Relnotes:", "Security:", "Sponsored by:" @@ -404,11 +406,13 @@ svn_cl__get_log_message(const char **log default_msg = svn_stringbuf_create(APR_EOL_STR, pool); svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t" @@ -419,15 +423,17 @@ svn_cl__get_log_message(const char **log svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX); svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above: 76 columns --|" APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> PR: If a Bugzilla PR is affected by the change." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR); - svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> PR: If a Bugzilla PR is affected by the change." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> MFH: Ports tree branch name. Request approval for merge." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); Modified: projects/clang350-import/gnu/usr.bin/binutils/Makefile ============================================================================== --- projects/clang350-import/gnu/usr.bin/binutils/Makefile Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/gnu/usr.bin/binutils/Makefile Tue Dec 2 01:45:04 2014 (r275387) @@ -1,19 +1,29 @@ # $FreeBSD$ +.include + SUBDIR= libiberty \ libbfd \ libopcodes \ libbinutils \ - addr2line \ + ${_addr2line} \ as \ ld \ - nm \ + ${_nm} \ objcopy \ objdump \ readelf \ - size \ - strings \ - strip \ + ${_size} \ + ${_strings} \ + ${_strip} \ doc + +.if ${MK_ELFTOOLCHAIN_TOOLS} == "no" +_addr2line= addr2line +_nm= nm +_size= size +_strings= strings +_strip= strip +.endif .include Modified: projects/clang350-import/lib/Makefile ============================================================================== --- projects/clang350-import/lib/Makefile Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/lib/Makefile Tue Dec 2 01:45:04 2014 (r275387) @@ -45,6 +45,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libdpv \ libdwarf \ libedit \ + ${_libelftc} \ ${_libevent} \ libexecinfo \ libexpat \ @@ -190,6 +191,10 @@ _clang= clang _cuse= libcuse .endif +.if ${MK_ELFTOOLCHAIN_TOOLS} != "no" +_libelftc= libelftc +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif Modified: projects/clang350-import/sbin/sysctl/sysctl.c ============================================================================== --- projects/clang350-import/sbin/sysctl/sysctl.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/sbin/sysctl/sysctl.c Tue Dec 2 01:45:04 2014 (r275387) @@ -679,15 +679,18 @@ strIKtoi(const char *str, char **endptrp p = &str[len - 1]; if (*p == 'C' || *p == 'F') { temp = strtof(str, endptrp); - if (*endptrp != str && *endptrp == p && errno != 0) { + if (*endptrp != str && *endptrp == p && errno == 0) { if (*p == 'F') temp = (temp - 32) * 5 / 9; + *endptrp = NULL; return (temp * 10 + 2732); } } else { kelv = (int)strtol(str, endptrp, 10); - if (*endptrp != str && *endptrp == p && errno != 0) + if (*endptrp != str && *endptrp == p && errno == 0) { + *endptrp = NULL; return (kelv); + } } errno = ERANGE; Modified: projects/clang350-import/share/man/man4/isp.4 ============================================================================== --- projects/clang350-import/share/man/man4/isp.4 Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/share/man/man4/isp.4 Tue Dec 2 01:45:04 2014 (r275387) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 28, 2007 +.Dd December 1, 2014 .Dt ISP 4 .Os .Sh NAME @@ -136,6 +136,8 @@ Dell Branded version of the QLogic 2312 Qlogic 2422 Optical Fibre Channel PCI cards (4 Gigabit) .It Qlogic 2432 Qlogic 2432 Optical Fibre Channel PCIe cards (4 Gigabit) +.It Qlogic 2432 +Qlogic 2532 Optical Fibre Channel PCIe cards (8 Gigabit) .El .Sh CONFIGURATION OPTIONS Target mode support may be enabled with the @@ -197,6 +199,8 @@ A hint to define default role for isp in A hint value for a driver debug level (see the file .Pa /usr/src/sys/dev/isp/ispvar.h for the values. +.It Va hint.isp.0.vports +A hint to create specified number of additional virtual ports. .El .Sh SYSCTL OPTIONS .Bl -tag -width indent Modified: projects/clang350-import/share/mk/bsd.cpu.mk ============================================================================== --- projects/clang350-import/share/mk/bsd.cpu.mk Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/share/mk/bsd.cpu.mk Tue Dec 2 01:45:04 2014 (r275387) @@ -99,7 +99,7 @@ _CPUCFLAGS = -march=armv5te -D__XSCALE__ . elif ${CPUTYPE} == "armv6" _CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6=1 . elif ${CPUTYPE} == "cortexa" -_CPUCFLAGS = -DARM_ARCH_6=1 -mfpu=vfp +_CPUCFLAGS = -march=armv7 -DARM_ARCH_6=1 -mfpu=vfp . else _CPUCFLAGS = -mcpu=${CPUTYPE} . endif Modified: projects/clang350-import/share/mk/src.libnames.mk ============================================================================== --- projects/clang350-import/share/mk/src.libnames.mk Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/share/mk/src.libnames.mk Tue Dec 2 01:45:04 2014 (r275387) @@ -27,6 +27,7 @@ _INTERNALIBS= \ amu \ bsnmptools \ cron \ + elftc \ event \ fifolog \ ipf \ @@ -286,6 +287,10 @@ LIBATF_CXX?= ${LIBATF_CXXDIR}/libatf-c++ LIBBSDSTATDIR= ${ROOTOBJDIR}/lib/libbsdstat LIBBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.a +LIBELFTCDIR= ${ROOTOBJDIR}/lib/libelftc +LDELFTC?= ${LIBELFTCDIR}/libelftc.a +LIBELFTC?= ${LIBELFTCDIR}/libelftc.a + LIBEVENTDIR= ${ROOTOBJDIR}/lib/libevent LIBEVENT?= ${LIBEVENTDIR}/libevent.a Modified: projects/clang350-import/share/mk/src.opts.mk ============================================================================== --- projects/clang350-import/share/mk/src.opts.mk Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/share/mk/src.opts.mk Tue Dec 2 01:45:04 2014 (r275387) @@ -160,6 +160,7 @@ __DEFAULT_NO_OPTIONS = \ BSD_GREP \ CLANG_EXTRAS \ EISA \ + ELFTOOLCHAIN_TOOLS \ FMAKE \ HESIOD \ LLDB \ Modified: projects/clang350-import/sys/arm/include/asm.h ============================================================================== --- projects/clang350-import/sys/arm/include/asm.h Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/sys/arm/include/asm.h Tue Dec 2 01:45:04 2014 (r275387) @@ -112,10 +112,16 @@ ldr x, [x, got] #define GOT_INIT(got,gotsym,pclabel) \ ldr got, gotsym; \ - add got, got, pc; \ - pclabel: + pclabel: add got, got, pc +#ifdef __thumb__ #define GOT_INITSYM(gotsym,pclabel) \ - gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) + (. - (pclabel+4)) + .align 0; \ + gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (pclabel+4) +#else +#define GOT_INITSYM(gotsym,pclabel) \ + .align 0; \ + gotsym: .word _C_LABEL(_GLOBAL_OFFSET_TABLE_) - (pclabel+8) +#endif #ifdef __STDC__ #define PIC_SYM(x,y) x ## ( ## y ## ) Modified: projects/clang350-import/sys/arm/ti/ti_pruss.c ============================================================================== --- projects/clang350-import/sys/arm/ti/ti_pruss.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/sys/arm/ti/ti_pruss.c Tue Dec 2 01:45:04 2014 (r275387) @@ -67,7 +67,6 @@ static device_attach_t ti_pruss_attach; static device_detach_t ti_pruss_detach; static void ti_pruss_intr(void *); static d_open_t ti_pruss_open; -static d_close_t ti_pruss_close; static d_mmap_t ti_pruss_mmap; static void ti_pruss_kq_read_detach(struct knote *); static int ti_pruss_kq_read_event(struct knote *, long); @@ -83,14 +82,12 @@ struct ti_pruss_softc { bus_space_handle_t sc_bh; struct cdev *sc_pdev; struct selinfo sc_selinfo; - uint32_t sc_inuse; }; static struct cdevsw ti_pruss_cdevsw = { .d_version = D_VERSION, .d_name = "ti_pruss", .d_open = ti_pruss_open, - .d_close = ti_pruss_close, .d_mmap = ti_pruss_mmap, .d_kqfilter = ti_pruss_kqfilter, }; @@ -187,11 +184,11 @@ ti_pruss_attach(device_t dev) for (i = 0; i < TI_PRUSS_IRQS; i++) { ti_pruss_irq_args[i].irq = i; ti_pruss_irq_args[i].sc = sc; - if (bus_setup_intr(dev, sc->sc_irq_res[i], + if (bus_setup_intr(dev, sc->sc_irq_res[i], INTR_MPSAFE | INTR_TYPE_MISC, - NULL, ti_pruss_intr, &ti_pruss_irq_args[i], + NULL, ti_pruss_intr, &ti_pruss_irq_args[i], &sc->sc_intr[i]) != 0) { - device_printf(dev, + device_printf(dev, "unable to setup the interrupt handler\n"); ti_pruss_detach(dev); return (ENXIO); @@ -220,7 +217,7 @@ ti_pruss_detach(device_t dev) if (sc->sc_intr[i]) bus_teardown_intr(dev, sc->sc_irq_res[i], sc->sc_intr[i]); if (sc->sc_irq_res[i]) - bus_release_resource(dev, SYS_RES_IRQ, + bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->sc_irq_res[i]), sc->sc_irq_res[i]); } @@ -246,25 +243,9 @@ ti_pruss_intr(void *arg) } static int -ti_pruss_open(struct cdev *cdev, int oflags, int devtype, struct thread *td) +ti_pruss_open(struct cdev *cdev __unused, int oflags __unused, + int devtype __unused, struct thread *td __unused) { - device_t dev = cdev->si_drv1; - struct ti_pruss_softc *sc = device_get_softc(dev); - - if (atomic_cmpset_32(&sc->sc_inuse, 0, 1) == 0) - return (EBUSY); - else - return (0); -} - -static int -ti_pruss_close(struct cdev *cdev, int fflag, int devtype, struct thread *td) -{ - device_t dev = cdev->si_drv1; - struct ti_pruss_softc *sc = device_get_softc(dev); - - sc->sc_inuse = 0; - return (0); } Modified: projects/clang350-import/sys/cam/cam_xpt.c ============================================================================== --- projects/clang350-import/sys/cam/cam_xpt.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/sys/cam/cam_xpt.c Tue Dec 2 01:45:04 2014 (r275387) @@ -1136,8 +1136,15 @@ xpt_getattr(char *buf, size_t len, const if (idd == NULL) goto out; ret = 0; - if ((idd->proto_codeset & SVPD_ID_CODESET_MASK) == SVPD_ID_CODESET_ASCII || - (idd->proto_codeset & SVPD_ID_CODESET_MASK) == SVPD_ID_CODESET_UTF8) { + if ((idd->proto_codeset & SVPD_ID_CODESET_MASK) == SVPD_ID_CODESET_ASCII) { + if (idd->length < len) { + for (l = 0; l < idd->length; l++) + buf[l] = idd->identifier[l] ? + idd->identifier[l] : ' '; + buf[l] = 0; + } else + ret = EFAULT; + } else if ((idd->proto_codeset & SVPD_ID_CODESET_MASK) == SVPD_ID_CODESET_UTF8) { l = strnlen(idd->identifier, idd->length); if (l < len) { bcopy(idd->identifier, buf, l); Modified: projects/clang350-import/sys/kern/kern_mutex.c ============================================================================== --- projects/clang350-import/sys/kern/kern_mutex.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/sys/kern/kern_mutex.c Tue Dec 2 01:45:04 2014 (r275387) @@ -968,7 +968,7 @@ mutex_init(void) mtx_init(&blocked_lock, "blocked lock", NULL, MTX_SPIN); blocked_lock.mtx_lock = 0xdeadc0de; /* Always blocked. */ mtx_init(&proc0.p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); - mtx_init(&proc0.p_slock, "process slock", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&proc0.p_slock, "process slock", NULL, MTX_SPIN); mtx_init(&proc0.p_statmtx, "pstatl", NULL, MTX_SPIN); mtx_init(&proc0.p_itimmtx, "pitiml", NULL, MTX_SPIN); mtx_init(&proc0.p_profmtx, "pprofl", NULL, MTX_SPIN); Modified: projects/clang350-import/sys/kern/kern_proc.c ============================================================================== --- projects/clang350-import/sys/kern/kern_proc.c Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/sys/kern/kern_proc.c Tue Dec 2 01:45:04 2014 (r275387) @@ -227,7 +227,7 @@ proc_init(void *mem, int size, int flags p->p_sched = (struct p_sched *)&p[1]; bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); - mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN); mtx_init(&p->p_statmtx, "pstatl", NULL, MTX_SPIN); mtx_init(&p->p_itimmtx, "pitiml", NULL, MTX_SPIN); mtx_init(&p->p_profmtx, "pprofl", NULL, MTX_SPIN); Copied: projects/clang350-import/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS (from r275386, head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang350-import/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS Tue Dec 2 01:45:04 2014 (r275387, copy of r275386, head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS) @@ -0,0 +1,9 @@ +.\" $FreeBSD$ +Set to use +.Xr addr2line 1 , +.Xr nm 1 , +.Xr size 1 , +.Xr strings 1 , +and +.Xr strip 1 +from the elftoolchain project instead of GNU binutils. Modified: projects/clang350-import/tools/tools/nanobsd/fill_pkg.sh ============================================================================== --- projects/clang350-import/tools/tools/nanobsd/fill_pkg.sh Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/tools/tools/nanobsd/fill_pkg.sh Tue Dec 2 01:45:04 2014 (r275387) @@ -57,8 +57,8 @@ ports_recurse() ( else ( cd $d - rd=`make -V RUN_DEPENDS` - ld=`make -V LIB_DEPENDS` + rd=`make -V RUN_DEPENDS ${PORTS_OPTS}` + ld=`make -V LIB_DEPENDS ${PORTS_OPTS}` for x in $rd $ld do @@ -84,8 +84,8 @@ done for i in `cat $PL` do p=`(cd $i && make -V PKGNAME)` - if [ -f $NANO_PKG_DUMP/$p.tbz ] ; then - ln -s $NANO_PKG_DUMP/$p.tbz $NANO_PACKAGE_DIR + if [ -f $NANO_PKG_DUMP/$p.t[bx]z ] ; then + ln -s $NANO_PKG_DUMP/$p.t[bx]z $NANO_PACKAGE_DIR else echo "Package $p misssing in $NANO_PKG_DUMP" 1>&2 exit 1 Modified: projects/clang350-import/usr.bin/Makefile ============================================================================== --- projects/clang350-import/usr.bin/Makefile Tue Dec 2 01:30:53 2014 (r275386) +++ projects/clang350-import/usr.bin/Makefile Tue Dec 2 01:45:04 2014 (r275387) @@ -9,7 +9,8 @@ # Moved to secure: bdes # -SUBDIR= alias \ +SUBDIR= ${_addr2line} \ + alias \ apply \ asa \ awk \ @@ -41,6 +42,7 @@ SUBDIR= alias \ du \ ee \ elf2aout \ + ${_elfcopy} \ elfdump \ enigma \ env \ @@ -119,6 +121,7 @@ SUBDIR= alias \ nfsstat \ nice \ nl \ + ${_nm} \ nohup \ opieinfo \ opiekey \ @@ -150,12 +153,14 @@ SUBDIR= alias \ seq \ shar \ showmount \ + ${_size} \ sockstat \ soeliminate \ sort \ split \ stat \ stdbuf \ + ${_strings} \ su \ systat \ tabs \ @@ -236,6 +241,14 @@ SUBDIR+= calendar _clang= clang .endif +.if ${MK_ELFTOOLCHAIN_TOOLS} != "no" +_addr2line= addr2line +_elfcopy= elfcopy +_nm= nm +_size= size +_strings= strings +.endif + .if ${MK_FMAKE} != "no" SUBDIR+= make .endif From owner-svn-src-projects@FreeBSD.ORG Tue Dec 2 09:45:08 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6778669A; Tue, 2 Dec 2014 09:45:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 54845E8B; Tue, 2 Dec 2014 09:45:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB29j8US019300; Tue, 2 Dec 2014 09:45:08 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB29j8Hg019299; Tue, 2 Dec 2014 09:45:08 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412020945.sB29j8Hg019299@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 2 Dec 2014 09:45:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275400 - projects/building-blocks/include 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.18-1 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, 02 Dec 2014 09:45:08 -0000 Author: ngie Date: Tue Dec 2 09:45:07 2014 New Revision: 275400 URL: https://svnweb.freebsd.org/changeset/base/275400 Log: bsm needs to be further factored out of sys/sys/ucred.h, sys/sys/sysproto.h, etc Modified: projects/building-blocks/include/Makefile Modified: projects/building-blocks/include/Makefile ============================================================================== --- projects/building-blocks/include/Makefile Tue Dec 2 07:42:25 2014 (r275399) +++ projects/building-blocks/include/Makefile Tue Dec 2 09:45:07 2014 (r275400) @@ -62,9 +62,11 @@ LDIRS+= netnatm LSUBDIRS+= netgraph/atm .endif -.if ${MK_AUDIT} != "no" +# XXX: bsm headers are explicitly required for sys/sysent.h, sys/sysproto.h, +# and sys/ucred.h +#.if ${MK_AUDIT} != "no" LDIRS+= bsm -.endif +#.endif .if ${MK_BLUETOOTH} != "no" LSUBSUBDIRS+= netgraph/bluetooth/include From owner-svn-src-projects@FreeBSD.ORG Tue Dec 2 17:08:27 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 137BCB96; Tue, 2 Dec 2014 17:08:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 F24753E9; Tue, 2 Dec 2014 17:08:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2H8QU9028644; Tue, 2 Dec 2014 17:08:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2H8OET028634; Tue, 2 Dec 2014 17:08:24 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412021708.sB2H8OET028634@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 2 Dec 2014 17:08:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275413 - in projects/building-blocks: etc etc/rc.d lib lib/libpam/modules share/mk tools/build/mk tools/build/options usr.sbin 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.18-1 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, 02 Dec 2014 17:08:27 -0000 Author: ngie Date: Tue Dec 2 17:08:24 2014 New Revision: 275413 URL: https://svnweb.freebsd.org/changeset/base/275413 Log: Add knob, MK_MAC_SUPPORT for building items with mac(9) support, like libugidfw, ugidfw, etc Added: projects/building-blocks/tools/build/options/WITHOUT_MAC_SUPPORT (contents, props changed) Modified: projects/building-blocks/etc/Makefile projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/lib/Makefile projects/building-blocks/lib/libpam/modules/modules.inc projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/etc/Makefile ============================================================================== --- projects/building-blocks/etc/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/etc/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -38,7 +38,6 @@ BIN1= crontab \ profile \ protocols \ rc \ - rc.bsdextended \ rc.initdiskless \ rc.shutdown \ rc.subr \ @@ -114,6 +113,10 @@ BIN1+= libmap32.conf BIN1+= hosts.lpd printcap .endif +.if ${MK_MAC_SUPPORT} != "no" +BIN1+= rc.bsdextended +.endif + .if ${MK_MAIL} != "no" BIN1+= ${.CURDIR}/../usr.bin/mail/misc/mail.rc .endif Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -93,7 +93,6 @@ FILES= DAEMON \ syslogd \ tmp \ ${_ubthidhci} \ - ugidfw \ ${_unbound} \ ${_utx} \ var \ @@ -223,6 +222,10 @@ FILES+= syscons FILES+= lpd .endif +.if ${MK_MAC_SUPPORT} != "no" +FILES+= ugidfw +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif Modified: projects/building-blocks/lib/Makefile ============================================================================== --- projects/building-blocks/lib/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/lib/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -101,7 +101,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libthread_db \ libucl \ libufs \ - libugidfw \ + ${_libugidfw} \ libulog \ ${_libunbound} \ ${_libusbhid} \ @@ -236,6 +236,10 @@ _libcplusplus= libc++ _libthr= libthr .endif +.if ${MK_MAC_SUPPORT} != "no" +_libugidfw= libugidfw +.endif + .if ${MK_NAND} != "no" _libnandfs= libnandfs .endif Modified: projects/building-blocks/lib/libpam/modules/modules.inc ============================================================================== --- projects/building-blocks/lib/libpam/modules/modules.inc Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/lib/libpam/modules/modules.inc Tue Dec 2 17:08:24 2014 (r275413) @@ -23,7 +23,7 @@ MODULES += pam_opie MODULES += pam_opieaccess MODULES += pam_passwdqc MODULES += pam_permit -.if ${MK_RADIUS_SUPPORT} != "no +.if ${MK_RADIUS_SUPPORT} != "no" MODULES += pam_radius .endif MODULES += pam_rhosts Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 17:08:24 2014 (r275413) @@ -121,6 +121,7 @@ __DEFAULT_YES_OPTIONS = \ LPR \ LS_COLORS \ LZMA_SUPPORT \ + MAC_SUPPORT \ MAIL \ MAILWRAPPER \ MAKE \ Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 17:08:24 2014 (r275413) @@ -4055,6 +4055,36 @@ OLD_FILES+=usr/share/man/man8/lpd.8.gz OLD_FILES+=usr/share/man/man8/pac.8.gz .endif +.if ${MK_MAC_SUPPORT} == no +OLD_FILES+=etc/rc.d/ugidfw +OLD_FILES+=usr/include/ugidfw.h +OLD_FILES+=usr/lib/libugidfw.a +OLD_LIBS+=usr/lib/libugidfw.so.4 +OLD_FILES+=usr/lib/libugidfw_p.a +OLD_FILES+=usr/sbin/getfmac +OLD_FILES+=usr/sbin/getpmac +OLD_FILES+=usr/sbin/setfmac +OLD_FILES+=usr/sbin/setfsmac +OLD_FILES+=usr/sbin/setpmac +OLD_FILES+=usr/sbin/ugidfw +OLD_FILES+=usr/share/man/man3/bsde_add_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_delete_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_get_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_get_rule_count.3.gz +OLD_FILES+=usr/share/man/man3/bsde_get_rule_slots.3.gz +OLD_FILES+=usr/share/man/man3/bsde_parse_rule.3.gz +OLD_FILES+=usr/share/man/man3/bsde_parse_rule_string.3.gz +OLD_FILES+=usr/share/man/man3/bsde_rule_to_string.3.gz +OLD_FILES+=usr/share/man/man3/bsde_set_rule.3.gz +OLD_FILES+=usr/share/man/man3/libugidfw.3.gz +OLD_FILES+=usr/share/man/man8/getfmac.8.gz +OLD_FILES+=usr/share/man/man8/getpmac.8.gz +OLD_FILES+=usr/share/man/man8/setfmac.8.gz +OLD_FILES+=usr/share/man/man8/setfsmac.8.gz +OLD_FILES+=usr/share/man/man8/setpmac.8.gz +OLD_FILES+=usr/share/man/man8/ugidfw.8.gz +.endif + .if ${MK_MAIL} == no OLD_FILES+=etc/pam.d/imap OLD_FILES+=etc/pam.d/pop3 Added: projects/building-blocks/tools/build/options/WITHOUT_MAC_SUPPORT ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_MAC_SUPPORT Tue Dec 2 17:08:24 2014 (r275413) @@ -0,0 +1,6 @@ +.\" $FreeBSD$ +Set to build libraries, programs, and kernel modules without +.Xr mac 9 +support. Also, do not compile +.Xr libugidfw 8 +and associated applications. Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Tue Dec 2 16:22:08 2014 (r275412) +++ projects/building-blocks/usr.sbin/Makefile Tue Dec 2 17:08:24 2014 (r275413) @@ -26,8 +26,6 @@ SUBDIR= adduser \ extattrctl \ fifolog \ fwcontrol \ - getfmac \ - getpmac \ gstat \ i2c \ ifmcstat \ @@ -65,8 +63,6 @@ SUBDIR= adduser \ service \ services_mkdb \ setfib \ - setfmac \ - setpmac \ smbmsg \ snapinfo \ spray \ @@ -76,7 +72,6 @@ SUBDIR= adduser \ traceroute \ trpt \ tzsetup \ - ugidfw \ vipw \ wake \ watch \ @@ -216,6 +211,14 @@ SUBDIR+= nscd .if ${MK_LPR} != "no" SUBDIR+= lpr .endif + +.if ${MK_MAC_SUPPORT} != "no" +SUBDIR+= getfmac +SUBDIR+= getpmac +SUBDIR+= setfmac +SUBDIR+= setpmac +SUBDIR+= ugidfw +.endif .if ${MK_MAN_UTILS} != "no" SUBDIR+= manctl From owner-svn-src-projects@FreeBSD.ORG Tue Dec 2 17:10:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E5700CB3; Tue, 2 Dec 2014 17:10:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D19F15DF; Tue, 2 Dec 2014 17:10:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2HACPB028969; Tue, 2 Dec 2014 17:10:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2HACO0028967; Tue, 2 Dec 2014 17:10:12 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412021710.sB2HACO0028967@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 2 Dec 2014 17:10:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275414 - in projects/building-blocks: tools/build/mk usr.sbin 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.18-1 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, 02 Dec 2014 17:10:13 -0000 Author: ngie Date: Tue Dec 2 17:10:11 2014 New Revision: 275414 URL: https://svnweb.freebsd.org/changeset/base/275414 Log: Don't install usr.sbin/mountd if MK_NFS_SERVER == no Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 17:08:24 2014 (r275413) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 17:10:11 2014 (r275414) @@ -4130,6 +4130,7 @@ OLD_FILES+=usr/share/misc/windrv_stub.c .endif .if ${MK_NFS_SERVER} == no +OLD_FILES+=etc/rc.d/mountd OLD_FILES+=etc/rc.d/nfscbd OLD_FILES+=etc/rc.d/nfsd OLD_FILES+=etc/rc.d/nfsuserd @@ -4139,7 +4140,10 @@ OLD_FILES+=usr/sbin/nfsdumpstate OLD_FILES+=usr/sbin/nfsrevoke OLD_FILES+=usr/sbin/nfsuserd OLD_FILES+=usr/share/man/man4/nfsv4.4.gz +OLD_FILES+=usr/share/man/man5/exports.5.gz +OLD_FILES+=usr/share/man/man5/netgroup.5.gz OLD_FILES+=usr/share/man/man5/stablerestart.5.gz +OLD_FILES+=usr/share/man/man8/mountd.8.gz OLD_FILES+=usr/share/man/man8/nfscbd.8.gz OLD_FILES+=usr/share/man/man8/nfsd.8.gz OLD_FILES+=usr/share/man/man8/nfsdumpstate.8.gz Modified: projects/building-blocks/usr.sbin/Makefile ============================================================================== --- projects/building-blocks/usr.sbin/Makefile Tue Dec 2 17:08:24 2014 (r275413) +++ projects/building-blocks/usr.sbin/Makefile Tue Dec 2 17:10:11 2014 (r275414) @@ -38,7 +38,6 @@ SUBDIR= adduser \ mfiutil \ mixer \ mlxcontrol \ - mountd \ mptutil \ mtest \ ${_mtree} \ @@ -237,6 +236,7 @@ SUBDIR+= nghook .endif .if ${MK_NFS_SERVER} != "no" +SUBDIR+= mountd SUBDIR+= nfscbd SUBDIR+= nfsd SUBDIR+= nfsdumpstate From owner-svn-src-projects@FreeBSD.ORG Tue Dec 2 19:02:40 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31E18CC5; Tue, 2 Dec 2014 19:02:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1E28D302; Tue, 2 Dec 2014 19:02:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2J2dCW085450; Tue, 2 Dec 2014 19:02:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2J2dde085445; Tue, 2 Dec 2014 19:02:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412021902.sB2J2dde085445@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 2 Dec 2014 19:02:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275419 - in projects/building-blocks: etc/devd tools/build/mk 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.18-1 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, 02 Dec 2014 19:02:40 -0000 Author: ngie Date: Tue Dec 2 19:02:39 2014 New Revision: 275419 URL: https://svnweb.freebsd.org/changeset/base/275419 Log: Only install etc/devd/asus.conf if MK_ACPI == yes Modified: projects/building-blocks/etc/devd/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/devd/Makefile ============================================================================== --- projects/building-blocks/etc/devd/Makefile Tue Dec 2 18:37:04 2014 (r275418) +++ projects/building-blocks/etc/devd/Makefile Tue Dec 2 19:02:39 2014 (r275419) @@ -2,12 +2,16 @@ .include +FILES= + .if ${MACHINE} == "powerpc" FILES+= apple.conf .endif .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" +.if ${MK_ACPI} != "no" FILES+= asus.conf +.endif .if ${MK_HYPERV} != "no" FILES+= hyperv.conf .endif Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 18:37:04 2014 (r275418) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 19:02:39 2014 (r275419) @@ -15,6 +15,7 @@ OLD_FILES+=usr/share/man/man8/sa.8.gz .endif .if ${MK_ACPI} == no +OLD_FILES+=etc/devd/asus.conf OLD_FILES+=etc/rc.d/power_profile OLD_FILES+=usr/sbin/acpiconf OLD_FILES+=usr/sbin/acpidb From owner-svn-src-projects@FreeBSD.ORG Tue Dec 2 19:53:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 842E6C65; Tue, 2 Dec 2014 19:53:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 64BF7AE5; Tue, 2 Dec 2014 19:53:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2JrwpY009439; Tue, 2 Dec 2014 19:53:58 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2JruVK009430; Tue, 2 Dec 2014 19:53:56 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412021953.sB2JruVK009430@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 2 Dec 2014 19:53:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275421 - in projects/building-blocks: etc/rc.d sbin share/man/man4 share/mk sys/conf sys/modules/geom tools/build/mk 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.18-1 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, 02 Dec 2014 19:53:58 -0000 Author: ngie Date: Tue Dec 2 19:53:55 2014 New Revision: 275421 URL: https://svnweb.freebsd.org/changeset/base/275421 Log: Make ccd(4), et al conditional based on MK_CCD Modified: projects/building-blocks/etc/rc.d/Makefile projects/building-blocks/sbin/Makefile projects/building-blocks/share/man/man4/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/sys/conf/kern.opts.mk projects/building-blocks/sys/modules/geom/Makefile projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/etc/rc.d/Makefile ============================================================================== --- projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/etc/rc.d/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -20,7 +20,6 @@ FILES= DAEMON \ ${_bsnmpd} \ ${_bthidd} \ ${_casperd} \ - ccd \ cleanvar \ cleartmp \ cron \ @@ -167,6 +166,10 @@ _bsnmpd= bsnmpd _casperd= casperd .endif +.if ${MK_CCD} != "no" +FILES+= ccd +.endif + .if ${MK_FTP} != "no" FILES+= ftpd .endif @@ -226,10 +229,6 @@ FILES+= lpd FILES+= ugidfw .endif -.if ${MK_NS_CACHING} != "no" -_nscd= nscd -.endif - .if ${MK_KERBEROS} != "no" FILES+= ipropd_master FILES+= ipropd_slave @@ -260,6 +259,10 @@ FILES+= ypupdated FILES+= ypxfrd .endif +.if ${MK_NS_CACHING} != "no" +_nscd= nscd +.endif + .if ${MK_NTP} != "no" FILES+= ntpd FILES+= ntpdate Modified: projects/building-blocks/sbin/Makefile ============================================================================== --- projects/building-blocks/sbin/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/sbin/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -8,7 +8,6 @@ SUBDIR=adjkerntz \ badsect \ camcontrol \ - ccdconfig \ clri \ comcontrol \ conscontrol \ @@ -78,6 +77,10 @@ SUBDIR+= atm SUBDIR+= casperd .endif +.if ${MK_CCD} != "no" +SUBDIR+= ccdconfig +.endif + .if ${MK_CXX} != "no" SUBDIR+= devd .endif Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/share/man/man4/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -91,7 +91,7 @@ MAN= aac.4 \ cc_htcp.4 \ cc_newreno.4 \ cc_vegas.4 \ - ccd.4 \ + ${_ccd.4} \ cd.4 \ cdce.4 \ ch.4 \ @@ -743,6 +743,10 @@ SUBDIR= man4.${MACHINE_CPUARCH} _bhyve.4= bhyve.4 .endif +.if ${MK_CCD} != "no" +_ccd.4= ccd.4 +.endif + .if ${MK_ISCSI} != "no" MAN+= iscsi.4 MAN+= iscsi_initiator.4 Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/share/mk/src.opts.mk Tue Dec 2 19:53:55 2014 (r275421) @@ -67,6 +67,7 @@ __DEFAULT_YES_OPTIONS = \ CALENDAR \ CAPSICUM \ CASPER \ + CCD \ CDDL \ CPP \ CROSS_COMPILER \ Modified: projects/building-blocks/sys/conf/kern.opts.mk ============================================================================== --- projects/building-blocks/sys/conf/kern.opts.mk Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/sys/conf/kern.opts.mk Tue Dec 2 19:53:55 2014 (r275421) @@ -25,6 +25,7 @@ __DEFAULT_YES_OPTIONS = \ AUTOFS \ BLUETOOTH \ + CCD \ CDDL \ CRYPT \ FORMAT_EXTENSIONS \ Modified: projects/building-blocks/sys/modules/geom/Makefile ============================================================================== --- projects/building-blocks/sys/modules/geom/Makefile Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/sys/modules/geom/Makefile Tue Dec 2 19:53:55 2014 (r275421) @@ -1,8 +1,10 @@ # $FreeBSD$ +SYSDIR?=${.CURDIR}/../.. +.include "${SYSDIR}/conf/kern.opts.mk" + SUBDIR= geom_bde \ geom_cache \ - geom_ccd \ geom_concat \ geom_eli \ geom_gate \ @@ -25,4 +27,8 @@ SUBDIR= geom_bde \ geom_virstor \ geom_zero +.if ${MK_CCD} != "no" || defined(ALL_MODULES) +SUBDIR+= geom_ccd +.endif + .include Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 19:41:25 2014 (r275420) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 19:53:55 2014 (r275421) @@ -934,6 +934,13 @@ OLD_FILES+=sbin/casper OLD_FILES+=usr/lib/libcasper.a .endif +.if ${MK_CCD} == no +OLD_FILES+=etc/rc.d/ccd +OLD_FILES+=sbin/ccdconfig +OLD_FILES+=usr/share/man/man4/ccd.4.gz +OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz +.endif + .if ${MK_CDDL} == no OLD_LIBS+=lib/libavl.so.2 OLD_LIBS+=lib/libctf.so.2 From owner-svn-src-projects@FreeBSD.ORG Tue Dec 2 19:55:46 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB454D6E; Tue, 2 Dec 2014 19:55:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D8581AF9; Tue, 2 Dec 2014 19:55:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2Jtkoh009810; Tue, 2 Dec 2014 19:55:46 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2Jtk4C009809; Tue, 2 Dec 2014 19:55:46 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412021955.sB2Jtk4C009809@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 2 Dec 2014 19:55:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275423 - projects/building-blocks/tools/build/mk 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.18-1 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, 02 Dec 2014 19:55:47 -0000 Author: ngie Date: Tue Dec 2 19:55:46 2014 New Revision: 275423 URL: https://svnweb.freebsd.org/changeset/base/275423 Log: Don't try to remove /usr/include/bsm, et al Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 19:55:43 2014 (r275422) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Dec 2 19:55:46 2014 (r275423) @@ -152,8 +152,9 @@ OLD_FILES+=etc/security/audit_control OLD_FILES+=etc/security/audit_event OLD_FILES+=etc/security/audit_user OLD_FILES+=etc/security/audit_warn -OLD_FILES+=usr/include/bsm/audit_uevents.h -OLD_FILES+=usr/include/bsm/libbsm.h +# XXX: needs refactoring in sys/sys before it can be removed +#OLD_FILES+=usr/include/bsm/audit_uevents.h +#OLD_FILES+=usr/include/bsm/libbsm.h OLD_FILES+=usr/lib/libauditd.a OLD_LIBS+=usr/lib/libauditd.so.5 OLD_FILES+=usr/lib/libauditd_p.a @@ -274,7 +275,8 @@ OLD_FILES+=usr/share/man/man5/audit_warn OLD_FILES+=usr/share/man/man8/audit.8.gz OLD_FILES+=usr/share/man/man8/auditd.8.gz OLD_DIRS+=etc/security -OLD_DIRS+=usr/include/bsm +# XXX: needs refactoring in sys/sys before it can be removed +#OLD_DIRS+=usr/include/bsm .endif .if ${MK_AUTHPF} == no From owner-svn-src-projects@FreeBSD.ORG Thu Dec 4 17:38:36 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A9D5CED; Thu, 4 Dec 2014 17:38:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 626A4975; Thu, 4 Dec 2014 17:38:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB4HcaHC041394; Thu, 4 Dec 2014 17:38:36 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB4HcXKQ041380; Thu, 4 Dec 2014 17:38:33 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412041738.sB4HcXKQ041380@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 4 Dec 2014 17:38:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275479 - in projects/clang350-import: . contrib/binutils/gas/config contrib/elftoolchain/libelf contrib/gcc/cp contrib/mdocml gnu/usr.bin/binutils/addr2line gnu/usr.bin/binutils/nm gnu... 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.18-1 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, 04 Dec 2014 17:38:36 -0000 Author: dim Date: Thu Dec 4 17:38:32 2014 New Revision: 275479 URL: https://svnweb.freebsd.org/changeset/base/275479 Log: Merge ^/head r275387 through r275477. Added: projects/clang350-import/contrib/mdocml/compat_fts.c - copied unchanged from r275477, head/contrib/mdocml/compat_fts.c projects/clang350-import/contrib/mdocml/compat_fts.h - copied unchanged from r275477, head/contrib/mdocml/compat_fts.h projects/clang350-import/contrib/mdocml/configure.local.example - copied unchanged from r275477, head/contrib/mdocml/configure.local.example projects/clang350-import/contrib/mdocml/man.1 - copied unchanged from r275477, head/contrib/mdocml/man.1 projects/clang350-import/contrib/mdocml/test-dirent-namlen.c - copied unchanged from r275477, head/contrib/mdocml/test-dirent-namlen.c projects/clang350-import/contrib/mdocml/test-fts.c - copied unchanged from r275477, head/contrib/mdocml/test-fts.c projects/clang350-import/contrib/mdocml/test-sqlite3.c - copied unchanged from r275477, head/contrib/mdocml/test-sqlite3.c projects/clang350-import/contrib/mdocml/test-wchar.c - copied unchanged from r275477, head/contrib/mdocml/test-wchar.c projects/clang350-import/sys/amd64/conf/GENERIC-NODEBUG - copied unchanged from r275477, head/sys/amd64/conf/GENERIC-NODEBUG projects/clang350-import/sys/i386/conf/GENERIC-NODEBUG - copied unchanged from r275477, head/sys/i386/conf/GENERIC-NODEBUG projects/clang350-import/sys/pc98/conf/GENERIC-NODEBUG - copied unchanged from r275477, head/sys/pc98/conf/GENERIC-NODEBUG projects/clang350-import/sys/powerpc/conf/GENERIC-NODEBUG - copied unchanged from r275477, head/sys/powerpc/conf/GENERIC-NODEBUG projects/clang350-import/sys/sparc64/conf/GENERIC-NODEBUG - copied unchanged from r275477, head/sys/sparc64/conf/GENERIC-NODEBUG Deleted: projects/clang350-import/contrib/mdocml/apropos.c projects/clang350-import/contrib/mdocml/arch.c projects/clang350-import/contrib/mdocml/arch.in projects/clang350-import/contrib/mdocml/att.in projects/clang350-import/contrib/mdocml/config.h.post projects/clang350-import/contrib/mdocml/config.h.pre projects/clang350-import/contrib/mdocml/preconv.1 projects/clang350-import/contrib/mdocml/vol.c projects/clang350-import/contrib/mdocml/vol.in projects/clang350-import/usr.bin/preconv/ Modified: projects/clang350-import/ObsoleteFiles.inc projects/clang350-import/contrib/binutils/gas/config/tc-arm.c projects/clang350-import/contrib/elftoolchain/libelf/libelf_convert.m4 projects/clang350-import/contrib/gcc/cp/name-lookup.c projects/clang350-import/contrib/gcc/cp/name-lookup.h projects/clang350-import/contrib/mdocml/INSTALL projects/clang350-import/contrib/mdocml/LICENSE projects/clang350-import/contrib/mdocml/Makefile projects/clang350-import/contrib/mdocml/Makefile.depend projects/clang350-import/contrib/mdocml/NEWS projects/clang350-import/contrib/mdocml/TODO projects/clang350-import/contrib/mdocml/apropos.1 projects/clang350-import/contrib/mdocml/att.c projects/clang350-import/contrib/mdocml/cgi.c projects/clang350-import/contrib/mdocml/chars.c projects/clang350-import/contrib/mdocml/chars.in projects/clang350-import/contrib/mdocml/compat_fgetln.c projects/clang350-import/contrib/mdocml/compat_getsubopt.c projects/clang350-import/contrib/mdocml/compat_ohash.c projects/clang350-import/contrib/mdocml/compat_reallocarray.c projects/clang350-import/contrib/mdocml/compat_sqlite3_errstr.c projects/clang350-import/contrib/mdocml/compat_strcasestr.c projects/clang350-import/contrib/mdocml/compat_strlcat.c projects/clang350-import/contrib/mdocml/compat_strlcpy.c projects/clang350-import/contrib/mdocml/compat_strsep.c projects/clang350-import/contrib/mdocml/config.h projects/clang350-import/contrib/mdocml/configure projects/clang350-import/contrib/mdocml/demandoc.1 projects/clang350-import/contrib/mdocml/demandoc.c projects/clang350-import/contrib/mdocml/eqn.7 projects/clang350-import/contrib/mdocml/eqn.c projects/clang350-import/contrib/mdocml/eqn_html.c projects/clang350-import/contrib/mdocml/eqn_term.c projects/clang350-import/contrib/mdocml/example.style.css projects/clang350-import/contrib/mdocml/html.c projects/clang350-import/contrib/mdocml/html.h projects/clang350-import/contrib/mdocml/lib.c projects/clang350-import/contrib/mdocml/lib.in projects/clang350-import/contrib/mdocml/libman.h projects/clang350-import/contrib/mdocml/libmandoc.h projects/clang350-import/contrib/mdocml/libmdoc.h projects/clang350-import/contrib/mdocml/libroff.h projects/clang350-import/contrib/mdocml/main.c projects/clang350-import/contrib/mdocml/main.h projects/clang350-import/contrib/mdocml/makewhatis.8 projects/clang350-import/contrib/mdocml/man.c projects/clang350-import/contrib/mdocml/man.cgi.8 projects/clang350-import/contrib/mdocml/man.h projects/clang350-import/contrib/mdocml/man_hash.c projects/clang350-import/contrib/mdocml/man_html.c projects/clang350-import/contrib/mdocml/man_macro.c projects/clang350-import/contrib/mdocml/man_term.c projects/clang350-import/contrib/mdocml/man_validate.c projects/clang350-import/contrib/mdocml/mandoc.1 projects/clang350-import/contrib/mdocml/mandoc.3 projects/clang350-import/contrib/mdocml/mandoc.c projects/clang350-import/contrib/mdocml/mandoc.db.5 projects/clang350-import/contrib/mdocml/mandoc.h projects/clang350-import/contrib/mdocml/mandoc_aux.c projects/clang350-import/contrib/mdocml/mandoc_escape.3 projects/clang350-import/contrib/mdocml/mandocdb.c projects/clang350-import/contrib/mdocml/manpage.c projects/clang350-import/contrib/mdocml/manpath.c projects/clang350-import/contrib/mdocml/mansearch.c projects/clang350-import/contrib/mdocml/mansearch.h projects/clang350-import/contrib/mdocml/mansearch_const.c projects/clang350-import/contrib/mdocml/mchars_alloc.3 projects/clang350-import/contrib/mdocml/mdoc.7 projects/clang350-import/contrib/mdocml/mdoc.c projects/clang350-import/contrib/mdocml/mdoc_argv.c projects/clang350-import/contrib/mdocml/mdoc_hash.c projects/clang350-import/contrib/mdocml/mdoc_html.c projects/clang350-import/contrib/mdocml/mdoc_macro.c projects/clang350-import/contrib/mdocml/mdoc_man.c projects/clang350-import/contrib/mdocml/mdoc_term.c projects/clang350-import/contrib/mdocml/mdoc_validate.c projects/clang350-import/contrib/mdocml/msec.c projects/clang350-import/contrib/mdocml/out.c projects/clang350-import/contrib/mdocml/out.h projects/clang350-import/contrib/mdocml/preconv.c projects/clang350-import/contrib/mdocml/read.c projects/clang350-import/contrib/mdocml/roff.7 projects/clang350-import/contrib/mdocml/roff.c projects/clang350-import/contrib/mdocml/st.c projects/clang350-import/contrib/mdocml/st.in projects/clang350-import/contrib/mdocml/style.css projects/clang350-import/contrib/mdocml/tbl.7 projects/clang350-import/contrib/mdocml/tbl.c projects/clang350-import/contrib/mdocml/tbl_data.c projects/clang350-import/contrib/mdocml/tbl_html.c projects/clang350-import/contrib/mdocml/tbl_layout.c projects/clang350-import/contrib/mdocml/tbl_opts.c projects/clang350-import/contrib/mdocml/tbl_term.c projects/clang350-import/contrib/mdocml/term.c projects/clang350-import/contrib/mdocml/term.h projects/clang350-import/contrib/mdocml/term_ascii.c projects/clang350-import/contrib/mdocml/term_ps.c projects/clang350-import/contrib/mdocml/test-getsubopt.c projects/clang350-import/contrib/mdocml/tree.c projects/clang350-import/gnu/usr.bin/binutils/addr2line/addr2line.1 projects/clang350-import/gnu/usr.bin/binutils/nm/nm.1 projects/clang350-import/gnu/usr.bin/binutils/objcopy/objcopy.1 projects/clang350-import/gnu/usr.bin/binutils/objdump/objdump.1 projects/clang350-import/gnu/usr.bin/binutils/readelf/readelf.1 projects/clang350-import/gnu/usr.bin/binutils/size/size.1 projects/clang350-import/gnu/usr.bin/binutils/strings/strings.1 projects/clang350-import/gnu/usr.bin/binutils/strip/strip.1 projects/clang350-import/lib/libgpio/gpio.c projects/clang350-import/lib/libmandoc/Makefile projects/clang350-import/lib/msun/src/e_j0f.c projects/clang350-import/libexec/rtld-elf/rtld.c projects/clang350-import/rescue/rescue/Makefile projects/clang350-import/share/man/man5/src.conf.5 projects/clang350-import/share/mk/src.libnames.mk projects/clang350-import/sys/arm/arm/bcopyinout_xscale.S projects/clang350-import/sys/arm/arm/blockio.S projects/clang350-import/sys/arm/arm/cpufunc_asm_armv5_ec.S projects/clang350-import/sys/arm/arm/cpufunc_asm_sheeva.S projects/clang350-import/sys/arm/arm/in_cksum_arm.S projects/clang350-import/sys/arm/arm/locore.S projects/clang350-import/sys/arm/arm/support.S projects/clang350-import/sys/boot/mips/beri/loader/loader.ldscript projects/clang350-import/sys/boot/pc98/boot2/boot2.c projects/clang350-import/sys/cam/ctl/ctl.c projects/clang350-import/sys/cam/ctl/ctl.h projects/clang350-import/sys/cam/ctl/ctl_backend_block.c projects/clang350-import/sys/cam/ctl/ctl_backend_ramdisk.c projects/clang350-import/sys/cam/ctl/ctl_cmd_table.c projects/clang350-import/sys/cam/ctl/ctl_error.c projects/clang350-import/sys/cam/ctl/ctl_error.h projects/clang350-import/sys/cam/ctl/ctl_ioctl.h projects/clang350-import/sys/cam/ctl/ctl_private.h projects/clang350-import/sys/cam/ctl/ctl_tpc.c projects/clang350-import/sys/cam/scsi/scsi_all.h projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/clang350-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/clang350-import/sys/dev/e1000/if_igb.c projects/clang350-import/sys/dev/ixgbe/ixgbe.c projects/clang350-import/sys/dev/pccard/pccardvar.h projects/clang350-import/sys/dev/usb/controller/saf1761_otg.c projects/clang350-import/sys/dev/usb/controller/saf1761_otg.h projects/clang350-import/sys/geom/raid/md_intel.c projects/clang350-import/sys/kern/kern_linker.c projects/clang350-import/sys/kern/subr_bus.c projects/clang350-import/sys/mips/conf/WZR-HPAG300H.hints projects/clang350-import/sys/net/if_stf.c projects/clang350-import/sys/netinet/ip_icmp.c projects/clang350-import/sys/netinet/ip_ipsec.c projects/clang350-import/sys/netinet/sctp_indata.c projects/clang350-import/sys/netinet/sctp_input.c projects/clang350-import/sys/netinet/sctp_os_bsd.h projects/clang350-import/sys/netinet/sctp_output.c projects/clang350-import/sys/netinet/sctp_pcb.c projects/clang350-import/sys/netinet/sctp_pcb.h projects/clang350-import/sys/netinet/sctp_structs.h projects/clang350-import/sys/netinet/sctp_usrreq.c projects/clang350-import/sys/netinet/sctp_var.h projects/clang350-import/sys/netinet/sctputil.c projects/clang350-import/sys/netinet/sctputil.h projects/clang350-import/sys/netinet6/icmp6.c projects/clang350-import/sys/netinet6/ip6_ipsec.c projects/clang350-import/sys/netipsec/ipsec.c projects/clang350-import/sys/netipsec/ipsec.h projects/clang350-import/sys/netipsec/ipsec6.h projects/clang350-import/sys/netipsec/ipsec_input.c projects/clang350-import/sys/netipsec/ipsec_mbuf.c projects/clang350-import/sys/netipsec/ipsec_output.c projects/clang350-import/sys/netipsec/key.c projects/clang350-import/sys/netipsec/key.h projects/clang350-import/sys/netipsec/key_debug.c projects/clang350-import/sys/netipsec/key_debug.h projects/clang350-import/sys/netipsec/keydb.h projects/clang350-import/sys/netipsec/keysock.c projects/clang350-import/sys/netipsec/keysock.h projects/clang350-import/sys/netipsec/xform_ah.c projects/clang350-import/sys/netipsec/xform_esp.c projects/clang350-import/sys/netipsec/xform_ipcomp.c projects/clang350-import/sys/netipsec/xform_ipip.c projects/clang350-import/sys/netipsec/xform_tcp.c projects/clang350-import/sys/sys/bus.h projects/clang350-import/tools/build/mk/OptionalObsoleteFiles.inc projects/clang350-import/tools/tools/usbtest/Makefile projects/clang350-import/usr.bin/Makefile projects/clang350-import/usr.bin/man/man.sh projects/clang350-import/usr.bin/mandoc/Makefile projects/clang350-import/usr.sbin/ctld/ctld.c projects/clang350-import/usr.sbin/gpioctl/Makefile projects/clang350-import/usr.sbin/gpioctl/gpioctl.c Directory Properties: projects/clang350-import/ (props changed) projects/clang350-import/contrib/binutils/ (props changed) projects/clang350-import/contrib/gcc/ (props changed) projects/clang350-import/contrib/mdocml/ (props changed) projects/clang350-import/gnu/usr.bin/binutils/ (props changed) projects/clang350-import/share/ (props changed) projects/clang350-import/sys/ (props changed) projects/clang350-import/sys/boot/ (props changed) projects/clang350-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang350-import/ObsoleteFiles.inc ============================================================================== --- projects/clang350-import/ObsoleteFiles.inc Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/ObsoleteFiles.inc Thu Dec 4 17:38:32 2014 (r275479) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# 20141201: new clang import which bumps version from 3.4.1 to 3.5.0. +# 20141204: new clang import which bumps version from 3.4.1 to 3.5.0. OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h OLD_FILES+=usr/include/clang/3.4.1/altivec.h @@ -74,6 +74,9 @@ OLD_FILES+=usr/include/clang/3.4.1/x86in OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h OLD_DIRS+=usr/include/clang/3.4.1 +# 20141202: update to mandoc CVS 20141201 +OLD_FILES+=usr.bin/preconv +OLD_FILES+=share/man/man1/preconv.1.gz # 20141129: mrouted rc.d scripts removed from base OLD_FILES+=etc/rc.d/mrouted # 20141126: convert sbin/mdconfig/tests to ATF format tests Modified: projects/clang350-import/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/clang350-import/contrib/binutils/gas/config/tc-arm.c Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/binutils/gas/config/tc-arm.c Thu Dec 4 17:38:32 2014 (r275479) @@ -15055,7 +15055,7 @@ static const struct asm_opcode insns[] = TCE(stc, c000000, ec000000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TC3(stcl, c400000, ec400000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TCE(mcr, e000010, ee000010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), - TCE(mrc, e100010, ee100010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), + TCE(mrc, e100010, ee100010, 6, (RCP, I7b, APSR_RR, RCN, RCN, oI7b), co_reg, co_reg), #undef ARM_VARIANT #define ARM_VARIANT &arm_ext_v2s /* ARM 3 - swp instructions. */ @@ -15114,7 +15114,7 @@ static const struct asm_opcode insns[] = TUF(stc2l, c400000, fc400000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TUF(cdp2, e000000, fe000000, 6, (RCP, I15b, RCN, RCN, RCN, oI7b), cdp, cdp), TUF(mcr2, e000010, fe000010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), - TUF(mrc2, e100010, fe100010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), + TUF(mrc2, e100010, fe100010, 6, (RCP, I7b, APSR_RR, RCN, RCN, oI7b), co_reg, co_reg), #undef ARM_VARIANT #define ARM_VARIANT &arm_ext_v5exp /* ARM Architecture 5TExP. */ Modified: projects/clang350-import/contrib/elftoolchain/libelf/libelf_convert.m4 ============================================================================== --- projects/clang350-import/contrib/elftoolchain/libelf/libelf_convert.m4 Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/elftoolchain/libelf/libelf_convert.m4 Thu Dec 4 17:38:32 2014 (r275479) @@ -947,11 +947,6 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d READ_WORD(src, descsz); READ_WORD(src, type); - sz = namesz; - ROUNDUP2(sz, 4); - sz += descsz; - ROUNDUP2(sz, 4); - /* Translate. */ SWAP_WORD(namesz); SWAP_WORD(descsz); @@ -967,6 +962,11 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d dst += sizeof(Elf_Note); count -= hdrsz; + ROUNDUP2(namesz, 4); + ROUNDUP2(descsz, 4); + + sz = namesz + descsz; + if (count < sz || dsz < sz) /* Buffers are too small. */ return (0); @@ -1005,6 +1005,11 @@ _libelf_cvt_NOTE_tof(char *dst, size_t d descsz = en->n_descsz; type = en->n_type; + sz = namesz; + ROUNDUP2(sz, 4); + sz += descsz; + ROUNDUP2(sz, 4); + SWAP_WORD(namesz); SWAP_WORD(descsz); SWAP_WORD(type); @@ -1015,11 +1020,6 @@ _libelf_cvt_NOTE_tof(char *dst, size_t d src += sizeof(Elf_Note); - ROUNDUP2(namesz, 4); - ROUNDUP2(descsz, 4); - - sz = namesz + descsz; - if (count < sz) sz = count; Modified: projects/clang350-import/contrib/gcc/cp/name-lookup.c ============================================================================== --- projects/clang350-import/contrib/gcc/cp/name-lookup.c Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/gcc/cp/name-lookup.c Thu Dec 4 17:38:32 2014 (r275479) @@ -319,35 +319,11 @@ new_class_binding (tree name, tree value cp_class_binding *cb; cxx_binding *binding; - if (VEC_length (cp_class_binding, scope->class_shadowed)) - { - cp_class_binding *old_base; - old_base = VEC_index (cp_class_binding, scope->class_shadowed, 0); - if (VEC_reserve (cp_class_binding, gc, scope->class_shadowed, 1)) - { - /* Fixup the current bindings, as they might have moved. */ - size_t i; - - for (i = 0; - VEC_iterate (cp_class_binding, scope->class_shadowed, i, cb); - i++) - { - cxx_binding **b; - b = &IDENTIFIER_BINDING (cb->identifier); - while (*b != &old_base[i].base) - b = &((*b)->previous); - *b = &cb->base; - } - } - cb = VEC_quick_push (cp_class_binding, scope->class_shadowed, NULL); - } - else cb = VEC_safe_push (cp_class_binding, gc, scope->class_shadowed, NULL); cb->identifier = name; - binding = &cb->base; + cb->base = binding = cxx_binding_make (value, type); binding->scope = scope; - cxx_binding_init (binding, value, type); return binding; } @@ -2501,7 +2477,10 @@ poplevel_class (void) for (i = 0; VEC_iterate (cp_class_binding, level->class_shadowed, i, cb); ++i) - IDENTIFIER_BINDING (cb->identifier) = cb->base.previous; + { + IDENTIFIER_BINDING (cb->identifier) = cb->base->previous; + cxx_binding_free (cb->base); + } ggc_free (level->class_shadowed); level->class_shadowed = NULL; } Modified: projects/clang350-import/contrib/gcc/cp/name-lookup.h ============================================================================== --- projects/clang350-import/contrib/gcc/cp/name-lookup.h Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/gcc/cp/name-lookup.h Thu Dec 4 17:38:32 2014 (r275479) @@ -144,7 +144,7 @@ typedef enum tag_scope { typedef struct cp_class_binding GTY(()) { - cxx_binding base; + cxx_binding *base; /* The bound name. */ tree identifier; } cp_class_binding; Modified: projects/clang350-import/contrib/mdocml/INSTALL ============================================================================== --- projects/clang350-import/contrib/mdocml/INSTALL Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/mdocml/INSTALL Thu Dec 4 17:38:32 2014 (r275479) @@ -1,4 +1,4 @@ -$Id: INSTALL,v 1.2 2014/08/10 17:22:26 schwarze Exp $ +$Id: INSTALL,v 1.5 2014/08/18 13:27:47 kristaps Exp $ About mdocml, the portable mandoc distribution ---------------------------------------------- @@ -34,19 +34,52 @@ latest bundled and ported versions of ma systems is maintained at . If mandoc is installed, you can check the version by running "mandoc -V". -The version contained in this distribution tarball is listed near -the beginning of the file "Makefile". +You can find the version contained in this distribution tarball +by running "./configure". Regarding how packages and ports are maintained for your operating system, please consult your operating system documentation. To install mandoc manually, the following steps are needed: -1. Decide whether you want to build the base tools mandoc(1), -preconv(1) and demandoc(1) only or whether you also want to build the -database tools apropos(1) and makewhatis(8). For the latter, -the following dependencies are required: +1. If you want to build the CGI program, man.cgi(8), too, run the +command "echo BUILD_CGI=1 > configure.local". Then run "cp +cgi.h.examples cgi.h" and edit cgi.h as desired. + +2. Run "./configure". +This script attempts autoconfiguration of mandoc for your system. +Read both its standard output and the file "Makefile.local" it +generates. If anything looks wrong or different from what you +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. + +3. Run "make". +Any POSIX-compatible make, in particular both BSD make and GNU make, +should work. If the build fails, look at "configure.local.example" +and go back to step 2. + +4. Run "make -n install" and check whether everything will be +installed to the intended places. Otherwise, put some *DIR variables +into "configure.local" and go back to step 2. -1.1. The SQLite database system, see . +5. Run "sudo make install". If you intend to build a binary +package using some kind of fake root mechanism, you may need a +command like "make DESTDIR=... install". Read the *-install targets +in the "Makefile" to understand how DESTDIR is used. + +6. To set up a man.cgi(8) server, read its manual page. + +7. To use mandoc(1) as your man(1) formatter, read the "Deployment" +section below. + + +Understanding mandoc dependencies +--------------------------------- +The mandoc(1), preconv(1), and demandoc(1) utilities have no external +dependencies. However, makewhatis(8) and apropos(1) depend on the +following software: + +1. The SQLite database system, see . The recommended version of SQLite is 3.8.4.3 or newer. The mandoc toolset is known to work with version 3.7.5 or newer. Versions older than 3.8.3 may not achieve full performance due to the @@ -57,47 +90,16 @@ problems, apropos(1) is fully usable wit older than 3.7.5 may or may not work, they have not been tested. 1.2. The fts(3) directory traversion functions. -A compatibility version will be bundled for 1.13.2 but is not available -yet. If you want apropos(1) and makewhatis(8) but do not have fts(3), -please stay with mandoc 1.12.3 for now and upgrade first to 1.12.4, -then to 1.13.2 when these versionns are released. Be careful: the +If your system does not have them, the bundled compatibility version +will be used, so you need not worry in that case. But be careful: the glibc version of fts(3) is known to be broken on 32bit platforms, see . +If you run into that problem, set "HAVE_FTS=0" in configure.local. 1.3. Marc Espie's ohash(3) library. If your system does not have it, the bundled compatibility version will be used, so you probably need not worry about it. -2. If you choose to build the database tools, too, decide whether -you also want to build the CGI program, man.cgi(8). - -3. Read the beginning of the file "Makefile" from "USER SETTINGS" -to "END OF USER SETTINGS" and edit it as required. In particular, -disable "BUILD_TARGETS += db-build" if you do not want database -support or enable "BUILD_TARGETS += cgi-build" if you do want -the CGI program. - -4. Run "make". No separate "./configure" or "make depend" steps -are needed. The former is run automatically by "make". The latter -is a maintainer target. If you merely want to build the released -version as opposed to doing active development, there is no need -to regenerate the dependency specifications. Any POSIX-compatible -make, in particular both BSD make and GNU make, should work. - -5. Run "make -n install" and check whether everything will be -installed to the intended places. Otherwise, edit the *DIR variables -in the Makefile until it is. - -6. Run "sudo make install". If you intend to build a binary -package using some kind of fake root mechanism, you may need a -command like "make DESTDIR=... install". Read the *-install targets -in the "Makefile" to understand how DESTDIR is used. - -7. To set up a man.cgi(8) server, read its manual page. - -8. To use mandoc(1) as your man(1) formatter, read the "Deployment" -section below. - Checking autoconfiguration quality ---------------------------------- @@ -130,9 +132,9 @@ please report whatever is missing on you The following steps can be used to manually check the automatic configuration on your platform: -1. Run "make clean". +1. Run "make distclean". -2. Run "make config.h" +2. Run "./configure" 3. Read the file "config.log". It shows the compiler commands used to test the libraries installed on your system and the standard @@ -140,8 +142,7 @@ output and standard error output these c for unexpected failures. Those are most likely to happen if headers or libraries are installed in unusual places or interfaces defined in unusual headers. You can also look at the file "config.h" and -check that no expected "#define HAVE_*" lines are missing. The -list of tests run can be found in the file "configure". +check that no "#define HAVE_*" differ from your expectations. Deployment Modified: projects/clang350-import/contrib/mdocml/LICENSE ============================================================================== --- projects/clang350-import/contrib/mdocml/LICENSE Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/mdocml/LICENSE Thu Dec 4 17:38:32 2014 (r275479) @@ -1,4 +1,4 @@ -$Id: LICENSE,v 1.2 2014/04/23 21:06:41 schwarze Exp $ +$Id: LICENSE,v 1.4 2014/08/21 00:42:38 schwarze Exp $ With the exceptions noted below, all code and documentation contained in the mdocml toolkit is protected by the Copyright @@ -37,8 +37,10 @@ The following files included from outsid other people's Copyright and are distributed under a 3-clause BSD license; see these individual files for details. -compat_getsubopt.c, compat_strcasestr.c, compat_strsep.c: -Copyright (c) 1990, 1993 The Regents of the University of California +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. Modified: projects/clang350-import/contrib/mdocml/Makefile ============================================================================== --- projects/clang350-import/contrib/mdocml/Makefile Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/mdocml/Makefile Thu Dec 4 17:38:32 2014 (r275479) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.435 2014/08/10 02:45:04 schwarze Exp $ +# $Id: Makefile,v 1.448 2014/11/28 18:57:31 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014 Ingo Schwarze @@ -15,126 +15,31 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -VERSION = 1.13.1 - -# === USER SETTINGS ==================================================== - -# --- user settings relevant for all builds ---------------------------- - -# Specify this if you want to hard-code the operating system to appear -# in the lower-left hand corner of -mdoc manuals. -# -# CFLAGS += -DOSNAME="\"OpenBSD 5.5\"" - -# IFF your system supports multi-byte functions (setlocale(), wcwidth(), -# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a -# UCS-4 value) should you define USE_WCHAR. If you define it and your -# system DOESN'T support this, -Tlocale will produce garbage. -# If you don't define it, -Tlocale is a synonym for -Tacsii. -# -CFLAGS += -DUSE_WCHAR - -CFLAGS += -g -DHAVE_CONFIG_H -CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings -PREFIX = /usr/local -BINDIR = $(PREFIX)/bin -INCLUDEDIR = $(PREFIX)/include/mandoc -LIBDIR = $(PREFIX)/lib/mandoc -MANDIR = $(PREFIX)/man -EXAMPLEDIR = $(PREFIX)/share/examples/mandoc - -INSTALL = install -INSTALL_PROGRAM = $(INSTALL) -m 0555 -INSTALL_DATA = $(INSTALL) -m 0444 -INSTALL_LIB = $(INSTALL) -m 0444 -INSTALL_SOURCE = $(INSTALL) -m 0644 -INSTALL_MAN = $(INSTALL_DATA) - -# --- user settings related to database support ------------------------ - -# Building apropos(1) and makewhatis(8) requires both SQLite3 and fts(3). -# To avoid those dependencies, comment the following line. -# Be careful: the fts(3) implementation in glibc is broken on 32bit -# machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838 -# -BUILD_TARGETS += db-build - -# The remaining settings in this section -# are only relevant if db-build is enabled. -# Otherwise, they have no effect either way. - -# If your system has manpath(1), uncomment this. This is most any -# system that's not OpenBSD or NetBSD. If uncommented, apropos(1) -# and makewhatis(8) will use manpath(1) to get the MANPATH variable. -# -#CFLAGS += -DUSE_MANPATH - -# On some systems, SQLite3 may be installed below /usr/local. -# In that case, uncomment the following two lines. -# -#CFLAGS += -I/usr/local/include -#DBLIB += -L/usr/local/lib - -# OpenBSD has the ohash functions in libutil. -# Comment the following line if your system doesn't. -# -DBLIB += -lutil - -SBINDIR = $(PREFIX)/sbin - -# --- user settings related to man.cgi --------------------------------- - -# To build man.cgi, copy cgi.h.example to cgi.h, edit it, -# and enable the following line. -# Obviously, this requires that db-build is enabled, too. -# -#BUILD_TARGETS += cgi-build - -# The remaining settings in this section -# are only relevant if cgi-build is enabled. -# Otherwise, they have no effect either way. - -# If your system does not support static binaries, comment this, -# for example on Mac OS X. -# -STATIC = -static - -# Linux requires -pthread for statical linking. -# -#STATIC += -pthread - -WWWPREFIX = /var/www -HTDOCDIR = $(WWWPREFIX)/htdocs -CGIBINDIR = $(WWWPREFIX)/cgi-bin - -# === END OF USER SETTINGS ============================================= - -INSTALL_TARGETS = $(BUILD_TARGETS:-build=-install) - -BASEBIN = mandoc preconv demandoc -DBBIN = apropos makewhatis +BASEBIN = mandoc demandoc +DBBIN = makewhatis CGIBIN = man.cgi -DBLIB += -lsqlite3 - -TESTSRCS = test-fgetln.c \ +TESTSRCS = test-dirent-namlen.c \ + test-fgetln.c \ + test-fts.c \ test-getsubopt.c \ test-mmap.c \ test-ohash.c \ test-reallocarray.c \ + test-sqlite3.c \ test-sqlite3_errstr.c \ test-strcasestr.c \ test-strlcat.c \ test-strlcpy.c \ test-strptime.c \ - test-strsep.c + test-strsep.c \ + test-wchar.c -SRCS = apropos.c \ - arch.c \ - att.c \ +SRCS = att.c \ cgi.c \ chars.c \ compat_fgetln.c \ + compat_fts.c \ compat_getsubopt.c \ compat_ohash.c \ compat_reallocarray.c \ @@ -187,7 +92,6 @@ SRCS = apropos.c \ term_ascii.c \ term_ps.c \ tree.c \ - vol.c \ $(TESTSRCS) DISTFILES = INSTALL \ @@ -197,14 +101,12 @@ DISTFILES = INSTALL \ NEWS \ TODO \ apropos.1 \ - arch.in \ - att.in \ cgi.h.example \ chars.in \ + compat_fts.h \ compat_ohash.h \ - config.h.post \ - config.h.pre \ configure \ + configure.local.example \ demandoc.1 \ eqn.7 \ example.style.css \ @@ -218,6 +120,7 @@ DISTFILES = INSTALL \ main.h \ makewhatis.8 \ man-cgi.css \ + man.1 \ man.7 \ man.cgi.8 \ man.h \ @@ -238,7 +141,6 @@ DISTFILES = INSTALL \ mdoc.h \ msec.in \ out.h \ - preconv.1 \ predefs.in \ roff.7 \ st.in \ @@ -246,7 +148,6 @@ DISTFILES = INSTALL \ tbl.3 \ tbl.7 \ term.h \ - vol.in \ $(SRCS) LIBMAN_OBJS = man.o \ @@ -254,16 +155,14 @@ LIBMAN_OBJS = man.o \ man_macro.o \ man_validate.o -LIBMDOC_OBJS = arch.o \ - att.o \ +LIBMDOC_OBJS = att.o \ lib.o \ mdoc.o \ mdoc_argv.o \ mdoc_hash.o \ mdoc_macro.o \ mdoc_validate.o \ - st.o \ - vol.o + st.o LIBROFF_OBJS = eqn.o \ roff.o \ @@ -279,9 +178,11 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ mandoc.o \ mandoc_aux.o \ msec.o \ + preconv.o \ read.o COMPAT_OBJS = compat_fgetln.o \ + compat_fts.o \ compat_getsubopt.o \ compat_ohash.o \ compat_reallocarray.o \ @@ -314,11 +215,11 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ out.o \ tree.o -MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o +MAN_OBJS = $(MANDOC_OBJS) -PRECONV_OBJS = preconv.o +MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o -APROPOS_OBJS = apropos.o mansearch.o mansearch_const.o manpath.o +APROPOS_OBJS = mansearch.o mansearch_const.o manpath.o CGI_OBJS = $(MANDOC_HTML_OBJS) \ cgi.o \ @@ -332,8 +233,8 @@ DEMANDOC_OBJS = demandoc.o WWW_MANS = apropos.1.html \ demandoc.1.html \ + man.1.html \ mandoc.1.html \ - preconv.1.html \ mandoc.3.html \ mandoc_escape.3.html \ mandoc_html.3.html \ @@ -360,9 +261,13 @@ WWW_MANS = apropos.1.html \ WWW_OBJS = mdocml.tar.gz \ mdocml.sha256 +include Makefile.local + +INSTALL_TARGETS = $(BUILD_TARGETS:-build=-install) + # === DEPENDENCY HANDLING ============================================== -all: base-build $(BUILD_TARGETS) +all: base-build $(BUILD_TARGETS) Makefile.local base-build: $(BASEBIN) @@ -374,20 +279,22 @@ install: base-install $(INSTALL_TARGETS) www: $(WWW_OBJS) $(WWW_MANS) +$(WWW_MANS): mandoc + include Makefile.depend # === TARGETS CONTAINING SHELL COMMANDS ================================ +distclean: clean + rm -f Makefile.local config.h config.h.old config.log config.log.old + clean: - rm -f libmandoc.a $(LIBMANDOC_OBJS) - rm -f apropos $(APROPOS_OBJS) + rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) + rm -f mandoc $(MANDOC_OBJS) $(APROPOS_OBJS) rm -f makewhatis $(MAKEWHATIS_OBJS) - rm -f preconv $(PRECONV_OBJS) rm -f man.cgi $(CGI_OBJS) rm -f manpage $(MANPAGE_OBJS) rm -f demandoc $(DEMANDOC_OBJS) - rm -f mandoc $(MANDOC_OBJS) - rm -f config.h config.log $(COMPAT_OBJS) rm -f $(WWW_MANS) $(WWW_OBJS) rm -rf *.dSYM @@ -403,7 +310,8 @@ base-install: base-build $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \ $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) man.1 mandoc.1 demandoc.1 \ + $(DESTDIR)$(MANDIR)/man1 $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \ @@ -417,8 +325,8 @@ db-install: db-build mkdir -p $(DESTDIR)$(MANDIR)/man3 mkdir -p $(DESTDIR)$(MANDIR)/man5 mkdir -p $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_PROGRAM) apropos $(DESTDIR)$(BINDIR) - ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis + ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/apropos + ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/whatis $(INSTALL_PROGRAM) makewhatis $(DESTDIR)$(SBINDIR) $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1 ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \ @@ -447,30 +355,29 @@ www-install: www $(INSTALL_DATA) mdocml.sha256 \ $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 +Makefile.local config.h: configure ${TESTSRCS} + @echo "$@ is out of date; please run ./configure" + @exit 1 + depend: config.h mkdep -f Makefile.depend $(CFLAGS) $(SRCS) perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ - s|\\\n||g; s| +| |g; print;' Makefile.depend > Makefile.tmp + s|\\\n||g; s| +| |g; s| $$||mg; print;' \ + Makefile.depend > Makefile.tmp mv Makefile.tmp Makefile.depend libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) -mandoc: $(MANDOC_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a +mandoc: $(MAN_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MAN_OBJS) libmandoc.a $(DBLIB) makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB) -preconv: $(PRECONV_OBJS) - $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS) - manpage: $(MANPAGE_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB) -apropos: $(APROPOS_OBJS) libmandoc.a - $(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB) - man.cgi: $(CGI_OBJS) libmandoc.a $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB) @@ -482,18 +389,13 @@ mdocml.sha256: mdocml.tar.gz mdocml.tar.gz: $(DISTFILES) mkdir -p .dist/mdocml-$(VERSION)/ - $(INSTALL_SOURCE) $(DISTFILES) .dist/mdocml-$(VERSION) + $(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION) chmod 755 .dist/mdocml-$(VERSION)/configure ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) ) rm -rf .dist/ -config.h: configure config.h.pre config.h.post $(TESTSRCS) - rm -f config.log - CC="$(CC)" CFLAGS="$(CFLAGS)" DBLIB="$(DBLIB)" \ - VERSION="$(VERSION)" ./configure - .PHONY: base-install cgi-install db-install install www-install -.PHONY: clean depend +.PHONY: clean distclean depend .SUFFIXES: .1 .3 .5 .7 .8 .h .SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html Modified: projects/clang350-import/contrib/mdocml/Makefile.depend ============================================================================== --- projects/clang350-import/contrib/mdocml/Makefile.depend Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/mdocml/Makefile.depend Thu Dec 4 17:38:32 2014 (r275479) @@ -1,24 +1,23 @@ -apropos.o: apropos.c config.h manpath.h mansearch.h -arch.o: arch.c config.h mdoc.h libmdoc.h arch.in -att.o: att.c config.h mdoc.h libmdoc.h att.in +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 -compat_getsubopt.o: compat_getsubopt.c config.h -compat_ohash.o: compat_ohash.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_strlcat.o: compat_strlcat.c config.h -compat_strlcpy.o: compat_strlcpy.c config.h -compat_strsep.o: compat_strsep.c config.h +compat_fgetln.o: compat_fgetln.c config.h +compat_fts.o: compat_fts.c config.h compat_fts.h +compat_getsubopt.o: compat_getsubopt.c config.h +compat_ohash.o: compat_ohash.c config.h compat_ohash.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_strlcat.o: compat_strlcat.c config.h +compat_strlcpy.o: compat_strlcpy.c config.h +compat_strsep.o: compat_strsep.c config.h demandoc.o: demandoc.c config.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 libmandoc.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 +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 mandoc.h libman.h man_html.o: man_html.c config.h mandoc.h mandoc_aux.h out.h html.h man.h main.h @@ -27,10 +26,10 @@ man_term.o: man_term.c config.h mandoc.h man_validate.o: man_validate.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.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 mdoc.h man.h mandoc.h mandoc_aux.h manpath.h mansearch.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 mandoc.h mandoc_aux.h manpath.h mansearch.h +mansearch.o: mansearch.c config.h compat_ohash.h mandoc.h mandoc_aux.h manpath.h mansearch.h mansearch_const.o: mansearch_const.c config.h manpath.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 @@ -42,9 +41,9 @@ mdoc_term.o: mdoc_term.c config.h mandoc mdoc_validate.o: mdoc_validate.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.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 +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 main.h -roff.o: roff.c config.h mandoc.h mandoc_aux.h libroff.h libmandoc.h predefs.in +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 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 @@ -56,15 +55,18 @@ term.o: term.c config.h mandoc.h mandoc_ 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.h mandoc_aux.h out.h main.h term.h tree.o: tree.c config.h mandoc.h mdoc.h man.h main.h -vol.o: vol.c config.h mdoc.h libmdoc.h vol.in -test-fgetln.o: test-fgetln.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_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-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-wchar.o: test-wchar.c Modified: projects/clang350-import/contrib/mdocml/NEWS ============================================================================== --- projects/clang350-import/contrib/mdocml/NEWS Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/mdocml/NEWS Thu Dec 4 17:38:32 2014 (r275479) @@ -1,4 +1,4 @@ -$Id: NEWS,v 1.5 2014/08/10 16:32:57 schwarze Exp $ +$Id: NEWS,v 1.6 2014/08/11 01:39:00 schwarze Exp $ This file lists the most important changes in the mdocml.bsd.lv distribution. @@ -7,9 +7,6 @@ Changes in version 1.13.1, released on A --- MAJOR NEW FEATURES --- * A complete apropos(1)/makewhatis(8)/man.cgi(8) suite based on SQLite3 is now included. - CAVEAT: This also requires a working fts(3) implementation. - If your system lacks that *and* you want apropos(1)/makewhatis(8), - stay with 1.12.3 for now, then go to 1.12.4 and 1.13.2. * The roff(7) parser now provides an almost complete implementation of numerical expressions. * Warning and error messages have been improved in many ways. Modified: projects/clang350-import/contrib/mdocml/TODO ============================================================================== --- projects/clang350-import/contrib/mdocml/TODO Thu Dec 4 17:36:29 2014 (r275478) +++ projects/clang350-import/contrib/mdocml/TODO Thu Dec 4 17:38:32 2014 (r275479) @@ -1,8 +1,37 @@ ************************************************************************ * Official mandoc TODO. -* $Id: TODO,v 1.176 2014/08/09 14:24:53 schwarze Exp $ +* $Id: TODO,v 1.189 2014/11/26 21:40:17 schwarze Exp $ ************************************************************************ +Many issues are annotated for difficulty as follows: + + - loc = locality of the issue + * single file issue, affects file only, or very few + ** single module issue, affects several files of one module + *** cross-module issue, significantly impacts multiple modules + and may require substantial changes to internal interfaces + - exist = difficulty of the existing code in this area + * affected code is straightforward and easy to read and change + ** affected code is somewhat complex, but once you understand + the design, not particularly difficult to understand + *** affected code uses a special, exceptionally tricky design + - algo = difficulty of the new algorithm to be written + * the required logic and code is straightforward + ** the required logic is somewhat complex and needs a careful design + *** the required logic is exceptionally tricky, + maybe an approach to solve that is not even known yet + - size = the amount of code to be written or changed + * a small number of lines (at most 100, usually much less) + ** a considerable amount of code (several dozen to a few hundred) + *** a large amount of code (many hundreds, maybe thousands) + - imp = importance of the issue + * mostly for completeness + ** would be nice to have + *** issue causes considerable inconvenience + +Obviously, as the issues have not been solved yet, these annotations +are mere guesses, and some may be wrong. + ************************************************************************ * crashes ************************************************************************ @@ -10,6 +39,7 @@ - The abort() in bufcat(), html.c, can be triggered via buffmt_includes() by running -Thtml -Oincludes on a file containing a long .In argument. Fixing this will probably require reworking the whole bufcat() concept. + loc ** exist * algo * size ** imp ** ************************************************************************ * missing features @@ -25,49 +55,62 @@ .na -- temporarily disable adjustment without changing the mode .ad -- re-enable adjustment without changing the mode Adjustment mode is ignored while in no-fill mode (.nf). + loc *** exist *** algo ** size ** imp ** (parser reorg would help) - .fc (field control) found by naddy@ in xloadimage(1) + loc ** exist *** algo * size * imp * - .nr third argument (auto-increment step size, requires \n+) found by bentley@ in sbcl(1) Mon, 9 Dec 2013 18:36:57 -0700 + loc * exist * algo * size * imp ** - .ns (no-space mode) occurs in xine-config(1) reported by brad@ Sat, 15 Jan 2011 15:45:23 -0500 + loc *** exist *** algo *** size ** imp * - .ta (tab settings) occurs in ircbug(1) and probably gnats(1) reported by brad@ Sat, 15 Jan 2011 15:50:51 -0500 also Tcl_NewStringObj(3) via wiz@ Wed, 5 Mar 2014 22:27:43 +0100 + loc ** exist *** algo ** size ** imp ** - .ti (temporary indent) found by naddy@ in xloadimage(1) found by bentley@ in nmh(1) Mon, 23 Apr 2012 13:38:28 -0600 + loc ** exist ** algo ** size * imp ** (parser reorg helps a lot) - .while and .shift found by jca@ in ratpoison(1) Sun, 30 Jun 2013 12:01:09 +0200 + loc * exist ** algo ** size ** imp ** - \c (interrupted text) should prevent the line break even inside .Bd literal; that occurs in chat(8) also found in cclive(1) - DocBook output + loc ** exist *** algo ** size * imp * - \h horizontal move found in cclive(1) DocBook output Anthony J. Bentley on discuss@ Sat, 21 Sep 2013 22:29:34 -0600 + loc ** exist ** algo ** size * imp ** (parser reorg helps a lot) - \n+ and \n- numerical register increment and decrement found by bentley@ in sbcl(1) Mon, 9 Dec 2013 18:36:57 -0700 + loc * exist * algo * size * imp ** -- \w'' width measurements +- \w'' improve width measurements would not be very useful without an expression parser, see below needed for Tcl_NewStringObj(3) via wiz@ Wed, 5 Mar 2014 22:27:43 +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 * --- missing mdoc features ---------------------------------------------- - fix bad block nesting involving multiple identical explicit blocks see the OpenBSD mdoc_macro.c 1.47 commit message + loc * exist *** algo *** size * imp ** - .Bl -column .Xo support is missing ultimate goal: @@ -75,10 +118,12 @@ lib/libc/compat-43/sigvec.3 lib/libc/gen/signal.3 lib/libc/sys/sigaction.2 + loc * exist *** algo *** size * imp ** - edge case: decide how to deal with blk_full bad nesting, e.g. .Sh .Nm .Bk .Nm .Ek .Sh found by jmc@ in ssh-keygen(1) from jmc@ Wed, 14 Jul 2010 18:10:32 +0100 + loc * exist *** algo *** size ** imp ** - \\ is now implemented correctly * when defining strings and macros using .ds and .de @@ -92,18 +137,22 @@ we don't have either. Besides, groff has bug causing text right *before* .Bd -centered to be centered as well. + loc *** exist *** algo ** size ** imp ** (parser reorg would help) - .Bd -filled should not be the same as .Bd -ragged, but align both the left and right margin. In groff, it is implemented in terms of .ad b, which we don't have either. Found in cksum(1). + loc *** exist *** algo ** size ** imp ** (parser reorg would help) - implement blank `Bl -column', such as .Bl -column .It foo Ta bar .El + loc * exist *** algo *** size * imp * - explicitly disallow nested `Bl -column', which would clobber internal flags defined for struct mdoc_macro + loc * exist * algo * size * imp ** - In .Bl -column .It, the end of the line probably has to be regarded as an implicit .Ta, if there could be one, see the following mildly @@ -114,6 +163,7 @@ Default search path. reported by Michal Mazurek via jmc@ Thu, 7 Apr 2011 16:00:53 +0059 + loc * exist *** algo ** size * imp ** - inside `.Bl -column' phrases, punctuation is handled like normal text, e.g. `.Bl -column .It Fl x . Ta ...' should give "-x -." @@ -123,11 +173,14 @@ but should give "ab ." - set a meaningful default if no `Bl' list type is assigned + loc * exist * algo * size * imp ** (already done?) - have a blank `It' head for `Bl -tag' not puke + loc * exist * algo * size * imp ** (already done?) - check whether it is correct that `D1' uses INDENT+1; does it need its own constant? + loc * exist ** algo ** size * imp ** - prohibit `Nm' from having non-text HEAD children (e.g., NetBSD mDNSShared/dns-sd.1) @@ -138,6 +191,7 @@ that one uses NOMBRE because it is spanish... deraadt tends to think that section-dependent macro behaviour is a bad idea in the first place, so this may be irrelevant + loc ** exist ** algo ** size * imp ** - When there is free text in the SYNOPSIS and that free text contains the .Nm macro, groff somehow understands to treat the .Nm as an in-line @@ -146,6 +200,7 @@ should be, needs investigation. uqs@ Thu, 2 Jun 2011 11:03:51 +0200 uqs@ Thu, 2 Jun 2011 11:33:35 +0200 + loc * exist ** algo *** size * imp ** --- missing man features ----------------------------------------------- @@ -155,18 +210,36 @@ - look at the POSIX manuals in the books/man-pages-posix port, they use some unsupported tbl(7) features. + loc * exist ** algo ** size ** imp *** -- investigate tbl(1) errors in sox(1) - see also naddy@ Sat, 16 Oct 2010 23:51:57 +0200 +- use Unicode U+2500 to U+256C for table borders + in tbl(7) -Tutf-8 output *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Dec 5 07:48:33 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3DADD2A1; Fri, 5 Dec 2014 07:48:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 2669AF93; Fri, 5 Dec 2014 07:48:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB57mX1U048646; Fri, 5 Dec 2014 07:48:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB57mR01048619; Fri, 5 Dec 2014 07:48:27 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412050748.sB57mR01048619@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 5 Dec 2014 07:48:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275499 - in projects/building-blocks: . bin/sh contrib/binutils/bfd contrib/binutils/bfd/po contrib/binutils/gas/config contrib/elftoolchain/elfcopy contrib/elftoolchain/libelf contrib... 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.18-1 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, 05 Dec 2014 07:48:33 -0000 Author: ngie Date: Fri Dec 5 07:48:25 2014 New Revision: 275499 URL: https://svnweb.freebsd.org/changeset/base/275499 Log: MFhead @ r275496 Added: projects/building-blocks/contrib/mdocml/compat_fts.c - copied unchanged from r275496, head/contrib/mdocml/compat_fts.c projects/building-blocks/contrib/mdocml/compat_fts.h - copied unchanged from r275496, head/contrib/mdocml/compat_fts.h projects/building-blocks/contrib/mdocml/configure.local.example - copied unchanged from r275496, head/contrib/mdocml/configure.local.example projects/building-blocks/contrib/mdocml/man.1 - copied unchanged from r275496, head/contrib/mdocml/man.1 projects/building-blocks/contrib/mdocml/test-dirent-namlen.c - copied unchanged from r275496, head/contrib/mdocml/test-dirent-namlen.c projects/building-blocks/contrib/mdocml/test-fts.c - copied unchanged from r275496, head/contrib/mdocml/test-fts.c projects/building-blocks/contrib/mdocml/test-sqlite3.c - copied unchanged from r275496, head/contrib/mdocml/test-sqlite3.c projects/building-blocks/contrib/mdocml/test-wchar.c - copied unchanged from r275496, head/contrib/mdocml/test-wchar.c projects/building-blocks/lib/libelftc/ - copied from r275496, head/lib/libelftc/ projects/building-blocks/sys/amd64/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/amd64/conf/GENERIC-NODEBUG projects/building-blocks/sys/i386/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/i386/conf/GENERIC-NODEBUG projects/building-blocks/sys/pc98/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/pc98/conf/GENERIC-NODEBUG projects/building-blocks/sys/powerpc/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/powerpc/conf/GENERIC-NODEBUG projects/building-blocks/sys/sparc64/conf/GENERIC-NODEBUG - copied unchanged from r275496, head/sys/sparc64/conf/GENERIC-NODEBUG projects/building-blocks/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS - copied unchanged from r275496, head/tools/build/options/WITH_ELFTOOLCHAIN_TOOLS projects/building-blocks/usr.bin/addr2line/ - copied from r275496, head/usr.bin/addr2line/ projects/building-blocks/usr.bin/elfcopy/ - copied from r275496, head/usr.bin/elfcopy/ projects/building-blocks/usr.bin/nm/ - copied from r275496, head/usr.bin/nm/ projects/building-blocks/usr.bin/size/ - copied from r275496, head/usr.bin/size/ projects/building-blocks/usr.bin/strings/ - copied from r275496, head/usr.bin/strings/ Deleted: projects/building-blocks/contrib/mdocml/apropos.c projects/building-blocks/contrib/mdocml/arch.c projects/building-blocks/contrib/mdocml/arch.in projects/building-blocks/contrib/mdocml/att.in projects/building-blocks/contrib/mdocml/config.h.post projects/building-blocks/contrib/mdocml/config.h.pre projects/building-blocks/contrib/mdocml/preconv.1 projects/building-blocks/contrib/mdocml/vol.c projects/building-blocks/contrib/mdocml/vol.in projects/building-blocks/usr.bin/preconv/ Modified: projects/building-blocks/Makefile.inc1 projects/building-blocks/ObsoleteFiles.inc projects/building-blocks/bin/sh/eval.c projects/building-blocks/bin/sh/output.c projects/building-blocks/contrib/binutils/bfd/elf32-arm.c projects/building-blocks/contrib/binutils/bfd/elflink.c projects/building-blocks/contrib/binutils/bfd/po/bfd.pot projects/building-blocks/contrib/binutils/gas/config/tc-arm.c projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c projects/building-blocks/contrib/elftoolchain/nm/nm.c projects/building-blocks/contrib/elftoolchain/size/size.c projects/building-blocks/contrib/elftoolchain/strings/strings.c projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm projects/building-blocks/contrib/gcc/config/arm/libunwind.S projects/building-blocks/contrib/gcc/cp/name-lookup.c projects/building-blocks/contrib/gcc/cp/name-lookup.h projects/building-blocks/contrib/libc++/include/type_traits projects/building-blocks/contrib/mdocml/INSTALL projects/building-blocks/contrib/mdocml/LICENSE projects/building-blocks/contrib/mdocml/Makefile projects/building-blocks/contrib/mdocml/Makefile.depend projects/building-blocks/contrib/mdocml/NEWS projects/building-blocks/contrib/mdocml/TODO projects/building-blocks/contrib/mdocml/apropos.1 projects/building-blocks/contrib/mdocml/att.c projects/building-blocks/contrib/mdocml/cgi.c projects/building-blocks/contrib/mdocml/chars.c projects/building-blocks/contrib/mdocml/chars.in projects/building-blocks/contrib/mdocml/compat_fgetln.c projects/building-blocks/contrib/mdocml/compat_getsubopt.c projects/building-blocks/contrib/mdocml/compat_ohash.c projects/building-blocks/contrib/mdocml/compat_reallocarray.c projects/building-blocks/contrib/mdocml/compat_sqlite3_errstr.c projects/building-blocks/contrib/mdocml/compat_strcasestr.c projects/building-blocks/contrib/mdocml/compat_strlcat.c projects/building-blocks/contrib/mdocml/compat_strlcpy.c projects/building-blocks/contrib/mdocml/compat_strsep.c projects/building-blocks/contrib/mdocml/config.h projects/building-blocks/contrib/mdocml/configure projects/building-blocks/contrib/mdocml/demandoc.1 projects/building-blocks/contrib/mdocml/demandoc.c projects/building-blocks/contrib/mdocml/eqn.7 projects/building-blocks/contrib/mdocml/eqn.c projects/building-blocks/contrib/mdocml/eqn_html.c projects/building-blocks/contrib/mdocml/eqn_term.c projects/building-blocks/contrib/mdocml/example.style.css projects/building-blocks/contrib/mdocml/html.c projects/building-blocks/contrib/mdocml/html.h projects/building-blocks/contrib/mdocml/lib.c projects/building-blocks/contrib/mdocml/lib.in projects/building-blocks/contrib/mdocml/libman.h projects/building-blocks/contrib/mdocml/libmandoc.h projects/building-blocks/contrib/mdocml/libmdoc.h projects/building-blocks/contrib/mdocml/libroff.h projects/building-blocks/contrib/mdocml/main.c projects/building-blocks/contrib/mdocml/main.h projects/building-blocks/contrib/mdocml/makewhatis.8 projects/building-blocks/contrib/mdocml/man.c projects/building-blocks/contrib/mdocml/man.cgi.8 projects/building-blocks/contrib/mdocml/man.h projects/building-blocks/contrib/mdocml/man_hash.c projects/building-blocks/contrib/mdocml/man_html.c projects/building-blocks/contrib/mdocml/man_macro.c projects/building-blocks/contrib/mdocml/man_term.c projects/building-blocks/contrib/mdocml/man_validate.c projects/building-blocks/contrib/mdocml/mandoc.1 projects/building-blocks/contrib/mdocml/mandoc.3 projects/building-blocks/contrib/mdocml/mandoc.c projects/building-blocks/contrib/mdocml/mandoc.db.5 projects/building-blocks/contrib/mdocml/mandoc.h projects/building-blocks/contrib/mdocml/mandoc_aux.c projects/building-blocks/contrib/mdocml/mandoc_escape.3 projects/building-blocks/contrib/mdocml/mandocdb.c projects/building-blocks/contrib/mdocml/manpage.c projects/building-blocks/contrib/mdocml/manpath.c projects/building-blocks/contrib/mdocml/mansearch.c projects/building-blocks/contrib/mdocml/mansearch.h projects/building-blocks/contrib/mdocml/mansearch_const.c projects/building-blocks/contrib/mdocml/mchars_alloc.3 projects/building-blocks/contrib/mdocml/mdoc.7 projects/building-blocks/contrib/mdocml/mdoc.c projects/building-blocks/contrib/mdocml/mdoc_argv.c projects/building-blocks/contrib/mdocml/mdoc_hash.c projects/building-blocks/contrib/mdocml/mdoc_html.c projects/building-blocks/contrib/mdocml/mdoc_macro.c projects/building-blocks/contrib/mdocml/mdoc_man.c projects/building-blocks/contrib/mdocml/mdoc_term.c projects/building-blocks/contrib/mdocml/mdoc_validate.c projects/building-blocks/contrib/mdocml/msec.c projects/building-blocks/contrib/mdocml/out.c projects/building-blocks/contrib/mdocml/out.h projects/building-blocks/contrib/mdocml/preconv.c projects/building-blocks/contrib/mdocml/read.c projects/building-blocks/contrib/mdocml/roff.7 projects/building-blocks/contrib/mdocml/roff.c projects/building-blocks/contrib/mdocml/st.c projects/building-blocks/contrib/mdocml/st.in projects/building-blocks/contrib/mdocml/style.css projects/building-blocks/contrib/mdocml/tbl.7 projects/building-blocks/contrib/mdocml/tbl.c projects/building-blocks/contrib/mdocml/tbl_data.c projects/building-blocks/contrib/mdocml/tbl_html.c projects/building-blocks/contrib/mdocml/tbl_layout.c projects/building-blocks/contrib/mdocml/tbl_opts.c projects/building-blocks/contrib/mdocml/tbl_term.c projects/building-blocks/contrib/mdocml/term.c projects/building-blocks/contrib/mdocml/term.h projects/building-blocks/contrib/mdocml/term_ascii.c projects/building-blocks/contrib/mdocml/term_ps.c projects/building-blocks/contrib/mdocml/test-getsubopt.c projects/building-blocks/contrib/mdocml/tree.c projects/building-blocks/contrib/ofed/librdmacm/examples/build/cmatose/Makefile projects/building-blocks/contrib/ofed/librdmacm/examples/build/mckey/Makefile projects/building-blocks/contrib/ofed/librdmacm/examples/build/rping/Makefile projects/building-blocks/contrib/ofed/librdmacm/examples/build/udaddy/Makefile projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibnetdiscover.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibroute.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibsendtrap.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/ibtracert.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/saquery.c projects/building-blocks/contrib/ofed/management/infiniband-diags/src/smpquery.c projects/building-blocks/contrib/ofed/usr.bin/Makefile.inc projects/building-blocks/contrib/subversion/subversion/svn/util.c projects/building-blocks/etc/rc projects/building-blocks/etc/rc.subr projects/building-blocks/gnu/usr.bin/binutils/Makefile projects/building-blocks/gnu/usr.bin/binutils/addr2line/addr2line.1 projects/building-blocks/gnu/usr.bin/binutils/nm/nm.1 projects/building-blocks/gnu/usr.bin/binutils/objcopy/objcopy.1 projects/building-blocks/gnu/usr.bin/binutils/objdump/objdump.1 projects/building-blocks/gnu/usr.bin/binutils/readelf/readelf.1 projects/building-blocks/gnu/usr.bin/binutils/size/size.1 projects/building-blocks/gnu/usr.bin/binutils/strings/strings.1 projects/building-blocks/gnu/usr.bin/binutils/strip/strip.1 projects/building-blocks/lib/Makefile projects/building-blocks/lib/libgpio/gpio.c projects/building-blocks/lib/libmandoc/Makefile projects/building-blocks/lib/libxo/Makefile projects/building-blocks/lib/msun/src/e_j0f.c projects/building-blocks/libexec/rtld-elf/rtld.c projects/building-blocks/rescue/rescue/Makefile projects/building-blocks/sbin/ifconfig/Makefile projects/building-blocks/sbin/sysctl/sysctl.c projects/building-blocks/share/man/man4/isp.4 projects/building-blocks/share/man/man5/src.conf.5 projects/building-blocks/share/mk/bsd.cpu.mk projects/building-blocks/share/mk/src.libnames.mk projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/sys/arm/arm/bcopyinout_xscale.S projects/building-blocks/sys/arm/arm/blockio.S projects/building-blocks/sys/arm/arm/cpufunc_asm_armv5_ec.S projects/building-blocks/sys/arm/arm/cpufunc_asm_sheeva.S projects/building-blocks/sys/arm/arm/in_cksum_arm.S projects/building-blocks/sys/arm/arm/locore.S projects/building-blocks/sys/arm/arm/support.S projects/building-blocks/sys/arm/include/asm.h projects/building-blocks/sys/arm/ti/ti_pruss.c projects/building-blocks/sys/boot/mips/beri/loader/loader.ldscript projects/building-blocks/sys/boot/pc98/boot2/boot2.c projects/building-blocks/sys/cam/cam_xpt.c projects/building-blocks/sys/cam/ctl/ctl.c projects/building-blocks/sys/cam/ctl/ctl.h projects/building-blocks/sys/cam/ctl/ctl_backend_block.c projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c projects/building-blocks/sys/cam/ctl/ctl_cmd_table.c projects/building-blocks/sys/cam/ctl/ctl_error.c projects/building-blocks/sys/cam/ctl/ctl_error.h projects/building-blocks/sys/cam/ctl/ctl_ioctl.h projects/building-blocks/sys/cam/ctl/ctl_private.h projects/building-blocks/sys/cam/ctl/ctl_tpc.c projects/building-blocks/sys/cam/ctl/scsi_ctl.c projects/building-blocks/sys/cam/scsi/scsi_all.h projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/building-blocks/sys/dev/bxe/bxe.c projects/building-blocks/sys/dev/cxgb/cxgb_sge.c projects/building-blocks/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c projects/building-blocks/sys/dev/cxgbe/t4_main.c projects/building-blocks/sys/dev/cxgbe/t4_sge.c projects/building-blocks/sys/dev/cxgbe/tom/t4_cpl_io.c projects/building-blocks/sys/dev/cxgbe/tom/t4_ddp.c projects/building-blocks/sys/dev/e1000/if_igb.c projects/building-blocks/sys/dev/ixgbe/ixgbe.c projects/building-blocks/sys/dev/ixgbe/ixv.c projects/building-blocks/sys/dev/ixl/ixl_txrx.c projects/building-blocks/sys/dev/mxge/if_mxge.c projects/building-blocks/sys/dev/netmap/netmap_freebsd.c projects/building-blocks/sys/dev/oce/oce_if.c projects/building-blocks/sys/dev/pccard/pccardvar.h projects/building-blocks/sys/dev/qlxgbe/ql_isr.c projects/building-blocks/sys/dev/qlxgbe/ql_os.c projects/building-blocks/sys/dev/qlxge/qls_isr.c projects/building-blocks/sys/dev/qlxge/qls_os.c projects/building-blocks/sys/dev/sfxge/sfxge_rx.c projects/building-blocks/sys/dev/sfxge/sfxge_tx.c projects/building-blocks/sys/dev/usb/controller/saf1761_otg.c projects/building-blocks/sys/dev/usb/controller/saf1761_otg.h projects/building-blocks/sys/dev/virtio/block/virtio_blk.c projects/building-blocks/sys/dev/virtio/network/if_vtnet.c projects/building-blocks/sys/dev/vmware/vmxnet3/if_vmx.c projects/building-blocks/sys/dev/vxge/vxge.c projects/building-blocks/sys/geom/raid/md_intel.c projects/building-blocks/sys/kern/kern_linker.c projects/building-blocks/sys/kern/kern_mutex.c projects/building-blocks/sys/kern/kern_proc.c projects/building-blocks/sys/kern/subr_bus.c projects/building-blocks/sys/kern/subr_taskqueue.c projects/building-blocks/sys/kern/uipc_debug.c projects/building-blocks/sys/kern/uipc_domain.c projects/building-blocks/sys/kern/uipc_mbuf.c projects/building-blocks/sys/kern/uipc_sockbuf.c projects/building-blocks/sys/kern/uipc_socket.c projects/building-blocks/sys/kern/uipc_usrreq.c projects/building-blocks/sys/mips/conf/WZR-HPAG300H.hints projects/building-blocks/sys/net/flowtable.c projects/building-blocks/sys/net/ieee8023ad_lacp.c projects/building-blocks/sys/net/if_lagg.c projects/building-blocks/sys/net/if_lagg.h projects/building-blocks/sys/net/if_stf.c projects/building-blocks/sys/net/if_vxlan.c projects/building-blocks/sys/net/netisr.c projects/building-blocks/sys/netinet/in_pcb.h projects/building-blocks/sys/netinet/in_rss.c projects/building-blocks/sys/netinet/ip_icmp.c projects/building-blocks/sys/netinet/ip_input.c projects/building-blocks/sys/netinet/ip_ipsec.c projects/building-blocks/sys/netinet/ip_output.c projects/building-blocks/sys/netinet/sctp_indata.c projects/building-blocks/sys/netinet/sctp_input.c projects/building-blocks/sys/netinet/sctp_os_bsd.h projects/building-blocks/sys/netinet/sctp_output.c projects/building-blocks/sys/netinet/sctp_pcb.c projects/building-blocks/sys/netinet/sctp_structs.h projects/building-blocks/sys/netinet/sctputil.c projects/building-blocks/sys/netinet/tcp_input.c projects/building-blocks/sys/netinet/tcp_reass.c projects/building-blocks/sys/netinet/tcp_syncache.c projects/building-blocks/sys/netinet/tcp_usrreq.c projects/building-blocks/sys/netinet/udp_usrreq.c projects/building-blocks/sys/netinet6/icmp6.c projects/building-blocks/sys/netinet6/in6_pcb.c projects/building-blocks/sys/netinet6/ip6_ipsec.c projects/building-blocks/sys/netinet6/ip6_output.c projects/building-blocks/sys/netinet6/sctp6_usrreq.c projects/building-blocks/sys/netinet6/udp6_usrreq.c projects/building-blocks/sys/netipsec/ipsec.c projects/building-blocks/sys/netipsec/ipsec.h projects/building-blocks/sys/netipsec/ipsec6.h projects/building-blocks/sys/netipsec/ipsec_input.c projects/building-blocks/sys/netipsec/ipsec_mbuf.c projects/building-blocks/sys/netipsec/ipsec_output.c projects/building-blocks/sys/netipsec/key.c projects/building-blocks/sys/netipsec/key.h projects/building-blocks/sys/netipsec/key_debug.c projects/building-blocks/sys/netipsec/key_debug.h projects/building-blocks/sys/netipsec/keydb.h projects/building-blocks/sys/netipsec/keysock.c projects/building-blocks/sys/netipsec/keysock.h projects/building-blocks/sys/netipsec/xform_ah.c projects/building-blocks/sys/netipsec/xform_esp.c projects/building-blocks/sys/netipsec/xform_ipcomp.c projects/building-blocks/sys/netipsec/xform_ipip.c projects/building-blocks/sys/netipsec/xform_tcp.c projects/building-blocks/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c projects/building-blocks/sys/ofed/drivers/net/mlx4/en_rx.c projects/building-blocks/sys/ofed/drivers/net/mlx4/en_tx.c projects/building-blocks/sys/sys/bus.h projects/building-blocks/sys/sys/mbuf.h projects/building-blocks/sys/sys/param.h projects/building-blocks/sys/sys/protosw.h projects/building-blocks/sys/sys/sockbuf.h projects/building-blocks/sys/vm/uma_core.c projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/tools/tools/nanobsd/fill_pkg.sh projects/building-blocks/tools/tools/shlib-compat/shlib-compat.py projects/building-blocks/tools/tools/shlib-compat/test/Makefile.inc projects/building-blocks/tools/tools/shlib-compat/test/regress.sh projects/building-blocks/tools/tools/sysbuild/sysbuild.sh projects/building-blocks/tools/tools/usbtest/Makefile projects/building-blocks/usr.bin/Makefile projects/building-blocks/usr.bin/bluetooth/btsockstat/btsockstat.c projects/building-blocks/usr.bin/man/man.sh projects/building-blocks/usr.bin/mandoc/Makefile projects/building-blocks/usr.bin/netstat/inet.c projects/building-blocks/usr.bin/netstat/netgraph.c projects/building-blocks/usr.bin/netstat/unix.c projects/building-blocks/usr.bin/systat/netstat.c projects/building-blocks/usr.sbin/ctladm/ctladm.8 projects/building-blocks/usr.sbin/ctld/ctld.c projects/building-blocks/usr.sbin/gpioctl/Makefile projects/building-blocks/usr.sbin/gpioctl/gpioctl.c Directory Properties: projects/building-blocks/ (props changed) projects/building-blocks/contrib/binutils/ (props changed) projects/building-blocks/contrib/gcc/ (props changed) projects/building-blocks/contrib/libc++/ (props changed) projects/building-blocks/contrib/mdocml/ (props changed) projects/building-blocks/contrib/subversion/ (props changed) projects/building-blocks/etc/ (props changed) projects/building-blocks/gnu/usr.bin/binutils/ (props changed) projects/building-blocks/sbin/ (props changed) projects/building-blocks/share/ (props changed) projects/building-blocks/share/man/man4/ (props changed) projects/building-blocks/sys/ (props changed) projects/building-blocks/sys/boot/ (props changed) projects/building-blocks/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/building-blocks/Makefile.inc1 ============================================================================== --- projects/building-blocks/Makefile.inc1 Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/Makefile.inc1 Fri Dec 5 07:48:25 2014 (r275499) @@ -1425,6 +1425,14 @@ _kgzip= usr.sbin/kgzip # If we're given an XAS, don't build binutils. .if ${XAS:M/*} == "" && ${MK_BINUTILS_BOOTSTRAP} != "no" _binutils= gnu/usr.bin/binutils +.if ${MK_ELFTOOLCHAIN_TOOLS} != "no" +_elftctools= lib/libelftc \ + usr.bin/addr2line \ + usr.bin/elfcopy \ + usr.bin/nm \ + usr.bin/size \ + usr.bin/strings +.endif .endif # If an full path to an external cross compiler is given, don't build @@ -1444,6 +1452,7 @@ cross-tools: .MAKE ${_clang_libs} \ ${_clang} \ ${_binutils} \ + ${_elftctools} \ ${_cc} \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ @@ -1501,6 +1510,7 @@ native-xtools: .MAKE ${_clang_tblgen} \ usr.bin/ar \ ${_binutils} \ + ${_elftctools} \ ${_cc} \ ${_gcc_tools} \ ${_clang_libs} \ @@ -2059,6 +2069,7 @@ _xb-build-tools: _xb-cross-tools: .for _tool in \ ${_binutils} \ + ${_elftctools} \ usr.bin/ar \ ${_clang_libs} \ ${_clang} \ @@ -2091,6 +2102,7 @@ _xi-cross-tools: @echo "_xi-cross-tools" .for _tool in \ ${_binutils} \ + ${_elftctools} \ usr.bin/ar \ ${_clang_libs} \ ${_clang} \ Modified: projects/building-blocks/ObsoleteFiles.inc ============================================================================== --- projects/building-blocks/ObsoleteFiles.inc Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/ObsoleteFiles.inc Fri Dec 5 07:48:25 2014 (r275499) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20141202: update to mandoc CVS 20141201 +OLD_FILES+=usr.bin/preconv +OLD_FILES+=share/man/man1/preconv.1.gz # 20141129: mrouted rc.d scripts removed from base OLD_FILES+=etc/rc.d/mrouted # 20141126: convert sbin/mdconfig/tests to ATF format tests Modified: projects/building-blocks/bin/sh/eval.c ============================================================================== --- projects/building-blocks/bin/sh/eval.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/bin/sh/eval.c Fri Dec 5 07:48:25 2014 (r275499) @@ -774,15 +774,7 @@ xtracecommand(struct arglist *varlist, s for (sp = arglist->list ; sp ; sp = sp->next) { if (sep != 0) out2c(' '); - /* Disambiguate command looking like assignment. */ - if (sp == arglist->list && - strchr(sp->text, '=') != NULL && - strchr(sp->text, '\'') == NULL) { - out2c('\''); - out2str(sp->text); - out2c('\''); - } else - out2qstr(sp->text); + out2qstr(sp->text); sep = ' '; } out2c('\n'); Modified: projects/building-blocks/bin/sh/output.c ============================================================================== --- projects/building-blocks/bin/sh/output.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/bin/sh/output.c Fri Dec 5 07:48:25 2014 (r275499) @@ -122,8 +122,7 @@ outqstr(const char *p, struct output *fi outstr("''", file); return; } - /* Caller will handle '=' if necessary */ - if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#")] == '\0' || + if (p[strcspn(p, "|&;<>()$`\\\"' \t\n*?[~#=")] == '\0' || strcmp(p, "[") == 0) { outstr(p, file); return; Modified: projects/building-blocks/contrib/binutils/bfd/elf32-arm.c ============================================================================== --- projects/building-blocks/contrib/binutils/bfd/elf32-arm.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/bfd/elf32-arm.c Fri Dec 5 07:48:25 2014 (r275499) @@ -4960,7 +4960,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -4998,7 +4998,7 @@ elf32_arm_final_link_relocate (reloc_how + input_section->output_offset + rel->r_offset); - value = abs (relocation); + value = llabs (relocation); if (value >= 0x1000) return bfd_reloc_overflow; @@ -5984,7 +5984,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_n, in encoded constant-with-rotation format. */ - g_n = calculate_group_reloc_mask (abs (signed_value), group, + g_n = calculate_group_reloc_mask (llabs (signed_value), group, &residual); /* Check for overflow if required. */ @@ -5998,7 +5998,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6077,7 +6077,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x1000) @@ -6085,7 +6085,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6160,7 +6160,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. */ if (residual >= 0x100) @@ -6168,7 +6168,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } @@ -6243,7 +6243,7 @@ elf32_arm_final_link_relocate (reloc_how /* Calculate the value of the relevant G_{n-1} to obtain the residual at that stage. */ - calculate_group_reloc_mask (abs (signed_value), group - 1, &residual); + calculate_group_reloc_mask (llabs (signed_value), group - 1, &residual); /* Check for overflow. (The absolute value to go in the place must be divisible by four and, after having been divided by four, must @@ -6253,7 +6253,7 @@ elf32_arm_final_link_relocate (reloc_how (*_bfd_error_handler) (_("%B(%A+0x%lx): Overflow whilst splitting 0x%lx for group relocation %s"), input_bfd, input_section, - (long) rel->r_offset, abs (signed_value), howto->name); + (long) rel->r_offset, llabs (signed_value), howto->name); return bfd_reloc_overflow; } Modified: projects/building-blocks/contrib/binutils/bfd/elflink.c ============================================================================== --- projects/building-blocks/contrib/binutils/bfd/elflink.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/bfd/elflink.c Fri Dec 5 07:48:25 2014 (r275499) @@ -4356,9 +4356,38 @@ elf_link_add_object_symbols (bfd *abfd, --no-add-needed is used. */ if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) { + bfd_boolean looks_soish; + const char *print_name; + int print_len; + size_t len, lend = 0; + + looks_soish = FALSE; + print_name = soname; + print_len = strlen(soname); + if (strncmp(soname, "lib", 3) == 0) + { + len = print_len; + if (len > 5 && strcmp(soname + len - 2, ".a") == 0) + lend = len - 5; + else + { + while (len > 6 && (ISDIGIT(soname[len - 1]) || + soname[len - 1] == '.')) + len--; + if (strncmp(soname + len - 3, ".so", 3) == 0) + lend = len - 6; + } + if (lend != 0) + { + print_name = soname + 3; + print_len = lend; + looks_soish = TRUE; + } + } + (*_bfd_error_handler) - (_("%B: invalid DSO for symbol `%s' definition"), - abfd, name); + (_("undefined reference to symbol `%s' (try adding -l%s%.*s)"), + name, looks_soish? "" : ":", print_len, print_name); bfd_set_error (bfd_error_bad_value); goto error_free_vers; } Modified: projects/building-blocks/contrib/binutils/bfd/po/bfd.pot ============================================================================== --- projects/building-blocks/contrib/binutils/bfd/po/bfd.pot Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/bfd/po/bfd.pot Fri Dec 5 07:48:25 2014 (r275499) @@ -2438,9 +2438,9 @@ msgstr "" msgid "Warning: size of symbol `%s' changed from %lu in %B to %lu in %B" msgstr "" -#: elflink.c:4309 +#: elflink.c:4389 #, c-format -msgid "%B: invalid DSO for symbol `%s' definition" +msgid "undefined reference to symbol `%s' (try adding -l%s%.*s)" msgstr "" #: elflink.c:5535 Modified: projects/building-blocks/contrib/binutils/gas/config/tc-arm.c ============================================================================== --- projects/building-blocks/contrib/binutils/gas/config/tc-arm.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/binutils/gas/config/tc-arm.c Fri Dec 5 07:48:25 2014 (r275499) @@ -15055,7 +15055,7 @@ static const struct asm_opcode insns[] = TCE(stc, c000000, ec000000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TC3(stcl, c400000, ec400000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TCE(mcr, e000010, ee000010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), - TCE(mrc, e100010, ee100010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), + TCE(mrc, e100010, ee100010, 6, (RCP, I7b, APSR_RR, RCN, RCN, oI7b), co_reg, co_reg), #undef ARM_VARIANT #define ARM_VARIANT &arm_ext_v2s /* ARM 3 - swp instructions. */ @@ -15114,7 +15114,7 @@ static const struct asm_opcode insns[] = TUF(stc2l, c400000, fc400000, 3, (RCP, RCN, ADDRGLDC), lstc, lstc), TUF(cdp2, e000000, fe000000, 6, (RCP, I15b, RCN, RCN, RCN, oI7b), cdp, cdp), TUF(mcr2, e000010, fe000010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), - TUF(mrc2, e100010, fe100010, 6, (RCP, I7b, RR, RCN, RCN, oI7b), co_reg, co_reg), + TUF(mrc2, e100010, fe100010, 6, (RCP, I7b, APSR_RR, RCN, RCN, oI7b), co_reg, co_reg), #undef ARM_VARIANT #define ARM_VARIANT &arm_ext_v5exp /* ARM Architecture 5TExP. */ Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/archive.c Fri Dec 5 07:48:25 2014 (r275499) @@ -350,12 +350,12 @@ ac_detect_ar(int ifd) r = -1; if ((a = archive_read_new()) == NULL) return (0); - archive_read_support_compression_none(a); + archive_read_support_filter_none(a); archive_read_support_format_ar(a); if (archive_read_open_fd(a, ifd, 10240) == ARCHIVE_OK) r = archive_read_next_header(a, &entry); archive_read_close(a); - archive_read_finish(a); + archive_read_free(a); return (r == ARCHIVE_OK); } @@ -386,7 +386,7 @@ ac_read_objs(struct elfcopy *ecp, int if err(EXIT_FAILURE, "lseek failed"); if ((a = archive_read_new()) == NULL) errx(EXIT_FAILURE, "%s", archive_error_string(a)); - archive_read_support_compression_none(a); + archive_read_support_filter_none(a); archive_read_support_format_ar(a); AC(archive_read_open_fd(a, ifd, 10240)); for(;;) { @@ -435,7 +435,7 @@ ac_read_objs(struct elfcopy *ecp, int if } } AC(archive_read_close(a)); - ACV(archive_read_finish(a)); + ACV(archive_read_free(a)); } static void @@ -449,7 +449,7 @@ ac_write_objs(struct elfcopy *ecp, int o if ((a = archive_write_new()) == NULL) errx(EXIT_FAILURE, "%s", archive_error_string(a)); archive_write_set_format_ar_svr4(a); - archive_write_set_compression_none(a); + archive_write_add_filter_none(a); AC(archive_write_open_fd(a, ofd)); /* Write the archive symbol table, even if it's empty. */ @@ -491,7 +491,7 @@ ac_write_objs(struct elfcopy *ecp, int o } AC(archive_write_close(a)); - ACV(archive_write_finish(a)); + ACV(archive_write_free(a)); } static void Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/ascii.c Fri Dec 5 07:48:25 2014 (r275499) @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include Modified: projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/elfcopy/segments.c Fri Dec 5 07:48:25 2014 (r275499) @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include Modified: projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/libelf/libelf_convert.m4 Fri Dec 5 07:48:25 2014 (r275499) @@ -947,11 +947,6 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d READ_WORD(src, descsz); READ_WORD(src, type); - sz = namesz; - ROUNDUP2(sz, 4); - sz += descsz; - ROUNDUP2(sz, 4); - /* Translate. */ SWAP_WORD(namesz); SWAP_WORD(descsz); @@ -967,6 +962,11 @@ _libelf_cvt_NOTE_tom(char *dst, size_t d dst += sizeof(Elf_Note); count -= hdrsz; + ROUNDUP2(namesz, 4); + ROUNDUP2(descsz, 4); + + sz = namesz + descsz; + if (count < sz || dsz < sz) /* Buffers are too small. */ return (0); @@ -1005,6 +1005,11 @@ _libelf_cvt_NOTE_tof(char *dst, size_t d descsz = en->n_descsz; type = en->n_type; + sz = namesz; + ROUNDUP2(sz, 4); + sz += descsz; + ROUNDUP2(sz, 4); + SWAP_WORD(namesz); SWAP_WORD(descsz); SWAP_WORD(type); @@ -1015,11 +1020,6 @@ _libelf_cvt_NOTE_tof(char *dst, size_t d src += sizeof(Elf_Note); - ROUNDUP2(namesz, 4); - ROUNDUP2(descsz, 4); - - sz = namesz + descsz; - if (count < sz) sz = count; Modified: projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Fri Dec 5 07:48:25 2014 (r275499) @@ -156,7 +156,7 @@ static int vector_type_qualifier_init(st static int vector_type_qualifier_push(struct vector_type_qualifier *, enum type_qualifier); -int cpp_demangle_gnu3_push_head; +static int cpp_demangle_gnu3_push_head; /** * @brief Decode the input string by IA-64 C++ ABI style. Modified: projects/building-blocks/contrib/elftoolchain/nm/nm.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/nm/nm.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/nm/nm.c Fri Dec 5 07:48:25 2014 (r275499) @@ -65,7 +65,7 @@ typedef void (*fn_sym_print)(const GElf_ typedef int (*fn_filter)(char, const GElf_Sym *, const char *); /* output filter list */ -SLIST_HEAD(filter_head, filter_entry) nm_out_filter = +static SLIST_HEAD(filter_head, filter_entry) nm_out_filter = SLIST_HEAD_INITIALIZER(nm_out_filter); struct filter_entry { Modified: projects/building-blocks/contrib/elftoolchain/size/size.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/size/size.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/size/size.c Fri Dec 5 07:48:25 2014 (r275499) @@ -269,7 +269,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el static pid_t pid; uintptr_t ver; Elf32_Nhdr *nhdr, nhdr_l; - static int reg_pseudo = 0, reg2_pseudo = 0, regxfp_pseudo = 0; + static int reg_pseudo = 0, reg2_pseudo = 0 /*, regxfp_pseudo = 0*/; char buf[BUF_SIZE], *data, *name; if (elf == NULL || elfhdr == NULL || phdr == NULL) @@ -360,6 +360,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el text_size_total += nhdr_l.n_descsz; } break; +#if 0 case NT_AUXV: if (style == STYLE_SYSV) { tbl_append(); @@ -390,6 +391,7 @@ handle_core_note(Elf *elf, GElf_Ehdr *el } break; case NT_PSINFO: +#endif case NT_PRPSINFO: { /* FreeBSD 64-bit */ if (nhdr_l.n_descsz == 0x78 && @@ -415,8 +417,10 @@ handle_core_note(Elf *elf, GElf_Ehdr *el } break; } +#if 0 case NT_PSTATUS: case NT_LWPSTATUS: +#endif default: break; } Modified: projects/building-blocks/contrib/elftoolchain/strings/strings.c ============================================================================== --- projects/building-blocks/contrib/elftoolchain/strings/strings.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/elftoolchain/strings/strings.c Fri Dec 5 07:48:25 2014 (r275499) @@ -75,9 +75,9 @@ enum encoding_style { (encoding == ENCODING_8BIT && (c) > 127))) -int encoding_size, entire_file, min_len, show_filename, show_loc; -enum encoding_style encoding; -enum radix_style radix; +static int encoding_size, entire_file, min_len, show_filename, show_loc; +static enum encoding_style encoding; +static enum radix_style radix; static struct option strings_longopts[] = { { "all", no_argument, NULL, 'a'}, Modified: projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm ============================================================================== --- projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/config/arm/lib1funcs.asm Fri Dec 5 07:48:25 2014 (r275499) @@ -980,8 +980,6 @@ LSYM(Lover12): RET - FUNC_END aeabi_ldiv0 - FUNC_END aeabi_idiv0 FUNC_END div0 #endif /* L_divmodsi_tools */ Modified: projects/building-blocks/contrib/gcc/config/arm/libunwind.S ============================================================================== --- projects/building-blocks/contrib/gcc/config/arm/libunwind.S Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/config/arm/libunwind.S Fri Dec 5 07:48:25 2014 (r275499) @@ -26,6 +26,13 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include + +/* Allow the use of VFP instructions */ +#if __ARM_ARCH >= 7 +.fpu vfp +#endif + #ifndef __symbian__ #include "lib1funcs.asm" @@ -66,14 +73,22 @@ ARM_FUNC_START restore_core_regs ARM_FUNC_START gnu_Unwind_Restore_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ +#if __ARM_ARCH >= 7 + fldmiax r0, {d0-d15} +#else ldc p11,cr0,[r0],{0x21} /* fldmiax r0, {d0-d15} */ +#endif RET /* Store VFR regsters d0-d15 to the address in r0. */ ARM_FUNC_START gnu_Unwind_Save_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ +#if __ARM_ARCH >= 7 + fstmiax r0, {d0-d15} +#else stc p11,cr0,[r0],{0x21} /* fstmiax r0, {d0-d15} */ +#endif RET /* Wrappers to save core registers, then call the real routine. */ Modified: projects/building-blocks/contrib/gcc/cp/name-lookup.c ============================================================================== --- projects/building-blocks/contrib/gcc/cp/name-lookup.c Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/cp/name-lookup.c Fri Dec 5 07:48:25 2014 (r275499) @@ -319,35 +319,11 @@ new_class_binding (tree name, tree value cp_class_binding *cb; cxx_binding *binding; - if (VEC_length (cp_class_binding, scope->class_shadowed)) - { - cp_class_binding *old_base; - old_base = VEC_index (cp_class_binding, scope->class_shadowed, 0); - if (VEC_reserve (cp_class_binding, gc, scope->class_shadowed, 1)) - { - /* Fixup the current bindings, as they might have moved. */ - size_t i; - - for (i = 0; - VEC_iterate (cp_class_binding, scope->class_shadowed, i, cb); - i++) - { - cxx_binding **b; - b = &IDENTIFIER_BINDING (cb->identifier); - while (*b != &old_base[i].base) - b = &((*b)->previous); - *b = &cb->base; - } - } - cb = VEC_quick_push (cp_class_binding, scope->class_shadowed, NULL); - } - else cb = VEC_safe_push (cp_class_binding, gc, scope->class_shadowed, NULL); cb->identifier = name; - binding = &cb->base; + cb->base = binding = cxx_binding_make (value, type); binding->scope = scope; - cxx_binding_init (binding, value, type); return binding; } @@ -2501,7 +2477,10 @@ poplevel_class (void) for (i = 0; VEC_iterate (cp_class_binding, level->class_shadowed, i, cb); ++i) - IDENTIFIER_BINDING (cb->identifier) = cb->base.previous; + { + IDENTIFIER_BINDING (cb->identifier) = cb->base->previous; + cxx_binding_free (cb->base); + } ggc_free (level->class_shadowed); level->class_shadowed = NULL; } Modified: projects/building-blocks/contrib/gcc/cp/name-lookup.h ============================================================================== --- projects/building-blocks/contrib/gcc/cp/name-lookup.h Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/gcc/cp/name-lookup.h Fri Dec 5 07:48:25 2014 (r275499) @@ -144,7 +144,7 @@ typedef enum tag_scope { typedef struct cp_class_binding GTY(()) { - cxx_binding base; + cxx_binding *base; /* The bound name. */ tree identifier; } cp_class_binding; Modified: projects/building-blocks/contrib/libc++/include/type_traits ============================================================================== --- projects/building-blocks/contrib/libc++/include/type_traits Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/libc++/include/type_traits Fri Dec 5 07:48:25 2014 (r275499) @@ -439,8 +439,26 @@ template struct _LIBCPP_TYPE // is_member_function_pointer -template struct __libcpp_is_member_function_pointer : public false_type {}; -template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +// template struct __libcpp_is_member_function_pointer : public false_type {}; +// template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; +// + +template +struct __member_pointer_traits_imp +{ // forward declaration; specializations later +}; + + +namespace __libcpp_is_member_function_pointer_imp { + template + char __test(typename std::__member_pointer_traits_imp<_Tp, true, false>::_FnType *); + + template + std::__two __test(...); +}; + +template struct __libcpp_is_member_function_pointer + : public integral_constant(nullptr)) == 1> {}; template struct _LIBCPP_TYPE_VIS_ONLY is_member_function_pointer : public __libcpp_is_member_function_pointer::type> {}; @@ -1593,11 +1611,6 @@ __decay_copy(const _Tp& __t) #endif -template -struct __member_pointer_traits_imp -{ -}; - #ifndef _LIBCPP_HAS_NO_VARIADICS template @@ -1605,6 +1618,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1612,6 +1626,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1619,6 +1634,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1626,6 +1642,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; #if __has_feature(cxx_reference_qualified_functions) @@ -1635,6 +1652,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1642,6 +1660,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1649,6 +1668,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1656,6 +1676,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1663,6 +1684,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1670,6 +1692,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1677,6 +1700,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; template @@ -1684,6 +1708,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile&& _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_Param...); }; #endif // __has_feature(cxx_reference_qualified_functions) @@ -1695,6 +1720,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1702,6 +1728,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1709,6 +1736,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1716,6 +1744,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template @@ -1723,6 +1752,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1730,6 +1760,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1737,6 +1768,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1744,6 +1776,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template @@ -1751,6 +1784,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1758,6 +1792,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1765,6 +1800,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1772,6 +1808,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; template @@ -1779,6 +1816,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (); }; template @@ -1786,6 +1824,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0); }; template @@ -1793,6 +1832,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1); }; template @@ -1800,6 +1840,7 @@ struct __member_pointer_traits_imp<_Rp ( { typedef _Class const volatile _ClassType; typedef _Rp _ReturnType; + typedef _Rp (_FnType) (_P0, _P1, _P2); }; #endif // _LIBCPP_HAS_NO_VARIADICS @@ -1819,6 +1860,7 @@ struct __member_pointer_traits { // typedef ... _ClassType; // typedef ... _ReturnType; +// typedef ... _FnType; }; // result_of @@ -2526,6 +2568,15 @@ template struct _LIBCPP_TYPE // is_nothrow_constructible +#if 0 +template +struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible + : public integral_constant +{ +}; + +#else + #ifndef _LIBCPP_HAS_NO_VARIADICS #if __has_feature(cxx_noexcept) @@ -2664,6 +2715,7 @@ struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_ }; #endif // _LIBCPP_HAS_NO_VARIADICS +#endif // __has_feature(is_nothrow_constructible) // is_nothrow_default_constructible Modified: projects/building-blocks/contrib/mdocml/INSTALL ============================================================================== --- projects/building-blocks/contrib/mdocml/INSTALL Fri Dec 5 07:48:22 2014 (r275498) +++ projects/building-blocks/contrib/mdocml/INSTALL Fri Dec 5 07:48:25 2014 (r275499) @@ -1,4 +1,4 @@ -$Id: INSTALL,v 1.2 2014/08/10 17:22:26 schwarze Exp $ +$Id: INSTALL,v 1.5 2014/08/18 13:27:47 kristaps Exp $ About mdocml, the portable mandoc distribution ---------------------------------------------- @@ -34,19 +34,52 @@ latest bundled and ported versions of ma systems is maintained at . If mandoc is installed, you can check the version by running "mandoc -V". -The version contained in this distribution tarball is listed near -the beginning of the file "Makefile". +You can find the version contained in this distribution tarball +by running "./configure". Regarding how packages and ports are maintained for your operating system, please consult your operating system documentation. To install mandoc manually, the following steps are needed: -1. Decide whether you want to build the base tools mandoc(1), -preconv(1) and demandoc(1) only or whether you also want to build the -database tools apropos(1) and makewhatis(8). For the latter, -the following dependencies are required: +1. If you want to build the CGI program, man.cgi(8), too, run the +command "echo BUILD_CGI=1 > configure.local". Then run "cp +cgi.h.examples cgi.h" and edit cgi.h as desired. + +2. Run "./configure". +This script attempts autoconfiguration of mandoc for your system. +Read both its standard output and the file "Makefile.local" it +generates. If anything looks wrong or different from what you +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. + +3. Run "make". +Any POSIX-compatible make, in particular both BSD make and GNU make, +should work. If the build fails, look at "configure.local.example" +and go back to step 2. + +4. Run "make -n install" and check whether everything will be +installed to the intended places. Otherwise, put some *DIR variables +into "configure.local" and go back to step 2. -1.1. The SQLite database system, see . +5. Run "sudo make install". If you intend to build a binary +package using some kind of fake root mechanism, you may need a +command like "make DESTDIR=... install". Read the *-install targets +in the "Makefile" to understand how DESTDIR is used. + +6. To set up a man.cgi(8) server, read its manual page. + +7. To use mandoc(1) as your man(1) formatter, read the "Deployment" +section below. + + +Understanding mandoc dependencies +--------------------------------- +The mandoc(1), preconv(1), and demandoc(1) utilities have no external +dependencies. However, makewhatis(8) and apropos(1) depend on the +following software: + +1. The SQLite database system, see . The recommended version of SQLite is 3.8.4.3 or newer. The mandoc toolset is known to work with version 3.7.5 or newer. Versions older than 3.8.3 may not achieve full performance due to the @@ -57,47 +90,16 @@ problems, apropos(1) is fully usable wit older than 3.7.5 may or may not work, they have not been tested. 1.2. The fts(3) directory traversion functions. -A compatibility version will be bundled for 1.13.2 but is not available -yet. If you want apropos(1) and makewhatis(8) but do not have fts(3), -please stay with mandoc 1.12.3 for now and upgrade first to 1.12.4, -then to 1.13.2 when these versionns are released. Be careful: the +If your system does not have them, the bundled compatibility version +will be used, so you need not worry in that case. But be careful: the glibc version of fts(3) is known to be broken on 32bit platforms, see . +If you run into that problem, set "HAVE_FTS=0" in configure.local. 1.3. Marc Espie's ohash(3) library. If your system does not have it, the bundled compatibility version will be used, so you probably need not worry about it. -2. If you choose to build the database tools, too, decide whether -you also want to build the CGI program, man.cgi(8). - -3. Read the beginning of the file "Makefile" from "USER SETTINGS" -to "END OF USER SETTINGS" and edit it as required. In particular, -disable "BUILD_TARGETS += db-build" if you do not want database -support or enable "BUILD_TARGETS += cgi-build" if you do want -the CGI program. - -4. Run "make". No separate "./configure" or "make depend" steps -are needed. The former is run automatically by "make". The latter -is a maintainer target. If you merely want to build the released -version as opposed to doing active development, there is no need -to regenerate the dependency specifications. Any POSIX-compatible -make, in particular both BSD make and GNU make, should work. - -5. Run "make -n install" and check whether everything will be -installed to the intended places. Otherwise, edit the *DIR variables -in the Makefile until it is. - -6. Run "sudo make install". If you intend to build a binary -package using some kind of fake root mechanism, you may need a -command like "make DESTDIR=... install". Read the *-install targets -in the "Makefile" to understand how DESTDIR is used. - -7. To set up a man.cgi(8) server, read its manual page. - -8. To use mandoc(1) as your man(1) formatter, read the "Deployment" -section below. - Checking autoconfiguration quality ---------------------------------- @@ -130,9 +132,9 @@ please report whatever is missing on you The following steps can be used to manually check the automatic configuration on your platform: -1. Run "make clean". +1. Run "make distclean". -2. Run "make config.h" +2. Run "./configure" 3. Read the file "config.log". It shows the compiler commands used *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Dec 6 03:12:58 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A1FB7B1; Sat, 6 Dec 2014 03:12:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 F0FBF289; Sat, 6 Dec 2014 03:12:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB63CvlA014119; Sat, 6 Dec 2014 03:12:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB63Cvpp014118; Sat, 6 Dec 2014 03:12:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412060312.sB63Cvpp014118@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 6 Dec 2014 03:12:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275556 - projects/building-blocks/share/mk 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.18-1 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, 06 Dec 2014 03:12:58 -0000 Author: ngie Date: Sat Dec 6 03:12:57 2014 New Revision: 275556 URL: https://svnweb.freebsd.org/changeset/base/275556 Log: Fix typos in comments and wrap to <80 columns MFC after: 3 days Modified: projects/building-blocks/share/mk/bsd.compiler.mk Modified: projects/building-blocks/share/mk/bsd.compiler.mk ============================================================================== --- projects/building-blocks/share/mk/bsd.compiler.mk Sat Dec 6 02:59:59 2014 (r275555) +++ projects/building-blocks/share/mk/bsd.compiler.mk Sat Dec 6 03:12:57 2014 (r275556) @@ -2,18 +2,22 @@ # Setup variables for the compiler # -# COMPILTER_TYPE is the major type of compiler. Currently gcc and clang support -# automatic detetion. Other compiler types can be shoe-horned in, but require explicit -# setting of the compiler type. The compiler type can also be set explicitly if, say, -# you install gcc as clang... -# -# COMPILER_VERSION is a numeric constant equal to major * 10000 + minor * 100 + tiny. It -# too can be overriden on the command line. When testing it, be sure to make sure that you -# are limiting the test to a specific compiler. Testing against 30300 for gcc likely isn't -# what you wanted (since versions of gcc prior to 4.2 likely have no prayer of working). +# COMPILER_TYPE is the major type of compiler. Currently gcc and clang support +# automatic detection. Other compiler types can be shoe-horned in, but require +# explicit setting of the compiler type. The compiler type can also be set +# explicitly if, say, you install gcc as clang... # -# COMPILER_FEATURES will contain one or more of the following, based on compiler support -# for that feature: c++11 (supports full (or nearly full) C++11 programming environment). +# COMPILER_VERSION is a numeric constant equal to: +# major * 10000 + minor * 100 + tiny +# It too can be overriden on the command line. When testing it, be sure to +# make sure that you are limiting the test to a specific compiler. Testing +# against 30300 for gcc likely isn't what you wanted (since versions of gcc +# prior to 4.2 likely have no prayer of working). +# +# COMPILER_FEATURES will contain one or more of the following, based on +# compiler support for that feature: +# +# - c++11 : supports full (or nearly full) C++11 programming environment. # # This file may be included multiple times, but only has effect the first time. # From owner-svn-src-projects@FreeBSD.ORG Sat Dec 6 04:02:57 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 857A4FC5; Sat, 6 Dec 2014 04:02:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6FEB596C; Sat, 6 Dec 2014 04:02:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB642v02037203; Sat, 6 Dec 2014 04:02:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB642vOY037202; Sat, 6 Dec 2014 04:02:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412060402.sB642vOY037202@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 6 Dec 2014 04:02:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275558 - projects/building-blocks/share/mk 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.18-1 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, 06 Dec 2014 04:02:57 -0000 Author: ngie Date: Sat Dec 6 04:02:56 2014 New Revision: 275558 URL: https://svnweb.freebsd.org/changeset/base/275558 Log: ${CC} --version doesn't need to be queried if both COMPILER_TYPE and COMPILER_VERSION are known Modified: projects/building-blocks/share/mk/bsd.compiler.mk Modified: projects/building-blocks/share/mk/bsd.compiler.mk ============================================================================== --- projects/building-blocks/share/mk/bsd.compiler.mk Sat Dec 6 03:15:46 2014 (r275557) +++ projects/building-blocks/share/mk/bsd.compiler.mk Sat Dec 6 04:02:56 2014 (r275558) @@ -25,6 +25,7 @@ .if !target(____) ____: +.if !defined(COMPILER_TYPE) && !defined(COMPILER_VERSION) _v!= ${CC} --version 2>/dev/null || echo 0.0.0 .if !defined(COMPILER_TYPE) . if ${CC:T:M*gcc*} @@ -45,6 +46,7 @@ COMPILER_TYPE:= clang COMPILER_VERSION!=echo ${_v:M[1-9].[0-9]*} | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .endif .undef _v +.endif .if ${COMPILER_TYPE} == "clang" || \ (${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40800)