From owner-p4-projects@FreeBSD.ORG Fri Apr 27 21:05:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ABDF16A409; Fri, 27 Apr 2007 21:05:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1A02F16A406 for ; Fri, 27 Apr 2007 21:05:29 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0694013C4B7 for ; Fri, 27 Apr 2007 21:05:29 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3RL5SK2094310 for ; Fri, 27 Apr 2007 21:05:29 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3RL5Rg3094289 for perforce@freebsd.org; Fri, 27 Apr 2007 21:05:27 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 27 Apr 2007 21:05:27 GMT Message-Id: <200704272105.l3RL5Rg3094289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 118897 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: Fri, 27 Apr 2007 21:05:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=118897 Change 118897 by mjacob@mjexp on 2007/04/27 21:05:01 IFC Affected files ... .. //depot/projects/mjexp/MAINTAINERS#4 integrate .. //depot/projects/mjexp/ObsoleteFiles.inc#14 integrate .. //depot/projects/mjexp/UPDATING#14 integrate .. //depot/projects/mjexp/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate .. //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/engine.c#3 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/listener.c#3 integrate .. //depot/projects/mjexp/contrib/sendmail/libmilter/main.c#3 integrate .. //depot/projects/mjexp/etc/rc.d/zfs#4 integrate .. //depot/projects/mjexp/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/mjexp/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/mjexp/lib/libbsm/Makefile#2 integrate .. //depot/projects/mjexp/lib/libc/sys/send.2#3 integrate .. //depot/projects/mjexp/lib/libexpat/expat_config.h#2 integrate .. //depot/projects/mjexp/lib/libfetch/fetch.3#2 integrate .. //depot/projects/mjexp/lib/libfetch/ftp.c#2 integrate .. //depot/projects/mjexp/lib/libpthread/thread/thr_info.c#3 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 integrate .. //depot/projects/mjexp/sbin/fdisk_pc98/fdisk.8#2 integrate .. //depot/projects/mjexp/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/mjexp/share/examples/Makefile#2 integrate .. //depot/projects/mjexp/share/examples/netgraph/bluetooth/rc.bluetooth#2 delete .. //depot/projects/mjexp/share/man/man4/Makefile#12 integrate .. //depot/projects/mjexp/share/man/man4/led.4#2 integrate .. //depot/projects/mjexp/share/man/man4/sbsh.4#2 integrate .. //depot/projects/mjexp/share/man/man4/vlan.4#3 integrate .. //depot/projects/mjexp/share/man/man4/worm.4#2 delete .. //depot/projects/mjexp/share/misc/committers-ports.dot#5 integrate .. //depot/projects/mjexp/share/misc/committers-src.dot#4 integrate .. //depot/projects/mjexp/share/misc/organization.dot#2 integrate .. //depot/projects/mjexp/share/mk/version_gen.awk#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/mjexp/sys/conf/files#22 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/mjexp/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#22 edit .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#16 edit .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#26 edit .. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#14 edit .. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#11 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#15 integrate .. //depot/projects/mjexp/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/mjexp/sys/geom/part/g_part.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/mjexp/sys/kern/kern_descrip.c#10 integrate .. //depot/projects/mjexp/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/mjexp/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/mjexp/sys/vm/vm_map.c#5 integrate .. //depot/projects/mjexp/tools/regression/netinet6/inet6_rth/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c#1 branch .. //depot/projects/mjexp/tools/regression/netinet6/inet6_rth/test_subr.c#1 branch .. //depot/projects/mjexp/tools/regression/netinet6/inet6_rth/test_subr.h#1 branch .. //depot/projects/mjexp/tools/regression/usr.bin/sed/regress.sh#4 integrate .. //depot/projects/mjexp/tools/sched/schedgraph.py#5 integrate .. //depot/projects/mjexp/tools/tools/net80211/wesside/wesside/wesside.c#3 integrate .. //depot/projects/mjexp/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#10 integrate .. //depot/projects/mjexp/usr.bin/quota/quota.c#5 integrate .. //depot/projects/mjexp/usr.bin/sed/extern.h#2 integrate .. //depot/projects/mjexp/usr.bin/sed/main.c#2 integrate .. //depot/projects/mjexp/usr.bin/sed/process.c#3 integrate .. //depot/projects/mjexp/usr.bin/sed/sed.1#2 integrate .. //depot/projects/mjexp/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pmcstat/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/pmcstat/pmcstat.8#2 integrate .. //depot/projects/mjexp/usr.sbin/pmcstat/pmcstat.c#2 integrate .. //depot/projects/mjexp/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/mjexp/usr.sbin/rpcbind/rpcbind.8#3 integrate .. //depot/projects/mjexp/usr.sbin/rpcbind/rpcbind.c#2 integrate .. //depot/projects/mjexp/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/mjexp/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.143 2007/04/06 10:57:15 pjd Exp $ +$FreeBSD: src/MAINTAINERS,v 1.144 2007/04/26 21:30:16 imp Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -128,6 +128,7 @@ usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. +usb core Please contact core@ before any major changes Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/mjexp/ObsoleteFiles.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070423: rc.bluetooth (examples) removed +OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +# 20070421: worm.4 removed +OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ ==== //depot/projects/mjexp/UPDATING#14 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20070423: + The ABI breakage in sendmail(8)'s libmilter has been repaired + so it is no longer necessary to recompile mail filters (aka, + milters). If you recompiled mail filters after the 20070408 + note, it is not necessary to recompile them again. + 20070417: The new trunk(4) driver has been renamed to lagg(4) as it better reflects its purpose. ifconfig will need to be recompiled. @@ -767,4 +773,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $ +$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $ ==== //depot/projects/mjexp/compat/opensolaris/misc/fsshare.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.1 2007/04/06 01:08:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $"); #include #include @@ -99,21 +99,30 @@ /* * Function translate options to a format acceptable by exports(5), eg. * - * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 + * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org 69.147.83.54 * * Accepted input formats: * - * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0 - * ro network=192.168.0.0 mask=255.255.255.0 maproot=0 - * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0 - * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 + * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0,freefall.freebsd.org + * ro network=192.168.0.0 mask=255.255.255.0 maproot=0 freefall.freebsd.org + * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0,freefall.freebsd.org + * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org + * + * Recognized keywords: + * + * ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet + * */ +static const char *known_opts[] = { "ro", "maproot", "mapall", "mask", + "network", "alldirs", "public", "webnfs", "index", "quiet", NULL }; static char * translate_opts(const char *shareopts) { static char newopts[OPTSSIZE]; - char oldopts[OPTSSIZE], opt[64]; + char oldopts[OPTSSIZE]; char *o, *s = NULL; + unsigned int i; + size_t len; strlcpy(oldopts, shareopts, sizeof(oldopts)); newopts[0] = '\0'; @@ -121,8 +130,16 @@ while ((o = strsep(&s, "-, ")) != NULL) { if (o[0] == '\0') continue; - snprintf(opt, sizeof(opt), "-%s ", o); - strlcat(newopts, opt, sizeof(newopts)); + for (i = 0; known_opts[i] != NULL; i++) { + len = strlen(known_opts[i]); + if (strncmp(known_opts[i], o, len) == 0 && + (o[len] == '\0' || o[len] == '=')) { + strlcat(newopts, "-", sizeof(newopts)); + break; + } + } + strlcat(newopts, o, sizeof(newopts)); + strlcat(newopts, " ", sizeof(newopts)); } return (newopts); } ==== //depot/projects/mjexp/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ==== @@ -932,11 +932,11 @@ if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (K=%s)", - zio_checksum_table[doi.doi_checksum].ci_name); + zio_checksum_table[doi.doi_checksum].ci_name); if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (Z=%s)", - zio_compress_table[doi.doi_compress].ci_name); + zio_compress_table[doi.doi_compress].ci_name); (void) printf("%10lld %3u %5s %5s %5s %5s %s%s\n", (u_longlong_t)object, doi.doi_indirection, iblk, dblk, lsize, @@ -1441,7 +1441,7 @@ (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object, (u_longlong_t)blkid2offset(bc->bc_dnode, - zb->zb_level, zb->zb_blkid), + zb->zb_level, zb->zb_blkid), blkbuf); } @@ -1951,8 +1951,8 @@ spa_close(spa, (void *)zdb_read_block); error = spa_open(spa_name, spap, (void *)zdb_read_block); if (error) - fatal("Failed to open pool '%s': errno = %d\n", - spa_name, error); + fatal("Failed to open pool '%s': %s", + spa_name, strerror(error)); spa = *spap; } @@ -2156,7 +2156,7 @@ } if (error) - fatal("can't open %s: error %d", argv[0], error); + fatal("can't open %s: %s", argv[0], strerror(error)); argv++; if (--argc > 0) { ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 (text+ko) ==== @@ -339,22 +339,15 @@ changelist_free(prop_changelist_t *clp) { prop_changenode_t *cn; - uu_list_walk_t *walk; + void *cookie; if (clp->cl_list) { - verify((walk = uu_list_walk_start(clp->cl_list, - UU_WALK_ROBUST)) != NULL); - - while ((cn = uu_list_walk_next(walk)) != NULL) { - - uu_list_remove(clp->cl_list, cn); - + cookie = NULL; + while ((cn = uu_list_teardown(clp->cl_list, &cookie)) != NULL) { zfs_close(cn->cn_handle); free(cn); } - uu_list_walk_end(walk); - uu_list_destroy(clp->cl_list); } if (clp->cl_pool) @@ -418,7 +411,7 @@ } else { ASSERT(!clp->cl_alldependents); verify(uu_list_insert_before(clp->cl_list, - uu_list_first(clp->cl_list), cn) == 0); + uu_list_first(clp->cl_list), cn) == 0); } if (!clp->cl_alldependents) ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 (text+ko) ==== @@ -74,22 +74,16 @@ namespace_clear(libzfs_handle_t *hdl) { if (hdl->libzfs_ns_avl) { - uu_avl_walk_t *walk; config_node_t *cn; + void *cookie = NULL; - if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl, - UU_WALK_ROBUST)) == NULL) - return; - - while ((cn = uu_avl_walk_next(walk)) != NULL) { - uu_avl_remove(hdl->libzfs_ns_avl, cn); + while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl, + &cookie)) != NULL) { nvlist_free(cn->cn_config); free(cn->cn_name); free(cn); } - uu_avl_walk_end(walk); - uu_avl_destroy(hdl->libzfs_ns_avl); hdl->libzfs_ns_avl = NULL; } @@ -110,7 +104,7 @@ config_node_t *cn; nvpair_t *elem; zfs_cmd_t zc = { 0 }; - uu_avl_walk_t *walk; + void *cookie; if (hdl->libzfs_ns_gen == 0) { /* @@ -172,21 +166,13 @@ /* * Clear out any existing configuration information. */ - if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl, - UU_WALK_ROBUST)) == NULL) { - nvlist_free(config); - return (no_memory(hdl)); - } - - while ((cn = uu_avl_walk_next(walk)) != NULL) { - uu_avl_remove(hdl->libzfs_ns_avl, cn); + cookie = NULL; + while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl, &cookie)) != NULL) { nvlist_free(cn->cn_config); free(cn->cn_name); free(cn); } - uu_avl_walk_end(walk); - elem = NULL; while ((elem = nvlist_next_nvpair(config, elem)) != NULL) { nvlist_t *child; @@ -222,7 +208,7 @@ } /* - * Retrive the configuration for the given pool. The configuration is a nvlist + * Retrieve the configuration for the given pool. The configuration is a nvlist * describing the vdevs, as well as the statistics associated with each one. */ nvlist_t * ==== //depot/projects/mjexp/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#3 (text+ko) ==== @@ -220,7 +220,7 @@ &state) == 0 && state == POOL_STATE_SPARE && nvlist_lookup_uint64(config, ZPOOL_CONFIG_GUID, &vdev_guid) == 0) { if ((ne = zfs_alloc(hdl, sizeof (name_entry_t))) == NULL) - return (-1); + return (-1); if ((ne->ne_name = zfs_strdup(hdl, path)) == NULL) { free(ne); @@ -748,7 +748,6 @@ zpool_find_import(libzfs_handle_t *hdl, int argc, char **argv) { int i; - DIR *dirp; char path[MAXPATHLEN]; nvlist_t *ret = NULL, *config; int fd; @@ -824,7 +823,6 @@ free(ne); } - return (ret); } ==== //depot/projects/mjexp/contrib/sendmail/libmilter/engine.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -855,6 +855,7 @@ ; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 4 && (fi_negotiate = g->a_ctx->ctx_smfi->xxfi_negotiate) != NULL) { int r; @@ -1177,6 +1178,7 @@ if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 3 && (fi_data = g->a_ctx->ctx_smfi->xxfi_data) != NULL) return (*fi_data)(g->a_ctx); return SMFIS_CONTINUE; @@ -1310,6 +1312,7 @@ if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 2 && (fi_unknown = g->a_ctx->ctx_smfi->xxfi_unknown) != NULL) return (*fi_unknown)(g->a_ctx, (const char *) g->a_buf); return SMFIS_CONTINUE; ==== //depot/projects/mjexp/contrib/sendmail/libmilter/listener.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -927,9 +927,9 @@ ctx->ctx_pflags |= SMFIP_NOEOH; if (smfi->xxfi_body == NULL) ctx->ctx_pflags |= SMFIP_NOBODY; - if (smfi->xxfi_data == NULL) + if (smfi->xxfi_version <= 3 || smfi->xxfi_data == NULL) ctx->ctx_pflags |= SMFIP_NODATA; - if (smfi->xxfi_unknown == NULL) + if (smfi->xxfi_version <= 2 || smfi->xxfi_unknown == NULL) ctx->ctx_pflags |= SMFIP_NOUNKNOWN; #if _FFR_WORKERS_POOL ==== //depot/projects/mjexp/contrib/sendmail/libmilter/main.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2003, 2006, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -52,7 +52,10 @@ (void) sm_strlcpy(smfi->xxfi_name, smfilter.xxfi_name, len); /* compare milter version with hard coded version */ - if (smfi->xxfi_version != SMFI_VERSION) + if (smfi->xxfi_version != SMFI_VERSION && + smfi->xxfi_version != 2 && + smfi->xxfi_version != 3 && + smfi->xxfi_version != 4) { /* hard failure for now! */ smi_log(SMI_LOG_ERR, ==== //depot/projects/mjexp/etc/rc.d/zfs#4 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/zfs,v 1.4 2007/04/15 18:07:14 pjd Exp $ +# $FreeBSD: src/etc/rc.d/zfs,v 1.5 2007/04/22 20:55:08 pjd Exp $ # # PROVIDE: zfs # REQUIRE: mountcritlocal -# KEYWORD: nojail . /etc/rc.subr @@ -15,7 +14,14 @@ stop_cmd="zfs_stop" required_modules="zfs" -zfs_start() +zfs_start_jail() +{ + if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then + zfs mount -a + fi +} + +zfs_start_main() { zfs volinit zfs mount -a @@ -34,7 +40,23 @@ done } -zfs_stop() +zfs_start() +{ + if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then + zfs_start_jail + else + zfs_start_main + fi +} + +zfs_stop_jail() +{ + if [ `$SYSCTL_N security.jail.mount_allowed` -eq 1 ]; then + zfs unmount -a + fi +} + +zfs_stop_main() { # Disable swap on ZVOLs with property org.freebsd:swap=on. zfs list -H -o org.freebsd:swap,name -t volume | \ @@ -50,5 +72,14 @@ zfs volfini } +zfs_stop() +{ + if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then + zfs_stop_jail + else + zfs_stop_main + fi +} + load_rc_config $name run_rc_command "$1" ==== //depot/projects/mjexp/etc/sendmail/freebsd.mc#2 (text+ko) ==== @@ -44,7 +44,7 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.33 2006/08/17 05:12:07 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.34 2007/04/23 22:23:54 gshapiro Exp $') OSTYPE(freebsd6) DOMAIN(generic) ==== //depot/projects/mjexp/etc/sendmail/freebsd.submit.mc#2 (text+ko) ==== @@ -16,7 +16,7 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.4 2006/08/17 05:12:07 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.5 2007/04/23 22:23:54 gshapiro Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet ==== //depot/projects/mjexp/lib/libbsm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libbsm/Makefile,v 1.5 2006/09/25 11:53:58 rwatson Exp $ +# $FreeBSD: src/lib/libbsm/Makefile,v 1.6 2007/04/23 14:46:59 rwatson Exp $ # OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm @@ -143,6 +143,7 @@ au_token.3 au_to_header32.3 \ au_token.3 au_to_header64.3 \ au_token.3 au_to_trailer.3 \ + au_token.3 au_to_zonename.3 \ au_user.3 setauuser.3 \ au_user.3 endauuser.3 \ au_user.3 getauuserent.3 \ ==== //depot/projects/mjexp/lib/libc/sys/send.2#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.34 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/send.2,v 1.36 2007/04/27 10:30:31 roam Exp $ .\" .Dd September 13, 2006 .Dt SEND 2 @@ -100,7 +100,6 @@ argument may include one or more of the following: .Bd -literal #define MSG_OOB 0x00001 /* process out-of-band data */ -#define MSG_PEEK 0x00002 /* peek at incoming message */ #define MSG_DONTROUTE 0x00004 /* bypass routing, use direct interface */ #define MSG_EOR 0x00008 /* data completes record */ #define MSG_EOF 0x00100 /* data completes transaction */ ==== //depot/projects/mjexp/lib/libexpat/expat_config.h#2 (text+ko) ==== @@ -1,7 +1,13 @@ -/* $FreeBSD: src/lib/libexpat/expat_config.h,v 1.1 2002/10/02 07:35:35 phk Exp $ */ +/* $FreeBSD: src/lib/libexpat/expat_config.h,v 1.2 2007/04/24 06:29:27 phk Exp $ */ + +#include /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#if BYTE_ORDER == LITTLE_ENDIAN #define BYTEORDER 1234 +#else +#define BYTEORDER 4321 +#endif /* Define to 1 if you have the `bcopy' function. */ #define HAVE_BCOPY 1 @@ -67,7 +73,11 @@ #define STDC_HEADERS 1 /* whether byteorder is bigendian */ -/* #undef WORDS_BIGENDIAN */ +#if BYTE_ORDER == BIG_ENDIAN +#define WORDS_BIGENDIAN +#else +#undef WORDS_BIGENDIAN +#endif /* Define to specify how much context to retain around the current parse point. */ ==== //depot/projects/mjexp/lib/libfetch/fetch.3#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.61 2005/11/30 04:08:45 tmclaugh Exp $ +.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.62 2007/04/22 22:33:29 njl Exp $ .\" -.Dd July 1, 1998 +.Dd April 22, 2007 .Dt FETCH 3 .Os .Sh NAME @@ -334,6 +334,16 @@ .Nm fetch library will attempt an anonymous login, with user name "anonymous" and password "anonymous@". +.Pp +By default, +.Nm fetch +changes directories one at a time for the best compatibility with a wide +variety of servers. +If it is compiled with the +.Ql FTP_COMBINE_CWDS +flag, it will first try a single change directory command for the entire +path and fall back to the default scheme if an error occurred. +This can save latency when used with a slow network link. .Sh HTTP SCHEME The .Fn fetchXGetHTTP , ==== //depot/projects/mjexp/lib/libfetch/ftp.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.95 2006/06/13 10:21:03 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/ftp.c,v 1.96 2007/04/22 22:33:29 njl Exp $"); /* * Portions of this code were taken from or based on ftpio.c: @@ -267,6 +267,7 @@ char pwd[PATH_MAX]; int e, i, len; + /* If no slashes in name, no need to change dirs. */ if ((end = strrchr(file, '/')) == NULL) return (0); if ((e = _ftp_cmd(conn, "PWD")) != FTP_WORKING_DIRECTORY || @@ -276,7 +277,8 @@ } for (;;) { len = strlen(pwd); - /* look for a common prefix */ + + /* Look for a common prefix between PWD and dir to fetch. */ for (i = 0; i <= len && i <= end - file; ++i) if (pwd[i] != file[i]) break; @@ -284,6 +286,7 @@ DEBUG(fprintf(stderr, "have: [%.*s|%s]\n", i, pwd, pwd + i)); DEBUG(fprintf(stderr, "want: [%.*s|%s]\n", i, file, file + i)); #endif + /* Keep going up a dir until we have a matching prefix. */ if (pwd[i] == '\0' && (file[i - 1] == '/' || file[i] == '/')) break; if ((e = _ftp_cmd(conn, "CDUP")) != FTP_FILE_ACTION_OK || @@ -293,6 +296,23 @@ return (-1); } } + +#ifdef FTP_COMBINE_CWDS + /* Skip leading slashes, even "////". */ + for (beg = file + i; beg < end && *beg == '/'; ++beg, ++i) + /* nothing */ ; + + /* If there is no trailing dir, we're already there. */ + if (beg >= end) + return (0); + + /* Change to the directory all in one chunk (e.g., foo/bar/baz). */ + e = _ftp_cmd(conn, "CWD %.*s", (int)(end - beg), beg); + if (e == FTP_FILE_ACTION_OK) + return (0); +#endif /* FTP_COMBINE_CWDS */ + + /* That didn't work so go back to legacy behavior (multiple CWDs). */ for (beg = file + i; beg < end; beg = file + i + 1) { while (*beg == '/') ++beg, ++i; @@ -966,6 +986,8 @@ if ((e = _ftp_authenticate(conn, url, purl)) != FTP_LOGGED_IN) goto fouch; + /* TODO: Request extended features supported, if any (RFC 3659). */ + /* done */ return (conn); ==== //depot/projects/mjexp/lib/libpthread/thread/thr_info.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_info.c,v 1.29 2007/01/12 07:26:18 imp Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_info.c,v 1.30 2007/04/23 03:36:14 deischen Exp $ */ #include #include @@ -214,12 +214,31 @@ void _pthread_set_name_np(pthread_t thread, char *name) { - /* Check if the caller has specified a valid thread: */ - if (thread != NULL && thread->magic == THR_MAGIC) { - if (thread->name != NULL) { + struct pthread *curthread = _get_curthread(); + char *new_name; + char *prev_name; + int ret; + + new_name = strdup(name); + /* Add a reference to the target thread. */ + if (_thr_ref_add(curthread, thread, 0) != 0) { + free(new_name); + ret = ESRCH; + } + else { + THR_THREAD_LOCK(curthread, thread); + prev_name = thread->name; + thread->name = new_name; + THR_THREAD_UNLOCK(curthread, thread); + _thr_ref_delete(curthread, thread); + if (prev_name != NULL) { /* Free space for previous name. */ - free(thread->name); + free(prev_name); } - thread->name = strdup(name); + ret = 0; } +#if 0 + /* XXX - Should return error code. */ + return (ret); +#endif } ==== //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#13 (text+ko) ==== @@ -30,7 +30,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1020 2007/04/20 16:12:31 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1023 2007/04/24 08:58:09 yar Exp $ 2000 @@ -438,14 +438,19 @@ statistics via a binary structure stream. The sysctl variable hw.pci.do_powerstate - has been changed from a boolean to a range. + has been split into two sysctl variables + hw.pci.do_powerstate_nodriver + and hw.pci.do_powerstate_resume. + Also, these variables have been changed from a boolean to a range. 0 means no power management, 1 means conservative power management which any device class that has caused problems is added to the watch list, 2 means aggressive power management where any device class that is not fundamental to the system is added to the list, and 3 means power them all down unconditionally. - The default is 1. + The default values are 0 for + hw.pci.do_powerstate_nodriver and + 1 for hw.pci.do_powerstate_resume. [&arch.ia64;] The GENERIC kernel now enables SMP support by default. @@ -1351,7 +1356,7 @@ The &man.arp.8; utility now allows the option together with the and options - to allow all entries for a given interface to be removed. + to allow all entries for a given interface to be removed. &merged; The OpenBSM userland tools, including &man.audit.8;, &man.auditd.8;, @@ -1485,16 +1490,17 @@ The &man.ifconfig.8; utility now supports a flag to allow printing potentially sensitive keying material to standard output. - This sensitive information will not be printed by default. + This sensitive information will not be printed by default. + &merged; The &man.ifconfig.8; utility now supports a parameter, which is just an alias for , - yet is more convenient and easier to type. + yet is more convenient and easier to type. &merged; The parameter to &man.ifconfig.8; no longer requires a network interface as its argument. The argument still is supported for backward compatibility, but - is now deprecated and its use is discouraged. + is now deprecated and its use is discouraged. &merged; The &man.iostat.8; utility now supports a flag (inspired by Solaris) to print @@ -2021,9 +2027,7 @@ &merged; sendmail has been updated from - 8.13.4 to 8.14.1. This upgrade includes a new libmilter - library which requires all dynamically linked milters to be - recompiled. &merged; + 8.13.4 to 8.14.1. &merged; tcpdump has been updated from 3.9.1 to 3.9.4. &merged; ==== //depot/projects/mjexp/sbin/fdisk_pc98/fdisk.8#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/sbin/fdisk_pc98/fdisk.8,v 1.18 2006/09/18 11:55:09 ru Exp $ +.\" $FreeBSD: src/sbin/fdisk_pc98/fdisk.8,v 1.19 2007/04/21 22:47:35 imp Exp $ .\" .Dd February 26, 2006 .Dt FDISK 8 @@ -122,6 +122,7 @@ is given. .It Fl v Be verbose. +Partitions that are unused are suppressed unless this flag is specified. When .Fl f is used, ==== //depot/projects/mjexp/sbin/fdisk_pc98/fdisk.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.20 2006/02/26 07:37:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.21 2007/04/21 22:47:35 imp Exp $"); #include #include @@ -153,7 +153,7 @@ static void print_part(int i); static void init_sector0(unsigned long start); static void init_boot(void); -static void change_part(int i); +static void change_part(int i, int force); static void print_params(void); static void change_active(int which); static void change_code(void); @@ -254,16 +254,16 @@ err(1, "read_s0"); printf("%s: %d cyl %d hd %d sec\n", disk, dos_cyls, dos_heads, dos_sectors); - printf("Part %11s %11s %4s %4s\n", "Start", "Size", "MID", - "SID"); + printf("Part %11s %11s %4s %4s %-16s\n", "Start", "Size", "MID", + "SID", "Name"); for (i = 0; i < NDOSPART; i++) { partp = ((struct pc98_partition *) &mboot.parts) + i; if (partp->dp_sid == 0) continue; - printf("%4d: %11u %11u 0x%02x 0x%02x\n", i + 1, + printf("%4d: %11u %11u 0x%02x 0x%02x %-16.16s\n", i + 1, partp->dp_scyl * cylsecs, (partp->dp_ecyl - partp->dp_scyl + 1) * cylsecs, - partp->dp_mid, partp->dp_sid); + partp->dp_mid, partp->dp_sid, partp->dp_name); } exit(0); } @@ -276,6 +276,7 @@ partp = (struct pc98_partition *) (&mboot.parts[0]); partp->dp_mid = DOSMID_386BSD; partp->dp_sid = DOSSID_386BSD; + strncpy(partp->dp_name, "FreeBSD", sizeof(partp->dp_name)); /* Start c/h/s. */ partp->dp_scyl = partp->dp_ipl_cyl = 1; partp->dp_shd = partp->dp_ipl_head = 1; @@ -312,9 +313,9 @@ printf("Information from DOS bootblock is:\n"); if (partition == -1) for (i = 1; i <= NDOSPART; i++) - change_part(i); + change_part(i, v_flag); else - change_part(partition); + change_part(partition, 1); if (u_flag || a_flag) change_active(partition); @@ -349,6 +350,17 @@ exit(1); } +static struct pc98_partition mtpart; + +static int +part_unused(int i) +{ + struct pc98_partition *partp; + + partp = ((struct pc98_partition *) &mboot.parts) + i - 1; + return (bcmp(partp, &mtpart, sizeof (struct pc98_partition)) == 0); +} + static void print_s0(int which) { @@ -356,30 +368,31 @@ print_params(); printf("Information from DOS bootblock is:\n"); - if (which == -1) + if (which == -1) { for (i = 1; i <= NDOSPART; i++) - printf("%d: ", i), print_part(i); + if (v_flag || !part_unused(i)) { + printf("%d: ", i); + print_part(i); + } + } else print_part(which); } -static struct pc98_partition mtpart; - static void print_part(int i) { struct pc98_partition *partp; u_int64_t part_sz, part_mb; - partp = ((struct pc98_partition *) &mboot.parts) + i - 1; - - if (!bcmp(partp, &mtpart, sizeof (struct pc98_partition))) { + if (part_unused(i)) { printf("\n"); return; >>> TRUNCATED FOR MAIL (1000 lines) <<<