From owner-p4-projects@FreeBSD.ORG Mon Sep 7 19:22:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 158241065670; Mon, 7 Sep 2009 19:22:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDA3F106566B for ; Mon, 7 Sep 2009 19:22:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BACF08FC0C for ; Mon, 7 Sep 2009 19:22:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n87JMC45006268 for ; Mon, 7 Sep 2009 19:22:12 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n87JMCiD006266 for perforce@freebsd.org; Mon, 7 Sep 2009 19:22:12 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Sep 2009 19:22:12 GMT Message-Id: <200909071922.n87JMCiD006266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 19:22:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=168293 Change 168293 by trasz@trasz_anger on 2009/09/07 19:22:09 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#40 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/mask.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/intro.2#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/package-split.py#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/mirror/gmirror.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/core/geom.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifgif.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/pts.4#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/pty.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ah_osdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_eeprom_v3.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/null/null.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pty/pty.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_io.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_llatbl.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fastfwd.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#25 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_src.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_output.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ioctl_compat.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttycom.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/01.t#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-nfs4.test#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/tools-posix.test#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tar/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/ndp.c#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#40 (text+ko) ==== @@ -22,13 +22,20 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090825: + The old tunable hw.bus.devctl_disable has been superseded by + hw.bus.devctl_queue. hw.bus.devctl_disable=1 in loader.conf should be + replaced by hw.bus.devctl_queue=0. The default for this new tunable + is 1000. + 20090813: Remove the option STOP_NMI. The default action is now to use NMI only for KDB via the newly introduced function stop_cpus_hard() and maintain stop_cpus() to just use a normal IPI_STOP on ia32 and amd64. 20090803: - stable/8 branch created in subversion. + The stable/8 branch created in subversion. This corresponds to the + RELENG_8 branch in CVS. 20090719: Bump the shared library version numbers for all libraries that do not @@ -964,4 +971,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.636 2009/09/03 17:13:54 imp Exp $ +$FreeBSD: src/UPDATING,v 1.638 2009/09/05 08:09:35 imp Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/mask.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.8 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/mask.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.8 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -254,8 +254,7 @@ if (acl_brand != ACL_BRAND_NFS4) { warnx("%s: branding mismatch; existing ACL is NFSv4, " - "entry to be added is %s", filename, - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + "entry to be added is POSIX.1e", filename); return (-1); } @@ -269,10 +268,7 @@ entry_id = ACL_NEXT_ENTRY; if (acl_create_entry_np(&acl_new, &entry_new, entry_number) == -1) { - if (entry_number >= acl_new->ats_acl.acl_cnt) - warnx("%s: invalid entry number", filename); - else - warn("%s: acl_create_entry_np() failed", filename); + warn("%s: acl_create_entry_np() failed", filename); acl_free(acl_new); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.6 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -130,11 +130,7 @@ if (acl_delete_entry_np(acl_new, entry_number) == -1) { carried_error++; - - if (entry_number >= (uint)acl_new->ats_acl.acl_cnt) - warnx("%s: invalid entry number", filename); - else - warn("%s: acl_delete_entry_np() failed", filename); + warn("%s: acl_delete_entry_np() failed", filename); } acl_free(*prev_acl); @@ -152,6 +148,7 @@ int remove_default(acl_t *prev_acl, const char *filename) { + acl_free(*prev_acl); *prev_acl = acl_init(ACL_MAX_ENTRIES); if (*prev_acl == NULL) @@ -175,4 +172,3 @@ acl_free(*prev_acl); *prev_acl = acl_new; } - ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.1#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.19 2008/07/06 22:47:10 csjp Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.20 2009/09/07 16:19:32 trasz Exp $ .\" -.Dd January 7, 2001 +.Dd September 5, 2009 .Dt SETFACL 1 .Os .Sh NAME @@ -301,40 +301,65 @@ .Dq Li everyone@ , this field is ommited altogether, including the trailing comma. .It Ar "access permissions" -The access permissions field contains up to one of each of -the following: -.Ql r , -.Ql w , -.Ql x , -.Ql p , -.Ql d , -.Ql D , -.Ql a , -.Ql A , -.Ql R , -.Ql W , -.Ql c , -.Ql C , -.Ql o , -and -.Ql S -to set read_data, write_data, execute, append_data, delete_child, delete, -read_attributes, write_attributes, read_xattr, write_xattr, read_acl, write_acl, -write_owner, and synchronize permissions, respectively. This section obviously -needs to be rewritten. -Each of these may be excluded -or replaced with a -.Ql - -character to indicate no access. +Access permissions may be specified in either short or long form. +Short and long forms may not be mixed. +Permissions in long form are separated by the +.Ql / +character; in short form, they are concatenated together. +Valid permissions are: +.Bl -tag -width ".Dv short" +.It Short +Long +.It r +read_data +.It w +write_data +.It x +execute +.It p +append_data +.It d +delete_child +.It D +delete +.It a +read_attributes +.It A +write_attributes +.It R +read_xattr +.It W +write_xattr +.It c +read_acl +.It C +write_acl +.It o +write_owner +.It S +synchronize +.El .It Ar "ACL inheritance flags" -The ACL inheritance flags field contains up to one of each of -the following: -.Ql f , -.Ql d , -.Ql i , -.Ql n , -to set file_inherit, dir_inherit, inherit_only, and no_propagate flags, -respectively. Inheritance flags may be only set on directories. +Inheritance flags may be specified in either short or long form. +Short and long forms may not be mixed. +Access flags in long form are separated by the +.Ql / +character; in short form, they are concatenated together. +Valid inheritance flags are: +.Bl -tag -width ".Dv short" +.It Short +Long +.It f +file_inherit +.It d +dir_inherit +.It i +inherit_only +.It n +no_propagate +.El +.Pp +Inheritance flags may be only set on directories. .It Ar "ACL type" The ACL type field is either .Dq Li allow ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.14 2008/09/06 13:17:35 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.15 2009/09/07 16:19:32 trasz Exp $"); #include #include @@ -34,6 +34,7 @@ #include #include +#include #include #include #include @@ -42,7 +43,6 @@ #include "setfacl.h" static void add_filename(const char *filename); -static acl_t get_file_acl(const char *filename, acl_type_t type, int h_flag); static void usage(void); static void @@ -59,52 +59,6 @@ TAILQ_INSERT_TAIL(&filelist, file, next); } -static acl_t -get_file_acl(const char *filename, acl_type_t type, int h_flag) -{ - acl_t acl = NULL; - struct stat sb; - - switch (type) { - case ACL_TYPE_ACCESS: - case ACL_TYPE_NFS4: - if (h_flag) - acl = acl_get_link_np(filename, type); - else - acl = acl_get_file(filename, type); - break; - - case ACL_TYPE_DEFAULT: - if (stat(filename, &sb) == -1) { - warn("%s: stat() failed", filename); - return (NULL); - } - - if (S_ISDIR(sb.st_mode) == 0) { - warnx("%s: default ACL may only be set on a directory", - filename); - return (NULL); - } - - if (h_flag) - acl = acl_get_link_np(filename, ACL_TYPE_DEFAULT); - else - acl = acl_get_file(filename, ACL_TYPE_DEFAULT); - break; - } - - if (acl == NULL) { - if (h_flag) - warn("%s: acl_get_link_np() failed", filename); - else - warn("%s: acl_get_file() failed", filename); - - return (NULL); - } - - return (acl); -} - static void usage(void) { @@ -120,12 +74,13 @@ acl_t acl; acl_type_t acl_type; char filename[PATH_MAX]; - int local_error, carried_error, ch, i, entry_number; + int local_error, carried_error, ch, i, entry_number, ret; int h_flag; struct sf_file *file; struct sf_entry *entry; const char *fn_dup; char *end; + struct stat sb; acl_type = ACL_TYPE_ACCESS; carried_error = local_error = 0; @@ -244,21 +199,49 @@ TAILQ_FOREACH(file, &filelist, next) { local_error = 0; - if (pathconf(file->filename, _PC_ACL_NFS4)) { + if (stat(file->filename, &sb) == -1) { + warn("%s: stat() failed", file->filename); + continue; + } + + if (acl_type == ACL_TYPE_DEFAULT && S_ISDIR(sb.st_mode) == 0) { + warnx("%s: default ACL may only be set on a directory", + file->filename); + continue; + } + + if (h_flag) + ret = lpathconf(file->filename, _PC_ACL_NFS4); + else + ret = pathconf(file->filename, _PC_ACL_NFS4); + if (ret > 0) { if (acl_type == ACL_TYPE_DEFAULT) { warnx("%s: there are no default entries " "in NFSv4 ACLs", file->filename); continue; } - acl_type = ACL_TYPE_NFS4; - - } else if (acl_type == ACL_TYPE_NFS4) + } else if (ret == 0) { + if (acl_type == ACL_TYPE_NFS4) acl_type = ACL_TYPE_ACCESS; + } else if (ret < 0 && errno != EINVAL) { + warn("%s: pathconf(..., _PC_ACL_NFS4) failed", + file->filename); + } - acl = get_file_acl(file->filename, acl_type, h_flag); - if (acl == NULL) + if (h_flag) + acl = acl_get_link_np(file->filename, acl_type); + else + acl = acl_get_file(file->filename, acl_type); + if (acl == NULL) { + if (h_flag) + warn("%s: acl_get_link_np() failed", + file->filename); + else + warn("%s: acl_get_file() failed", + file->filename); continue; + } /* cycle through each option */ TAILQ_FOREACH(entry, &entrylist, next) { @@ -315,11 +298,8 @@ continue; } - if (acl_type == ACL_TYPE_NFS4) - need_mask = 0; - - if (need_mask && (set_acl_mask(&acl, - file->filename) == -1)) { + if (acl_type != ACL_TYPE_NFS4 && need_mask && + set_acl_mask(&acl, file->filename) == -1) { warnx("%s: failed to set ACL mask", file->filename); carried_error++; } else if (h_flag) { @@ -343,4 +323,3 @@ return (carried_error); } - ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.5 2005/01/10 08:39:25 imp Exp $ + * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.6 2009/09/07 16:19:32 trasz Exp $ */ #ifndef _SETFACL_H ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 (text+ko) ==== @@ -1322,6 +1322,14 @@ exit(1); } + if (S_ISCHR(statbuf.st_mode)) { + if (ioctl(fd, DIOCGMEDIASIZE, &statbuf.st_size) == -1) { + (void) printf("failed to get size of '%s': %s\n", dev, + strerror(errno)); + exit(1); + } + } + psize = statbuf.st_size; psize = P2ALIGN(psize, (uint64_t)sizeof (vdev_label_t)); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/gdtoaimp.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.11 2009/01/28 04:36:34 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.12 2009/09/07 09:30:37 attilio Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -485,7 +485,7 @@ _pthread_mutex_unlock(&__gdtoa_locks[n]); \ } while(0) -#define Kmax 15 +#define Kmax 9 struct Bigint { ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/gdtoa/misc.c#2 (text+ko) ==== @@ -55,7 +55,9 @@ #endif ACQUIRE_DTOA_LOCK(0); - if ( (rv = freelist[k]) !=0) { + /* The k > Kmax case does not need ACQUIRE_DTOA_LOCK(0), */ + /* but this case seems very unlikely. */ + if (k <= Kmax && (rv = freelist[k]) !=0) { freelist[k] = rv->next; } else { @@ -65,7 +67,7 @@ #else len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1) /sizeof(double); - if (pmem_next - private_mem + len <= PRIVATE_mem) { + if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) { rv = (Bigint*)pmem_next; pmem_next += len; } @@ -89,10 +91,14 @@ #endif { if (v) { - ACQUIRE_DTOA_LOCK(0); - v->next = freelist[v->k]; - freelist[v->k] = v; - FREE_DTOA_LOCK(0); + if (v->k > Kmax) + free((void*)v); + else { + ACQUIRE_DTOA_LOCK(0); + v->next = freelist[v->k]; + freelist[v->k] = v; + FREE_DTOA_LOCK(0); + } } } ==== //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/Makefile#2 (text+ko) ==== @@ -1,16 +1,14 @@ -# $FreeBSD: src/etc/mtree/Makefile,v 1.6 2006/03/17 18:54:21 ru Exp $ +# $FreeBSD: src/etc/mtree/Makefile,v 1.7 2009/09/06 13:26:51 antoine Exp $ .include FILES= ${_BIND.chroot.dist} \ ${_BIND.include.dist} \ BSD.include.dist \ - BSD.local.dist \ BSD.root.dist \ + ${_BSD.sendmail.dist} \ BSD.usr.dist \ - BSD.var.dist \ - BSD.x11-4.dist \ - BSD.x11.dist + BSD.var.dist .if ${MK_BIND} != "no" _BIND.chroot.dist= BIND.chroot.dist @@ -18,6 +16,9 @@ _BIND.include.dist= BIND.include.dist .endif .endif +.if ${MK_SENDMAIL} != "no" +_BSD.sendmail.dist= BSD.sendmail.dist +.endif NO_OBJ= FILESDIR= /etc/mtree ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/malloc.c#9 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.183 2008/12/01 10:20:59 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.184 2009/09/05 13:32:05 kib Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -5320,6 +5320,15 @@ goto RETURN; } + if (size == 0) { + if (opt_sysv == false) + size = 1; + else { + result = NULL; + ret = 0; + goto RETURN; + } + } result = ipalloc(alignment, size); } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/intro.2#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.2 8.5 (Berkeley) 2/27/95 -.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.48 2007/01/09 00:28:14 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/intro.2,v 1.49 2009/09/06 07:22:09 pjd Exp $ .\" .Dd February 27, 1995 .Dt INTRO 2 @@ -302,7 +302,7 @@ .It Er 48 EADDRINUSE Em "Address already in use" . Only one usage of each address is normally permitted. .Pp -.It Er 49 EADDRNOTAVAIL Em "Cannot assign requested address" . +.It Er 49 EADDRNOTAVAIL Em "Can't assign requested address" . Normally results from an attempt to create a socket with an address not on this machine. .It Er 50 ENETDOWN Em "Network is down" . @@ -335,7 +335,7 @@ An request to send or receive data was disallowed because the socket was not connected and (when sending on a datagram socket) no address was supplied. -.It Er 58 ESHUTDOWN Em "Cannot send after socket shutdown" . +.It Er 58 ESHUTDOWN Em "Can't send after socket shutdown" . A request to send data was disallowed because the socket had already been shut down with a previous .Xr shutdown 2 ==== //depot/projects/soc2008/trasz_nfs4acl/release/scripts/package-split.py#3 (text+ko) ==== @@ -7,7 +7,7 @@ # # Usage: package-split.py # -# $FreeBSD: src/release/scripts/package-split.py,v 1.18 2009/06/28 08:59:46 blackend Exp $ +# $FreeBSD: src/release/scripts/package-split.py,v 1.19 2009/09/07 17:54:20 kensmith Exp $ import os import sys @@ -23,71 +23,14 @@ else: verbose = 0 -# List of packages for disc1. This just includes packages sysinstall can -# install as a distribution +if 'PKG_DVD' in os.environ: + doing_dvd = 1 +else: + doing_dvd = 0 + +# List of packages for disc1. def disc1_packages(): - pkgs = ['lang/perl5.8'] - pkgs.extend(['x11/xorg', - 'devel/imake']) - if arch == 'i386': - pkgs.append('emulators/linux_base-fc4') - return pkgs - -# List of packages for disc2. This includes packages that the X desktop -# menu depends on (if it still exists) and other "nice to have" packages. -# For architectures that use a separate livefs, this is actually disc3. -def disc2_packages(): - # X Desktops - if arch == 'ia64': - pkgs = ['x11/gnome2-lite', - 'x11/kde-lite'] - else: - pkgs = ['x11/gnome2', - 'x11/kde3'] - pkgs.extend(['x11-wm/afterstep', - 'x11-wm/windowmaker', - 'x11-wm/fvwm2', - # "Nice to have" - 'archivers/unzip', - 'astro/xearth', - 'devel/gmake', - 'editors/emacs', - 'editors/vim-lite', - 'emulators/mtools', - 'graphics/png', - 'graphics/xv', - 'irc/xchat', - 'mail/exim', - 'mail/fetchmail', - 'mail/mutt', - 'mail/pine4', - 'mail/popd', - 'mail/xfmail', - 'mail/postfix', - 'net/cvsup-without-gui', - 'net/rsync', - 'net/samba3', - 'news/slrn', - 'news/tin', - 'ports-mgmt/portupgrade', - 'print/a2ps-letter', - 'print/apsfilter', - 'print/ghostscript-gnu-nox11', - 'print/gv', - 'print/psutils-letter', - 'shells/bash', - 'shells/pdksh', - 'shells/zsh', - 'security/sudo', - 'www/links', - 'www/lynx', - 'x11/rxvt', - # Formerly on disc3 - 'ports-mgmt/portaudit']) - return pkgs - -def docs_packages(): - pkgs = ['misc/freebsd-doc-bn', + pkgs = ['misc/freebsd-doc-bn', 'misc/freebsd-doc-da', 'misc/freebsd-doc-de', 'misc/freebsd-doc-el', @@ -106,14 +49,58 @@ 'misc/freebsd-doc-tr', 'misc/freebsd-doc-zh_cn', 'misc/freebsd-doc-zh_tw'] + + if doing_dvd: + pkgs.extend(['lang/perl5.8', + 'x11/xorg', + 'devel/imake', + 'emulators/linux_base-fc4', + 'x11/gnome2', + 'x11/kde4', + 'x11-wm/afterstep', + 'x11-wm/windowmaker', + 'x11-wm/fvwm2', + 'archivers/unzip', + 'astro/xearth', + 'devel/gmake', + 'editors/emacs', + 'editors/vim-lite', + 'emulators/mtools', + 'graphics/png', + 'graphics/xv', + 'irc/xchat', + 'mail/exim', + 'mail/fetchmail', + 'mail/mutt', + 'mail/alpine', + 'mail/popd', + 'mail/xfmail', + 'mail/postfix', + 'net/cvsup-without-gui', + 'net/rsync', + 'net/samba3', + 'news/slrn', + 'news/tin', + 'ports-mgmt/portupgrade', + 'print/a2ps-letter', + 'print/apsfilter', + 'print/ghostscript7-nox11', + 'print/gv', + 'print/psutils-letter', + 'shells/bash', + 'shells/pdksh', + 'shells/zsh', + 'security/sudo', + 'www/links', + 'www/lynx', + 'x11/rxvt', + 'ports-mgmt/portaudit']) return pkgs # The list of desired packages def desired_packages(): disc1 = disc1_packages() - disc2 = disc2_packages() - docs = docs_packages() - return [disc1, disc2, docs] + return [disc1] # Suck the entire INDEX file into a two different dictionaries. The first # dictionary maps port names (origins) to package names. The second ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/mirror/geom_mirror.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2005 Pawel Jakub Dawidek + * Copyright (c) 2004-2009 Pawel Jakub Dawidek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.17 2007/05/15 20:25:16 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.18 2009/09/06 06:52:06 pjd Exp $"); #include #include @@ -41,13 +41,12 @@ #include #include - uint32_t lib_version = G_LIB_VERSION; uint32_t version = G_MIRROR_VERSION; static char label_balance[] = "split", configure_balance[] = "none"; static intmax_t label_slice = 4096, configure_slice = -1; -static intmax_t insert_priority = 0; +static intmax_t insert_priority = 0, configure_priority = -1; static void mirror_main(struct gctl_req *req, unsigned flags); static void mirror_activate(struct gctl_req *req); @@ -71,10 +70,12 @@ { 'F', "nofailsync", NULL, G_TYPE_BOOL }, { 'h', "hardcode", NULL, G_TYPE_BOOL }, { 'n', "noautosync", NULL, G_TYPE_BOOL }, + { 'p', "priority", &configure_priority, G_TYPE_NUMBER }, { 's', "slice", &configure_slice, G_TYPE_NUMBER }, G_OPT_SENTINEL }, - NULL, "[-adfFhnv] [-b balance] [-s slice] name" + NULL, "[-adfFhnv] [-b balance] [-s slice] name\n" + "[-v] -p priority name prov" }, { "deactivate", G_FLAG_VERBOSE, NULL, G_NULL_OPTS, NULL, "[-v] name prov ..." ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/mirror/gmirror.8#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2004-2005 Pawel Jakub Dawidek +.\" Copyright (c) 2004-2009 Pawel Jakub Dawidek .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.23 2006/12/21 18:30:23 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.24 2009/09/06 06:52:06 pjd Exp $ .\" -.Dd November 1, 2006 +.Dd August 1, 2009 .Dt GMIRROR 8 .Os .Sh NAME @@ -49,6 +49,12 @@ .Op Fl s Ar slice .Ar name .Nm +.Cm configure +.Op Fl v +.Fl p Ar priority +.Ar name +.Ar prov +.Nm .Cm rebuild .Op Fl v .Ar name @@ -115,8 +121,8 @@ .It Cm label Create a mirror. The order of components is important, because a component's priority is based on its position -(starting from 0). -The component with the biggest priority is used by the +(starting from 0 to 255). +The component with the biggest priority (the lowest number) is used by the .Cm prefer balance algorithm and is also used as a master component when resynchronization is needed, @@ -159,7 +165,7 @@ Configure the given device. .Pp Additional options include: -.Bl -tag -width ".Fl b Ar balance" +.Bl -tag -width ".Fl p Ar priority" .It Fl a Turn on autosynchronization of stale components. .It Fl b Ar balance @@ -175,6 +181,9 @@ Hardcode providers' names in metadata. .It Fl n Turn off autosynchronization of stale components. +.It Fl p Ar priority +Specifies priority for the given component +.Ar prov . .It Fl s Ar slice Specifies slice size for .Cm split ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/core/geom.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004-2005 Pawel Jakub Dawidek + * Copyright (c) 2004-2009 Pawel Jakub Dawidek * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.38 2009/06/07 20:12:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.40 2009/09/06 06:49:59 pjd Exp $"); #include #include @@ -98,11 +98,21 @@ struct g_option *opt; unsigned i; - fprintf(stderr, "%s %s %s", prefix, comm, cmd->gc_name); if (cmd->gc_usage != NULL) { - fprintf(stderr, " %s\n", cmd->gc_usage); + char *pos, *ptr, *sptr; + + sptr = ptr = strdup(cmd->gc_usage); + while ((pos = strsep(&ptr, "\n")) != NULL) { + if (*pos == '\0') + continue; + fprintf(stderr, "%s %s %s %s\n", prefix, comm, + cmd->gc_name, pos); + } + free(sptr); return; } + + fprintf(stderr, "%s %s %s", prefix, comm, cmd->gc_name); if ((cmd->gc_flags & G_FLAG_VERBOSE) != 0) fprintf(stderr, " [-v]"); for (i = 0; ; i++) { ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifgif.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifgif.c,v 1.2 2009/06/23 23:49:52 delphij Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifgif.c,v 1.4 2009/09/07 15:52:15 hrs Exp $"; #endif #include @@ -51,36 +51,22 @@ #include "ifconfig.h" +#define GIFBITS "\020\1ACCEPT_REV_ETHIP_VER\5SEND_REV_ETHIP_VER" + static void gif_status(int); -static struct { - const char *label; - u_int mask; -} gif_opts[] = { - { "ACCEPT_REV_ETHIP_VER", GIF_ACCEPT_REVETHIP }, - { "SEND_REV_ETHIP_VER", GIF_SEND_REVETHIP }, -}; - static void gif_status(int s) { int opts; - int nopts = 0; - size_t i; ifr.ifr_data = (caddr_t)&opts; if (ioctl(s, GIFGOPTS, &ifr) == -1) return; >>> TRUNCATED FOR MAIL (1000 lines) <<<