From owner-svn-src-projects@FreeBSD.ORG Sun Feb 10 04:14:26 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 37AAB514; Sun, 10 Feb 2013 04:14:26 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 297A088B; Sun, 10 Feb 2013 04:14:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1A4EPox007534; Sun, 10 Feb 2013 04:14:25 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1A4EP4t007533; Sun, 10 Feb 2013 04:14:25 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201302100414.r1A4EP4t007533@svn.freebsd.org> From: Benno Rice Date: Sun, 10 Feb 2013 04:14:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246607 - projects/uefi/sys/boot/i386/efi 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.14 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, 10 Feb 2013 04:14:26 -0000 Author: benno Date: Sun Feb 10 04:14:25 2013 New Revision: 246607 URL: http://svnweb.freebsd.org/changeset/base/246607 Log: Use EFI types for EFI values (silences warnings). Sponsored by: FreeBSD Foundation Modified: projects/uefi/sys/boot/i386/efi/main.c Modified: projects/uefi/sys/boot/i386/efi/main.c ============================================================================== --- projects/uefi/sys/boot/i386/efi/main.c Sun Feb 10 01:30:13 2013 (r246606) +++ projects/uefi/sys/boot/i386/efi/main.c Sun Feb 10 04:14:25 2013 (r246607) @@ -273,7 +273,8 @@ COMMAND_SET(mode, "mode", "change or dis static int command_mode(int argc, char *argv[]) { - unsigned int cols, rows, mode; + UINTN cols, rows; + unsigned int mode; int i; char *cp; char rowenv[8]; @@ -327,8 +328,7 @@ command_nvram(int argc, char *argv[]) CHAR16 *data; EFI_STATUS status; EFI_GUID varguid = { 0,0,0,{0,0,0,0,0,0,0,0} }; - unsigned int varsz; - unsigned int datasz; + UINTN varsz, datasz; SIMPLE_TEXT_OUTPUT_INTERFACE *conout; int i; From owner-svn-src-projects@FreeBSD.ORG Sun Feb 10 04:17:43 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CEFF1640; Sun, 10 Feb 2013 04:17:43 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A4124897; Sun, 10 Feb 2013 04:17:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1A4HhIL008015; Sun, 10 Feb 2013 04:17:43 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1A4HgTH008004; Sun, 10 Feb 2013 04:17:42 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201302100417.r1A4HgTH008004@svn.freebsd.org> From: Benno Rice Date: Sun, 10 Feb 2013 04:17:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246608 - projects/uefi/sys/boot/i386/efi 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.14 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, 10 Feb 2013 04:17:43 -0000 Author: benno Date: Sun Feb 10 04:17:41 2013 New Revision: 246608 URL: http://svnweb.freebsd.org/changeset/base/246608 Log: Rework copy routines to ensure we always use memory allocated via EFI. The previous code assumed it could copy wherever it liked. This is not the case. The approach taken by this code is pretty ham-fisted in that it simply allocates a large (32MB) buffer area and stages into that, then copies the whole area into place when it's time to execute. A more elegant solution could be used but this works for now. Sponsored by: FreeBSD Foundation Added: projects/uefi/sys/boot/i386/efi/x86_efi_copy.c projects/uefi/sys/boot/i386/efi/x86_efi_copy.h Deleted: projects/uefi/sys/boot/i386/efi/i386_copy.c Modified: projects/uefi/sys/boot/i386/efi/Makefile projects/uefi/sys/boot/i386/efi/bootinfo.c projects/uefi/sys/boot/i386/efi/bootinfo64.c projects/uefi/sys/boot/i386/efi/elf64_freebsd.c projects/uefi/sys/boot/i386/efi/main.c Modified: projects/uefi/sys/boot/i386/efi/Makefile ============================================================================== --- projects/uefi/sys/boot/i386/efi/Makefile Sun Feb 10 04:14:25 2013 (r246607) +++ projects/uefi/sys/boot/i386/efi/Makefile Sun Feb 10 04:17:41 2013 (r246608) @@ -11,7 +11,7 @@ INTERNALPROG= # architecture-specific loader code SRCS= main.c exec.c conf.c vers.c reloc.c elf32_freebsd.c elf64_freebsd.c -SRCS+= i386_copy.c bootinfo.c bootinfo64.c autoload.c devicename.c efimd.c +SRCS+= x86_efi_copy.c bootinfo.c bootinfo64.c autoload.c devicename.c efimd.c .PATH: ${.CURDIR}/${MACHINE_CPUARCH} SRCS+= start.S Modified: projects/uefi/sys/boot/i386/efi/bootinfo.c ============================================================================== --- projects/uefi/sys/boot/i386/efi/bootinfo.c Sun Feb 10 04:14:25 2013 (r246607) +++ projects/uefi/sys/boot/i386/efi/bootinfo.c Sun Feb 10 04:17:41 2013 (r246608) @@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include "libi386.h" #include +#include "x86_efi_copy.h" + /* * Return a 'boothowto' value corresponding to the kernel arguments in * (kargs) and any relevant environment variables. @@ -120,24 +122,24 @@ bi_copyenv(vm_offset_t start) /* Traverse the environment. */ for (ep = environ; ep != NULL; ep = ep->ev_next) { len = strlen(ep->ev_name); - if (i386_copyin(ep->ev_name, addr, len) != len) + if (x86_efi_copyin(ep->ev_name, addr, len) != len) break; addr += len; - if (i386_copyin("=", addr, 1) != 1) + if (x86_efi_copyin("=", addr, 1) != 1) break; addr++; if (ep->ev_value != NULL) { len = strlen(ep->ev_value); - if (i386_copyin(ep->ev_value, addr, len) != len) + if (x86_efi_copyin(ep->ev_value, addr, len) != len) break; addr += len; } - if (i386_copyin("", addr, 1) != 1) + if (x86_efi_copyin("", addr, 1) != 1) break; last = ++addr; } - if (i386_copyin("", last++, 1) != 1) + if (x86_efi_copyin("", last++, 1) != 1) last = start; return(last); } @@ -160,14 +162,14 @@ bi_copyenv(vm_offset_t start) */ #define COPY32(v, a) { \ u_int32_t x = (v); \ - i386_copyin(&x, a, sizeof(x)); \ + x86_efi_copyin(&x, a, sizeof(x)); \ a += sizeof(x); \ } #define MOD_STR(t, a, s) { \ COPY32(t, a); \ COPY32(strlen(s) + 1, a); \ - i386_copyin(s, a, strlen(s) + 1); \ + x86_efi_copyin(s, a, strlen(s) + 1); \ a += roundup(strlen(s) + 1, sizeof(u_int64_t));\ } @@ -178,7 +180,7 @@ bi_copyenv(vm_offset_t start) #define MOD_VAR(t, a, s) { \ COPY32(t, a); \ COPY32(sizeof(s), a); \ - i386_copyin(&s, a, sizeof(s)); \ + x86_efi_copyin(&s, a, sizeof(s)); \ a += roundup(sizeof(s), sizeof(u_int64_t)); \ } @@ -188,7 +190,7 @@ bi_copyenv(vm_offset_t start) #define MOD_METADATA(a, mm) { \ COPY32(MODINFO_METADATA | mm->md_type, a); \ COPY32(mm->md_size, a); \ - i386_copyin(mm->md_data, a, mm->md_size); \ + x86_efi_copyin(mm->md_data, a, mm->md_size); \ a += roundup(mm->md_size, sizeof(u_int64_t));\ } Modified: projects/uefi/sys/boot/i386/efi/bootinfo64.c ============================================================================== --- projects/uefi/sys/boot/i386/efi/bootinfo64.c Sun Feb 10 04:14:25 2013 (r246607) +++ projects/uefi/sys/boot/i386/efi/bootinfo64.c Sun Feb 10 04:17:41 2013 (r246608) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include "bootstrap.h" #include "libi386.h" +#include "x86_efi_copy.h" /* * Copy module-related data into the load area, where it can be @@ -57,7 +58,7 @@ __FBSDID("$FreeBSD$"); #define COPY32(v, a, c) { \ u_int32_t x = (v); \ if (c) \ - i386_copyin(&x, a, sizeof(x)); \ + x86_efi_copyin(&x, a, sizeof(x)); \ a += sizeof(x); \ } @@ -65,7 +66,7 @@ __FBSDID("$FreeBSD$"); COPY32(t, a, c); \ COPY32(strlen(s) + 1, a, c); \ if (c) \ - i386_copyin(s, a, strlen(s) + 1); \ + x86_efi_copyin(s, a, strlen(s) + 1); \ a += roundup(strlen(s) + 1, sizeof(u_int64_t));\ } @@ -77,7 +78,7 @@ __FBSDID("$FreeBSD$"); COPY32(t, a, c); \ COPY32(sizeof(s), a, c); \ if (c) \ - i386_copyin(&s, a, sizeof(s)); \ + x86_efi_copyin(&s, a, sizeof(s)); \ a += roundup(sizeof(s), sizeof(u_int64_t)); \ } @@ -88,7 +89,7 @@ __FBSDID("$FreeBSD$"); COPY32(MODINFO_METADATA | mm->md_type, a, c); \ COPY32(mm->md_size, a, c); \ if (c) \ - i386_copyin(mm->md_data, a, mm->md_size); \ + x86_efi_copyin(mm->md_data, a, mm->md_size); \ a += roundup(mm->md_size, sizeof(u_int64_t));\ } Modified: projects/uefi/sys/boot/i386/efi/elf64_freebsd.c ============================================================================== --- projects/uefi/sys/boot/i386/efi/elf64_freebsd.c Sun Feb 10 04:14:25 2013 (r246607) +++ projects/uefi/sys/boot/i386/efi/elf64_freebsd.c Sun Feb 10 04:17:41 2013 (r246608) @@ -49,6 +49,8 @@ __FBSDID("$FreeBSD$"); #include "actypes.h" #include "actbl.h" +#include "x86_efi_copy.h" + static EFI_GUID acpi_guid = ACPI_TABLE_GUID; static EFI_GUID acpi20_guid = ACPI_20_TABLE_GUID; @@ -155,6 +157,8 @@ elf64_exec(struct preloaded_file *fp) dev_cleanup(); + x86_efi_copy_finish(); + mp = modulep & 0xffffffff; ke = kernend & 0xffffffff; pagetable = (uintptr_t)PT4; Modified: projects/uefi/sys/boot/i386/efi/main.c ============================================================================== --- projects/uefi/sys/boot/i386/efi/main.c Sun Feb 10 04:14:25 2013 (r246607) +++ projects/uefi/sys/boot/i386/efi/main.c Sun Feb 10 04:17:41 2013 (r246608) @@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$"); #include #include "../libi386/libi386.h" +#include "x86_efi_copy.h" + extern char bootprog_name[]; extern char bootprog_rev[]; extern char bootprog_date[]; @@ -69,6 +71,11 @@ main(int argc, CHAR16 *argv[]) */ cons_probe(); + if (x86_efi_copy_init()) { + printf("failed to allocate staging area\n"); + return (EFI_BUFFER_TOO_SMALL); + } + /* * March through the device switch probing for things. */ @@ -115,9 +122,9 @@ main(int argc, CHAR16 *argv[]) archsw.arch_autoload = i386_autoload; archsw.arch_getdev = i386_getdev; - archsw.arch_copyin = i386_copyin; - archsw.arch_copyout = i386_copyout; - archsw.arch_readin = i386_readin; + archsw.arch_copyin = x86_efi_copyin; + archsw.arch_copyout = x86_efi_copyout; + archsw.arch_readin = x86_efi_readin; interact(); /* doesn't return */ Added: projects/uefi/sys/boot/i386/efi/x86_efi_copy.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/uefi/sys/boot/i386/efi/x86_efi_copy.c Sun Feb 10 04:17:41 2013 (r246608) @@ -0,0 +1,98 @@ +/*- + * Copyright (c) 2013 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Benno Rice under sponsorship from + * the FreeBSD Foundation. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include + +#include +#include + +#include +#include + +#define STAGE_PAGES 8000 /* 32MB */ + +EFI_PHYSICAL_ADDRESS staging; +int stage_offset_set = 0; +ssize_t stage_offset; + +int +x86_efi_copy_init(void) +{ + EFI_STATUS status; + + status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData, + STAGE_PAGES, &staging); + if (EFI_ERROR(status)) { + printf("failed to allocate staging area: %d\n", + status & EFI_ERROR_MASK); + return (status); + } + + printf("x86_efi_copyinit>>> staging=0x%016x\n", staging); + return (0); +} + +ssize_t +x86_efi_copyin(const void *src, vm_offset_t dest, const size_t len) +{ + + if (!stage_offset_set) { + stage_offset = (vm_offset_t)staging - dest; + stage_offset_set = 1; + } + + bcopy(src, (void *)(dest + stage_offset), len); + return (len); +} + +ssize_t +x86_efi_copyout(const vm_offset_t src, void *dest, const size_t len) +{ + + bcopy((void *)(src + stage_offset), dest, len); + return (len); +} + + +ssize_t +x86_efi_readin(const int fd, vm_offset_t dest, const size_t len) +{ + + return (read(fd, (void *)(dest + stage_offset), len)); +} + +void +x86_efi_copy_finish(void) +{ + + bcopy((void *)staging, (void *)(staging - stage_offset), + STAGE_PAGES * EFI_PAGE_SIZE); +} Added: projects/uefi/sys/boot/i386/efi/x86_efi_copy.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/uefi/sys/boot/i386/efi/x86_efi_copy.h Sun Feb 10 04:17:41 2013 (r246608) @@ -0,0 +1,41 @@ +/*- + * Copyright (c) 2013 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Benno Rice under sponsorship from + * the FreeBSD Foundation. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _X86_EFI_COPY_H_ +#define _X86_EFI_COPY_H_ + +int x86_efi_copy_init(void); +void x86_efi_copy_finish(void); + +ssize_t x86_efi_copyin(const void *src, vm_offset_t dest, const size_t len); +ssize_t x86_efi_copyout(const vm_offset_t src, void *dest, const size_t len); +ssize_t x86_efi_readin(const int fd, vm_offset_t dest, const size_t len); + +#endif /* _X86_EFI_COPY_H_ */ From owner-svn-src-projects@FreeBSD.ORG Sun Feb 10 10:17:42 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 73C72B93; Sun, 10 Feb 2013 10:17:42 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4E9D5294; Sun, 10 Feb 2013 10:17:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1AAHgG8016442; Sun, 10 Feb 2013 10:17:42 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1AAHg2g016440; Sun, 10 Feb 2013 10:17:42 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201302101017.r1AAHg2g016440@svn.freebsd.org> From: Benno Rice Date: Sun, 10 Feb 2013 10:17:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246613 - projects/uefi/sys/boot/common 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.14 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, 10 Feb 2013 10:17:42 -0000 Author: benno Date: Sun Feb 10 10:17:41 2013 New Revision: 246613 URL: http://svnweb.freebsd.org/changeset/base/246613 Log: Make it possible to load 32-bit kernels/modules from a 64-bit loader. Sponsored by: FreeBSD Foundation Modified: projects/uefi/sys/boot/common/load_elf.c Modified: projects/uefi/sys/boot/common/load_elf.c ============================================================================== --- projects/uefi/sys/boot/common/load_elf.c Sun Feb 10 10:17:33 2013 (r246612) +++ projects/uefi/sys/boot/common/load_elf.c Sun Feb 10 10:17:41 2013 (r246613) @@ -50,6 +50,13 @@ __FBSDID("$FreeBSD$"); #define ELF_TARG_MACH EM_X86_64 #endif +#if defined(__amd64__) && __ELF_WORD_SIZE == 32 +#undef ELF_TARG_CLASS +#undef ELF_TARG_MACH +#define ELF_TARG_CLASS ELFCLASS32 +#define ELF_TARG_MACH EM_386 +#endif + typedef struct elf_file { Elf_Phdr *ph; Elf_Ehdr *ehdr; @@ -595,6 +602,13 @@ struct mod_metadata64 { u_int64_t md_data; /* specific data */ u_int64_t md_cval; /* common string label */ }; +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 +struct mod_metadata32 { + int md_version; /* structure version MDTV_* */ + int md_type; /* type of entry MDT_* */ + u_int32_t md_data; /* specific data */ + u_int32_t md_cval; /* common string label */ +}; #endif int @@ -603,6 +617,8 @@ __elfN(parse_modmetadata)(struct preload struct mod_metadata md; #if (defined(__i386__) || defined(__powerpc__)) && __ELF_WORD_SIZE == 64 struct mod_metadata64 md64; +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 + struct mod_metadata32 md32; #endif struct mod_depend *mdepend; struct mod_version mver; @@ -638,6 +654,18 @@ __elfN(parse_modmetadata)(struct preload md.md_type = md64.md_type; md.md_cval = (const char *)(uintptr_t)md64.md_cval; md.md_data = (void *)(uintptr_t)md64.md_data; +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 + COPYOUT(v, &md32, sizeof(md32)); + error = __elfN(reloc_ptr)(fp, ef, v, &md32, sizeof(md32)); + if (error == EOPNOTSUPP) { + md32.md_cval += ef->off; + md32.md_data += ef->off; + } else if (error != 0) + return (error); + md.md_version = md32.md_version; + md.md_type = md32.md_type; + md.md_cval = (const char *)(uintptr_t)md32.md_cval; + md.md_data = (void *)(uintptr_t)md32.md_data; #else COPYOUT(v, &md, sizeof(md)); error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md)); From owner-svn-src-projects@FreeBSD.ORG Sun Feb 10 14:07:09 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 58577495; Sun, 10 Feb 2013 14:07:09 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from adsum.doit.wisc.edu (adsum.doit.wisc.edu [144.92.197.210]) by mx1.freebsd.org (Postfix) with ESMTP id 2A600EC3; Sun, 10 Feb 2013 14:07:08 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; CHARSET=US-ASCII Received: from avs-daemon.smtpauth1.wiscmail.wisc.edu by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) id <0MI000A00CH0BA00@smtpauth1.wiscmail.wisc.edu>; Sun, 10 Feb 2013 08:07:02 -0600 (CST) X-Spam-PmxInfo: Server=avs-1, Version=5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.2.10.140017, SenderIP=0.0.0.0 X-Spam-Report: AuthenticatedSender=yes, SenderIP=0.0.0.0 Received: from wanderer.tachypleus.net (adsl-76-208-68-53.dsl.mdsnwi.sbcglobal.net [76.208.68.53]) by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7u2-7.05 32bit (built Jul 30 2009)) with ESMTPSA id <0MI0007Q6CJNJW00@smtpauth1.wiscmail.wisc.edu>; Sun, 10 Feb 2013 08:07:01 -0600 (CST) X-Wisc-Sender: whitehorn@wisc.edu Message-id: <5117A983.4000605@freebsd.org> Date: Sun, 10 Feb 2013 08:06:59 -0600 From: Nathan Whitehorn User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130112 Thunderbird/17.0.2 To: Benno Rice Subject: Re: svn commit: r246613 - projects/uefi/sys/boot/common References: <201302101017.r1AAHg2g016440@svn.freebsd.org> In-reply-to: <201302101017.r1AAHg2g016440@svn.freebsd.org> Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Feb 2013 14:07:09 -0000 This is something potentially useful on non-x86 platforms. Could you do s/__amd64__/__LP64__ here? The first set of #define should also be redundant (the amd64 elf.h -- and other platforms -- define ELF_TARG appropriately in elf.h based on __ELF_WORD_SIZE already). -Nathan On 02/10/13 04:17, Benno Rice wrote: > Author: benno > Date: Sun Feb 10 10:17:41 2013 > New Revision: 246613 > URL: http://svnweb.freebsd.org/changeset/base/246613 > > Log: > Make it possible to load 32-bit kernels/modules from a 64-bit loader. > > Sponsored by: FreeBSD Foundation > > Modified: > projects/uefi/sys/boot/common/load_elf.c > > Modified: projects/uefi/sys/boot/common/load_elf.c > ============================================================================== > --- projects/uefi/sys/boot/common/load_elf.c Sun Feb 10 10:17:33 2013 (r246612) > +++ projects/uefi/sys/boot/common/load_elf.c Sun Feb 10 10:17:41 2013 (r246613) > @@ -50,6 +50,13 @@ __FBSDID("$FreeBSD$"); > #define ELF_TARG_MACH EM_X86_64 > #endif > > +#if defined(__amd64__) && __ELF_WORD_SIZE == 32 > +#undef ELF_TARG_CLASS > +#undef ELF_TARG_MACH > +#define ELF_TARG_CLASS ELFCLASS32 > +#define ELF_TARG_MACH EM_386 > +#endif > + > typedef struct elf_file { > Elf_Phdr *ph; > Elf_Ehdr *ehdr; > @@ -595,6 +602,13 @@ struct mod_metadata64 { > u_int64_t md_data; /* specific data */ > u_int64_t md_cval; /* common string label */ > }; > +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 > +struct mod_metadata32 { > + int md_version; /* structure version MDTV_* */ > + int md_type; /* type of entry MDT_* */ > + u_int32_t md_data; /* specific data */ > + u_int32_t md_cval; /* common string label */ > +}; > #endif > > int > @@ -603,6 +617,8 @@ __elfN(parse_modmetadata)(struct preload > struct mod_metadata md; > #if (defined(__i386__) || defined(__powerpc__)) && __ELF_WORD_SIZE == 64 > struct mod_metadata64 md64; > +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 > + struct mod_metadata32 md32; > #endif > struct mod_depend *mdepend; > struct mod_version mver; > @@ -638,6 +654,18 @@ __elfN(parse_modmetadata)(struct preload > md.md_type = md64.md_type; > md.md_cval = (const char *)(uintptr_t)md64.md_cval; > md.md_data = (void *)(uintptr_t)md64.md_data; > +#elif defined(__amd64__) && __ELF_WORD_SIZE == 32 > + COPYOUT(v, &md32, sizeof(md32)); > + error = __elfN(reloc_ptr)(fp, ef, v, &md32, sizeof(md32)); > + if (error == EOPNOTSUPP) { > + md32.md_cval += ef->off; > + md32.md_data += ef->off; > + } else if (error != 0) > + return (error); > + md.md_version = md32.md_version; > + md.md_type = md32.md_type; > + md.md_cval = (const char *)(uintptr_t)md32.md_cval; > + md.md_data = (void *)(uintptr_t)md32.md_data; > #else > COPYOUT(v, &md, sizeof(md)); > error = __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md)); > From owner-svn-src-projects@FreeBSD.ORG Sun Feb 10 23:49:19 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 663CFE07; Sun, 10 Feb 2013 23:49:19 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2AE92934; Sun, 10 Feb 2013 23:49:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1ANnIPx058551; Sun, 10 Feb 2013 23:49:18 GMT (envelope-from benno@svn.freebsd.org) Received: (from benno@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1ANnILP058550; Sun, 10 Feb 2013 23:49:18 GMT (envelope-from benno@svn.freebsd.org) Message-Id: <201302102349.r1ANnILP058550@svn.freebsd.org> From: Benno Rice Date: Sun, 10 Feb 2013 23:49:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246642 - projects/uefi 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.14 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, 10 Feb 2013 23:49:19 -0000 Author: benno Date: Sun Feb 10 23:49:18 2013 New Revision: 246642 URL: http://svnweb.freebsd.org/changeset/base/246642 Log: Move this information to https://wiki.freebsd.org/UEFI Deleted: projects/uefi/UEFI-TODO.txt From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:10:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 44018AF0; Mon, 11 Feb 2013 12:10:25 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 36F862C6; Mon, 11 Feb 2013 12:10:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCAPkP083703; Mon, 11 Feb 2013 12:10:25 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCAOtR083647; Mon, 11 Feb 2013 12:10:24 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111210.r1BCAOtR083647@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:10:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246662 - projects/portbuild/admin/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.14 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, 11 Feb 2013 12:10:25 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:10:24 2013 New Revision: 246662 URL: http://svnweb.freebsd.org/changeset/base/246662 Log: Suggested bugfixes from crees. Modified: projects/portbuild/admin/etc/rc.d/pollmachine projects/portbuild/admin/etc/rc.d/qmanager Modified: projects/portbuild/admin/etc/rc.d/pollmachine ============================================================================== --- projects/portbuild/admin/etc/rc.d/pollmachine Mon Feb 11 11:33:56 2013 (r246661) +++ projects/portbuild/admin/etc/rc.d/pollmachine Mon Feb 11 12:10:24 2013 (r246662) @@ -8,20 +8,21 @@ export PATH=/usr/local/bin:${PATH} -pb=/var/portbuild +pb=${portbuild_base:-/a/portbuild} config_file=${pb}/conf/server.conf if [ ! -f ${config_file} ]; then echo "$0: ${config_file} must exist!" exit 1 fi + +. ${config_file} + if [ -z "${PORTBUILD_USER}" ]; then echo "$0: You must define PORTBUILD_USER in ${config_file}." exit 1 fi -. ${config_file} - case $1 in start) s=${pb}/scripts/pollmachine Modified: projects/portbuild/admin/etc/rc.d/qmanager ============================================================================== --- projects/portbuild/admin/etc/rc.d/qmanager Mon Feb 11 11:33:56 2013 (r246661) +++ projects/portbuild/admin/etc/rc.d/qmanager Mon Feb 11 12:10:24 2013 (r246662) @@ -8,20 +8,21 @@ export PATH=/usr/local/bin:${PATH} -pb=/var/portbuild +pb=${portbuild_base:-/a/portbuild} config_file=${pb}/conf/server.conf if [ ! -f ${config_file} ]; then echo "$0: ${config_file} must exist!" exit 1 fi + +. ${config_file} + if [ -z "${PORTBUILD_USER}" ]; then echo "$0: You must define PORTBUILD_USER in ${config_file}." exit 1 fi -. ${config_file} - case $1 in start) s=${pb}/qmanager/qmanager.py From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:30:38 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E66FF1E2; Mon, 11 Feb 2013 12:30:38 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D74B33D8; Mon, 11 Feb 2013 12:30:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCUcHf089488; Mon, 11 Feb 2013 12:30:38 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCUcPh089480; Mon, 11 Feb 2013 12:30:38 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111230.r1BCUcPh089480@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:30:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246663 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 12:30:39 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:30:38 2013 New Revision: 246663 URL: http://svnweb.freebsd.org/changeset/base/246663 Log: Rewrite of mkportbuild for a new world where portbuild only own files and responsibilities for managing clients. Server-based operations such as svn updates and zfs maintenance are now reserved to a "more powerful" user, designated srcbuild. portbuild trusts srcbuild but completely not vice versa. Request by: rwatson Added: projects/portbuild/admin/tools/newmkportbuild (contents, props changed) Added: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 12:30:38 2013 (r246663) @@ -0,0 +1,150 @@ +#!/bin/sh +# +# server-side script to setup the portbuild ZFS volume, delegate its +# administration, and check out the repository. Must be run as root. +# +# Designed to be run before anything else. +# + +DEFAULT_PORTBUILD_USER="portbuild" +DEFAULT_SRCBUILD_USER="srcbuild" +DEFAULT_VCS_CHECKOUT_COMMAND="svn checkout" +DEFAULT_VCS_REPOSITORY="svn://svn.FreeBSD.org" +DEFAULT_ZFS_VOLUME="a" +DEFAULT_ZFS_PERMISSIONSET="clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot" + +SRCBUILD_OWNED_SUBDIRS="chroot pxeroot snap" +PORTBUILD_OWNED_SUBDIRS="portbuild" + +if [ `id -u` != 0 ]; then + echo "$0 must be run as root." + exit 1 +fi + +if [ -z "${PORTBUILD_USER}" ]; then + echo "You must export PORTBUILD_USER, for example, export PORTBUILD_USER=${DEFAULT_PORTBUILD_USER}." + exit 1 +fi +if [ -z "${SRCBUILD_USER}" ]; then + echo "You must export SRCBUILD_USER, for example, export SRCBUILD_USER=${DEFAULT_SRCBUILD_USER}." + exit 1 +fi +if [ -z "${VCS_CHECKOUT_COMMAND}" ]; then + VCS_CHECKOUT_COMMAND="${DEFAULT_VCS_CHECKOUT_COMMAND}" +fi +if [ -z "${VCS_PORTBUILD_REPOSITORY}" ]; then + echo "You have not set VCS_PORTBUILD_REPOSITORY. I will try to set it from VCS_REPOSITORY." + if [ -z "${VCS_REPOSITORY}" ]; then + echo "You have not set VCS_REPOSITORY. I will use the default, ${DEFAULT_VCS_REPOSITORY}." + VCS_REPOSITORY=${DEFAULT_VCS_REPOSITORY} + fi + VCS_PORTBUILD_REPOSITORY="${VCS_REPOSITORY}/base/projects/portbuild" +fi +if [ -z "${ZFS_VOLUME}" ]; then + echo "You must export ZFS_VOLUME, for example, export ZFS_VOLUME=${DEFAULT_ZFS_VOLUME}." + exit 1 +fi +ZFS_MOUNTPOINT="/${ZFS_VOLUME}" +if [ -z "${ZFS_PERMISSIONSET}" ]; then + echo "You have not set ZFS_PERMISSIONSET. I will use the default, ${DEFAULT_ZFS_PERMISSIONSET}." + ZFS_PERMISSIONSET="${DEFAULT_ZFS_PERMISSIONSET}" +fi + +# sprinkle magic fairy dust to help delegate zfs permissions +sysctl vfs.usermount=1 +sysctl vfs.zfs.super_owner=1 + +name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}` +if [ -z "${name}" ]; then + echo "ZFS volume ${ZFS_VOLUME} does not exist. You must create it first." + exit 1 +fi + +mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}` +if [ ! -z "${mounted}" ]; then + echo "ZFS volume ${ZFS_VOLUME} is mounted. I'll unmount it for you then remount it later." + zfs umount ${ZFS_VOLUME} 2> /dev/null +fi + +# create a place to hold all portbuild-managed files. All other ZFS_VOLUME +# files are managed by srcbuild. +if [ ! -d ${ZFS_MOUNTPOINT}/portbuild ]; then + echo "ZFS volume ${ZFS_VOLUME}/portbuild does not exist. I'll create it for you." + zfs create ${ZFS_VOLUME}/portbuild || exit 1 +fi + +# reset the "zfsalladmin" permission set if it already exists. +zfs unallow -s @zfsalladmin ${ZFS_VOLUME} 2> /dev/null +zfs unallow -u ${SRCBUILD_USER} ${ZFS_VOLUME} 2> /dev/null + +# reset the "zfsportbuildadmin" permission set if it already exists. +zfs unallow -s @zfsportbuildadmin ${ZFS_VOLUME} 2> /dev/null +zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null + +# create the "zfsalladmin" permission set. +zfs allow -s @zfsalladmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME} || exit 1 + +# create the "zfsportbuildadmin" permission set. +zfs allow -s @zfsportbuildadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}/portbuild || exit 1 + +# delegate the "zfsalladmin" permission set to the SRCBUILD_USER. +zfs allow -du ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 +zfs allow -lu ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 + +mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}` +if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME} is not mounted. I'll remount it for you." + zfs mount ${ZFS_VOLUME} || exit 1 +fi +chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT} 2> /dev/null + +# create various subdirectories to be managed by srcbuild. +for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do + if [ ! -d ${ZFS_MOUNTPOINT}/${subdir} ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." + zfs create ${ZFS_VOLUME}/${subdir} || exit 1 + fi + mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` + if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." + zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 + fi + chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null +done + +# delegate the "zfsportbuildadmin" permission set to the PORTBUILD_USER. +zfs allow -du ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1 + +echo "results of ZFS operations:" +zfs list ${ZFS_VOLUME} +zfs allow ${ZFS_VOLUME} + +# create various subdirectories to be managed by portbuild. +for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do + if [ ! -d ${ZFS_MOUNTPOINT}/${subdir} ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." + zfs create ${ZFS_VOLUME}/${subdir} || exit 1 + fi + mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` + if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." + zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 + fi + chown ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null +done + + +echo "checking out the repository as user ${PORTBUILD_USER} ..." +su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1 + +echo "$0: you should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/conf." + +# create convenience directories. failure is annoying but non-fatal. +extra_dirs="lockfiles log" +for extra_dir in ${extra_dirs}; do + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then + su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir}" + fi +done + +echo "$0: done." From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:39:36 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1E93E413; Mon, 11 Feb 2013 12:39:36 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F144A639; Mon, 11 Feb 2013 12:39:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCdZdE091643; Mon, 11 Feb 2013 12:39:35 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCdZUR091642; Mon, 11 Feb 2013 12:39:35 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111239.r1BCdZUR091642@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:39:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246664 - projects/portbuild/admin/conf 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.14 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, 11 Feb 2013 12:39:36 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:39:35 2013 New Revision: 246664 URL: http://svnweb.freebsd.org/changeset/base/246664 Log: Add ZFS_PERMISSIONSET_SNAPS. This will allow PORTBUID_USER to clone and snapshot svn directroies. It used to be able to do this by itself, but now these directories are to be owned by the "more trusted" user SRCBUILD_CONF. Submitted by: crees Modified: projects/portbuild/admin/conf/admin.conf Modified: projects/portbuild/admin/conf/admin.conf ============================================================================== --- projects/portbuild/admin/conf/admin.conf Mon Feb 11 12:30:38 2013 (r246663) +++ projects/portbuild/admin/conf/admin.conf Mon Feb 11 12:39:35 2013 (r246664) @@ -17,9 +17,12 @@ ZFS_VOLUME=a # zfs mount point ZFS_MOUNTPOINT=/a -# zfs permission set. this delegates all permissions except "allow" and -# "receive". +# zfs general permission set. This delegates all permissions except +# "allow" and "receive". ZFS_PERMISSIONSET=clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot +# zfs restricted permission set. This is so that PORTBUILD_USER can +# clone from files owned by SRCBUILD_USER (see below). +ZFS_PERMISSIONSET_SNAPS=clone,snapshot # portbuild subtree. holds portbuild codebase plus all architectures. # belongs to PORTBUILD_USER. From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:42:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BA096628; Mon, 11 Feb 2013 12:42:06 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 948D465D; Mon, 11 Feb 2013 12:42:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCg6wS093636; Mon, 11 Feb 2013 12:42:06 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCg68T093635; Mon, 11 Feb 2013 12:42:06 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111242.r1BCg68T093635@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:42:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246665 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 12:42:06 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:42:06 2013 New Revision: 246665 URL: http://svnweb.freebsd.org/changeset/base/246665 Log: Checkpoint of changes to once again allow PORTBUILD_USER to clone from svn repositories. Submitted by: crees Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 12:39:35 2013 (r246664) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 12:42:06 2013 (r246665) @@ -79,6 +79,9 @@ zfs unallow -u ${SRCBUILD_USER} ${ZFS_VO # reset the "zfsportbuildadmin" permission set if it already exists. zfs unallow -s @zfsportbuildadmin ${ZFS_VOLUME} 2> /dev/null + +# reset the "zfssnapadmin" permission set if it already exists. +zfs unallow -s @zfssnapadmin ${ZFS_VOLUME} 2> /dev/null zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null # create the "zfsalladmin" permission set. @@ -87,6 +90,9 @@ zfs allow -s @zfsalladmin ${ZFS_PERMISSI # create the "zfsportbuildadmin" permission set. zfs allow -s @zfsportbuildadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}/portbuild || exit 1 +# create the "zfssnapadmin" permission set. +zfs allow -s @zfssnapadmin ${ZFS_PERMISSIONSET_SNAPS} ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 + # delegate the "zfsalladmin" permission set to the SRCBUILD_USER. zfs allow -du ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 zfs allow -lu ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 @@ -115,6 +121,9 @@ done # delegate the "zfsportbuildadmin" permission set to the PORTBUILD_USER. zfs allow -du ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1 +# delegate the "zfssnapadmin" permission set to the PORTBUILD_USER. +zfs allow -du ${PORTBUILD_USER} @zfssnapadmin ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 + echo "results of ZFS operations:" zfs list ${ZFS_VOLUME} zfs allow ${ZFS_VOLUME} @@ -137,6 +146,9 @@ done echo "checking out the repository as user ${PORTBUILD_USER} ..." su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1 +# XXX MCL now have to move some directories over, create different +# XXX MCL ownerships, and so forth. + echo "$0: you should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/conf." # create convenience directories. failure is annoying but non-fatal. From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:49:38 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9AE17C33; Mon, 11 Feb 2013 12:49:38 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 892F06E3; Mon, 11 Feb 2013 12:49:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCnciG094763; Mon, 11 Feb 2013 12:49:38 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCncXD094760; Mon, 11 Feb 2013 12:49:38 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111249.r1BCncXD094760@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:49:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246667 - projects/portbuild/admin/scripts 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.14 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, 11 Feb 2013 12:49:38 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:49:37 2013 New Revision: 246667 URL: http://svnweb.freebsd.org/changeset/base/246667 Log: Prepare for move of portbuild/lib to portbuild/admin/lib. lib/ now needs to be owned by srcbuild, thus the move. Modified: projects/portbuild/admin/scripts/zbackup projects/portbuild/admin/scripts/zexpire Modified: projects/portbuild/admin/scripts/zbackup ============================================================================== --- projects/portbuild/admin/scripts/zbackup Mon Feb 11 12:42:11 2013 (r246666) +++ projects/portbuild/admin/scripts/zbackup Mon Feb 11 12:49:37 2013 (r246667) @@ -6,7 +6,10 @@ import commands, datetime, sys, os, bz2 from signal import * -sys.path.insert(0, '/var/portbuild/lib/python') +pbc = os.getenv('PORTBUILD_CHECKOUT') \ + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" + +sys.path.insert(0, '%s/admin/lib/python' % pbc) import zfs Modified: projects/portbuild/admin/scripts/zexpire ============================================================================== --- projects/portbuild/admin/scripts/zexpire Mon Feb 11 12:42:11 2013 (r246666) +++ projects/portbuild/admin/scripts/zexpire Mon Feb 11 12:49:37 2013 (r246667) @@ -6,10 +6,8 @@ import sys, commands, datetime, os, stri pbc = os.getenv('PORTBUILD_CHECKOUT') \ if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" -pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from freebsd import * from freebsd_config import * From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:50:51 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 57F44D56; Mon, 11 Feb 2013 12:50:51 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4A6096EC; Mon, 11 Feb 2013 12:50:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCopDI096524; Mon, 11 Feb 2013 12:50:51 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCoorY096522; Mon, 11 Feb 2013 12:50:50 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111250.r1BCoorY096522@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:50:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246668 - projects/portbuild/admin/scripts 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.14 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, 11 Feb 2013 12:50:51 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:50:50 2013 New Revision: 246668 URL: http://svnweb.freebsd.org/changeset/base/246668 Log: Start canonicalizing on /a instead of /var. Modified: projects/portbuild/admin/scripts/updatesnap projects/portbuild/admin/scripts/updatesnap.ports Modified: projects/portbuild/admin/scripts/updatesnap ============================================================================== --- projects/portbuild/admin/scripts/updatesnap Mon Feb 11 12:49:37 2013 (r246667) +++ projects/portbuild/admin/scripts/updatesnap Mon Feb 11 12:50:50 2013 (r246668) @@ -3,7 +3,7 @@ # Update the master source trees that are used by package builds # and other consumers -pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} +pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} . ${pbc}/conf/server.conf Modified: projects/portbuild/admin/scripts/updatesnap.ports ============================================================================== --- projects/portbuild/admin/scripts/updatesnap.ports Mon Feb 11 12:49:37 2013 (r246667) +++ projects/portbuild/admin/scripts/updatesnap.ports Mon Feb 11 12:50:50 2013 (r246668) @@ -3,7 +3,7 @@ # Update the master ports tree that is used by package builds # and other consumers -pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} +pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} . ${pbc}/conf/server.conf From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:55:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E0EC9F17; Mon, 11 Feb 2013 12:55:25 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D34B873B; Mon, 11 Feb 2013 12:55:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCtPwm097178; Mon, 11 Feb 2013 12:55:25 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCtPBh097174; Mon, 11 Feb 2013 12:55:25 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111255.r1BCtPBh097174@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:55:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246669 - projects/portbuild/qmanager 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.14 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, 11 Feb 2013 12:55:25 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:55:24 2013 New Revision: 246669 URL: http://svnweb.freebsd.org/changeset/base/246669 Log: Move lib/ to admin/lib, for privilege separation. While here, carefully note why this is being done; move from /var/portbuild to /a/portbuild as the default; and delete unneccesary uses of ${pbd}. Modified: projects/portbuild/qmanager/dumpdb.py projects/portbuild/qmanager/packagebuild projects/portbuild/qmanager/qclient projects/portbuild/qmanager/qmanager.py Modified: projects/portbuild/qmanager/dumpdb.py ============================================================================== --- projects/portbuild/qmanager/dumpdb.py Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/dumpdb.py Mon Feb 11 12:55:24 2013 (r246669) @@ -5,11 +5,9 @@ import sys, os, threading, socket, Queue pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" -pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from signal import * from sys import exc_info Modified: projects/portbuild/qmanager/packagebuild ============================================================================== --- projects/portbuild/qmanager/packagebuild Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/packagebuild Mon Feb 11 12:55:24 2013 (r246669) @@ -36,11 +36,11 @@ import os import sys pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_DATA') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from qmanagerclient import * from freebsd_config import * @@ -444,6 +444,8 @@ class worker(threading.Thread): self.setDaemon(True) + # NOTE 20130211: only use ${pbc}/scripts here, *not* ${pbc}/admin/scripts, + # for privilege separation purposes. def run(self): pkg = self.job Modified: projects/portbuild/qmanager/qclient ============================================================================== --- projects/portbuild/qmanager/qclient Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/qclient Mon Feb 11 12:55:24 2013 (r246669) @@ -10,11 +10,9 @@ import socket, os, sys from optparse import OptionParser pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" -pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from qmanagerclient import * from freebsd_config import * Modified: projects/portbuild/qmanager/qmanager.py ============================================================================== --- projects/portbuild/qmanager/qmanager.py Mon Feb 11 12:50:50 2013 (r246668) +++ projects/portbuild/qmanager/qmanager.py Mon Feb 11 12:55:24 2013 (r246669) @@ -53,11 +53,9 @@ import os import sys pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" -pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) import socket, threading, time, Queue From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:56:46 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 837AF256; Mon, 11 Feb 2013 12:56:46 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5E3E874D; Mon, 11 Feb 2013 12:56:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCuk0G097426; Mon, 11 Feb 2013 12:56:46 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCukFd097425; Mon, 11 Feb 2013 12:56:46 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111256.r1BCukFd097425@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:56:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246671 - in projects/portbuild: admin/lib 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.14 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, 11 Feb 2013 12:56:46 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:56:45 2013 New Revision: 246671 URL: http://svnweb.freebsd.org/changeset/base/246671 Log: Move common files shared between PORTBUILD_USER and SRCBUILD_USER to be only writeable by SRCBUILD_USER, for greater privilege separation. Implicitly requested by: rwatson Added: projects/portbuild/admin/lib/ - copied from r246051, projects/portbuild/lib/ Deleted: projects/portbuild/lib/ From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 12:58:27 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5EBBB3A4; Mon, 11 Feb 2013 12:58:27 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 37EE1772; Mon, 11 Feb 2013 12:58:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BCwRNW097682; Mon, 11 Feb 2013 12:58:27 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BCwRYq097681; Mon, 11 Feb 2013 12:58:27 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111258.r1BCwRYq097681@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 12:58:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246672 - in projects/portbuild: admin/www www 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.14 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, 11 Feb 2013 12:58:27 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 12:58:26 2013 New Revision: 246672 URL: http://svnweb.freebsd.org/changeset/base/246672 Log: Move www ownership away from PORTBUILD_USER and to SRCBUILD_USER. Added: projects/portbuild/admin/www/ - copied from r246051, projects/portbuild/www/ Deleted: projects/portbuild/www/ From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 13:42:12 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 267AF3B1; Mon, 11 Feb 2013 13:42:12 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1929C9DD; Mon, 11 Feb 2013 13:42:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BDgBJN012186; Mon, 11 Feb 2013 13:42:11 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BDgBok012185; Mon, 11 Feb 2013 13:42:11 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111342.r1BDgBok012185@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 13:42:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246673 - projects/portbuild/admin/conf 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.14 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, 11 Feb 2013 13:42:12 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 13:42:11 2013 New Revision: 246673 URL: http://svnweb.freebsd.org/changeset/base/246673 Log: Since SRCBUILD_USER now owns the svn repositories, the definitions of which svn repositories to track must move out of portbuild/conf/server.conf and into here. Modified: projects/portbuild/admin/conf/admin.conf Modified: projects/portbuild/admin/conf/admin.conf ============================================================================== --- projects/portbuild/admin/conf/admin.conf Mon Feb 11 12:58:26 2013 (r246672) +++ projects/portbuild/admin/conf/admin.conf Mon Feb 11 13:42:11 2013 (r246673) @@ -10,6 +10,17 @@ # # +# top-level package building things +# + +SRC_BRANCHES="7 8 9 10" +SRC_BRANCHES_PATTERN="^[0-9]" +SRC_BRANCH_7_SUBDIR=releng/7.4/ +SRC_BRANCH_8_SUBDIR=releng/8.3/ +SRC_BRANCH_9_SUBDIR=releng/9.0/ +SRC_BRANCH_10_SUBDIR=head/ + +# # directory management definitions # From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 14:25:38 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 818BF3AA; Mon, 11 Feb 2013 14:25:38 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 72A5B345; Mon, 11 Feb 2013 14:25:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BEPc2Z025361; Mon, 11 Feb 2013 14:25:38 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BEPcwq025360; Mon, 11 Feb 2013 14:25:38 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111425.r1BEPcwq025360@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 14:25:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246676 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 14:25:38 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 14:25:37 2013 New Revision: 246676 URL: http://svnweb.freebsd.org/changeset/base/246676 Log: Add sub-permissions for snapshot directories. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 13:59:57 2013 (r246675) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:25:37 2013 (r246676) @@ -12,7 +12,9 @@ DEFAULT_VCS_CHECKOUT_COMMAND="svn checko DEFAULT_VCS_REPOSITORY="svn://svn.FreeBSD.org" DEFAULT_ZFS_VOLUME="a" DEFAULT_ZFS_PERMISSIONSET="clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot" +DEFAULT_ZFS_PERMISSIONSET_SNAPS="clone,snapshot" +# ownership of direct subdirectories of DEFAULT_ZFS_VOLUME SRCBUILD_OWNED_SUBDIRS="chroot pxeroot snap" PORTBUILD_OWNED_SUBDIRS="portbuild" @@ -49,6 +51,10 @@ if [ -z "${ZFS_PERMISSIONSET}" ]; then echo "You have not set ZFS_PERMISSIONSET. I will use the default, ${DEFAULT_ZFS_PERMISSIONSET}." ZFS_PERMISSIONSET="${DEFAULT_ZFS_PERMISSIONSET}" fi +if [ -z "${ZFS_PERMISSIONSET_SNAPS}" ]; then + echo "You have not set ZFS_PERMISSIONSET_SNAPS. I will use the default, ${DEFAULT_ZFS_PERMISSIONSET_SNAPS}." + ZFS_PERMISSIONSET_SNAPS="${DEFAULT_ZFS_PERMISSIONSET_SNAPS}" +fi # sprinkle magic fairy dust to help delegate zfs permissions sysctl vfs.usermount=1 From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 14:27:33 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4934C505; Mon, 11 Feb 2013 14:27:33 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3C58035E; Mon, 11 Feb 2013 14:27:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BERXgl025635; Mon, 11 Feb 2013 14:27:33 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BERXeE025634; Mon, 11 Feb 2013 14:27:33 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111427.r1BERXeE025634@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 14:27:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246677 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 14:27:33 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 14:27:32 2013 New Revision: 246677 URL: http://svnweb.freebsd.org/changeset/base/246677 Log: Cosmetic. Makes understanding the zfs permission set default a little bit easier. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:25:37 2013 (r246676) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:27:32 2013 (r246677) @@ -37,7 +37,7 @@ fi if [ -z "${VCS_PORTBUILD_REPOSITORY}" ]; then echo "You have not set VCS_PORTBUILD_REPOSITORY. I will try to set it from VCS_REPOSITORY." if [ -z "${VCS_REPOSITORY}" ]; then - echo "You have not set VCS_REPOSITORY. I will use the default, ${DEFAULT_VCS_REPOSITORY}." + echo "You have not set VCS_REPOSITORY. I will use the default: ${DEFAULT_VCS_REPOSITORY}." VCS_REPOSITORY=${DEFAULT_VCS_REPOSITORY} fi VCS_PORTBUILD_REPOSITORY="${VCS_REPOSITORY}/base/projects/portbuild" @@ -48,11 +48,11 @@ if [ -z "${ZFS_VOLUME}" ]; then fi ZFS_MOUNTPOINT="/${ZFS_VOLUME}" if [ -z "${ZFS_PERMISSIONSET}" ]; then - echo "You have not set ZFS_PERMISSIONSET. I will use the default, ${DEFAULT_ZFS_PERMISSIONSET}." + echo "You have not set ZFS_PERMISSIONSET. I will use the default: ${DEFAULT_ZFS_PERMISSIONSET}." ZFS_PERMISSIONSET="${DEFAULT_ZFS_PERMISSIONSET}" fi if [ -z "${ZFS_PERMISSIONSET_SNAPS}" ]; then - echo "You have not set ZFS_PERMISSIONSET_SNAPS. I will use the default, ${DEFAULT_ZFS_PERMISSIONSET_SNAPS}." + echo "You have not set ZFS_PERMISSIONSET_SNAPS. I will use the default: ${DEFAULT_ZFS_PERMISSIONSET_SNAPS}." ZFS_PERMISSIONSET_SNAPS="${DEFAULT_ZFS_PERMISSIONSET_SNAPS}" fi From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 14:30:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5A0C49DC; Mon, 11 Feb 2013 14:30:07 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4D7563D3; Mon, 11 Feb 2013 14:30:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BEU7KG026104; Mon, 11 Feb 2013 14:30:07 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BEU7A8026103; Mon, 11 Feb 2013 14:30:07 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111430.r1BEU7A8026103@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 14:30:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246679 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 14:30:07 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 14:30:06 2013 New Revision: 246679 URL: http://svnweb.freebsd.org/changeset/base/246679 Log: "mounted" can return "no". I fixed this everywhere but this one instance. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:29:38 2013 (r246678) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:30:06 2013 (r246679) @@ -67,7 +67,7 @@ if [ -z "${name}" ]; then fi mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}` -if [ ! -z "${mounted}" ]; then +if [ -z "${mounted}" -o "${mounted}" = "no" ]; then echo "ZFS volume ${ZFS_VOLUME} is mounted. I'll unmount it for you then remount it later." zfs umount ${ZFS_VOLUME} 2> /dev/null fi From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 14:32:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4F220BFB; Mon, 11 Feb 2013 14:32:07 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3848D3F2; Mon, 11 Feb 2013 14:32:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BEW78t028020; Mon, 11 Feb 2013 14:32:07 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BEW7FW028019; Mon, 11 Feb 2013 14:32:07 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111432.r1BEW7FW028019@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 14:32:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246680 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 14:32:07 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 14:32:06 2013 New Revision: 246680 URL: http://svnweb.freebsd.org/changeset/base/246680 Log: Fix sense of the test. It is the opposite of the others. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:30:06 2013 (r246679) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:32:06 2013 (r246680) @@ -67,7 +67,7 @@ if [ -z "${name}" ]; then fi mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}` -if [ -z "${mounted}" -o "${mounted}" = "no" ]; then +if [ ! -z "${mounted}" -a "${mounted}" != "no" ]; then echo "ZFS volume ${ZFS_VOLUME} is mounted. I'll unmount it for you then remount it later." zfs umount ${ZFS_VOLUME} 2> /dev/null fi From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 14:45:42 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A741EF46; Mon, 11 Feb 2013 14:45:42 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 903556A0; Mon, 11 Feb 2013 14:45:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BEjg4a031425; Mon, 11 Feb 2013 14:45:42 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BEjgGq031423; Mon, 11 Feb 2013 14:45:42 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111445.r1BEjgGq031423@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 14:45:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246681 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 14:45:42 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 14:45:41 2013 New Revision: 246681 URL: http://svnweb.freebsd.org/changeset/base/246681 Log: Fix the test for whether the portbuild zpool exists. While here, add some more armor-plating. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:32:06 2013 (r246680) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 14:45:41 2013 (r246681) @@ -27,10 +27,19 @@ if [ -z "${PORTBUILD_USER}" ]; then echo "You must export PORTBUILD_USER, for example, export PORTBUILD_USER=${DEFAULT_PORTBUILD_USER}." exit 1 fi +if [ ! `id ${PORTBUILD_USER} 2> /dev/null` ]; then + echo "User ${PORTBUILD_USER} must exist." + exit 1 +fi if [ -z "${SRCBUILD_USER}" ]; then echo "You must export SRCBUILD_USER, for example, export SRCBUILD_USER=${DEFAULT_SRCBUILD_USER}." exit 1 fi +if [ ! `id ${SRCBUILD_USER} 2> /dev/null` ]; then + echo "User ${SRCBUILD_USER} must exist." + exit 1 +fi + if [ -z "${VCS_CHECKOUT_COMMAND}" ]; then VCS_CHECKOUT_COMMAND="${DEFAULT_VCS_CHECKOUT_COMMAND}" fi @@ -74,7 +83,8 @@ fi # create a place to hold all portbuild-managed files. All other ZFS_VOLUME # files are managed by srcbuild. -if [ ! -d ${ZFS_MOUNTPOINT}/portbuild ]; then +name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}/portbuild` +if [ -z "${name}" ]; then echo "ZFS volume ${ZFS_VOLUME}/portbuild does not exist. I'll create it for you." zfs create ${ZFS_VOLUME}/portbuild || exit 1 fi From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 15:13:28 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id EA4909C3; Mon, 11 Feb 2013 15:13:28 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DD3E183D; Mon, 11 Feb 2013 15:13:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BFDSXk040558; Mon, 11 Feb 2013 15:13:28 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BFDSpQ040557; Mon, 11 Feb 2013 15:13:28 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111513.r1BFDSpQ040557@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 15:13:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246682 - projects/portbuild/admin/conf 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.14 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, 11 Feb 2013 15:13:29 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 15:13:28 2013 New Revision: 246682 URL: http://svnweb.freebsd.org/changeset/base/246682 Log: Get rid of the misnomer "chroot" for the subdirectory where worlds are built. Modified: projects/portbuild/admin/conf/admin.conf Modified: projects/portbuild/admin/conf/admin.conf ============================================================================== --- projects/portbuild/admin/conf/admin.conf Mon Feb 11 14:45:41 2013 (r246681) +++ projects/portbuild/admin/conf/admin.conf Mon Feb 11 15:13:28 2013 (r246682) @@ -50,7 +50,7 @@ SNAP_SRC_DIRECTORY_PREFIX=${SNAP_DIRECTO # temporary workspace. # belongs to SRCBUILD_USER. -WORLDDIR=${ZFS_MOUNTPOINT}/chroot/ +WORLDDIR=${ZFS_MOUNTPOINT}/worlddir/ # XXX TODO (note: Python script, so avoid {}) #zbackup a/nfs a/local a/portbuild/* /dumpster From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 15:42:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5044A3D6; Mon, 11 Feb 2013 15:42:49 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 430D99E9; Mon, 11 Feb 2013 15:42:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BFgnOx049131; Mon, 11 Feb 2013 15:42:49 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BFgnDn049130; Mon, 11 Feb 2013 15:42:49 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302111542.r1BFgnDn049130@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 15:42:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246683 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 15:42:49 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 15:42:48 2013 New Revision: 246683 URL: http://svnweb.freebsd.org/changeset/base/246683 Log: Reorder operations so that all zfs creates are done before permission definitions. Although PORTBUILD_USER has only one subdirectory of ZFS_VOLUME to administer, parameterize it. Clean up some noise from the id(1) commands. Note: this is still not sufficient. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 15:13:28 2013 (r246682) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 15:42:48 2013 (r246683) @@ -13,9 +13,10 @@ DEFAULT_VCS_REPOSITORY="svn://svn.FreeBS DEFAULT_ZFS_VOLUME="a" DEFAULT_ZFS_PERMISSIONSET="clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot" DEFAULT_ZFS_PERMISSIONSET_SNAPS="clone,snapshot" +SNAP_DIRECTORY=snap # ownership of direct subdirectories of DEFAULT_ZFS_VOLUME -SRCBUILD_OWNED_SUBDIRS="chroot pxeroot snap" +SRCBUILD_OWNED_SUBDIRS="chroot pxeroot ${SNAP_DIRECTORY}" PORTBUILD_OWNED_SUBDIRS="portbuild" if [ `id -u` != 0 ]; then @@ -27,7 +28,7 @@ if [ -z "${PORTBUILD_USER}" ]; then echo "You must export PORTBUILD_USER, for example, export PORTBUILD_USER=${DEFAULT_PORTBUILD_USER}." exit 1 fi -if [ ! `id ${PORTBUILD_USER} 2> /dev/null` ]; then +if [ ! `id -u ${PORTBUILD_USER} 2> /dev/null` ]; then echo "User ${PORTBUILD_USER} must exist." exit 1 fi @@ -35,7 +36,7 @@ if [ -z "${SRCBUILD_USER}" ]; then echo "You must export SRCBUILD_USER, for example, export SRCBUILD_USER=${DEFAULT_SRCBUILD_USER}." exit 1 fi -if [ ! `id ${SRCBUILD_USER} 2> /dev/null` ]; then +if [ ! `id -u ${SRCBUILD_USER} 2> /dev/null` ]; then echo "User ${SRCBUILD_USER} must exist." exit 1 fi @@ -51,11 +52,13 @@ if [ -z "${VCS_PORTBUILD_REPOSITORY}" ]; fi VCS_PORTBUILD_REPOSITORY="${VCS_REPOSITORY}/base/projects/portbuild" fi + if [ -z "${ZFS_VOLUME}" ]; then echo "You must export ZFS_VOLUME, for example, export ZFS_VOLUME=${DEFAULT_ZFS_VOLUME}." exit 1 fi ZFS_MOUNTPOINT="/${ZFS_VOLUME}" + if [ -z "${ZFS_PERMISSIONSET}" ]; then echo "You have not set ZFS_PERMISSIONSET. I will use the default: ${DEFAULT_ZFS_PERMISSIONSET}." ZFS_PERMISSIONSET="${DEFAULT_ZFS_PERMISSIONSET}" @@ -81,13 +84,24 @@ if [ ! -z "${mounted}" -a "${mounted}" ! zfs umount ${ZFS_VOLUME} 2> /dev/null fi -# create a place to hold all portbuild-managed files. All other ZFS_VOLUME -# files are managed by srcbuild. -name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}/portbuild` -if [ -z "${name}" ]; then - echo "ZFS volume ${ZFS_VOLUME}/portbuild does not exist. I'll create it for you." - zfs create ${ZFS_VOLUME}/portbuild || exit 1 -fi +# create subdirectories for portbuild-managed files. All other ZFS_VOLUME +# subdirectories are managed by srcbuild. +for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do + name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}/${subdir}` + if [ -z "${name}" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." + zfs create ${ZFS_VOLUME}/${subdir} || exit 1 + fi +done + +# create subdirectories for srcbuild-managed files. +for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do + name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}/${subdir}` + if [ -z "${name}" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." + zfs create ${ZFS_VOLUME}/${subdir} || exit 1 + fi +done # reset the "zfsalladmin" permission set if it already exists. zfs unallow -s @zfsalladmin ${ZFS_VOLUME} 2> /dev/null @@ -113,6 +127,7 @@ zfs allow -s @zfssnapadmin ${ZFS_PERMISS zfs allow -du ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 zfs allow -lu ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 +# after (possibly) modifying permissions, now it's permissable to remount. mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}` if [ -z "${mounted}" -o "${mounted}" = "no" ]; then echo "ZFS volume ${ZFS_VOLUME} is not mounted. I'll remount it for you." @@ -120,12 +135,8 @@ if [ -z "${mounted}" -o "${mounted}" = " fi chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT} 2> /dev/null -# create various subdirectories to be managed by srcbuild. +# (re)mount various subdirectories to be managed by srcbuild. for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do - if [ ! -d ${ZFS_MOUNTPOINT}/${subdir} ]; then - echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." - zfs create ${ZFS_VOLUME}/${subdir} || exit 1 - fi mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` if [ -z "${mounted}" -o "${mounted}" = "no" ]; then echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." @@ -144,12 +155,8 @@ echo "results of ZFS operations:" zfs list ${ZFS_VOLUME} zfs allow ${ZFS_VOLUME} -# create various subdirectories to be managed by portbuild. +# (re)mount various subdirectories to be managed by portbuild. for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do - if [ ! -d ${ZFS_MOUNTPOINT}/${subdir} ]; then - echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." - zfs create ${ZFS_VOLUME}/${subdir} || exit 1 - fi mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` if [ -z "${mounted}" -o "${mounted}" = "no" ]; then echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." @@ -158,16 +165,17 @@ for subdir in ${PORTBUILD_OWNED_SUBDIRS} chown ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null done - echo "checking out the repository as user ${PORTBUILD_USER} ..." su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1 # XXX MCL now have to move some directories over, create different # XXX MCL ownerships, and so forth. -echo "$0: you should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/conf." +echo -n "$0: you should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/admin/conf" +echo " and ${ZFS_MOUNTPOINT}/portbuild/conf." -# create convenience directories. failure is annoying but non-fatal. +# create convenience directories for PORTBUILD_USER. failure is annoying +# but non-fatal. extra_dirs="lockfiles log" for extra_dir in ${extra_dirs}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 19:23:27 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E2BB67AE; Mon, 11 Feb 2013 19:23:27 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D254D8D3; Mon, 11 Feb 2013 19:23:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BJNRDA015930; Mon, 11 Feb 2013 19:23:27 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BJNOO8015908; Mon, 11 Feb 2013 19:23:24 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201302111923.r1BJNOO8015908@svn.freebsd.org> From: Davide Italiano Date: Mon, 11 Feb 2013 19:23:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246685 - in projects/calloutng: . bin/cat bin/ps bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/op... 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.14 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, 11 Feb 2013 19:23:28 -0000 Author: davide Date: Mon Feb 11 19:23:23 2013 New Revision: 246685 URL: http://svnweb.freebsd.org/changeset/base/246685 Log: Merge head r236314 through r246684. Added: projects/calloutng/contrib/bmake/Makefile - copied unchanged from r246684, head/contrib/bmake/Makefile projects/calloutng/contrib/bmake/Makefile.config.in - copied unchanged from r246684, head/contrib/bmake/Makefile.config.in projects/calloutng/contrib/bmake/makefile.in - copied unchanged from r246684, head/contrib/bmake/makefile.in projects/calloutng/contrib/bmake/mk/ - copied from r246684, head/contrib/bmake/mk/ projects/calloutng/lib/libc/arm/sys/__vdso_gettc.c - copied unchanged from r246684, head/lib/libc/arm/sys/__vdso_gettc.c projects/calloutng/lib/libc/ia64/sys/__vdso_gettc.c - copied unchanged from r246684, head/lib/libc/ia64/sys/__vdso_gettc.c projects/calloutng/lib/libc/mips/sys/__vdso_gettc.c - copied unchanged from r246684, head/lib/libc/mips/sys/__vdso_gettc.c projects/calloutng/lib/libc/powerpc/sys/__vdso_gettc.c - copied unchanged from r246684, head/lib/libc/powerpc/sys/__vdso_gettc.c projects/calloutng/lib/libc/powerpc64/sys/__vdso_gettc.c - copied unchanged from r246684, head/lib/libc/powerpc64/sys/__vdso_gettc.c projects/calloutng/lib/libc/sparc64/sys/__vdso_gettc.c - copied unchanged from r246684, head/lib/libc/sparc64/sys/__vdso_gettc.c projects/calloutng/lib/libc/stdio/fmemopen.c - copied unchanged from r246684, head/lib/libc/stdio/fmemopen.c projects/calloutng/lib/libpmc/pmc.ivybridgexeon.3 - copied unchanged from r246684, head/lib/libpmc/pmc.ivybridgexeon.3 projects/calloutng/sys/arm/allwinner/a10_gpio.c - copied unchanged from r246684, head/sys/arm/allwinner/a10_gpio.c projects/calloutng/sys/arm/allwinner/a10_wdog.c - copied unchanged from r246684, head/sys/arm/allwinner/a10_wdog.c projects/calloutng/sys/arm/allwinner/a10_wdog.h - copied unchanged from r246684, head/sys/arm/allwinner/a10_wdog.h projects/calloutng/sys/boot/fdt/help.fdt - copied unchanged from r246684, head/sys/boot/fdt/help.fdt projects/calloutng/sys/boot/usb/ - copied from r246684, head/sys/boot/usb/ projects/calloutng/sys/cddl/boot/zfs/lz4.c - copied unchanged from r246684, head/sys/cddl/boot/zfs/lz4.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4 - copied unchanged from r246684, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4 projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4.descrip - copied unchanged from r246684, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4.descrip projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c - copied unchanged from r246684, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c projects/calloutng/sys/dev/usb/usb_freebsd_loader.h - copied unchanged from r246684, head/sys/dev/usb/usb_freebsd_loader.h projects/calloutng/tools/build/options/WITHOUT_CLANG_FULL - copied unchanged from r246684, head/tools/build/options/WITHOUT_CLANG_FULL projects/calloutng/tools/build/options/WITHOUT_LIBCPLUSPLUS - copied unchanged from r246684, head/tools/build/options/WITHOUT_LIBCPLUSPLUS projects/calloutng/tools/build/options/WITH_BSD_PATCH - copied unchanged from r246684, head/tools/build/options/WITH_BSD_PATCH projects/calloutng/tools/build/options/WITH_CLANG_FULL - copied unchanged from r246684, head/tools/build/options/WITH_CLANG_FULL projects/calloutng/tools/build/options/WITH_GPL_DTC - copied unchanged from r246684, head/tools/build/options/WITH_GPL_DTC projects/calloutng/tools/regression/lib/libc/stdio/test-fmemopen.c - copied unchanged from r246684, head/tools/regression/lib/libc/stdio/test-fmemopen.c projects/calloutng/tools/regression/lib/libc/stdio/test-fmemopen.t - copied unchanged from r246684, head/tools/regression/lib/libc/stdio/test-fmemopen.t projects/calloutng/usr.bin/bmake/Makefile.config - copied unchanged from r246684, head/usr.bin/bmake/Makefile.config projects/calloutng/usr.bin/patch/ - copied from r246684, head/usr.bin/patch/ Deleted: projects/calloutng/contrib/bmake/Makefile.in projects/calloutng/lib/libstand/if_ether.h projects/calloutng/sys/dev/blackhole/ projects/calloutng/sys/modules/blackhole/ Modified: projects/calloutng/Makefile.inc1 projects/calloutng/ObsoleteFiles.inc projects/calloutng/UPDATING projects/calloutng/bin/cat/cat.1 projects/calloutng/bin/cat/cat.c projects/calloutng/bin/ps/ps.1 projects/calloutng/bin/setfacl/setfacl.1 projects/calloutng/bin/sh/eval.c projects/calloutng/bin/sh/expand.c projects/calloutng/bin/sh/expand.h projects/calloutng/bin/sh/jobs.c projects/calloutng/bin/sh/miscbltin.c projects/calloutng/bin/sh/mksyntax.c projects/calloutng/bin/sh/nodetypes projects/calloutng/bin/sh/parser.h projects/calloutng/bin/sh/redir.c projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/calloutng/contrib/binutils/include/elf/common.h projects/calloutng/contrib/bmake/ChangeLog projects/calloutng/contrib/bmake/FILES projects/calloutng/contrib/bmake/bmake.1 projects/calloutng/contrib/bmake/bmake.cat1 projects/calloutng/contrib/bmake/boot-strap projects/calloutng/contrib/bmake/bsd.after-import.mk projects/calloutng/contrib/bmake/compat.c projects/calloutng/contrib/bmake/configure projects/calloutng/contrib/bmake/configure.in projects/calloutng/contrib/bmake/job.c projects/calloutng/contrib/bmake/main.c projects/calloutng/contrib/bmake/make-bootstrap.sh.in projects/calloutng/contrib/bmake/make.1 projects/calloutng/contrib/bmake/meta.c projects/calloutng/contrib/bmake/realpath.c projects/calloutng/contrib/bmake/unit-tests/Makefile.in projects/calloutng/contrib/bmake/var.c projects/calloutng/contrib/gcc/config/arm/freebsd.h projects/calloutng/contrib/gcc/config/arm/unwind-arm.h projects/calloutng/contrib/gdb/gdb/osabi.c projects/calloutng/contrib/ipfilter/ipsend/44arp.c projects/calloutng/contrib/libarchive/libarchive/archive_getdate.c projects/calloutng/contrib/libarchive/libarchive/test/test_archive_getdate.c projects/calloutng/contrib/libc++/include/__config projects/calloutng/contrib/libc++/include/algorithm projects/calloutng/contrib/libc++/include/array projects/calloutng/contrib/libc++/include/atomic projects/calloutng/contrib/libc++/include/cmath projects/calloutng/contrib/libc++/include/functional projects/calloutng/contrib/libc++/include/future projects/calloutng/contrib/libc++/include/istream projects/calloutng/contrib/libc++/include/iterator projects/calloutng/contrib/libc++/include/limits projects/calloutng/contrib/libc++/include/locale projects/calloutng/contrib/libc++/include/memory projects/calloutng/contrib/libc++/include/ostream projects/calloutng/contrib/libc++/include/random projects/calloutng/contrib/libc++/include/regex projects/calloutng/contrib/libc++/include/string projects/calloutng/contrib/libc++/include/type_traits projects/calloutng/contrib/libc++/include/vector projects/calloutng/contrib/libc++/src/chrono.cpp projects/calloutng/contrib/libc++/src/debug.cpp projects/calloutng/contrib/libc++/src/exception.cpp projects/calloutng/contrib/libc++/src/future.cpp projects/calloutng/contrib/libc++/src/hash.cpp projects/calloutng/contrib/libc++/src/locale.cpp projects/calloutng/contrib/libc++/src/string.cpp projects/calloutng/contrib/libc++/src/thread.cpp projects/calloutng/contrib/libcxxrt/exception.cc projects/calloutng/contrib/libstdc++/libsupc++/unwind-cxx.h projects/calloutng/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td projects/calloutng/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp projects/calloutng/etc/Makefile projects/calloutng/etc/mtree/BSD.include.dist projects/calloutng/etc/rc.d/ip6addrctl projects/calloutng/etc/rc.d/pfsync projects/calloutng/games/fortune/datfiles/fortunes-o.real projects/calloutng/gnu/usr.bin/patch/Makefile projects/calloutng/include/Makefile projects/calloutng/include/stdio.h (contents, props changed) projects/calloutng/kerberos5/libexec/digest-service/Makefile projects/calloutng/lib/Makefile projects/calloutng/lib/clang/Makefile projects/calloutng/lib/clang/clang.build.mk projects/calloutng/lib/clang/libclanganalysis/Makefile projects/calloutng/lib/clang/libclangarcmigrate/Makefile projects/calloutng/lib/clang/libclangast/Makefile projects/calloutng/lib/clang/libclangbasic/Makefile projects/calloutng/lib/clang/libclangcodegen/Makefile projects/calloutng/lib/clang/libclangdriver/Makefile projects/calloutng/lib/clang/libclangedit/Makefile projects/calloutng/lib/clang/libclangfrontend/Makefile projects/calloutng/lib/clang/libclangfrontendtool/Makefile projects/calloutng/lib/clang/libclanglex/Makefile projects/calloutng/lib/clang/libclangparse/Makefile projects/calloutng/lib/clang/libclangrewritecore/Makefile projects/calloutng/lib/clang/libclangrewritefrontend/Makefile projects/calloutng/lib/clang/libclangsema/Makefile projects/calloutng/lib/clang/libclangserialization/Makefile projects/calloutng/lib/clang/libclangstaticanalyzercheckers/Makefile projects/calloutng/lib/clang/libclangstaticanalyzercore/Makefile projects/calloutng/lib/clang/libclangstaticanalyzerfrontend/Makefile projects/calloutng/lib/clang/libllvmarchive/Makefile projects/calloutng/lib/clang/libllvmarmasmparser/Makefile projects/calloutng/lib/clang/libllvmarmcodegen/Makefile projects/calloutng/lib/clang/libllvmarmdesc/Makefile projects/calloutng/lib/clang/libllvmarmdisassembler/Makefile projects/calloutng/lib/clang/libllvmarminfo/Makefile projects/calloutng/lib/clang/libllvmarminstprinter/Makefile projects/calloutng/lib/clang/libllvmasmparser/Makefile projects/calloutng/lib/clang/libllvmasmprinter/Makefile projects/calloutng/lib/clang/libllvmbitreader/Makefile projects/calloutng/lib/clang/libllvmbitwriter/Makefile projects/calloutng/lib/clang/libllvmcodegen/Makefile projects/calloutng/lib/clang/libllvmcore/Makefile projects/calloutng/lib/clang/libllvmdebuginfo/Makefile projects/calloutng/lib/clang/libllvmexecutionengine/Makefile projects/calloutng/lib/clang/libllvminstcombine/Makefile projects/calloutng/lib/clang/libllvminstrumentation/Makefile projects/calloutng/lib/clang/libllvminterpreter/Makefile projects/calloutng/lib/clang/libllvmjit/Makefile projects/calloutng/lib/clang/libllvmlinker/Makefile projects/calloutng/lib/clang/libllvmmcdisassembler/Makefile projects/calloutng/lib/clang/libllvmmcparser/Makefile projects/calloutng/lib/clang/libllvmmipsasmparser/Makefile projects/calloutng/lib/clang/libllvmmipscodegen/Makefile projects/calloutng/lib/clang/libllvmmipsdesc/Makefile projects/calloutng/lib/clang/libllvmmipsdisassembler/Makefile projects/calloutng/lib/clang/libllvmmipsinfo/Makefile projects/calloutng/lib/clang/libllvmmipsinstprinter/Makefile projects/calloutng/lib/clang/libllvmobject/Makefile projects/calloutng/lib/clang/libllvmpowerpccodegen/Makefile projects/calloutng/lib/clang/libllvmpowerpcdesc/Makefile projects/calloutng/lib/clang/libllvmpowerpcinfo/Makefile projects/calloutng/lib/clang/libllvmpowerpcinstprinter/Makefile projects/calloutng/lib/clang/libllvmruntimedyld/Makefile projects/calloutng/lib/clang/libllvmselectiondag/Makefile projects/calloutng/lib/clang/libllvmtablegen/Makefile projects/calloutng/lib/clang/libllvmtarget/Makefile projects/calloutng/lib/clang/libllvmvectorize/Makefile projects/calloutng/lib/clang/libllvmx86asmparser/Makefile projects/calloutng/lib/clang/libllvmx86codegen/Makefile projects/calloutng/lib/clang/libllvmx86desc/Makefile projects/calloutng/lib/clang/libllvmx86info/Makefile projects/calloutng/lib/clang/libllvmx86instprinter/Makefile projects/calloutng/lib/clang/libllvmx86utils/Makefile projects/calloutng/lib/libc/amd64/sys/__vdso_gettc.c projects/calloutng/lib/libc/arm/sys/Makefile.inc projects/calloutng/lib/libc/gen/fts.c projects/calloutng/lib/libc/i386/sys/__vdso_gettc.c projects/calloutng/lib/libc/ia64/sys/Makefile.inc projects/calloutng/lib/libc/mips/sys/Makefile.inc projects/calloutng/lib/libc/net/sctp_sys_calls.c projects/calloutng/lib/libc/powerpc/Makefile.inc projects/calloutng/lib/libc/powerpc64/Makefile.inc projects/calloutng/lib/libc/sparc64/Makefile.inc projects/calloutng/lib/libc/stdio/Makefile.inc (contents, props changed) projects/calloutng/lib/libc/stdio/Symbol.map (contents, props changed) projects/calloutng/lib/libc/stdio/fopen.3 (contents, props changed) projects/calloutng/lib/libc/sys/__vdso_gettimeofday.c projects/calloutng/lib/libc/sys/chflags.2 projects/calloutng/lib/libc/sys/gettimeofday.c projects/calloutng/lib/libc/sys/open.2 projects/calloutng/lib/libc/sys/ptrace.2 projects/calloutng/lib/libc/sys/sigqueue.2 projects/calloutng/lib/libcompiler_rt/Makefile projects/calloutng/lib/libcxxrt/Version.map projects/calloutng/lib/libpmc/Makefile projects/calloutng/lib/libpmc/libpmc.c projects/calloutng/lib/libpmc/pmc.ivybridge.3 projects/calloutng/lib/libpmc/pmc.sandybridge.3 projects/calloutng/lib/libpmc/pmc.sandybridgexeon.3 projects/calloutng/lib/libstand/Makefile projects/calloutng/libexec/bootpd/rtmsg.c projects/calloutng/libexec/rtld-elf/powerpc64/reloc.c projects/calloutng/libexec/tftpd/tftp-io.c projects/calloutng/libexec/tftpd/tftp-options.c projects/calloutng/libexec/tftpd/tftp-utils.h projects/calloutng/libexec/tftpd/tftpd.c projects/calloutng/release/Makefile projects/calloutng/release/amd64/mkisoimages.sh projects/calloutng/release/generate-release.sh projects/calloutng/release/i386/mkisoimages.sh projects/calloutng/release/ia64/mkisoimages.sh projects/calloutng/release/pc98/mkisoimages.sh projects/calloutng/release/powerpc/mkisoimages.sh projects/calloutng/release/sparc64/mkisoimages.sh projects/calloutng/sbin/devd/devd.8 projects/calloutng/sbin/devd/devd.cc projects/calloutng/sbin/devd/devd.hh projects/calloutng/sbin/geom/class/eli/geom_eli.c projects/calloutng/sbin/ifconfig/ifieee80211.c projects/calloutng/sbin/recoverdisk/recoverdisk.c projects/calloutng/sbin/route/route.c projects/calloutng/share/man/man5/group.5 projects/calloutng/share/man/man5/src.conf.5 projects/calloutng/share/man/man7/release.7 projects/calloutng/share/man/man9/timeout.9 projects/calloutng/share/man/man9/vfs_busy.9 projects/calloutng/share/misc/committers-src.dot projects/calloutng/share/mk/bsd.own.mk projects/calloutng/sys/amd64/amd64/minidump_machdep.c projects/calloutng/sys/amd64/amd64/mp_machdep.c projects/calloutng/sys/amd64/amd64/pmap.c projects/calloutng/sys/amd64/conf/GENERIC projects/calloutng/sys/amd64/include/intr_machdep.h projects/calloutng/sys/amd64/include/pmap.h projects/calloutng/sys/amd64/include/vmm_instruction_emul.h (contents, props changed) projects/calloutng/sys/amd64/linux32/linux.h projects/calloutng/sys/amd64/linux32/linux32_sysvec.c projects/calloutng/sys/amd64/vmm/io/ppt.c projects/calloutng/sys/amd64/vmm/vmm.c projects/calloutng/sys/amd64/vmm/vmm_instruction_emul.c projects/calloutng/sys/arm/allwinner/a10_clk.c projects/calloutng/sys/arm/allwinner/a10_ehci.c projects/calloutng/sys/arm/allwinner/a10_machdep.c projects/calloutng/sys/arm/allwinner/files.a10 projects/calloutng/sys/arm/arm/busdma_machdep.c projects/calloutng/sys/arm/arm/vm_machdep.c projects/calloutng/sys/arm/conf/BEAGLEBONE projects/calloutng/sys/arm/conf/CUBIEBOARD projects/calloutng/sys/arm/include/vmparam.h projects/calloutng/sys/arm/ti/cpsw/if_cpsw.c projects/calloutng/sys/arm/ti/cpsw/if_cpswreg.h projects/calloutng/sys/arm/ti/cpsw/if_cpswvar.h projects/calloutng/sys/boot/arm/uboot/Makefile projects/calloutng/sys/boot/common/part.c projects/calloutng/sys/boot/fdt/dts/cubieboard.dts projects/calloutng/sys/boot/powerpc/ps3/Makefile projects/calloutng/sys/boot/powerpc/uboot/Makefile projects/calloutng/sys/boot/uboot/common/metadata.c projects/calloutng/sys/cam/scsi/scsi_all.c projects/calloutng/sys/cddl/boot/zfs/README projects/calloutng/sys/cddl/boot/zfs/zfsimpl.h projects/calloutng/sys/cddl/boot/zfs/zfssubr.c projects/calloutng/sys/cddl/compat/opensolaris/sys/byteorder.h projects/calloutng/sys/cddl/compat/opensolaris/sys/kmem.h projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/Makefile.files projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/calloutng/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/calloutng/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S projects/calloutng/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c projects/calloutng/sys/compat/linprocfs/linprocfs.c projects/calloutng/sys/compat/linux/linux_emul.c projects/calloutng/sys/compat/linux/linux_file.c projects/calloutng/sys/compat/linux/linux_file.h projects/calloutng/sys/compat/linux/linux_fork.c projects/calloutng/sys/compat/linux/linux_ioctl.h projects/calloutng/sys/compat/linux/linux_ipc.h projects/calloutng/sys/compat/linux/linux_mib.c projects/calloutng/sys/compat/linux/linux_misc.h projects/calloutng/sys/compat/linux/linux_signal.h projects/calloutng/sys/compat/linux/linux_socket.h projects/calloutng/sys/compat/linux/linux_sysctl.c projects/calloutng/sys/compat/linux/linux_time.c projects/calloutng/sys/conf/NOTES projects/calloutng/sys/conf/files projects/calloutng/sys/conf/newvers.sh projects/calloutng/sys/conf/options projects/calloutng/sys/dev/acpi_support/acpi_asus_wmi.c projects/calloutng/sys/dev/acpi_support/acpi_fujitsu.c (contents, props changed) projects/calloutng/sys/dev/acpi_support/acpi_hp.c projects/calloutng/sys/dev/acpi_support/acpi_ibm.c (contents, props changed) projects/calloutng/sys/dev/acpi_support/acpi_panasonic.c (contents, props changed) projects/calloutng/sys/dev/acpi_support/acpi_sony.c (contents, props changed) projects/calloutng/sys/dev/acpi_support/acpi_toshiba.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_acad.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_button.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_cmbat.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_dock.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_ec.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_hpet.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_lid.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_pci.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_pci_link.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_pcib_pci.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_perf.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_resource.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_smbat.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_thermal.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_throttle.c (contents, props changed) projects/calloutng/sys/dev/acpica/acpi_timer.c (contents, props changed) projects/calloutng/sys/dev/adlink/adlink.c (contents, props changed) projects/calloutng/sys/dev/age/if_age.c projects/calloutng/sys/dev/age/if_agevar.h projects/calloutng/sys/dev/amdsbwd/amdsbwd.c projects/calloutng/sys/dev/amdtemp/amdtemp.c (contents, props changed) projects/calloutng/sys/dev/ata/ata-all.h projects/calloutng/sys/dev/ata/ata-lowlevel.c projects/calloutng/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c projects/calloutng/sys/dev/ath/if_ath.c projects/calloutng/sys/dev/ath/if_ath_ahb.c projects/calloutng/sys/dev/ath/if_ath_alq.c projects/calloutng/sys/dev/ath/if_ath_alq.h projects/calloutng/sys/dev/ath/if_ath_misc.h projects/calloutng/sys/dev/ath/if_ath_pci.c projects/calloutng/sys/dev/ath/if_ath_rx.c projects/calloutng/sys/dev/ath/if_ath_tx.c projects/calloutng/sys/dev/ath/if_ath_tx_edma.c projects/calloutng/sys/dev/ath/if_ath_tx_ht.c projects/calloutng/sys/dev/ath/if_athvar.h projects/calloutng/sys/dev/auxio/auxio.c (contents, props changed) projects/calloutng/sys/dev/bxe/if_bxe.c projects/calloutng/sys/dev/ce/if_ce.c (contents, props changed) projects/calloutng/sys/dev/cfi/cfi_bus_fdt.c projects/calloutng/sys/dev/cfi/cfi_bus_ixp4xx.c projects/calloutng/sys/dev/coretemp/coretemp.c (contents, props changed) projects/calloutng/sys/dev/cp/if_cp.c (contents, props changed) projects/calloutng/sys/dev/cpufreq/ichss.c (contents, props changed) projects/calloutng/sys/dev/ctau/if_ct.c (contents, props changed) projects/calloutng/sys/dev/cx/if_cx.c (contents, props changed) projects/calloutng/sys/dev/cxgbe/common/t4_hw.c projects/calloutng/sys/dev/cxgbe/t4_main.c projects/calloutng/sys/dev/cxgbe/t4_sge.c projects/calloutng/sys/dev/digi/digi_isa.c (contents, props changed) projects/calloutng/sys/dev/digi/digi_pci.c (contents, props changed) projects/calloutng/sys/dev/e1000/if_em.c (contents, props changed) projects/calloutng/sys/dev/e1000/if_igb.c (contents, props changed) projects/calloutng/sys/dev/e1000/if_lem.c projects/calloutng/sys/dev/ep/if_ep_eisa.c (contents, props changed) projects/calloutng/sys/dev/ep/if_ep_isa.c (contents, props changed) projects/calloutng/sys/dev/ep/if_ep_mca.c (contents, props changed) projects/calloutng/sys/dev/ep/if_ep_pccard.c (contents, props changed) projects/calloutng/sys/dev/fdc/fdc_acpi.c (contents, props changed) projects/calloutng/sys/dev/hwpmc/hwpmc_core.c projects/calloutng/sys/dev/hwpmc/hwpmc_intel.c projects/calloutng/sys/dev/hwpmc/pmc_events.h projects/calloutng/sys/dev/iicbus/ad7418.c (contents, props changed) projects/calloutng/sys/dev/iicbus/ds133x.c (contents, props changed) projects/calloutng/sys/dev/iicbus/ds1672.c (contents, props changed) projects/calloutng/sys/dev/iicbus/icee.c (contents, props changed) projects/calloutng/sys/dev/ixgb/if_ixgb.c (contents, props changed) projects/calloutng/sys/dev/ixgbe/ixgbe.c (contents, props changed) projects/calloutng/sys/dev/ixgbe/ixv.c projects/calloutng/sys/dev/mfi/mfi_cam.c (contents, props changed) projects/calloutng/sys/dev/mn/if_mn.c (contents, props changed) projects/calloutng/sys/dev/mxge/if_mxge.c (contents, props changed) projects/calloutng/sys/dev/my/if_my.c (contents, props changed) projects/calloutng/sys/dev/nvram2env/nvram2env.c (contents, props changed) projects/calloutng/sys/dev/nxge/if_nxge.c (contents, props changed) projects/calloutng/sys/dev/oce/oce_if.c (contents, props changed) projects/calloutng/sys/dev/sdhci/sdhci_pci.c projects/calloutng/sys/dev/sound/pci/emu10kx-midi.c (contents, props changed) projects/calloutng/sys/dev/sound/pci/emu10kx-pcm.c (contents, props changed) projects/calloutng/sys/dev/sound/pci/emu10kx.c (contents, props changed) projects/calloutng/sys/dev/sound/pcm/mixer.c projects/calloutng/sys/dev/sound/pcm/mixer.h projects/calloutng/sys/dev/sound/sbus/cs4231.c (contents, props changed) projects/calloutng/sys/dev/sound/usb/uaudio.c projects/calloutng/sys/dev/sound/usb/uaudio_pcm.c projects/calloutng/sys/dev/syscons/syscons.c projects/calloutng/sys/dev/uart/uart_bus.h projects/calloutng/sys/dev/uart/uart_bus_acpi.c projects/calloutng/sys/dev/uart/uart_bus_isa.c projects/calloutng/sys/dev/uart/uart_bus_pci.c projects/calloutng/sys/dev/uart/uart_core.c projects/calloutng/sys/dev/usb/controller/at91dci.c projects/calloutng/sys/dev/usb/controller/atmegadci.c projects/calloutng/sys/dev/usb/controller/avr32dci.c projects/calloutng/sys/dev/usb/controller/dwc_otg.c projects/calloutng/sys/dev/usb/controller/ehci.c projects/calloutng/sys/dev/usb/controller/musb_otg.c projects/calloutng/sys/dev/usb/controller/ohci.c projects/calloutng/sys/dev/usb/controller/uhci.c projects/calloutng/sys/dev/usb/controller/usb_controller.c projects/calloutng/sys/dev/usb/controller/uss820dci.c projects/calloutng/sys/dev/usb/controller/xhci.c projects/calloutng/sys/dev/usb/controller/xhci.h projects/calloutng/sys/dev/usb/input/uhid.c projects/calloutng/sys/dev/usb/input/ukbd.c projects/calloutng/sys/dev/usb/input/ums.c projects/calloutng/sys/dev/usb/misc/udbp.c projects/calloutng/sys/dev/usb/misc/ufm.c projects/calloutng/sys/dev/usb/net/if_cdce.c projects/calloutng/sys/dev/usb/net/if_cue.c projects/calloutng/sys/dev/usb/net/if_ipheth.c projects/calloutng/sys/dev/usb/net/if_kue.c projects/calloutng/sys/dev/usb/net/if_smsc.c projects/calloutng/sys/dev/usb/storage/umass.c projects/calloutng/sys/dev/usb/storage/urio.c projects/calloutng/sys/dev/usb/storage/ustorage_fs.c projects/calloutng/sys/dev/usb/template/usb_template.c projects/calloutng/sys/dev/usb/template/usb_template_audio.c projects/calloutng/sys/dev/usb/template/usb_template_cdce.c projects/calloutng/sys/dev/usb/template/usb_template_kbd.c projects/calloutng/sys/dev/usb/template/usb_template_modem.c projects/calloutng/sys/dev/usb/template/usb_template_mouse.c projects/calloutng/sys/dev/usb/template/usb_template_msc.c projects/calloutng/sys/dev/usb/template/usb_template_mtp.c projects/calloutng/sys/dev/usb/ufm_ioctl.h projects/calloutng/sys/dev/usb/usb.h projects/calloutng/sys/dev/usb/usb_bus.h projects/calloutng/sys/dev/usb/usb_busdma.c projects/calloutng/sys/dev/usb/usb_busdma.h projects/calloutng/sys/dev/usb/usb_compat_linux.c projects/calloutng/sys/dev/usb/usb_controller.h projects/calloutng/sys/dev/usb/usb_core.c projects/calloutng/sys/dev/usb/usb_core.h projects/calloutng/sys/dev/usb/usb_debug.c projects/calloutng/sys/dev/usb/usb_dev.c projects/calloutng/sys/dev/usb/usb_dev.h projects/calloutng/sys/dev/usb/usb_device.c projects/calloutng/sys/dev/usb/usb_device.h projects/calloutng/sys/dev/usb/usb_dynamic.c projects/calloutng/sys/dev/usb/usb_endian.h projects/calloutng/sys/dev/usb/usb_error.c projects/calloutng/sys/dev/usb/usb_freebsd.h projects/calloutng/sys/dev/usb/usb_generic.c projects/calloutng/sys/dev/usb/usb_handle_request.c projects/calloutng/sys/dev/usb/usb_hid.c projects/calloutng/sys/dev/usb/usb_hub.c projects/calloutng/sys/dev/usb/usb_ioctl.h projects/calloutng/sys/dev/usb/usb_lookup.c projects/calloutng/sys/dev/usb/usb_mbuf.c projects/calloutng/sys/dev/usb/usb_msctest.c projects/calloutng/sys/dev/usb/usb_parse.c projects/calloutng/sys/dev/usb/usb_pci.h projects/calloutng/sys/dev/usb/usb_pf.c projects/calloutng/sys/dev/usb/usb_process.c projects/calloutng/sys/dev/usb/usb_process.h projects/calloutng/sys/dev/usb/usb_request.c projects/calloutng/sys/dev/usb/usb_transfer.c projects/calloutng/sys/dev/usb/usb_util.c projects/calloutng/sys/dev/usb/usbdi.h projects/calloutng/sys/dev/usb/usbhid.h projects/calloutng/sys/dev/usb/wlan/if_rum.c projects/calloutng/sys/dev/usb/wlan/if_rumvar.h projects/calloutng/sys/dev/usb/wlan/if_run.c projects/calloutng/sys/dev/usb/wlan/if_runvar.h projects/calloutng/sys/dev/usb/wlan/if_uath.c projects/calloutng/sys/dev/usb/wlan/if_upgt.c projects/calloutng/sys/dev/usb/wlan/if_upgtvar.h projects/calloutng/sys/dev/usb/wlan/if_ural.c projects/calloutng/sys/dev/usb/wlan/if_uralvar.h projects/calloutng/sys/dev/usb/wlan/if_urtw.c projects/calloutng/sys/dev/usb/wlan/if_urtwvar.h projects/calloutng/sys/dev/usb/wlan/if_zyd.c projects/calloutng/sys/dev/usb/wlan/if_zydreg.h projects/calloutng/sys/dev/vx/if_vx_eisa.c (contents, props changed) projects/calloutng/sys/dev/vx/if_vx_pci.c (contents, props changed) projects/calloutng/sys/dev/vxge/vxge.c (contents, props changed) projects/calloutng/sys/dev/xen/console/console.c projects/calloutng/sys/fs/devfs/devfs_vnops.c projects/calloutng/sys/fs/ext2fs/ext2_alloc.c projects/calloutng/sys/fs/ext2fs/ext2_balloc.c projects/calloutng/sys/fs/ext2fs/ext2_bmap.c projects/calloutng/sys/fs/ext2fs/ext2_dir.h projects/calloutng/sys/fs/ext2fs/ext2_inode.c projects/calloutng/sys/fs/ext2fs/ext2_inode_cnv.c projects/calloutng/sys/fs/ext2fs/ext2_lookup.c projects/calloutng/sys/fs/ext2fs/ext2_mount.h projects/calloutng/sys/fs/ext2fs/ext2_subr.c projects/calloutng/sys/fs/ext2fs/ext2_vfsops.c projects/calloutng/sys/fs/ext2fs/ext2_vnops.c projects/calloutng/sys/fs/ext2fs/ext2fs.h projects/calloutng/sys/fs/ext2fs/fs.h projects/calloutng/sys/fs/ext2fs/inode.h projects/calloutng/sys/fs/msdosfs/msdosfs_fat.c projects/calloutng/sys/fs/msdosfs/msdosfs_vfsops.c projects/calloutng/sys/fs/msdosfs/msdosfs_vnops.c projects/calloutng/sys/fs/nfs/nfs_commonkrpc.c projects/calloutng/sys/fs/nfs/nfs_commonsubs.c projects/calloutng/sys/fs/tmpfs/tmpfs_vnops.c projects/calloutng/sys/i386/conf/GENERIC projects/calloutng/sys/i386/i386/mp_machdep.c projects/calloutng/sys/i386/include/intr_machdep.h projects/calloutng/sys/i386/include/vmparam.h projects/calloutng/sys/i386/linux/linux.h projects/calloutng/sys/i386/linux/linux_ptrace.c projects/calloutng/sys/i386/linux/linux_sysvec.c projects/calloutng/sys/kern/imgact_elf.c projects/calloutng/sys/kern/init_main.c projects/calloutng/sys/kern/kern_clocksource.c projects/calloutng/sys/kern/kern_descrip.c projects/calloutng/sys/kern/kern_exec.c projects/calloutng/sys/kern/kern_exit.c projects/calloutng/sys/kern/kern_intr.c projects/calloutng/sys/kern/kern_ktr.c projects/calloutng/sys/kern/kern_malloc.c projects/calloutng/sys/kern/kern_mib.c projects/calloutng/sys/kern/kern_sig.c projects/calloutng/sys/kern/subr_blist.c projects/calloutng/sys/kern/subr_sleepqueue.c projects/calloutng/sys/kern/sys_process.c projects/calloutng/sys/kern/uipc_syscalls.c projects/calloutng/sys/kern/vfs_acl.c projects/calloutng/sys/kern/vfs_syscalls.c projects/calloutng/sys/kern/vfs_vnops.c projects/calloutng/sys/modules/Makefile projects/calloutng/sys/modules/usb/Makefile projects/calloutng/sys/modules/usb/smsc/Makefile projects/calloutng/sys/modules/wlan/Makefile projects/calloutng/sys/net/if.c projects/calloutng/sys/net/if_llatbl.c projects/calloutng/sys/net/if_llatbl.h projects/calloutng/sys/net/if_var.h projects/calloutng/sys/net80211/ieee80211_action.c projects/calloutng/sys/net80211/ieee80211_ddb.c projects/calloutng/sys/net80211/ieee80211_hwmp.c projects/calloutng/sys/net80211/ieee80211_input.c projects/calloutng/sys/net80211/ieee80211_ioctl.h projects/calloutng/sys/net80211/ieee80211_mesh.c projects/calloutng/sys/net80211/ieee80211_mesh.h projects/calloutng/sys/net80211/ieee80211_node.h projects/calloutng/sys/net80211/ieee80211_output.c projects/calloutng/sys/net80211/ieee80211_superg.c projects/calloutng/sys/netgraph/ng_ether.c projects/calloutng/sys/netinet/if_ether.h projects/calloutng/sys/netinet/in.c projects/calloutng/sys/netinet/ip_carp.c projects/calloutng/sys/netinet/ip_carp.h projects/calloutng/sys/netinet/libalias/alias.c projects/calloutng/sys/netinet/libalias/libalias.3 projects/calloutng/sys/netinet/sctp.h projects/calloutng/sys/netinet/sctp_asconf.c projects/calloutng/sys/netinet/sctp_indata.c projects/calloutng/sys/netinet/sctp_input.c projects/calloutng/sys/netinet/sctp_output.c projects/calloutng/sys/netinet/sctp_output.h projects/calloutng/sys/netinet/sctp_pcb.c projects/calloutng/sys/netinet/sctp_structs.h projects/calloutng/sys/netinet/sctp_sysctl.c projects/calloutng/sys/netinet/sctp_timer.c projects/calloutng/sys/netinet/sctp_usrreq.c projects/calloutng/sys/netinet/sctputil.c projects/calloutng/sys/netinet/tcp.h projects/calloutng/sys/netinet/tcp_reass.c projects/calloutng/sys/netinet/tcp_syncache.c projects/calloutng/sys/netinet/udp.h projects/calloutng/sys/nfsclient/nfs_krpc.c projects/calloutng/sys/ofed/drivers/net/mlx4/en_tx.c projects/calloutng/sys/pc98/conf/GENERIC projects/calloutng/sys/powerpc/wii/wii_gpio.c projects/calloutng/sys/powerpc/wii/wii_ipc.c projects/calloutng/sys/powerpc/wii/wii_pic.c projects/calloutng/sys/security/audit/audit.h projects/calloutng/sys/sparc64/conf/GENERIC projects/calloutng/sys/sparc64/include/vmparam.h projects/calloutng/sys/sys/buf_ring.h projects/calloutng/sys/sys/diskmbr.h projects/calloutng/sys/sys/param.h projects/calloutng/sys/sys/pmc.h projects/calloutng/sys/sys/proc.h projects/calloutng/sys/sys/queue.h projects/calloutng/sys/sys/signalvar.h projects/calloutng/sys/sys/socket.h projects/calloutng/sys/sys/systm.h projects/calloutng/sys/sys/un.h projects/calloutng/sys/sys/vdso.h projects/calloutng/sys/ufs/ffs/ffs_alloc.c projects/calloutng/sys/ufs/ffs/ffs_inode.c projects/calloutng/sys/ufs/ufs/inode.h projects/calloutng/sys/ufs/ufs/ufs_lookup.c projects/calloutng/sys/vm/uma_core.c projects/calloutng/sys/vm/vm_kern.c projects/calloutng/sys/x86/x86/intr_machdep.c projects/calloutng/sys/x86/x86/local_apic.c projects/calloutng/sys/x86/x86/tsc.c projects/calloutng/tools/regression/sockets/unix_cmsg/README projects/calloutng/tools/regression/sockets/unix_cmsg/unix_cmsg.c projects/calloutng/tools/regression/sockets/unix_cmsg/unix_cmsg.t projects/calloutng/tools/test/pthread_vfork/pthread_vfork_test.c projects/calloutng/tools/tools/ath/athalq/ar5210_ds.c projects/calloutng/tools/tools/ath/athalq/ar5211_ds.c projects/calloutng/tools/tools/ath/athalq/ar5212_ds.c projects/calloutng/tools/tools/ath/athalq/ar5416_ds.c projects/calloutng/tools/tools/ath/athalq/main.c projects/calloutng/usr.bin/Makefile projects/calloutng/usr.bin/bmake/Makefile projects/calloutng/usr.bin/bmake/config.h projects/calloutng/usr.bin/bmake/unit-tests/Makefile projects/calloutng/usr.bin/clang/clang/Makefile projects/calloutng/usr.bin/csup/csup.1 projects/calloutng/usr.bin/ee/Makefile projects/calloutng/usr.bin/find/function.c projects/calloutng/usr.bin/find/main.c projects/calloutng/usr.bin/join/join.c projects/calloutng/usr.bin/newgrp/newgrp.1 projects/calloutng/usr.bin/newgrp/newgrp.c projects/calloutng/usr.bin/procstat/procstat_files.c projects/calloutng/usr.bin/xinstall/xinstall.c projects/calloutng/usr.sbin/arp/arp.8 projects/calloutng/usr.sbin/arp/arp.c projects/calloutng/usr.sbin/bhyve/Makefile projects/calloutng/usr.sbin/bhyve/pci_emul.c projects/calloutng/usr.sbin/bhyve/pci_emul.h projects/calloutng/usr.sbin/bhyve/pci_passthru.c projects/calloutng/usr.sbin/bhyve/pci_virtio_block.c projects/calloutng/usr.sbin/bhyve/pci_virtio_net.c projects/calloutng/usr.sbin/bhyve/virtio.h projects/calloutng/usr.sbin/bsdconfig/Makefile projects/calloutng/usr.sbin/crunch/crunchgen/crunchgen.c projects/calloutng/usr.sbin/crunch/crunchide/exec_elf32.c projects/calloutng/usr.sbin/crunch/examples/really-big.conf projects/calloutng/usr.sbin/named/Makefile projects/calloutng/usr.sbin/ndp/ndp.c projects/calloutng/usr.sbin/pciconf/Makefile projects/calloutng/usr.sbin/pciconf/cap.c projects/calloutng/usr.sbin/pciconf/pciconf.c projects/calloutng/usr.sbin/ppp/arp.c projects/calloutng/usr.sbin/pw/pw_user.c projects/calloutng/usr.sbin/rarpd/rarpd.c projects/calloutng/usr.sbin/sysrc/Makefile projects/calloutng/usr.sbin/tcpdrop/tcpdrop.8 projects/calloutng/usr.sbin/tcpdrop/tcpdrop.c projects/calloutng/usr.sbin/timed/timed/acksend.c projects/calloutng/usr.sbin/timed/timed/byteorder.c projects/calloutng/usr.sbin/timed/timed/candidate.c projects/calloutng/usr.sbin/timed/timed/cksum.c projects/calloutng/usr.sbin/timed/timed/correct.c projects/calloutng/usr.sbin/timed/timed/master.c projects/calloutng/usr.sbin/timed/timed/measure.c projects/calloutng/usr.sbin/timed/timed/networkdelta.c projects/calloutng/usr.sbin/timed/timed/readmsg.c projects/calloutng/usr.sbin/timed/timed/slave.c projects/calloutng/usr.sbin/timed/timed/timed.c projects/calloutng/usr.sbin/timed/timedc/cmds.c projects/calloutng/usr.sbin/timed/timedc/timedc.c Directory Properties: projects/calloutng/ (props changed) projects/calloutng/cddl/contrib/opensolaris/ (props changed) projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/calloutng/contrib/binutils/ (props changed) projects/calloutng/contrib/bmake/ (props changed) projects/calloutng/contrib/gcc/ (props changed) projects/calloutng/contrib/gdb/ (props changed) projects/calloutng/contrib/libarchive/ (props changed) projects/calloutng/contrib/libarchive/libarchive/ (props changed) projects/calloutng/contrib/libc++/ (props changed) projects/calloutng/contrib/libcxxrt/ (props changed) projects/calloutng/contrib/libstdc++/ (props changed) projects/calloutng/contrib/llvm/ (props changed) projects/calloutng/contrib/llvm/tools/clang/ (props changed) projects/calloutng/lib/libc/ (props changed) projects/calloutng/sbin/ (props changed) projects/calloutng/sys/ (props changed) projects/calloutng/sys/amd64/vmm/ (props changed) projects/calloutng/sys/boot/ (props changed) projects/calloutng/sys/cddl/contrib/opensolaris/ (props changed) projects/calloutng/sys/conf/ (props changed) projects/calloutng/usr.bin/csup/ (props changed) projects/calloutng/usr.bin/procstat/ (props changed) projects/calloutng/usr.sbin/bhyve/ (props changed) Modified: projects/calloutng/Makefile.inc1 ============================================================================== --- projects/calloutng/Makefile.inc1 Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/Makefile.inc1 Mon Feb 11 19:23:23 2013 (r246685) @@ -27,6 +27,8 @@ # TARGET="machine" to crossbuild world for a different machine type # TARGET_ARCH= may be required when a TARGET supports multiple endians # BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh) +# WORLD_FLAGS= additional flags to pass to make(1) during buildworld +# KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel # # The intended user-driven targets are: @@ -185,7 +187,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.$ .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -245,7 +247,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ COMPILER_TYPE=${COMPILER_TYPE} BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ - ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ @@ -255,7 +257,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ - ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ @@ -288,7 +290,7 @@ WMAKE_COMPILER_TYPE= gcc WMAKE_COMPILER_TYPE= clang .endif WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE} -WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world @@ -378,7 +380,7 @@ IMAKE_MTREE= MTREE_CMD="nmtree ${MTREEFL # kernel stage KMAKEENV= ${WMAKEENV} -KMAKE= ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} +KMAKE= ${KMAKEENV} ${MAKE} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME} # # buildworld @@ -412,7 +414,7 @@ _worldtmp: rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in \ - lib usr legacy/usr + lib usr legacy/bin legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ @@ -671,10 +673,14 @@ _install-info= install-info _zoneinfo= zic tzsetup .endif +.if exists(/usr/sbin/nmtree) +_nmtree_itools= nmtree +.endif + ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep id install ${_install-info} \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc ${_zoneinfo} + ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \ + rm sed sh sysctl test true uname wc ${_zoneinfo} # # distributeworld @@ -964,7 +970,7 @@ reinstallkernel reinstallkernel.debug: i @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ - ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} + ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//} distributekernel distributekernel.debug: .if empty(INSTALLKERNEL) @@ -1134,6 +1140,10 @@ _nmtree= lib/libnetbsd \ usr.sbin/nmtree .endif +.if ${BOOTSTRAPPING} < 1000027 +_cat= bin/cat +.endif + .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 _awk= usr.bin/awk .endif @@ -1189,6 +1199,7 @@ bootstrap-tools: ${_ar} \ ${_dtc} \ ${_awk} \ + ${_cat} \ usr.bin/lorder \ usr.bin/makewhatis \ ${_mklocale} \ @@ -1724,7 +1735,8 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOU XDDIR=${XDEV_ARCH}-freebsd XDTP=/usr/${XDDIR} -CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} +CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ + INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ _SHLIBDIRPREFIX=${XDTP} \ TOOLS_PREFIX=${XDTP} Modified: projects/calloutng/ObsoleteFiles.inc ============================================================================== --- projects/calloutng/ObsoleteFiles.inc Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/ObsoleteFiles.inc Mon Feb 11 19:23:23 2013 (r246685) @@ -45,6 +45,10 @@ OLD_DIRS+=usr/share/man/man1aout OLD_DIRS+=usr/share/man/cat1aout OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout +# 20130110: bsd.compat.mk removed +OLD_FILES+=usr/share/mk/bsd.compat.mk +# 20130103: gnats-supfile removed +OLD_FILES+=usr/share/examples/cvsup/gnats-supfile # 20121230: libdisk removed OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a Modified: projects/calloutng/UPDATING ============================================================================== --- projects/calloutng/UPDATING Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/UPDATING Mon Feb 11 19:23:23 2013 (r246685) @@ -26,6 +26,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130129: + A BSD-licensed patch(1) variant has been added and is installed + as bsdpatch, being the GNU version the default patch. + To inverse the logic and use the BSD-licensed one as default, + while having the GNU version installed as gnupatch, rebuild + and install world with the WITH_BSD_PATCH knob set. + 20130118: The install(1) option -M has changed meaning and now takes an argument that is a file or path to append logs to. In the Modified: projects/calloutng/bin/cat/cat.1 ============================================================================== --- projects/calloutng/bin/cat/cat.1 Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/cat/cat.1 Mon Feb 11 19:23:23 2013 (r246685) @@ -32,7 +32,7 @@ .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 .\" $FreeBSD$ .\" -.Dd March 21, 2004 +.Dd January 29, 2013 .Dt CAT 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd concatenate and print files .Sh SYNOPSIS .Nm -.Op Fl benstuv +.Op Fl belnstuv .Op Ar .Sh DESCRIPTION The @@ -79,6 +79,16 @@ Display non-printing characters (see the option), and display a dollar sign .Pq Ql \&$ at the end of each line. +.It Fl l +Set an exclusive advisory lock on the standard output file descriptor. +This lock is set using +.Xr fcntl 2 +with the +.Dv F_SETLKW +command. +If the output file is already locked, +.Nm +will block until the lock is acquired. .It Fl n Number the output lines, starting at 1. .It Fl s @@ -160,6 +170,7 @@ operand. .Xr tail 1 , .Xr vis 1 , .Xr zcat 1 , +.Xr fcntl 2 , .Xr setbuf 3 .Rs .%A Rob Pike @@ -175,7 +186,7 @@ utility is compliant with the specification. .Pp The flags -.Op Fl benstv +.Op Fl belnstv are extensions to the specification. .Sh HISTORY A Modified: projects/calloutng/bin/cat/cat.c ============================================================================== --- projects/calloutng/bin/cat/cat.c Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/cat/cat.c Mon Feb 11 19:23:23 2013 (r246685) @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$"); #include #include -static int bflag, eflag, nflag, sflag, tflag, vflag; +static int bflag, eflag, lflag, nflag, sflag, tflag, vflag; static int rval; static const char *filename; @@ -96,10 +96,11 @@ int main(int argc, char *argv[]) { int ch; + struct flock stdout_lock; setlocale(LC_CTYPE, ""); - while ((ch = getopt(argc, argv, "benstuv")) != -1) + while ((ch = getopt(argc, argv, "belnstuv")) != -1) switch (ch) { case 'b': bflag = nflag = 1; /* -b implies -n */ @@ -107,6 +108,9 @@ main(int argc, char *argv[]) case 'e': eflag = vflag = 1; /* -e implies -v */ break; + case 'l': + lflag = 1; + break; case 'n': nflag = 1; break; @@ -127,6 +131,15 @@ main(int argc, char *argv[]) } argv += optind; + if (lflag) { + stdout_lock.l_len = 0; + stdout_lock.l_start = 0; + stdout_lock.l_type = F_WRLCK; + stdout_lock.l_whence = SEEK_SET; + if (fcntl(STDOUT_FILENO, F_SETLKW, &stdout_lock) == -1) + err(EXIT_FAILURE, "stdout"); + } + if (bflag || eflag || nflag || sflag || tflag || vflag) scanfiles(argv, 1); else @@ -140,7 +153,7 @@ main(int argc, char *argv[]) static void usage(void) { - fprintf(stderr, "usage: cat [-benstuv] [file ...]\n"); + fprintf(stderr, "usage: cat [-belnstuv] [file ...]\n"); exit(1); /* NOTREACHED */ } Modified: projects/calloutng/bin/ps/ps.1 ============================================================================== --- projects/calloutng/bin/ps/ps.1 Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/ps/ps.1 Mon Feb 11 19:23:23 2013 (r246685) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd September 18, 2012 +.Dd February 7, 2013 .Dt PS 1 .Os .Sh NAME @@ -323,6 +323,7 @@ the include file .It Dv "P_INMEM" Ta No "0x10000000" Ta "Loaded into memory" .It Dv "P_SWAPPINGOUT" Ta No "0x20000000" Ta "Process is being swapped out" .It Dv "P_SWAPPINGIN" Ta No "0x40000000" Ta "Process is being swapped in" +.It Dv "P_PPTRACE" Ta No "0x80000000" Ta "Vforked child issued ptrace(PT_TRACEME)" .El .It Cm label The MAC label of the process. Modified: projects/calloutng/bin/setfacl/setfacl.1 ============================================================================== --- projects/calloutng/bin/setfacl/setfacl.1 Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/setfacl/setfacl.1 Mon Feb 11 19:23:23 2013 (r246685) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 2, 2012 +.Dd February 8, 2013 .Dt SETFACL 1 .Os .Sh NAME @@ -91,10 +91,16 @@ An error will be reported if any of the specified files cannot have a default entry (i.e.\& non-directories). This option is not applicable to NFSv4 ACLs. .It Fl m Ar entries -Modify the ACL entries on the specified files by adding new -entries and modifying existing ACL entries with the ACL entries -specified in -.Ar entries . +Modify the ACL on the specified file. +New entries will be added, and existing entries will be modified +according to the +.Ar entries +argument. +For NFSv4 ACLs, it is recommended to use the +.Fl a +and +.Fl x +options instead. .It Fl M Ar file Modify the ACL entries on the specified files by adding new ACL entries and modifying existing ACL entries with the ACL @@ -319,9 +325,9 @@ write_data execute .It p append_data -.It d -delete_child .It D +delete_child +.It d delete .It a read_attributes Modified: projects/calloutng/bin/sh/eval.c ============================================================================== --- projects/calloutng/bin/sh/eval.c Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/sh/eval.c Mon Feb 11 19:23:23 2013 (r246685) @@ -92,6 +92,7 @@ static void evalfor(union node *, int); static union node *evalcase(union node *); static void evalsubshell(union node *, int); static void evalredir(union node *, int); +static void exphere(union node *, struct arglist *); static void expredir(union node *); static void evalpipe(union node *); static int is_valid_fast_cmdsubst(union node *n); @@ -488,6 +489,37 @@ evalredir(union node *n, int flags) } +static void +exphere(union node *redir, struct arglist *fn) +{ + struct jmploc jmploc; + struct jmploc *savehandler; + struct localvar *savelocalvars; + int need_longjmp = 0; + + redir->nhere.expdoc = nullstr; + savelocalvars = localvars; + localvars = NULL; + forcelocal++; + savehandler = handler; + if (setjmp(jmploc.loc)) + need_longjmp = exception != EXERROR && exception != EXEXEC; + else { + handler = &jmploc; + expandarg(redir->nhere.doc, fn, 0); + redir->nhere.expdoc = fn->list->text; + INTOFF; + } + handler = savehandler; + forcelocal--; + poplocalvars(); + localvars = savelocalvars; + if (need_longjmp) + longjmp(handler->loc, 1); + INTON; +} + + /* * Compute the names of the files in a redirection list. */ @@ -516,6 +548,9 @@ expredir(union node *n) fixredir(redir, fn.list->text, 1); } break; + case NXHERE: + exphere(redir, &fn); + break; } } } Modified: projects/calloutng/bin/sh/expand.c ============================================================================== --- projects/calloutng/bin/sh/expand.c Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/sh/expand.c Mon Feb 11 19:23:23 2013 (r246685) @@ -127,19 +127,6 @@ collate_range_cmp(wchar_t c1, wchar_t c2 return (wcscoll(s1, s2)); } -/* - * Expand shell variables and backquotes inside a here document. - * union node *arg the document - * int fd; where to write the expanded version - */ - -void -expandhere(union node *arg, int fd) -{ - expandarg(arg, (struct arglist *)NULL, 0); - xwrite(fd, stackblock(), expdest - stackblock()); -} - static char * stputs_quotes(const char *data, const char *syntax, char *p) { Modified: projects/calloutng/bin/sh/expand.h ============================================================================== --- projects/calloutng/bin/sh/expand.h Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/sh/expand.h Mon Feb 11 19:23:23 2013 (r246685) @@ -57,7 +57,6 @@ struct arglist { union node; -void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); void rmescapes(char *); Modified: projects/calloutng/bin/sh/jobs.c ============================================================================== --- projects/calloutng/bin/sh/jobs.c Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/sh/jobs.c Mon Feb 11 19:23:23 2013 (r246685) @@ -1030,7 +1030,7 @@ dowait(int mode, struct job *job) int wflags; int restore_sigchld; - TRACE(("dowait(%d) called\n", block)); + TRACE(("dowait(%d, %p) called\n", mode, job)); restore_sigchld = 0; if ((mode & DOWAIT_SIG) != 0) { sigfillset(&mask); @@ -1298,6 +1298,10 @@ until: cmdputs(n->narg.text); cmdputs("() ..."); break; + case NNOT: + cmdputs("! "); + cmdtxt(n->nnot.com); + break; case NCMD: for (np = n->ncmd.args ; np ; np = np->narg.next) { cmdtxt(np); Modified: projects/calloutng/bin/sh/miscbltin.c ============================================================================== --- projects/calloutng/bin/sh/miscbltin.c Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/sh/miscbltin.c Mon Feb 11 19:23:23 2013 (r246685) @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -60,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include "memalloc.h" #include "error.h" #include "mystring.h" +#include "syntax.h" #undef eflag @@ -307,7 +307,7 @@ umaskcmd(int argc __unused, char **argv out1fmt("%.4o\n", mask); } } else { - if (isdigit(*ap)) { + if (is_digit(*ap)) { mask = 0; do { if (*ap >= '8' || *ap < '0') Modified: projects/calloutng/bin/sh/mksyntax.c ============================================================================== --- projects/calloutng/bin/sh/mksyntax.c Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/sh/mksyntax.c Mon Feb 11 19:23:23 2013 (r246685) @@ -103,29 +103,19 @@ static char writer[] = "\ static FILE *cfile; static FILE *hfile; -static const char *syntax[513]; -static int base; -static int size; /* number of values which a char variable can have */ -static int nbits; /* number of bits in a character */ -static int digit_contig;/* true if digits are contiguous */ -static void filltable(const char *); -static void init(void); +static void add_default(void); +static void finish(void); +static void init(const char *); static void add(const char *, const char *); -static void print(const char *); static void output_type_macros(void); -static void digit_convert(void); int main(int argc __unused, char **argv __unused) { - char c; - char d; - int sign; int i; char buf[80]; int pos; - static char digit[] = "0123456789"; /* Create output files */ if ((cfile = fopen("syntax.c", "w")) == NULL) { @@ -139,33 +129,8 @@ main(int argc __unused, char **argv __un fputs(writer, hfile); fputs(writer, cfile); - /* Determine the characteristics of chars. */ - c = -1; - sign = (c > 0) ? 0 : 1; - for (nbits = 1 ; ; nbits++) { - d = (1 << nbits) - 1; - if (d == c) - break; - } -#if 0 - printf("%s %d bit chars\n", sign? "signed" : "unsigned", nbits); -#endif - if (nbits > 9) { - fputs("Characters can't have more than 9 bits\n", stderr); - exit(2); - } - size = (1 << nbits) + 1; - base = 1; - if (sign) - base += 1 << (nbits - 1); - digit_contig = 1; - for (i = 0 ; i < 10 ; i++) { - if (digit[i] != '0' + i) - digit_contig = 0; - } - fputs("#include \n", hfile); - fputs("#include \n", hfile); + fputs("#include \n\n", hfile); /* Generate the #define statements in the header file */ fputs("/* Syntax classes */\n", hfile); @@ -186,8 +151,8 @@ main(int argc __unused, char **argv __un fprintf(hfile, "/* %s */\n", is_entry[i].comment); } putc('\n', hfile); - fprintf(hfile, "#define SYNBASE %d\n", base); - fprintf(hfile, "#define PEOF %d\n\n", -base); + fputs("#define SYNBASE (1 - CHAR_MIN)\n", hfile); + fputs("#define PEOF -SYNBASE\n\n", hfile); putc('\n', hfile); fputs("#define BASESYNTAX (basesyntax + SYNBASE)\n", hfile); fputs("#define DQSYNTAX (dqsyntax + SYNBASE)\n", hfile); @@ -198,10 +163,13 @@ main(int argc __unused, char **argv __un putc('\n', hfile); /* Generate the syntax tables. */ + fputs("#include \"parser.h\"\n", cfile); fputs("#include \"shell.h\"\n", cfile); fputs("#include \"syntax.h\"\n\n", cfile); - init(); + fputs("/* syntax table used when not in quotes */\n", cfile); + init("basesyntax"); + add_default(); add("\n", "CNL"); add("\\", "CBACK"); add("'", "CSQUOTE"); @@ -210,9 +178,11 @@ main(int argc __unused, char **argv __un add("$", "CVAR"); add("}", "CENDVAR"); add("<>();&| \t", "CSPCL"); - print("basesyntax"); - init(); + finish(); + fputs("\n/* syntax table used when in double quotes */\n", cfile); + init("dqsyntax"); + add_default(); add("\n", "CNL"); add("\\", "CBACK"); add("\"", "CENDQUOTE"); @@ -221,17 +191,21 @@ main(int argc __unused, char **argv __un add("}", "CENDVAR"); /* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */ add("!*?[]=~:/-^", "CCTL"); - print("dqsyntax"); - init(); + finish(); + fputs("\n/* syntax table used when in single quotes */\n", cfile); + init("sqsyntax"); + add_default(); add("\n", "CNL"); add("\\", "CSBACK"); add("'", "CENDQUOTE"); /* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */ add("!*?[]=~:/-^", "CCTL"); - print("sqsyntax"); - init(); + finish(); + fputs("\n/* syntax table used when in arithmetic */\n", cfile); + init("arisyntax"); + add_default(); add("\n", "CNL"); add("\\", "CBACK"); add("`", "CBQUOTE"); @@ -240,114 +214,108 @@ main(int argc __unused, char **argv __un add("}", "CENDVAR"); add("(", "CLP"); add(")", "CRP"); - print("arisyntax"); - filltable("0"); + finish(); + fputs("\n/* character classification table */\n", cfile); + init("is_type"); add("0123456789", "ISDIGIT"); add("abcdefghijklmnopqrstuvwxyz", "ISLOWER"); add("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "ISUPPER"); add("_", "ISUNDER"); add("#?$!-*@", "ISSPECL"); - print("is_type"); - if (! digit_contig) - digit_convert(); + finish(); + exit(0); } - /* - * Clear the syntax table. + * Output the header and declaration of a syntax table. */ static void -filltable(const char *dftval) +init(const char *name) { - int i; + fprintf(hfile, "extern const char %s[];\n", name); + fprintf(cfile, "const char %s[SYNBASE + CHAR_MAX + 1] = {\n", name); +} + - for (i = 0 ; i < size ; i++) - syntax[i] = dftval; +static void +add_one(const char *key, const char *type) +{ + fprintf(cfile, "\t[SYNBASE + %s] = %s,\n", key, type); } /* - * Initialize the syntax table with default values. + * Add default values to the syntax table. */ static void -init(void) +add_default(void) { - filltable("CWORD"); - syntax[0] = "CEOF"; - syntax[base + CTLESC] = "CCTL"; - syntax[base + CTLVAR] = "CCTL"; - syntax[base + CTLENDVAR] = "CCTL"; - syntax[base + CTLBACKQ] = "CCTL"; - syntax[base + CTLBACKQ + CTLQUOTE] = "CCTL"; - syntax[base + CTLARI] = "CCTL"; - syntax[base + CTLENDARI] = "CCTL"; - syntax[base + CTLQUOTEMARK] = "CCTL"; - syntax[base + CTLQUOTEEND] = "CCTL"; + add_one("PEOF", "CEOF"); + add_one("CTLESC", "CCTL"); + add_one("CTLVAR", "CCTL"); + add_one("CTLENDVAR", "CCTL"); + add_one("CTLBACKQ", "CCTL"); + add_one("CTLBACKQ + CTLQUOTE", "CCTL"); + add_one("CTLARI", "CCTL"); + add_one("CTLENDARI", "CCTL"); + add_one("CTLQUOTEMARK", "CCTL"); + add_one("CTLQUOTEEND", "CCTL"); } /* - * Add entries to the syntax table. + * Output the footer of a syntax table. */ static void -add(const char *p, const char *type) +finish(void) { - while (*p) - syntax[*p++ + base] = type; + fputs("};\n", cfile); } - /* - * Output the syntax table. + * Add entries to the syntax table. */ static void -print(const char *name) +add(const char *p, const char *type) { - int i; - int col; - - fprintf(hfile, "extern const char %s[];\n", name); - fprintf(cfile, "const char %s[%d] = {\n", name, size); - col = 0; - for (i = 0 ; i < size ; i++) { - if (i == 0) { - fputs(" ", cfile); - } else if ((i & 03) == 0) { - fputs(",\n ", cfile); - col = 0; - } else { - putc(',', cfile); - while (++col < 9 * (i & 03)) - putc(' ', cfile); + for (; *p; ++p) { + char c = *p; + switch (c) { + case '\t': c = 't'; break; + case '\n': c = 'n'; break; + case '\'': c = '\''; break; + case '\\': c = '\\'; break; + + default: + fprintf(cfile, "\t[SYNBASE + '%c'] = %s,\n", c, type); + continue; } - fputs(syntax[i], cfile); - col += strlen(syntax[i]); + fprintf(cfile, "\t[SYNBASE + '\\%c'] = %s,\n", c, type); } - fputs("\n};\n", cfile); } - /* * Output character classification macros (e.g. is_digit). If digits are * contiguous, we can test for them quickly. */ static const char *macro[] = { - "#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)", + "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)", "#define is_eof(c)\t((c) == PEOF)", "#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", "#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", "#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", "#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))", + "#define digit_val(c)\t((c) - '0')", NULL }; @@ -356,41 +324,6 @@ output_type_macros(void) { const char **pp; - if (digit_contig) - macro[0] = "#define is_digit(c)\t((unsigned int)((c) - '0') <= 9)"; for (pp = macro ; *pp ; pp++) fprintf(hfile, "%s\n", *pp); - if (digit_contig) - fputs("#define digit_val(c)\t((c) - '0')\n", hfile); - else - fputs("#define digit_val(c)\t(digit_value[c])\n", hfile); -} - - - -/* - * Output digit conversion table (if digits are not contiguous). - */ - -static void -digit_convert(void) -{ - int maxdigit; - static char digit[] = "0123456789"; - char *p; - int i; - - maxdigit = 0; - for (p = digit ; *p ; p++) - if (*p > maxdigit) - maxdigit = *p; - fputs("extern const char digit_value[];\n", hfile); - fputs("\n\nconst char digit_value[] = {\n", cfile); - for (i = 0 ; i <= maxdigit ; i++) { - for (p = digit ; *p && *p != i ; p++); - if (*p == '\0') - p = digit; - fprintf(cfile, " %d,\n", (int)(p - digit)); - } - fputs("};\n", cfile); } Modified: projects/calloutng/bin/sh/nodetypes ============================================================================== --- projects/calloutng/bin/sh/nodetypes Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/bin/sh/nodetypes Mon Feb 11 19:23:23 2013 (r246685) @@ -138,6 +138,7 @@ NXHERE nhere # fd<type == NHERE) { - len = strlen(redir->nhere.doc->narg.text); - if (len <= PIPESIZE) { - xwrite(pip[1], redir->nhere.doc->narg.text, len); - goto out; - } + + if (redir->type == NXHERE) + p = redir->nhere.expdoc; + else + p = redir->nhere.doc->narg.text; + len = strlen(p); + if (len <= PIPESIZE) { + xwrite(pip[1], p, len); + goto out; } + if (forkshell((struct job *)NULL, (union node *)NULL, FORK_NOJOB) == 0) { close(pip[0]); signal(SIGINT, SIG_IGN); @@ -270,10 +275,7 @@ openhere(union node *redir) signal(SIGHUP, SIG_IGN); signal(SIGTSTP, SIG_IGN); signal(SIGPIPE, SIG_DFL); - if (redir->type == NHERE) - xwrite(pip[1], redir->nhere.doc->narg.text, len); - else - expandhere(redir->nhere.doc, pip[1]); + xwrite(pip[1], p, len); _exit(0); } out: Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c Mon Feb 11 19:23:23 2013 (r246685) @@ -983,7 +983,7 @@ visit_indirect(spa_t *spa, const dnode_p arc_buf_t *buf; uint64_t fill = 0; - err = arc_read_nolock(NULL, spa, bp, arc_getbuf_func, &buf, + err = arc_read(NULL, spa, bp, arc_getbuf_func, &buf, ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb); if (err) return (err); @@ -2001,9 +2001,8 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t * bp, NULL, NULL, ZIO_FLAG_CANFAIL)), ==, 0); } -/* ARGSUSED */ static int -zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf, +zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) { zdb_cb_t *zcb = arg; @@ -2410,7 +2409,7 @@ typedef struct zdb_ddt_entry { /* ARGSUSED */ static int zdb_ddt_add_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, - arc_buf_t *pbuf, const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) + const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) { avl_tree_t *t = arg; avl_index_t where; Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Feb 11 18:22:26 2013 (r246684) +++ projects/calloutng/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Feb 11 19:23:23 2013 (r246685) @@ -1,5 +1,5 @@ '\" te -.\" Copyright (c) 2012, Martin Matuska . +.\" Copyright (c) 2013, Martin Matuska . .\" All Rights Reserved. .\" .\" The contents of this file are subject to the terms of the @@ -19,15 +19,16 @@ .\" .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved. .\" Copyright (c) 2012 by Delphix. All rights reserved. -.\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2012, Joyent, Inc. All rights reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek .\" Copyright (c) 2012, Glen Barber .\" Copyright (c) 2012, Bryan Drewery +.\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. +.\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved. .\" .\" $FreeBSD$ .\" -.Dd November 26, 2012 +.Dd February 10, 2013 .Dt ZFS 8 .Os .Sh NAME @@ -39,14 +40,12 @@ .Nm .Cm create .Op Fl pu -.Op Fl o Ar property Ns = Ns Ar value -.Ar ... filesystem +.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... Ar filesystem .Nm .Cm create .Op Fl ps .Op Fl b Ar blocksize -.Op Fl o Ar property Ns = Ns Ar value -.Ar ... +.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... .Fl V .Ar size volume .Nm @@ -59,13 +58,13 @@ .Sm off .Ar snapshot .Op % Ns Ar snapname -.Op , Ns Ar ... +.Op , Ns ... .Sm on .Nm .Cm snapshot .Op Fl r -.Op Fl o Ar property Ns = Ns Ar value -.Ar ... filesystem@snapname Ns | Ns Ar volume@snapname +.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... +.Ar filesystem@snapname Ns | Ns Ar volume@snapname .Nm .Cm rollback .Op Fl rRf @@ -73,8 +72,8 @@ .Nm .Cm clone .Op Fl p -.Op Fl o Ar property Ns = Ns Ar value -.Ar ... snapshot filesystem Ns | Ns Ar volume +.Oo Fl o Ar property Ns = Ns Ar value Oc Ns ... +.Ar snapshot filesystem Ns | Ns Ar volume .Nm .Cm promote .Ar clone-filesystem @@ -102,31 +101,29 @@ .Cm list .Op Fl r Ns | Ns Fl d Ar depth .Op Fl H -.Op Fl o Ar property Ns Op , Ns Ar ... -.Op Fl t Ar type Ns Op , Ns Ar ... -.Op Fl s Ar property -.Ar ... -.Op Fl S Ar property -.Ar ... +.Op Fl o Ar property Ns Oo , Ns property Ns Oc Ns ... +.Op Fl t Ar type Ns Oo , Ns type Ns Oc Ns ... +.Oo Fl s Ar property Oc Ns ... +.Oo Fl S Ar property Oc Ns ... .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot .Nm .Cm set .Ar property Ns = Ns Ar value -.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot +.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ... .Nm .Cm get .Op Fl r Ns | Ns Fl d Ar depth .Op Fl Hp -.Op Fl o Ar all | field Ns Op , Ns Ar ... -.Op Fl t Ar type Ns Op , Ns Ar ... -.Op Fl s Ar source Ns Op , Ns Ar ... -.Ar all | property Ns Op , Ns Ar ... *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 22:32:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 338AEEAA; Mon, 11 Feb 2013 22:32:50 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 27297255; Mon, 11 Feb 2013 22:32:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BMWoEb072787; Mon, 11 Feb 2013 22:32:50 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BMWowE072786; Mon, 11 Feb 2013 22:32:50 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201302112232.r1BMWowE072786@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 11 Feb 2013 22:32:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246690 - projects/physbio/sys/dev/siis 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.14 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, 11 Feb 2013 22:32:50 -0000 Author: kib Date: Mon Feb 11 22:32:49 2013 New Revision: 246690 URL: http://svnweb.freebsd.org/changeset/base/246690 Log: The siis dma load callback siis_dmasetprd() does not handle the case nsegs == 0. Restore the direct call to siis_execute_transaction() for the ccbs which do not specify I/O. Discussed with: jeff Modified: projects/physbio/sys/dev/siis/siis.c Modified: projects/physbio/sys/dev/siis/siis.c ============================================================================== --- projects/physbio/sys/dev/siis/siis.c Mon Feb 11 21:50:00 2013 (r246689) +++ projects/physbio/sys/dev/siis/siis.c Mon Feb 11 22:32:49 2013 (r246690) @@ -994,9 +994,13 @@ siis_begin_transaction(device_t dev, uni (ccb->ataio.cmd.flags & (CAM_ATAIO_CONTROL | CAM_ATAIO_NEEDRESULT))) ch->aslots |= (1 << slot->slot); slot->dma.nsegs = 0; - slot->state = SIIS_SLOT_LOADING; - bus_dmamap_load_ccb(ch->dma.data_tag, slot->dma.data_map, - ccb, siis_dmasetprd, slot, 0); + /* If request moves data, setup and load SG list */ + if ((ccb->ccb_h.flags & CAM_DIR_MASK) != CAM_DIR_NONE) { + slot->state = SIIS_SLOT_LOADING; + bus_dmamap_load_ccb(ch->dma.data_tag, slot->dma.data_map, + ccb, siis_dmasetprd, slot, 0); + } else + siis_execute_transaction(slot); } /* Locked by busdma engine. */ From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 22:55:24 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 169F568D; Mon, 11 Feb 2013 22:55:24 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 08B3F37A; Mon, 11 Feb 2013 22:55:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BMtNJD078957; Mon, 11 Feb 2013 22:55:23 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BMtNWB078956; Mon, 11 Feb 2013 22:55:23 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112255.r1BMtNWB078956@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 22:55:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246692 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 22:55:24 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 22:55:23 2013 New Revision: 246692 URL: http://svnweb.freebsd.org/changeset/base/246692 Log: Get rid of the mis-named chroot/ dir and make it worlddir/ . Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 22:54:23 2013 (r246691) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 22:55:23 2013 (r246692) @@ -16,7 +16,7 @@ DEFAULT_ZFS_PERMISSIONSET_SNAPS="clone,s SNAP_DIRECTORY=snap # ownership of direct subdirectories of DEFAULT_ZFS_VOLUME -SRCBUILD_OWNED_SUBDIRS="chroot pxeroot ${SNAP_DIRECTORY}" +SRCBUILD_OWNED_SUBDIRS="pxeroot ${SNAP_DIRECTORY} worlddir" PORTBUILD_OWNED_SUBDIRS="portbuild" if [ `id -u` != 0 ]; then From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 22:56:44 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 85D347C6; Mon, 11 Feb 2013 22:56:44 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 62D6438B; Mon, 11 Feb 2013 22:56:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BMuioO079163; Mon, 11 Feb 2013 22:56:44 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BMuicZ079162; Mon, 11 Feb 2013 22:56:44 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112256.r1BMuicZ079162@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 22:56:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246693 - projects/portbuild/admin/www 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.14 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, 11 Feb 2013 22:56:44 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 22:56:43 2013 New Revision: 246693 URL: http://svnweb.freebsd.org/changeset/base/246693 Log: Remove one more instance of the chroot misnomer. Modified: projects/portbuild/admin/www/index.html Modified: projects/portbuild/admin/www/index.html ============================================================================== --- projects/portbuild/admin/www/index.html Mon Feb 11 22:55:23 2013 (r246692) +++ projects/portbuild/admin/www/index.html Mon Feb 11 22:56:43 2013 (r246693) @@ -414,9 +414,9 @@ put on a CDROM.

Notes on the building process:

    -
  • Every port is built in its own chroot environment +
  • Every port is built in its own jailed environment , starting with an -empty /usr/local and /usr/X11R6. /usr/local. The dependencies are installed as packages just before the build. You can see the list of dependencies on the third line of the log -- the "foo.tgz bar.tgz" stuff are the dependencies. To From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 22:59:11 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 749AF90B; Mon, 11 Feb 2013 22:59:11 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 591C33A6; Mon, 11 Feb 2013 22:59:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BMxBYM079503; Mon, 11 Feb 2013 22:59:11 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BMxB7E079501; Mon, 11 Feb 2013 22:59:11 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112259.r1BMxB7E079501@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 22:59:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246694 - in projects/portbuild: admin/scripts scripts 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.14 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, 11 Feb 2013 22:59:11 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 22:59:10 2013 New Revision: 246694 URL: http://svnweb.freebsd.org/changeset/base/246694 Log: makeworld and mkbindist need to belong to SRCBUILD_USER, not PORTBUILD_USER, in the new privilege separation world. Added: projects/portbuild/admin/scripts/makeworld - copied unchanged from r246683, projects/portbuild/scripts/makeworld projects/portbuild/admin/scripts/mkbindist - copied unchanged from r246683, projects/portbuild/scripts/mkbindist Deleted: projects/portbuild/scripts/makeworld projects/portbuild/scripts/mkbindist Copied: projects/portbuild/admin/scripts/makeworld (from r246683, projects/portbuild/scripts/makeworld) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/portbuild/admin/scripts/makeworld Mon Feb 11 22:59:10 2013 (r246694, copy of r246683, projects/portbuild/scripts/makeworld) @@ -0,0 +1,122 @@ +#!/bin/sh + +# +# XXX lockfile and interlock with mkbindist to avoid overlapping +# builds + +if [ $# -lt 2 ]; then + echo "usage: makeworld [] [args]" + exit 1 +fi + +arch=$1 +branch=$2 +shift 2 + +buildid="latest" +if [ $# -gt 0 ]; then + case "$1" in + -client) + ;; + -nocvs|-novcs) + ;; + *) + buildid="$1" + shift + ;; + esac +fi + +pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} +pbd=${PORTBUILD_DATA:-/var/portbuild} + +builddir=${pbd}/${arch}/${branch}/builds/${buildid} +if [ ! -d ${builddir} ]; then + echo "build directory ${builddir} does not exist!" + exit 1 +fi + +. ${pbc}/conf/server.conf +. ${pbc}/conf/common.conf +. ${pbd}/${arch}/portbuild.conf +if [ -f ${builddir}/portbuild.conf ]; then + . ${builddir}/portbuild.conf +fi +# NB: we can't use buildenv because it sets ARCH and MACHINE_ARCH that +# confuses cross-builds + +export TARGET_ARCH=${arch} +# Workaround needed for zfs - 20090321 erwin +export NO_FSCHG=1 + +client=0 +novcs=0 + +# optional arguments +while [ $# -gt 0 ]; do + case "$1" in + -client) + client=1 + ;; + -nocvs|-novcs) + novcs=1 + ;; + *) + args="$1 ${args}" + ;; + esac + shift +done + +# XXX MCL I don't know what -client is supposed to do. +if [ "$client" = "1" ]; then + SRC_BASE=${pbd}/${arch}/src-client + shift 1 +else + SRC_BASE=${builddir}/src + + # allow for per-build make.conf + if [ -f ${builddir}/make.conf.server ]; then + export __MAKE_CONF=${builddir}/make.conf.server + else + export __MAKE_CONF=/dev/null + fi + + # allow for per-build src.conf + if [ -f ${builddir}/src.conf.server ]; then + export SRCCONF=${builddir}/src.conf.server + else + export SRCCONF=/dev/null + fi +fi + +cd ${SRC_BASE} || exit $? + +if [ "$novcs" = "0" ]; then + echo "==> Updating source tree" + # XXX MCL 20121120 not yet tested. + ${VCS_UPDATE_COMMAND} ${SRC_BASE} || exit $? +fi + +echo "==> Starting make buildworld" +make buildworld ${args} || exit $? + +echo "==> Cleaning up destdir" +destdir=${WORLDDIR}/${arch}/${branch} +rm -rf ${destdir}/ +chflags -R noschg ${destdir}/ +rm -rf ${destdir}/ +mkdir -p ${destdir} || exit $? + +echo "==> Starting make installworld" +if [ "$client" = "0" ]; then + export NEWSPARC_TIMETYPE=__int64_t + make installworld DESTDIR=${destdir} || exit $? + + echo "==> Starting make distribute" + make DESTDIR=${destdir} distrib-dirs && \ + make DESTDIR=${destdir} distribution || exit $? + +else + echo "==> Not doing installworld of client source tree" +fi Copied: projects/portbuild/admin/scripts/mkbindist (from r246683, projects/portbuild/scripts/mkbindist) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/portbuild/admin/scripts/mkbindist Mon Feb 11 22:59:10 2013 (r246694, copy of r246683, projects/portbuild/scripts/mkbindist) @@ -0,0 +1,93 @@ +#!/bin/sh + +# XXX merge with makeworld? + +usage () { + echo "usage: mkbindist []" + exit 1 +} + +cleandir() { + dir=$1 + rm -rf ${dir} 2>/dev/null + if [ -d ${dir} ]; then + chflags -R noschg ${dir} + rm -rf ${dir} + fi +} + +if [ $# -lt 2 ]; then + usage +fi + +arch=$1 +branch=$2 +shift 2 + +buildid="latest" +if [ $# -gt 0 ]; then + buildid="$1" + shift +fi + +pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} +pbd=${PORTBUILD_DATA:-/var/portbuild} + +builddir=${pbd}/${arch}/${branch}/builds/${buildid} +if [ ! -d ${builddir} ]; then + echo "build directory ${builddir} does not exist!" + exit 1 +fi + +. ${pbc}/conf/server.conf +. ${pbd}/${arch}/portbuild.conf +if [ -f ${builddir}/portbuild.conf ]; then + . ${builddir}/portbuild.conf +fi + +. ${pbc}/scripts/buildenv + +if ! validate_env ${arch} ${branch}; then + echo "Invalid build environment ${arch}/${branch}" + exit 1 +fi + +tmpdir=${builddir}/bindist/tmp + +# Clean up ${tmpdir} +cleandir ${tmpdir} +mkdir -p ${tmpdir} + +# Copy the files into the tmpdir from an existing built world +destdir=${WORLDDIR}/${arch}/${branch} +cd ${destdir}; find -dx . | \ + grep -v -E '^./usr/(local|obj|opt|ports|src)' | \ + grep -v '^./home' | \ + grep -v '^./var/db/pkg' | \ + cpio -dump ${tmpdir} + +cd ${tmpdir} + +# Customize the tmpdir +if [ -s "${builddir}/bindist/delete" ]; then + sed -e "s,^,${tmpdir}," ${builddir}/bindist/delete | xargs rm -rf +fi +if [ -s "${builddir}/bindist/dirlist" ]; then + cat "${builddir}/bindist/dirlist" | xargs mkdir -p +fi +# XXX MCL seems to be obsoleted by individual files in clients/? +if [ -d ${builddir}/bindist/files ]; then + cd ${builddir}/bindist/files; find -dx . | cpio -dump ${tmpdir} +fi + +# Post-processing of installed world +date '+%Y%m%d' > ${tmpdir}/var/db/port.mkversion + +# Create the tarball +tar cfCj ${builddir}/.bindist.tbz ${tmpdir} . +mv -f ${builddir}/.bindist.tbz ${builddir}/bindist.tbz +md5 ${builddir}/bindist.tbz > ${builddir}/bindist.tbz.md5 + +# Clean up +cd ${builddir} +cleandir ${tmpdir} From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 23:04:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5AE44AD3; Mon, 11 Feb 2013 23:04:14 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1F87F400; Mon, 11 Feb 2013 23:04:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BN4ECF082041; Mon, 11 Feb 2013 23:04:14 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BN4DFF082036; Mon, 11 Feb 2013 23:04:13 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112304.r1BN4DFF082036@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 23:04:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246695 - projects/portbuild/admin/scripts 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.14 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, 11 Feb 2013 23:04:14 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 23:04:12 2013 New Revision: 246695 URL: http://svnweb.freebsd.org/changeset/base/246695 Log: Make these more comfortable in the new world. Modified: projects/portbuild/admin/scripts/makeworld projects/portbuild/admin/scripts/mkbindist projects/portbuild/admin/scripts/updatesnap projects/portbuild/admin/scripts/updatesnap.ports Modified: projects/portbuild/admin/scripts/makeworld ============================================================================== --- projects/portbuild/admin/scripts/makeworld Mon Feb 11 22:59:10 2013 (r246694) +++ projects/portbuild/admin/scripts/makeworld Mon Feb 11 23:04:12 2013 (r246695) @@ -27,8 +27,8 @@ if [ $# -gt 0 ]; then esac fi -pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} -pbd=${PORTBUILD_DATA:-/var/portbuild} +pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} +pbd=${PORTBUILD_DATA:-/a/portbuild} builddir=${pbd}/${arch}/${branch}/builds/${buildid} if [ ! -d ${builddir} ]; then @@ -36,6 +36,7 @@ if [ ! -d ${builddir} ]; then exit 1 fi +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf Modified: projects/portbuild/admin/scripts/mkbindist ============================================================================== --- projects/portbuild/admin/scripts/mkbindist Mon Feb 11 22:59:10 2013 (r246694) +++ projects/portbuild/admin/scripts/mkbindist Mon Feb 11 23:04:12 2013 (r246695) @@ -30,8 +30,8 @@ if [ $# -gt 0 ]; then shift fi -pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} -pbd=${PORTBUILD_DATA:-/var/portbuild} +pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} +pbd=${PORTBUILD_DATA:-/a/portbuild} builddir=${pbd}/${arch}/${branch}/builds/${buildid} if [ ! -d ${builddir} ]; then @@ -39,6 +39,7 @@ if [ ! -d ${builddir} ]; then exit 1 fi +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf . ${pbd}/${arch}/portbuild.conf if [ -f ${builddir}/portbuild.conf ]; then Modified: projects/portbuild/admin/scripts/updatesnap ============================================================================== --- projects/portbuild/admin/scripts/updatesnap Mon Feb 11 22:59:10 2013 (r246694) +++ projects/portbuild/admin/scripts/updatesnap Mon Feb 11 23:04:12 2013 (r246695) @@ -5,6 +5,7 @@ pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf base=${ZFS_MOUNTPOINT}/${SNAP_DIRECTORY} Modified: projects/portbuild/admin/scripts/updatesnap.ports ============================================================================== --- projects/portbuild/admin/scripts/updatesnap.ports Mon Feb 11 22:59:10 2013 (r246694) +++ projects/portbuild/admin/scripts/updatesnap.ports Mon Feb 11 23:04:12 2013 (r246695) @@ -5,6 +5,7 @@ pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf base=${ZFS_MOUNTPOINT}/${SNAP_DIRECTORY} From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 23:06:19 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0E2A8DC7; Mon, 11 Feb 2013 23:06:19 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 002E4635; Mon, 11 Feb 2013 23:06:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BN6Imt082507; Mon, 11 Feb 2013 23:06:18 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BN6IGJ082505; Mon, 11 Feb 2013 23:06:18 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112306.r1BN6IGJ082505@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 23:06:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246697 - projects/portbuild/admin/crontabs 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.14 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, 11 Feb 2013 23:06:19 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 23:06:18 2013 New Revision: 246697 URL: http://svnweb.freebsd.org/changeset/base/246697 Log: Cleanup. Modified: projects/portbuild/admin/crontabs/portbuild projects/portbuild/admin/crontabs/srcbuild Modified: projects/portbuild/admin/crontabs/portbuild ============================================================================== --- projects/portbuild/admin/crontabs/portbuild Mon Feb 11 23:05:10 2013 (r246696) +++ projects/portbuild/admin/crontabs/portbuild Mon Feb 11 23:06:18 2013 (r246697) @@ -29,12 +29,3 @@ SCRIPTS=/a/portbuild/scripts/ # # Clean up old chroots on client machines #30 * * * * ${SCRIPTS}/do-cleanup-chroots all -# -# Backup ZFS filesystems -# XXX MCL script not yet converted -# will have to split this up -#50 4 * * * lockf -t 0 -k ${LOCKFILES}/busybusybusy.lock ${SCRIPTS}/zbackup -# -# Expire old ZFS snapshots -# will have to split this up, too -#50 3 * * * lockf -t 0 -k ${LOCKFILES}/busybusybusy.lock ${SCRIPTS}/zexpire Modified: projects/portbuild/admin/crontabs/srcbuild ============================================================================== --- projects/portbuild/admin/crontabs/srcbuild Mon Feb 11 23:05:10 2013 (r246696) +++ projects/portbuild/admin/crontabs/srcbuild Mon Feb 11 23:06:18 2013 (r246697) @@ -21,5 +21,4 @@ SCRIPTS=/a/portbuild/admin/scripts/ #50 4 * * * lockf -t 0 -k ${LOCKFILES}/busybusybusy.lock ${SCRIPTS}/zbackup # # Expire old ZFS snapshots -# XXX MCL have to split this one up, too #50 3 * * * lockf -t 0 -k ${LOCKFILES}/busybusybusy.lock ${SCRIPTS}/zexpire From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 23:27:40 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 672F23A6; Mon, 11 Feb 2013 23:27:40 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 42409706; Mon, 11 Feb 2013 23:27:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BNRexT088754; Mon, 11 Feb 2013 23:27:40 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BNRebK088753; Mon, 11 Feb 2013 23:27:40 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112327.r1BNRebK088753@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 23:27:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246699 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 23:27:40 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 23:27:39 2013 New Revision: 246699 URL: http://svnweb.freebsd.org/changeset/base/246699 Log: Swap the order of some operations. No code changes. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 23:14:54 2013 (r246698) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 23:27:39 2013 (r246699) @@ -135,26 +135,12 @@ if [ -z "${mounted}" -o "${mounted}" = " fi chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT} 2> /dev/null -# (re)mount various subdirectories to be managed by srcbuild. -for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do - mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` - if [ -z "${mounted}" -o "${mounted}" = "no" ]; then - echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." - zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 - fi - chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null -done - # delegate the "zfsportbuildadmin" permission set to the PORTBUILD_USER. zfs allow -du ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1 # delegate the "zfssnapadmin" permission set to the PORTBUILD_USER. zfs allow -du ${PORTBUILD_USER} @zfssnapadmin ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 -echo "results of ZFS operations:" -zfs list ${ZFS_VOLUME} -zfs allow ${ZFS_VOLUME} - # (re)mount various subdirectories to be managed by portbuild. for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` @@ -165,6 +151,20 @@ for subdir in ${PORTBUILD_OWNED_SUBDIRS} chown ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null done +# (re)mount various subdirectories to be managed by srcbuild. +for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do + mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` + if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." + zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 + fi + chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null +done + +echo "results of ZFS operations:" +zfs list ${ZFS_VOLUME} +zfs allow ${ZFS_VOLUME} + echo "checking out the repository as user ${PORTBUILD_USER} ..." su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1 From owner-svn-src-projects@FreeBSD.ORG Mon Feb 11 23:33:51 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 05CE1503; Mon, 11 Feb 2013 23:33:51 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E3805734; Mon, 11 Feb 2013 23:33:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BNXoe4091172; Mon, 11 Feb 2013 23:33:50 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BNXoZY091171; Mon, 11 Feb 2013 23:33:50 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112333.r1BNXoZY091171@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 23:33:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246700 - projects/portbuild/admin/tools 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.14 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, 11 Feb 2013 23:33:51 -0000 Author: linimon (doc,ports committer) Date: Mon Feb 11 23:33:50 2013 New Revision: 246700 URL: http://svnweb.freebsd.org/changeset/base/246700 Log: An example script that demonstrates how to use mkportbuild to create a new package building node, as per: http://www.freebsd.org/doc/en_US.ISO8859-1/articles/portbuild/article.html#new-node Added: projects/portbuild/admin/tools/example_install (contents, props changed) Added: projects/portbuild/admin/tools/example_install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/portbuild/admin/tools/example_install Mon Feb 11 23:33:50 2013 (r246700) @@ -0,0 +1,12 @@ +#!/bin/sh +# +# example script to drive mkportbuild +# +export PORTBUILD_USER=portbuild +export SRCBUILD_USER=srcbuild +export ZFS_VOLUME=a +export ZFS_MOUNTPOINT=/a +export VCS_REPOSITORY=svn://svn0.us-east.FreeBSD.org +mkdir -p tmp +svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/admin/tools tmp +sh -x ./tmp/newmkportbuild From owner-svn-src-projects@FreeBSD.ORG Tue Feb 12 03:14:48 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5A5FF6D5; Tue, 12 Feb 2013 03:14:48 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4CFECF07; Tue, 12 Feb 2013 03:14:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1C3EmBU058395; Tue, 12 Feb 2013 03:14:48 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1C3Emnp058394; Tue, 12 Feb 2013 03:14:48 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302120314.r1C3Emnp058394@svn.freebsd.org> From: Mark Linimon Date: Tue, 12 Feb 2013 03:14:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246702 - projects/portbuild/tools 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.14 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, 12 Feb 2013 03:14:48 -0000 Author: linimon (doc,ports committer) Date: Tue Feb 12 03:14:47 2013 New Revision: 246702 URL: http://svnweb.freebsd.org/changeset/base/246702 Log: Continue the move from /var/portbuild to /a/portbuild. Modified: projects/portbuild/tools/addarch Modified: projects/portbuild/tools/addarch ============================================================================== --- projects/portbuild/tools/addarch Tue Feb 12 01:37:33 2013 (r246701) +++ projects/portbuild/tools/addarch Tue Feb 12 03:14:47 2013 (r246702) @@ -3,8 +3,8 @@ # server-side script to add an architecture. Should be run as root. # configurable variables -pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} -pbd=${PORTBUILD_DATA:-/var/portbuild} +pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} +pbd=${PORTBUILD_DATA:-/a/portbuild} PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:${pbc}/scripts From owner-svn-src-projects@FreeBSD.ORG Tue Feb 12 03:19:40 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2A763856; Tue, 12 Feb 2013 03:19:40 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 06CD5F2E; Tue, 12 Feb 2013 03:19:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1C3JdtS059054; Tue, 12 Feb 2013 03:19:39 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1C3JdjE059053; Tue, 12 Feb 2013 03:19:39 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302120319.r1C3JdjE059053@svn.freebsd.org> From: Mark Linimon Date: Tue, 12 Feb 2013 03:19:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246703 - projects/portbuild/tools 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.14 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, 12 Feb 2013 03:19:40 -0000 Author: linimon (doc,ports committer) Date: Tue Feb 12 03:19:39 2013 New Revision: 246703 URL: http://svnweb.freebsd.org/changeset/base/246703 Log: Follow the split of server.conf into server.conf and admin.conf. While here, stamp out some other lies, and comment out code that can take eons to run. Modified: projects/portbuild/tools/addarch Modified: projects/portbuild/tools/addarch ============================================================================== --- projects/portbuild/tools/addarch Tue Feb 12 03:14:47 2013 (r246702) +++ projects/portbuild/tools/addarch Tue Feb 12 03:19:39 2013 (r246703) @@ -21,6 +21,12 @@ usage () { exit 1 } +if [ ! -e ${pbc}/admin/conf/admin.conf ] ; then + echo "You must first create ${pbc}/admin/conf/admin.conf." + exit 1 +fi +. ${pbc}/admin/conf/admin.conf + if [ ! -e ${pbc}/conf/server.conf ] ; then echo "You must first create ${pbc}/conf/server.conf." exit 1 @@ -42,7 +48,7 @@ for i in ${SUPPORTED_ARCHS}; do fi done if [ $valid_arch = 0 ]; then - echo "You must first add ${arch} to SUPPORTED_ARCHS in ${pbc}/conf/server.conf." + echo "You must first add ${arch} to SUPPORTED_ARCHS in ${pbc}/admin/conf/admin.conf." echo "Currently supported archs are: ${SUPPORTED_ARCHS}." exit 1 fi @@ -50,7 +56,8 @@ fi if [ ! -z "${PORTBUILD_USER}" ]; then uid=${PORTBUILD_USER} else - uid=ports-${arch} + echo "You must first define PORTBUILD_USER in ${pbc}/admin/conf/admin.conf." + exit 1 fi if [ ! -z "${PORTBUILD_GROUP}" ]; then gid=${PORTBUILD_GROUP} @@ -64,8 +71,8 @@ archfs=${ZFS_VOLUME}/portbuild/${arch} if ! test_fs "${archfs}"; then echo "The ${archfs} filesystem does not exist. I'll create and mount it for you." zfs create ${archfs} || exit 1 - chown -R ${uid}:${gid} ${archdir} || exit 1 - chmod -R g+w ${archdir} || exit 1 +# chown -R ${uid}:${gid} ${archdir} || exit 1 +# chmod -R g+w ${archdir} || exit 1 fi loads=${archdir}/loads From owner-svn-src-projects@FreeBSD.ORG Tue Feb 12 18:26:31 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8C63E6A4; Tue, 12 Feb 2013 18:26:31 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 66AE090B; Tue, 12 Feb 2013 18:26:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1CIQVBL035367; Tue, 12 Feb 2013 18:26:31 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1CIQVjv035366; Tue, 12 Feb 2013 18:26:31 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302121826.r1CIQVjv035366@svn.freebsd.org> From: Mark Linimon Date: Tue, 12 Feb 2013 18:26:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246716 - projects/portbuild/errorlogs 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.14 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, 12 Feb 2013 18:26:31 -0000 Author: linimon (doc,ports committer) Date: Tue Feb 12 18:26:30 2013 New Revision: 246716 URL: http://svnweb.freebsd.org/changeset/base/246716 Log: Attempt to make the index.html link follow the new directory layout. Modified: Directory Properties: projects/portbuild/errorlogs/index.html (props changed) From owner-svn-src-projects@FreeBSD.ORG Tue Feb 12 18:27:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id DF59C95E; Tue, 12 Feb 2013 18:27:59 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F36E591E; Tue, 12 Feb 2013 18:27:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1CIRwGe035725; Tue, 12 Feb 2013 18:27:58 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1CIRwSv035724; Tue, 12 Feb 2013 18:27:58 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302121827.r1CIRwSv035724@svn.freebsd.org> From: Mark Linimon Date: Tue, 12 Feb 2013 18:27:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246717 - projects/portbuild/errorlogs 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.14 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, 12 Feb 2013 18:27:59 -0000 Author: linimon (doc,ports committer) Date: Tue Feb 12 18:27:58 2013 New Revision: 246717 URL: http://svnweb.freebsd.org/changeset/base/246717 Log: nope. Modified: Directory Properties: projects/portbuild/errorlogs/index.html (props changed) From owner-svn-src-projects@FreeBSD.ORG Tue Feb 12 18:38:02 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 00038D74; Tue, 12 Feb 2013 18:38:01 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E52A6989; Tue, 12 Feb 2013 18:38:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1CIc13p038870; Tue, 12 Feb 2013 18:38:01 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1CIc1Cs038869; Tue, 12 Feb 2013 18:38:01 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302121838.r1CIc1Cs038869@svn.freebsd.org> From: Mark Linimon Date: Tue, 12 Feb 2013 18:38:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246718 - projects/portbuild/admin/tools 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.14 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, 12 Feb 2013 18:38:02 -0000 Author: linimon (doc,ports committer) Date: Tue Feb 12 18:38:01 2013 New Revision: 246718 URL: http://svnweb.freebsd.org/changeset/base/246718 Log: Continue to work on the split. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Tue Feb 12 18:27:58 2013 (r246717) +++ projects/portbuild/admin/tools/newmkportbuild Tue Feb 12 18:38:01 2013 (r246718) @@ -15,9 +15,10 @@ DEFAULT_ZFS_PERMISSIONSET="clone,create, DEFAULT_ZFS_PERMISSIONSET_SNAPS="clone,snapshot" SNAP_DIRECTORY=snap -# ownership of direct subdirectories of DEFAULT_ZFS_VOLUME +# define ownership of direct subdirectories of DEFAULT_ZFS_VOLUME SRCBUILD_OWNED_SUBDIRS="pxeroot ${SNAP_DIRECTORY} worlddir" PORTBUILD_OWNED_SUBDIRS="portbuild" +PORTBUILD_OWNED_SUBSUBDIRS="lockfiles log" if [ `id -u` != 0 ]; then echo "$0 must be run as root." @@ -171,13 +172,14 @@ su -m ${PORTBUILD_USER} -c "${VCS_CHECKO # XXX MCL now have to move some directories over, create different # XXX MCL ownerships, and so forth. -echo -n "$0: you should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/admin/conf" -echo " and ${ZFS_MOUNTPOINT}/portbuild/conf." +echo "$0: you should now be able to edit files in the following directories:" +echo "$0: in ${ZFS_MOUNTPOINT}/portbuild/admin/conf as ${SRCBUILD_USER}, and" +echo "$0: in ${ZFS_MOUNTPOINT}/portbuild/conf as ${PORTBUILD_USER}." # create convenience directories for PORTBUILD_USER. failure is annoying # but non-fatal. -extra_dirs="lockfiles log" -for extra_dir in ${extra_dirs}; do +PORTBUILD_OWNED_SUBSUBDIRS="lockfiles log" +for extra_dir in ${PORTBUILD_OWNED_SUBSUBDIRS}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir}" fi From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 01:54:07 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 540C3E07; Wed, 13 Feb 2013 01:54:07 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 423DA1F8; Wed, 13 Feb 2013 01:54:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D1s7Te070665; Wed, 13 Feb 2013 01:54:07 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D1s7B5070664; Wed, 13 Feb 2013 01:54:07 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130154.r1D1s7B5070664@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 01:54:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246729 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 01:54:07 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 01:54:06 2013 New Revision: 246729 URL: http://svnweb.freebsd.org/changeset/base/246729 Log: Checkpoint of separation of powers for SVN-owned directories. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Wed Feb 13 01:30:35 2013 (r246728) +++ projects/portbuild/admin/tools/newmkportbuild Wed Feb 13 01:54:06 2013 (r246729) @@ -15,10 +15,14 @@ DEFAULT_ZFS_PERMISSIONSET="clone,create, DEFAULT_ZFS_PERMISSIONSET_SNAPS="clone,snapshot" SNAP_DIRECTORY=snap -# define ownership of direct subdirectories of DEFAULT_ZFS_VOLUME +# define ownership of subdirectories of DEFAULT_ZFS_VOLUME/ SRCBUILD_OWNED_SUBDIRS="pxeroot ${SNAP_DIRECTORY} worlddir" PORTBUILD_OWNED_SUBDIRS="portbuild" -PORTBUILD_OWNED_SUBSUBDIRS="lockfiles log" + +# define ownership of subdirectories of DEFAULT_ZFS_VOLUME/portbuild/ +SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" +PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" +PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" if [ `id -u` != 0 ]; then echo "$0 must be run as root." @@ -166,11 +170,31 @@ echo "results of ZFS operations:" zfs list ${ZFS_VOLUME} zfs allow ${ZFS_VOLUME} -echo "checking out the repository as user ${PORTBUILD_USER} ..." -su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1 +# perform the repository magic to allow SRCBUILD_USER to edit everything, +# but PORTBUILD_USER to only edit files under its own responsibility. +chown ${SRCBUILD_USER}:${PORTBUILD_USER} ${ZFS_VOLUME}/portbuild +chmod 775 ${ZFS_VOLUME}/portbuild + +PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" +SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" + +for subdir in ${PORTBUILD_OWNED_VCS_SUBDIRS}; do + echo "checking out the ${subdir} repository as user ${PORTBUILD_USER} ..." + mkdir ${ZFS_VOLUME}/portbuild/${subdir} + chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_VOLUME}/portbuild/${subdir} + chmod 755 ${ZFS_VOLUME}/portbuild/${subdir} + echo "su -m ${PORTBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}\"" + su -m ${PORTBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}" +done -# XXX MCL now have to move some directories over, create different -# XXX MCL ownerships, and so forth. +for subdir in ${SRCBUILD_OWNED_VCS_SUBDIRS}; do + echo "checking out the ${subdir} repository as user ${SRCBUILD_USER} ..." + mkdir ${ZFS_VOLUME}/portbuild/${subdir} + chown ${SRCBUILD_USER}:${SRCBUILD_USER} ${ZFS_VOLUME}/portbuild/${subdir} + chmod 755 ${ZFS_VOLUME}/portbuild/${subdir} + echo "su -m ${SRCBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}\"" + su -m ${SRCBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}" +done echo "$0: you should now be able to edit files in the following directories:" echo "$0: in ${ZFS_MOUNTPOINT}/portbuild/admin/conf as ${SRCBUILD_USER}, and" @@ -178,8 +202,8 @@ echo "$0: in ${ZFS_MOUNTPOINT}/portbuild # create convenience directories for PORTBUILD_USER. failure is annoying # but non-fatal. -PORTBUILD_OWNED_SUBSUBDIRS="lockfiles log" -for extra_dir in ${PORTBUILD_OWNED_SUBSUBDIRS}; do +PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" +for extra_dir in ${PORTBUILD_OWNED_CONVENIENCE_SUBDIRS}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir}" fi From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 02:18:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 262544A6; Wed, 13 Feb 2013 02:18:17 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 190372AD; Wed, 13 Feb 2013 02:18:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D2IG7b077868; Wed, 13 Feb 2013 02:18:16 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D2IG1g077867; Wed, 13 Feb 2013 02:18:16 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130218.r1D2IG1g077867@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 02:18:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246731 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 02:18:17 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 02:18:16 2013 New Revision: 246731 URL: http://svnweb.freebsd.org/changeset/base/246731 Log: Use ZFS_MOUNTPOINT where needed instead of ZFS_VOLUME. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Wed Feb 13 02:04:49 2013 (r246730) +++ projects/portbuild/admin/tools/newmkportbuild Wed Feb 13 02:18:16 2013 (r246731) @@ -172,28 +172,32 @@ zfs allow ${ZFS_VOLUME} # perform the repository magic to allow SRCBUILD_USER to edit everything, # but PORTBUILD_USER to only edit files under its own responsibility. -chown ${SRCBUILD_USER}:${PORTBUILD_USER} ${ZFS_VOLUME}/portbuild -chmod 775 ${ZFS_VOLUME}/portbuild +chown ${SRCBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild +chmod 775 ${ZFS_MOUNTPOINT}/portbuild PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" for subdir in ${PORTBUILD_OWNED_VCS_SUBDIRS}; do echo "checking out the ${subdir} repository as user ${PORTBUILD_USER} ..." - mkdir ${ZFS_VOLUME}/portbuild/${subdir} - chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_VOLUME}/portbuild/${subdir} - chmod 755 ${ZFS_VOLUME}/portbuild/${subdir} - echo "su -m ${PORTBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}\"" - su -m ${PORTBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}" + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${subdir} ]; then + mkdir ${ZFS_MOUNTPOINT}/portbuild/${subdir} 2> /dev/null || exit 1 + fi + chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${subdir} + chmod 755 ${ZFS_MOUNTPOINT}/portbuild/${subdir} + echo "su -m ${PORTBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}\"" + su -m ${PORTBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}" done for subdir in ${SRCBUILD_OWNED_VCS_SUBDIRS}; do echo "checking out the ${subdir} repository as user ${SRCBUILD_USER} ..." - mkdir ${ZFS_VOLUME}/portbuild/${subdir} - chown ${SRCBUILD_USER}:${SRCBUILD_USER} ${ZFS_VOLUME}/portbuild/${subdir} - chmod 755 ${ZFS_VOLUME}/portbuild/${subdir} - echo "su -m ${SRCBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}\"" - su -m ${SRCBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_VOLUME}/portbuild/${subdir}" + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${subdir} ]; then + mkdir ${ZFS_MOUNTPOINT}/portbuild/${subdir} 2> /dev/null || exit 1 + fi + chown ${SRCBUILD_USER}:${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${subdir} + chmod 755 ${ZFS_MOUNTPOINT}/portbuild/${subdir} + echo "su -m ${SRCBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}\"" + su -m ${SRCBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}" done echo "$0: you should now be able to edit files in the following directories:" @@ -205,8 +209,9 @@ echo "$0: in ${ZFS_MOUNTPOINT}/portbuild PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" for extra_dir in ${PORTBUILD_OWNED_CONVENIENCE_SUBDIRS}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then - su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir}" + su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 fi + chgrp ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null done echo "$0: done." From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 02:35:20 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0EEFD7F4; Wed, 13 Feb 2013 02:35:20 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DFAF2320; Wed, 13 Feb 2013 02:35:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D2ZJwp083514; Wed, 13 Feb 2013 02:35:19 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D2ZJ6D083513; Wed, 13 Feb 2013 02:35:19 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130235.r1D2ZJ6D083513@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 02:35:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246733 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 02:35:20 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 02:35:19 2013 New Revision: 246733 URL: http://svnweb.freebsd.org/changeset/base/246733 Log: Add commented-out examples of zpool create commands. Modified: projects/portbuild/admin/tools/example_install Modified: projects/portbuild/admin/tools/example_install ============================================================================== --- projects/portbuild/admin/tools/example_install Wed Feb 13 02:21:45 2013 (r246732) +++ projects/portbuild/admin/tools/example_install Wed Feb 13 02:35:19 2013 (r246733) @@ -1,12 +1,26 @@ #!/bin/sh # -# example script to drive mkportbuild +# example script to drive the "mkportbuild" kickstart file # export PORTBUILD_USER=portbuild export SRCBUILD_USER=srcbuild export ZFS_VOLUME=a export ZFS_MOUNTPOINT=/a export VCS_REPOSITORY=svn://svn0.us-east.FreeBSD.org + +# +# create the zpool. the examples here are just suggestions and need to be +# customized for your site. +# +# simple examples: +# zpool create ${ZFS_VOLUME} da1 +# zpool create ${ZFS_VOLUME} gprootfs +# more complex example: +# zpool create ${ZFS_VOLUME} mirror da1 da2 mirror da3 da4 mirror da5 da6 mirror da7 da8 + +# +# check out the kickstart file and run it +# mkdir -p tmp svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/admin/tools tmp sh -x ./tmp/newmkportbuild From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 02:57:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E51AEC07; Wed, 13 Feb 2013 02:57:25 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D7F7B3E6; Wed, 13 Feb 2013 02:57:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D2vPn6089748; Wed, 13 Feb 2013 02:57:25 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D2vPx4089747; Wed, 13 Feb 2013 02:57:25 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130257.r1D2vPx4089747@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 02:57:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246734 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 02:57:26 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 02:57:25 2013 New Revision: 246734 URL: http://svnweb.freebsd.org/changeset/base/246734 Log: Move newmkportubild to mkportbuild. Modified: projects/portbuild/admin/tools/example_install Modified: projects/portbuild/admin/tools/example_install ============================================================================== --- projects/portbuild/admin/tools/example_install Wed Feb 13 02:35:19 2013 (r246733) +++ projects/portbuild/admin/tools/example_install Wed Feb 13 02:57:25 2013 (r246734) @@ -23,4 +23,4 @@ export VCS_REPOSITORY=svn://svn0.us-east # mkdir -p tmp svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/admin/tools tmp -sh -x ./tmp/newmkportbuild +sh -x ./tmp/mkportbuild From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 03:00:12 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CFC81D42; Wed, 13 Feb 2013 03:00:12 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B6CE33FA; Wed, 13 Feb 2013 03:00:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D30C2h090262; Wed, 13 Feb 2013 03:00:12 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D30CIR090261; Wed, 13 Feb 2013 03:00:12 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130300.r1D30CIR090261@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 03:00:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246735 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 03:00:12 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 03:00:12 2013 New Revision: 246735 URL: http://svnweb.freebsd.org/changeset/base/246735 Log: newmkportbuild replaces mkportbuild. Replaced: projects/portbuild/admin/tools/mkportbuild - copied unchanged from r246731, projects/portbuild/admin/tools/newmkportbuild Deleted: projects/portbuild/admin/tools/newmkportbuild Copied: projects/portbuild/admin/tools/mkportbuild (from r246731, projects/portbuild/admin/tools/newmkportbuild) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/portbuild/admin/tools/mkportbuild Wed Feb 13 03:00:12 2013 (r246735, copy of r246731, projects/portbuild/admin/tools/newmkportbuild) @@ -0,0 +1,217 @@ +#!/bin/sh +# +# server-side script to setup the portbuild ZFS volume, delegate its +# administration, and check out the repository. Must be run as root. +# +# Designed to be run before anything else. +# + +DEFAULT_PORTBUILD_USER="portbuild" +DEFAULT_SRCBUILD_USER="srcbuild" +DEFAULT_VCS_CHECKOUT_COMMAND="svn checkout" +DEFAULT_VCS_REPOSITORY="svn://svn.FreeBSD.org" +DEFAULT_ZFS_VOLUME="a" +DEFAULT_ZFS_PERMISSIONSET="clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot" +DEFAULT_ZFS_PERMISSIONSET_SNAPS="clone,snapshot" +SNAP_DIRECTORY=snap + +# define ownership of subdirectories of DEFAULT_ZFS_VOLUME/ +SRCBUILD_OWNED_SUBDIRS="pxeroot ${SNAP_DIRECTORY} worlddir" +PORTBUILD_OWNED_SUBDIRS="portbuild" + +# define ownership of subdirectories of DEFAULT_ZFS_VOLUME/portbuild/ +SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" +PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" +PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" + +if [ `id -u` != 0 ]; then + echo "$0 must be run as root." + exit 1 +fi + +if [ -z "${PORTBUILD_USER}" ]; then + echo "You must export PORTBUILD_USER, for example, export PORTBUILD_USER=${DEFAULT_PORTBUILD_USER}." + exit 1 +fi +if [ ! `id -u ${PORTBUILD_USER} 2> /dev/null` ]; then + echo "User ${PORTBUILD_USER} must exist." + exit 1 +fi +if [ -z "${SRCBUILD_USER}" ]; then + echo "You must export SRCBUILD_USER, for example, export SRCBUILD_USER=${DEFAULT_SRCBUILD_USER}." + exit 1 +fi +if [ ! `id -u ${SRCBUILD_USER} 2> /dev/null` ]; then + echo "User ${SRCBUILD_USER} must exist." + exit 1 +fi + +if [ -z "${VCS_CHECKOUT_COMMAND}" ]; then + VCS_CHECKOUT_COMMAND="${DEFAULT_VCS_CHECKOUT_COMMAND}" +fi +if [ -z "${VCS_PORTBUILD_REPOSITORY}" ]; then + echo "You have not set VCS_PORTBUILD_REPOSITORY. I will try to set it from VCS_REPOSITORY." + if [ -z "${VCS_REPOSITORY}" ]; then + echo "You have not set VCS_REPOSITORY. I will use the default: ${DEFAULT_VCS_REPOSITORY}." + VCS_REPOSITORY=${DEFAULT_VCS_REPOSITORY} + fi + VCS_PORTBUILD_REPOSITORY="${VCS_REPOSITORY}/base/projects/portbuild" +fi + +if [ -z "${ZFS_VOLUME}" ]; then + echo "You must export ZFS_VOLUME, for example, export ZFS_VOLUME=${DEFAULT_ZFS_VOLUME}." + exit 1 +fi +ZFS_MOUNTPOINT="/${ZFS_VOLUME}" + +if [ -z "${ZFS_PERMISSIONSET}" ]; then + echo "You have not set ZFS_PERMISSIONSET. I will use the default: ${DEFAULT_ZFS_PERMISSIONSET}." + ZFS_PERMISSIONSET="${DEFAULT_ZFS_PERMISSIONSET}" +fi +if [ -z "${ZFS_PERMISSIONSET_SNAPS}" ]; then + echo "You have not set ZFS_PERMISSIONSET_SNAPS. I will use the default: ${DEFAULT_ZFS_PERMISSIONSET_SNAPS}." + ZFS_PERMISSIONSET_SNAPS="${DEFAULT_ZFS_PERMISSIONSET_SNAPS}" +fi + +# sprinkle magic fairy dust to help delegate zfs permissions +sysctl vfs.usermount=1 +sysctl vfs.zfs.super_owner=1 + +name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}` +if [ -z "${name}" ]; then + echo "ZFS volume ${ZFS_VOLUME} does not exist. You must create it first." + exit 1 +fi + +mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}` +if [ ! -z "${mounted}" -a "${mounted}" != "no" ]; then + echo "ZFS volume ${ZFS_VOLUME} is mounted. I'll unmount it for you then remount it later." + zfs umount ${ZFS_VOLUME} 2> /dev/null +fi + +# create subdirectories for portbuild-managed files. All other ZFS_VOLUME +# subdirectories are managed by srcbuild. +for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do + name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}/${subdir}` + if [ -z "${name}" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." + zfs create ${ZFS_VOLUME}/${subdir} || exit 1 + fi +done + +# create subdirectories for srcbuild-managed files. +for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do + name=`zfs list -H -t filesystem -o name ${ZFS_VOLUME}/${subdir}` + if [ -z "${name}" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} does not exist. I'll create it for you." + zfs create ${ZFS_VOLUME}/${subdir} || exit 1 + fi +done + +# reset the "zfsalladmin" permission set if it already exists. +zfs unallow -s @zfsalladmin ${ZFS_VOLUME} 2> /dev/null +zfs unallow -u ${SRCBUILD_USER} ${ZFS_VOLUME} 2> /dev/null + +# reset the "zfsportbuildadmin" permission set if it already exists. +zfs unallow -s @zfsportbuildadmin ${ZFS_VOLUME} 2> /dev/null + +# reset the "zfssnapadmin" permission set if it already exists. +zfs unallow -s @zfssnapadmin ${ZFS_VOLUME} 2> /dev/null +zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null + +# create the "zfsalladmin" permission set. +zfs allow -s @zfsalladmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME} || exit 1 + +# create the "zfsportbuildadmin" permission set. +zfs allow -s @zfsportbuildadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}/portbuild || exit 1 + +# create the "zfssnapadmin" permission set. +zfs allow -s @zfssnapadmin ${ZFS_PERMISSIONSET_SNAPS} ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 + +# delegate the "zfsalladmin" permission set to the SRCBUILD_USER. +zfs allow -du ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 +zfs allow -lu ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 + +# after (possibly) modifying permissions, now it's permissable to remount. +mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}` +if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME} is not mounted. I'll remount it for you." + zfs mount ${ZFS_VOLUME} || exit 1 +fi +chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT} 2> /dev/null + +# delegate the "zfsportbuildadmin" permission set to the PORTBUILD_USER. +zfs allow -du ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1 + +# delegate the "zfssnapadmin" permission set to the PORTBUILD_USER. +zfs allow -du ${PORTBUILD_USER} @zfssnapadmin ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 + +# (re)mount various subdirectories to be managed by portbuild. +for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do + mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` + if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." + zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 + fi + chown ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null +done + +# (re)mount various subdirectories to be managed by srcbuild. +for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do + mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` + if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." + zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 + fi + chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null +done + +echo "results of ZFS operations:" +zfs list ${ZFS_VOLUME} +zfs allow ${ZFS_VOLUME} + +# perform the repository magic to allow SRCBUILD_USER to edit everything, +# but PORTBUILD_USER to only edit files under its own responsibility. +chown ${SRCBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild +chmod 775 ${ZFS_MOUNTPOINT}/portbuild + +PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" +SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" + +for subdir in ${PORTBUILD_OWNED_VCS_SUBDIRS}; do + echo "checking out the ${subdir} repository as user ${PORTBUILD_USER} ..." + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${subdir} ]; then + mkdir ${ZFS_MOUNTPOINT}/portbuild/${subdir} 2> /dev/null || exit 1 + fi + chown ${PORTBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${subdir} + chmod 755 ${ZFS_MOUNTPOINT}/portbuild/${subdir} + echo "su -m ${PORTBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}\"" + su -m ${PORTBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}" +done + +for subdir in ${SRCBUILD_OWNED_VCS_SUBDIRS}; do + echo "checking out the ${subdir} repository as user ${SRCBUILD_USER} ..." + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${subdir} ]; then + mkdir ${ZFS_MOUNTPOINT}/portbuild/${subdir} 2> /dev/null || exit 1 + fi + chown ${SRCBUILD_USER}:${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${subdir} + chmod 755 ${ZFS_MOUNTPOINT}/portbuild/${subdir} + echo "su -m ${SRCBUILD_USER} -c \"svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}\"" + su -m ${SRCBUILD_USER} -c "svn checkout ${VCS_REPOSITORY}/base/projects/portbuild/${subdir} ${ZFS_MOUNTPOINT}/portbuild/${subdir}" +done + +echo "$0: you should now be able to edit files in the following directories:" +echo "$0: in ${ZFS_MOUNTPOINT}/portbuild/admin/conf as ${SRCBUILD_USER}, and" +echo "$0: in ${ZFS_MOUNTPOINT}/portbuild/conf as ${PORTBUILD_USER}." + +# create convenience directories for PORTBUILD_USER. failure is annoying +# but non-fatal. +PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" +for extra_dir in ${PORTBUILD_OWNED_CONVENIENCE_SUBDIRS}; do + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then + su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 + fi + chgrp ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null +done + +echo "$0: done." From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 03:10:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 8AC08235; Wed, 13 Feb 2013 03:10:03 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7DD3B72D; Wed, 13 Feb 2013 03:10:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D3A3Da094414; Wed, 13 Feb 2013 03:10:03 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D3A3XN094413; Wed, 13 Feb 2013 03:10:03 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130310.r1D3A3XN094413@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 03:10:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246736 - projects/portbuild/admin/conf 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 03:10:03 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 03:10:02 2013 New Revision: 246736 URL: http://svnweb.freebsd.org/changeset/base/246736 Log: Point the www files to a real place. Modified: projects/portbuild/admin/conf/admin.conf Modified: projects/portbuild/admin/conf/admin.conf ============================================================================== --- projects/portbuild/admin/conf/admin.conf Wed Feb 13 03:00:12 2013 (r246735) +++ projects/portbuild/admin/conf/admin.conf Wed Feb 13 03:10:02 2013 (r246736) @@ -115,4 +115,4 @@ VCSWEB="http://svnweb.freebsd.org/ports/ # www definitions (see processfail) # -WWW_DIRECTORY=/usr/local/www/apache22/data/ +WWW_DIRECTORY=/a/portbuild From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 03:16:33 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D5E893B0; Wed, 13 Feb 2013 03:16:33 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C823375E; Wed, 13 Feb 2013 03:16:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D3GXvp097005; Wed, 13 Feb 2013 03:16:33 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D3GXnF097004; Wed, 13 Feb 2013 03:16:33 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130316.r1D3GXnF097004@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 03:16:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246737 - projects/portbuild/conf 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 03:16:33 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 03:16:33 2013 New Revision: 246737 URL: http://svnweb.freebsd.org/changeset/base/246737 Log: Even though this definition is obsolete, make it match the other one for merging purposes. Modified: projects/portbuild/conf/server.conf Modified: projects/portbuild/conf/server.conf ============================================================================== --- projects/portbuild/conf/server.conf Wed Feb 13 03:10:02 2013 (r246736) +++ projects/portbuild/conf/server.conf Wed Feb 13 03:16:33 2013 (r246737) @@ -153,4 +153,4 @@ VCSWEB="http://svnweb.freebsd.org/ports/ # www definitions (see processfail) # -WWW_DIRECTORY=/usr/local/www/apache22/data/ +WWW_DIRECTORY=/a/portbuild From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 03:20:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B2F5B565; Wed, 13 Feb 2013 03:20:34 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8C40E78F; Wed, 13 Feb 2013 03:20:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D3KYUB099100; Wed, 13 Feb 2013 03:20:34 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D3KY1n099099; Wed, 13 Feb 2013 03:20:34 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130320.r1D3KY1n099099@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 03:20:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246738 - projects/portbuild/scripts 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 03:20:34 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 03:20:33 2013 New Revision: 246738 URL: http://svnweb.freebsd.org/changeset/base/246738 Log: Teach this to figure out the supported arches by itself, rather than having to hard-code them into the rc.d script invocation. Modified: projects/portbuild/scripts/pollmachine Modified: projects/portbuild/scripts/pollmachine ============================================================================== --- projects/portbuild/scripts/pollmachine Wed Feb 13 03:16:33 2013 (r246737) +++ projects/portbuild/scripts/pollmachine Wed Feb 13 03:20:33 2013 (r246738) @@ -24,7 +24,7 @@ # - ACL list might change! # - take machine offline, update ACL/arch/etc, reboot, bring online -import sys, threading, socket +import sys, threading, socket, string from time import sleep import os, subprocess, logging @@ -42,14 +42,13 @@ sys.path.insert(0, '%s/lib/python' % pbc from freebsd import * from freebsd_config import * -CONFIG_SUBDIR="conf" -CONFIG_FILENAME="server.conf" +CONFIG_SUBDIR="admin/conf" +CONFIG_FILENAME="admin.conf" -if len(sys.argv) < 1: - print "Usage: %s [ ...]" % sys.argv[0] - sys.exit(1) +config = getConfig( pbc, CONFIG_SUBDIR, CONFIG_FILENAME ) +SUPPORTED_ARCHS = config.get( 'SUPPORTED_ARCHS' ) +arches = string.split( SUPPORTED_ARCHS ) -arches=set() mlist={} polldelay=0 for i in sys.argv[1:]: @@ -57,21 +56,8 @@ for i in sys.argv[1:]: polldelay = 180 continue - if "/" in i: - item=i.partition("/") - arch=item[0] - mach=item[2] - arches.add(arch) - try: - mlist[arch].add(mach) - except KeyError: - mlist[arch] = set((mach,)) - else: - arches.add(i) - # set of machines for each arch machines={} -# XXX MCL would be nice to remove this hardwiring for i in arches: machines[i]=set() @@ -281,20 +267,14 @@ class MachinePoll(threading.Thread): logging.info("%s finished polling for %s" % ( str(self), self.mach )) def setup(self, branch, buildid, args = ""): - uid = PORTBUILD_USER - if not uid: - uid = "ports-" + self.arch - cmd = "su %s -c \"%s/scripts/dosetupnode %s %s %s %s %s\""\ - % (uid, pbc, self.arch, branch, buildid, self.mach, args) + cmd = "%s/scripts/dosetupnode %s %s %s %s %s"\ + % (pbc, self.arch, branch, buildid, self.mach, args) child = subprocess.Popen(cmd, shell=True, stderr = subprocess.STDOUT, stdout = subprocess.PIPE) err = child.wait() out = "".join(child.stdout.readlines()) return (err, out) -config = getConfig( pbc, CONFIG_SUBDIR, CONFIG_FILENAME ) -PORTBUILD_USER = config.get( 'PORTBUILD_USER' ) - logging.basicConfig(level=logging.INFO, format='[%(asctime)s] %(message)s', datefmt='%d %b %Y %H:%M:%S', From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 03:21:05 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7F919683; Wed, 13 Feb 2013 03:21:05 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 68D19793; Wed, 13 Feb 2013 03:21:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D3L5US099212; Wed, 13 Feb 2013 03:21:05 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D3L5EW099211; Wed, 13 Feb 2013 03:21:05 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130321.r1D3L5EW099211@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 03:21:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246739 - projects/portbuild/qmanager 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 03:21:05 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 03:21:04 2013 New Revision: 246739 URL: http://svnweb.freebsd.org/changeset/base/246739 Log: Add note about obsolete code. Modified: projects/portbuild/qmanager/qmanager.py Modified: projects/portbuild/qmanager/qmanager.py ============================================================================== --- projects/portbuild/qmanager/qmanager.py Wed Feb 13 03:20:33 2013 (r246738) +++ projects/portbuild/qmanager/qmanager.py Wed Feb 13 03:21:04 2013 (r246739) @@ -73,6 +73,7 @@ QMANAGER_SOCKET_FILE = config.get( 'QMAN PORTBUILD_USER = config.get( 'PORTBUILD_USER' ) # added 20121229 as a fallback. no longer recommended! +# XXX MCL 20130128 all uses of portbuild_uid need to go away. portbuild_uid = 0 if PORTBUILD_USER: portbuild_uid = getuidbyname( PORTBUILD_USER ) From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 03:23:13 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E97D1968; Wed, 13 Feb 2013 03:23:13 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CD07D7C8; Wed, 13 Feb 2013 03:23:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D3ND8o099558; Wed, 13 Feb 2013 03:23:13 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D3NC3t099551; Wed, 13 Feb 2013 03:23:12 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130323.r1D3NC3t099551@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 03:23:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246740 - in projects/portbuild: scripts tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 03:23:14 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 03:23:12 2013 New Revision: 246740 URL: http://svnweb.freebsd.org/changeset/base/246740 Log: From production: properly reflect the refactoring of parts of conf/server.conf into admin/conf/admin.conf. While here, remove excess chown/chmod invocations which a) no longer make sense, and b) take a long time to do their unneeded work. Modified: projects/portbuild/scripts/build projects/portbuild/scripts/dopackages projects/portbuild/scripts/dopackagestats projects/portbuild/scripts/processfail projects/portbuild/scripts/processlogs projects/portbuild/scripts/stats projects/portbuild/tools/addarch Modified: projects/portbuild/scripts/build ============================================================================== --- projects/portbuild/scripts/build Wed Feb 13 03:21:04 2013 (r246739) +++ projects/portbuild/scripts/build Wed Feb 13 03:23:12 2013 (r246740) @@ -56,42 +56,32 @@ do_create() { # not manageable by uid:gid. archdir=${pbd}/${arch} if [ ! -d ${archdir} ]; then - echo "${archdir} must exist and be owned by ${uid}:${gid} mode 77x." + echo "${archdir} must exist." exit 1 fi - chown -R ${uid}:${gid} ${archdir} || exit 1 - chmod 775 ${archdir} || exit 1 # create zfs instance for arch if it does not already exist archfs=${ZFS_VOLUME}/portbuild/${arch} if ! test_fs "${archfs}"; then zfs create ${archfs} || exit 1 - #chown -R ${uid}:${gid} ${archdir} - #chmod -R g+w ${archdir} fi # create overall archive directory if it does not already exist archivedir=${pbd}/${arch}/archive if [ ! -d ${archivedir} ]; then mkdir -p ${archivedir} || exit 1 - chown -R ${uid}:${gid} ${archivedir} - chmod -R g+w ${archivedir} fi # create archive directory for all build logs if it does not already exist buildlogsdir=${archivedir}/buildlogs if [ ! -d ${buildlogsdir} ]; then mkdir -p ${buildlogsdir} || exit 1 - chown -R ${uid}:${gid} ${buildlogsdir} - chmod -R g+w ${buildlogsdir} fi # create archive directory for all errorlogs if it does not already exist errorlogsdir=${archivedir}/errorlogs if [ ! -d ${errorlogsdir} ]; then mkdir -p ${errorlogsdir} || exit 1 - chown -R ${uid}:${gid} ${errorlogsdir} - chmod -R g+w ${errorlogsdir} fi # create zfs instance for buildenv if it does not already exist @@ -128,44 +118,32 @@ do_create() { clientsdir=${pbd}/${arch}/clients if [ ! -d ${clientsdir} ]; then mkdir -p ${clientsdir} || exit 1 - chown -R ${uid}:${gid} ${clientsdir} - chmod -R g+w ${clientsdir} fi # create loads/ directory if it does not already exist loadsdir=${pbd}/${arch}/loads if [ ! -d ${loadsdir} ]; then mkdir -p ${loadsdir} || exit 1 - chown -R ${uid}:${gid} ${loadsdir} - chmod -R g+w ${loadsdir} fi # create lockfiles/ directory if it does not already exist lockfiles=${pbd}/${arch}/lockfiles if [ ! -d ${lockfiles} ]; then mkdir -p ${lockfiles} || exit 1 - chown -R ${uid}:${gid} ${lockfiles} - chmod -R g+w ${lockfiles} fi # create empty mlist file if it does not already exist mlist=${pbd}/${arch}/mlist if [ ! -d ${mlist} ]; then touch ${mlist} || exit 1 - chown -R ${uid}:${gid} ${mlist} - chmod -R g+w ${mlist} fi # create the links for the webserver under ../errorlogs/. Note # possibly different ownership of this directory! errorlogs=${pbd}/errorlogs - portbuild_uid=${PORTBUILD_USER} if [ ! -d ${errorlogs} ]; then - echo "${errorlogs} must exist and be owned by ${portbuild_uid}:${gid} mode 77x." - exit 1 + mkdir -p ${archivedir} || exit 1 fi - chown -R ${portbuild_uid}:${gid} ${errorlogs} || exit 1 - chmod 775 ${errorlogs} || exit 1 ln -s ${buildsdir}/latest/bak/errors ${errorlogs}/${arch}-${branch}-previous ln -s ${buildsdir}/latest/bak/logs ${errorlogs}/${arch}-${branch}-previous-logs @@ -547,6 +525,7 @@ arch=$2 branch=$3 shift 3 +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf . ${pbd}/${arch}/portbuild.conf . ${pbc}/scripts/buildenv @@ -555,17 +534,6 @@ pbab=${pbd}/${arch}/${branch} validate_env ${arch} ${branch} || exit 1 -if [ ! -z "${PORTBUILD_USER}" ]; then - uid=${PORTBUILD_USER} -else - uid=ports-${arch} -fi -if [ ! -z "${PORTBUILD_GROUP}" ]; then - gid=${PORTBUILD_GROUP} -else - gid=${uid} -fi - # Not every command requires a buildid as arg if [ $# -ge 1 ]; then buildid=$1 Modified: projects/portbuild/scripts/dopackages ============================================================================== --- projects/portbuild/scripts/dopackages Wed Feb 13 03:21:04 2013 (r246739) +++ projects/portbuild/scripts/dopackages Wed Feb 13 03:23:12 2013 (r246740) @@ -51,6 +51,7 @@ buildid=$3 datestamp=$4 shift 4 +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbc}/scripts/buildenv Modified: projects/portbuild/scripts/dopackagestats ============================================================================== --- projects/portbuild/scripts/dopackagestats Wed Feb 13 03:21:04 2013 (r246739) +++ projects/portbuild/scripts/dopackagestats Wed Feb 13 03:23:12 2013 (r246740) @@ -8,6 +8,7 @@ pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} pbd=${PORTBUILD_DATA:-/var/portbuild} +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf here=`pwd` Modified: projects/portbuild/scripts/processfail ============================================================================== --- projects/portbuild/scripts/processfail Wed Feb 13 03:21:04 2013 (r246739) +++ projects/portbuild/scripts/processfail Wed Feb 13 03:23:12 2013 (r246740) @@ -8,6 +8,7 @@ branch=$2 pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} pbd=${PORTBUILD_DATA:-/var/portbuild} +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf ERRORLOGS_DIRECTORY="${WWW_DIRECTORY}/errorlogs" Modified: projects/portbuild/scripts/processlogs ============================================================================== --- projects/portbuild/scripts/processlogs Wed Feb 13 03:21:04 2013 (r246739) +++ projects/portbuild/scripts/processlogs Wed Feb 13 03:23:12 2013 (r246740) @@ -42,6 +42,7 @@ errorscript=$scriptdir/processonelog pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} pbd=${PORTBUILD_DATA:-/var/portbuild} +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf . ${pbd}/${arch}/portbuild.conf Modified: projects/portbuild/scripts/stats ============================================================================== --- projects/portbuild/scripts/stats Wed Feb 13 03:21:04 2013 (r246739) +++ projects/portbuild/scripts/stats Wed Feb 13 03:23:12 2013 (r246740) @@ -3,6 +3,7 @@ pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} pbd=${PORTBUILD_DATA:-/var/portbuild} +. ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf if [ $# -ne 1 ]; then Modified: projects/portbuild/tools/addarch ============================================================================== --- projects/portbuild/tools/addarch Wed Feb 13 03:21:04 2013 (r246739) +++ projects/portbuild/tools/addarch Wed Feb 13 03:23:12 2013 (r246740) @@ -28,6 +28,11 @@ fi . ${pbc}/admin/conf/admin.conf if [ ! -e ${pbc}/conf/server.conf ] ; then + echo "You must first create ${pbc}/admin/conf/admin.conf." + exit 1 +fi +. ${pbc}/admin/conf/admin.conf +if [ ! -e ${pbc}/conf/server.conf ] ; then echo "You must first create ${pbc}/conf/server.conf." exit 1 fi @@ -71,32 +76,24 @@ archfs=${ZFS_VOLUME}/portbuild/${arch} if ! test_fs "${archfs}"; then echo "The ${archfs} filesystem does not exist. I'll create and mount it for you." zfs create ${archfs} || exit 1 -# chown -R ${uid}:${gid} ${archdir} || exit 1 -# chmod -R g+w ${archdir} || exit 1 fi loads=${archdir}/loads if [ ! -d ${loads} ]; then echo "The ${loads} directory does not exist. I'll create it for you." mkdir -p ${loads} || exit 1 - chown -R ${uid}:${gid} ${loads} || exit 1 - chmod -R g+w ${loads} || exit 1 fi lockfiles=${archdir}/lockfiles if [ ! -d ${lockfiles} ]; then echo "The ${lockfiles} directory does not exist. I'll create it for you." mkdir -p ${lockfiles} || exit 1 - chown -R ${uid}:${gid} ${lockfiles} || exit 1 - chmod -R g+w ${lockfiles} || exit 1 fi mlist=${archdir}/mlist if [ ! -e ${mlist} ]; then echo "${mlist} does not exist. I'll create an empty one." touch ${mlist} - chown -R ${uid}:${gid} ${mlist} || exit 1 - chmod 664 ${mlist} || exit 1 fi conf=${archdir}/portbuild.conf From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 05:12:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F2751A2B; Wed, 13 Feb 2013 05:12:16 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E5B7BADA; Wed, 13 Feb 2013 05:12:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D5CGt7032263; Wed, 13 Feb 2013 05:12:16 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D5CGPI032262; Wed, 13 Feb 2013 05:12:16 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130512.r1D5CGPI032262@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 05:12:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246741 - projects/portbuild/admin/conf 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 05:12:17 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 05:12:16 2013 New Revision: 246741 URL: http://svnweb.freebsd.org/changeset/base/246741 Log: Move SUPPORTED_ARCHS in here. Modified: projects/portbuild/admin/conf/admin.conf Modified: projects/portbuild/admin/conf/admin.conf ============================================================================== --- projects/portbuild/admin/conf/admin.conf Wed Feb 13 03:23:12 2013 (r246740) +++ projects/portbuild/admin/conf/admin.conf Wed Feb 13 05:12:16 2013 (r246741) @@ -13,6 +13,8 @@ # top-level package building things # +SUPPORTED_ARCHS="amd64 arm i386 ia64 mips powerpc sparc64" + SRC_BRANCHES="7 8 9 10" SRC_BRANCHES_PATTERN="^[0-9]" SRC_BRANCH_7_SUBDIR=releng/7.4/ From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 05:12:50 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 326B8B45; Wed, 13 Feb 2013 05:12:50 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0FC5AADD; Wed, 13 Feb 2013 05:12:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D5Cnsq032386; Wed, 13 Feb 2013 05:12:49 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D5CnJ2032385; Wed, 13 Feb 2013 05:12:49 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130512.r1D5CnJ2032385@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 05:12:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246742 - projects/portbuild/scripts 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 05:12:50 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 05:12:49 2013 New Revision: 246742 URL: http://svnweb.freebsd.org/changeset/base/246742 Log: Chase the move of the library files. Modified: projects/portbuild/scripts/pollmachine Modified: projects/portbuild/scripts/pollmachine ============================================================================== --- projects/portbuild/scripts/pollmachine Wed Feb 13 05:12:16 2013 (r246741) +++ projects/portbuild/scripts/pollmachine Wed Feb 13 05:12:49 2013 (r246742) @@ -33,11 +33,11 @@ EXPECTED_LINES = 6 DEBUG=False pbc = os.getenv('PORTBUILD_CHECKOUT') \ - if os.getenv('PORTBUILD_CHECKOUT') else "/var/portbuild" + if os.getenv('PORTBUILD_CHECKOUT') else "/a/portbuild" pbd = os.getenv('PORTBUILD_DATA') \ - if os.getenv('PORTBUILD_DATA') else "/var/portbuild" + if os.getenv('PORTBUILD_DATA') else "/a/portbuild" -sys.path.insert(0, '%s/lib/python' % pbc) +sys.path.insert(0, '%s/admin/lib/python' % pbc) from freebsd import * from freebsd_config import * From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 05:17:59 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 41C33C84; Wed, 13 Feb 2013 05:17:59 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1F188AF6; Wed, 13 Feb 2013 05:17:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D5Hxn1033153; Wed, 13 Feb 2013 05:17:59 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D5HwPJ033152; Wed, 13 Feb 2013 05:17:58 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130517.r1D5HwPJ033152@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 05:17:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246743 - projects/portbuild/admin/conf 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 05:17:59 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 05:17:58 2013 New Revision: 246743 URL: http://svnweb.freebsd.org/changeset/base/246743 Log: Fix path. Modified: projects/portbuild/admin/conf/apache.conf Modified: projects/portbuild/admin/conf/apache.conf ============================================================================== --- projects/portbuild/admin/conf/apache.conf Wed Feb 13 05:12:49 2013 (r246742) +++ projects/portbuild/admin/conf/apache.conf Wed Feb 13 05:17:58 2013 (r246743) @@ -1,4 +1,4 @@ -DocumentRoot "/var/portbuild/www" +DocumentRoot "/a/portbuild/admin/www" # filter magic to decompress bzip2 logs - pav@ LoadModule ext_filter_module libexec/apache22/mod_ext_filter.so From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 05:27:26 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0DDBEDE6; Wed, 13 Feb 2013 05:27:26 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E258AB1E; Wed, 13 Feb 2013 05:27:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D5RPl4035956; Wed, 13 Feb 2013 05:27:25 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D5RPoh035955; Wed, 13 Feb 2013 05:27:25 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130527.r1D5RPoh035955@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 05:27:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246744 - projects/portbuild/scripts 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 05:27:26 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 05:27:25 2013 New Revision: 246744 URL: http://svnweb.freebsd.org/changeset/base/246744 Log: Start getting rid of this hack. Modified: projects/portbuild/scripts/dopackagestats Modified: projects/portbuild/scripts/dopackagestats ============================================================================== --- projects/portbuild/scripts/dopackagestats Wed Feb 13 05:17:58 2013 (r246743) +++ projects/portbuild/scripts/dopackagestats Wed Feb 13 05:27:25 2013 (r246744) @@ -5,8 +5,8 @@ # accessible to the web server. # -pbc=${PORTBUILD_CHECKOUT:-/var/portbuild} -pbd=${PORTBUILD_DATA:-/var/portbuild} +pbc=${PORTBUILD_CHECKOUT:-/a/portbuild} +pbd=${PORTBUILD_DATA:-/a/portbuild} . ${pbc}/admin/conf/admin.conf . ${pbc}/conf/server.conf From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 05:39:01 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C310522E; Wed, 13 Feb 2013 05:39:01 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9DF8FB79; Wed, 13 Feb 2013 05:39:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D5d13Q039138; Wed, 13 Feb 2013 05:39:01 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D5d1D9039137; Wed, 13 Feb 2013 05:39:01 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130539.r1D5d1D9039137@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 05:39:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246746 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 05:39:01 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 05:39:01 2013 New Revision: 246746 URL: http://svnweb.freebsd.org/changeset/base/246746 Log: Fix two missed cases, necessary for addarch in the new world. Modified: projects/portbuild/admin/tools/mkportbuild Modified: projects/portbuild/admin/tools/mkportbuild ============================================================================== --- projects/portbuild/admin/tools/mkportbuild Wed Feb 13 05:32:19 2013 (r246745) +++ projects/portbuild/admin/tools/mkportbuild Wed Feb 13 05:39:01 2013 (r246746) @@ -142,9 +142,11 @@ chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT} # delegate the "zfsportbuildadmin" permission set to the PORTBUILD_USER. zfs allow -du ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1 +zfs allow -lu ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1 # delegate the "zfssnapadmin" permission set to the PORTBUILD_USER. zfs allow -du ${PORTBUILD_USER} @zfssnapadmin ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 +zfs allow -lu ${PORTBUILD_USER} @zfssnapadmin ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 # (re)mount various subdirectories to be managed by portbuild. for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 06:13:20 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 212FBA0B; Wed, 13 Feb 2013 06:13:20 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F1646CF6; Wed, 13 Feb 2013 06:13:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D6DJBl050953; Wed, 13 Feb 2013 06:13:19 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D6DJ9J050952; Wed, 13 Feb 2013 06:13:19 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130613.r1D6DJ9J050952@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 06:13:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246748 - projects/portbuild/admin/scripts 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 06:13:20 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 06:13:19 2013 New Revision: 246748 URL: http://svnweb.freebsd.org/changeset/base/246748 Log: More details of privilege separation. Modified: projects/portbuild/admin/scripts/makeworld Modified: projects/portbuild/admin/scripts/makeworld ============================================================================== --- projects/portbuild/admin/scripts/makeworld Wed Feb 13 05:44:35 2013 (r246747) +++ projects/portbuild/admin/scripts/makeworld Wed Feb 13 06:13:19 2013 (r246748) @@ -49,6 +49,7 @@ fi export TARGET_ARCH=${arch} # Workaround needed for zfs - 20090321 erwin export NO_FSCHG=1 +export MAKEOBJDIRPREFIX=${WORLDDIR}/obj client=0 novcs=0 From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 06:17:17 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C2932BF9; Wed, 13 Feb 2013 06:17:17 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B5D93D25; Wed, 13 Feb 2013 06:17:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D6HHqI051537; Wed, 13 Feb 2013 06:17:17 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D6HHRi051536; Wed, 13 Feb 2013 06:17:17 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130617.r1D6HHRi051536@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 06:17:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246749 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 06:17:17 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 06:17:17 2013 New Revision: 246749 URL: http://svnweb.freebsd.org/changeset/base/246749 Log: srbuild needs its own lockfiles subdir. Modified: projects/portbuild/admin/tools/mkportbuild Modified: projects/portbuild/admin/tools/mkportbuild ============================================================================== --- projects/portbuild/admin/tools/mkportbuild Wed Feb 13 06:13:19 2013 (r246748) +++ projects/portbuild/admin/tools/mkportbuild Wed Feb 13 06:17:17 2013 (r246749) @@ -22,6 +22,7 @@ PORTBUILD_OWNED_SUBDIRS="portbuild" # define ownership of subdirectories of DEFAULT_ZFS_VOLUME/portbuild/ SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" +SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles" PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" if [ `id -u` != 0 ]; then @@ -216,4 +217,13 @@ for extra_dir in ${PORTBUILD_OWNED_CONVE chgrp ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null done +# create convenience directories for SRCBUILD_USER. +SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" +for extra_dir in ${SRCBUILD_OWNED_CONVENIENCE_SUBDIRS}; do + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then + su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 + fi + chgrp ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null +done + echo "$0: done." From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 09:10:34 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 90EB31C0; Wed, 13 Feb 2013 09:10:34 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 83DE43FB; Wed, 13 Feb 2013 09:10:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1D9AYio002790; Wed, 13 Feb 2013 09:10:34 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1D9AYsQ002789; Wed, 13 Feb 2013 09:10:34 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302130910.r1D9AYsQ002789@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 09:10:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246755 - projects/portbuild/errorlogs 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 09:10:34 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 09:10:33 2013 New Revision: 246755 URL: http://svnweb.freebsd.org/changeset/base/246755 Log: Attempt to change the link to the new, correct, location. Modified: projects/portbuild/errorlogs/index.html Modified: projects/portbuild/errorlogs/index.html ============================================================================== --- projects/portbuild/errorlogs/index.html Wed Feb 13 09:07:37 2013 (r246754) +++ projects/portbuild/errorlogs/index.html Wed Feb 13 09:10:33 2013 (r246755) @@ -1 +1 @@ -link ../www/index.html \ No newline at end of file +link ../admin/www/index.html \ No newline at end of file From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 14:53:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2A178F43; Wed, 13 Feb 2013 14:53:56 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 050EE849; Wed, 13 Feb 2013 14:53:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1DErtd0007346; Wed, 13 Feb 2013 14:53:55 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1DErt0l007345; Wed, 13 Feb 2013 14:53:55 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302131453.r1DErt0l007345@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 14:53:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246761 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 14:53:56 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 14:53:55 2013 New Revision: 246761 URL: http://svnweb.freebsd.org/changeset/base/246761 Log: Fix the location for SRCBUILD_OWNED_CONVENIENCE_SUBDIRS. While here, clean up and consolidate. Modified: projects/portbuild/admin/tools/mkportbuild Modified: projects/portbuild/admin/tools/mkportbuild ============================================================================== --- projects/portbuild/admin/tools/mkportbuild Wed Feb 13 13:55:54 2013 (r246760) +++ projects/portbuild/admin/tools/mkportbuild Wed Feb 13 14:53:55 2013 (r246761) @@ -22,7 +22,7 @@ PORTBUILD_OWNED_SUBDIRS="portbuild" # define ownership of subdirectories of DEFAULT_ZFS_VOLUME/portbuild/ SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" -SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles" +SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" if [ `id -u` != 0 ]; then @@ -178,9 +178,6 @@ zfs allow ${ZFS_VOLUME} chown ${SRCBUILD_USER}:${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild chmod 775 ${ZFS_MOUNTPOINT}/portbuild -PORTBUILD_OWNED_VCS_SUBDIRS="conf errorlogs qmanager scripts sources tools" -SRCBUILD_OWNED_VCS_SUBDIRS="admin docs" - for subdir in ${PORTBUILD_OWNED_VCS_SUBDIRS}; do echo "checking out the ${subdir} repository as user ${PORTBUILD_USER} ..." if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${subdir} ]; then @@ -209,7 +206,6 @@ echo "$0: in ${ZFS_MOUNTPOINT}/portbuild # create convenience directories for PORTBUILD_USER. failure is annoying # but non-fatal. -PORTBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" for extra_dir in ${PORTBUILD_OWNED_CONVENIENCE_SUBDIRS}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 @@ -218,10 +214,9 @@ for extra_dir in ${PORTBUILD_OWNED_CONVE done # create convenience directories for SRCBUILD_USER. -SRCBUILD_OWNED_CONVENIENCE_SUBDIRS="lockfiles log" for extra_dir in ${SRCBUILD_OWNED_CONVENIENCE_SUBDIRS}; do - if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then - su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 + if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} ]; then + su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} 2> /dev/null" || exit 1 fi chgrp ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null done From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 14:57:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 72E3B123; Wed, 13 Feb 2013 14:57:55 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6471686B; Wed, 13 Feb 2013 14:57:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1DEvtJ7007940; Wed, 13 Feb 2013 14:57:55 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1DEvtKw007939; Wed, 13 Feb 2013 14:57:55 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302131457.r1DEvtKw007939@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 14:57:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246762 - projects/portbuild/admin/tools 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 14:57:55 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 14:57:54 2013 New Revision: 246762 URL: http://svnweb.freebsd.org/changeset/base/246762 Log: zsh-proof this. Modified: projects/portbuild/admin/tools/mkportbuild Modified: projects/portbuild/admin/tools/mkportbuild ============================================================================== --- projects/portbuild/admin/tools/mkportbuild Wed Feb 13 14:53:55 2013 (r246761) +++ projects/portbuild/admin/tools/mkportbuild Wed Feb 13 14:57:54 2013 (r246762) @@ -208,7 +208,7 @@ echo "$0: in ${ZFS_MOUNTPOINT}/portbuild # but non-fatal. for extra_dir in ${PORTBUILD_OWNED_CONVENIENCE_SUBDIRS}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} ]; then - su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null" || exit 1 + su -m ${PORTBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/${extra_dir}" 2> /dev/null || exit 1 fi chgrp ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null done @@ -216,7 +216,7 @@ done # create convenience directories for SRCBUILD_USER. for extra_dir in ${SRCBUILD_OWNED_CONVENIENCE_SUBDIRS}; do if [ ! -d ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} ]; then - su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir} 2> /dev/null" || exit 1 + su -m ${SRCBUILD_USER} -c "mkdir ${ZFS_MOUNTPOINT}/portbuild/admin/${extra_dir}" 2> /dev/null || exit 1 fi chgrp ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/portbuild/${extra_dir} 2> /dev/null done From owner-svn-src-projects@FreeBSD.ORG Wed Feb 13 17:03:35 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B8F64C60; Wed, 13 Feb 2013 17:03:35 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AAA441A6; Wed, 13 Feb 2013 17:03:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1DH3Z3i047290; Wed, 13 Feb 2013 17:03:35 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1DH3ZSR047289; Wed, 13 Feb 2013 17:03:35 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302131703.r1DH3ZSR047289@svn.freebsd.org> From: Mark Linimon Date: Wed, 13 Feb 2013 17:03:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246767 - projects/portbuild/admin/conf 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.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Feb 2013 17:03:35 -0000 Author: linimon (doc,ports committer) Date: Wed Feb 13 17:03:35 2013 New Revision: 246767 URL: http://svnweb.freebsd.org/changeset/base/246767 Log: Continue to hunt down hardcoded /var instances. Modified: projects/portbuild/admin/conf/apache.conf Modified: projects/portbuild/admin/conf/apache.conf ============================================================================== --- projects/portbuild/admin/conf/apache.conf Wed Feb 13 15:46:33 2013 (r246766) +++ projects/portbuild/admin/conf/apache.conf Wed Feb 13 17:03:35 2013 (r246767) @@ -4,7 +4,7 @@ DocumentRoot "/a/portbuild/admin/www" LoadModule ext_filter_module libexec/apache22/mod_ext_filter.so ExtFilterDefine BUNZIP2 mode=output intype=application/x-bzip2 outtype=text/plain cmd=/usr/bin/bunzip2 - + Order allow,deny Allow from all Options FollowSymLinks @@ -12,9 +12,9 @@ ExtFilterDefine BUNZIP2 mode=output inty #Redirect permanent /index.html http://pointyhat.freebsd.org/errorlogs/ -Alias /errorlogs/ /var/portbuild/errorlogs/ +Alias /errorlogs/ /a/portbuild/errorlogs/ - + Order allow,deny Allow from all Options FollowSymLinks Indexes @@ -42,7 +42,7 @@ Alias /ganglia/ "/usr/local/www/ganglia/ # sometimes useful as a playpen -# +# # Order allow,deny # Allow from all # Options Indexes FollowSymlinks MultiViews From owner-svn-src-projects@FreeBSD.ORG Thu Feb 14 04:28:51 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 34D5C19B; Thu, 14 Feb 2013 04:28:51 +0000 (UTC) (envelope-from alfred@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 271372EF; Thu, 14 Feb 2013 04:28:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1E4SpKE055112; Thu, 14 Feb 2013 04:28:51 GMT (envelope-from alfred@svn.freebsd.org) Received: (from alfred@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1E4SoP2055108; Thu, 14 Feb 2013 04:28:50 GMT (envelope-from alfred@svn.freebsd.org) Message-Id: <201302140428.r1E4SoP2055108@svn.freebsd.org> From: Alfred Perlstein Date: Thu, 14 Feb 2013 04:28:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246782 - in projects/utrace2: contrib/jemalloc/src lib/libc/stdlib/jemalloc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 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, 14 Feb 2013 04:28:51 -0000 Author: alfred Date: Thu Feb 14 04:28:49 2013 New Revision: 246782 URL: http://svnweb.freebsd.org/changeset/base/246782 Log: Allow utrace2 to be turned on, or old utrace via malloc config. Modified: projects/utrace2/contrib/jemalloc/src/ctl.c projects/utrace2/contrib/jemalloc/src/jemalloc.c projects/utrace2/contrib/jemalloc/src/stats.c projects/utrace2/lib/libc/stdlib/jemalloc/Symbol.map Modified: projects/utrace2/contrib/jemalloc/src/ctl.c ============================================================================== --- projects/utrace2/contrib/jemalloc/src/ctl.c Thu Feb 14 02:00:41 2013 (r246781) +++ projects/utrace2/contrib/jemalloc/src/ctl.c Thu Feb 14 04:28:49 2013 (r246782) @@ -86,6 +86,7 @@ CTL_PROTO(config_stats) CTL_PROTO(config_tcache) CTL_PROTO(config_tls) CTL_PROTO(config_utrace) +CTL_PROTO(config_utrace2) CTL_PROTO(config_valgrind) CTL_PROTO(config_xmalloc) CTL_PROTO(opt_abort) @@ -99,6 +100,7 @@ CTL_PROTO(opt_zero) CTL_PROTO(opt_quarantine) CTL_PROTO(opt_redzone) CTL_PROTO(opt_utrace) +CTL_PROTO(opt_utrace2) CTL_PROTO(opt_valgrind) CTL_PROTO(opt_xmalloc) CTL_PROTO(opt_tcache) @@ -225,6 +227,7 @@ static const ctl_named_node_t config_nod {NAME("tcache"), CTL(config_tcache)}, {NAME("tls"), CTL(config_tls)}, {NAME("utrace"), CTL(config_utrace)}, + {NAME("utrace2"), CTL(config_utrace2)}, {NAME("valgrind"), CTL(config_valgrind)}, {NAME("xmalloc"), CTL(config_xmalloc)} }; @@ -241,6 +244,7 @@ static const ctl_named_node_t opt_node[] {NAME("quarantine"), CTL(opt_quarantine)}, {NAME("redzone"), CTL(opt_redzone)}, {NAME("utrace"), CTL(opt_utrace)}, + {NAME("utrace2"), CTL(opt_utrace2)}, {NAME("valgrind"), CTL(opt_valgrind)}, {NAME("xmalloc"), CTL(opt_xmalloc)}, {NAME("tcache"), CTL(opt_tcache)}, @@ -1242,6 +1246,7 @@ CTL_RO_BOOL_CONFIG_GEN(config_stats) CTL_RO_BOOL_CONFIG_GEN(config_tcache) CTL_RO_BOOL_CONFIG_GEN(config_tls) CTL_RO_BOOL_CONFIG_GEN(config_utrace) +CTL_RO_BOOL_CONFIG_GEN(config_utrace2) CTL_RO_BOOL_CONFIG_GEN(config_valgrind) CTL_RO_BOOL_CONFIG_GEN(config_xmalloc) @@ -1258,6 +1263,7 @@ CTL_RO_NL_CGEN(config_fill, opt_zero, op CTL_RO_NL_CGEN(config_fill, opt_quarantine, opt_quarantine, size_t) CTL_RO_NL_CGEN(config_fill, opt_redzone, opt_redzone, bool) CTL_RO_NL_CGEN(config_utrace, opt_utrace, opt_utrace, bool) +CTL_RO_NL_CGEN(config_utrace2, opt_utrace2, opt_utrace2, bool) CTL_RO_NL_CGEN(config_valgrind, opt_valgrind, opt_valgrind, bool) CTL_RO_NL_CGEN(config_xmalloc, opt_xmalloc, opt_xmalloc, bool) CTL_RO_NL_CGEN(config_tcache, opt_tcache, opt_tcache, bool) Modified: projects/utrace2/contrib/jemalloc/src/jemalloc.c ============================================================================== --- projects/utrace2/contrib/jemalloc/src/jemalloc.c Thu Feb 14 02:00:41 2013 (r246781) +++ projects/utrace2/contrib/jemalloc/src/jemalloc.c Thu Feb 14 04:28:49 2013 (r246782) @@ -78,14 +78,14 @@ static const void (WINAPI *init_init_loc static malloc_mutex_t init_lock = MALLOC_MUTEX_INITIALIZER; #endif +#ifdef JEMALLOC_UTRACE typedef struct { void *p; /* Input pointer (as in realloc(p, s)). */ size_t s; /* Request size. */ void *r; /* Result pointer. */ } malloc_utrace_t; -#ifdef JEMALLOC_UTRACE -# define UTRACE(a, b, c) do { \ +# define UTRACE1(a, b, c) do { \ if (opt_utrace) { \ malloc_utrace_t ut; \ ut.p = (a); \ @@ -95,6 +95,38 @@ typedef struct { } \ } while (0) #else +# define UTRACE1(a, b, c) +#endif + +#ifdef JEMALLOC_UTRACE2 +typedef struct { + int ut_type; /* utrace type UTRACE_MALLOC */ + int ut_version; /* utrace malloc version */ + void *p; /* Input pointer (as in realloc(p, s)). */ + size_t s; /* Request size. */ + void *r; /* Result pointer. */ + void *ut_caller; /* Caller */ +} malloc_utrace2_t; + +# define UTRACE2(a, b, c) do { \ + if (opt_utrace2) { \ + malloc_utrace2_t ut; \ + ut.ut_type = UTRACE_MALLOC; \ + ut.ut_version = 2; \ + ut.p = (a); \ + ut.s = (b); \ + ut.r = (c); \ + ut.ut_caller = __builtin_return_address(0); \ + utrace2(&ut, sizeof(ut)); \ + } \ +} while (0) +#else +# define UTRACE2(a, b, c) +#endif + +#if defined(JEMALLOC_UTRACE) || defined(JEMALLOC_UTRACE2) +# define UTRACE(a, b, c) do { UTRACE1(a, b, c); UTRACE2(a, b, c); } while (0) +#else # define UTRACE(a, b, c) #endif @@ -975,7 +1007,6 @@ label_return: } if (config_prof && opt_prof && result != NULL) prof_malloc(result, usize, cnt); - UTRACE(0, size, result); return (ret); } @@ -985,6 +1016,7 @@ je_posix_memalign(void **memptr, size_t int ret = imemalign(memptr, alignment, size, sizeof(void *)); JEMALLOC_VALGRIND_MALLOC(ret == 0, *memptr, isalloc(*memptr, config_prof), false); + UTRACE(0, size, *memptr); return (ret); } @@ -1000,6 +1032,7 @@ je_aligned_alloc(size_t alignment, size_ } JEMALLOC_VALGRIND_MALLOC(err == 0, ret, isalloc(ret, config_prof), false); + UTRACE(0, size, ret); return (ret); } @@ -1265,6 +1298,7 @@ je_memalign(size_t alignment, size_t siz void *ret JEMALLOC_CC_SILENCE_INIT(NULL); imemalign(&ret, alignment, size, 1); JEMALLOC_VALGRIND_MALLOC(ret != NULL, ret, size, false); + UTRACE(0, size, ret); return (ret); } #endif @@ -1276,6 +1310,7 @@ je_valloc(size_t size) void *ret JEMALLOC_CC_SILENCE_INIT(NULL); imemalign(&ret, PAGE, size, 1); JEMALLOC_VALGRIND_MALLOC(ret != NULL, ret, size, false); + UTRACE(0, size, ret); return (ret); } #endif Modified: projects/utrace2/contrib/jemalloc/src/stats.c ============================================================================== --- projects/utrace2/contrib/jemalloc/src/stats.c Thu Feb 14 02:00:41 2013 (r246781) +++ projects/utrace2/contrib/jemalloc/src/stats.c Thu Feb 14 04:28:49 2013 (r246782) @@ -383,6 +383,7 @@ stats_print(void (*write_cb)(void *, con OPT_WRITE_BOOL(redzone) OPT_WRITE_BOOL(zero) OPT_WRITE_BOOL(utrace) + OPT_WRITE_BOOL(utrace2) OPT_WRITE_BOOL(valgrind) OPT_WRITE_BOOL(xmalloc) OPT_WRITE_BOOL(tcache) Modified: projects/utrace2/lib/libc/stdlib/jemalloc/Symbol.map ============================================================================== --- projects/utrace2/lib/libc/stdlib/jemalloc/Symbol.map Thu Feb 14 02:00:41 2013 (r246781) +++ projects/utrace2/lib/libc/stdlib/jemalloc/Symbol.map Thu Feb 14 04:28:49 2013 (r246782) @@ -26,6 +26,7 @@ FBSD_1.3 { sallocm; dallocm; nallocm; + /* __jemalloc_opt_utrace;*/ }; FBSDprivate_1.0 { From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 00:54:33 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CED8B631; Fri, 15 Feb 2013 00:54:33 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A65B3829; Fri, 15 Feb 2013 00:54:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F0sXpM030291; Fri, 15 Feb 2013 00:54:33 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F0sX74030290; Fri, 15 Feb 2013 00:54:33 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150054.r1F0sX74030290@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 00:54:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246810 - projects/diffused_head/sbin/ipfw 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.14 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, 15 Feb 2013 00:54:33 -0000 Author: lstewart Date: Fri Feb 15 00:54:33 2013 New Revision: 246810 URL: http://svnweb.freebsd.org/changeset/base/246810 Log: Mitigate against possible unaligned access when parsing protocol data. Reported by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_proto.c Modified: projects/diffused_head/sbin/ipfw/diffuse_proto.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_proto.c Thu Feb 14 21:29:55 2013 (r246809) +++ projects/diffused_head/sbin/ipfw/diffuse_proto.c Fri Feb 15 00:54:33 2013 (r246810) @@ -38,6 +38,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include @@ -73,7 +74,7 @@ print_field(int idx, int id, int len, ch case DIP_IE_DST_IPV4: { /* XXX: Resolve to name. */ - a.s_addr = *((uint32_t *)val); + a.s_addr = le32dec(val); /* le32dec to leave as BE. */ printf("%s", inet_ntoa(a)); break; } @@ -81,7 +82,7 @@ print_field(int idx, int id, int len, ch case DIP_IE_SRC_PORT: case DIP_IE_DST_PORT: /* XXX: Resolve to name. */ - printf("%u", ntohs(*((uint16_t *)val))); + printf("%u", be16dec(val)); break; case DIP_IE_PROTO: @@ -89,13 +90,13 @@ print_field(int idx, int id, int len, ch case DIP_IE_TIMEOUT_TYPE: case DIP_IE_IPV4_TOS: /* XXX: Resolve to name. */ - printf("%u", *((uint8_t *)val)); + printf("%u", *val); break; case DIP_IE_CLASS_LABEL: case DIP_IE_ACTION_FLAGS: case DIP_IE_TIMEOUT: - printf("%u", ntohs(*((uint16_t *)val))); + printf("%u", be16dec(val)); break; case DIP_IE_ACTION: @@ -107,7 +108,7 @@ print_field(int idx, int id, int len, ch case DIP_IE_PCKT_CNT: case DIP_IE_KBYTE_CNT: - printf("%u", ntohl(*((uint32_t *)val))); + printf("%u", be32dec(val)); break; case DIP_IE_CLASSES: @@ -116,7 +117,7 @@ print_field(int idx, int id, int len, ch while (c < val + len) { printf("%s:", c); c += strlen(val) + 1; - printf("%u", ntohs(*((uint16_t *)c))); + printf("%u", be16dec(c)); c += sizeof(uint16_t); if (c < val + len) printf(" "); @@ -199,7 +200,7 @@ diffuse_proto_print_msg(char *buf, struc sizeof(struct dip_set_header) - sizeof(struct dip_templ_header)) { r->fields[r->fcnt].id = - ntohs(*((uint16_t *)(buf + offs))); + be16dec(buf + offs); offs += sizeof(uint16_t); info = diffuse_proto_get_info( r->fields[r->fcnt].id); @@ -207,8 +208,7 @@ diffuse_proto_print_msg(char *buf, struc r->fields[r->fcnt].len = info.len; if (r->fields[r->fcnt].len == 0) { r->fields[r->fcnt].len = - ntohs(*((uint16_t *) - (buf + offs))); + be16dec(buf + offs); offs += sizeof(uint16_t); } r->fcnt++; From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 00:58:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id EEDA3770; Fri, 15 Feb 2013 00:58:00 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E0ECD83E; Fri, 15 Feb 2013 00:58:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F0w0qW030785; Fri, 15 Feb 2013 00:58:00 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F0w0WK030784; Fri, 15 Feb 2013 00:58:00 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150058.r1F0w0WK030784@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 00:58:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246811 - projects/diffused_head/sbin/ipfw 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.14 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, 15 Feb 2013 00:58:01 -0000 Author: lstewart Date: Fri Feb 15 00:58:00 2013 New Revision: 246811 URL: http://svnweb.freebsd.org/changeset/base/246811 Log: Resolve warning about comparison of differently signed integers. Reported by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_proto.c Modified: projects/diffused_head/sbin/ipfw/diffuse_proto.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_proto.c Fri Feb 15 00:54:33 2013 (r246810) +++ projects/diffused_head/sbin/ipfw/diffuse_proto.c Fri Feb 15 00:58:00 2013 (r246811) @@ -137,7 +137,8 @@ diffuse_proto_get_info(uint16_t id) { int i; - for (i = 0; i < sizeof(dip_info) / sizeof(struct dip_info_descr); i++) { + for (i = 0; i < (int)(sizeof(dip_info) / sizeof(struct dip_info_descr)); + i++) { if (dip_info[i].id == id) return (dip_info[i]); } @@ -197,8 +198,8 @@ diffuse_proto_print_msg(char *buf, struc r->id = s.id; while (offs - toffs < ntohs(shdr->set_len) - - sizeof(struct dip_set_header) - - sizeof(struct dip_templ_header)) { + (int)sizeof(struct dip_set_header) - + (int)sizeof(struct dip_templ_header)) { r->fields[r->fcnt].id = be16dec(buf + offs); offs += sizeof(uint16_t); @@ -243,7 +244,7 @@ diffuse_proto_print_msg(char *buf, struc cnt = 0; while (offs - toffs < ntohs(shdr->set_len) - - sizeof(struct dip_set_header)) { + (int)sizeof(struct dip_set_header)) { if (r->fields[cnt].len == -1) { /* Read dynamic length */ dlen = From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 01:12:48 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 84B4CAC5; Fri, 15 Feb 2013 01:12:48 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 75FAB8A9; Fri, 15 Feb 2013 01:12:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F1CmIP036563; Fri, 15 Feb 2013 01:12:48 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F1ClP9036562; Fri, 15 Feb 2013 01:12:47 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150112.r1F1ClP9036562@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 01:12:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246813 - projects/diffused_head/sbin/ipfw/diffuse_exporter 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.14 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, 15 Feb 2013 01:12:48 -0000 Author: lstewart Date: Fri Feb 15 01:12:47 2013 New Revision: 246813 URL: http://svnweb.freebsd.org/changeset/base/246813 Log: Mark an unused variable as such. Reported by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 01:00:48 2013 (r246812) +++ projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 01:12:47 2013 (r246813) @@ -155,7 +155,7 @@ static int stop; /* Sets the flag to terminate the main loop on receipt of a signal. */ static void -sigint_handler(int i) +sigint_handler(int i __unused) { stop = 1; From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 01:24:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 946BAD1D; Fri, 15 Feb 2013 01:24:06 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 705178F9; Fri, 15 Feb 2013 01:24:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F1O65e039640; Fri, 15 Feb 2013 01:24:06 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F1O65M039639; Fri, 15 Feb 2013 01:24:06 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150124.r1F1O65M039639@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 01:24:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246814 - projects/diffused_head/sbin/ipfw/diffuse_collector 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.14 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, 15 Feb 2013 01:24:06 -0000 Author: lstewart Date: Fri Feb 15 01:24:05 2013 New Revision: 246814 URL: http://svnweb.freebsd.org/changeset/base/246814 Log: be16enc works with host byte order. Modified: projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c Modified: projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c Fri Feb 15 01:12:47 2013 (r246813) +++ projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c Fri Feb 15 01:24:05 2013 (r246814) @@ -1893,7 +1893,7 @@ request_classifier_state() thdr->flags = 0; offs += sizeof(struct dip_templ_header); - be16enc(reqstatepkt + offs, htons(dip_info[DIP_IE_MSG_TYPE].id)); + be16enc(reqstatepkt + offs, dip_info[DIP_IE_MSG_TYPE].id); offs += sizeof(uint16_t); shdr->set_len = htons(offs - sizeof(struct dip_header)); From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 01:25:28 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 74E80E42; Fri, 15 Feb 2013 01:25:28 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 66378905; Fri, 15 Feb 2013 01:25:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F1PSb8039849; Fri, 15 Feb 2013 01:25:28 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F1PSds039848; Fri, 15 Feb 2013 01:25:28 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150125.r1F1PSds039848@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 01:25:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246815 - projects/diffused_head/sbin/ipfw/diffuse_exporter 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.14 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, 15 Feb 2013 01:25:28 -0000 Author: lstewart Date: Fri Feb 15 01:25:27 2013 New Revision: 246815 URL: http://svnweb.freebsd.org/changeset/base/246815 Log: Mitigate against possible unaligned access when serialising data into a buffer. Reported by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 01:24:05 2013 (r246814) +++ projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 01:25:27 2013 (r246815) @@ -43,6 +43,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -628,19 +629,17 @@ handle_anode_state_request(struct action /* Add the IE data for the default flowrule template. */ for (i = 0; i < N_DEFAULT_FLOWRULE_TEMPLATE_ITEMS; i++) { - *((uint16_t *)(dstbuf + offs)) = - htons(dip_info[def_flowrule_template[i]].id); + be16enc(dstbuf + offs, + dip_info[def_flowrule_template[i]].id); offs += sizeof(uint16_t); if (def_flowrule_template[i] == DIP_IE_ACTION || def_flowrule_template[i] == DIP_IE_EXPORT_NAME || def_flowrule_template[i] == DIP_IE_CLASSIFIER_NAME) { - *((uint16_t *)(dstbuf + offs)) = - htons((uint16_t)DI_MAX_NAME_STR_LEN); + be16enc(dstbuf + offs, DI_MAX_NAME_STR_LEN); offs += sizeof(uint16_t); } else if (def_flowrule_template[i] == DIP_IE_ACTION_PARAMS) { - *((uint16_t *)(dstbuf + offs)) = - htons((uint16_t)DI_MAX_PARAM_STR_LEN); + be16enc(dstbuf + offs, DI_MAX_PARAM_STR_LEN); offs += sizeof(uint16_t); } } From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 01:27:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A1DC9FD; Fri, 15 Feb 2013 01:27:54 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 950DA920; Fri, 15 Feb 2013 01:27:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F1RsSh040174; Fri, 15 Feb 2013 01:27:54 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F1Rsdl040173; Fri, 15 Feb 2013 01:27:54 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150127.r1F1Rsdl040173@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 01:27:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246816 - projects/diffused_head/sbin/ipfw/diffuse_exporter 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.14 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, 15 Feb 2013 01:27:54 -0000 Author: lstewart Date: Fri Feb 15 01:27:54 2013 New Revision: 246816 URL: http://svnweb.freebsd.org/changeset/base/246816 Log: Avoid shadowing the global getopt(3) optarg variable. Reported by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 01:25:27 2013 (r246815) +++ projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 01:27:54 2013 (r246816) @@ -229,13 +229,13 @@ parse_anode(char *s, struct action_node } static void -parse_anodes(char *optarg) +parse_anodes(char *oparg) { struct action_node *tmp_anode; char *anode_str, *x; char *sep = ","; - x = strdup(optarg); + x = strdup(oparg); for (anode_str = strtok(x, sep); anode_str; anode_str = strtok(NULL, sep)) { @@ -250,13 +250,13 @@ parse_anodes(char *optarg) } static void -parse_class(char *optarg, uint32_t *class_ip, uint16_t *class_port) +parse_class(char *oparg, uint32_t *class_ip, uint16_t *class_port) { struct addrinfo *ai, *curai; char *errptr, *p; int ret; - p = strstr(optarg, ":"); + p = strstr(oparg, ":"); if (p != NULL) { *p = '\0'; @@ -266,7 +266,7 @@ parse_class(char *optarg, uint32_t *clas errx(EX_USAGE, "parse error port '%s': %s", p, errptr); } - ret = getaddrinfo(optarg, NULL, NULL, &ai); + ret = getaddrinfo(oparg, NULL, NULL, &ai); if (ret != 0) errx(EX_OSERR, "%s", gai_strerror(ret)); From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 02:01:41 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 887A63D4; Fri, 15 Feb 2013 02:01:41 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 631C6AA3; Fri, 15 Feb 2013 02:01:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F21f9G051548; Fri, 15 Feb 2013 02:01:41 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F21fnI051547; Fri, 15 Feb 2013 02:01:41 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150201.r1F21fnI051547@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 02:01:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246817 - projects/diffused_head/sbin/ipfw/diffuse_exporter 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.14 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, 15 Feb 2013 02:01:41 -0000 Author: lstewart Date: Fri Feb 15 02:01:40 2013 New Revision: 246817 URL: http://svnweb.freebsd.org/changeset/base/246817 Log: Mitigate against possible unaligned access when converting from sockaddr to sockaddr_in. Reproted by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 01:27:54 2013 (r246816) +++ projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 02:01:40 2013 (r246817) @@ -211,10 +211,9 @@ parse_anode(char *s, struct action_node if (curai != NULL) { v4sockaddr = (struct sockaddr_in *)&an->an_details; + bcopy(curai->ai_addr, v4sockaddr, sizeof(struct sockaddr_in)); v4sockaddr->sin_family = curai->ai_family; v4sockaddr->sin_port = port; - v4sockaddr->sin_addr.s_addr = - ((struct sockaddr_in *)curai->ai_addr)->sin_addr.s_addr; } else { errx(EX_USAGE, "getaddrinfo() returned non IPv4 details"); } @@ -252,6 +251,7 @@ parse_anodes(char *oparg) static void parse_class(char *oparg, uint32_t *class_ip, uint16_t *class_port) { + struct sockaddr_in v4sockaddr; struct addrinfo *ai, *curai; char *errptr, *p; int ret; @@ -276,8 +276,8 @@ parse_class(char *oparg, uint32_t *class curai = curai->ai_next; if (curai != NULL) { - *class_ip = - ((struct sockaddr_in *)curai->ai_addr)->sin_addr.s_addr; + bcopy(curai->ai_addr, &v4sockaddr, sizeof(struct sockaddr_in)); + *class_ip = v4sockaddr.sin_addr.s_addr; } else { errx(EX_USAGE, "getaddrinfo() returned non IPv4 details"); } @@ -366,7 +366,7 @@ send_anode_pkt(struct action_node *anode if (anode->proto == IPPROTO_SCTP) { /* Send templates and data over different streams. */ - if (tpllen > sizeof(struct dip_header)) { + if (tpllen > (int)sizeof(struct dip_header)) { hdr = (struct dip_header *)colpkt + tplindex; hdr->msg_len = htons(tpllen); hdr->seq_no = htonl(anode->seq_no++); @@ -377,7 +377,7 @@ send_anode_pkt(struct action_node *anode tpllen, &sinfo, 0); } - if (!ret && datalen > sizeof(struct dip_header)) { + if (!ret && datalen > (int)sizeof(struct dip_header)) { hdr = (struct dip_header *)colpkt + dataindex; hdr->msg_len = htons(datalen); hdr->seq_no = htonl(anode->seq_no++); @@ -628,7 +628,7 @@ handle_anode_state_request(struct action offs += sizeof(struct dip_templ_header); /* Add the IE data for the default flowrule template. */ - for (i = 0; i < N_DEFAULT_FLOWRULE_TEMPLATE_ITEMS; i++) { + for (i = 0; i < (int)N_DEFAULT_FLOWRULE_TEMPLATE_ITEMS; i++) { be16enc(dstbuf + offs, dip_info[def_flowrule_template[i]].id); offs += sizeof(uint16_t); From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 02:07:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A300193F; Fri, 15 Feb 2013 02:07:06 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8A594ADA; Fri, 15 Feb 2013 02:07:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F276wX052899; Fri, 15 Feb 2013 02:07:06 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F276MO052898; Fri, 15 Feb 2013 02:07:06 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201302150207.r1F276MO052898@svn.freebsd.org> From: Lawrence Stewart Date: Fri, 15 Feb 2013 02:07:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246818 - projects/diffused_head/sbin/ipfw/diffuse_exporter 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.14 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, 15 Feb 2013 02:07:06 -0000 Author: lstewart Date: Fri Feb 15 02:07:05 2013 New Revision: 246818 URL: http://svnweb.freebsd.org/changeset/base/246818 Log: Fix a const vs non-const string issue. Reported by: clang Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 02:01:40 2013 (r246817) +++ projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c Fri Feb 15 02:07:05 2013 (r246818) @@ -232,7 +232,7 @@ parse_anodes(char *oparg) { struct action_node *tmp_anode; char *anode_str, *x; - char *sep = ","; + const char *sep = ","; x = strdup(oparg); From owner-svn-src-projects@FreeBSD.ORG Fri Feb 15 07:13:28 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2B136944; Fri, 15 Feb 2013 07:13:28 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 199E27FD; Fri, 15 Feb 2013 07:13:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F7DRrY047039; Fri, 15 Feb 2013 07:13:27 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F7DR8o047038; Fri, 15 Feb 2013 07:13:27 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201302150713.r1F7DR8o047038@svn.freebsd.org> From: "Cherry G. Mathew" Date: Fri, 15 Feb 2013 07:13:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246820 - projects/amd64_xen_pv/sys/ddb 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.14 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, 15 Feb 2013 07:13:28 -0000 Author: cherry Date: Fri Feb 15 07:13:27 2013 New Revision: 246820 URL: http://svnweb.freebsd.org/changeset/base/246820 Log: Remove Xen specific hack to print to console. We do not need this anymore, and it corrupts the db> backtrace print buffer. Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/ddb/db_output.c Modified: projects/amd64_xen_pv/sys/ddb/db_output.c ============================================================================== --- projects/amd64_xen_pv/sys/ddb/db_output.c Fri Feb 15 06:52:56 2013 (r246819) +++ projects/amd64_xen_pv/sys/ddb/db_output.c Fri Feb 15 07:13:27 2013 (r246820) @@ -341,10 +341,6 @@ db_printf(const char *fmt, ...) va_start(listp, fmt); -#ifdef XEN - /* Redirect the db_printf() output also to the emergency console. */ - vprintk(fmt, listp); -#endif retval = kvprintf (fmt, db_putchar, &dca, db_radix, listp); va_end(listp); From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:11:41 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1A2C57DD; Sat, 16 Feb 2013 01:11:41 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0D25B18D; Sat, 16 Feb 2013 01:11:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1Bek8074541; Sat, 16 Feb 2013 01:11:40 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1BeBD074540; Sat, 16 Feb 2013 01:11:40 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160111.r1G1BeBD074540@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:11:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246862 - 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.14 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, 16 Feb 2013 01:11:41 -0000 Author: sjg Date: Sat Feb 16 01:11:40 2013 New Revision: 246862 URL: http://svnweb.freebsd.org/changeset/base/246862 Log: Remove duplicate option entries Modified: projects/bmake/share/mk/bsd.own.mk Modified: projects/bmake/share/mk/bsd.own.mk ============================================================================== --- projects/bmake/share/mk/bsd.own.mk Sat Feb 16 00:12:21 2013 (r246861) +++ projects/bmake/share/mk/bsd.own.mk Sat Feb 16 01:11:40 2013 (r246862) @@ -355,9 +355,6 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ ARM_EABI \ AUTO_OBJ \ - BMAKE \ - BSD_GREP \ - BSD_PATCH \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ @@ -366,6 +363,7 @@ __DEFAULT_NO_OPTIONS = \ BMAKE \ BSDCONFIG \ BSD_GREP \ + BSD_PATCH \ CLANG_EXTRAS \ CTF \ GPL_DTC \ @@ -374,8 +372,8 @@ __DEFAULT_NO_OPTIONS = \ IDEA \ INSTALL_AS_USER \ META_MODE \ - NMTREE \ NAND \ + NMTREE \ OFED \ OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN \ From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:13:31 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7DE2B905; Sat, 16 Feb 2013 01:13:31 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 706CC197; Sat, 16 Feb 2013 01:13:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1DVGP074880; Sat, 16 Feb 2013 01:13:31 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1DVKd074879; Sat, 16 Feb 2013 01:13:31 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160113.r1G1DVKd074879@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:13:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246863 - 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.14 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, 16 Feb 2013 01:13:31 -0000 Author: sjg Date: Sat Feb 16 01:13:30 2013 New Revision: 246863 URL: http://svnweb.freebsd.org/changeset/base/246863 Log: hook stage_* to all: only as needed Modified: projects/bmake/share/mk/bsd.lib.mk Modified: projects/bmake/share/mk/bsd.lib.mk ============================================================================== --- projects/bmake/share/mk/bsd.lib.mk Sat Feb 16 01:11:40 2013 (r246862) +++ projects/bmake/share/mk/bsd.lib.mk Sat Feb 16 01:13:30 2013 (r246863) @@ -436,7 +436,11 @@ stage_libs stage_files stage_as: .else .if !empty(_LIBS) && !defined(INTERNALLIB) stage_libs: ${_LIBS} -all: stage_libs +.for t in stage_libs stage_files stage_as +.if target($t) +all: $t +.endif +.endfor .endif .if !empty(INCS) || !empty(INCSGROUPS) prebuild: buildincludes From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:14:27 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C95B3A23; Sat, 16 Feb 2013 01:14:27 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B282219F; Sat, 16 Feb 2013 01:14:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1ER3F075060; Sat, 16 Feb 2013 01:14:27 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1ER3B075059; Sat, 16 Feb 2013 01:14:27 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160114.r1G1ER3B075059@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:14:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246864 - 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.14 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, 16 Feb 2013 01:14:27 -0000 Author: sjg Date: Sat Feb 16 01:14:27 2013 New Revision: 246864 URL: http://svnweb.freebsd.org/changeset/base/246864 Log: tweak STAGE_SETS Modified: projects/bmake/share/mk/bsd.prog.mk Modified: projects/bmake/share/mk/bsd.prog.mk ============================================================================== --- projects/bmake/share/mk/bsd.prog.mk Sat Feb 16 01:13:30 2013 (r246863) +++ projects/bmake/share/mk/bsd.prog.mk Sat Feb 16 01:14:27 2013 (r246864) @@ -247,6 +247,7 @@ stage_files stage_as: .if ${MK_STAGING_PROG:Uno} != "no" STAGE_DIR.prog= ${STAGE_OBJTOP}${BINDIR} +.if !empty(PROG) .if defined(PROGNAME) STAGE_AS_SETS+= prog STAGE_AS_${PROG}= ${PROGNAME} @@ -254,23 +255,24 @@ stage_as.prog: ${PROG} .else STAGE_SETS+= prog stage_files.prog: ${PROG} +all: stage_files +.endif .endif .if !empty(LINKS) all: stage_links +STAGE_SETS+= prog STAGE_LINKS.prog= ${LINKS} .endif .if !empty(SYMLINKS) all: stage_symlinks +STAGE_SETS+= prog STAGE_SYMLINKS.prog= ${SYMLINKS} .endif .if !empty(STAGE_AS_SETS) all: stage_as .endif -.if !empty(STAGE_SETS) -all: stage_files -.endif .endif .include From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:16:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 81F6BB51; Sat, 16 Feb 2013 01:16:54 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5B5081AC; Sat, 16 Feb 2013 01:16:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1Gsqx075412; Sat, 16 Feb 2013 01:16:54 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1GrCa075409; Sat, 16 Feb 2013 01:16:53 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160116.r1G1GrCa075409@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:16:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246865 - 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.14 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, 16 Feb 2013 01:16:54 -0000 Author: sjg Date: Sat Feb 16 01:16:53 2013 New Revision: 246865 URL: http://svnweb.freebsd.org/changeset/base/246865 Log: Latest *dirdeps.mk and meta2deps Modified: projects/bmake/share/mk/dirdeps.mk projects/bmake/share/mk/gendirdeps.mk projects/bmake/share/mk/meta2deps.py Modified: projects/bmake/share/mk/dirdeps.mk ============================================================================== --- projects/bmake/share/mk/dirdeps.mk Sat Feb 16 01:14:27 2013 (r246864) +++ projects/bmake/share/mk/dirdeps.mk Sat Feb 16 01:16:53 2013 (r246865) @@ -1,6 +1,7 @@ -# $Id: dirdeps.mk,v 1.23 2012/11/06 05:44:03 sjg Exp $ +# $Id: dirdeps.mk,v 1.24 2013/02/10 19:21:46 sjg Exp $ -# Copyright (c) 2010-2012, Juniper Networks, Inc. +# Copyright (c) 2010-2013, Juniper Networks, Inc. +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -33,21 +34,31 @@ # This is what we do with DIRDEPS # DIRDEPS: -# This is a list of directories - relative to SRCTOP, it is only -# of interest to .MAKE.LEVEL 0. +# This is a list of directories - relative to SRCTOP, it is +# normally only of interest to .MAKE.LEVEL 0. # In some cases the entry may be qualified with a . -# suffix, for example to force building something for the pseudo +# or . suffix (see TARGET_SPEC_VARS below), +# for example to force building something for the pseudo # machines "host" or "common" regardless of current ${MACHINE}. -# All unqualified entries end up being qualified with .${MACHINE} -# and _DIRDEPS_USE below, uses the suffix to set MACHINE +# +# All unqualified entries end up being qualified with .${TARGET_SPEC} +# and partially qualified (if TARGET_SPEC_VARS has multiple +# entries) are also expanded to a full .. +# The _DIRDEPS_USE target uses the suffix to set TARGET_SPEC # correctly when visiting each entry. # -# Each entry is also converted into a set of paths to look for -# Makefile.depend. to learn the dependencies of each. -# Each Makefile.depend. sets DEP_RELDIR to be the +# The fully qualified directory entries are used to construct a +# dependency graph that will drive the build later. +# +# Also, for each fully qualified directory target, we will search +# using ${.MAKE.DEPENDFILE_PREFERENCE} to find additional +# dependencies. We use Makefile.depend (default value for +# .MAKE.DEPENDFILE_PREFIX) to refer to these makefiles to +# distinguish them from others. +# +# Each Makefile.depend file sets DEP_RELDIR to be the # the RELDIR (path relative to SRCTOP) for its directory, and -# DEP_MACHINE to its suffix (), further since -# each Makefile.depend. includes dirdeps.mk, this +# since each Makefile.depend file includes dirdeps.mk, this # processing is recursive and results in .MAKE.LEVEL 0 learning the # dependencies of the tree wrt the initial directory (_DEP_RELDIR). # @@ -55,22 +66,23 @@ # Indicates whether .MAKE.LEVEL 0 builds anything: # if "no" sub-makes are used to build everything, # if "yes" sub-makes are only used to build for other machines. +# It is best to use "no", but this can require fixing some +# makefiles to not do anything at .MAKE.LEVEL 0. # # TARGET_SPEC_VARS -# All the description above (and below) assumes is the -# only data needed to control the build. -# This is not always the case. So in addition to setting -# MACHINE in the build environment we set TARGET_SPEC which is -# composed of the values of TARGET_SPEC_VARS separated by -# commas. The default is just MACHINE. +# The default value is just MACHINE, and for most environments +# this is sufficient. The _DIRDEPS_USE target actually sets +# both MACHINE and TARGET_SPEC to the suffix of the current +# target so that in the general case TARGET_SPEC can be ignored. # -# If more that MACHINE is needed then sys.mk needs to decompose +# If more than MACHINE is needed then sys.mk needs to decompose # TARGET_SPEC and set the relevant variables accordingly. -# It is important that MACHINE be included in TARGET_SPEC_VARS -# since if there is more the value passed as MACHINE will infact -# be the TARGET_SPEC. +# It is important that MACHINE be included in and actually be +# the first member of TARGET_SPEC_VARS. This allows other +# variables to be considered optional, and some of the treatment +# below relies on MACHINE being the first entry. # Note: TARGET_SPEC cannot contain any '.'s so the target -# tripple used by compiler folk won't work (directly anyway). +# triple used by compiler folk won't work (directly anyway). # # For example: # @@ -100,14 +112,48 @@ # do some setup we only need once _CURDIR ?= ${.CURDIR} +# make sure these are empty to start with +_DEP_TARGET_SPEC = +_DIRDEP_CHECKED = + # If TARGET_SPEC_VARS is other than just MACHINE # it should be set by sys.mk or similar by now. # TARGET_SPEC must not contain any '.'s. TARGET_SPEC_VARS ?= MACHINE +# this is what we started with TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts,} +# this is what we mostly use below +DEP_TARGET_SPEC = ${TARGET_SPEC_VARS:S,^,DEP_,:@v@${$v:U}@:ts,} +# make sure we have defaults +.for v in ${TARGET_SPEC_VARS} +DEP_$v ?= ${$v} +.endfor + +.if ${TARGET_SPEC_VARS:[#]} > 1 +# Ok, this gets more complex (putting it mildly). +# In order to stay sane, we need to ensure that all the build_dirs +# we compute below are fully qualified wrt DEP_TARGET_SPEC. +# The makefiles may only partially specify (eg. MACHINE only), +# so we need to construct a set of modifiers to fill in the gaps. +# jot 10 should output 1 2 3 .. 10 +JOT ?= jot +_tspec_x := ${${JOT} ${TARGET_SPEC_VARS:[#]}:L:sh} +# this handles unqualified entries +M_dep_qual_fixes = C;(/[^/.,]+)$$;\1.${DEP_TARGET_SPEC}; +# there needs to be at least one item missing for these to make sense +.for i in ${_tspec_x:[2..-1]} +_tspec_m$i := ${TARGET_SPEC_VARS:[2..$i]:@w@[^,]+@:ts,} +_tspec_a$i := ,${TARGET_SPEC_VARS:[$i..-1]:@v@$${DEP_$v}@:ts,} +M_dep_qual_fixes += C;(\.${_tspec_m$i})$$;\1${_tspec_a$i}; +.endfor +.else +# A harmless? default. +M_dep_qual_fixes = U +.endif .if !defined(.MAKE.DEPENDFILE_PREFERENCE) -# this makes the logic below neater? +# .MAKE.DEPENDFILE_PREFERENCE makes the logic below neater? +# you really want this set by sys.mk or similar .MAKE.DEPENDFILE_PREFERENCE = ${_CURDIR}/${.MAKE.DEPENDFILE:T} .if ${.MAKE.DEPENDFILE:E} == "${TARGET_SPEC}" .if ${TARGET_SPEC} != ${MACHINE} @@ -118,12 +164,12 @@ TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v .endif _default_dependfile := ${.MAKE.DEPENDFILE_PREFERENCE:[1]:T} -_machine_dependfiles := ${.MAKE.DEPENDFILE_PREFERENCE:M*.${TARGET_SPEC}} \ - ${.MAKE.DEPENDFILE_PREFERENCE:M*.${MACHINE}} +_machine_dependfiles := ${.MAKE.DEPENDFILE_PREFERENCE:T:M*${MACHINE}*} # for machine specific dependfiles we require ${MACHINE} to be at the end # also for the sake of sanity we require a common prefix .if !defined(.MAKE.DEPENDFILE_PREFIX) +# knowing .MAKE.DEPENDFILE_PREFIX helps .if !empty(_machine_dependfiles) .MAKE.DEPENDFILE_PREFIX := ${_machine_dependfiles:[1]:T:R} .else @@ -133,24 +179,45 @@ _machine_dependfiles := ${.MAKE.DEPENDFI # this is how we identify non-machine specific dependfiles -N_notmachine := ${.MAKE.DEPENDFILE_PREFERENCE:E:N${TARGET_SPEC}:N${MACHINE}:${M_ListToSkip}} +N_notmachine := ${.MAKE.DEPENDFILE_PREFERENCE:E:N*${MACHINE}*:${M_ListToSkip}} .endif # !target(_DIRDEP_USE) +# if we were included recursively _DEP_TARGET_SPEC should be valid. +.if empty(_DEP_TARGET_SPEC) +# we may or may not have included a dependfile yet _last_dependfile := ${.MAKE.MAKEFILES:M*/${.MAKE.DEPENDFILE_PREFIX}*:[-1]} +.if !empty(_debug_reldir) +.info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _last_dependfile='${_last_dependfile}' +.endif + +.if empty(_last_dependfile) || ${_last_dependfile:E:${N_notmachine}} == "" +# this is all we have to work with +DEP_MACHINE = ${TARGET_MACHINE:U${MACHINE}} +_DEP_TARGET_SPEC := ${DEP_TARGET_SPEC} +.else +_DEP_TARGET_SPEC = ${_last_dependfile:${M_dep_qual_fixes:ts:}:E} +.endif +.if !empty(_last_dependfile) +# record that we've read dependfile for this +_DIRDEP_CHECKED += ${_CURDIR}.${TARGET_SPEC} +.endif +.endif -# Note: if a makefile is read many times, the above -# will not work, so we also test for DEP_MACHINE==depend below. -.if empty(_last_dependfile) -# we haven't included one yet -DEP_MACHINE ?= ${TARGET_MACHINE:U${TARGET_SPEC}} -# else it should be correctly set by ${.MAKE.DEPENDFILE} -.elif ${_last_dependfile:E:${N_notmachine}} == "" || ${DEP_MACHINE:Uno:${N_notmachine}} == "" -# don't rely on manually maintained files to be correct -DEP_MACHINE := ${_DEP_MACHINE:U${TARGET_SPEC}} +# by now _DEP_TARGET_SPEC should be set, parse it. +.if ${TARGET_SPEC_VARS:[#]} > 1 +# we need to parse DEP_MACHINE may or may not contain more info +_tspec := ${_DEP_TARGET_SPEC:S/,/ /g} +.for i in ${_tspec_x} +DEP_${TARGET_SPEC_VARS:[$i]} := ${_tspec:[$i]} +.endfor +.for v in ${TARGET_SPEC_VARS:O:u} +.if empty(DEP_$v) +.undef DEP_$v +.endif +.endfor .else -# just in case -DEP_MACHINE ?= ${_last_dependfile:E} +DEP_MACHINE := ${_DEP_TARGET_SPEC} .endif # pickup customizations @@ -198,12 +265,15 @@ DIRDEPS_FILTER += M${_DEP_RELDIR}* # we supress SUBDIR when visiting the leaves # we assume sys.mk will set MACHINE_ARCH +# you can add extras to DIRDEP_USE_ENV +# if there is no makefile in the target directory, we skip it. _DIRDEP_USE: .USE .MAKE @for m in ${.MAKE.MAKEFILE_PREFERENCE}; do \ test -s ${.TARGET:R}/$$m || continue; \ echo "${TRACER}Checking ${.TARGET:R} for ${.TARGET:E} ..."; \ + MACHINE_ARCH= NO_SUBDIR=1 ${DIRDEP_USE_ENV} \ TARGET_SPEC=${.TARGET:E} \ - MACHINE=${.TARGET:E} MACHINE_ARCH= NO_SUBDIR=1 \ + MACHINE=${.TARGET:E} \ ${.MAKE} -C ${.TARGET:R} || exit 1; \ break; \ done @@ -260,7 +330,7 @@ _this_dir := ${SRCTOP}/${DEP_RELDIR} _dep_hack := ${_this_dir}/${.MAKE.DEPENDFILE_PREFIX}.inc .-include "${_dep_hack}" -.if ${DEP_RELDIR} != ${_DEP_RELDIR} || ${DEP_MACHINE} != ${TARGET_SPEC} +.if ${DEP_RELDIR} != ${_DEP_RELDIR} || ${DEP_TARGET_SPEC} != ${TARGET_SPEC} # this should be all _machines := ${DEP_MACHINE} .else @@ -275,17 +345,23 @@ _machines += host _machines := ${_machines:O:u} .endif -# reset these each time through +.if ${TARGET_SPEC_VARS:[#]} > 1 +# we need to tweak _machines +_dm := ${DEP_MACHINE} +_machines := ${_machines:@DEP_MACHINE@${DEP_TARGET_SPEC}@} +DEP_MACHINE := ${_dm} +.endif + +# reset each time through _build_dirs = -_depdir_files = .if ${DEP_RELDIR} == ${_DEP_RELDIR} # pickup other machines for this dir if necessary .if ${BUILD_AT_LEVEL0:Uyes} == "no" _build_dirs += ${_machines:@m@${_CURDIR}.$m@} .else -_build_dirs += ${_machines:N${DEP_MACHINE}:@m@${_CURDIR}.$m@} -.if ${DEP_MACHINE} == ${TARGET_SPEC} +_build_dirs += ${_machines:N${DEP_TARGET_SPEC}:@m@${_CURDIR}.$m@} +.if ${DEP_TARGET_SPEC} == ${TARGET_SPEC} # pickup local dependencies now .-include <.depend> .endif @@ -293,9 +369,8 @@ _build_dirs += ${_machines:N${DEP_MACHIN .endif .if !empty(_debug_reldir) -.info ${DEP_RELDIR}.${DEP_MACHINE}: _last_dependfile='${_last_dependfile}' -.info ${DEP_RELDIR}.${DEP_MACHINE}: DIRDEPS='${DIRDEPS}' -.info ${DEP_RELDIR}.${DEP_MACHINE}: _machines='${_machines}' +.info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: DIRDEPS='${DIRDEPS}' +.info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _machines='${_machines}' .endif .if !empty(DIRDEPS) @@ -327,26 +402,8 @@ _build_dirs += \ ${__qual_depdirs:N*.host} \ ${_machines:@m@${__unqual_depdirs:@d@$d.$m@}@} -_build_dirs := ${_build_dirs:O:u} - -# this is where we will pick up more dependencies from -# the inner inline loops look complex, but save a significant -# amount of memory compared to a .for loop. -_depdir_files = -.for d in ${_build_dirs} -.if exists($d) -# easy, we're building for ${MACHINE} -_depdir_files += ${.MAKE.DEPENDFILE_PREFERENCE:T:@m@${exists($d/$m):?$d/$m:}@:[1]} -.elif exists(${d:R}) && ${d:R:T} == ${d:T:R} -# a little more complex - building for another machine -# we will ensure the file is qualified with a machine -# so that if necessary _DEP_MACHINE can be set below -_depdir_files += ${.MAKE.DEPENDFILE_PREFERENCE:T:S,.${TARGET_SPEC}$,.${d:E},:S,.${MACHINE}$,.${d:E},:@m@${exists(${d:R}/$m):?${d:R}/$m:}@:[1]:@m@${"${m:M*.${d:E}}":?$m:$m.${d:E}}@} -.endif -.endfor - -# clean up -_depdir_files := ${_depdir_files:O:u} +# qualify everything now +_build_dirs := ${_build_dirs:${M_dep_qual_fixes:ts:}:O:u} .endif # empty DIRDEPS @@ -360,48 +417,57 @@ dirdeps: ${_build_dirs} ${_build_dirs}: _DIRDEP_USE .if !empty(_debug_reldir) -.info ${DEP_RELDIR}.${DEP_MACHINE}: ${_build_dirs} +.info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: needs: ${_build_dirs} .endif +# this builds the dependency graph .for m in ${_machines} # it would be nice to do :N${.TARGET} .if !empty(__qual_depdirs) -.for q in ${__qual_depdirs:E:O:u:N$m} +.for q in ${__qual_depdirs:${M_dep_qual_fixes:ts:}:E:O:u:N$m} .if !empty(_debug_reldir) || ${DEBUG_DIRDEPS:@x@${${DEP_RELDIR}.$m:L:M$x}${${DEP_RELDIR}.$q:L:M$x}@} != "" -.info ${DEP_RELDIR}.$m: ${_build_dirs:M*.$q} +.info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$q} .endif ${_this_dir}.$m: ${_build_dirs:M*.$q} .endfor .endif .if !empty(_debug_reldir) -.info ${DEP_RELDIR}.$m: ${_build_dirs:M*.$m:N${_this_dir}.$m} +.info ${DEP_RELDIR}.$m: graph: ${_build_dirs:M*.$m:N${_this_dir}.$m} .endif ${_this_dir}.$m: ${_build_dirs:M*.$m:N${_this_dir}.$m} .endfor .endif -.for d in ${_depdir_files} -.if ${.MAKE.MAKEFILES:M${d}} == "" +# Now find more dependencies - and recurse. +.for d in ${_build_dirs} +.if ${_DIRDEP_CHECKED:M$d} == "" +# once only +_DIRDEP_CHECKED += $d +# Note: _build_dirs is fully qualifed so d:R is always the directory +.if exists(${d:R}) +# Warning: there is an assumption here that MACHINE is always +# the first entry in TARGET_SPEC_VARS. +# If TARGET_SPEC and MACHINE are insufficient, you have a problem. +_m := ${.MAKE.DEPENDFILE_PREFERENCE:T:S;${TARGET_SPEC}$;${d:E};:S;${MACHINE};${d:E:C/,.*//};:@m@${exists(${d:R}/$m):?${d:R}/$m:}@:[1]} +.if !empty(_m) +_qm := ${_m:${M_dep_qual_fixes:ts:}} .if !empty(_debug_search) -.info Looking for $d +.info Looking for ${_qm} .endif -.if exists($d) -.include <$d> -.elif exists(${d:R}) -# an unqualified file exists, we qualified it above so we can set _DEP_MACHINE -# it might be manually maintained and shared by all machine types -# tell it the machine we are interested in. -_DEP_MACHINE := ${d:E} -.if !empty(_debug_reldir) -.info loading ${d:R} for ${_DEP_MACHINE} +# we pass _DEP_TARGET_SPEC to tell the next step what we want +_DEP_TARGET_SPEC := ${d:E} +# some makefiles may still look at this +_DEP_MACHINE := ${d:E:C/,.*//} +.if !empty(_debug_reldir) && ${_qm} != ${_m} +.info loading ${_m} for ${d:E} +.endif +.include <${_m}> .endif -# pretend we read $d, so we don't come by here again. -.MAKE.MAKEFILES += $d -.include <${d:R}> .endif .endif .endfor + .endif # -V .elif ${.MAKE.LEVEL} > 42 Modified: projects/bmake/share/mk/gendirdeps.mk ============================================================================== --- projects/bmake/share/mk/gendirdeps.mk Sat Feb 16 01:14:27 2013 (r246864) +++ projects/bmake/share/mk/gendirdeps.mk Sat Feb 16 01:16:53 2013 (r246865) @@ -1,6 +1,7 @@ -# $Id: gendirdeps.mk,v 1.10 2012/06/30 00:37:50 sjg Exp $ +# $Id: gendirdeps.mk,v 1.12 2013/02/10 19:59:10 sjg Exp $ -# Copyright (c) 2010, Juniper Networks, Inc. +# Copyright (c) 2010-2013, Juniper Networks, Inc. +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -106,25 +107,26 @@ _py_d = # we can afford to do this all the time. DPDEPS ?= no META2DEPS_CMD = ${_time} ${PYTHON} ${META2DEPS} ${_py_d} \ - -R ${RELDIR} -H ${HOST_TARGET} -O ${M2D_OBJROOT} + -R ${RELDIR} -H ${HOST_TARGET} \ + ${M2D_OBJROOTS:O:u:@o@-O $o@} + .if ${DPDEPS:tl} != "no" META2DEPS_CMD += -D ${DPDEPS} .endif + +M2D_OBJROOTS += ${OBJTOP}/ ${_OBJROOT} +.if defined(SB_OBJROOT) +M2D_OBJROOTS += ${SB_OBJROOT} +.endif .if ${.MAKE.DEPENDFILE_PREFERENCE:U${.MAKE.DEPENDFILE}:M*.${MACHINE}} == "" # meta2deps.py only groks objroot # so we need to give it what it expects -M2D_OBJROOT = ${OBJTOP}/ # and tell it not to add machine qualifiers META2DEPS_ARGS += MACHINE=none -.else -.if defined(SB_OBJROOT) -M2D_OBJROOT ?= ${SB_OBJROOT} -.else -M2D_OBJROOT = ${OBJTOP}/ -.endif .endif .if defined(SB_BACKING_SB) -META2DEPS_CMD += -S ${SB_BACKING_SB}/src -O ${SB_BACKING_SB}/${SB_OBJPREFIX} +META2DEPS_CMD += -S ${SB_BACKING_SB}/src +M2D_OBJROOTS += ${SB_BACKING_SB}/${SB_OBJPREFIX} .endif META2DEPS_FILTER = sed 's,^src:,${SRCTOP}/,;s,^\([^/]\),${OBJTOP}/\1,' | .elif ${META2DEPS:E} == "sh" @@ -263,7 +265,6 @@ CAT_DEPEND ?= .depend ${_DEPENDFILE}: ${CAT_DEPEND:M.depend} ${META_FILES:O:u:@m@${exists($m):?$m:}@} ${_this} ${META2DEPS} @(echo '# Autogenerated - do NOT edit!'; echo; \ echo 'DEP_RELDIR := $${_PARSEDIR:S,$${SRCTOP}/,,}'; echo; \ - echo 'DEP_MACHINE := $${.PARSEFILE:E}'; echo; \ echo 'DIRDEPS = \'; \ echo '${DIRDEPS:@d@ $d \\${.newline}@}'; echo; \ ${_include_src_dirdeps} \ @@ -285,7 +286,6 @@ all: ${_DEPENDFILE} ${_DEPENDFILE}: ${MAKEFILE} ${_this} @(echo '# Autogenerated - do NOT edit!'; echo; \ echo 'DEP_RELDIR := $${_PARSEDIR:S,$${SRCTOP}/,,}'; echo; \ - echo 'DEP_MACHINE := $${.PARSEFILE:E}'; echo; \ echo 'DIRDEPS = \'; \ echo '${DIRDEPS:@d@ $d \\${.newline}@}'; echo; \ echo '.include '; \ Modified: projects/bmake/share/mk/meta2deps.py ============================================================================== --- projects/bmake/share/mk/meta2deps.py Sat Feb 16 01:14:27 2013 (r246864) +++ projects/bmake/share/mk/meta2deps.py Sat Feb 16 01:16:53 2013 (r246865) @@ -35,9 +35,10 @@ We only pay attention to a subset of the """ RCSid: - $Id: meta2deps.py,v 1.7 2012/11/06 05:44:03 sjg Exp $ + $Id: meta2deps.py,v 1.8 2013/02/10 19:21:46 sjg Exp $ - Copyright (c) 2011, Juniper Networks, Inc. + Copyright (c) 2011-2013, Juniper Networks, Inc. + All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -174,6 +175,8 @@ class MetaFile: self.debug = getv(conf, 'debug', 0) self.debug_out = getv(conf, 'debug_out', sys.stderr) + self.machine = getv(conf, 'MACHINE', '') + if not self.conf: # some of the steps below we want to do only once self.conf = conf @@ -190,6 +193,12 @@ class MetaFile: self.srctops.append(_srctop) for objroot in getv(conf, 'OBJROOTS', []): + for e in ['/' + self.machine, '/' + self.machine + '/']: + if objroot.endswith(e): + # this is not what we want - fix it + objroot = objroot[0:-len(e)] + if e.endswith('/'): + objroot += '/' if not objroot in self.objroots: self.objroots.append(objroot) _objroot = os.path.realpath(objroot) @@ -198,6 +207,10 @@ class MetaFile: if not _objroot in self.objroots: self.objroots.append(_objroot) + # we want the longest match + self.srctops.sort(reverse=True) + self.objroots.sort(reverse=True) + if self.debug: print >> self.debug_out, "host_target=", self.host_target print >> self.debug_out, "srctops=", self.srctops @@ -206,7 +219,6 @@ class MetaFile: self.dirdep_re = re.compile(r'([^/]+)/(.+)') self.curdir = getv(conf, 'CURDIR') - self.machine = getv(conf, 'MACHINE', '') self.reldir = getv(conf, 'RELDIR') self.dpdeps = getv(conf, 'DPDEPS') if self.dpdeps and not self.reldir: From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:19:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E2F95C7C; Sat, 16 Feb 2013 01:19:18 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A6AC01B4; Sat, 16 Feb 2013 01:19:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1JIdJ075747; Sat, 16 Feb 2013 01:19:18 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1JISQ075746; Sat, 16 Feb 2013 01:19:18 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160119.r1G1JISQ075746@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:19:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246866 - 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.14 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, 16 Feb 2013 01:19:19 -0000 Author: sjg Date: Sat Feb 16 01:19:18 2013 New Revision: 246866 URL: http://svnweb.freebsd.org/changeset/base/246866 Log: If MAKESYSPATH contained .../ entry resolve it so that it still works when we launch make from obj tree. If we don't have sysroot support we need some c++ and clang specific include dirs in the stage tree. Modified: projects/bmake/share/mk/local.sys.mk Modified: projects/bmake/share/mk/local.sys.mk ============================================================================== --- projects/bmake/share/mk/local.sys.mk Sat Feb 16 01:16:53 2013 (r246865) +++ projects/bmake/share/mk/local.sys.mk Sat Feb 16 01:19:18 2013 (r246866) @@ -108,6 +108,11 @@ WITH_STAGING_PROG= yes PYTHON ?= /usr/local/bin/python .if ${.MAKE.LEVEL} == 0 +.if ${MAKESYSPATH:Uno:M*.../*} != "" +# make sure this is resolved +MAKESYSPATH:= ${MAKESYSPATH:S,:, ,g:C,\.\.\./.*,${_this:H},:ts:} +.export MAKESYSPATH +.endif # this works best if share/mk is ready for it. BUILD_AT_LEVEL0= no # By default only MACHINE0 updates dependencies @@ -146,8 +151,13 @@ STAGE_SYMLINKS_DIR= ${STAGE_OBJTOP} CFLAGS_LAST+= -nostdinc .endif CFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include -isystem ${STAGE_OBJTOP}/include +CFLAGS_LAST += ${CFLAGS_LAST.${COMPILER_TYPE}} LDFLAGS_LAST+= -B${STAGE_LIBDIR} -L${STAGE_LIBDIR} -CXXFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2} +CXXFLAGS_LAST += -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2} +# backward doesn't get searched if -nostdinc +CXXFLAGS_LAST += -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2}/backward +CFLAGS_LAST.clang += -isystem ${STAGE_OBJTOP}/usr/include/clang/3.2 +CXXFLAGS_LAST += ${CFLAGS_LAST.${COMPILER_TYPE}} .else # if ld suppored sysroot, this would suffice CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} -isystem ${STAGE_OBJTOP}/include @@ -202,6 +212,11 @@ MAKE_PRINT_VAR_ON_ERROR+= \ OBJTOP \ ${MAKE_PRINT_VAR_ON_ERROR_XTRAS} +.if ${.MAKE.LEVEL} > 0 +MAKE_PRINT_VAR_ON_ERROR += .MAKE.MAKEFILES .PATH +.endif + + # these are handy # we can use this for a cheap timestamp at the start of a target's script, # but not at the end - since make will expand both at the same time. From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:20:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D2098DAC; Sat, 16 Feb 2013 01:20:56 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C0EA41BC; Sat, 16 Feb 2013 01:20:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1KuCm077431; Sat, 16 Feb 2013 01:20:56 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1KuT0077430; Sat, 16 Feb 2013 01:20:56 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160120.r1G1KuT0077430@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:20:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246867 - 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.14 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, 16 Feb 2013 01:20:56 -0000 Author: sjg Date: Sat Feb 16 01:20:56 2013 New Revision: 246867 URL: http://svnweb.freebsd.org/changeset/base/246867 Log: We may only have INCSLINKS, and STAGE_SYMLINKS should all be full paths. Modified: projects/bmake/share/mk/bsd.incs.mk Modified: projects/bmake/share/mk/bsd.incs.mk ============================================================================== --- projects/bmake/share/mk/bsd.incs.mk Sat Feb 16 01:19:18 2013 (r246866) +++ projects/bmake/share/mk/bsd.incs.mk Sat Feb 16 01:20:56 2013 (r246867) @@ -97,10 +97,10 @@ buildincludes: stage_files .if !empty(STAGE_AS_SETS) buildincludes: stage_as .endif +.endif .if !empty(INCSLINKS) stage_files: stage_symlinks -STAGE_SYMLINKS.INCS= ${INCSLINKS:S,${INCSDIR}/,,} -.endif +STAGE_SYMLINKS.INCS= ${INCSLINKS} .endif .endif .endif From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:24:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BEE8DF7A; Sat, 16 Feb 2013 01:24:14 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AE17D1DD; Sat, 16 Feb 2013 01:24:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1OEMp078133; Sat, 16 Feb 2013 01:24:14 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1NuvA078001; Sat, 16 Feb 2013 01:23:56 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160123.r1G1NuvA078001@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:23:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246868 - in projects/bmake: bin/cat bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/expr bin/getfacl bin/hostname bin/kenv bin/k... 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.14 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, 16 Feb 2013 01:24:14 -0000 Author: sjg Date: Sat Feb 16 01:23:54 2013 New Revision: 246868 URL: http://svnweb.freebsd.org/changeset/base/246868 Log: Updated dependencies Modified: projects/bmake/bin/cat/Makefile.depend projects/bmake/bin/chflags/Makefile.depend projects/bmake/bin/chio/Makefile.depend projects/bmake/bin/chmod/Makefile.depend projects/bmake/bin/cp/Makefile.depend projects/bmake/bin/csh/Makefile.depend projects/bmake/bin/date/Makefile.depend projects/bmake/bin/dd/Makefile.depend projects/bmake/bin/df/Makefile.depend projects/bmake/bin/domainname/Makefile.depend projects/bmake/bin/echo/Makefile.depend projects/bmake/bin/ed/Makefile.depend projects/bmake/bin/expr/Makefile.depend projects/bmake/bin/getfacl/Makefile.depend projects/bmake/bin/hostname/Makefile.depend projects/bmake/bin/kenv/Makefile.depend projects/bmake/bin/kill/Makefile.depend projects/bmake/bin/ln/Makefile.depend projects/bmake/bin/ls/Makefile.depend projects/bmake/bin/mkdir/Makefile.depend projects/bmake/bin/mv/Makefile.depend projects/bmake/bin/pax/Makefile.depend projects/bmake/bin/pkill/Makefile.depend projects/bmake/bin/ps/Makefile.depend projects/bmake/bin/pwait/Makefile.depend projects/bmake/bin/pwd/Makefile.depend projects/bmake/bin/rcp/Makefile.depend projects/bmake/bin/realpath/Makefile.depend projects/bmake/bin/rm/Makefile.depend projects/bmake/bin/rmail/Makefile.depend projects/bmake/bin/rmdir/Makefile.depend projects/bmake/bin/setfacl/Makefile.depend projects/bmake/bin/sh/Makefile.depend projects/bmake/bin/sleep/Makefile.depend projects/bmake/bin/stty/Makefile.depend projects/bmake/bin/sync/Makefile.depend projects/bmake/bin/test/Makefile.depend projects/bmake/bin/uuidgen/Makefile.depend projects/bmake/cddl/lib/drti/Makefile.depend projects/bmake/cddl/lib/libavl/Makefile.depend projects/bmake/cddl/lib/libctf/Makefile.depend projects/bmake/cddl/lib/libdtrace/Makefile.depend projects/bmake/cddl/lib/libnvpair/Makefile.depend projects/bmake/cddl/lib/libumem/Makefile.depend projects/bmake/cddl/lib/libuutil/Makefile.depend projects/bmake/cddl/lib/libzfs/Makefile.depend projects/bmake/cddl/lib/libzpool/Makefile.depend projects/bmake/cddl/sbin/zfs/Makefile.depend projects/bmake/cddl/sbin/zpool/Makefile.depend projects/bmake/cddl/usr.bin/ctfconvert/Makefile.depend projects/bmake/cddl/usr.bin/ctfdump/Makefile.depend projects/bmake/cddl/usr.bin/ctfmerge/Makefile.depend projects/bmake/cddl/usr.bin/sgsmsg/Makefile.depend projects/bmake/cddl/usr.bin/zinject/Makefile.depend projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend projects/bmake/cddl/usr.bin/ztest/Makefile.depend projects/bmake/cddl/usr.sbin/dtrace/Makefile.depend projects/bmake/cddl/usr.sbin/dtruss/Makefile.depend projects/bmake/cddl/usr.sbin/lockstat/Makefile.depend projects/bmake/cddl/usr.sbin/zdb/Makefile.depend projects/bmake/cddl/usr.sbin/zhack/Makefile.depend projects/bmake/games/bcd/Makefile.depend projects/bmake/games/caesar/Makefile.depend projects/bmake/games/factor/Makefile.depend projects/bmake/games/fortune/datfiles/Makefile.depend projects/bmake/games/fortune/fortune/Makefile.depend projects/bmake/games/fortune/strfile/Makefile.depend projects/bmake/games/fortune/unstr/Makefile.depend projects/bmake/games/grdc/Makefile.depend projects/bmake/games/morse/Makefile.depend projects/bmake/games/number/Makefile.depend projects/bmake/games/pom/Makefile.depend projects/bmake/games/ppt/Makefile.depend projects/bmake/games/primes/Makefile.depend projects/bmake/games/random/Makefile.depend projects/bmake/gnu/lib/csu/Makefile.depend projects/bmake/gnu/lib/libdialog/Makefile.depend projects/bmake/gnu/lib/libgcc/Makefile.depend projects/bmake/gnu/lib/libgcov/Makefile.depend projects/bmake/gnu/lib/libgomp/Makefile.depend projects/bmake/gnu/lib/libreadline/readline/Makefile.depend projects/bmake/gnu/lib/libregex/Makefile.depend projects/bmake/gnu/lib/libssp/libssp_nonshared/Makefile.depend projects/bmake/gnu/lib/libstdc++/Makefile.depend projects/bmake/gnu/lib/libsupc++/Makefile.depend projects/bmake/gnu/usr.bin/binutils/addr2line/Makefile.depend projects/bmake/gnu/usr.bin/binutils/ar/Makefile.depend projects/bmake/gnu/usr.bin/binutils/as/Makefile.depend projects/bmake/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 projects/bmake/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64 projects/bmake/gnu/usr.bin/binutils/libbinutils/Makefile.depend projects/bmake/gnu/usr.bin/binutils/libiberty/Makefile.depend projects/bmake/gnu/usr.bin/binutils/libopcodes/Makefile.depend projects/bmake/gnu/usr.bin/binutils/nm/Makefile.depend projects/bmake/gnu/usr.bin/binutils/objcopy/Makefile.depend projects/bmake/gnu/usr.bin/binutils/objdump/Makefile.depend projects/bmake/gnu/usr.bin/binutils/ranlib/Makefile.depend projects/bmake/gnu/usr.bin/binutils/readelf/Makefile.depend projects/bmake/gnu/usr.bin/binutils/size/Makefile.depend projects/bmake/gnu/usr.bin/binutils/strings/Makefile.depend projects/bmake/gnu/usr.bin/binutils/strip/Makefile.depend projects/bmake/gnu/usr.bin/cc/cc_int/Makefile.depend projects/bmake/gnu/usr.bin/cc/cc_tools/Makefile.depend projects/bmake/gnu/usr.bin/cc/include/Makefile.depend projects/bmake/gnu/usr.bin/cc/libcpp/Makefile.depend projects/bmake/gnu/usr.bin/cc/libdecnumber/Makefile.depend projects/bmake/gnu/usr.bin/cc/libiberty/Makefile.depend projects/bmake/gnu/usr.bin/cvs/contrib/Makefile.depend projects/bmake/gnu/usr.bin/cvs/cvs/Makefile.depend projects/bmake/gnu/usr.bin/cvs/cvsbug/Makefile.depend projects/bmake/gnu/usr.bin/cvs/lib/Makefile.depend projects/bmake/gnu/usr.bin/cvs/libdiff/Makefile.depend projects/bmake/gnu/usr.bin/dialog/Makefile.depend projects/bmake/gnu/usr.bin/diff3/Makefile.depend projects/bmake/gnu/usr.bin/gdb/gdb/Makefile.depend projects/bmake/gnu/usr.bin/gdb/gdbserver/Makefile.depend projects/bmake/gnu/usr.bin/gdb/gdbtui/Makefile.depend projects/bmake/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 projects/bmake/gnu/usr.bin/gdb/libgdb/Makefile.depend.amd64 projects/bmake/gnu/usr.bin/groff/contrib/mm/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devascii/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devcp1047/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devdvi/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devhtml/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devkoi8-r/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devlatin1/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devlbp/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devlj4/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devps/Makefile.depend projects/bmake/gnu/usr.bin/groff/font/devutf8/Makefile.depend projects/bmake/gnu/usr.bin/groff/man/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/devices/grops/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/libs/libdriver/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/preproc/html/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/roff/groff/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/roff/grog/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/roff/psroff/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/roff/troff/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend projects/bmake/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend projects/bmake/gnu/usr.bin/groff/tmac/Makefile.depend projects/bmake/gnu/usr.bin/patch/Makefile.depend projects/bmake/gnu/usr.bin/rcs/ci/Makefile.depend projects/bmake/gnu/usr.bin/rcs/co/Makefile.depend projects/bmake/gnu/usr.bin/rcs/ident/Makefile.depend projects/bmake/gnu/usr.bin/rcs/lib/Makefile.depend projects/bmake/gnu/usr.bin/rcs/merge/Makefile.depend projects/bmake/gnu/usr.bin/rcs/rcs/Makefile.depend projects/bmake/gnu/usr.bin/rcs/rcsclean/Makefile.depend projects/bmake/gnu/usr.bin/rcs/rcsdiff/Makefile.depend projects/bmake/gnu/usr.bin/rcs/rcsfreeze/Makefile.depend projects/bmake/gnu/usr.bin/rcs/rcsmerge/Makefile.depend projects/bmake/gnu/usr.bin/rcs/rlog/Makefile.depend projects/bmake/gnu/usr.bin/sdiff/Makefile.depend projects/bmake/gnu/usr.bin/texinfo/info/Makefile.depend projects/bmake/gnu/usr.bin/texinfo/infokey/Makefile.depend projects/bmake/gnu/usr.bin/texinfo/install-info/Makefile.depend projects/bmake/gnu/usr.bin/texinfo/libtxi/Makefile.depend projects/bmake/gnu/usr.bin/texinfo/makeinfo/Makefile.depend projects/bmake/gnu/usr.bin/texinfo/texindex/Makefile.depend projects/bmake/include/Makefile.depend projects/bmake/include/arpa/Makefile.depend projects/bmake/include/gssapi/Makefile.depend projects/bmake/include/protocols/Makefile.depend projects/bmake/include/rpc/Makefile.depend projects/bmake/include/rpcsvc/Makefile.depend projects/bmake/include/xlocale/Makefile.depend projects/bmake/kerberos5/lib/libasn1/Makefile.depend projects/bmake/kerberos5/lib/libgssapi_krb5/Makefile.depend projects/bmake/kerberos5/lib/libgssapi_ntlm/Makefile.depend projects/bmake/kerberos5/lib/libgssapi_spnego/Makefile.depend projects/bmake/kerberos5/lib/libhdb/Makefile.depend projects/bmake/kerberos5/lib/libheimbase/Makefile.depend projects/bmake/kerberos5/lib/libheimipcc/Makefile.depend projects/bmake/kerberos5/lib/libheimipcs/Makefile.depend projects/bmake/kerberos5/lib/libheimntlm/Makefile.depend projects/bmake/kerberos5/lib/libheimsqlite/Makefile.depend projects/bmake/kerberos5/lib/libhx509/Makefile.depend projects/bmake/kerberos5/lib/libkadm5clnt/Makefile.depend projects/bmake/kerberos5/lib/libkadm5srv/Makefile.depend projects/bmake/kerberos5/lib/libkafs5/Makefile.depend projects/bmake/kerberos5/lib/libkdc/Makefile.depend projects/bmake/kerberos5/lib/libkrb5/Makefile.depend projects/bmake/kerberos5/lib/libroken/Makefile.depend projects/bmake/kerberos5/lib/libsl/Makefile.depend projects/bmake/kerberos5/lib/libvers/Makefile.depend projects/bmake/kerberos5/lib/libwind/Makefile.depend projects/bmake/kerberos5/libexec/digest-service/Makefile.depend projects/bmake/kerberos5/libexec/hprop/Makefile.depend projects/bmake/kerberos5/libexec/hpropd/Makefile.depend projects/bmake/kerberos5/libexec/ipropd-master/Makefile.depend projects/bmake/kerberos5/libexec/ipropd-slave/Makefile.depend projects/bmake/kerberos5/libexec/kadmind/Makefile.depend projects/bmake/kerberos5/libexec/kcm/Makefile.depend projects/bmake/kerberos5/libexec/kdc/Makefile.depend projects/bmake/kerberos5/libexec/kdigest/Makefile.depend projects/bmake/kerberos5/libexec/kfd/Makefile.depend projects/bmake/kerberos5/libexec/kimpersonate/Makefile.depend projects/bmake/kerberos5/libexec/kpasswdd/Makefile.depend projects/bmake/kerberos5/tools/asn1_compile/Makefile.depend projects/bmake/kerberos5/tools/make-roken/Makefile.depend projects/bmake/kerberos5/tools/slc/Makefile.depend projects/bmake/kerberos5/usr.bin/hxtool/Makefile.depend projects/bmake/kerberos5/usr.bin/kadmin/Makefile.depend projects/bmake/kerberos5/usr.bin/kcc/Makefile.depend projects/bmake/kerberos5/usr.bin/kdestroy/Makefile.depend projects/bmake/kerberos5/usr.bin/kf/Makefile.depend projects/bmake/kerberos5/usr.bin/kgetcred/Makefile.depend projects/bmake/kerberos5/usr.bin/kinit/Makefile.depend projects/bmake/kerberos5/usr.bin/kpasswd/Makefile.depend projects/bmake/kerberos5/usr.bin/krb5-config/Makefile.depend projects/bmake/kerberos5/usr.bin/ksu/Makefile.depend projects/bmake/kerberos5/usr.bin/string2key/Makefile.depend projects/bmake/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend projects/bmake/kerberos5/usr.sbin/iprop-log/Makefile.depend projects/bmake/kerberos5/usr.sbin/kstash/Makefile.depend projects/bmake/kerberos5/usr.sbin/ktutil/Makefile.depend projects/bmake/lib/atf/libatf-c++/Makefile.depend projects/bmake/lib/atf/libatf-c/Makefile.depend projects/bmake/lib/bind/bind9/Makefile.depend projects/bmake/lib/bind/dns/Makefile.depend projects/bmake/lib/bind/isc/Makefile.depend projects/bmake/lib/bind/isccc/Makefile.depend projects/bmake/lib/bind/isccfg/Makefile.depend projects/bmake/lib/bind/lwres/Makefile.depend projects/bmake/lib/csu/amd64/Makefile.depend projects/bmake/lib/libalias/libalias/Makefile.depend projects/bmake/lib/libalias/modules/cuseeme/Makefile.depend projects/bmake/lib/libalias/modules/dummy/Makefile.depend projects/bmake/lib/libalias/modules/ftp/Makefile.depend projects/bmake/lib/libalias/modules/irc/Makefile.depend projects/bmake/lib/libalias/modules/nbt/Makefile.depend projects/bmake/lib/libalias/modules/pptp/Makefile.depend projects/bmake/lib/libalias/modules/skinny/Makefile.depend projects/bmake/lib/libalias/modules/smedia/Makefile.depend projects/bmake/lib/libarchive/Makefile.depend projects/bmake/lib/libauditd/Makefile.depend projects/bmake/lib/libbegemot/Makefile.depend projects/bmake/lib/libblocksruntime/Makefile.depend projects/bmake/lib/libbluetooth/Makefile.depend projects/bmake/lib/libbsm/Makefile.depend projects/bmake/lib/libbsnmp/libbsnmp/Makefile.depend projects/bmake/lib/libbz2/Makefile.depend projects/bmake/lib/libc/Makefile.depend projects/bmake/lib/libcalendar/Makefile.depend projects/bmake/lib/libcam/Makefile.depend projects/bmake/lib/libcom_err/Makefile.depend projects/bmake/lib/libcompat/Makefile.depend projects/bmake/lib/libcompiler_rt/Makefile.depend projects/bmake/lib/libcrypt/Makefile.depend projects/bmake/lib/libdevinfo/Makefile.depend projects/bmake/lib/libdevstat/Makefile.depend projects/bmake/lib/libdwarf/Makefile.depend projects/bmake/lib/libedit/Makefile.depend projects/bmake/lib/libedit/edit/readline/Makefile.depend projects/bmake/lib/libelf/Makefile.depend projects/bmake/lib/libexpat/Makefile.depend projects/bmake/lib/libfetch/Makefile.depend projects/bmake/lib/libgeom/Makefile.depend projects/bmake/lib/libgpib/Makefile.depend projects/bmake/lib/libgssapi/Makefile.depend projects/bmake/lib/libipsec/Makefile.depend projects/bmake/lib/libipx/Makefile.depend projects/bmake/lib/libjail/Makefile.depend projects/bmake/lib/libkiconv/Makefile.depend projects/bmake/lib/libkvm/Makefile.depend projects/bmake/lib/liblzma/Makefile.depend projects/bmake/lib/libmagic/Makefile.depend projects/bmake/lib/libmandoc/Makefile.depend projects/bmake/lib/libmd/Makefile.depend projects/bmake/lib/libmemstat/Makefile.depend projects/bmake/lib/libmilter/Makefile.depend projects/bmake/lib/libmp/Makefile.depend projects/bmake/lib/libnetgraph/Makefile.depend projects/bmake/lib/libngatm/Makefile.depend projects/bmake/lib/libopie/Makefile.depend projects/bmake/lib/libpam/libpam/Makefile.depend projects/bmake/lib/libpam/modules/pam_chroot/Makefile.depend projects/bmake/lib/libpam/modules/pam_deny/Makefile.depend projects/bmake/lib/libpam/modules/pam_echo/Makefile.depend projects/bmake/lib/libpam/modules/pam_exec/Makefile.depend projects/bmake/lib/libpam/modules/pam_ftpusers/Makefile.depend projects/bmake/lib/libpam/modules/pam_group/Makefile.depend projects/bmake/lib/libpam/modules/pam_guest/Makefile.depend projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend projects/bmake/lib/libpam/modules/pam_lastlog/Makefile.depend projects/bmake/lib/libpam/modules/pam_login_access/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_permit/Makefile.depend projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend projects/bmake/lib/libpam/modules/pam_rhosts/Makefile.depend projects/bmake/lib/libpam/modules/pam_rootok/Makefile.depend projects/bmake/lib/libpam/modules/pam_securetty/Makefile.depend projects/bmake/lib/libpam/modules/pam_self/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 projects/bmake/lib/libpcap/Makefile.depend projects/bmake/lib/libpmc/Makefile.depend projects/bmake/lib/libproc/Makefile.depend projects/bmake/lib/libprocstat/Makefile.depend projects/bmake/lib/libprocstat/zfs/Makefile.depend projects/bmake/lib/libradius/Makefile.depend projects/bmake/lib/librpcsec_gss/Makefile.depend projects/bmake/lib/librpcsvc/Makefile.depend projects/bmake/lib/librt/Makefile.depend projects/bmake/lib/librtld_db/Makefile.depend projects/bmake/lib/libsbuf/Makefile.depend projects/bmake/lib/libsdp/Makefile.depend projects/bmake/lib/libsm/Makefile.depend projects/bmake/lib/libsmdb/Makefile.depend projects/bmake/lib/libsmutil/Makefile.depend projects/bmake/lib/libstand/Makefile.depend projects/bmake/lib/libstdbuf/Makefile.depend projects/bmake/lib/libstdthreads/Makefile.depend projects/bmake/lib/libtacplus/Makefile.depend projects/bmake/lib/libtelnet/Makefile.depend projects/bmake/lib/libthr/Makefile.depend projects/bmake/lib/libthread_db/Makefile.depend projects/bmake/lib/libufs/Makefile.depend projects/bmake/lib/libugidfw/Makefile.depend projects/bmake/lib/libulog/Makefile.depend projects/bmake/lib/libusb/Makefile.depend projects/bmake/lib/libusbhid/Makefile.depend projects/bmake/lib/libutil/Makefile.depend projects/bmake/lib/libvgl/Makefile.depend projects/bmake/lib/libwrap/Makefile.depend projects/bmake/lib/liby/Makefile.depend projects/bmake/lib/libypclnt/Makefile.depend projects/bmake/lib/libz/Makefile.depend projects/bmake/lib/msun/Makefile.depend projects/bmake/lib/ncurses/form/Makefile.depend projects/bmake/lib/ncurses/formw/Makefile.depend projects/bmake/lib/ncurses/menu/Makefile.depend projects/bmake/lib/ncurses/menuw/Makefile.depend projects/bmake/lib/ncurses/ncurses/Makefile.depend projects/bmake/lib/ncurses/ncursesw/Makefile.depend projects/bmake/lib/ncurses/panel/Makefile.depend projects/bmake/lib/ncurses/panelw/Makefile.depend projects/bmake/libexec/atf/atf-check/Makefile.depend projects/bmake/libexec/atrun/Makefile.depend projects/bmake/libexec/bootpd/bootpgw/Makefile.depend projects/bmake/libexec/bootpd/tools/bootpef/Makefile.depend projects/bmake/libexec/bootpd/tools/bootptest/Makefile.depend projects/bmake/libexec/comsat/Makefile.depend projects/bmake/libexec/fingerd/Makefile.depend projects/bmake/libexec/ftpd/Makefile.depend projects/bmake/libexec/getty/Makefile.depend projects/bmake/libexec/mail.local/Makefile.depend projects/bmake/libexec/mknetid/Makefile.depend projects/bmake/libexec/pppoed/Makefile.depend projects/bmake/libexec/rbootd/Makefile.depend projects/bmake/libexec/revnetgroup/Makefile.depend projects/bmake/libexec/rlogind/Makefile.depend projects/bmake/libexec/rpc.rquotad/Makefile.depend projects/bmake/libexec/rpc.rstatd/Makefile.depend projects/bmake/libexec/rpc.rusersd/Makefile.depend projects/bmake/libexec/rpc.rwalld/Makefile.depend projects/bmake/libexec/rpc.sprayd/Makefile.depend projects/bmake/libexec/rshd/Makefile.depend projects/bmake/libexec/rtld-elf/Makefile.depend projects/bmake/libexec/smrsh/Makefile.depend projects/bmake/libexec/talkd/Makefile.depend projects/bmake/libexec/tcpd/Makefile.depend projects/bmake/libexec/telnetd/Makefile.depend projects/bmake/libexec/tftp-proxy/Makefile.depend projects/bmake/libexec/tftpd/Makefile.depend projects/bmake/libexec/ulog-helper/Makefile.depend projects/bmake/libexec/ypxfr/Makefile.depend projects/bmake/pkgs/pseudo/bin/Makefile.depend projects/bmake/pkgs/pseudo/cddl/Makefile.depend projects/bmake/pkgs/pseudo/clang/Makefile.depend projects/bmake/pkgs/pseudo/games/Makefile.depend projects/bmake/pkgs/pseudo/gcc/Makefile.depend projects/bmake/pkgs/pseudo/gnu/Makefile.depend projects/bmake/pkgs/pseudo/include/Makefile.depend projects/bmake/pkgs/pseudo/kerberos5/Makefile.depend projects/bmake/pkgs/pseudo/lib/Makefile.depend projects/bmake/pkgs/pseudo/libexec/Makefile.depend projects/bmake/pkgs/pseudo/misc/Makefile.depend projects/bmake/pkgs/pseudo/sbin/Makefile.depend projects/bmake/pkgs/pseudo/secure/Makefile.depend projects/bmake/pkgs/pseudo/share/Makefile.depend projects/bmake/pkgs/pseudo/the-lot/Makefile.depend projects/bmake/pkgs/pseudo/usr.bin/Makefile.depend projects/bmake/pkgs/pseudo/usr.sbin/Makefile.depend projects/bmake/sbin/adjkerntz/Makefile.depend projects/bmake/sbin/atacontrol/Makefile.depend projects/bmake/sbin/atm/atmconfig/Makefile.depend projects/bmake/sbin/badsect/Makefile.depend projects/bmake/sbin/bsdlabel/Makefile.depend projects/bmake/sbin/camcontrol/Makefile.depend projects/bmake/sbin/ccdconfig/Makefile.depend projects/bmake/sbin/clri/Makefile.depend projects/bmake/sbin/comcontrol/Makefile.depend projects/bmake/sbin/conscontrol/Makefile.depend projects/bmake/sbin/ddb/Makefile.depend projects/bmake/sbin/devd/Makefile.depend projects/bmake/sbin/devfs/Makefile.depend projects/bmake/sbin/dhclient/Makefile.depend projects/bmake/sbin/dmesg/Makefile.depend projects/bmake/sbin/dump/Makefile.depend projects/bmake/sbin/dumpfs/Makefile.depend projects/bmake/sbin/dumpon/Makefile.depend projects/bmake/sbin/etherswitchcfg/Makefile.depend projects/bmake/sbin/fdisk/Makefile.depend projects/bmake/sbin/ffsinfo/Makefile.depend projects/bmake/sbin/fsck/Makefile.depend projects/bmake/sbin/fsck_ffs/Makefile.depend projects/bmake/sbin/fsck_msdosfs/Makefile.depend projects/bmake/sbin/fsdb/Makefile.depend projects/bmake/sbin/fsirand/Makefile.depend projects/bmake/sbin/gbde/Makefile.depend projects/bmake/sbin/geom/class/cache/Makefile.depend projects/bmake/sbin/geom/class/concat/Makefile.depend projects/bmake/sbin/geom/class/eli/Makefile.depend projects/bmake/sbin/geom/class/journal/Makefile.depend projects/bmake/sbin/geom/class/label/Makefile.depend projects/bmake/sbin/geom/class/mirror/Makefile.depend projects/bmake/sbin/geom/class/mountver/Makefile.depend projects/bmake/sbin/geom/class/multipath/Makefile.depend projects/bmake/sbin/geom/class/nop/Makefile.depend projects/bmake/sbin/geom/class/part/Makefile.depend projects/bmake/sbin/geom/class/raid/Makefile.depend projects/bmake/sbin/geom/class/raid3/Makefile.depend projects/bmake/sbin/geom/class/sched/Makefile.depend projects/bmake/sbin/geom/class/shsec/Makefile.depend projects/bmake/sbin/geom/class/stripe/Makefile.depend projects/bmake/sbin/geom/class/virstor/Makefile.depend projects/bmake/sbin/geom/core/Makefile.depend projects/bmake/sbin/ggate/ggatec/Makefile.depend projects/bmake/sbin/ggate/ggated/Makefile.depend projects/bmake/sbin/ggate/ggatel/Makefile.depend projects/bmake/sbin/growfs/Makefile.depend projects/bmake/sbin/gvinum/Makefile.depend projects/bmake/sbin/hastctl/Makefile.depend projects/bmake/sbin/hastd/Makefile.depend projects/bmake/sbin/ifconfig/Makefile.depend projects/bmake/sbin/init/Makefile.depend projects/bmake/sbin/ipf/ipf/Makefile.depend projects/bmake/sbin/ipf/ipfs/Makefile.depend projects/bmake/sbin/ipf/ipfstat/Makefile.depend projects/bmake/sbin/ipf/ipftest/Makefile.depend projects/bmake/sbin/ipf/ipmon/Makefile.depend projects/bmake/sbin/ipf/ipnat/Makefile.depend projects/bmake/sbin/ipf/ippool/Makefile.depend projects/bmake/sbin/ipf/ipresend/Makefile.depend projects/bmake/sbin/ipf/libipf/Makefile.depend projects/bmake/sbin/ipfw/Makefile.depend projects/bmake/sbin/iscontrol/Makefile.depend projects/bmake/sbin/kldconfig/Makefile.depend projects/bmake/sbin/kldload/Makefile.depend projects/bmake/sbin/kldstat/Makefile.depend projects/bmake/sbin/kldunload/Makefile.depend projects/bmake/sbin/ldconfig/Makefile.depend projects/bmake/sbin/md5/Makefile.depend projects/bmake/sbin/mdconfig/Makefile.depend projects/bmake/sbin/mdmfs/Makefile.depend projects/bmake/sbin/mknod/Makefile.depend projects/bmake/sbin/mksnap_ffs/Makefile.depend projects/bmake/sbin/mount/Makefile.depend projects/bmake/sbin/mount_cd9660/Makefile.depend projects/bmake/sbin/mount_fusefs/Makefile.depend projects/bmake/sbin/mount_msdosfs/Makefile.depend projects/bmake/sbin/mount_nfs/Makefile.depend projects/bmake/sbin/mount_nullfs/Makefile.depend projects/bmake/sbin/mount_udf/Makefile.depend projects/bmake/sbin/mount_unionfs/Makefile.depend projects/bmake/sbin/natd/Makefile.depend projects/bmake/sbin/newfs/Makefile.depend projects/bmake/sbin/newfs_msdos/Makefile.depend projects/bmake/sbin/nfsiod/Makefile.depend projects/bmake/sbin/nos-tun/Makefile.depend projects/bmake/sbin/nvmecontrol/Makefile.depend projects/bmake/sbin/pfctl/Makefile.depend projects/bmake/sbin/pflogd/Makefile.depend projects/bmake/sbin/ping/Makefile.depend projects/bmake/sbin/ping6/Makefile.depend projects/bmake/sbin/quotacheck/Makefile.depend projects/bmake/sbin/rcorder/Makefile.depend projects/bmake/sbin/reboot/Makefile.depend projects/bmake/sbin/recoverdisk/Makefile.depend projects/bmake/sbin/resolvconf/Makefile.depend projects/bmake/sbin/restore/Makefile.depend projects/bmake/sbin/route/Makefile.depend projects/bmake/sbin/routed/rtquery/Makefile.depend projects/bmake/sbin/rtsol/Makefile.depend projects/bmake/sbin/savecore/Makefile.depend projects/bmake/sbin/setkey/Makefile.depend projects/bmake/sbin/shutdown/Makefile.depend projects/bmake/sbin/spppcontrol/Makefile.depend projects/bmake/sbin/swapon/Makefile.depend projects/bmake/sbin/sysctl/Makefile.depend projects/bmake/sbin/tunefs/Makefile.depend projects/bmake/sbin/umount/Makefile.depend projects/bmake/secure/lib/libcrypto/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libaep/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libatalla/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libchil/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libcswift/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libgost/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libnuron/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libsureware/Makefile.depend projects/bmake/secure/lib/libcrypto/engines/libubsec/Makefile.depend projects/bmake/secure/lib/libssh/Makefile.depend projects/bmake/secure/lib/libssl/Makefile.depend projects/bmake/secure/libexec/sftp-server/Makefile.depend projects/bmake/secure/libexec/ssh-keysign/Makefile.depend projects/bmake/secure/libexec/ssh-pkcs11-helper/Makefile.depend projects/bmake/secure/usr.bin/bdes/Makefile.depend projects/bmake/secure/usr.bin/openssl/Makefile.depend projects/bmake/secure/usr.bin/scp/Makefile.depend projects/bmake/secure/usr.bin/sftp/Makefile.depend projects/bmake/secure/usr.bin/ssh-add/Makefile.depend projects/bmake/secure/usr.bin/ssh-agent/Makefile.depend projects/bmake/secure/usr.bin/ssh-keygen/Makefile.depend projects/bmake/secure/usr.bin/ssh-keyscan/Makefile.depend projects/bmake/secure/usr.bin/ssh/Makefile.depend projects/bmake/secure/usr.sbin/sshd/Makefile.depend projects/bmake/share/colldef/Makefile.depend projects/bmake/share/examples/ipfilter/Makefile.depend projects/bmake/share/man/man1/Makefile.depend projects/bmake/share/man/man3/Makefile.depend projects/bmake/share/man/man4/Makefile.depend projects/bmake/share/man/man5/Makefile.depend projects/bmake/share/man/man6/Makefile.depend projects/bmake/share/man/man7/Makefile.depend projects/bmake/share/man/man8/Makefile.depend projects/bmake/share/man/man9/Makefile.depend projects/bmake/share/me/Makefile.depend projects/bmake/share/mklocale/Makefile.depend projects/bmake/share/monetdef/Makefile.depend projects/bmake/share/msgdef/Makefile.depend projects/bmake/share/numericdef/Makefile.depend projects/bmake/share/syscons/scrnmaps/Makefile.depend projects/bmake/share/tabset/Makefile.depend projects/bmake/share/termcap/Makefile.depend projects/bmake/share/timedef/Makefile.depend projects/bmake/share/zoneinfo/Makefile.depend projects/bmake/usr.bin/apply/Makefile.depend projects/bmake/usr.bin/ar/Makefile.depend projects/bmake/usr.bin/asa/Makefile.depend projects/bmake/usr.bin/at/Makefile.depend projects/bmake/usr.bin/atf/atf-config/Makefile.depend projects/bmake/usr.bin/atf/atf-report/Makefile.depend projects/bmake/usr.bin/atf/atf-run/Makefile.depend projects/bmake/usr.bin/atf/atf-sh/Makefile.depend projects/bmake/usr.bin/atf/atf-version/Makefile.depend projects/bmake/usr.bin/atm/sscop/Makefile.depend projects/bmake/usr.bin/awk/Makefile.depend projects/bmake/usr.bin/banner/Makefile.depend projects/bmake/usr.bin/basename/Makefile.depend projects/bmake/usr.bin/bc/Makefile.depend projects/bmake/usr.bin/biff/Makefile.depend projects/bmake/usr.bin/bluetooth/bthost/Makefile.depend projects/bmake/usr.bin/bluetooth/btsockstat/Makefile.depend projects/bmake/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend projects/bmake/usr.bin/bmake/Makefile.depend projects/bmake/usr.bin/brandelf/Makefile.depend projects/bmake/usr.bin/bsdiff/bsdiff/Makefile.depend projects/bmake/usr.bin/bsdiff/bspatch/Makefile.depend projects/bmake/usr.bin/bzip2/Makefile.depend projects/bmake/usr.bin/bzip2recover/Makefile.depend projects/bmake/usr.bin/c89/Makefile.depend projects/bmake/usr.bin/c99/Makefile.depend projects/bmake/usr.bin/calendar/Makefile.depend projects/bmake/usr.bin/cap_mkdb/Makefile.depend projects/bmake/usr.bin/catman/Makefile.depend projects/bmake/usr.bin/chat/Makefile.depend projects/bmake/usr.bin/checknr/Makefile.depend projects/bmake/usr.bin/chkey/Makefile.depend projects/bmake/usr.bin/chpass/Makefile.depend projects/bmake/usr.bin/cksum/Makefile.depend projects/bmake/usr.bin/cmp/Makefile.depend projects/bmake/usr.bin/col/Makefile.depend projects/bmake/usr.bin/colcrt/Makefile.depend projects/bmake/usr.bin/colldef/Makefile.depend projects/bmake/usr.bin/colrm/Makefile.depend projects/bmake/usr.bin/column/Makefile.depend projects/bmake/usr.bin/comm/Makefile.depend projects/bmake/usr.bin/compile_et/Makefile.depend projects/bmake/usr.bin/compress/Makefile.depend projects/bmake/usr.bin/cpio/Makefile.depend projects/bmake/usr.bin/cpuset/Makefile.depend projects/bmake/usr.bin/csplit/Makefile.depend projects/bmake/usr.bin/csup/Makefile.depend projects/bmake/usr.bin/ctags/Makefile.depend projects/bmake/usr.bin/ctlstat/Makefile.depend projects/bmake/usr.bin/cut/Makefile.depend projects/bmake/usr.bin/dc/Makefile.depend projects/bmake/usr.bin/dig/Makefile.depend projects/bmake/usr.bin/dirname/Makefile.depend projects/bmake/usr.bin/du/Makefile.depend projects/bmake/usr.bin/ee/Makefile.depend projects/bmake/usr.bin/elf2aout/Makefile.depend projects/bmake/usr.bin/elfdump/Makefile.depend projects/bmake/usr.bin/enigma/Makefile.depend projects/bmake/usr.bin/env/Makefile.depend projects/bmake/usr.bin/expand/Makefile.depend projects/bmake/usr.bin/false/Makefile.depend projects/bmake/usr.bin/fetch/Makefile.depend projects/bmake/usr.bin/file/Makefile.depend projects/bmake/usr.bin/file2c/Makefile.depend projects/bmake/usr.bin/find/Makefile.depend projects/bmake/usr.bin/finger/Makefile.depend projects/bmake/usr.bin/fmt/Makefile.depend projects/bmake/usr.bin/fold/Makefile.depend projects/bmake/usr.bin/from/Makefile.depend projects/bmake/usr.bin/fstat/Makefile.depend projects/bmake/usr.bin/fsync/Makefile.depend projects/bmake/usr.bin/ftp/Makefile.depend projects/bmake/usr.bin/gcore/Makefile.depend projects/bmake/usr.bin/gencat/Makefile.depend projects/bmake/usr.bin/getconf/Makefile.depend projects/bmake/usr.bin/getent/Makefile.depend projects/bmake/usr.bin/getopt/Makefile.depend projects/bmake/usr.bin/gprof/Makefile.depend projects/bmake/usr.bin/grep/Makefile.depend projects/bmake/usr.bin/gzip/Makefile.depend projects/bmake/usr.bin/head/Makefile.depend projects/bmake/usr.bin/hexdump/Makefile.depend projects/bmake/usr.bin/host/Makefile.depend projects/bmake/usr.bin/id/Makefile.depend projects/bmake/usr.bin/indent/Makefile.depend projects/bmake/usr.bin/ipcrm/Makefile.depend projects/bmake/usr.bin/ipcs/Makefile.depend projects/bmake/usr.bin/join/Makefile.depend projects/bmake/usr.bin/jot/Makefile.depend projects/bmake/usr.bin/kdump/Makefile.depend projects/bmake/usr.bin/keylogin/Makefile.depend projects/bmake/usr.bin/keylogout/Makefile.depend projects/bmake/usr.bin/killall/Makefile.depend projects/bmake/usr.bin/ktrace/Makefile.depend projects/bmake/usr.bin/ktrdump/Makefile.depend projects/bmake/usr.bin/lam/Makefile.depend projects/bmake/usr.bin/last/Makefile.depend projects/bmake/usr.bin/lastcomm/Makefile.depend projects/bmake/usr.bin/ldd/Makefile.depend projects/bmake/usr.bin/leave/Makefile.depend projects/bmake/usr.bin/less/Makefile.depend projects/bmake/usr.bin/lessecho/Makefile.depend projects/bmake/usr.bin/lesskey/Makefile.depend projects/bmake/usr.bin/lex/lib/Makefile.depend projects/bmake/usr.bin/limits/Makefile.depend projects/bmake/usr.bin/locale/Makefile.depend projects/bmake/usr.bin/locate/bigram/Makefile.depend projects/bmake/usr.bin/locate/code/Makefile.depend projects/bmake/usr.bin/locate/locate/Makefile.depend projects/bmake/usr.bin/lock/Makefile.depend projects/bmake/usr.bin/lockf/Makefile.depend projects/bmake/usr.bin/logger/Makefile.depend projects/bmake/usr.bin/login/Makefile.depend projects/bmake/usr.bin/logins/Makefile.depend projects/bmake/usr.bin/logname/Makefile.depend projects/bmake/usr.bin/look/Makefile.depend projects/bmake/usr.bin/lorder/Makefile.depend projects/bmake/usr.bin/lsvfs/Makefile.depend projects/bmake/usr.bin/lzmainfo/Makefile.depend projects/bmake/usr.bin/m4/Makefile.depend projects/bmake/usr.bin/mail/Makefile.depend projects/bmake/usr.bin/makewhatis/Makefile.depend projects/bmake/usr.bin/man/Makefile.depend projects/bmake/usr.bin/mandoc/Makefile.depend projects/bmake/usr.bin/mesg/Makefile.depend projects/bmake/usr.bin/minigzip/Makefile.depend projects/bmake/usr.bin/ministat/Makefile.depend projects/bmake/usr.bin/mkdep/Makefile.depend projects/bmake/usr.bin/mkfifo/Makefile.depend projects/bmake/usr.bin/mklocale/Makefile.depend projects/bmake/usr.bin/mkstr/Makefile.depend projects/bmake/usr.bin/mktemp/Makefile.depend projects/bmake/usr.bin/mkulzma/Makefile.depend projects/bmake/usr.bin/mkuzip/Makefile.depend projects/bmake/usr.bin/msgs/Makefile.depend projects/bmake/usr.bin/mt/Makefile.depend projects/bmake/usr.bin/nc/Makefile.depend projects/bmake/usr.bin/ncal/Makefile.depend projects/bmake/usr.bin/netstat/Makefile.depend projects/bmake/usr.bin/newgrp/Makefile.depend projects/bmake/usr.bin/newkey/Makefile.depend projects/bmake/usr.bin/nfsstat/Makefile.depend projects/bmake/usr.bin/nice/Makefile.depend projects/bmake/usr.bin/nl/Makefile.depend projects/bmake/usr.bin/nohup/Makefile.depend projects/bmake/usr.bin/nslookup/Makefile.depend projects/bmake/usr.bin/nsupdate/Makefile.depend projects/bmake/usr.bin/opieinfo/Makefile.depend projects/bmake/usr.bin/opiekey/Makefile.depend projects/bmake/usr.bin/opiepasswd/Makefile.depend projects/bmake/usr.bin/pagesize/Makefile.depend projects/bmake/usr.bin/passwd/Makefile.depend projects/bmake/usr.bin/paste/Makefile.depend projects/bmake/usr.bin/pathchk/Makefile.depend projects/bmake/usr.bin/perror/Makefile.depend projects/bmake/usr.bin/pr/Makefile.depend projects/bmake/usr.bin/printenv/Makefile.depend projects/bmake/usr.bin/printf/Makefile.depend projects/bmake/usr.bin/procstat/Makefile.depend projects/bmake/usr.bin/quota/Makefile.depend projects/bmake/usr.bin/rctl/Makefile.depend projects/bmake/usr.bin/renice/Makefile.depend projects/bmake/usr.bin/rev/Makefile.depend projects/bmake/usr.bin/revoke/Makefile.depend projects/bmake/usr.bin/rlogin/Makefile.depend projects/bmake/usr.bin/rpcgen/Makefile.depend projects/bmake/usr.bin/rpcinfo/Makefile.depend projects/bmake/usr.bin/rs/Makefile.depend projects/bmake/usr.bin/rsh/Makefile.depend projects/bmake/usr.bin/rup/Makefile.depend projects/bmake/usr.bin/ruptime/Makefile.depend projects/bmake/usr.bin/rusers/Makefile.depend projects/bmake/usr.bin/rwall/Makefile.depend projects/bmake/usr.bin/rwho/Makefile.depend projects/bmake/usr.bin/script/Makefile.depend projects/bmake/usr.bin/sed/Makefile.depend projects/bmake/usr.bin/seq/Makefile.depend projects/bmake/usr.bin/shar/Makefile.depend projects/bmake/usr.bin/showmount/Makefile.depend projects/bmake/usr.bin/sockstat/Makefile.depend projects/bmake/usr.bin/sort/Makefile.depend projects/bmake/usr.bin/split/Makefile.depend projects/bmake/usr.bin/ssh-copy-id/Makefile.depend projects/bmake/usr.bin/stat/Makefile.depend projects/bmake/usr.bin/stdbuf/Makefile.depend projects/bmake/usr.bin/su/Makefile.depend projects/bmake/usr.bin/systat/Makefile.depend projects/bmake/usr.bin/tabs/Makefile.depend projects/bmake/usr.bin/tail/Makefile.depend projects/bmake/usr.bin/talk/Makefile.depend projects/bmake/usr.bin/tar/Makefile.depend projects/bmake/usr.bin/tcopy/Makefile.depend projects/bmake/usr.bin/tee/Makefile.depend projects/bmake/usr.bin/telnet/Makefile.depend projects/bmake/usr.bin/tftp/Makefile.depend projects/bmake/usr.bin/time/Makefile.depend projects/bmake/usr.bin/tip/tip/Makefile.depend projects/bmake/usr.bin/top/Makefile.depend projects/bmake/usr.bin/touch/Makefile.depend projects/bmake/usr.bin/tput/Makefile.depend projects/bmake/usr.bin/tr/Makefile.depend projects/bmake/usr.bin/true/Makefile.depend projects/bmake/usr.bin/truncate/Makefile.depend projects/bmake/usr.bin/truss/Makefile.depend.amd64 projects/bmake/usr.bin/tset/Makefile.depend projects/bmake/usr.bin/tsort/Makefile.depend projects/bmake/usr.bin/tty/Makefile.depend projects/bmake/usr.bin/ul/Makefile.depend projects/bmake/usr.bin/uname/Makefile.depend projects/bmake/usr.bin/unexpand/Makefile.depend projects/bmake/usr.bin/unifdef/Makefile.depend projects/bmake/usr.bin/uniq/Makefile.depend projects/bmake/usr.bin/units/Makefile.depend projects/bmake/usr.bin/unvis/Makefile.depend projects/bmake/usr.bin/unzip/Makefile.depend projects/bmake/usr.bin/usbhidaction/Makefile.depend projects/bmake/usr.bin/usbhidctl/Makefile.depend projects/bmake/usr.bin/users/Makefile.depend projects/bmake/usr.bin/uudecode/Makefile.depend projects/bmake/usr.bin/uuencode/Makefile.depend projects/bmake/usr.bin/vacation/Makefile.depend projects/bmake/usr.bin/vgrind/Makefile.depend projects/bmake/usr.bin/vi/Makefile.depend projects/bmake/usr.bin/vis/Makefile.depend projects/bmake/usr.bin/vmstat/Makefile.depend projects/bmake/usr.bin/w/Makefile.depend projects/bmake/usr.bin/wall/Makefile.depend projects/bmake/usr.bin/wc/Makefile.depend projects/bmake/usr.bin/what/Makefile.depend projects/bmake/usr.bin/whereis/Makefile.depend projects/bmake/usr.bin/which/Makefile.depend projects/bmake/usr.bin/who/Makefile.depend projects/bmake/usr.bin/whois/Makefile.depend projects/bmake/usr.bin/write/Makefile.depend projects/bmake/usr.bin/xargs/Makefile.depend projects/bmake/usr.bin/xinstall/Makefile.depend projects/bmake/usr.bin/xlint/lint1/Makefile.depend projects/bmake/usr.bin/xlint/lint2/Makefile.depend projects/bmake/usr.bin/xlint/llib/Makefile.depend projects/bmake/usr.bin/xlint/xlint/Makefile.depend projects/bmake/usr.bin/xstr/Makefile.depend projects/bmake/usr.bin/xz/Makefile.depend projects/bmake/usr.bin/xzdec/Makefile.depend projects/bmake/usr.bin/yacc/Makefile.depend projects/bmake/usr.bin/yes/Makefile.depend projects/bmake/usr.bin/ypcat/Makefile.depend projects/bmake/usr.bin/ypmatch/Makefile.depend projects/bmake/usr.bin/ypwhich/Makefile.depend projects/bmake/usr.sbin/IPXrouted/Makefile.depend projects/bmake/usr.sbin/ac/Makefile.depend projects/bmake/usr.sbin/accton/Makefile.depend projects/bmake/usr.sbin/acpi/acpiconf/Makefile.depend projects/bmake/usr.sbin/acpi/acpidb/Makefile.depend projects/bmake/usr.sbin/acpi/acpidump/Makefile.depend projects/bmake/usr.sbin/acpi/iasl/Makefile.depend projects/bmake/usr.sbin/adduser/Makefile.depend projects/bmake/usr.sbin/amd/amd/Makefile.depend projects/bmake/usr.sbin/amd/amq/Makefile.depend projects/bmake/usr.sbin/amd/fixmount/Makefile.depend projects/bmake/usr.sbin/amd/fsinfo/Makefile.depend projects/bmake/usr.sbin/amd/hlfsd/Makefile.depend projects/bmake/usr.sbin/amd/include/Makefile.depend projects/bmake/usr.sbin/amd/libamu/Makefile.depend projects/bmake/usr.sbin/amd/mk-amd-map/Makefile.depend projects/bmake/usr.sbin/amd/pawd/Makefile.depend projects/bmake/usr.sbin/amd/scripts/Makefile.depend projects/bmake/usr.sbin/amd/wire-test/Makefile.depend projects/bmake/usr.sbin/ancontrol/Makefile.depend projects/bmake/usr.sbin/apm/Makefile.depend projects/bmake/usr.sbin/arp/Makefile.depend projects/bmake/usr.sbin/arpaname/Makefile.depend projects/bmake/usr.sbin/asf/Makefile.depend projects/bmake/usr.sbin/audit/Makefile.depend projects/bmake/usr.sbin/auditd/Makefile.depend projects/bmake/usr.sbin/auditreduce/Makefile.depend projects/bmake/usr.sbin/authpf/Makefile.depend projects/bmake/usr.sbin/bluetooth/ath3kfw/Makefile.depend projects/bmake/usr.sbin/bluetooth/bcmfw/Makefile.depend projects/bmake/usr.sbin/bluetooth/bt3cfw/Makefile.depend projects/bmake/usr.sbin/bluetooth/bthidcontrol/Makefile.depend projects/bmake/usr.sbin/bluetooth/bthidd/Makefile.depend projects/bmake/usr.sbin/bluetooth/btpand/Makefile.depend projects/bmake/usr.sbin/bluetooth/hccontrol/Makefile.depend projects/bmake/usr.sbin/bluetooth/hcsecd/Makefile.depend projects/bmake/usr.sbin/bluetooth/hcseriald/Makefile.depend projects/bmake/usr.sbin/bluetooth/l2control/Makefile.depend projects/bmake/usr.sbin/bluetooth/l2ping/Makefile.depend projects/bmake/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend projects/bmake/usr.sbin/bluetooth/sdpcontrol/Makefile.depend projects/bmake/usr.sbin/bluetooth/sdpd/Makefile.depend projects/bmake/usr.sbin/boot0cfg/Makefile.depend projects/bmake/usr.sbin/bootparamd/bootparamd/Makefile.depend projects/bmake/usr.sbin/bootparamd/callbootd/Makefile.depend projects/bmake/usr.sbin/bsdinstall/distextract/Makefile.depend projects/bmake/usr.sbin/bsdinstall/distfetch/Makefile.depend projects/bmake/usr.sbin/bsdinstall/partedit/Makefile.depend projects/bmake/usr.sbin/bsnmpd/bsnmpd/Makefile.depend projects/bmake/usr.sbin/bsnmpd/gensnmptree/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend projects/bmake/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend projects/bmake/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend projects/bmake/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend projects/bmake/usr.sbin/btxld/Makefile.depend projects/bmake/usr.sbin/burncd/Makefile.depend projects/bmake/usr.sbin/cdcontrol/Makefile.depend projects/bmake/usr.sbin/chkgrp/Makefile.depend projects/bmake/usr.sbin/chown/Makefile.depend projects/bmake/usr.sbin/chroot/Makefile.depend projects/bmake/usr.sbin/ckdist/Makefile.depend projects/bmake/usr.sbin/clear_locks/Makefile.depend projects/bmake/usr.sbin/config/Makefile.depend projects/bmake/usr.sbin/cpucontrol/Makefile.depend projects/bmake/usr.sbin/crashinfo/Makefile.depend projects/bmake/usr.sbin/cron/cron/Makefile.depend projects/bmake/usr.sbin/cron/crontab/Makefile.depend projects/bmake/usr.sbin/cron/lib/Makefile.depend projects/bmake/usr.sbin/crunch/crunchgen/Makefile.depend projects/bmake/usr.sbin/crunch/crunchide/Makefile.depend projects/bmake/usr.sbin/ctladm/Makefile.depend projects/bmake/usr.sbin/ctm/ctm/Makefile.depend projects/bmake/usr.sbin/ctm/ctm_dequeue/Makefile.depend projects/bmake/usr.sbin/ctm/ctm_rmail/Makefile.depend projects/bmake/usr.sbin/ctm/ctm_smail/Makefile.depend projects/bmake/usr.sbin/daemon/Makefile.depend projects/bmake/usr.sbin/dconschat/Makefile.depend projects/bmake/usr.sbin/ddns-confgen/Makefile.depend projects/bmake/usr.sbin/devinfo/Makefile.depend projects/bmake/usr.sbin/digictl/Makefile.depend projects/bmake/usr.sbin/diskinfo/Makefile.depend projects/bmake/usr.sbin/dnssec-dsfromkey/Makefile.depend projects/bmake/usr.sbin/dnssec-keyfromlabel/Makefile.depend projects/bmake/usr.sbin/dnssec-keygen/Makefile.depend projects/bmake/usr.sbin/dnssec-revoke/Makefile.depend projects/bmake/usr.sbin/dnssec-settime/Makefile.depend projects/bmake/usr.sbin/dnssec-signzone/Makefile.depend projects/bmake/usr.sbin/dumpcis/Makefile.depend projects/bmake/usr.sbin/editmap/Makefile.depend projects/bmake/usr.sbin/edquota/Makefile.depend projects/bmake/usr.sbin/etcupdate/Makefile.depend projects/bmake/usr.sbin/extattr/Makefile.depend projects/bmake/usr.sbin/extattrctl/Makefile.depend projects/bmake/usr.sbin/faithd/Makefile.depend projects/bmake/usr.sbin/fdcontrol/Makefile.depend projects/bmake/usr.sbin/fdformat/Makefile.depend projects/bmake/usr.sbin/fdread/Makefile.depend projects/bmake/usr.sbin/fdwrite/Makefile.depend projects/bmake/usr.sbin/fifolog/fifolog_create/Makefile.depend projects/bmake/usr.sbin/fifolog/fifolog_reader/Makefile.depend projects/bmake/usr.sbin/fifolog/fifolog_writer/Makefile.depend projects/bmake/usr.sbin/fifolog/lib/Makefile.depend projects/bmake/usr.sbin/flowctl/Makefile.depend projects/bmake/usr.sbin/freebsd-update/Makefile.depend projects/bmake/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend projects/bmake/usr.sbin/ftp-proxy/libevent/Makefile.depend projects/bmake/usr.sbin/fwcontrol/Makefile.depend projects/bmake/usr.sbin/genrandom/Makefile.depend projects/bmake/usr.sbin/getfmac/Makefile.depend projects/bmake/usr.sbin/getpmac/Makefile.depend projects/bmake/usr.sbin/gpioctl/Makefile.depend projects/bmake/usr.sbin/gssd/Makefile.depend projects/bmake/usr.sbin/gstat/Makefile.depend projects/bmake/usr.sbin/i2c/Makefile.depend projects/bmake/usr.sbin/ifmcstat/Makefile.depend projects/bmake/usr.sbin/inetd/Makefile.depend projects/bmake/usr.sbin/iostat/Makefile.depend projects/bmake/usr.sbin/ip6addrctl/Makefile.depend projects/bmake/usr.sbin/ipfwpcap/Makefile.depend projects/bmake/usr.sbin/isc-hmac-fixup/Makefile.depend projects/bmake/usr.sbin/isfctl/Makefile.depend projects/bmake/usr.sbin/jail/Makefile.depend projects/bmake/usr.sbin/jexec/Makefile.depend projects/bmake/usr.sbin/jls/Makefile.depend projects/bmake/usr.sbin/kbdcontrol/Makefile.depend projects/bmake/usr.sbin/kbdmap/Makefile.depend projects/bmake/usr.sbin/keyserv/Makefile.depend projects/bmake/usr.sbin/kgmon/Makefile.depend projects/bmake/usr.sbin/kldxref/Makefile.depend projects/bmake/usr.sbin/lastlogin/Makefile.depend projects/bmake/usr.sbin/lmcconfig/Makefile.depend projects/bmake/usr.sbin/lpr/chkprintcap/Makefile.depend projects/bmake/usr.sbin/lpr/common_source/Makefile.depend projects/bmake/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend projects/bmake/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend projects/bmake/usr.sbin/lpr/filters/Makefile.depend projects/bmake/usr.sbin/lpr/lp/Makefile.depend projects/bmake/usr.sbin/lpr/lpc/Makefile.depend projects/bmake/usr.sbin/lpr/lpd/Makefile.depend projects/bmake/usr.sbin/lpr/lpq/Makefile.depend projects/bmake/usr.sbin/lpr/lpr/Makefile.depend projects/bmake/usr.sbin/lpr/lprm/Makefile.depend projects/bmake/usr.sbin/lpr/lptest/Makefile.depend projects/bmake/usr.sbin/lpr/pac/Makefile.depend projects/bmake/usr.sbin/lptcontrol/Makefile.depend projects/bmake/usr.sbin/mailstats/Makefile.depend projects/bmake/usr.sbin/mailwrapper/Makefile.depend projects/bmake/usr.sbin/makefs/Makefile.depend projects/bmake/usr.sbin/makemap/Makefile.depend projects/bmake/usr.sbin/manctl/Makefile.depend projects/bmake/usr.sbin/memcontrol/Makefile.depend projects/bmake/usr.sbin/mergemaster/Makefile.depend projects/bmake/usr.sbin/mfiutil/Makefile.depend projects/bmake/usr.sbin/mixer/Makefile.depend projects/bmake/usr.sbin/mld6query/Makefile.depend projects/bmake/usr.sbin/mlxcontrol/Makefile.depend projects/bmake/usr.sbin/mountd/Makefile.depend projects/bmake/usr.sbin/moused/Makefile.depend projects/bmake/usr.sbin/mptable/Makefile.depend projects/bmake/usr.sbin/mptutil/Makefile.depend projects/bmake/usr.sbin/mtest/Makefile.depend projects/bmake/usr.sbin/mtree/Makefile.depend projects/bmake/usr.sbin/named-checkconf/Makefile.depend projects/bmake/usr.sbin/named-checkzone/Makefile.depend projects/bmake/usr.sbin/named-journalprint/Makefile.depend projects/bmake/usr.sbin/named/Makefile.depend projects/bmake/usr.sbin/ndiscvt/Makefile.depend projects/bmake/usr.sbin/ndp/Makefile.depend projects/bmake/usr.sbin/newsyslog/Makefile.depend projects/bmake/usr.sbin/nfscbd/Makefile.depend projects/bmake/usr.sbin/nfsd/Makefile.depend projects/bmake/usr.sbin/nfsdumpstate/Makefile.depend projects/bmake/usr.sbin/nfsrevoke/Makefile.depend projects/bmake/usr.sbin/nfsuserd/Makefile.depend projects/bmake/usr.sbin/ngctl/Makefile.depend projects/bmake/usr.sbin/nghook/Makefile.depend projects/bmake/usr.sbin/nologin/Makefile.depend projects/bmake/usr.sbin/nscd/Makefile.depend projects/bmake/usr.sbin/nsec3hash/Makefile.depend projects/bmake/usr.sbin/ntp/doc/Makefile.depend projects/bmake/usr.sbin/ntp/libntp/Makefile.depend projects/bmake/usr.sbin/ntp/libopts/Makefile.depend projects/bmake/usr.sbin/ntp/libparse/Makefile.depend projects/bmake/usr.sbin/ntp/ntp-keygen/Makefile.depend projects/bmake/usr.sbin/ntp/ntpd/Makefile.depend projects/bmake/usr.sbin/ntp/ntpdate/Makefile.depend projects/bmake/usr.sbin/ntp/ntpdc/Makefile.depend projects/bmake/usr.sbin/ntp/ntpq/Makefile.depend projects/bmake/usr.sbin/ntp/ntptime/Makefile.depend projects/bmake/usr.sbin/ntp/sntp/Makefile.depend projects/bmake/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile.depend projects/bmake/usr.sbin/pciconf/Makefile.depend projects/bmake/usr.sbin/periodic/Makefile.depend projects/bmake/usr.sbin/pkg/Makefile.depend projects/bmake/usr.sbin/pkg_install/add/Makefile.depend projects/bmake/usr.sbin/pkg_install/create/Makefile.depend projects/bmake/usr.sbin/pkg_install/delete/Makefile.depend projects/bmake/usr.sbin/pkg_install/info/Makefile.depend projects/bmake/usr.sbin/pkg_install/lib/Makefile.depend projects/bmake/usr.sbin/pkg_install/updating/Makefile.depend projects/bmake/usr.sbin/pkg_install/version/Makefile.depend projects/bmake/usr.sbin/pmcannotate/Makefile.depend projects/bmake/usr.sbin/pmccontrol/Makefile.depend projects/bmake/usr.sbin/pmcstat/Makefile.depend projects/bmake/usr.sbin/portsnap/make_index/Makefile.depend projects/bmake/usr.sbin/portsnap/phttpget/Makefile.depend projects/bmake/usr.sbin/portsnap/portsnap/Makefile.depend projects/bmake/usr.sbin/powerd/Makefile.depend projects/bmake/usr.sbin/ppp/Makefile.depend projects/bmake/usr.sbin/pppctl/Makefile.depend projects/bmake/usr.sbin/praliases/Makefile.depend projects/bmake/usr.sbin/praudit/Makefile.depend projects/bmake/usr.sbin/procctl/Makefile.depend projects/bmake/usr.sbin/pstat/Makefile.depend projects/bmake/usr.sbin/pw/Makefile.depend projects/bmake/usr.sbin/pwd_mkdb/Makefile.depend projects/bmake/usr.sbin/quot/Makefile.depend projects/bmake/usr.sbin/quotaon/Makefile.depend projects/bmake/usr.sbin/rarpd/Makefile.depend projects/bmake/usr.sbin/repquota/Makefile.depend projects/bmake/usr.sbin/rip6query/Makefile.depend projects/bmake/usr.sbin/rmt/Makefile.depend projects/bmake/usr.sbin/rndc-confgen/Makefile.depend projects/bmake/usr.sbin/rndc/Makefile.depend projects/bmake/usr.sbin/route6d/Makefile.depend projects/bmake/usr.sbin/rpc.lockd/Makefile.depend projects/bmake/usr.sbin/rpc.statd/Makefile.depend projects/bmake/usr.sbin/rpc.umntall/Makefile.depend projects/bmake/usr.sbin/rpc.yppasswdd/Makefile.depend projects/bmake/usr.sbin/rpc.ypupdated/Makefile.depend projects/bmake/usr.sbin/rpc.ypxfrd/Makefile.depend projects/bmake/usr.sbin/rpcbind/Makefile.depend projects/bmake/usr.sbin/rrenumd/Makefile.depend projects/bmake/usr.sbin/rtadvctl/Makefile.depend projects/bmake/usr.sbin/rtadvd/Makefile.depend projects/bmake/usr.sbin/rtprio/Makefile.depend projects/bmake/usr.sbin/rtsold/Makefile.depend projects/bmake/usr.sbin/rwhod/Makefile.depend projects/bmake/usr.sbin/sa/Makefile.depend projects/bmake/usr.sbin/sendmail/Makefile.depend projects/bmake/usr.sbin/service/Makefile.depend projects/bmake/usr.sbin/services_mkdb/Makefile.depend projects/bmake/usr.sbin/setfib/Makefile.depend projects/bmake/usr.sbin/setfmac/Makefile.depend projects/bmake/usr.sbin/setpmac/Makefile.depend projects/bmake/usr.sbin/sicontrol/Makefile.depend projects/bmake/usr.sbin/smbmsg/Makefile.depend projects/bmake/usr.sbin/snapinfo/Makefile.depend projects/bmake/usr.sbin/spkrtest/Makefile.depend projects/bmake/usr.sbin/spray/Makefile.depend projects/bmake/usr.sbin/syslogd/Makefile.depend projects/bmake/usr.sbin/tcpdchk/Makefile.depend projects/bmake/usr.sbin/tcpdmatch/Makefile.depend projects/bmake/usr.sbin/tcpdrop/Makefile.depend projects/bmake/usr.sbin/tcpdump/tcpdump/Makefile.depend projects/bmake/usr.sbin/timed/timed/Makefile.depend projects/bmake/usr.sbin/timed/timedc/Makefile.depend projects/bmake/usr.sbin/traceroute/Makefile.depend projects/bmake/usr.sbin/traceroute6/Makefile.depend projects/bmake/usr.sbin/trpt/Makefile.depend projects/bmake/usr.sbin/tzsetup/Makefile.depend projects/bmake/usr.sbin/uathload/Makefile.depend projects/bmake/usr.sbin/ugidfw/Makefile.depend projects/bmake/usr.sbin/uhsoctl/Makefile.depend projects/bmake/usr.sbin/usbconfig/Makefile.depend projects/bmake/usr.sbin/usbdump/Makefile.depend projects/bmake/usr.sbin/utx/Makefile.depend projects/bmake/usr.sbin/vidcontrol/Makefile.depend projects/bmake/usr.sbin/vipw/Makefile.depend projects/bmake/usr.sbin/wake/Makefile.depend projects/bmake/usr.sbin/watch/Makefile.depend projects/bmake/usr.sbin/watchdogd/Makefile.depend projects/bmake/usr.sbin/wlandebug/Makefile.depend projects/bmake/usr.sbin/wpa/hostapd/Makefile.depend projects/bmake/usr.sbin/wpa/hostapd_cli/Makefile.depend projects/bmake/usr.sbin/wpa/ndis_events/Makefile.depend projects/bmake/usr.sbin/wpa/wpa_cli/Makefile.depend projects/bmake/usr.sbin/wpa/wpa_passphrase/Makefile.depend projects/bmake/usr.sbin/wpa/wpa_supplicant/Makefile.depend projects/bmake/usr.sbin/yp_mkdb/Makefile.depend projects/bmake/usr.sbin/ypbind/Makefile.depend projects/bmake/usr.sbin/yppoll/Makefile.depend projects/bmake/usr.sbin/yppush/Makefile.depend projects/bmake/usr.sbin/ypserv/Makefile.depend projects/bmake/usr.sbin/ypset/Makefile.depend projects/bmake/usr.sbin/zic/zdump/Makefile.depend projects/bmake/usr.sbin/zic/zic/Makefile.depend projects/bmake/usr.sbin/zzz/Makefile.depend Modified: projects/bmake/bin/cat/Makefile.depend ============================================================================== --- projects/bmake/bin/cat/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/cat/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/chflags/Makefile.depend ============================================================================== --- projects/bmake/bin/chflags/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/chflags/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/chio/Makefile.depend ============================================================================== --- projects/bmake/bin/chio/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/chio/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/chmod/Makefile.depend ============================================================================== --- projects/bmake/bin/chmod/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/chmod/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/cp/Makefile.depend ============================================================================== --- projects/bmake/bin/cp/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/cp/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/csh/Makefile.depend ============================================================================== --- projects/bmake/bin/csh/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/csh/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/date/Makefile.depend ============================================================================== --- projects/bmake/bin/date/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/date/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/dd/Makefile.depend ============================================================================== --- projects/bmake/bin/dd/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/dd/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/df/Makefile.depend ============================================================================== --- projects/bmake/bin/df/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/df/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/domainname/Makefile.depend ============================================================================== --- projects/bmake/bin/domainname/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/domainname/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/echo/Makefile.depend ============================================================================== --- projects/bmake/bin/echo/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/echo/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/ed/Makefile.depend ============================================================================== --- projects/bmake/bin/ed/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/ed/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/expr/Makefile.depend ============================================================================== --- projects/bmake/bin/expr/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/expr/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/getfacl/Makefile.depend ============================================================================== --- projects/bmake/bin/getfacl/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/getfacl/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/hostname/Makefile.depend ============================================================================== --- projects/bmake/bin/hostname/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/hostname/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/kenv/Makefile.depend ============================================================================== --- projects/bmake/bin/kenv/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/kenv/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/kill/Makefile.depend ============================================================================== --- projects/bmake/bin/kill/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/kill/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/ln/Makefile.depend ============================================================================== --- projects/bmake/bin/ln/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/ln/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/ls/Makefile.depend ============================================================================== --- projects/bmake/bin/ls/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/ls/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/mkdir/Makefile.depend ============================================================================== --- projects/bmake/bin/mkdir/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/mkdir/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/mv/Makefile.depend ============================================================================== --- projects/bmake/bin/mv/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/mv/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/pax/Makefile.depend ============================================================================== --- projects/bmake/bin/pax/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/pax/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/pkill/Makefile.depend ============================================================================== --- projects/bmake/bin/pkill/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/pkill/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/ps/Makefile.depend ============================================================================== --- projects/bmake/bin/ps/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/ps/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/pwait/Makefile.depend ============================================================================== --- projects/bmake/bin/pwait/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/pwait/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/pwd/Makefile.depend ============================================================================== --- projects/bmake/bin/pwd/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/pwd/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/rcp/Makefile.depend ============================================================================== --- projects/bmake/bin/rcp/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/rcp/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/realpath/Makefile.depend ============================================================================== --- projects/bmake/bin/realpath/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/realpath/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/rm/Makefile.depend ============================================================================== --- projects/bmake/bin/rm/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/rm/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/rmail/Makefile.depend ============================================================================== --- projects/bmake/bin/rmail/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/rmail/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/rmdir/Makefile.depend ============================================================================== --- projects/bmake/bin/rmdir/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/rmdir/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/setfacl/Makefile.depend ============================================================================== --- projects/bmake/bin/setfacl/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/setfacl/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/sh/Makefile.depend ============================================================================== --- projects/bmake/bin/sh/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/sh/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ @@ -70,6 +68,8 @@ main.o: builtins.h main.o: nodes.h main.po: builtins.h main.po: nodes.h +miscbltin.o: syntax.h +miscbltin.po: syntax.h mystring.o: syntax.h mystring.po: syntax.h nodes.o: nodes.c Modified: projects/bmake/bin/sleep/Makefile.depend ============================================================================== --- projects/bmake/bin/sleep/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/sleep/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/stty/Makefile.depend ============================================================================== --- projects/bmake/bin/stty/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/stty/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/sync/Makefile.depend ============================================================================== --- projects/bmake/bin/sync/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/sync/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/test/Makefile.depend ============================================================================== --- projects/bmake/bin/test/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/test/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/bin/uuidgen/Makefile.depend ============================================================================== --- projects/bmake/bin/uuidgen/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/bin/uuidgen/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/lib/drti/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/drti/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/drti/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ include/xlocale \ Modified: projects/bmake/cddl/lib/libavl/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libavl/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libavl/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/lib/libctf/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libctf/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libctf/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/lib/libdtrace/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libdtrace/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libdtrace/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/lib/libnvpair/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libnvpair/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libnvpair/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/lib/libumem/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libumem/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libumem/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/lib/libuutil/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libuutil/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libuutil/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/lib/libzfs/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libzfs/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libzfs/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libumem \ Modified: projects/bmake/cddl/lib/libzpool/Makefile.depend ============================================================================== --- projects/bmake/cddl/lib/libzpool/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/lib/libzpool/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/sbin/zfs/Makefile.depend ============================================================================== --- projects/bmake/cddl/sbin/zfs/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/sbin/zfs/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libumem \ Modified: projects/bmake/cddl/sbin/zpool/Makefile.depend ============================================================================== --- projects/bmake/cddl/sbin/zpool/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/sbin/zpool/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ Modified: projects/bmake/cddl/usr.bin/ctfconvert/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/ctfconvert/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.bin/ctfconvert/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libctf \ gnu/lib/libgcc \ Modified: projects/bmake/cddl/usr.bin/ctfdump/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/ctfdump/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.bin/ctfdump/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/usr.bin/ctfmerge/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/ctfmerge/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.bin/ctfmerge/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libctf \ gnu/lib/libgcc \ Modified: projects/bmake/cddl/usr.bin/sgsmsg/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/sgsmsg/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.bin/sgsmsg/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/cddl/usr.bin/zinject/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/zinject/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.bin/zinject/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libumem \ Modified: projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.bin/zstreamdump/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ Modified: projects/bmake/cddl/usr.bin/ztest/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.bin/ztest/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.bin/ztest/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libavl \ cddl/lib/libnvpair \ Modified: projects/bmake/cddl/usr.sbin/dtrace/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.sbin/dtrace/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.sbin/dtrace/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libctf \ cddl/lib/libdtrace \ Modified: projects/bmake/cddl/usr.sbin/dtruss/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.sbin/dtruss/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.sbin/dtruss/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ Modified: projects/bmake/cddl/usr.sbin/lockstat/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.sbin/lockstat/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.sbin/lockstat/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libctf \ cddl/lib/libdtrace \ Modified: projects/bmake/cddl/usr.sbin/zdb/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.sbin/zdb/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.sbin/zdb/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libumem \ Modified: projects/bmake/cddl/usr.sbin/zhack/Makefile.depend ============================================================================== --- projects/bmake/cddl/usr.sbin/zhack/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/cddl/usr.sbin/zhack/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ cddl/lib/libnvpair \ cddl/lib/libumem \ Modified: projects/bmake/games/bcd/Makefile.depend ============================================================================== --- projects/bmake/games/bcd/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/bcd/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/caesar/Makefile.depend ============================================================================== --- projects/bmake/games/caesar/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/caesar/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/factor/Makefile.depend ============================================================================== --- projects/bmake/games/factor/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/factor/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/fortune/datfiles/Makefile.depend ============================================================================== --- projects/bmake/games/fortune/datfiles/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/fortune/datfiles/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ Modified: projects/bmake/games/fortune/fortune/Makefile.depend ============================================================================== --- projects/bmake/games/fortune/fortune/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/fortune/fortune/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/fortune/strfile/Makefile.depend ============================================================================== --- projects/bmake/games/fortune/strfile/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/fortune/strfile/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/fortune/unstr/Makefile.depend ============================================================================== --- projects/bmake/games/fortune/unstr/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/fortune/unstr/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/grdc/Makefile.depend ============================================================================== --- projects/bmake/games/grdc/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/grdc/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/morse/Makefile.depend ============================================================================== --- projects/bmake/games/morse/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/morse/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/number/Makefile.depend ============================================================================== --- projects/bmake/games/number/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/number/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/pom/Makefile.depend ============================================================================== --- projects/bmake/games/pom/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/pom/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/ppt/Makefile.depend ============================================================================== --- projects/bmake/games/ppt/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/ppt/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/primes/Makefile.depend ============================================================================== --- projects/bmake/games/primes/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/primes/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/games/random/Makefile.depend ============================================================================== --- projects/bmake/games/random/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/games/random/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/gnu/lib/csu/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/csu/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/csu/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ include/xlocale \ Modified: projects/bmake/gnu/lib/libdialog/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libdialog/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libdialog/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/gnu/lib/libgcc/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libgcc/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libgcc/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ include/xlocale \ Modified: projects/bmake/gnu/lib/libgcov/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libgcov/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libgcov/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ include/xlocale \ Modified: projects/bmake/gnu/lib/libgomp/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libgomp/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libgomp/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/gnu/lib/libreadline/readline/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libreadline/readline/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libreadline/readline/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/gnu/lib/libregex/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libregex/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libregex/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/gnu/lib/libssp/libssp_nonshared/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libssp/libssp_nonshared/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libssp/libssp_nonshared/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ Modified: projects/bmake/gnu/lib/libstdc++/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libstdc++/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libstdc++/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ include \ Modified: projects/bmake/gnu/lib/libsupc++/Makefile.depend ============================================================================== --- projects/bmake/gnu/lib/libsupc++/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/lib/libsupc++/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ gnu/lib/libstdc++ \ Modified: projects/bmake/gnu/usr.bin/binutils/addr2line/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/binutils/addr2line/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/usr.bin/binutils/addr2line/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/lib/libgcc \ gnu/usr.bin/binutils/libbfd \ Modified: projects/bmake/gnu/usr.bin/binutils/ar/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/binutils/ar/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/usr.bin/binutils/ar/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/usr.bin/binutils/libbfd \ gnu/usr.bin/binutils/libbinutils \ Modified: projects/bmake/gnu/usr.bin/binutils/as/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/binutils/as/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/usr.bin/binutils/as/Makefile.depend Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/usr.bin/binutils/libbfd \ gnu/usr.bin/binutils/libiberty \ Modified: projects/bmake/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 ============================================================================== --- projects/bmake/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ gnu/usr.bin/binutils/libbfd \ gnu/usr.bin/binutils/libiberty \ Modified: projects/bmake/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64 ============================================================================== --- projects/bmake/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64 Sat Feb 16 01:20:56 2013 (r246867) +++ projects/bmake/gnu/usr.bin/binutils/libbfd/Makefile.depend.amd64 Sat Feb 16 01:23:54 2013 (r246868) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ include/xlocale \ Modified: projects/bmake/gnu/usr.bin/binutils/libbinutils/Makefile.depend ============================================================================== --- projects/bmake/gnu/usr.bin/binutils/libbinutils/Makefile.depend Sat Feb 16 01:20:56 2013 (r246867) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:32:03 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B20BC26A; Sat, 16 Feb 2013 01:32:03 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A544420C; Sat, 16 Feb 2013 01:32:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1W3ug080740; Sat, 16 Feb 2013 01:32:03 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1W3wB080739; Sat, 16 Feb 2013 01:32:03 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160132.r1G1W3wB080739@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:32:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246869 - projects/bmake/include/arpa 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.14 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, 16 Feb 2013 01:32:03 -0000 Author: sjg Date: Sat Feb 16 01:32:03 2013 New Revision: 246869 URL: http://svnweb.freebsd.org/changeset/base/246869 Log: ftpd needs telnet.h so install it regardless Modified: projects/bmake/include/arpa/Makefile Modified: projects/bmake/include/arpa/Makefile ============================================================================== --- projects/bmake/include/arpa/Makefile Sat Feb 16 01:23:54 2013 (r246868) +++ projects/bmake/include/arpa/Makefile Sat Feb 16 01:32:03 2013 (r246869) @@ -3,9 +3,8 @@ .include INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h -.if ${MK_TELNET} == "no" INCS+= telnet.h -.endif + INCSDIR=${INCLUDEDIR}/arpa .include From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 01:36:15 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 482BD3AD; Sat, 16 Feb 2013 01:36:15 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 25645228; Sat, 16 Feb 2013 01:36:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G1aF63081389; Sat, 16 Feb 2013 01:36:15 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G1aFj6081388; Sat, 16 Feb 2013 01:36:15 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160136.r1G1aFj6081388@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 01:36:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246870 - 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.14 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, 16 Feb 2013 01:36:15 -0000 Author: sjg Date: Sat Feb 16 01:36:14 2013 New Revision: 246870 URL: http://svnweb.freebsd.org/changeset/base/246870 Log: Avoid problems with read-only osreldate.h Modified: projects/bmake/include/Makefile Modified: projects/bmake/include/Makefile ============================================================================== --- projects/bmake/include/Makefile Sat Feb 16 01:32:03 2013 (r246869) +++ projects/bmake/include/Makefile Sat Feb 16 01:36:14 2013 (r246870) @@ -99,6 +99,7 @@ osreldate.h: ${.CURDIR}/../sys/conf/newv @MAKE=${MAKE}; \ PARAMFILE=${.CURDIR}/../sys/sys/param.h; \ . ${.CURDIR}/../sys/conf/newvers.sh; \ + rm -f osreldate.h; \ echo "$$COPYRIGHT" > osreldate.h; \ echo "#ifdef _KERNEL" >> osreldate.h; \ echo "#error \" cannot be used in the kernel, use \"" >> osreldate.h; \ From owner-svn-src-projects@FreeBSD.ORG Sat Feb 16 05:22:49 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B373BF4B; Sat, 16 Feb 2013 05:22:49 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8F284A38; Sat, 16 Feb 2013 05:22:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1G5Mno7051404; Sat, 16 Feb 2013 05:22:49 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1G5MnKh051402; Sat, 16 Feb 2013 05:22:49 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201302160522.r1G5MnKh051402@svn.freebsd.org> From: "Simon J. Gerraty" Date: Sat, 16 Feb 2013 05:22:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246871 - projects/bmake/pkgs/pseudo/toolchain 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.14 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, 16 Feb 2013 05:22:49 -0000 Author: sjg Date: Sat Feb 16 05:22:48 2013 New Revision: 246871 URL: http://svnweb.freebsd.org/changeset/base/246871 Log: target to build toolchain Added: projects/bmake/pkgs/pseudo/toolchain/ projects/bmake/pkgs/pseudo/toolchain/Makefile (contents, props changed) projects/bmake/pkgs/pseudo/toolchain/Makefile.depend (contents, props changed) Added: projects/bmake/pkgs/pseudo/toolchain/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/pkgs/pseudo/toolchain/Makefile Sat Feb 16 05:22:48 2013 (r246871) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" Added: projects/bmake/pkgs/pseudo/toolchain/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/pkgs/pseudo/toolchain/Makefile.depend Sat Feb 16 05:22:48 2013 (r246871) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +# This file is not autogenerated - take care! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = \ + pkgs/pseudo/clang \ + pkgs/pseudo/gcc \ + usr.bin/xinstall \ + +.include