From owner-p4-projects@FreeBSD.ORG Sun Jul 24 02:29:43 2005 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 087EA16A421; Sun, 24 Jul 2005 02:29:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 554CF16A420 for ; Sun, 24 Jul 2005 02:29:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 006A143D45 for ; Sun, 24 Jul 2005 02:29:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6O2TfY7065708 for ; Sun, 24 Jul 2005 02:29:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6O2TdCG065705 for perforce@freebsd.org; Sun, 24 Jul 2005 02:29:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Jul 2005 02:29:39 GMT Message-Id: <200507240229.j6O2TdCG065705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80886 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: Sun, 24 Jul 2005 02:29:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=80886 Change 80886 by rwatson@rwatson_zoo on 2005/07/24 02:29:32 Integrate netsmp. Affected files ... .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/netsmp/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/libkern/iconv.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/netsmp/src/sys/sys/param.h#2 integrate Differences ... ==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2005 Nate Lawson * Copyright (c) 2000 Mitsuru IWASAKI * All rights reserved. * @@ -25,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.12 2005/03/17 22:42:49 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.13 2005/07/23 19:35:59 njl Exp $"); #include "opt_acpi.h" #include @@ -39,96 +40,248 @@ #include #include -MALLOC_DEFINE(M_ACPIBATT, "acpibatt", "ACPI generic battery data"); +/* Default seconds before re-sampling the battery state. */ +#define ACPI_BATTERY_INFO_EXPIRE 5 -struct acpi_batteries { - TAILQ_ENTRY(acpi_batteries) link; - struct acpi_battdesc battdesc; -}; +static int acpi_batteries_initted; +static int acpi_battery_info_expire = ACPI_BATTERY_INFO_EXPIRE; +static struct acpi_battinfo acpi_battery_battinfo; +static struct sysctl_ctx_list acpi_battery_sysctl_ctx; +static struct sysctl_oid *acpi_battery_sysctl_tree; -static TAILQ_HEAD(,acpi_batteries) acpi_batteries; -static int acpi_batteries_initted; -static int acpi_batteries_units; -static int acpi_battery_info_expire = 5; -static struct acpi_battinfo acpi_battery_battinfo; ACPI_SERIAL_DECL(battery, "ACPI generic battery"); +static void acpi_reset_battinfo(struct acpi_battinfo *info); +static int acpi_battery_ioctl(u_long cmd, caddr_t addr, void *arg); +static int acpi_battery_sysctl(SYSCTL_HANDLER_ARGS); +static int acpi_battery_units_sysctl(SYSCTL_HANDLER_ARGS); +static int acpi_battery_init(void); + +int +acpi_battery_register(device_t dev) +{ + int error; + + error = 0; + ACPI_SERIAL_BEGIN(battery); + if (!acpi_batteries_initted) + error = acpi_battery_init(); + ACPI_SERIAL_END(battery); + return (error); +} + int -acpi_battery_get_info_expire(void) +acpi_battery_remove(device_t dev) { - return (acpi_battery_info_expire); + + return (0); } int acpi_battery_get_units(void) { - return (acpi_batteries_units); + devclass_t batt_dc; + + batt_dc = devclass_find("battery"); + if (batt_dc == NULL) + return (0); + return (devclass_get_count(batt_dc)); } int -acpi_battery_get_battdesc(int unit, struct acpi_battdesc *battdesc) +acpi_battery_get_info_expire(void) { - struct acpi_batteries *bp; - int error, i; - error = ENXIO; - ACPI_SERIAL_BEGIN(battery); - if (unit < 0 || unit >= acpi_batteries_units) - goto out; + return (acpi_battery_info_expire); +} - i = 0; - TAILQ_FOREACH(bp, &acpi_batteries, link) { - if (unit == i) { - battdesc->type = bp->battdesc.type; - battdesc->phys_unit = bp->battdesc.phys_unit; - error = 0; - break; - } - i++; - } +/* Check _BST results for validity. */ +int +acpi_battery_bst_valid(struct acpi_bst *bst) +{ + if (bst->state >= ACPI_BATT_STAT_MAX || bst->cap == 0xffffffff || + bst->volt == 0xffffffff) + return (FALSE); + else + return (TRUE); +} -out: - ACPI_SERIAL_END(battery); - return (error); +/* Check _BIF results for validity. */ +int +acpi_battery_bif_valid(struct acpi_bif *bif) +{ + if (bif->lfcap == 0) + return (FALSE); + else + return (TRUE); } +/* Get info about one or all batteries. */ int -acpi_battery_get_battinfo(int unit, struct acpi_battinfo *battinfo) +acpi_battery_get_battinfo(device_t dev, struct acpi_battinfo *battinfo) { - struct acpi_battdesc battdesc; - int error; + int batt_stat, devcount, dev_idx, error, i; + int total_cap, total_min, valid_rate, valid_units; + devclass_t batt_dc; + device_t batt_dev; + struct acpi_bst *bst; + struct acpi_bif *bif; + struct acpi_battinfo *bi; + + /* + * Get the battery devclass and number of devices. If there are none + * or error, return immediately. + */ + batt_dc = devclass_find("battery"); + if (batt_dc == NULL) + return (ENXIO); + devcount = devclass_get_count(batt_dc); + if (devcount == 0) + return (ENXIO); + + /* + * Allocate storage for all _BST data, their derived battinfo data, + * and the current battery's _BIF data. + */ + bst = malloc(devcount * sizeof(*bst), M_TEMP, M_WAITOK); + bi = malloc(devcount * sizeof(*bi), M_TEMP, M_WAITOK); + bif = malloc(sizeof(*bif), M_TEMP, M_WAITOK); + + /* + * Pass 1: for each battery that is present and valid, get its status, + * calculate percent capacity remaining, and sum all the current + * discharge rates. + */ + dev_idx = -1; + batt_stat = valid_rate = valid_units = 0; + for (i = 0; i < devcount; i++) { + /* Find the device. If it disappeared, the user can try again. */ + batt_dev = devclass_get_device(batt_dc, i); + if (batt_dev == NULL) { + error = ENOMEM; + goto out; + } + + /* Default info for every battery is "not present". */ + acpi_reset_battinfo(&bi[i]); + + /* If examining a specific battery and this is it, record its index. */ + if (dev != NULL && dev == batt_dev) + dev_idx = i; + + /* Be sure we can get various info from the battery. */ + if (!acpi_BatteryIsPresent(batt_dev) || + ACPI_BATT_GET_STATUS(batt_dev, &bst[i]) != 0 || + ACPI_BATT_GET_INFO(batt_dev, bif) != 0) + continue; + + /* If a battery is not installed, we sometimes get strange values. */ + if (!acpi_battery_bst_valid(&bst[i]) || + !acpi_battery_bif_valid(bif)) + continue; + + /* Record state and calculate percent capacity remaining. */ + valid_units++; + batt_stat |= bst[i].state; + bi[i].state = bst[i].state; + bi[i].cap = 100 * bst[i].cap / bif->lfcap; + + /* + * Some laptops report the "design-capacity" instead of the + * "real-capacity" when the battery is fully charged. That breaks + * the above arithmetic as it needs to be 100% maximum. + */ + if (bi[i].cap > 100) + bi[i].cap = 100; + + /* + * On systems with more than one battery, they may get used + * sequentially, thus bst.rate may only signify the one currently + * in use. For the remaining batteries, bst.rate will be zero, + * which makes it impossible to calculate the total remaining time. + * Therefore, we sum the bst.rate for batteries in the discharging + * state and use the sum to calculate the total remaining time. + */ + if (bst[i].rate > 0 && (bst[i].state & ACPI_BATT_STAT_DISCHARG)) + valid_rate += bst[i].rate; + } - error = 0; - if (unit == -1) { - error = acpi_cmbat_get_battinfo(-1, battinfo); + /* If the caller asked for a device but we didn't find it, error. */ + if (dev != NULL && dev_idx < 0) { + error = ENXIO; goto out; - } else { - error = acpi_battery_get_battdesc(unit, &battdesc); - if (error != 0) - goto out; + } + + /* Pass 2: calculate capacity and remaining time for all batteries. */ + total_cap = total_min = 0; + for (i = 0; i < devcount; i++) { + /* + * If any batteries are discharging, use the sum of the bst.rate + * values. Otherwise, we are on AC power, and there is infinite + * time remaining for this battery until we go offline. + */ + if (valid_rate > 0) + bi[i].min = 60 * bst[i].cap / valid_rate; + else + bi[i].min = 0; + total_min += bi[i].min; + total_cap += bi[i].cap; + } - switch (battdesc.type) { - case ACPI_BATT_TYPE_CMBAT: - error = acpi_cmbat_get_battinfo(battdesc.phys_unit, battinfo); - break; - default: - error = ENXIO; - break; + /* + * Return total battery percent and time remaining. If there are + * no valid batteries, report values as unknown. + */ + if (valid_units > 0) { + if (dev == NULL) { + battinfo->cap = total_cap / valid_units; + battinfo->min = total_min; + battinfo->state = batt_stat; + battinfo->rate = valid_rate; + } else { + battinfo->cap = bi[dev_idx].cap; + battinfo->min = bi[dev_idx].min; + battinfo->state = bi[dev_idx].state; + battinfo->rate = bst[dev_idx].rate; } - } + } else + acpi_reset_battinfo(battinfo); + + error = 0; out: + if (bi) + free(bi, M_TEMP); + if (bif) + free(bif, M_TEMP); + if (bst) + free(bst, M_TEMP); return (error); } +static void +acpi_reset_battinfo(struct acpi_battinfo *info) +{ + info->cap = -1; + info->min = -1; + info->state = ACPI_BATT_STAT_NOT_PRESENT; + info->rate = -1; +} + static int acpi_battery_ioctl(u_long cmd, caddr_t addr, void *arg) { union acpi_battery_ioctl_arg *ioctl_arg; int error, unit; + device_t dev; + error = ENXIO; ioctl_arg = (union acpi_battery_ioctl_arg *)addr; - error = 0; + unit = ioctl_arg->unit; + if (unit != ACPI_BATTERY_ALL_UNITS) + dev = devclass_get_device(devclass_find("battery"), unit); + else + dev = NULL; /* * No security check required: information retrieval only. If @@ -138,17 +291,20 @@ case ACPIIO_BATT_GET_UNITS: *(int *)addr = acpi_battery_get_units(); break; - case ACPIIO_BATT_GET_BATTDESC: - unit = ioctl_arg->unit; - error = acpi_battery_get_battdesc(unit, &ioctl_arg->battdesc); + case ACPIIO_BATT_GET_BATTINFO: + if (dev != NULL || unit == ACPI_BATTERY_ALL_UNITS) + error = acpi_battery_get_battinfo(dev, &ioctl_arg->battinfo); + break; + case ACPIIO_BATT_GET_BIF: + if (dev != NULL) + error = ACPI_BATT_GET_INFO(dev, &ioctl_arg->bif); break; - case ACPIIO_BATT_GET_BATTINFO: - unit = ioctl_arg->unit; - error = acpi_battery_get_battinfo(unit, &ioctl_arg->battinfo); + case ACPIIO_BATT_GET_BST: + if (dev != NULL) + error = ACPI_BATT_GET_STATUS(dev, &ioctl_arg->bst); break; default: error = EINVAL; - break; } return (error); @@ -159,13 +315,23 @@ { int val, error; - acpi_battery_get_battinfo(-1, &acpi_battery_battinfo); + acpi_battery_get_battinfo(NULL, &acpi_battery_battinfo); val = *(u_int *)oidp->oid_arg1; error = sysctl_handle_int(oidp, &val, 0, req); return (error); } static int +acpi_battery_units_sysctl(SYSCTL_HANDLER_ARGS) +{ + int count, error; + + count = acpi_battery_get_units(); + error = sysctl_handle_int(oidp, &count, 0, req); + return (error); +} + +static int acpi_battery_init(void) { struct acpi_softc *sc; @@ -180,98 +346,54 @@ goto out; sc = device_get_softc(dev); - TAILQ_INIT(&acpi_batteries); - - /* XXX We should back out registered ioctls on error. */ error = acpi_register_ioctl(ACPIIO_BATT_GET_UNITS, acpi_battery_ioctl, NULL); if (error != 0) goto out; - error = acpi_register_ioctl(ACPIIO_BATT_GET_BATTDESC, acpi_battery_ioctl, + error = acpi_register_ioctl(ACPIIO_BATT_GET_BATTINFO, acpi_battery_ioctl, NULL); if (error != 0) goto out; - error = acpi_register_ioctl(ACPIIO_BATT_GET_BATTINFO, acpi_battery_ioctl, - NULL); + error = acpi_register_ioctl(ACPIIO_BATT_GET_BIF, acpi_battery_ioctl, NULL); + if (error != 0) + goto out; + error = acpi_register_ioctl(ACPIIO_BATT_GET_BST, acpi_battery_ioctl, NULL); if (error != 0) goto out; - sysctl_ctx_init(&sc->acpi_battery_sysctl_ctx); - sc->acpi_battery_sysctl_tree = SYSCTL_ADD_NODE(&sc->acpi_battery_sysctl_ctx, + sysctl_ctx_init(&acpi_battery_sysctl_ctx); + acpi_battery_sysctl_tree = SYSCTL_ADD_NODE(&acpi_battery_sysctl_ctx, SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "battery", CTLFLAG_RD, 0, ""); - SYSCTL_ADD_PROC(&sc->acpi_battery_sysctl_ctx, - SYSCTL_CHILDREN(sc->acpi_battery_sysctl_tree), + SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx, + SYSCTL_CHILDREN(acpi_battery_sysctl_tree), OID_AUTO, "life", CTLTYPE_INT | CTLFLAG_RD, &acpi_battery_battinfo.cap, 0, acpi_battery_sysctl, "I", ""); - SYSCTL_ADD_PROC(&sc->acpi_battery_sysctl_ctx, - SYSCTL_CHILDREN(sc->acpi_battery_sysctl_tree), + SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx, + SYSCTL_CHILDREN(acpi_battery_sysctl_tree), OID_AUTO, "time", CTLTYPE_INT | CTLFLAG_RD, &acpi_battery_battinfo.min, 0, acpi_battery_sysctl, "I", ""); - SYSCTL_ADD_PROC(&sc->acpi_battery_sysctl_ctx, - SYSCTL_CHILDREN(sc->acpi_battery_sysctl_tree), + SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx, + SYSCTL_CHILDREN(acpi_battery_sysctl_tree), OID_AUTO, "state", CTLTYPE_INT | CTLFLAG_RD, &acpi_battery_battinfo.state, 0, acpi_battery_sysctl, "I", ""); - SYSCTL_ADD_INT(&sc->acpi_battery_sysctl_ctx, - SYSCTL_CHILDREN(sc->acpi_battery_sysctl_tree), - OID_AUTO, "units", CTLFLAG_RD, &acpi_batteries_units, 0, ""); - SYSCTL_ADD_INT(&sc->acpi_battery_sysctl_ctx, - SYSCTL_CHILDREN(sc->acpi_battery_sysctl_tree), + SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx, + SYSCTL_CHILDREN(acpi_battery_sysctl_tree), + OID_AUTO, "units", CTLTYPE_INT | CTLFLAG_RD, + NULL, 0, acpi_battery_units_sysctl, "I", ""); + SYSCTL_ADD_INT(&acpi_battery_sysctl_ctx, + SYSCTL_CHILDREN(acpi_battery_sysctl_tree), OID_AUTO, "info_expire", CTLFLAG_RD | CTLFLAG_RW, &acpi_battery_info_expire, 0, ""); acpi_batteries_initted = TRUE; out: - return (error); -} - -int -acpi_battery_register(int type, int phys_unit) -{ - struct acpi_batteries *bp; - int error; - - error = 0; - bp = malloc(sizeof(*bp), M_ACPIBATT, M_NOWAIT); - if (bp == NULL) - return (ENOMEM); - - ACPI_SERIAL_BEGIN(battery); - if (!acpi_batteries_initted && (error = acpi_battery_init()) != 0) { - printf("acpi_battery_register failed for unit %d\n", phys_unit); - goto out; + if (error != 0) { + acpi_deregister_ioctl(ACPIIO_BATT_GET_UNITS, acpi_battery_ioctl); + acpi_deregister_ioctl(ACPIIO_BATT_GET_BATTINFO, acpi_battery_ioctl); + acpi_deregister_ioctl(ACPIIO_BATT_GET_BIF, acpi_battery_ioctl); + acpi_deregister_ioctl(ACPIIO_BATT_GET_BST, acpi_battery_ioctl); } - bp->battdesc.type = type; - bp->battdesc.phys_unit = phys_unit; - TAILQ_INSERT_TAIL(&acpi_batteries, bp, link); - acpi_batteries_units++; - -out: - ACPI_SERIAL_END(battery); - if (error) - free(bp, M_ACPIBATT); return (error); } - -int -acpi_battery_remove(int type, int phys_unit) -{ - struct acpi_batteries *bp, *tmp; - int ret; - - ret = ENOENT; - ACPI_SERIAL_BEGIN(battery); - TAILQ_FOREACH_SAFE(bp, &acpi_batteries, link, tmp) { - if (bp->battdesc.type == type && bp->battdesc.phys_unit == phys_unit) { - TAILQ_REMOVE(&acpi_batteries, bp, link); - acpi_batteries_units--; - ret = 0; - break; - } - } - ACPI_SERIAL_END(battery); - if (ret == 0) - free(bp, M_ACPIBATT); - return (ret); -} ==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_cmbat.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2005 Nate Lawson * Copyright (c) 2000 Munehiro Matsuda * Copyright (c) 2000 Takanori Watanabe * Copyright (c) 2000 Mitsuru IWASAKI @@ -24,10 +25,11 @@ * 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: src/sys/dev/acpica/acpi_cmbat.c,v 1.39 2004/12/20 05:03:41 njl Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.40 2005/07/23 19:35:59 njl Exp $"); + #include "opt_acpi.h" #include #include @@ -60,41 +62,29 @@ struct acpi_cmbat_softc { device_t dev; + int flags; struct acpi_bif bif; struct acpi_bst bst; struct timespec bif_lastupdated; struct timespec bst_lastupdated; - - int flags; - int present; - int cap; - int min; - int full_charge_time; - int initializing; - int phys_unit; }; -static struct timespec acpi_cmbat_info_lastupdated; ACPI_SERIAL_DECL(cmbat, "ACPI cmbat"); -/* XXX: devclass_get_maxunit() don't give us the current allocated units. */ -static int acpi_cmbat_units = 0; - -static int acpi_cmbat_info_expired(struct timespec *); -static void acpi_cmbat_info_updated(struct timespec *); -static void acpi_cmbat_get_bst(void *); -static void acpi_cmbat_get_bif(void *); -static void acpi_cmbat_notify_handler(ACPI_HANDLE, UINT32, void *); -static int acpi_cmbat_probe(device_t); -static int acpi_cmbat_attach(device_t); -static int acpi_cmbat_detach(device_t); -static int acpi_cmbat_resume(device_t); -static int acpi_cmbat_ioctl(u_long, caddr_t, void *); -static int acpi_cmbat_is_bst_valid(struct acpi_bst*); -static int acpi_cmbat_is_bif_valid(struct acpi_bif*); -static int acpi_cmbat_get_total_battinfo(struct acpi_battinfo *); -static void acpi_cmbat_init_battery(void *); +static int acpi_cmbat_probe(device_t dev); +static int acpi_cmbat_attach(device_t dev); +static int acpi_cmbat_detach(device_t dev); +static int acpi_cmbat_resume(device_t dev); +static void acpi_cmbat_notify_handler(ACPI_HANDLE h, UINT32 notify, + void *context); +static int acpi_cmbat_info_expired(struct timespec *lastupdated); +static void acpi_cmbat_info_updated(struct timespec *lastupdated); +static void acpi_cmbat_get_bst(device_t dev); +static void acpi_cmbat_get_bif(device_t dev); +static int acpi_cmbat_bst(device_t dev, struct acpi_bst *bstp); +static int acpi_cmbat_bif(device_t dev, struct acpi_bif *bifp); +static void acpi_cmbat_init_battery(void *arg); static device_method_t acpi_cmbat_methods[] = { /* Device interface */ @@ -103,11 +93,15 @@ DEVMETHOD(device_detach, acpi_cmbat_detach), DEVMETHOD(device_resume, acpi_cmbat_resume), + /* ACPI battery interface */ + DEVMETHOD(acpi_batt_get_info, acpi_cmbat_bif), + DEVMETHOD(acpi_batt_get_status, acpi_cmbat_bst), + {0, 0} }; static driver_t acpi_cmbat_driver = { - "acpi_cmbat", + "battery", acpi_cmbat_methods, sizeof(struct acpi_cmbat_softc), }; @@ -117,6 +111,96 @@ MODULE_DEPEND(acpi_cmbat, acpi, 1, 1, 1); static int +acpi_cmbat_probe(device_t dev) +{ + static char *cmbat_ids[] = { "PNP0C0A", NULL }; + + if (acpi_disabled("cmbat") || + ACPI_ID_PROBE(device_get_parent(dev), dev, cmbat_ids) == NULL) + return (ENXIO); + + device_set_desc(dev, "ACPI Control Method Battery"); + return (0); +} + +static int +acpi_cmbat_attach(device_t dev) +{ + int error; + ACPI_HANDLE handle; + struct acpi_cmbat_softc *sc; + + sc = device_get_softc(dev); + handle = acpi_get_handle(dev); + sc->dev = dev; + + timespecclear(&sc->bif_lastupdated); + timespecclear(&sc->bst_lastupdated); + + error = acpi_battery_register(dev); + if (error != 0) { + device_printf(dev, "registering battery failed\n"); + return (error); + } + + /* + * Install a system notify handler in addition to the device notify. + * Toshiba notebook uses this alternate notify for its battery. + */ + AcpiInstallNotifyHandler(handle, ACPI_ALL_NOTIFY, + acpi_cmbat_notify_handler, dev); + + AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_init_battery, dev); + + return (0); +} + +static int +acpi_cmbat_detach(device_t dev) +{ + + acpi_battery_remove(dev); + return (0); +} + +static int +acpi_cmbat_resume(device_t dev) +{ + + AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_init_battery, dev); + return (0); +} + +static void +acpi_cmbat_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context) +{ + struct acpi_cmbat_softc *sc; + device_t dev; + + dev = (device_t)context; + sc = device_get_softc(dev); + + /* + * Clear the appropriate last updated time. The next call to retrieve + * the battery status will get the new value for us. We don't need to + * acquire a lock since we are only clearing the time stamp and since + * calling _BST/_BIF can trigger a notify, we could deadlock also. + */ + switch (notify) { + case ACPI_NOTIFY_DEVICE_CHECK: + case ACPI_BATTERY_BST_CHANGE: + timespecclear(&sc->bst_lastupdated); + break; + case ACPI_NOTIFY_BUS_CHECK: + case ACPI_BATTERY_BIF_CHANGE: + timespecclear(&sc->bif_lastupdated); + break; + } + + acpi_UserNotify("CMBAT", h, notify); +} + +static int acpi_cmbat_info_expired(struct timespec *lastupdated) { struct timespec curtime; @@ -145,9 +229,8 @@ } static void -acpi_cmbat_get_bst(void *context) +acpi_cmbat_get_bst(device_t dev) { - device_t dev; struct acpi_cmbat_softc *sc; ACPI_STATUS as; ACPI_OBJECT *res; @@ -156,7 +239,6 @@ ACPI_SERIAL_ASSERT(cmbat); - dev = context; sc = device_get_softc(dev); h = acpi_get_handle(dev); bst_buffer.Pointer = NULL; @@ -205,9 +287,8 @@ } static void -acpi_cmbat_get_bif(void *context) +acpi_cmbat_get_bif(device_t dev) { - device_t dev; struct acpi_cmbat_softc *sc; ACPI_STATUS as; ACPI_OBJECT *res; @@ -216,7 +297,6 @@ ACPI_SERIAL_ASSERT(cmbat); - dev = context; sc = device_get_softc(dev); h = acpi_get_handle(dev); bif_buffer.Pointer = NULL; @@ -273,319 +353,59 @@ AcpiOsFree(bif_buffer.Pointer); } -static void -acpi_cmbat_notify_handler(ACPI_HANDLE h, UINT32 notify, void *context) -{ - device_t dev; - struct acpi_cmbat_softc *sc; - - dev = (device_t)context; - sc = device_get_softc(dev); - - acpi_UserNotify("CMBAT", h, notify); - - /* - * Clear the appropriate last updated time. The next call to retrieve - * the battery status will get the new value for us. We don't need to - * acquire a lock since we are only clearing the time stamp and since - * calling _BST/_BIF can trigger a notify, we could deadlock also. - */ - switch (notify) { - case ACPI_NOTIFY_DEVICE_CHECK: - case ACPI_BATTERY_BST_CHANGE: - timespecclear(&sc->bst_lastupdated); - break; - case ACPI_NOTIFY_BUS_CHECK: - case ACPI_BATTERY_BIF_CHANGE: - timespecclear(&sc->bif_lastupdated); - break; - default: - break; - } -} - static int -acpi_cmbat_probe(device_t dev) +acpi_cmbat_bif(device_t dev, struct acpi_bif *bifp) { - static char *cmbat_ids[] = { "PNP0C0A", NULL }; - - if (acpi_disabled("cmbat") || - ACPI_ID_PROBE(device_get_parent(dev), dev, cmbat_ids) == NULL) - return (ENXIO); - - device_set_desc(dev, "Control Method Battery"); - return (0); -} - -static int -acpi_cmbat_attach(device_t dev) -{ - int error; - ACPI_HANDLE handle; struct acpi_cmbat_softc *sc; sc = device_get_softc(dev); - handle = acpi_get_handle(dev); - sc->dev = dev; - /* - * Install a system notify handler in addition to the device notify. - * Toshiba notebook uses this alternate notify for its battery. - */ - AcpiInstallNotifyHandler(handle, ACPI_ALL_NOTIFY, - acpi_cmbat_notify_handler, dev); - ACPI_SERIAL_BEGIN(cmbat); - timespecclear(&sc->bif_lastupdated); - timespecclear(&sc->bst_lastupdated); - - if (acpi_cmbat_units == 0) { - error = acpi_register_ioctl(ACPIIO_CMBAT_GET_BIF, - acpi_cmbat_ioctl, NULL); - if (error != 0) { - device_printf(dev, "register bif ioctl failed\n"); - return (error); - } - error = acpi_register_ioctl(ACPIIO_CMBAT_GET_BST, - acpi_cmbat_ioctl, NULL); - if (error != 0) { - device_printf(dev, "register bst ioctl failed\n"); - return (error); - } - } - - sc->phys_unit = acpi_cmbat_units; - error = acpi_battery_register(ACPI_BATT_TYPE_CMBAT, sc->phys_unit); - if (error != 0) { - device_printf(dev, "registering battery %d failed\n", sc->phys_unit); - return (error); - } - acpi_cmbat_units++; - timespecclear(&acpi_cmbat_info_lastupdated); + acpi_cmbat_get_bif(dev); + bifp->units = sc->bif.units; + bifp->dcap = sc->bif.dcap; + bifp->lfcap = sc->bif.lfcap; + bifp->btech = sc->bif.btech; + bifp->dvol = sc->bif.dvol; + bifp->wcap = sc->bif.wcap; + bifp->lcap = sc->bif.lcap; + bifp->gra1 = sc->bif.gra1; + bifp->gra2 = sc->bif.gra2; + strncpy(bifp->model, sc->bif.model, sizeof(sc->bif.model)); + strncpy(bifp->serial, sc->bif.serial, sizeof(sc->bif.serial)); + strncpy(bifp->type, sc->bif.type, sizeof(sc->bif.type)); + strncpy(bifp->oeminfo, sc->bif.oeminfo, sizeof(sc->bif.oeminfo)); ACPI_SERIAL_END(cmbat); - AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_init_battery, dev); - return (0); } static int -acpi_cmbat_detach(device_t dev) +acpi_cmbat_bst(device_t dev, struct acpi_bst *bstp) { struct acpi_cmbat_softc *sc; sc = device_get_softc(dev); - ACPI_SERIAL_BEGIN(cmbat); - acpi_battery_remove(ACPI_BATT_TYPE_CMBAT, sc->phys_unit); - acpi_cmbat_units--; - ACPI_SERIAL_END(cmbat); - return (0); -} - -static int -acpi_cmbat_resume(device_t dev) -{ - AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cmbat_init_battery, dev); - return (0); -} - -static int -acpi_cmbat_ioctl(u_long cmd, caddr_t addr, void *arg) -{ - device_t dev; - union acpi_battery_ioctl_arg *ioctl_arg; - struct acpi_cmbat_softc *sc; - struct acpi_bif *bifp; - struct acpi_bst *bstp; - - ioctl_arg = (union acpi_battery_ioctl_arg *)addr; - dev = devclass_get_device(acpi_cmbat_devclass, ioctl_arg->unit); - if (dev == NULL) - return (ENXIO); - sc = device_get_softc(dev); - /* - * No security check required: information retrieval only. If - * new functions are added here, a check might be required. - */ ACPI_SERIAL_BEGIN(cmbat); - switch (cmd) { - case ACPIIO_CMBAT_GET_BIF: - acpi_cmbat_get_bif(dev); - bifp = &ioctl_arg->bif; - bifp->units = sc->bif.units; - bifp->dcap = sc->bif.dcap; - bifp->lfcap = sc->bif.lfcap; - bifp->btech = sc->bif.btech; - bifp->dvol = sc->bif.dvol; - bifp->wcap = sc->bif.wcap; - bifp->lcap = sc->bif.lcap; - bifp->gra1 = sc->bif.gra1; - bifp->gra2 = sc->bif.gra2; - strncpy(bifp->model, sc->bif.model, sizeof(sc->bif.model)); - strncpy(bifp->serial, sc->bif.serial, sizeof(sc->bif.serial)); - strncpy(bifp->type, sc->bif.type, sizeof(sc->bif.type)); - strncpy(bifp->oeminfo, sc->bif.oeminfo, sizeof(sc->bif.oeminfo)); - break; - case ACPIIO_CMBAT_GET_BST: - bstp = &ioctl_arg->bst; - if (acpi_BatteryIsPresent(dev)) { - acpi_cmbat_get_bst(dev); - bstp->state = sc->bst.state; - bstp->rate = sc->bst.rate; - bstp->cap = sc->bst.cap; - bstp->volt = sc->bst.volt; - } else { - bstp->state = ACPI_BATT_STAT_NOT_PRESENT; - } - break; - default: - break; - } + if (acpi_BatteryIsPresent(dev)) { + acpi_cmbat_get_bst(dev); + bstp->state = sc->bst.state; + bstp->rate = sc->bst.rate; + bstp->cap = sc->bst.cap; + bstp->volt = sc->bst.volt; + } else + bstp->state = ACPI_BATT_STAT_NOT_PRESENT; ACPI_SERIAL_END(cmbat); return (0); } -static int -acpi_cmbat_is_bst_valid(struct acpi_bst *bst) -{ - if (bst->state >= ACPI_BATT_STAT_MAX || bst->cap == 0xffffffff || - bst->volt == 0xffffffff) - return (FALSE); - else - return (TRUE); -} - -static int -acpi_cmbat_is_bif_valid(struct acpi_bif *bif) -{ - if (bif->lfcap == 0) - return (FALSE); - else - return (TRUE); -} - -static int -acpi_cmbat_get_total_battinfo(struct acpi_battinfo *battinfo) -{ - int i; - int error; - int batt_stat; - int valid_rate, valid_units; - int cap, min; - int total_cap, total_min, total_full; - struct acpi_cmbat_softc *sc; - - ACPI_SERIAL_ASSERT(cmbat); - - cap = min = -1; - batt_stat = ACPI_BATT_STAT_NOT_PRESENT; - error = 0; - - /* Get battery status, valid rate and valid units */ - batt_stat = valid_rate = valid_units = 0; - for (i = 0; i < acpi_cmbat_units; i++) { - sc = devclass_get_softc(acpi_cmbat_devclass, i); - if (sc == NULL) - continue; - sc->present = acpi_BatteryIsPresent(sc->dev); - if (!sc->present) - continue; - acpi_cmbat_get_bst(sc->dev); - - /* If battery not installed, we get strange values */ - if (!acpi_cmbat_is_bst_valid(&sc->bst) || - !acpi_cmbat_is_bif_valid(&sc->bif)) { - sc->present = FALSE; - continue; - } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 24 12:45:48 2005 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 EDC3316A421; Sun, 24 Jul 2005 12:45:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C80E416A41F for ; Sun, 24 Jul 2005 12:45:47 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 954EB43D45 for ; Sun, 24 Jul 2005 12:45:47 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OCjl8e002425 for ; Sun, 24 Jul 2005 12:45:47 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OCjlIF002422 for perforce@freebsd.org; Sun, 24 Jul 2005 12:45:47 GMT (envelope-from soc-saturnero@freebsd.org) Date: Sun, 24 Jul 2005 12:45:47 GMT Message-Id: <200507241245.j6OCjlIF002422@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80899 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: Sun, 24 Jul 2005 12:45:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=80899 Change 80899 by soc-saturnero@soc-saturnero_sberta on 2005/07/24 12:45:14 Added iso target Affected files ... .. //depot/projects/soc2005/freesbie/Makefile#6 edit .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#6 edit .. //depot/projects/soc2005/freesbie/scripts/iso.sh#1 add .. //depot/projects/soc2005/freesbie/scripts/powerpc/iso.sh#1 add Differences ... ==== //depot/projects/soc2005/freesbie/Makefile#6 (text+ko) ==== @@ -7,7 +7,7 @@ all: freesbie -freesbie: buildworld buildkernel installworld installkernel clonefs +freesbie: iso buildworld: .done_buildworld .done_buildworld: @@ -24,7 +24,7 @@ @mv .tmp_installworld .done_installworld buildkernel: .done_buildkernel -.done_buildkernel: +.done_buildkernel: .done_buildworld @-rm -f .tmp_buildkernel @touch .tmp_buildkernel @sh ./scripts/launch.sh buildkernel .tmp_buildkernel @@ -44,8 +44,15 @@ @sh ./scripts/launch.sh clonefs .tmp_clonefs @mv .tmp_clonefs .done_clonefs +iso: .done_iso +.done_iso: .done_clonefs + @-rm -f .tmp_iso + @touch .tmp_iso + @sh ./scripts/launch.sh iso .tmp_iso + @mv .tmp_iso .done_iso + clean: @-rm -f .tmp* .done* > /dev/null 2>&1 cleandir: clean - @sh ./scripts/launch.sh cleandir+ @sh ./scripts/launch.sh cleandir ==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#6 (text+ko) ==== @@ -19,11 +19,11 @@ # Directory with system sources SRCDIR="/usr/src" -# Path of the built iso -ISOPATH="FreeSBIE.iso" +# Path of the built iso, use absolute path +ISOPATH="/usr/obj/FreeSBIE.iso" -# Path of the built image -IMGPATH="FreeSBIE.img" +# Path of the built image, use absolute path +IMGPATH="/usr/obj/FreeSBIE.img" # From owner-p4-projects@FreeBSD.ORG Sun Jul 24 14:27:54 2005 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 3B6FE16A421; Sun, 24 Jul 2005 14:27:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1124C16A41F for ; Sun, 24 Jul 2005 14:27:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C180343D4C for ; Sun, 24 Jul 2005 14:27:53 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OERrEj013426 for ; Sun, 24 Jul 2005 14:27:53 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OERrrV013420 for perforce@freebsd.org; Sun, 24 Jul 2005 14:27:53 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 14:27:53 GMT Message-Id: <200507241427.j6OERrrV013420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80903 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: Sun, 24 Jul 2005 14:27:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=80903 Change 80903 by wsalamon@gretsch on 2005/07/24 14:27:10 Add events for NSTAT/NFSTAT/NLSTAT syscalls. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#17 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#17 (text+ko) ==== @@ -303,6 +303,9 @@ #define AUE_FHOPEN 372 /* FreeBSD */ #define AUE_FHSTAT 373 /* FreeBSD */ #define AUE_JAIL 374 /* FreeBSD */ +#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ +#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ +#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Sun Jul 24 14:35:03 2005 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 2777A16A421; Sun, 24 Jul 2005 14:35:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0261116A41F for ; Sun, 24 Jul 2005 14:35:03 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CACD643D45 for ; Sun, 24 Jul 2005 14:35:02 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OEZ2TM015531 for ; Sun, 24 Jul 2005 14:35:02 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OEZ2p0015528 for perforce@freebsd.org; Sun, 24 Jul 2005 14:35:02 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 14:35:02 GMT Message-Id: <200507241435.j6OEZ2p0015528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80904 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: Sun, 24 Jul 2005 14:35:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=80904 Change 80904 by wsalamon@gretsch on 2005/07/24 14:34:06 style(9) fix, place a tab between #define and macro name. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#18 (text+ko) ==== @@ -303,9 +303,9 @@ #define AUE_FHOPEN 372 /* FreeBSD */ #define AUE_FHSTAT 373 /* FreeBSD */ #define AUE_JAIL 374 /* FreeBSD */ -#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ -#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ -#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ +#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ +#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ +#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Sun Jul 24 14:38:07 2005 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 7450F16A421; Sun, 24 Jul 2005 14:38:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4CB6A16A420 for ; Sun, 24 Jul 2005 14:38:07 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1890D43D48 for ; Sun, 24 Jul 2005 14:38:07 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OEc6tc016722 for ; Sun, 24 Jul 2005 14:38:06 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OEc62K016719 for perforce@freebsd.org; Sun, 24 Jul 2005 14:38:06 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 14:38:06 GMT Message-Id: <200507241438.j6OEc62K016719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80905 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: Sun, 24 Jul 2005 14:38:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=80905 Change 80905 by wsalamon@gretsch on 2005/07/24 14:37:51 Integrate new events from OpenBSM branch into TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#5 (text+ko) ==== @@ -291,12 +291,21 @@ #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 #define AUE_LCHFLAGS 362 /* FreeBSD */ -#define AUE_SENDFILE 363 /* FreeBSD */ +#define AUE_SENDFILE 363 #define AUE_USELIB 364 /* Linux */ #define AUE_GETRESUID 365 #define AUE_SETRESUID 366 #define AUE_GETRESGID 367 #define AUE_SETRESGID 368 +#define AUE_WAIT4 369 /* FreeBSD */ +#define AUE_LGETFH 370 /* FreeBSD */ +#define AUE_FHSTATFS 371 /* FreeBSD */ +#define AUE_FHOPEN 372 /* FreeBSD */ +#define AUE_FHSTAT 373 /* FreeBSD */ +#define AUE_JAIL 374 /* FreeBSD */ +#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ +#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ +#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Sun Jul 24 14:43:14 2005 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 58A8F16A421; Sun, 24 Jul 2005 14:43:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0408C16A41F for ; Sun, 24 Jul 2005 14:43:14 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA89443D48 for ; Sun, 24 Jul 2005 14:43:13 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OEhDfd017958 for ; Sun, 24 Jul 2005 14:43:13 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OEhDcX017955 for perforce@freebsd.org; Sun, 24 Jul 2005 14:43:13 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 14:43:13 GMT Message-Id: <200507241443.j6OEhDcX017955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80906 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: Sun, 24 Jul 2005 14:43:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=80906 Change 80906 by wsalamon@gretsch on 2005/07/24 14:42:21 Integrate audit events from TrustedBSD audit3 contrib tree into kernel BSM tree. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#6 (text+ko) ==== @@ -291,12 +291,21 @@ #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 #define AUE_LCHFLAGS 362 /* FreeBSD */ -#define AUE_SENDFILE 363 /* FreeBSD */ +#define AUE_SENDFILE 363 #define AUE_USELIB 364 /* Linux */ #define AUE_GETRESUID 365 #define AUE_SETRESUID 366 #define AUE_GETRESGID 367 #define AUE_SETRESGID 368 +#define AUE_WAIT4 369 /* FreeBSD */ +#define AUE_LGETFH 370 /* FreeBSD */ +#define AUE_FHSTATFS 371 /* FreeBSD */ +#define AUE_FHOPEN 372 /* FreeBSD */ +#define AUE_FHSTAT 373 /* FreeBSD */ +#define AUE_JAIL 374 /* FreeBSD */ +#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ +#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ +#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Sun Jul 24 14:56:31 2005 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 B20B016A421; Sun, 24 Jul 2005 14:56:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 851F316A41F for ; Sun, 24 Jul 2005 14:56:30 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5796243D46 for ; Sun, 24 Jul 2005 14:56:30 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OEuUeq018575 for ; Sun, 24 Jul 2005 14:56:30 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OEuUTj018572 for perforce@freebsd.org; Sun, 24 Jul 2005 14:56:30 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 14:56:30 GMT Message-Id: <200507241456.j6OEuUTj018572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80907 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: Sun, 24 Jul 2005 14:56:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=80907 Change 80907 by wsalamon@gretsch on 2005/07/24 14:56:19 Bump the event numbers up by one, starting with AUE_LCHFLAGS, to remove the duplicate number assigned to AUE_LUTIMES and AUE_LCHFLAGS. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#19 (text+ko) ==== @@ -290,22 +290,22 @@ #define AUE_SYSCTL_NONADMIN 360 #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 362 /* FreeBSD */ -#define AUE_SENDFILE 363 -#define AUE_USELIB 364 /* Linux */ -#define AUE_GETRESUID 365 -#define AUE_SETRESUID 366 -#define AUE_GETRESGID 367 -#define AUE_SETRESGID 368 -#define AUE_WAIT4 369 /* FreeBSD */ -#define AUE_LGETFH 370 /* FreeBSD */ -#define AUE_FHSTATFS 371 /* FreeBSD */ -#define AUE_FHOPEN 372 /* FreeBSD */ -#define AUE_FHSTAT 373 /* FreeBSD */ -#define AUE_JAIL 374 /* FreeBSD */ -#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ -#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ -#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ +#define AUE_LCHFLAGS 363 /* FreeBSD */ +#define AUE_SENDFILE 364 +#define AUE_USELIB 365 /* Linux */ +#define AUE_GETRESUID 366 +#define AUE_SETRESUID 367 +#define AUE_GETRESGID 368 +#define AUE_SETRESGID 369 +#define AUE_WAIT4 370 /* FreeBSD */ +#define AUE_LGETFH 371 /* FreeBSD */ +#define AUE_FHSTATFS 372 /* FreeBSD */ +#define AUE_FHOPEN 373 /* FreeBSD */ +#define AUE_FHSTAT 374 /* FreeBSD */ +#define AUE_JAIL 375 /* FreeBSD */ +#define AUE_NSTAT 376 /* FreeBSD/NetBSD */ +#define AUE_NFSTAT 377 /* FreeBSD/NetBSD */ +#define AUE_NLSTAT 378 /* FreeBSD/NetBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Sun Jul 24 14:59:35 2005 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 EA2F316A421; Sun, 24 Jul 2005 14:59:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE1CE16A41F for ; Sun, 24 Jul 2005 14:59:34 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8108743D46 for ; Sun, 24 Jul 2005 14:59:34 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OExYlE018729 for ; Sun, 24 Jul 2005 14:59:34 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OExY3m018726 for perforce@freebsd.org; Sun, 24 Jul 2005 14:59:34 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 14:59:34 GMT Message-Id: <200507241459.j6OExY3m018726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80908 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: Sun, 24 Jul 2005 14:59:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=80908 Change 80908 by wsalamon@gretsch on 2005/07/24 14:59:27 Integrate audit event changes from OpenBSM to TrustedBSD/audit3. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#6 (text+ko) ==== @@ -290,22 +290,22 @@ #define AUE_SYSCTL_NONADMIN 360 #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 362 /* FreeBSD */ -#define AUE_SENDFILE 363 -#define AUE_USELIB 364 /* Linux */ -#define AUE_GETRESUID 365 -#define AUE_SETRESUID 366 -#define AUE_GETRESGID 367 -#define AUE_SETRESGID 368 -#define AUE_WAIT4 369 /* FreeBSD */ -#define AUE_LGETFH 370 /* FreeBSD */ -#define AUE_FHSTATFS 371 /* FreeBSD */ -#define AUE_FHOPEN 372 /* FreeBSD */ -#define AUE_FHSTAT 373 /* FreeBSD */ -#define AUE_JAIL 374 /* FreeBSD */ -#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ -#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ -#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ +#define AUE_LCHFLAGS 363 /* FreeBSD */ +#define AUE_SENDFILE 364 +#define AUE_USELIB 365 /* Linux */ +#define AUE_GETRESUID 366 +#define AUE_SETRESUID 367 +#define AUE_GETRESGID 368 +#define AUE_SETRESGID 369 +#define AUE_WAIT4 370 /* FreeBSD */ +#define AUE_LGETFH 371 /* FreeBSD */ +#define AUE_FHSTATFS 372 /* FreeBSD */ +#define AUE_FHOPEN 373 /* FreeBSD */ +#define AUE_FHSTAT 374 /* FreeBSD */ +#define AUE_JAIL 375 /* FreeBSD */ +#define AUE_NSTAT 376 /* FreeBSD/NetBSD */ +#define AUE_NFSTAT 377 /* FreeBSD/NetBSD */ +#define AUE_NLSTAT 378 /* FreeBSD/NetBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Sun Jul 24 15:01:38 2005 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 C7E5116A421; Sun, 24 Jul 2005 15:01:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A285416A41F for ; Sun, 24 Jul 2005 15:01:37 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74E7543D45 for ; Sun, 24 Jul 2005 15:01:37 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OF1bn5018877 for ; Sun, 24 Jul 2005 15:01:37 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OF1bXU018874 for perforce@freebsd.org; Sun, 24 Jul 2005 15:01:37 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 15:01:37 GMT Message-Id: <200507241501.j6OF1bXU018874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80909 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: Sun, 24 Jul 2005 15:01:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=80909 Change 80909 by wsalamon@gretsch on 2005/07/24 15:01:26 Integrate audit event changes from TrustedBSD/audit3 contrib tree to kernel tree. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#7 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#7 (text+ko) ==== @@ -290,22 +290,22 @@ #define AUE_SYSCTL_NONADMIN 360 #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 362 /* FreeBSD */ -#define AUE_SENDFILE 363 -#define AUE_USELIB 364 /* Linux */ -#define AUE_GETRESUID 365 -#define AUE_SETRESUID 366 -#define AUE_GETRESGID 367 -#define AUE_SETRESGID 368 -#define AUE_WAIT4 369 /* FreeBSD */ -#define AUE_LGETFH 370 /* FreeBSD */ -#define AUE_FHSTATFS 371 /* FreeBSD */ -#define AUE_FHOPEN 372 /* FreeBSD */ -#define AUE_FHSTAT 373 /* FreeBSD */ -#define AUE_JAIL 374 /* FreeBSD */ -#define AUE_NSTAT 375 /* FreeBSD/NetBSD */ -#define AUE_NFSTAT 376 /* FreeBSD/NetBSD */ -#define AUE_NLSTAT 377 /* FreeBSD/NetBSD */ +#define AUE_LCHFLAGS 363 /* FreeBSD */ +#define AUE_SENDFILE 364 +#define AUE_USELIB 365 /* Linux */ +#define AUE_GETRESUID 366 +#define AUE_SETRESUID 367 +#define AUE_GETRESGID 368 +#define AUE_SETRESGID 369 +#define AUE_WAIT4 370 /* FreeBSD */ +#define AUE_LGETFH 371 /* FreeBSD */ +#define AUE_FHSTATFS 372 /* FreeBSD */ +#define AUE_FHOPEN 373 /* FreeBSD */ +#define AUE_FHSTAT 374 /* FreeBSD */ +#define AUE_JAIL 375 /* FreeBSD */ +#define AUE_NSTAT 376 /* FreeBSD/NetBSD */ +#define AUE_NFSTAT 377 /* FreeBSD/NetBSD */ +#define AUE_NLSTAT 378 /* FreeBSD/NetBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Sun Jul 24 15:22:03 2005 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 E6BB116A421; Sun, 24 Jul 2005 15:22:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B8D5816A41F for ; Sun, 24 Jul 2005 15:22:02 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D1C243D46 for ; Sun, 24 Jul 2005 15:22:02 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OFM2lY019631 for ; Sun, 24 Jul 2005 15:22:02 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OFM2rh019628 for perforce@freebsd.org; Sun, 24 Jul 2005 15:22:02 GMT (envelope-from wsalamon@computer.org) Date: Sun, 24 Jul 2005 15:22:02 GMT Message-Id: <200507241522.j6OFM2rh019628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80910 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: Sun, 24 Jul 2005 15:22:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=80910 Change 80910 by wsalamon@gretsch on 2005/07/24 15:21:53 Add new BSM event definitions. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#2 (text+ko) ==== @@ -169,7 +169,6 @@ 205:AUE_SETGID:old setgid(2):pc 206:AUE_READL:readl(2):no 207:AUE_READVL:readvl(2):no -208:AUE_FSTAT:fstat(2):fa 209:AUE_DUP2:dup2(2):no 210:AUE_MMAP:mmap(2):fa 211:AUE_AUDIT:audit(2):ot @@ -284,6 +283,23 @@ 359:AUE_PIDFORTASK:pid_for_task():pc 360:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot 361:AUE_COPYFILE:copyfile():fr,fw +362:AUE_LUTIMES:lutimes(2):fm +363:AUE_LCHFLAGS:lchflags(2):fm +364:AUE_SENDFILE:sendfile(2):nt +365:AUE_USELIB:uselib(2):fa +366:AUE_GETRESUID:getresuid(2):pc +367:AUE_SETRESUID:setresuid(2):pc +368:AUE_GETRESGID:getresgid(2):pc +369:AUE_SETRESGID:setresgid(2):pc +370:AUE_WAIT4:wait4(2):pc +371:AUE_LGETFH:lgetfh(2):fa +372:AUE_FHSTATFS:fhstatfs(2):fa +373:AUE_FHOPEN:fhopen(2):fa +374:AUE_FHSTAT:fhstat(2):fa +375:AUE_JAIL:jail(2):pc +376:AUE_NSTAT:nstat(2):fa +377:AUE_NFSTAT:nfstat(2):fa +378:AUE_NLSTAT:nlstat(2):fa 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-p4-projects@FreeBSD.ORG Sun Jul 24 17:58:14 2005 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 F1F9816A421; Sun, 24 Jul 2005 17:58:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C679F16A41F for ; Sun, 24 Jul 2005 17:58:13 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E1D843D45 for ; Sun, 24 Jul 2005 17:58:13 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OHwDm8033420 for ; Sun, 24 Jul 2005 17:58:13 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OHwCq5033417 for perforce@freebsd.org; Sun, 24 Jul 2005 17:58:12 GMT (envelope-from peter@freebsd.org) Date: Sun, 24 Jul 2005 17:58:12 GMT Message-Id: <200507241758.j6OHwCq5033417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80916 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: Sun, 24 Jul 2005 17:58:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=80916 Change 80916 by peter@peter_overcee on 2005/07/24 17:57:51 IFC @80915 Affected files ... .. //depot/projects/hammer/Makefile#34 integrate .. //depot/projects/hammer/Makefile.inc1#99 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#1 branch .. //depot/projects/hammer/UPDATING#82 integrate .. //depot/projects/hammer/etc/Makefile#41 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#57 integrate .. //depot/projects/hammer/etc/rc.d/bgfsck#6 integrate .. //depot/projects/hammer/etc/rc.d/power_profile#7 integrate .. //depot/projects/hammer/games/fortune/fortune/fortune.c#6 integrate .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#7 integrate .. //depot/projects/hammer/gnu/lib/libg2c/Makefile#7 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#12 integrate .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#7 integrate .. //depot/projects/hammer/gnu/lib/libregex/Makefile#9 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#24 integrate .. //depot/projects/hammer/include/netdb.h#12 integrate .. //depot/projects/hammer/kerberos5/lib/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libalias/Makefile#12 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#24 integrate .. //depot/projects/hammer/lib/libbegemot/Makefile#3 integrate .. //depot/projects/hammer/lib/libbluetooth/Makefile#2 integrate .. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libbz2/Makefile#4 integrate .. //depot/projects/hammer/lib/libc/gen/getnetgrent.c#6 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#23 integrate .. //depot/projects/hammer/lib/libc/nls/pl_PL.ISO8859-2.msg#2 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#18 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#10 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#7 integrate .. //depot/projects/hammer/lib/libdevstat/Makefile#7 integrate .. //depot/projects/hammer/lib/libdevstat/devstat.h#3 integrate .. //depot/projects/hammer/lib/libedit/Makefile#4 integrate .. //depot/projects/hammer/lib/libexpat/Makefile#4 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#11 integrate .. //depot/projects/hammer/lib/libftpio/Makefile#3 integrate .. //depot/projects/hammer/lib/libgpib/Makefile#2 integrate .. //depot/projects/hammer/lib/libipsec/Makefile#6 integrate .. //depot/projects/hammer/lib/libkiconv/Makefile#3 integrate .. //depot/projects/hammer/lib/libmagic/Makefile#5 integrate .. //depot/projects/hammer/lib/libmemstat/Makefile#2 integrate .. //depot/projects/hammer/lib/libmemstat/libmemstat.3#3 integrate .. //depot/projects/hammer/lib/libmemstat/memstat.c#3 integrate .. //depot/projects/hammer/lib/libmemstat/memstat.h#3 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_internal.h#3 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_malloc.c#3 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_uma.c#3 integrate .. //depot/projects/hammer/lib/libmp/Makefile#4 integrate .. //depot/projects/hammer/lib/libncp/Makefile#4 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#16 integrate .. //depot/projects/hammer/lib/libnetgraph/Makefile#4 integrate .. //depot/projects/hammer/lib/libngatm/Makefile#6 integrate .. //depot/projects/hammer/lib/libopie/Makefile#7 integrate .. //depot/projects/hammer/lib/libpam/Makefile.inc#9 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#17 integrate .. //depot/projects/hammer/lib/libradius/Makefile#8 integrate .. //depot/projects/hammer/lib/libsdp/Makefile#4 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#6 integrate .. //depot/projects/hammer/lib/libtacplus/Makefile#5 integrate .. //depot/projects/hammer/lib/libthr/Makefile#12 integrate .. //depot/projects/hammer/lib/libthread_db/Makefile#5 integrate .. //depot/projects/hammer/lib/libugidfw/Makefile#6 integrate .. //depot/projects/hammer/lib/libusbhid/Makefile#5 integrate .. //depot/projects/hammer/lib/libutil/Makefile#8 integrate .. //depot/projects/hammer/lib/libvgl/Makefile#3 integrate .. //depot/projects/hammer/lib/libwrap/Makefile#8 integrate .. //depot/projects/hammer/lib/libypclnt/Makefile#5 integrate .. //depot/projects/hammer/lib/msun/Makefile#28 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#17 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#11 integrate .. //depot/projects/hammer/secure/lib/libssl/Makefile#8 integrate .. //depot/projects/hammer/share/man/man4/kbdmux.4#2 integrate .. //depot/projects/hammer/share/man/man7/build.7#9 integrate .. //depot/projects/hammer/share/man/man7/ffs.7#3 integrate .. //depot/projects/hammer/share/man/man9/vhold.9#3 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#104 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#78 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#19 integrate .. //depot/projects/hammer/sys/amd64/include/bus_dma.h#18 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_copy.c#6 integrate .. //depot/projects/hammer/sys/conf/files.amd64#77 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdDebug.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdMemory.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdStream.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#8 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#18 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#22 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpiio.h#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#46 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/amrr/amrr.c#7 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/onoe/onoe.c#8 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#34 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#16 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#19 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#38 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_machdep.c#22 integrate .. //depot/projects/hammer/sys/i386/bios/smapi_bios.S#4 integrate .. //depot/projects/hammer/sys/libkern/iconv.c#8 integrate .. //depot/projects/hammer/sys/net/bpf.c#35 integrate .. //depot/projects/hammer/sys/net/bpfdesc.h#11 integrate .. //depot/projects/hammer/sys/net/if_var.h#32 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#21 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#21 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#23 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#17 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#33 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#18 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#21 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#36 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#20 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#15 integrate .. //depot/projects/hammer/sys/sys/param.h#64 integrate .. //depot/projects/hammer/tools/regression/netinet/msocket/Makefile#1 branch .. //depot/projects/hammer/tools/regression/netinet/msocket/msocket.c#1 branch .. //depot/projects/hammer/tools/regression/netinet/udpconnectjail/udpconnectjail.c#2 integrate .. //depot/projects/hammer/tools/tools/ath/80211debug.c#2 integrate .. //depot/projects/hammer/tools/tools/ath/80211stats.c#6 integrate .. //depot/projects/hammer/usr.bin/netstat/mbuf.c#10 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.c#11 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#3 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.1#6 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndisgen.8#3 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/ndisgen.sh#2 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#6 integrate Differences ... ==== //depot/projects/hammer/Makefile#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.321 2005/07/19 11:21:14 ru Exp $ +# $FreeBSD: src/Makefile,v 1.322 2005/07/23 14:23:30 netchild Exp $ # # The user-driven targets are: # @@ -16,6 +16,9 @@ # reinstallkernel.debug # kernel - buildkernel + installkernel. # update - Convenient way to update your source tree (cvs). +# check-old - Print a list of old files/directories in the system. +# delete-old - Delete obsolete files and directories interactively. +# delete-old-libs - Delete obsolete libraries interactively. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -38,15 +41,17 @@ # For individuals wanting to upgrade their sources (even if only a # delta of a few days): # -# 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. `make buildworld' -# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). -# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). -# 5. `reboot' (in single user mode: boot -s from the loader prompt). -# 6. `mergemaster -p' -# 7. `make installworld' -# 8. `mergemaster' -# 9. `reboot' +# 1. `cd /usr/src' (or to the directory containing your source tree). +# 2. `make buildworld' +# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 5. `reboot' (in single user mode: boot -s from the loader prompt). +# 6. `mergemaster -p' +# 7. `make installworld' +# 8. `make delete-old' +# 9. `mergemaster' +# 10. `reboot' +# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) # # See src/UPDATING `COMMON ITEMS' for more complete information. # @@ -62,9 +67,9 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distributeworld \ - distrib-dirs distribution everything \ +TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ + clean cleandepend cleandir delete-old delete-old-libs depend \ + distribute distributeworld distrib-dirs distribution everything \ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ kernel-toolchain libraries lint maninstall \ ==== //depot/projects/hammer/Makefile.inc1#99 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.500 2005/07/15 14:38:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.501 2005/07/23 14:23:30 netchild Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -1070,3 +1070,95 @@ .endfor .include + +# +# check for / delete old files section +# + +.include "ObsoleteFiles.inc" + +OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \ +else you can not start such an application. Consult UPDATING for more \ +information regarding how to cope with the removal/revision bump of a \ +specific library." + +.if !defined(BATCH_DELETE_OLD_FILES) +RM_I=-i +.endif + +delete-old-files: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old files (only deletes safe to delete libs)" +.for file in ${OLD_FILES} +# Ask for every old file if the user really wants to remove it. +# It's anoying, but beter safe than sorry. + @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ + || ([ -f "${DESTDIR}/${file}" ] \ + && echo "Removing schg flag on ${DESTDIR}/${file}" \ + && chflags noschg "${DESTDIR}/${file}" \ + && rm ${RM_I} "${DESTDIR}/${file}")) +.endfor + @echo ">>> Old files removed" + +check-old-files: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old files" +.for file in ${OLD_FILES} + @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" +.endfor + +delete-old-libs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old libraries" + @echo "${OLD_LIBS_MESSAGE}" | fmt +.for file in ${OLD_LIBS} + @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ + || ([ -f "${DESTDIR}/${file}" ] \ + && echo "Removing schg flag on ${DESTDIR}/${file}" \ + && chflags noschg "${DESTDIR}/${file}" \ + && rm ${RM_I} "${DESTDIR}/${file}")) +.endfor + @echo ">>> Old libraries removed" + +check-old-libs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old libraries" +.for file in ${OLD_LIBS} + @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" +.endfor + +delete-old-dirs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old directories" +.for dir in ${OLD_DIRS} +# Don't fail if an old directory isn't empty. + @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) +.endfor + @echo ">>> Old directories removed" + +check-old-dirs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old directories" +.for dir in ${OLD_DIRS} + @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" +.endfor + +delete-old: delete-old-files delete-old-dirs + @echo "To remove old libraries run '${MAKE} delete-old-libs'." + +check-old: check-old-files check-old-libs check-old-dirs + @echo "To remove old files and directories run '${MAKE} delete-old'." + @echo "To remove old libraries run '${MAKE} delete-old-libs'." + ==== //depot/projects/hammer/UPDATING#82 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20050722: + The ai_addrlen of a struct addrinfo was changed to a socklen_t + to conform to POSIX-2001. This change broke an ABI + compatibility on 64 bit architecture. You have to recompile + userland programs that use getaddrinfo(3) on 64 bit + architecture. + 20050711: RELENG_6 branched here. @@ -270,6 +277,7 @@ [3] mergemaster -p [5] make installworld + make delete-old mergemaster [4] @@ -307,6 +315,7 @@ [3] mergemaster -p [5] make installworld + make delete-old mergemaster -i [4] @@ -400,4 +409,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.417 2005/07/11 15:46:45 kensmith Exp $ +$FreeBSD: src/UPDATING,v 1.419 2005/07/23 14:23:30 netchild Exp $ ==== //depot/projects/hammer/etc/Makefile#41 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.344 2005/07/15 14:52:29 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.345 2005/07/22 10:35:35 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -86,6 +86,10 @@ .endif distribution: +.if !defined(DESTDIR) + @echo "set DESTDIR before running \"make ${.TARGET}\"" + @false +.endif cd ${.CURDIR}; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ ==== //depot/projects/hammer/etc/defaults/rc.conf#57 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.253 2005/07/21 15:17:54 pav Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.254 2005/07/22 00:38:55 obrien Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -482,10 +482,10 @@ devfs_system_ruleset="" # The name of a ruleset to apply to /dev devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to # apply (must be mounted already, i.e. fstab(5)) -performance_cx_lowest="HIGH" # Online CPU idle state -performance_cpu_freq="NONE" # Online CPU frequency -economy_cx_lowest="HIGH" # Offline CPU idle state -economy_cpu_freq="NONE" # Offline CPU frequency +performance_cx_lowest="HIGH" # Online CPU idle state +performance_cpu_freq="NONE" # Online CPU frequency +economy_cx_lowest="HIGH" # Offline CPU idle state +economy_cpu_freq="NONE" # Offline CPU frequency virecover_enable="YES" # Perform housekeeping for the vi(1) editor ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot bsdextended_script="/etc/rc.bsdextended" # Default mac_bsdextended(4) ==== //depot/projects/hammer/etc/rc.d/bgfsck#6 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.6 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.7 2005/07/22 00:57:37 obrien Exp $ # # PROVIDE: bgfsck -# REQUIRE: cron devfs +# REQUIRE: cron devfs syslogd # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/power_profile#7 (text+ko) ==== @@ -5,11 +5,13 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.7 2005/02/26 20:17:07 njl Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.8 2005/07/22 00:57:04 obrien Exp $ # # PROVIDE: power_profile +# REQUIRE: mountcritlocal syslogd # KEYWORD: nojail nostart +# BEFORE: NETWORKING . /etc/rc.subr ==== //depot/projects/hammer/games/fortune/fortune/fortune.c#6 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.27 2005/02/17 18:06:37 ru Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.29 2005/07/23 18:24:47 ache Exp $"); # include # include ==== //depot/projects/hammer/gnu/lib/libdialog/Makefile#7 (text+ko) ==== @@ -1,11 +1,11 @@ # Makefile for libdialog -# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.42 2005/04/22 18:57:32 trhodes Exp $ +# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.43 2005/07/22 17:18:57 kensmith Exp $ LIB= dialog INCS= dialog.h MAN= dialog.3 -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 SRCS= kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \ lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \ fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c ==== //depot/projects/hammer/gnu/lib/libg2c/Makefile#7 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.15 2004/12/21 09:33:45 ru Exp $ +# $FreeBSD: src/gnu/lib/libg2c/Makefile,v 1.16 2005/07/22 17:18:57 kensmith Exp $ SRCDIR= ${.CURDIR}/../../../contrib/libf2c .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77 LIB= g2c -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 # Traditional FORTRAN Library members defined in libF77 ==== //depot/projects/hammer/gnu/lib/libobjc/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.26 2005/05/01 01:59:48 peter Exp $ +# $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.27 2005/07/22 17:18:58 kensmith Exp $ OBJCDIR=${.CURDIR}/../../../contrib/libobjc GCCDIR= ${.CURDIR}/../../../contrib/gcc @@ -6,7 +6,7 @@ .PATH: ${OBJCDIR}/objc ${OBJCDIR} LIB= objc -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 NO_MAN= SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ ==== //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#7 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.11 2004/10/18 08:29:47 ache Exp $ +# $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.12 2005/07/22 17:18:58 kensmith Exp $ -SHLIB_MAJOR=5 +SHLIB_MAJOR=6 RL_LIBRARY_VERSION=5.0 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline ==== //depot/projects/hammer/gnu/lib/libregex/Makefile#9 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.31 2005/05/10 11:37:37 tjr Exp $ +# $FreeBSD: src/gnu/lib/libregex/Makefile,v 1.32 2005/07/22 17:18:58 kensmith Exp $ SUBDIR= doc LIB= gnuregex -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS ==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.55 2005/04/22 18:57:32 trhodes Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.56 2005/07/22 17:18:58 kensmith Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -9,7 +9,7 @@ ${SUPDIR} ${GCCDIR} LIB= stdc++ -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include ==== //depot/projects/hammer/include/netdb.h#12 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.38 2005/06/03 03:32:06 ume Exp $ + * $FreeBSD: src/include/netdb.h,v 1.39 2005/07/22 18:21:28 ume Exp $ */ #ifndef _NETDB_H_ @@ -63,8 +63,6 @@ #include #include -#include -#include #ifndef _SIZE_T_DECLARED typedef __size_t size_t; @@ -125,29 +123,12 @@ int p_proto; /* protocol # */ }; -/* - * Note: ai_addrlen used to be a size_t, per RFC 2553. - * In XNS5.2, and subsequently in POSIX-2001 and RFC 3493 it was - * changed to a socklen_t. - * To accomodate for this while preserving binary compatibility with the - * old interface, we prepend or append 32 bits of padding, depending on - * the (LP64) architecture's endianness. - * - * This should be deleted the next time the libc major number is - * incremented. - */ struct addrinfo { int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ int ai_family; /* PF_xxx */ int ai_socktype; /* SOCK_xxx */ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif socklen_t ai_addrlen; /* length of ai_addr */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif char *ai_canonname; /* canonical name for hostname */ struct sockaddr *ai_addr; /* binary address */ struct addrinfo *ai_next; /* next structure in linked list */ ==== //depot/projects/hammer/kerberos5/lib/Makefile.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.6 2003/10/09 19:48:45 nectar Exp $ +# $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.7 2005/07/22 17:18:58 kensmith Exp $ -SHLIB_MAJOR?= 7 +SHLIB_MAJOR?= 8 .include "../Makefile.inc" ==== //depot/projects/hammer/lib/Makefile.inc#3 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/lib/Makefile.inc,v 1.2 2002/09/28 00:25:28 peter Exp $ +# $FreeBSD: src/lib/Makefile.inc,v 1.3 2005/07/22 17:18:58 kensmith Exp $ # Default version for system libs (override in /Makefile if necessary) -SHLIB_MAJOR?= 2 +SHLIB_MAJOR?= 3 ==== //depot/projects/hammer/lib/libalias/Makefile#12 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/lib/libalias/Makefile,v 1.30 2005/05/04 12:49:44 glebius Exp $ +# $FreeBSD: src/lib/libalias/Makefile,v 1.31 2005/07/22 17:18:59 kensmith Exp $ .PATH: ${.CURDIR}/../../sys/netinet/libalias LIB= alias SHLIBDIR?= /lib -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 MAN= libalias.3 SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \ ==== //depot/projects/hammer/lib/libarchive/Makefile#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.36 2005/06/04 22:30:36 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.37 2005/07/22 17:18:59 kensmith Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -9,7 +9,7 @@ LIB= archive VERSION= 1.02.026 ARCHIVE_API_FEATURE= 2 -ARCHIVE_API_VERSION= 1 +ARCHIVE_API_VERSION= 2 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\" CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\" ==== //depot/projects/hammer/lib/libbegemot/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/lib/libbegemot/Makefile,v 1.2 2004/11/04 08:25:03 ru Exp $ +# $FreeBSD: src/lib/libbegemot/Makefile,v 1.3 2005/07/22 17:18:59 kensmith Exp $ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot .PATH: ${LIBBEGEMOT_DIR} LIB= begemot -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SHLIBDIR?= /lib # WARNS?= 6 ==== //depot/projects/hammer/lib/libbluetooth/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Id: Makefile,v 1.5 2003/07/22 18:38:04 max Exp $ -# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.1 2003/10/12 22:04:18 emax Exp $ +# $FreeBSD: src/lib/libbluetooth/Makefile,v 1.2 2005/07/22 17:18:59 kensmith Exp $ LIB= bluetooth MAN= bluetooth.3 @@ -7,7 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= bluetooth.c INCS= bluetooth.h ==== //depot/projects/hammer/lib/libbsnmp/Makefile.inc#6 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.5 2004/10/24 15:32:30 ru Exp $ +# $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.6 2005/07/22 17:18:59 kensmith Exp $ -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 WARNS?= 6 NO_WERROR= INCSDIR= ${INCLUDEDIR}/bsnmp ==== //depot/projects/hammer/lib/libbz2/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/lib/libbz2/Makefile,v 1.5 2003/06/14 19:32:51 obrien Exp $ +# $FreeBSD: src/lib/libbz2/Makefile,v 1.6 2005/07/22 17:18:59 kensmith Exp $ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} LIB= bz2 -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \ huffman.c randtable.c INCS= bzlib.h ==== //depot/projects/hammer/lib/libc/gen/getnetgrent.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33 2005/01/13 18:33:01 jon Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.34 2005/07/22 22:20:26 jon Exp $"); #include #include @@ -305,22 +305,44 @@ } static int -_buildkey(char *key, const char *str, const char *dom, int *rotation) +_revnetgr_lookup(char* lookupdom, char* map, const char* str, + const char* dom, const char* group) { - (*rotation)++; - if (*rotation > 4) - return(0); - switch(*rotation) { - case(1): sprintf((char *)key, "%s.%s", str, dom ? dom : "*"); - break; - case(2): sprintf((char *)key, "%s.*", str); - break; - case(3): sprintf((char *)key, "*.%s", dom ? dom : "*"); - break; - case(4): sprintf((char *)key, "*.*"); - break; + int y, rv, rot; + char key[MAXHOSTNAMELEN]; + char *result; + int resultlen; + + for (rot = 0; ; rot++) { + switch (rot) { + case(0): snprintf(key, MAXHOSTNAMELEN, "%s.%s", + str, dom?dom:lookupdom); + break; + case(1): snprintf(key, MAXHOSTNAMELEN, "%s.*", + str); + break; + case(2): snprintf(key, MAXHOSTNAMELEN, "*.%s", + dom?dom:lookupdom); + break; + case(3): snprintf(key, MAXHOSTNAMELEN, "*.*"); + break; + default: return(0); + } + y = yp_match(lookupdom, map, key, strlen(key), &result, + &resultlen); + if (y == 0) { + rv = _listmatch(result, group, resultlen); + free(result); + if (rv) return(1); + } else if (y != YPERR_KEY) { + /* + * If we get an error other than 'no + * such key in map' then something is + * wrong and we should stop the search. + */ + return(-1); + } } - return(1); } #endif @@ -331,11 +353,6 @@ innetgr(const char *group, const char *host, const char *user, const char *dom) { char *hst, *usr, *dm; -#ifdef YP - char *result; - int resultlen; - int rv; -#endif /* Sanity check */ if (group == NULL || !strlen(group)) @@ -350,44 +367,36 @@ /* * If we're in NIS-only mode, do the search using * NIS 'reverse netgroup' lookups. + * + * What happens with 'reverse netgroup' lookups: + * + * 1) try 'reverse netgroup' lookup + * 1.a) if host is specified and user is null: + * look in netgroup.byhost + * (try host.domain, host.*, *.domain or *.*) + * if found, return yes + * 1.b) if user is specified and host is null: + * look in netgroup.byuser + * (try host.domain, host.*, *.domain or *.*) + * if found, return yes + * 1.c) if both host and user are specified, + * don't do 'reverse netgroup' lookup. It won't work. + * 1.d) if neither host ane user are specified (why?!?) + * don't do 'reverse netgroup' lookup either. + * 2) if domain is specified and 'reverse lookup' is done: + * 'reverse lookup' was authoritative. bye bye. + * 3) otherwise, too bad, try it the slow way. */ - if (_use_only_yp) { - char _key[MAXHOSTNAMELEN]; - int rot = 0, y = 0; - + if (_use_only_yp && (host == NULL) != (user == NULL)) { + int ret; if(yp_get_default_domain(&_netgr_yp_domain)) return(0); - while(_buildkey(_key, user ? user : host, dom, &rot)) { - y = yp_match(_netgr_yp_domain, user? "netgroup.byuser": - "netgroup.byhost", _key, strlen(_key), &result, - &resultlen); - if (y) { - /* - * If we get an error other than 'no - * such key in map' then something is - * wrong and we should stop the search. - */ - if (y != YPERR_KEY) - break; - } else { - rv = _listmatch(result, group, resultlen); - free(result); - if (rv) - return(1); - else - return(0); - } - } - /* - * Couldn't match using NIS-exclusive mode. If the error - * was YPERR_MAP, then the failure happened because there - * was no netgroup.byhost or netgroup.byuser map. The odds - * are we are talking to a Sun NIS+ server in YP emulation - * mode; if this is the case, then we have to do the check - * the 'old-fashioned' way by grovelling through the netgroup - * map and resolving memberships on the fly. - */ - if (y != YPERR_MAP) + ret = _revnetgr_lookup(_netgr_yp_domain, + host?"netgroup.byhost":"netgroup.byuser", + host?host:user, dom, group); + if (ret == 1) + return(1); + else if (ret == 0 && dom != NULL) return(0); } ==== //depot/projects/hammer/lib/libc/net/getaddrinfo.c#23 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.69 2005/05/15 20:15:15 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.70 2005/07/22 18:21:28 ume Exp $"); #include "namespace.h" #include @@ -1352,9 +1352,6 @@ memset(ai->ai_addr, 0, (size_t)afd->a_socklen); ai->ai_addr->sa_len = afd->a_socklen; ai->ai_addrlen = afd->a_socklen; -#if __LONG_BIT == 64 - ai->__ai_pad0 = 0; /* ABI compatibility */ -#endif ai->ai_addr->sa_family = ai->ai_family = afd->a_af; p = (char *)(void *)(ai->ai_addr); #ifdef FAITH ==== //depot/projects/hammer/lib/libc/nls/pl_PL.ISO8859-2.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/pl_PL.ISO8859-2.msg,v 1.1 2005/03/01 14:38:30 pjd Exp $ +$ $FreeBSD: src/lib/libc/nls/pl_PL.ISO8859-2.msg,v 1.2 2005/07/23 21:30:35 pjd Exp $ $ $ Message catalog for pl_PL.ISO8859-2 locale $ @@ -62,7 +62,7 @@ $ ENOSPC 28 Brak miejsca na urz±dzeniu $ ESPIPE -29 B³êdne przesuniêcie +29 Przesuniêcie niemo¿liwe $ EROFS 30 System plików tylko do odczytu $ EMLINK ==== //depot/projects/hammer/lib/libc/stdio/vfprintf.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.69 2005/04/16 22:36:51 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.70 2005/07/24 12:12:44 tjr Exp $"); /* * Actual printf innards. @@ -331,9 +331,9 @@ /* * Convert a wide character string argument for the %ls format to a multibyte - * string representation. ``prec'' specifies the maximum number of bytes - * to output. If ``prec'' is greater than or equal to zero, we can't assume - * that the wide char. string ends in a null character. + * string representation. If not -1, prec specifies the maximum number of + * bytes to output, and also means that we can't assume that the wide char. + * string ends is null-terminated. */ static char * __wcsconv(wchar_t *wcsarg, int prec) @@ -342,53 +342,49 @@ mbstate_t mbs; char buf[MB_LEN_MAX]; wchar_t *p; - char *convbuf, *mbp; + char *convbuf; size_t clen, nbytes; - /* - * Determine the number of bytes to output and allocate space for - * the output. - */ - if (prec >= 0) { - nbytes = 0; - p = wcsarg; - mbs = initial; - for (;;) { - clen = wcrtomb(buf, *p++, &mbs); - if (clen == 0 || clen == (size_t)-1 || - nbytes + clen > prec) - break; - nbytes += clen; - } - } else { + /* Allocate space for the maximum number of bytes we could output. */ + if (prec < 0) { p = wcsarg; mbs = initial; nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs); if (nbytes == (size_t)-1) return (NULL); + } else { + /* + * Optimisation: if the output precision is small enough, + * just allocate enough memory for the maximum instead of + * scanning the string. + */ + if (prec < 128) + nbytes = prec; + else { + nbytes = 0; + p = wcsarg; + mbs = initial; + for (;;) { + clen = wcrtomb(buf, *p++, &mbs); + if (clen == 0 || clen == (size_t)-1 || + nbytes + clen > prec) + break; + nbytes += clen; + } + } } if ((convbuf = malloc(nbytes + 1)) == NULL) return (NULL); - /* - * Fill the output buffer with the multibyte representations of as - * many wide characters as will fit. - */ - mbp = convbuf; + /* Fill the output buffer. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 24 18:02:20 2005 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 AFBD516A421; Sun, 24 Jul 2005 18:02:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88ECF16A41F for ; Sun, 24 Jul 2005 18:02:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 476A743D45 for ; Sun, 24 Jul 2005 18:02:19 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OI2JN5033707 for ; Sun, 24 Jul 2005 18:02:19 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OI2IKC033704 for perforce@freebsd.org; Sun, 24 Jul 2005 18:02:18 GMT (envelope-from peter@freebsd.org) Date: Sun, 24 Jul 2005 18:02:18 GMT Message-Id: <200507241802.j6OI2IKC033704@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80918 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: Sun, 24 Jul 2005 18:02:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=80918 Change 80918 by peter@peter_overcee on 2005/07/24 18:01:41 integ -b i386_hammer (metadata sync) Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#21 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_machdep.c#21 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jul 24 18:34:00 2005 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 C592016A421; Sun, 24 Jul 2005 18:33:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F6DA16A41F for ; Sun, 24 Jul 2005 18:33:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F52043D4C for ; Sun, 24 Jul 2005 18:33:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OIXxSh035025 for ; Sun, 24 Jul 2005 18:33:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OIXwNW035022 for perforce@freebsd.org; Sun, 24 Jul 2005 18:33:58 GMT (envelope-from peter@freebsd.org) Date: Sun, 24 Jul 2005 18:33:58 GMT Message-Id: <200507241833.j6OIXwNW035022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80922 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: Sun, 24 Jul 2005 18:34:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=80922 Change 80922 by peter@peter_overcee on 2005/07/24 18:33:46 Finally do what I've been threatening to do for months and move load_gs() to a function and catch traps from it. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/exception.S#43 edit .. //depot/projects/hammer/sys/amd64/amd64/support.S#32 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#71 edit .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#78 edit .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#35 edit .. //depot/projects/hammer/sys/amd64/include/md_var.h#34 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#43 (text+ko) ==== @@ -221,9 +221,12 @@ movq $T_PROTFLT,TF_TRAPNO(%rsp) movq $0,TF_ADDR(%rsp) movq %rdi,TF_RDI(%rsp) /* free up a GP register */ - leaq doreti_iret(%rip),%rdi + leaq doreti_iret(%rip),%rdi /* iretq trapped */ cmpq %rdi,TF_RIP(%rsp) je 2f /* kernel but with user gsbase!! */ + leaq load_gs_load(%rip),%rdi /* load_gs() trapped */ + cmpq %rdi,TF_RIP(%rsp) + je 2f testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 1f /* already running with kernel GS.base */ 2: ==== //depot/projects/hammer/sys/amd64/amd64/support.S#32 (text+ko) ==== @@ -612,6 +612,24 @@ MEXITCOUNT lretq +/* + * Special handling of %gs selector. + * This is done as an asm function so that traps can be recovered + * from while in the intermediate gsbase state. + * %edi + */ +/* void load_gs(u_int sel); */ +ENTRY(load_gs) + pushfq + cli + swapgs + .globl load_gs_load +load_gs_load: + movl %edi,%gs + swapgs + popfq + ret + /*****************************************************************************/ /* setjump, longjump */ /*****************************************************************************/ ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#71 (text+ko) ==== @@ -393,6 +393,20 @@ frame.tf_rip = (long)doreti_iret_fault; goto out; } + /* + * Handle invalid userland selectors causing a trap + * by turning it onto a SIGBUS. + */ + if (frame.tf_rip == (long)load_gs_load) { + ucode = code + BUS_SEGM_FAULT; + i = SIGBUS; + goto out; + } + /* + * Handle things like users passing non-canonical + * pointers to syscalls which will cause a GPF during + * copyin etc. + */ if (PCPU_GET(curpcb)->pcb_onfault != NULL) { frame.tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#78 (text+ko) ==== @@ -69,6 +69,7 @@ #include #include #include +#include #include #include ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#35 (text+ko) ==== @@ -514,47 +514,17 @@ __asm __volatile("movl %0,%%es" : : "rm" (sel)); } -#ifdef _KERNEL -/* This is defined in but is too painful to get to */ -#ifndef MSR_FSBASE -#define MSR_FSBASE 0xc0000100 -#endif static __inline void load_fs(u_int sel) { - register u_int32_t fsbase __asm("ecx"); - /* Preserve the fsbase value across the selector load */ - fsbase = MSR_FSBASE; - __asm __volatile("rdmsr; movl %0,%%fs; wrmsr" - : : "rm" (sel), "c" (fsbase) : "eax", "edx"); + __asm __volatile("movl %0,%%fs" : : "rm" (sel)); } -#ifndef MSR_GSBASE -#define MSR_GSBASE 0xc0000101 -#endif -static __inline void -load_gs(u_int sel) -{ - register u_int32_t gsbase __asm("ecx"); - - /* - * Preserve the gsbase value across the selector load. - * Note that we have to disable interrupts because the gsbase - * being trashed happens to be the kernel gsbase at the time. - */ - gsbase = MSR_GSBASE; - __asm __volatile("pushfq; cli; rdmsr; movl %0,%%gs; wrmsr; popfq" - : : "rm" (sel), "c" (gsbase) : "eax", "edx"); -} +#ifdef _KERNEL +/* In assembler so we can recover from traps */ +void load_gs(u_int sel); #else -/* Usable by userland */ -static __inline void -load_fs(u_int sel) -{ - __asm __volatile("movl %0,%%fs" : : "rm" (sel)); -} - static __inline void load_gs(u_int sel) { ==== //depot/projects/hammer/sys/amd64/include/md_var.h#34 (text+ko) ==== @@ -64,6 +64,7 @@ void cpu_setregs(void); void doreti_iret(void) __asm(__STRING(doreti_iret)); void doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault)); +void load_gs_load(void) __asm(__STRING(load_gs_load)); void initializecpu(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void fpstate_drop(struct thread *td); From owner-p4-projects@FreeBSD.ORG Sun Jul 24 22:16:35 2005 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 7545A16A421; Sun, 24 Jul 2005 22:16:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E0C916A41F for ; Sun, 24 Jul 2005 22:16:35 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9B4843D48 for ; Sun, 24 Jul 2005 22:16:34 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6OMGYxr052276 for ; Sun, 24 Jul 2005 22:16:34 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6OMGYkV052273 for perforce@freebsd.org; Sun, 24 Jul 2005 22:16:34 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 24 Jul 2005 22:16:34 GMT Message-Id: <200507242216.j6OMGYkV052273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 80926 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: Sun, 24 Jul 2005 22:16:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=80926 Change 80926 by soc-victor@soc-victor_82.76.158.176 on 2005/07/24 22:16:09 Added the SNMP instrumentation for hrProcessorTable and updated the hrDeviceTable accordingly. Still need to improve the per CPU load statistics as the HR-MIB requires ( load average per last minute). Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#12 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 add .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#10 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#14 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#4 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#12 (text+ko) ==== @@ -32,7 +32,9 @@ SRCS= hostres_snmp.c hostres_scalars.c \ hostres_storage_tbl.c hostres_fs_tbl.c \ hostres_swrun_tbl.c hostres_swrunperf_tbl.c \ - hostres_device_tbl.c + hostres_device_tbl.c \ + hostres_processor_tbl.c + WARNS?= 6 #Not having NDEBUG defined will enable assertions and a lot of output on stderr CFLAGS+= -DNDEBUG @@ -53,5 +55,5 @@ DEFS= ${MOD}_tree.def BMIBS= HOST-RESOURCES-MIB.txt HOST-RESOURCES-TYPES.txt -LDADD= -lkvm -ldevinfo +LDADD= -lkvm -ldevinfo -lm .include ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#3 (text+ko) ==== @@ -171,6 +171,12 @@ assert(out_type_p != NULL); if(dev_p == NULL) return; + + if (strncmp(dev_p->dd_name, "cpu", strlen("cpu")) == 0 && + strstr(dev_p->dd_location, ".CPU") != NULL) { + *out_type_p = (struct asn_oid)OIDX_hrDeviceProcessor; + return; + } *out_type_p = (struct asn_oid)OIDX_hrDeviceOther; /*FIX ME*/ } @@ -179,10 +185,9 @@ hrDevice_getStatus(struct devinfo_dev *dev) { assert(dev != NULL); switch (dev->dd_state) { + case DIS_ALIVE: /* probe succeeded */ case DIS_NOTPRESENT: /* not probed or probe failed */ return (DS_DOWN); - case DIS_ALIVE: /* probe succeeded */ - return (DS_TESTING); case DIS_ATTACHED: /* attach method called */ case DIS_BUSY: /* device is open */ return (DR_RUNNING); ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#10 (text+ko) ==== @@ -94,40 +94,50 @@ hrState_g.hrSWOSIndex = 0; + /*data structures initialization for hrStrorageTable*/ hrState_g.next_hrStorage_index = 1; STAILQ_INIT(&hrState_g.storage_name_map); TAILQ_INIT(&hrState_g.hr_storage_tbl); - + /*data structures initialization for hrFSTable*/ hrState_g.next_hrFS_index = 1; STAILQ_INIT(&hrState_g.fs_name_map); TAILQ_INIT(&hrState_g.hr_fs_tbl); - + + /*data structure initialization for hrSWRunTable & hrSWRunTable*/ TAILQ_INIT(&hrState_g.hr_swrun_tbl); - + /*data structures initialization for hrDeviceTable*/ hrState_g.next_hrDevice_index = 1; STAILQ_INIT(&hrState_g.device_name_map); TAILQ_INIT(&hrState_g.hr_device_tbl); + /*data structure initialization for hrProcessorTable*/ + hrState_g.detected_processor_count = 0; + hrState_g.hw_ncpu = 0; + hrState_g.fscale = 0; + hrState_g.ccpu = 0; + TAILQ_INIT(&hrState_g.hr_processor_tbl); hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; hrState_g.hr_swrun_tick = 0; hrState_g.hr_device_tick = 0; - + hrState_g.hr_processor_tick = 0; + hrState_g.hrStorage_tbl_age = 0; hrState_g.hrFS_tbl_age = 0; hrState_g.hrSWRun_tbl_age = 0; hrState_g.hrDevice_tbl_age = 0; - + hrState_g.hrProcessor_tbl_age = 0; init_hrStorage_tbl_v(); init_hrFS_tbl_v(); init_hrSWRun_tbl_v(); /*also the hrSWRunPerfTable's support is initialized here */ init_hrDevice_tbl_v(); - + init_hrProcessor_tbl_v(); + HR_DPRINTF((stderr, "[%s] done.\n", __func__)); return (0); @@ -172,21 +182,28 @@ fini_hrFS_tbl_v(); fini_hrSWRun_tbl_v(); fini_hrDevice_tbl_v(); + fini_hrProcessor_tbl_v(); hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; hrState_g.hr_swrun_tick = 0; hrState_g.hr_device_tick = 0; + hrState_g.hr_processor_tick = 0; hrState_g.hrStorage_tbl_age = 0; hrState_g.hrFS_tbl_age = 0; hrState_g.hrSWRun_tbl_age = 0; hrState_g.hrDevice_tbl_age = 0; - + hrState_g.hrProcessor_tbl_age = 0; + hrState_g.dev_root = NULL; hrState_g.hrSWOSIndex = 0; - + + hrState_g.hw_ncpu = 0; + hrState_g.fscale = 0; + hrState_g.ccpu = 0; + if( host_registration_id > 0){ or_unregister(host_registration_id); } @@ -219,6 +236,11 @@ refresh_hrDevice_tbl_v(); } + if ( (time(NULL) - hrState_g.hrProcessor_tbl_age) > HR_PROCESSOR_TBL_REFRESH ) { + HR_DPRINTF((stderr, "%s: hrProcessorTable needs refresh\n ", __func__)); + refresh_hrProcessor_tbl_v(); + } + HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } @@ -291,14 +313,6 @@ */ -int op_hrProcessorTable(struct snmp_context *ctx __unused, - struct snmp_value *value __unused, - u_int sub __unused, - u_int iidx __unused, - enum snmp_op curr_op __unused) -{ - return (SNMP_ERR_NOSUCHNAME); -} int op_hrNetworkTable(struct snmp_context *ctx __unused, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#14 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include /*a debug macro*/ #ifndef NDEBUG @@ -57,8 +58,8 @@ #define HR_DPRINTF(ARGS) #endif /*NDEBUG*/ +#define IS_KERNPROC(kp) ( ((kp)->ki_flag & P_KTHREAD) == P_KTHREAD ) - /* * This structure is used to hold a SNMP table entry * for HOST-RESOURCES-MIB's hrStorageTable @@ -193,13 +194,31 @@ TAILQ_HEAD(swrun_tbl, hrSWRunTblEntry); +/* + * This structure is used to hold a SNMP table entry + * for HOST-RESOURCES-MIB's hrProcessorTable + * Note that index is external being allocated & mainatined + * by the hrDeviceTable code. + */ +struct hrProcessorTblEntry { + int32_t index; + struct asn_oid frwId; + int32_t load; + TAILQ_ENTRY(hrProcessorTblEntry) link; + /*not from SNMP table definition, only used internally*/ + u_char cpu_no; /*which cpu, counted from 0*/ + pid_t idle_pid; /*the PID of ide process for this CPU */ +}; + +TAILQ_HEAD(processor_tbl, hrProcessorTblEntry); + enum DeviceStatus { DS_UNKNOWN = 1, DR_RUNNING = 2, DS_WARNING = 3, DS_TESTING = 4, - DS_DOWN = 4 + DS_DOWN = 5 }; @@ -313,7 +332,20 @@ struct devinfo_dev *dev_root; - + + /* + * next items are used for hrProcessorTable + */ + struct + processor_tbl hr_processor_tbl; /*the head of the list with hrDeviceTable's entries */ + int32_t detected_processor_count; + int hw_ncpu; /*get it via sysctlbyname(hw.ncpu)*/ + fixpt_t ccpu; /* kernel _ccpu variable */ + int fscale; /* kernel _fscale variable */ + + time_t hrProcessor_tbl_age; + uint64_t hr_processor_tick; /*last (agent) tick when hrProcessorTable was updated */ + }; @@ -445,5 +477,28 @@ */ void refresh_hrDevice_tbl_v(void); +/* + * Init the things for hrProcessorTable + */ +void init_hrProcessor_tbl_v(void); + +/* + * Finalization routine for hrProcessorTable + * It destroys the lists and frees any allocated heap memory + */ +void fini_hrProcessor_tbl_v(void); + +/* + * Next macro represents the number of seconds + * between two consecutive queries to the OS for getting the new data + * for hrProcessorTable (only for load numbers) + */ +#define HR_PROCESSOR_TBL_REFRESH 5 +/* + * Refresh routine for hrProcessorTable + * Usable for polling the system for load numbers. + */ +void refresh_hrProcessor_tbl_v(void); + #endif /*__HOSTRES_SNMP_H_INCLUDED__ */ ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#4 (text+ko) ==== @@ -45,7 +45,6 @@ #include -#define IS_KERNPROC(kp) ( ((kp)->ki_flag & P_KTHREAD) == P_KTHREAD ) /* * Ugly thing: PID_MAX, NO_PID defined only in kernel */ From owner-p4-projects@FreeBSD.ORG Sun Jul 24 23:47:28 2005 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 7671616A421; Sun, 24 Jul 2005 23:47:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B5DE16A41F for ; Sun, 24 Jul 2005 23:47:28 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AA9443D46 for ; Sun, 24 Jul 2005 23:47:28 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ONlRmo055517 for ; Sun, 24 Jul 2005 23:47:27 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ONlRxR055514 for perforce@freebsd.org; Sun, 24 Jul 2005 23:47:27 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 24 Jul 2005 23:47:27 GMT Message-Id: <200507242347.j6ONlRxR055514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 80932 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: Sun, 24 Jul 2005 23:47:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=80932 Change 80932 by soc-cjones@soc-cjones_ides on 2005/07/24 23:46:55 Outline for new ch. 17 of FreeBSD Handbook on gvinum Affected files ... .. //depot/projects/soc2005/gvinum/docs/HANDBOOK#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 25 00:08:55 2005 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 9524316A421; Mon, 25 Jul 2005 00:08:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B1C616A41F for ; Mon, 25 Jul 2005 00:08:54 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 275CF43D46 for ; Mon, 25 Jul 2005 00:08:54 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6P08seZ056253 for ; Mon, 25 Jul 2005 00:08:54 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6P08rj2056250 for perforce@freebsd.org; Mon, 25 Jul 2005 00:08:53 GMT (envelope-from soc-cjones@freebsd.org) Date: Mon, 25 Jul 2005 00:08:53 GMT Message-Id: <200507250008.j6P08rj2056250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 80933 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, 25 Jul 2005 00:08:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=80933 Change 80933 by soc-cjones@soc-cjones_ides on 2005/07/25 00:08:51 Outline of man page, plus add temporary target to Makefile for ease of reviewing man page. Affected files ... .. //depot/projects/soc2005/gvinum/src/sbin/gvinum/Makefile#2 edit .. //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.8#1 add Differences ... ==== //depot/projects/soc2005/gvinum/src/sbin/gvinum/Makefile#2 (text+ko) ==== @@ -12,3 +12,6 @@ .PATH: ${.CURDIR}/../../sys/geom/vinum .include + +gvinum.man: gvinum.8 + nroff -man -h gvinum.8 > $@ From owner-p4-projects@FreeBSD.ORG Mon Jul 25 00:49:45 2005 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 07ABA16A421; Mon, 25 Jul 2005 00:49:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7E8E16A41F for ; Mon, 25 Jul 2005 00:49:44 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 958E243D4C for ; Mon, 25 Jul 2005 00:49:44 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6P0niZE064792 for ; Mon, 25 Jul 2005 00:49:44 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6P0ni72064789 for perforce@freebsd.org; Mon, 25 Jul 2005 00:49:44 GMT (envelope-from soc-cjones@freebsd.org) Date: Mon, 25 Jul 2005 00:49:44 GMT Message-Id: <200507250049.j6P0ni72064789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 80936 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, 25 Jul 2005 00:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=80936 Change 80936 by soc-cjones@soc-cjones_ides on 2005/07/25 00:49:02 Initial submit of gvinum handbook chapter. Content identical to vinum chapter, only header modified. Affected files ... .. //depot/projects/soc2005/gvinum/docs/handbook/chapter.sgml#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 25 01:10:11 2005 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 83C8516A421; Mon, 25 Jul 2005 01:10:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59F5C16A41F for ; Mon, 25 Jul 2005 01:10:10 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AD1843D48 for ; Mon, 25 Jul 2005 01:10:10 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6P1AA3h065772 for ; Mon, 25 Jul 2005 01:10:10 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6P1A9pU065769 for perforce@freebsd.org; Mon, 25 Jul 2005 01:10:09 GMT (envelope-from soc-cjones@freebsd.org) Date: Mon, 25 Jul 2005 01:10:09 GMT Message-Id: <200507250110.j6P1A9pU065769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 80938 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, 25 Jul 2005 01:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=80938 Change 80938 by soc-cjones@soc-cjones_ides on 2005/07/25 01:09:27 Stubs for 'move' and 'rename' in kernel. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.c#2 edit .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.h#2 edit .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#1 add .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#1 add Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.c#2 (text+ko) ==== @@ -500,12 +500,18 @@ } else if (!strcmp(verb, "create")) { gv_create(gp, req); + } else if (!strcmp(verb, "move")) { + gv_move(gp, req); + } else if (!strcmp(verb, "parityop")) { gv_parityop(gp, req); } else if (!strcmp(verb, "remove")) { gv_remove(gp, req); + } else if (!strcmp(verb, "rename")) { + gv_rename(gp, req); + } else if (!strcmp(verb, "start")) { gv_start_obj(gp, req); ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.h#2 (text+ko) ==== @@ -48,6 +48,12 @@ void gv_lv(struct g_geom *, struct gctl_req *, struct sbuf *); void gv_list(struct g_geom *, struct gctl_req *); +/* geom_vinum_move.c */ +void gv_move(struct g_geom *, struct gctl_req *); + +/* geom_vinum_rename.c */ +void gv_rename(struct g_geom *, struct gctl_req *); + /* geom_vinum_rm.c */ void gv_remove(struct g_geom *, struct gctl_req *); From owner-p4-projects@FreeBSD.ORG Mon Jul 25 07:19:37 2005 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 2EDDC16A421; Mon, 25 Jul 2005 07:19:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E5ECB16A41F for ; Mon, 25 Jul 2005 07:19:36 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E4DB43D5F for ; Mon, 25 Jul 2005 07:19:36 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6P7Jaxc087799 for ; Mon, 25 Jul 2005 07:19:36 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6P7Jaj6087796 for perforce@freebsd.org; Mon, 25 Jul 2005 07:19:36 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 25 Jul 2005 07:19:36 GMT Message-Id: <200507250719.j6P7Jaj6087796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80946 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, 25 Jul 2005 07:19:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=80946 Change 80946 by soc-andrew@soc-andrew_serv on 2005/07/25 07:19:25 Reboot when asked to by the backend Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#2 (text+ko) ==== @@ -2,12 +2,24 @@ TTY=`tty` +if [ -f /.do_reboot ] +then + # The reboot should have begun after 60s + sleep 60 +fi + if [ ${TTY} = "/dev/ttyv0" ] then /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then /usr/sbin/bsd_installer_be + if [ $? -eq 5 ] + then +# The backend returned the reboot value + shutdown -r now + touch /.do_reboot + fi else echo "Error: bsdinstaller can only login on ttyv0 or ttyv1" fi From owner-p4-projects@FreeBSD.ORG Mon Jul 25 07:49:15 2005 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 DC64C16A421; Mon, 25 Jul 2005 07:49:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9227316A41F for ; Mon, 25 Jul 2005 07:49:14 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63F3E43D49 for ; Mon, 25 Jul 2005 07:49:14 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6P7nEFg089333 for ; Mon, 25 Jul 2005 07:49:14 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6P7nEJH089314 for perforce@freebsd.org; Mon, 25 Jul 2005 07:49:14 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 25 Jul 2005 07:49:14 GMT Message-Id: <200507250749.j6P7nEJH089314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80948 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, 25 Jul 2005 07:49:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=80948 Change 80948 by soc-andrew@soc-andrew_serv on 2005/07/25 07:48:35 The OpenBSD dhclient dosn't have -1 Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/installer/fn_configure.c#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/installer/fn_configure.c#2 (text+ko) ==== @@ -970,7 +970,7 @@ cmd = command_add(cmds, "%s%s dhclient", a->os_root, cmd_name(a, "KILLALL")); command_set_failure_mode(cmd, COMMAND_FAILURE_IGNORE); - command_add(cmds, "%s%s -1 %s", + command_add(cmds, "%s%s %s", a->os_root, cmd_name(a, "DHCLIENT"), interface); if (commands_execute(a, cmds)) { From owner-p4-projects@FreeBSD.ORG Mon Jul 25 13:24:32 2005 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 BDA5A16A421; Mon, 25 Jul 2005 13:24:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8E5CD16A41F for ; Mon, 25 Jul 2005 13:24:31 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 594FF43D49 for ; Mon, 25 Jul 2005 13:24:31 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6PDOVVL020296 for ; Mon, 25 Jul 2005 13:24:31 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6PDOVCX020293 for perforce@freebsd.org; Mon, 25 Jul 2005 13:24:31 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 25 Jul 2005 13:24:31 GMT Message-Id: <200507251324.j6PDOVCX020293@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80961 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, 25 Jul 2005 13:24:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=80961 Change 80961 by soc-andrew@soc-andrew_serv on 2005/07/25 13:24:09 Add a rc.d script to find the correct device for /usr and mount it. Also slip in a couple of *_enabled="NO" to rc.conf Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#11 edit .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller#1 add Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#11 (text+ko) ==== @@ -776,12 +776,14 @@ mkdir ${RD}/bsdinstaller/root/$$dir; \ done ) - @echo "/dev/acd0 /usr cd9660 ro 0 0" > ${RD}/bsdinstaller/root/etc/fstab + @touch ${RD}/bsdinstaller/root/etc/fstab ln -s /usr/boot ${RD}/bsdinstaller/root/boot @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf + @echo "dumpdev=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "syslogd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf + @echo "update_motd=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "kern.geom.debugflags=16" >> ${RD}/bsdinstaller/root/etc/sysctl.conf @cat ${.CURDIR}/bsdinstaller/gettytab >> ${RD}/bsdinstaller/root/etc/gettytab ( if [ -f ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} ]; then \ @@ -790,6 +792,8 @@ fi ) cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/root/ chmod u+x ${RD}/bsdinstaller/root/bsdinstaller_shell.sh + cp ${.CURDIR}/bsdinstaller/bsdinstaller ${RD}/bsdinstaller/root/etc/rc.d/ + chmod u+x ${RD}/bsdinstaller/root/etc/rc.d/bsdinstaller cp ${RD}/bsdinstaller/root/etc/master.passwd ${RD}/bsdinstaller/master.passwd @echo "bsdinstaller::0:0::0:0:BSD Installer:/root:/bsdinstaller_shell.sh" >> ${RD}/bsdinstaller/master.passwd pwd_mkdb -p -d ${RD}/bsdinstaller/root/etc \ From owner-p4-projects@FreeBSD.ORG Mon Jul 25 15:11:42 2005 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 2007416A421; Mon, 25 Jul 2005 15:11:42 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E73C616A41F for ; Mon, 25 Jul 2005 15:11:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A36C643D45 for ; Mon, 25 Jul 2005 15:11:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6PFBft5030267 for ; Mon, 25 Jul 2005 15:11:41 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6PFBf9X030264 for perforce@freebsd.org; Mon, 25 Jul 2005 15:11:41 GMT (envelope-from areisse@nailabs.com) Date: Mon, 25 Jul 2005 15:11:41 GMT Message-Id: <200507251511.j6PFBf9X030264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 80964 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, 25 Jul 2005 15:11:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=80964 Change 80964 by areisse@areisse_ibook on 2005/07/25 15:11:34 Add compute_label, a utility for calling mac_request_object_label from the command line (This should have been added quite long ago). Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/mach_cmds/compute_label.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 25 16:23:10 2005 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 25C4016A421; Mon, 25 Jul 2005 16:23:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFA7D16A420 for ; Mon, 25 Jul 2005 16:23:09 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D66543D5D for ; Mon, 25 Jul 2005 16:23:09 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6PGN9CX035456 for ; Mon, 25 Jul 2005 16:23:09 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6PGN8Kk035453 for perforce@freebsd.org; Mon, 25 Jul 2005 16:23:08 GMT (envelope-from areisse@nailabs.com) Date: Mon, 25 Jul 2005 16:23:08 GMT Message-Id: <200507251623.j6PGN8Kk035453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 80968 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, 25 Jul 2005 16:23:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=80968 Change 80968 by areisse@areisse_ibook on 2005/07/25 16:23:01 Include libsepol in the build (lib only, no utilities). libsepol uses the bswap functions that are expected to be found in but are not on Darwin. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/libsepol/include/sys/endian.h#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/Makefile#4 (text+ko) ==== @@ -1,17 +1,20 @@ all: cd sedarwin && gnumake + cd libsepol/src && gnumake cd libselinux && gnumake cd programs && gnumake cd policy && gnumake clean: cd sedarwin && gnumake clean + cd libsepol/src && gnumake clean cd libselinux && gnumake clean cd programs && gnumake clean cd policy && gnumake clean install: cd sedarwin && gnumake install + cd libsepol/src && gnumake install cd libselinux && gnumake install cd programs && gnumake install cd policy && gnumake install From owner-p4-projects@FreeBSD.ORG Mon Jul 25 19:22:52 2005 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 3A71516A421; Mon, 25 Jul 2005 19:22:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FB5C16A41F for ; Mon, 25 Jul 2005 19:22:52 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D258B43D46 for ; Mon, 25 Jul 2005 19:22:51 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6PJMpqM051985 for ; Mon, 25 Jul 2005 19:22:51 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6PJMpdN051982 for perforce@freebsd.org; Mon, 25 Jul 2005 19:22:51 GMT (envelope-from soc-saturnero@freebsd.org) Date: Mon, 25 Jul 2005 19:22:51 GMT Message-Id: <200507251922.j6PJMpdN051982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80982 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, 25 Jul 2005 19:22:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=80982 Change 80982 by soc-saturnero@soc-saturnero_sberta on 2005/07/25 19:22:40 Added img targe Affected files ... .. //depot/projects/soc2005/freesbie/Makefile#7 edit .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#7 edit .. //depot/projects/soc2005/freesbie/scripts/img.sh#1 add Differences ... ==== //depot/projects/soc2005/freesbie/Makefile#7 (text+ko) ==== @@ -51,6 +51,20 @@ @sh ./scripts/launch.sh iso .tmp_iso @mv .tmp_iso .done_iso +img: .done_img +.done_img: .done_clonefs + @-rm -f .tmp_img + @touch .tmp_img + @sh ./scripts/launch.sh img .tmp_img + @mv .tmp_img .done_img + +flash: .done_flash +.done_flash: .done_clonefs + @-rm -f .tmp_flash + @touch .tmp_flash + @sh ./scripts/launch.sh flash .tmp_flash + @mv .tmp_flash .done_flash + clean: @-rm -f .tmp* .done* > /dev/null 2>&1 ==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#7 (text+ko) ==== @@ -25,6 +25,10 @@ # Path of the built image, use absolute path IMGPATH="/usr/obj/FreeSBIE.img" +# Default parameters for the image, use diskinfo(1) to obtain yours +SECTS=501760 # Total number of sectors +SECTT=32 # Sectors/track +HEADS=16 # Heads # # Optional variables From owner-p4-projects@FreeBSD.ORG Mon Jul 25 21:30:29 2005 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 84CAC16A421; Mon, 25 Jul 2005 21:30:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4945716A41F for ; Mon, 25 Jul 2005 21:30:28 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E24A243D4C for ; Mon, 25 Jul 2005 21:30:27 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6PLURrW064811 for ; Mon, 25 Jul 2005 21:30:27 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6PLURu7064806 for perforce@freebsd.org; Mon, 25 Jul 2005 21:30:27 GMT (envelope-from soc-victor@freebsd.org) Date: Mon, 25 Jul 2005 21:30:27 GMT Message-Id: <200507252130.j6PLURu7064806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 80987 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, 25 Jul 2005 21:30:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=80987 Change 80987 by soc-victor@soc-victor_82.76.158.176 on 2005/07/25 21:29:50 A matter of style: use the special purpose (already defined) oid_zeroDotZero variable instead hardcoded values all over the HOST RESOURCES code. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#4 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#2 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#5 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#4 (text+ko) ==== @@ -225,7 +225,7 @@ } - entry->id = (struct asn_oid){2,{0,0,}}; /*unknown id - FIX ME*/ + entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/ entry->status = hrDevice_getStatus(dev); ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#2 (text+ko) ==== @@ -174,7 +174,7 @@ entry->load = 0; entry->cpu_no = (u_char)cpu_no; entry->idle_pid = 0; - entry->frwId = (struct asn_oid){2,{0,0,}}; /*unknown id - FIX ME*/ + entry->frwId = oid_zeroDotZero; /*unknown id - FIX ME*/ INSERT_OBJECT_INT(entry, &hrState_g.hr_processor_tbl); hrState_g.detected_processor_count++; ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#5 (text+ko) ==== @@ -159,7 +159,7 @@ entry->name[sizeof(entry->name) - 1] = '\0'; (void)strncpy(&entry->name[0], &kp->ki_ocomm[0], sizeof(entry->name) - 1); - entry->id = (struct asn_oid){2,{0,0,}}; /*unknown id - FIX ME*/ + entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/ entry->path[0] = '\0'; entry->parameters[0] = '\0'; @@ -224,7 +224,7 @@ /*no parameters for kernel files (.ko) of for the kernel*/ entry->parameters[0] = '\0'; - entry->id = (struct asn_oid){2,{0,0,}}; /*unknown id - FIX ME*/ + entry->id = oid_zeroDotZero; /*unknown id - FIX ME*/ if (strncmp(kfs->name, "kernel", strlen("kernel") ) == 0) { entry->type = SRT_OPERATING_SYSTEM; From owner-p4-projects@FreeBSD.ORG Tue Jul 26 13:35:42 2005 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 9722016A424; Tue, 26 Jul 2005 13:35:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 559A216A420 for ; Tue, 26 Jul 2005 13:35:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EB4143D55 for ; Tue, 26 Jul 2005 13:35:41 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6QDZfR0031377 for ; Tue, 26 Jul 2005 13:35:41 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6QDZee9031374 for perforce@freebsd.org; Tue, 26 Jul 2005 13:35:40 GMT (envelope-from areisse@nailabs.com) Date: Tue, 26 Jul 2005 13:35:40 GMT Message-Id: <200507261335.j6QDZee9031374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 81010 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: Tue, 26 Jul 2005 13:35:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=81010 Change 81010 by areisse@areisse_tislabs on 2005/07/26 13:34:49 Set fs_type on device_t instead of an extra rule for mounting device_t. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/mount.te#5 edit .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#6 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/mount.te#5 (text+ko) ==== @@ -46,9 +46,6 @@ # for when /etc/mtab loses its type allow mount_t file_t:file { getattr read unlink }; -# device_t is also used as a fs_type in freebsd -allow mount_t device_t:filesystem mount_fs_perms; - # Mount, remount and unmount file systems. allow mount_t fs_type:filesystem mount_fs_perms; allow mount_t default_t:dir mounton; ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#6 (text+ko) ==== @@ -10,7 +10,7 @@ # # device_t is the type of /dev. # -type device_t, file_type; +type device_t, file_type, fs_type; # # null_device_t is the type of /dev/null. From owner-p4-projects@FreeBSD.ORG Tue Jul 26 16:51:40 2005 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 8F3AB16A421; Tue, 26 Jul 2005 16:51:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4AC0416A41F for ; Tue, 26 Jul 2005 16:51:39 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42FE643D55 for ; Tue, 26 Jul 2005 16:51:38 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6QGpc6U046337 for ; Tue, 26 Jul 2005 16:51:38 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6QGpbKZ046334 for perforce@freebsd.org; Tue, 26 Jul 2005 16:51:37 GMT (envelope-from soc-saturnero@freebsd.org) Date: Tue, 26 Jul 2005 16:51:37 GMT Message-Id: <200507261651.j6QGpbKZ046334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 81014 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: Tue, 26 Jul 2005 16:51:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=81014 Change 81014 by soc-saturnero@soc-saturnero_sberta on 2005/07/26 16:51:07 Fixed build of bootable images Affected files ... .. //depot/projects/soc2005/freesbie/scripts/img.sh#2 edit Differences ... ==== //depot/projects/soc2005/freesbie/scripts/img.sh#2 (text+ko) ==== @@ -38,7 +38,9 @@ echo "g c${CYLINDERS} h${HEADS} s${SECTT}" > ${TMPFILE} echo "p 1 165 ${SECTT} $((${SECTS} - ${SECTT}))" >> ${TMPFILE} +echo "a 1" >> ${TMPFILE} +fdisk -BI ${DEVICE} >> ${LOGFILE} 2>&1 fdisk -i -v -f ${TMPFILE} ${DEVICE} >> ${LOGFILE} 2>&1 bsdlabel -w -B ${DEVICE}s1 >> ${LOGFILE} 2>&1 @@ -63,4 +65,4 @@ rm -f ${TMPFILE} rm -rf ${TMPDIR} -ls -lh ${IMGPATH}+ls -lh ${IMGPATH} From owner-p4-projects@FreeBSD.ORG Tue Jul 26 19:07:24 2005 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 025AC16A421; Tue, 26 Jul 2005 19:07:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CE65E16A41F for ; Tue, 26 Jul 2005 19:07:23 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5276743D58 for ; Tue, 26 Jul 2005 19:07:23 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6QJ7NM2052526 for ; Tue, 26 Jul 2005 19:07:23 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6QJ7Nsr052523 for perforce@freebsd.org; Tue, 26 Jul 2005 19:07:23 GMT (envelope-from soc-victor@freebsd.org) Date: Tue, 26 Jul 2005 19:07:23 GMT Message-Id: <200507261907.j6QJ7Nsr052523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 81019 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: Tue, 26 Jul 2005 19:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=81019 Change 81019 by soc-victor@soc-victor_82.76.158.176 on 2005/07/26 19:07:03 1)Added support for periodic timers (beside the existent one-shot timers) into the SNMP library (libbsnmp, -lbsnmp). 2)Adapted the instrumentation for hrProcessorTable so as the CPU load numbers represent the average CPU load (per CPU) in the last minute ( via 4 samples per minute ). This was implemented using a periodic timer. 3)Changed the implementation of hrDeviceTable so as the SNMP agent get the device tree change notifications via /var/run/devd.pipe (if available). This should reduce the overhead of scanning the system for device changes to the minimum required. Affected files ... .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/main.c#2 edit .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpd.h#2 edit .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpmod.h#2 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#13 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#5 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#11 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#15 edit Differences ... ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/main.c#2 (text+ko) ==== @@ -1621,21 +1621,27 @@ #endif { struct timer *tp = uap; - - LIST_REMOVE(tp, link); + if (tp->periodic == 0){ + LIST_REMOVE(tp, link); + } + tp->func(tp->udata); - free(tp); + + if (tp->periodic == 0){ + free(tp); + } } /* * Start a timer */ void * -timer_start(u_int ticks, void (*func)(void *), void *udata, struct lmodule *mod) +timer_start(u_int ticks, u_int repeat_ticks, void (*func)(void *), void *udata, struct lmodule *mod) { struct timer *tp; #ifndef USE_LIBBEGEMOT struct timespec due; + struct timespec inter; #endif if ((tp = malloc(sizeof(struct timer))) == NULL) { @@ -1646,21 +1652,26 @@ #ifndef USE_LIBBEGEMOT due = evAddTime(evNowTime(), evConsTime(ticks / 100, (ticks % 100) * 10000)); + inter = evAddTime(evNowTime(), + evConsTime(repeat_ticks / 100, (ticks % 100) * 10000)); + #endif tp->udata = udata; tp->owner = mod; tp->func = func; - + tp->periodic = (repeat_ticks == 0 ? 0 : 1); /*for clarity*/ + LIST_INSERT_HEAD(&timer_list, tp, link); #ifdef USE_LIBBEGEMOT - if ((tp->id = poll_start_timer(ticks * 10, 0, tfunc, tp)) < 0) { + if ((tp->id = poll_start_timer( (repeat_ticks == 0 ? ticks * 10 : repeat_ticks * 10), + tp->periodic, tfunc, tp)) < 0) { syslog(LOG_ERR, "cannot set timer: %m"); exit(1); } #else - if (evSetTimer(evctx, tfunc, tp, due, evConsTime(0, 0), &tp->id) + if (evSetTimer(evctx, tfunc, tp, due, inter, &tp->id) == -1) { syslog(LOG_ERR, "cannot set timer: %m"); exit(1); ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpd.h#2 (text+ko) ==== @@ -92,6 +92,8 @@ void *udata; /* user data */ evTimerID id; /* timer id */ struct lmodule *owner; /* owner of the timer */ + int periodic; /* flag to track periodic timers, 0 for one shot, + 1 for periodic timers*/ LIST_ENTRY(timer) link; }; ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpmod.h#2 (text+ko) ==== @@ -300,7 +300,7 @@ /* * Timers. */ -void *timer_start(u_int, void (*)(void *), void *, struct lmodule *); +void *timer_start(u_int, u_int ,void (*)(void *), void *, struct lmodule *); void timer_stop(void *); /* ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#13 (text+ko) ==== ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#5 (text+ko) ==== @@ -36,6 +36,11 @@ #include #include #include +#include +#include +#include +#include +#include /*just a prototype*/ int hr_device_collector(struct devinfo_dev *dev, void *arg); @@ -289,7 +294,7 @@ struct hrDeviceTblEntry *entry = NULL, *entry_tmp = NULL; - if ( this_tick <= hrState_g.hr_device_tick) { + if ( hrState_g.devd_sock < 0 && this_tick <= hrState_g.hr_device_tick) { HR_DPRINTF((stderr, "%s: no refresh needed\n ",__func__)); return; } @@ -341,6 +346,65 @@ } +int create_devd_socket(void) { + static const char devd_pipe_name[]="/var/run/devd.pipe"; + int d_sock = -1; + struct sockaddr_un devd_addr; + + bzero(&devd_addr, sizeof(struct sockaddr_un)); + + if ((d_sock = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) { + syslog(LOG_ERR,"Failed to create the socket for %s: %m", devd_pipe_name); + return (-1); + } + + devd_addr.sun_family = PF_LOCAL; + strlcpy(devd_addr.sun_path, devd_pipe_name, sizeof(devd_addr.sun_path) - 1); + + if (connect(d_sock, (struct sockaddr *)&devd_addr, + sizeof(struct sockaddr_un)) == -1) { + syslog(LOG_ERR,"Failed to connect the socket for %s: %m", devd_pipe_name); + if (close(d_sock) < 0 ){ + syslog(LOG_ERR,"Failed to close the socket for %s: %m", devd_pipe_name); + } + return (-1); + } + + return d_sock; +} + +void devd_socket_callback(int fd , void* arg __unused) { + char buf[512]; + int read_len = -1; + assert(fd == hrState_g.devd_sock); + HR_DPRINTF((stderr, "__hrDeviceTable__ %s: called\n ", __func__)); + read_len = read(fd, buf, sizeof(buf) - 1); + if (read_len < 0) { + if(errno == EBADF){ + hrState_g.devd_sock = -1; + if (hrState_g.devd_fd != NULL) { + fd_deselect(hrState_g.devd_fd); + hrState_g.devd_fd = NULL; + } + syslog(LOG_ERR,"Closing devd_fd, revert to devinfo polling"); + } + + } else if (read_len == 0) { + syslog(LOG_ERR,"zero bytes read from devd pipe...."); + } else { + switch(buf[0]){ + case '+': + case '-': + case '?': + refresh_hrDevice_tbl_v(); + return; + default: + syslog(LOG_ERR,"unknown message read from devd socket"); + + } + } +} + /* * This is the implementation for a generated (by a SNMP tool) * function prototype, see hostres_tree.h @@ -359,7 +423,8 @@ /* refresh entries here?! */ - if ( (time(NULL) - hrState_g.hrDevice_tbl_age) > HR_DEVICE_TBL_REFRESH ) { + if ( hrState_g.devd_sock < 0 && + (time(NULL) - hrState_g.hrDevice_tbl_age) > HR_DEVICE_TBL_REFRESH ) { HR_DPRINTF((stderr, "__hrDeviceTable__ %s: need refresh\n ", __func__)); refresh_hrDevice_tbl_v(); } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#3 (text+ko) ==== @@ -43,6 +43,20 @@ #include #include +static +int get_avg_load( struct hrProcessorTblEntry *entry ) { + int i = 0; + double sum = 0.0; + assert(entry != NULL); + for( i = 0; i < MAX_CPU_SAMPLES; i++ ){ + sum += entry->samples[i]; + } + return floor((double)sum/(double)MAX_CPU_SAMPLES); + + +} + + static struct hrProcessorTblEntry * hrProcessorTblEntry_find_by_cpu_no(u_char cpu_no) { @@ -119,6 +133,9 @@ entry = hrProcessorTblEntry_find_by_cpu_no(kp->ki_lastcpu); assert(entry != NULL); /*what? FIX ME!*/ + if (entry == NULL) { + continue; + } entry->idle_pid = kp->ki_pid; @@ -128,7 +145,10 @@ entry->idle_pid)); - entry->load = floor((double)100.0 - hrProcessor_getpcpu(kp)); + entry->samples[entry->cur_sample_idx] = (double)100.0 - hrProcessor_getpcpu(plist); + /*this is fisrt time, thus no previous samples*/ + entry->load = floor(entry->samples[entry->cur_sample_idx]); + entry->cur_sample_idx = (entry->cur_sample_idx + 1) % MAX_CPU_SAMPLES; } @@ -175,6 +195,7 @@ entry->cpu_no = (u_char)cpu_no; entry->idle_pid = 0; entry->frwId = oid_zeroDotZero; /*unknown id - FIX ME*/ + INSERT_OBJECT_INT(entry, &hrState_g.hr_processor_tbl); hrState_g.detected_processor_count++; @@ -188,7 +209,7 @@ HR_DPRINTF((stderr, "%s: %d CPUs detected\n", __func__, hrState_g.detected_processor_count)); - hrProcessor_get_pids_v(); + hrProcessor_get_pids_v(); } @@ -245,6 +266,12 @@ } +void get_cpus_samples(void* arg __unused) { + + HR_DPRINTF((stderr, "[hrProcessorTable] [%llu]: ENTER\n ", get_ticks())); + refresh_hrProcessor_tbl_v(); + HR_DPRINTF((stderr, "[hrProcessorTable] [%llu]: EXIT\n ", get_ticks() )); +} void refresh_hrProcessor_tbl_v(void) { @@ -273,7 +300,9 @@ need_pids = 1; continue; } - entry->load = floor((double)100.0 - hrProcessor_getpcpu(plist)); + entry->samples[entry->cur_sample_idx] = (double)100.0 - hrProcessor_getpcpu(plist); + entry->load = get_avg_load(entry); + entry->cur_sample_idx = (entry->cur_sample_idx + 1) % MAX_CPU_SAMPLES; } if (need_pids == 1) { @@ -295,14 +324,6 @@ struct hrProcessorTblEntry *entry = NULL; int ret = SNMP_ERR_NOERROR; - if ( (time(NULL) - hrState_g.hrProcessor_tbl_age) > HR_PROCESSOR_TBL_REFRESH ) { - HR_DPRINTF((stderr, "__hrProcessorTable__ %s: need refresh\n ", __func__)); - refresh_hrProcessor_tbl_v(); - } - - - - switch (curr_op) { case SNMP_OP_GETNEXT: ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#11 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /*internal id got after we'll register this module with the agent */ @@ -129,7 +130,7 @@ hrState_g.hrFS_tbl_age = 0; hrState_g.hrSWRun_tbl_age = 0; hrState_g.hrDevice_tbl_age = 0; - hrState_g.hrProcessor_tbl_age = 0; + init_hrStorage_tbl_v(); init_hrFS_tbl_v(); @@ -137,9 +138,26 @@ support is initialized here */ init_hrDevice_tbl_v(); init_hrProcessor_tbl_v(); - - HR_DPRINTF((stderr, "[%s] done.\n", __func__)); + + /* + * Start the cpu stats collector + * The semantics of timer_start parameters is in "SNMP ticks"; + * we have 100 "SNMP ticks" per second, thus we are trying below + * to get MAX_CPU_SAMPLES per minute + */ + + hrState_g.cpus_load_timer = + timer_start(100, 100*60/MAX_CPU_SAMPLES, get_cpus_samples, NULL, mod); + + + if ((hrState_g.devd_sock = create_devd_socket()) < 0) { + HR_DPRINTF((stderr, "Failed to create the socket to devd pipe.\n")); + } + + hrState_g.devd_fd = NULL; + + HR_DPRINTF((stderr, "[%s] done.\n", __func__)); return (0); } @@ -151,6 +169,20 @@ static int hostres_fini(void) { + if (hrState_g.cpus_load_timer != NULL) { + timer_stop(hrState_g.cpus_load_timer); + hrState_g.cpus_load_timer = NULL; + } + + if (hrState_g.devd_fd != NULL) { + fd_deselect(hrState_g.devd_fd); + hrState_g.devd_fd = NULL; + } + + if (hrState_g.devd_sock > 0) { + close(hrState_g.devd_sock); + } + /* here I free the resources used by this module*/ if( hrState_g.utmp_fp != (FILE*)NULL ) { if( fclose(hrState_g.utmp_fp) != 0 ) { @@ -194,7 +226,7 @@ hrState_g.hrFS_tbl_age = 0; hrState_g.hrSWRun_tbl_age = 0; hrState_g.hrDevice_tbl_age = 0; - hrState_g.hrProcessor_tbl_age = 0; + hrState_g.dev_root = NULL; @@ -230,17 +262,12 @@ HR_DPRINTF((stderr, "%s: hrSWRunTable needs refresh\n ", __func__)); refresh_hrSWRun_tbl_v(); } - +/* if ( (time(NULL) - hrState_g.hrDevice_tbl_age) > HR_DEVICE_TBL_REFRESH ) { HR_DPRINTF((stderr, "%s: hrDeviceTable needs refresh\n ", __func__)); refresh_hrDevice_tbl_v(); } - - if ( (time(NULL) - hrState_g.hrProcessor_tbl_age) > HR_PROCESSOR_TBL_REFRESH ) { - HR_DPRINTF((stderr, "%s: hrProcessorTable needs refresh\n ", __func__)); - refresh_hrProcessor_tbl_v(); - } - +*/ HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } @@ -288,6 +315,13 @@ host_registration_id = or_register(&oid_host, "The MIB module for host resource mib (rfc 2790).", hostres_module); + + if (hrState_g.devd_sock > 0) { + hrState_g.devd_fd = fd_select(hrState_g.devd_sock, devd_socket_callback, NULL, hostres_module); + if (hrState_g.devd_fd == NULL) { + syslog(LOG_ERR, "fd_select failed on devd socket: %m"); + } + } HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#15 (text+ko) ==== @@ -195,11 +195,18 @@ TAILQ_HEAD(swrun_tbl, hrSWRunTblEntry); /* + * The number of CPU load samples per one minute, + * per each CPU + */ +#define MAX_CPU_SAMPLES 4 + +/* * This structure is used to hold a SNMP table entry * for HOST-RESOURCES-MIB's hrProcessorTable * Note that index is external being allocated & mainatined * by the hrDeviceTable code. */ + struct hrProcessorTblEntry { int32_t index; struct asn_oid frwId; @@ -207,7 +214,11 @@ TAILQ_ENTRY(hrProcessorTblEntry) link; /*not from SNMP table definition, only used internally*/ u_char cpu_no; /*which cpu, counted from 0*/ - pid_t idle_pid; /*the PID of ide process for this CPU */ + pid_t idle_pid; /*the PID of idle process for this CPU */ + double samples[MAX_CPU_SAMPLES]; /*the samples from the last + minutes, as required by MIB*/ + uint32_t cur_sample_idx; /*current sample to fill in next time, + must be < MAX_CPU_SAMPLES*/ }; TAILQ_HEAD(processor_tbl, hrProcessorTblEntry); @@ -333,6 +344,8 @@ struct devinfo_dev *dev_root; + int devd_sock; /*socket for /var/run/devd.pipe*/ + void *devd_fd; /*used to wait notifications from /var/run/devd.pipe */ /* * next items are used for hrProcessorTable */ @@ -343,8 +356,9 @@ fixpt_t ccpu; /* kernel _ccpu variable */ int fscale; /* kernel _fscale variable */ - time_t hrProcessor_tbl_age; + uint64_t hr_processor_tick; /*last (agent) tick when hrProcessorTable was updated */ + void* cpus_load_timer; /*periodic time used to get cpu laod stats*/ }; @@ -478,6 +492,20 @@ void refresh_hrDevice_tbl_v(void); /* + * Creates the sockect to devd pipe, aka + * /var/run/devd.pipe. Returs the socket descriptor or + * -1 in case of an error + */ +int create_devd_socket(void); + +/* + * Callback for fd_select function; called when + * device events are detected in order to trigger + * a device table refresh + */ +void devd_socket_callback(int, void*); + +/* * Init the things for hrProcessorTable */ void init_hrProcessor_tbl_v(void); @@ -500,5 +528,10 @@ */ void refresh_hrProcessor_tbl_v(void); +/* + * The timer function used to collect the CPUs load samples + * Each CPU is "visited" MAX_CPU_SAMPLES times per one minute + */ +void get_cpus_samples(void*); #endif /*__HOSTRES_SNMP_H_INCLUDED__ */ From owner-p4-projects@FreeBSD.ORG Wed Jul 27 01:30:07 2005 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 7D4FA16A421; Wed, 27 Jul 2005 01:30:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3FD9216A41F for ; Wed, 27 Jul 2005 01:30:06 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8C7E43D46 for ; Wed, 27 Jul 2005 01:30:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6R1U5Ga088716 for ; Wed, 27 Jul 2005 01:30:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6R1U5Mc088711 for perforce@freebsd.org; Wed, 27 Jul 2005 01:30:05 GMT (envelope-from peter@freebsd.org) Date: Wed, 27 Jul 2005 01:30:05 GMT Message-Id: <200507270130.j6R1U5Mc088711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 81027 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: Wed, 27 Jul 2005 01:30:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=81027 Change 81027 by peter@peter_daintree on 2005/07/27 01:30:02 Back out bogus library major version change. Back out getaddrinfo ABI change. Affected files ... .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#8 edit .. //depot/projects/hammer/gnu/lib/libg2c/Makefile#8 edit .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#13 edit .. //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#8 edit .. //depot/projects/hammer/gnu/lib/libregex/Makefile#10 edit .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#25 edit .. //depot/projects/hammer/include/netdb.h#13 edit .. //depot/projects/hammer/kerberos5/lib/Makefile.inc#6 edit .. //depot/projects/hammer/lib/Makefile.inc#4 edit .. //depot/projects/hammer/lib/libalias/Makefile#13 edit .. //depot/projects/hammer/lib/libarchive/Makefile#25 edit .. //depot/projects/hammer/lib/libbegemot/Makefile#4 edit .. //depot/projects/hammer/lib/libbluetooth/Makefile#3 edit .. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#7 edit .. //depot/projects/hammer/lib/libbz2/Makefile#5 edit .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#24 edit .. //depot/projects/hammer/lib/libc_r/Makefile#11 edit .. //depot/projects/hammer/lib/libcrypt/Makefile#8 edit .. //depot/projects/hammer/lib/libdevstat/Makefile#8 edit .. //depot/projects/hammer/lib/libdevstat/devstat.h#4 edit .. //depot/projects/hammer/lib/libedit/Makefile#5 edit .. //depot/projects/hammer/lib/libexpat/Makefile#5 edit .. //depot/projects/hammer/lib/libfetch/Makefile#12 edit .. //depot/projects/hammer/lib/libftpio/Makefile#4 edit .. //depot/projects/hammer/lib/libgpib/Makefile#3 edit .. //depot/projects/hammer/lib/libipsec/Makefile#7 edit .. //depot/projects/hammer/lib/libkiconv/Makefile#4 edit .. //depot/projects/hammer/lib/libmagic/Makefile#6 edit .. //depot/projects/hammer/lib/libmp/Makefile#5 edit .. //depot/projects/hammer/lib/libncp/Makefile#5 edit .. //depot/projects/hammer/lib/libncurses/Makefile#17 edit .. //depot/projects/hammer/lib/libnetgraph/Makefile#5 edit .. //depot/projects/hammer/lib/libngatm/Makefile#7 edit .. //depot/projects/hammer/lib/libopie/Makefile#8 edit .. //depot/projects/hammer/lib/libpam/Makefile.inc#10 edit .. //depot/projects/hammer/lib/libpthread/Makefile#18 edit .. //depot/projects/hammer/lib/libradius/Makefile#9 edit .. //depot/projects/hammer/lib/libsdp/Makefile#5 edit .. //depot/projects/hammer/lib/libsmb/Makefile#7 edit .. //depot/projects/hammer/lib/libtacplus/Makefile#6 edit .. //depot/projects/hammer/lib/libthr/Makefile#13 edit .. //depot/projects/hammer/lib/libthread_db/Makefile#6 edit .. //depot/projects/hammer/lib/libugidfw/Makefile#7 edit .. //depot/projects/hammer/lib/libusbhid/Makefile#6 edit .. //depot/projects/hammer/lib/libutil/Makefile#9 edit .. //depot/projects/hammer/lib/libvgl/Makefile#4 edit .. //depot/projects/hammer/lib/libwrap/Makefile#9 edit .. //depot/projects/hammer/lib/libypclnt/Makefile#6 edit .. //depot/projects/hammer/lib/msun/Makefile#29 edit .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#18 edit .. //depot/projects/hammer/secure/lib/libssh/Makefile#12 edit .. //depot/projects/hammer/secure/lib/libssl/Makefile#9 edit .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#4 edit Differences ... ==== //depot/projects/hammer/gnu/lib/libdialog/Makefile#8 (text+ko) ==== @@ -5,7 +5,7 @@ INCS= dialog.h MAN= dialog.3 -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 4 SRCS= kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \ lineedit.c radiolist.c textbox.c yesno.c prgbox.c raw_popen.c \ fselect.c ui_objects.c dir.c notify.c help.c gauge.c tree.c ==== //depot/projects/hammer/gnu/lib/libg2c/Makefile#8 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77 LIB= g2c -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 # Traditional FORTRAN Library members defined in libF77 ==== //depot/projects/hammer/gnu/lib/libobjc/Makefile#13 (text+ko) ==== @@ -6,7 +6,7 @@ .PATH: ${OBJCDIR}/objc ${OBJCDIR} LIB= objc -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 NO_MAN= SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ ==== //depot/projects/hammer/gnu/lib/libreadline/Makefile.inc#8 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.12 2005/07/22 17:18:58 kensmith Exp $ -SHLIB_MAJOR=6 +SHLIB_MAJOR=5 RL_LIBRARY_VERSION=5.0 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline ==== //depot/projects/hammer/gnu/lib/libregex/Makefile#10 (text+ko) ==== @@ -3,7 +3,7 @@ SUBDIR= doc LIB= gnuregex -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 2 SRCS= gnuregex.c INCSGROUPS= INCS WRINCS PXINCS ==== //depot/projects/hammer/gnu/lib/libstdc++/Makefile#25 (text+ko) ==== @@ -9,7 +9,7 @@ ${SUPDIR} ${GCCDIR} LIB= stdc++ -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 4 CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include ==== //depot/projects/hammer/include/netdb.h#13 (text+ko) ==== @@ -63,6 +63,8 @@ #include #include +#include +#include #ifndef _SIZE_T_DECLARED typedef __size_t size_t; @@ -123,12 +125,29 @@ int p_proto; /* protocol # */ }; +/* + * Note: ai_addrlen used to be a size_t, per RFC 2553. + * In XNS5.2, and subsequently in POSIX-2001 and RFC 3493 it was + * changed to a socklen_t. + * To accomodate for this while preserving binary compatibility with the + * old interface, we prepend or append 32 bits of padding, depending on + * the (LP64) architecture's endianness. + * + * This should be deleted the next time the libc major number is + * incremented. + */ struct addrinfo { int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ int ai_family; /* PF_xxx */ int ai_socktype; /* SOCK_xxx */ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ +#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN + uint32_t __ai_pad0; /* ABI compatibility */ +#endif socklen_t ai_addrlen; /* length of ai_addr */ +#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN + uint32_t __ai_pad0; /* ABI compatibility */ +#endif char *ai_canonname; /* canonical name for hostname */ struct sockaddr *ai_addr; /* binary address */ struct addrinfo *ai_next; /* next structure in linked list */ ==== //depot/projects/hammer/kerberos5/lib/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/lib/Makefile.inc,v 1.7 2005/07/22 17:18:58 kensmith Exp $ -SHLIB_MAJOR?= 8 +SHLIB_MAJOR?= 7 .include "../Makefile.inc" ==== //depot/projects/hammer/lib/Makefile.inc#4 (text+ko) ==== @@ -1,3 +1,3 @@ # $FreeBSD: src/lib/Makefile.inc,v 1.3 2005/07/22 17:18:58 kensmith Exp $ # Default version for system libs (override in /Makefile if necessary) -SHLIB_MAJOR?= 3 +SHLIB_MAJOR?= 2 ==== //depot/projects/hammer/lib/libalias/Makefile#13 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= alias SHLIBDIR?= /lib -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 4 MAN= libalias.3 SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ alias_nbt.c alias_pptp.c alias_proxy.c alias_skinny.c alias_smedia.c \ ==== //depot/projects/hammer/lib/libarchive/Makefile#25 (text+ko) ==== @@ -9,7 +9,7 @@ LIB= archive VERSION= 1.02.026 ARCHIVE_API_FEATURE= 2 -ARCHIVE_API_VERSION= 2 +ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} CFLAGS+= -DPACKAGE_NAME=\"lib${LIB}\" CFLAGS+= -DPACKAGE_VERSION=\"${VERSION}\" ==== //depot/projects/hammer/lib/libbegemot/Makefile#4 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${LIBBEGEMOT_DIR} LIB= begemot -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SHLIBDIR?= /lib # WARNS?= 6 ==== //depot/projects/hammer/lib/libbluetooth/Makefile#3 (text+ko) ==== @@ -7,7 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= bluetooth.c INCS= bluetooth.h ==== //depot/projects/hammer/lib/libbsnmp/Makefile.inc#7 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/lib/libbsnmp/Makefile.inc,v 1.6 2005/07/22 17:18:59 kensmith Exp $ -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 2 WARNS?= 6 NO_WERROR= INCSDIR= ${INCLUDEDIR}/bsnmp ==== //depot/projects/hammer/lib/libbz2/Makefile#5 (text+ko) ==== @@ -4,7 +4,7 @@ .PATH: ${BZ2DIR} LIB= bz2 -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= bzlib.c blocksort.c compress.c crctable.c decompress.c \ huffman.c randtable.c INCS= bzlib.h ==== //depot/projects/hammer/lib/libc/net/getaddrinfo.c#24 (text+ko) ==== @@ -1352,6 +1352,9 @@ memset(ai->ai_addr, 0, (size_t)afd->a_socklen); ai->ai_addr->sa_len = afd->a_socklen; ai->ai_addrlen = afd->a_socklen; +#if __LONG_BIT == 64 + ai->__ai_pad0 = 0; /* ABI compatibility */ +#endif ai->ai_addr->sa_family = ai->ai_family = afd->a_af; p = (char *)(void *)(ai->ai_addr); #ifdef FAITH ==== //depot/projects/hammer/lib/libc_r/Makefile#11 (text+ko) ==== @@ -8,7 +8,7 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. LIB=c_r -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 5 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ -I${.CURDIR}/../../include ==== //depot/projects/hammer/lib/libcrypt/Makefile#8 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libcrypt/Makefile,v 1.36 2005/07/22 17:19:00 kensmith Exp $ # -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 2 LIB= crypt SHLIBDIR?= /lib ==== //depot/projects/hammer/lib/libdevstat/Makefile#8 (text+ko) ==== @@ -3,7 +3,7 @@ LIB= devstat SHLIBDIR?= /lib # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented. -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 4 SRCS= devstat.c INCS= devstat.h ==== //depot/projects/hammer/lib/libdevstat/devstat.h#4 (text+ko) ==== @@ -43,7 +43,7 @@ * backwards-compatible API changes, so application writers have a way to * determine when a particular feature is available. */ -#define DEVSTAT_USER_API_VER 6 +#define DEVSTAT_USER_API_VER 5 #define DEVSTAT_ERRBUF_SIZE 2048 /* size of the devstat library error string */ ==== //depot/projects/hammer/lib/libedit/Makefile#5 (text+ko) ==== @@ -3,7 +3,7 @@ # $FreeBSD: src/lib/libedit/Makefile,v 1.29 2005/07/22 17:19:00 kensmith Exp $ LIB= edit -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 4 SHLIBDIR?= /lib OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ ==== //depot/projects/hammer/lib/libexpat/Makefile#5 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= bsdxml SHLIBDIR?= /lib -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= xmlparse.c xmlrole.c xmltok.c INCS= bsdxml.h MAN= libbsdxml.3 ==== //depot/projects/hammer/lib/libfetch/Makefile#12 (text+ko) ==== @@ -18,7 +18,7 @@ CSTD?= c99 WARNS?= 2 -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 ftperr.h: ftp.errors @echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET} ==== //depot/projects/hammer/lib/libftpio/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libftpio/Makefile,v 1.14 2005/07/22 17:19:01 kensmith Exp $ LIB= ftpio -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 5 SRCS= ftpio.c ftperr.c INCS= ftpio.h ==== //depot/projects/hammer/lib/libgpib/Makefile#3 (text+ko) ==== @@ -2,7 +2,7 @@ LIB = gpib SHLIBDIR ?= /lib -SHLIB_MAJOR = 1 +SHLIB_MAJOR = 0 NO_MAN = sorry SRCS = ibfoo.c INCS = gpib.h ==== //depot/projects/hammer/lib/libipsec/Makefile#7 (text+ko) ==== @@ -29,7 +29,7 @@ LIB= ipsec SHLIBDIR?= /lib -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC .if !defined(NO_INET6) ==== //depot/projects/hammer/lib/libkiconv/Makefile#4 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= xlat16_iconv.c xlat16_sysctl.c SRCS+= quirks.c -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 MAN= kiconv.3 ==== //depot/projects/hammer/lib/libmagic/Makefile#6 (text+ko) ==== @@ -5,7 +5,7 @@ .PATH: ${CONTRDIR} LIB= magic -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \ ==== //depot/projects/hammer/lib/libmp/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libmp/Makefile,v 1.10 2005/07/22 17:19:01 kensmith Exp $ LIB= mp -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 4 MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c ==== //depot/projects/hammer/lib/libncp/Makefile#5 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= ncp -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 NO_MAN= ==== //depot/projects/hammer/lib/libncurses/Makefile#17 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= ncurses SHLIBDIR?= /lib -SHLIB_MAJOR=6 +SHLIB_MAJOR=5 # Should be elsewhere AWK?= awk ==== //depot/projects/hammer/lib/libnetgraph/Makefile#5 (text+ko) ==== @@ -5,7 +5,7 @@ WARNS?= 3 MAN= netgraph.3 -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= sock.c msg.c debug.c INCS= netgraph.h ==== //depot/projects/hammer/lib/libngatm/Makefile#7 (text+ko) ==== @@ -3,7 +3,7 @@ # Author: Harti Brandt # LIB= ngatm -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3 WARNS?= 6 ==== //depot/projects/hammer/lib/libopie/Makefile#8 (text+ko) ==== @@ -4,7 +4,7 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 KEYFILE?= \"/etc/opiekeys\" ==== //depot/projects/hammer/lib/libpam/Makefile.inc#10 (text+ko) ==== @@ -28,5 +28,5 @@ DEBUG_FLAGS+= -DDEBUG .endif -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 2 PAM_MOD_DIR= ${LIBDIR} ==== //depot/projects/hammer/lib/libpthread/Makefile#18 (text+ko) ==== @@ -12,7 +12,7 @@ .else LIB=pthread .endif -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include ==== //depot/projects/hammer/lib/libradius/Makefile#9 (text+ko) ==== @@ -28,7 +28,7 @@ SRCS= radlib.c INCS= radlib.h radlib_vs.h CFLAGS+= -Wall -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 MAN= libradius.3 radius.conf.5 .if defined(NO_CRYPT) || defined(NO_OPENSSL) ==== //depot/projects/hammer/lib/libsdp/Makefile#5 (text+ko) ==== @@ -7,7 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR} -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= search.c service.c session.c util.c INCS= sdp.h ==== //depot/projects/hammer/lib/libsmb/Makefile#7 (text+ko) ==== @@ -4,7 +4,7 @@ .PATH: ${CONTRIBDIR}/lib/smb LIB= smb -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 NO_MAN= SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ ==== //depot/projects/hammer/lib/libtacplus/Makefile#6 (text+ko) ==== @@ -30,7 +30,7 @@ CFLAGS+= -Wall DPADD= ${LIBMD} LDADD= -lmd -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 MAN= libtacplus.3 tacplus.conf.5 .include ==== //depot/projects/hammer/lib/libthr/Makefile#13 (text+ko) ==== @@ -8,7 +8,7 @@ # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. LIB=thr -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include ==== //depot/projects/hammer/lib/libthread_db/Makefile#6 (text+ko) ==== @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} LIB= thread_db -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= thread_db.c SRCS+= libpthread_db.c libpthread_md.c SRCS+= libc_r_db.c libc_r_md.c ==== //depot/projects/hammer/lib/libugidfw/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libugidfw/Makefile,v 1.7 2005/07/22 17:19:04 kensmith Exp $ LIB= ugidfw -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= ugidfw.c INCS= ugidfw.h ==== //depot/projects/hammer/lib/libusbhid/Makefile#6 (text+ko) ==== @@ -4,7 +4,7 @@ LIB= usbhid MAN= usbhid.3 -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 MLINKS= usbhid.3 libusbhid.3 usbhid.3 hid_get_report_desc.3 \ usbhid.3 hid_dispose_report_desc.3 \ ==== //depot/projects/hammer/lib/libutil/Makefile#9 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/lib/libutil/Makefile,v 1.57 2005/07/22 17:19:04 kensmith Exp $ LIB= util -SHLIB_MAJOR= 5 +SHLIB_MAJOR= 4 SHLIBDIR?= /lib CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/ CFLAGS+=-DINET6 ==== //depot/projects/hammer/lib/libvgl/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/lib/libvgl/Makefile,v 1.11 2005/07/22 17:19:04 kensmith Exp $ LIB= vgl -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 CFLAGS+=-Wall -I${.CURDIR} SRCS= main.c simple.c bitmap.c text.c mouse.c keyboard.c INCS= vgl.h ==== //depot/projects/hammer/lib/libwrap/Makefile#9 (text+ko) ==== @@ -3,7 +3,7 @@ # LIB= wrap -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 ==== //depot/projects/hammer/lib/libypclnt/Makefile#6 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libypclnt/Makefile,v 1.13 2005/07/22 17:19:04 kensmith Exp $ LIB= ypclnt -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 1 SRCS= ypclnt_connect.c \ ypclnt_error.c \ ypclnt_free.c \ ==== //depot/projects/hammer/lib/msun/Makefile#29 (text+ko) ==== @@ -26,7 +26,7 @@ LIB= m SHLIBDIR?= /lib -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \ e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \ e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \ ==== //depot/projects/hammer/secure/lib/libcrypto/Makefile#18 (text+ko) ==== @@ -2,7 +2,7 @@ LIB= crypto SHLIBDIR?= /lib -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 NO_LINT= ==== //depot/projects/hammer/secure/lib/libssh/Makefile#12 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/secure/lib/libssh/Makefile,v 1.35 2005/07/22 17:19:05 kensmith Exp $ LIB= ssh -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 2 SRCS= acss.c authfd.c authfile.c bufaux.c buffer.c \ canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \ cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \ ==== //depot/projects/hammer/secure/lib/libssl/Makefile#9 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/secure/lib/libssl/Makefile,v 1.22 2005/07/22 17:19:05 kensmith Exp $ LIB= ssl -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 NO_LINT= ==== //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/usr.sbin/bsnmpd/modules/Makefile.inc,v 1.10 2005/07/22 17:18:57 kensmith Exp $ -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 3 WARNS?= 6 INCSDIR= ${INCLUDEDIR}/bsnmp From owner-p4-projects@FreeBSD.ORG Wed Jul 27 05:20:46 2005 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 DB3F816A421; Wed, 27 Jul 2005 05:20:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B032216A41F for ; Wed, 27 Jul 2005 05:20:45 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E0E643D45 for ; Wed, 27 Jul 2005 05:20:45 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6R5KjIh004748 for ; Wed, 27 Jul 2005 05:20:45 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6R5Kiq3004745 for perforce@freebsd.org; Wed, 27 Jul 2005 05:20:44 GMT (envelope-from peter@freebsd.org) Date: Wed, 27 Jul 2005 05:20:44 GMT Message-Id: <200507270520.j6R5Kiq3004745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 81032 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: Wed, 27 Jul 2005 05:20:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=81032 Change 81032 by peter@peter_daintree on 2005/07/27 05:20:38 IFC @81031 Affected files ... .. //depot/projects/hammer/Makefile.inc1#100 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#2 integrate .. //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/hammer/etc/rc.d/dhclient#16 integrate .. //depot/projects/hammer/lib/bind/bind/config.h#2 integrate .. //depot/projects/hammer/lib/bind/config.h#3 integrate .. //depot/projects/hammer/lib/bind/config.mk#7 integrate .. //depot/projects/hammer/lib/bind/isc/Makefile#4 integrate .. //depot/projects/hammer/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/hammer/lib/libmemstat/memstat_uma.c#4 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#4 integrate .. //depot/projects/hammer/sbin/dhclient/tables.c#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/hammer/share/doc/IPv6/IMPLEMENTATION#5 integrate .. //depot/projects/hammer/share/man/man4/gif.4#7 integrate .. //depot/projects/hammer/share/man/man9/Makefile#55 integrate .. //depot/projects/hammer/share/man/man9/VFS.9#5 integrate .. //depot/projects/hammer/share/man/man9/VFS_START.9#7 delete .. //depot/projects/hammer/sys/amd64/conf/GENERIC#77 integrate .. //depot/projects/hammer/sys/boot/common/help.common#13 integrate .. //depot/projects/hammer/sys/conf/NOTES#95 integrate .. //depot/projects/hammer/sys/conf/files#120 integrate .. //depot/projects/hammer/sys/conf/options#82 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#10 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#17 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/gem/if_gemvar.h#6 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#31 integrate .. //depot/projects/hammer/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/hammer/sys/kern/sched_ule.c#62 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#36 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#8 integrate .. //depot/projects/hammer/sys/net/if_gif.c#20 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#21 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#24 integrate .. //depot/projects/hammer/sys/netinet/icmp6.h#9 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#61 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#47 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#32 integrate .. //depot/projects/hammer/sys/netinet6/ah_core.c#10 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#21 integrate .. //depot/projects/hammer/sys/netinet6/in6.c#16 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#10 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#8 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#11 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#13 integrate .. //depot/projects/hammer/sys/netinet6/in6_var.h#9 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#13 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#23 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#33 integrate .. //depot/projects/hammer/sys/netinet6/ip6_var.h#14 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#17 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#12 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#19 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#20 integrate .. //depot/projects/hammer/sys/netinet6/route6.c#6 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#7 integrate .. //depot/projects/hammer/sys/netinet6/scope6_var.h#5 integrate .. //depot/projects/hammer/sys/netinet6/udp6_output.c#13 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#19 integrate .. //depot/projects/hammer/sys/netkey/key.c#21 integrate .. //depot/projects/hammer/sys/vm/uma.h#13 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#42 integrate .. //depot/projects/hammer/tools/tools/README#16 integrate .. //depot/projects/hammer/tools/tools/bpfstat/Makefile#1 branch .. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.8#1 branch .. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.c#1 branch .. //depot/projects/hammer/tools/tools/bpfstat/bpfstat.h#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/Files/root/change_password#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Files/root/save_sshkeys#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/Files/root/updatep#1 branch .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#14 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#15 integrate .. //depot/projects/hammer/tools/tools/nanobsd/nanobsd.sh#1 branch .. //depot/projects/hammer/usr.bin/dig/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/host/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/nslookup/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/nsupdate/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/vmstat/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/vmstat/vmstat.c#19 integrate .. //depot/projects/hammer/usr.sbin/dnssec-keygen/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/dnssec-signzone/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#25 integrate .. //depot/projects/hammer/usr.sbin/named-checkconf/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/named-checkzone/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/named/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/hammer/usr.sbin/rndc-confgen/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/rndc/Makefile#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#100 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.501 2005/07/23 14:23:30 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.502 2005/07/25 14:44:09 des Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -985,14 +985,6 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L -.if !defined(NO_BIND) -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -_prebuild_libs+= lib/libc_r -.else -_prebuild_libs+= lib/libpthread -.endif -.endif - _generic_libs+= lib .if !defined(NO_CRYPT) ==== //depot/projects/hammer/ObsoleteFiles.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.3 2005/07/23 23:55:27 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.4 2005/07/26 19:21:10 dougb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -20,6 +20,8 @@ OLD_FILES+=usr/libexec/rexecd # 20050324: updated release infrastructure OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz +# 20050317: removed from BIND 9 distribution +OLD_FILES+=usr/share/doc/bind9/KNOWN_DEFECTS # 2005XXXX: OLD_FILES+=sbin/mount_autofs OLD_FILES+=usr/lib/libautofs.a ==== //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#5 (text+ko) ==== @@ -43,11 +43,12 @@ 7) Generate and run configure: - $ autoconf253 - $ autoheader253 + $ aclocal + $ autoheader + $ autoconf $ ./configure --prefix=/usr \ --infodir=/usr/share/info --mandir=/usr/share/man \ - --enable-threads --enable-libbind --disable-ipv6 \ + --disable-threads --enable-libbind --disable-ipv6 \ --enable-getifaddrs --disable-linux-caps \ --with-openssl=/usr --with-randomdev=/dev/random @@ -55,9 +56,20 @@ command line; src/lib/bind/config.mk will re-enable it at compile time if NO_INET6 is not defined. -8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and - commit it. Do not commit any other file that was modified or - created in steps 6) or 7). +8) Copy the following generated files to src/lib/bind and commit them: + + Path in src/contrib/bind9 Path in src/lib/bind + ------------------------------------------------------------ + config.h config.h + lib/bind/config.h bind/config.h + lib/bind/port_after.h bind/port_after.h + lib/bind/port_before.h bind/port_before.h + lib/isc/include/isc/platform.h isc/isc/platform.h + lib/lwres/include/lwres/netdb.h lwres/lwres/netdb.h + lib/lwres/include/lwres/platform.h lwres/lwres/platform.h + + Do not commit any other file that was modified or created in + steps 6) or 7). 9) cd src/lib/bind/dns && make -DMAINTAINER_MODE generate && rm gen Commit the new versions of the files generated. @@ -102,4 +114,4 @@ -- des@FreeBSD.org -- dougb@FreeBSD.org -$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.4 2005/03/17 08:40:41 dougb Exp $ +$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.5 2005/07/25 17:14:00 des Exp $ ==== //depot/projects/hammer/etc/rc.d/dhclient#16 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.20 2005/06/30 17:50:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.21 2005/07/26 00:37:19 brooks Exp $ # # PROVIDE: dhclient @@ -23,7 +23,6 @@ if [ -x /usr/bin/pgrep ]; then pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then - echo "${name} ${ifn}: already running?" exit 0 fi fi ==== //depot/projects/hammer/lib/bind/bind/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/bind/config.h,v 1.1 2004/09/21 19:01:42 des Exp $ */ +/* $FreeBSD: src/lib/bind/bind/config.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* #undef _SOCKADDR_LEN */ @@ -46,3 +46,11 @@ #endif /* #undef BROKEN_IN6ADDR_INIT_MACROS */ #define HAVE_STRLCAT 1 +/* Shut up warnings about missing braces */ +/* #undef SHUTUP_MUTEX_INITIALIZER */ +#ifdef SHUTUP_MUTEX_INITIALIZER +#define LIBBIND_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } +#else +#define LIBBIND_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif + ==== //depot/projects/hammer/lib/bind/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/config.h,v 1.2 2005/03/17 08:37:32 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/config.h,v 1.3 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -36,7 +36,7 @@ /* #undef NEED_PTHREAD_INIT */ /* define if your system has sigwait() */ -#define HAVE_SIGWAIT 1 +/* #undef HAVE_SIGWAIT */ /* define if sigwait() is the UnixWare flavor */ /* #undef HAVE_UNIXWARE_SIGWAIT */ @@ -48,7 +48,7 @@ /* #undef HAVE_LINUXTHREADS */ /* define if sysconf() is available */ -#define HAVE_SYSCONF 1 +/* #undef HAVE_SYSCONF */ /* define if sysctlbyname() is available */ #define HAVE_SYSCTLBYNAME 1 @@ -129,10 +129,10 @@ #define PATH_RANDOMDEV "/dev/random" /* define if pthread_attr_getstacksize() is available */ -#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */ /* define if pthread_attr_setstacksize() is available */ -#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ /* define if you have strerror in the C library. */ #define HAVE_STRERROR 1 @@ -149,6 +149,9 @@ /* Define if threads need PTHREAD_SCOPE_SYSTEM */ /* #undef NEED_PTHREAD_SCOPE_SYSTEM */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 @@ -165,7 +168,7 @@ /* #undef HAVE_LIBNSL */ /* Define to 1 if you have the `pthread' library (-lpthread). */ -#define HAVE_LIBPTHREAD 1 +/* #undef HAVE_LIBPTHREAD */ /* Define to 1 if you have the `scf' library (-lscf). */ /* #undef HAVE_LIBSCF */ @@ -252,9 +255,11 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus /* #undef inline */ +#endif /* Define to `unsigned' if does not define. */ /* #undef size_t */ ==== //depot/projects/hammer/lib/bind/config.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.14 2005/03/17 08:35:21 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.15 2005/07/25 14:44:09 des Exp $ # BIND version number .if defined(BIND_DIR) && exists(${BIND_DIR}/version) @@ -74,7 +74,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isccfg/include LIBISC= ${LIB_BIND_REL}/isc/libisc.a CFLAGS+= -I${BIND_DIR}/lib/isc/unix/include \ - -I${BIND_DIR}/lib/isc/pthreads/include \ + -I${BIND_DIR}/lib/isc/nothreads/include \ -I${BIND_DIR}/lib/isc/include \ -I${LIB_BIND_DIR}/isc LIBLWRES= ${LIB_BIND_REL}/lwres/liblwres.a @@ -95,17 +95,3 @@ CRYPTO_DPADD= ${LIBCRYPTO} CRYPTO_LDADD= -lcrypto .endif - -# Link against POSIX threads library -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -.if defined(NO_LIBC_R) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBC_R" -.endif -.else -.if defined(NO_LIBPTHREAD) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBPTHREAD" -.endif -.endif - -PTHREAD_DPADD= ${LIBPTHREAD} -PTHREAD_LDADD= -lpthread ==== //depot/projects/hammer/lib/bind/isc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -19,7 +19,7 @@ .PATH: ${SRCDIR}/nls SRCS+= msgcat.c \ -.PATH: ${SRCDIR}/pthreads +.PATH: ${SRCDIR}/nothreads SRCS+= condition.c mutex.c \ thread.c @@ -35,7 +35,7 @@ serial.c sha1.c sockaddr.c string.c strtoul.c \ symtab.c task.c taskpool.c timer.c version.c -CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} DPADD= ${PTHREAD_DPADD} @@ -104,10 +104,10 @@ ${SRCDIR}/include/isc/types.h \ ${SRCDIR}/include/isc/util.h \ ${SRCDIR}/include/isc/version.h \ - ${SRCDIR}/pthreads/include/isc/condition.h \ - ${SRCDIR}/pthreads/include/isc/mutex.h \ - ${SRCDIR}/pthreads/include/isc/once.h \ - ${SRCDIR}/pthreads/include/isc/thread.h \ + ${SRCDIR}/nothreads/include/isc/condition.h \ + ${SRCDIR}/nothreads/include/isc/mutex.h \ + ${SRCDIR}/nothreads/include/isc/once.h \ + ${SRCDIR}/nothreads/include/isc/thread.h \ ${SRCDIR}/unix/include/isc/dir.h \ ${SRCDIR}/unix/include/isc/int.h \ ${SRCDIR}/unix/include/isc/keyboard.h \ ==== //depot/projects/hammer/lib/bind/isc/isc/platform.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.1 2004/09/21 19:01:43 des Exp $ */ +/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") @@ -158,7 +158,7 @@ /* * Defined if we are using threads. */ -#define ISC_PLATFORM_USETHREADS 1 +#undef ISC_PLATFORM_USETHREADS /* * Defined if unistd.h does not cause fd_set to be delared. ==== //depot/projects/hammer/lib/libc/gen/getttyent.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.12 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $"); #include #include @@ -105,6 +105,10 @@ zapchar = 0; tty.ty_name = p; + tty.ty_status = 0; + tty.ty_window = NULL; + tty.ty_group = _TTYS_NOGROUP; + p = skip(p); if (!*(tty.ty_getty = p)) tty.ty_getty = tty.ty_type = NULL; @@ -121,9 +125,6 @@ p = skip(p); } } - tty.ty_status = 0; - tty.ty_window = NULL; - tty.ty_group = _TTYS_NOGROUP; for (; *p; p = skip(p)) { if (scmp(_TTYS_OFF)) ==== //depot/projects/hammer/lib/libmemstat/memstat_uma.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libmemstat/memstat_uma.c,v 1.7 2005/07/24 01:28:54 rwatson Exp $ + * $FreeBSD: src/lib/libmemstat/memstat_uma.c,v 1.8 2005/07/25 09:52:59 rwatson Exp $ */ #include @@ -211,7 +211,16 @@ mtp->mt_count = mtp->mt_numallocs - mtp->mt_numfrees; mtp->mt_zonefree = uthp->uth_zone_free; - mtp->mt_kegfree = uthp->uth_keg_free; + + /* + * UMA secondary zones share a keg with the primary zone. To + * avoid double-reporting of free items, report keg free + * items only in the primary zone. + */ + if (!(uthp->uth_zone_flags & UTH_ZONE_SECONDARY)) { + mtp->mt_free += mtp->mt_kegfree; + mtp->mt_kegfree = uthp->uth_keg_free; + } mtp->mt_free += mtp->mt_zonefree; } ==== //depot/projects/hammer/sbin/dhclient/dhclient-script#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $ -# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4 2005/06/10 03:41:18 brooks Exp $ +# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.5 2005/07/26 18:27:37 brooks Exp $ # # Copyright (c) 2003 Kenneth R Westerback # @@ -198,7 +198,7 @@ fi if [ -x $NETSTAT ]; then - if_defaulroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` + if_defaultroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` else if_defaultroute="x" fi ==== //depot/projects/hammer/sbin/dhclient/dhclient.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ -/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.6 2005/06/30 05:50:52 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.7 2005/07/25 04:32:40 sam Exp $ */ /* * Copyright 2004 Henning Brauer @@ -249,6 +249,7 @@ break; switch (ifan->ifan_what) { case RTM_IEEE80211_ASSOC: + case RTM_IEEE80211_REASSOC: state_reboot(ifi); break; case RTM_IEEE80211_DISASSOC: ==== //depot/projects/hammer/sbin/dhclient/tables.c#2 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: tables.c,v 1.4 2004/05/04 20:28:40 deraadt Exp $ */ +/* $FreeBSD: src/sbin/dhclient/tables.c,v 1.2 2005/07/25 22:19:09 brooks Exp $ */ /* Tables of information... */ @@ -74,7 +75,7 @@ { "lpr-servers", "IA", &dhcp_universe, 9 }, { "impress-servers", "IA", &dhcp_universe, 10 }, { "resource-location-servers", "IA", &dhcp_universe, 11 }, - { "host-name", "X", &dhcp_universe, 12 }, + { "host-name", "t", &dhcp_universe, 12 }, { "boot-size", "S", &dhcp_universe, 13 }, { "merit-dump", "t", &dhcp_universe, 14 }, { "domain-name", "t", &dhcp_universe, 15 }, ==== //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.19 2005/07/14 18:33:21 rwatson Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.20 2005/07/26 06:00:33 sam Exp $ */ /*- @@ -344,7 +344,8 @@ static void set80211rtsthreshold(const char *val, int d, int s, const struct afswtch *rafp) { - set80211(s, IEEE80211_IOC_RTSTHRESHOLD, atoi(val), 0, NULL); + set80211(s, IEEE80211_IOC_RTSTHRESHOLD, + isundefarg(val) ? IEEE80211_RTS_MAX : atoi(val), 0, NULL); } static void @@ -624,6 +625,13 @@ set80211(s, IEEE80211_IOC_PUREG, d, 0, NULL); } +static +DECL_CMD_FUNC(set80211fragthreshold, val, d) +{ + set80211(s, IEEE80211_IOC_FRAGTHRESHOLD, + isundefarg(val) ? IEEE80211_FRAG_MAX : atoi(val), 0, NULL); +} + static int getmaxrate(uint8_t rates[15], uint8_t nrates) { @@ -1509,6 +1517,12 @@ LINE_CHECK("%crtsthreshold %d", spacer, ireq.i_val); } + ireq.i_type = IEEE80211_IOC_FRAGTHRESHOLD; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val != IEEE80211_FRAG_MAX || verbose) + LINE_CHECK("%cfragthreshold %d", spacer, ireq.i_val); + } + if (IEEE80211_IS_CHAN_G(c) || IEEE80211_IS_CHAN_PUREG(c) || verbose) { ireq.i_type = IEEE80211_IOC_PUREG; if (ioctl(s, SIOCG80211, &ireq) != -1) { @@ -1805,6 +1819,7 @@ #endif DEF_CMD("pureg", 1, set80211pureg), DEF_CMD("-pureg", 0, set80211pureg), + DEF_CMD_ARG("fragthreshold", set80211fragthreshold), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", ==== //depot/projects/hammer/share/doc/IPv6/IMPLEMENTATION#5 (text+ko) ==== @@ -3,7 +3,7 @@ KAME Project http://www.kame.net/ $KAME: IMPLEMENTATION,v 1.216 2001/05/25 07:43:01 jinmei Exp $ - $FreeBSD: src/share/doc/IPv6/IMPLEMENTATION,v 1.7 2003/11/05 12:00:32 ume Exp $ + $FreeBSD: src/share/doc/IPv6/IMPLEMENTATION,v 1.8 2005/07/25 16:26:47 ume Exp $ NOTE: The document tries to describe behaviors/implementation choices of the latest KAME/*BSD stack (like KAME/NetBSD 1.5.1). The description @@ -164,8 +164,6 @@ RFC2732: Format for Literal IPv6 Addresses in URL's * The spec is implemented in programs that handle URLs (like freebsd ftpio(3) and fetch(1), or netbsd ftp(1)) -RFC2766: Network Address Translation - Protocol Translation (NAT-PT) - * Section 4.2 is implemented by totd (see ports/totd, or pkgsrc/net/totd). RFC2874: DNS Extensions to Support IPv6 Address Aggregation and Renumbering * KAME/bsdi4 supports A6, DNAME and binary label to some extent. * KAME apps/bind8 repository has resolver library with partial A6, DNAME @@ -183,6 +181,9 @@ * "stf" interface implements it. Be sure to read draft-itojun-ipv6-transition-abuse-01.txt below before configuring it, there can be security issues. +RFC3142: An IPv6-to-IPv4 transport relay translator + * FAITH tcp relay translator (faithd) implements this. See 3.1 for more + details. RFC3152: Delegation of IP6.ARPA * libinet6 resolvers contained in the KAME snaps support to use the ip6.arpa domain (with the nibble format) for IPv6 reverse @@ -198,6 +199,7 @@ - supported but turned off by default on KAME/NetBSD and KAME/FreeBSD5, - not supported on KAME/FreeBSD228, KAME/OpenBSD and KAME/BSDI3. see 1.12 in this document for details. + * The AI_ALL and AI_V4MAPPED flags are not supported. RFC3542: Advanced Sockets API for IPv6 (revised) * For supported library functions/kernel APIs, see sys/netinet6/ADVAPI. * Some of the updates in the draft are not implemented yet. See @@ -289,9 +291,9 @@ To avoid possible DoS attacks and infinite loops, KAME stack will accept only 10 options on ND packet. Therefore, if you have 20 prefix options attached to RA, only the first 10 prefixes will be recognized. -If this troubles you, please contact KAME team and/or modify +If this troubles you, please contact the KAME team and/or modify nd6_maxndopt in sys/netinet6/nd6.c. If there are high demands we may -provide sysctl knob for the variable. +provide a sysctl knob for the variable. Proxy Neighbor Advertisement support is implemented in the kernel. For instance, you can configure it by using the following command: @@ -345,7 +347,7 @@ net.inet6.icmp6.nd6_debug. nd6_debug can be turned on at bootstrap time, by defining ND6_DEBUG kernel compilation option (so you can debug behavior during bootstrap). nd6_debug configuration should -only be used for test/debug purposes - for production environment, +only be used for test/debug purposes - for a production environment, nd6_debug must be set to 0. If you leave it to 1, malicious parties can inject broken packet and fill up /var/log partition. @@ -355,29 +357,29 @@ specify the scope zone index (link index for a link-local address, or site index for a site-local address) with an IPv6 address. Without a zone index, a scoped IPv6 address is ambiguous to the kernel, and -the kernel would not be able to determine the outbound link for a +the kernel would not be able to determine the outbound zone for a packet to the scoped address. KAME code tries to address the issue in several ways. -The entire architecture of scoped addresses is documented in -draft-ietf-ipngwg-scoping-arch-xx.txt. One non-trivial point of the -architecture is that the link scope is (theoretically) larger than the -interface scope. That is, two different interfaces can belong to a -same single link. However, in a normal operation, we can assume that -there is 1-to-1 relationship between links and interfaces. In -other words, we can usually put links and interfaces in the same scope -type. The current KAME implementation assumes the 1-to-1 -relationship. In particular, we use interface names such as "ne1" as -unique link identifiers. This would be much more human-readable and -intuitive than numeric identifiers, but please keep your mind on the -theoretical difference between links and interfaces. +The entire architecture of scoped addresses is documented in RFC4007. +One non-trivial point of the architecture is that the link scope is +(theoretically) larger than the interface scope. That is, two +different interfaces can belong to a same single link. However, in a +normal operation, we can assume that there is 1-to-1 relationship +between links and interfaces. In other words, we can usually put +links and interfaces in the same scope type. The current KAME +implementation assumes the 1-to-1 relationship. In particular, we use +interface names such as "ne1" as unique link identifiers. This would +be much more human-readable and intuitive than numeric identifiers, +but please keep your mind on the theoretical difference between links +and interfaces. Site-local addresses are very vaguely defined in the specs, and both the specification and the KAME code need tons of improvements to enable its actual use. For example, it is still very unclear how we define a site, or how we resolve host names in a site. There is work underway to define behavior of routers at site border, but, we have -almost no code for site boundary node support (both forwarding nor +almost no code for site boundary node support (neither forwarding nor routing) and we bet almost noone has. We recommend, at this moment, you to use global addresses for experiments - there are way too many pitfalls if you use site-local addresses. @@ -397,6 +399,127 @@ link-local addresses over multiple links effectively and with only a little code change. +The use of the internal format must be limited inside the kernel. In +particular, addresses sent by an application should not contain the +embedded index (except via some very special APIs such as routing +sockets). Instead, the index should be specified in the sin6_scope_id +field of a sockaddr_in6 structure. Obviously, packets sent to or +received from must not contain the embedded index either, since the +index is meaningful only within the sending/receiving node. + +In order to deal with the differences, several kernel routines are +provided. These are available by including . +Typically, the following functions will be most generally used: + +- int sa6_embedscope(struct sockaddr_in6 *sa6, int defaultok); + Embed sa6->sin6_scope_id into sa6->sin6_addr. If sin6_scope_id is + 0, defaultok is non-0, and the default zone ID (see RFC4007) is + configured, the default ID will be used instead of the value of the + sin6_scope_id field. On success, sa6->sin6_scope_id will be reset + to 0. + + This function returns 0 on success, or a non-0 error code otherwise. + +- int sa6_recoverscope(struct sockaddr_in6 *sa6); + Extract embedded zone ID in sa6->sin6_addr and set + sa6->sin6_scope_id to that ID. The embedded ID will be cleared with + 0. + + This function returns 0 on success, or a non-0 error code otherwise. + +- int in6_clearscope(struct in6_addr *in6); + Reset the embedded zone ID in 'in6' to 0. This function never fails, and + returns 0 if the original address is intact or non 0 if the address is + modified. The return value doesn't matter in most cases; currently, the + only point where we care about the return value is ip6_input() for checking + whether the source or destination addresses of the incoming packet is in + the embedded form. + +- int in6_setscope(struct in6_addr *in6, struct ifnet *ifp, + u_int32_t *zoneidp); + Embed zone ID determined by the address scope type for 'in6' and the + interface 'ifp' into 'in6'. If zoneidp is non NULL, *zoneidp will + also have the zone ID. + + This function returns 0 on success, or a non-0 error code otherwise. + +The typical usage of these functions is as follows: + +sa6_embedscope() will be used at the socket or transport layer to +convert a sockaddr_in6 structure passed by an application into the +kernel-internal form. In this usage, the second argument is often the +'ip6_use_defzone' global variable. + +sa6_recoverscope() will also be used at the socket or transport layer +to convert an in6_addr structure with the embedded zone ID into a +sockaddr_in6 structure with the corresponding ID in the sin6_scope_id +field (and without the embedded ID in sin6_addr). + +in6_clearscope() will be used just before sending a packet to the wire +to remove the embedded ID. In general, this must be done at the last +stage of an output path, since otherwise the address would lose the ID +and could be ambiguous with regard to scope. + +in6_setscope() will be used when the kernel receives a packet from the +wire to construct the kernel internal form for each address field in +the packet (typical examples are the source and destination addresses +of the packet). In the typical usage, the third argument 'zoneidp' +will be NULL. A non-NULL value will be used when the validity of the +zone ID must be checked, e.g., when forwarding a packet to another +link (see ip6_forward() for this usage). + +An application, when sending a packet, is basically assumed to specify +the appropriate scope zone of the destination address by the +sin6_scope_id field (this might be done transparently from the +application with getaddrinfo() and the extended textual format - see +below), or at least the default scope zone(s) must be configured as a +last resort. In some cases, however, an application could specify an +ambiguous address with regard to scope, expecting it is disambiguated +in the kernel by some other means. A typical usage is to specify the +outgoing interface through another API, which can disambiguate the +unspecified scope zone. Such a usage is not recommended, but the +kernel implements some trick to deal with even this case. + +A rough sketch of the trick can be summarized as the following +sequence. + + sa6_embedscope(dst, ip6_use_defzone); + in6_selectsrc(dst, ..., &ifp, ...); + in6_setscope(&dst->sin6_addr, ifp, NULL); + +sa6_embedscope() first tries to convert sin6_scope_id (or the default +zone ID) into the kernel-internal form. This can fail with an +ambiguous destination, but it still tries to get the outgoing +interface (ifp) in the attempt of determining the source address of +the outgoing packet using in6_selectsrc(). If the interface is +detected, and the scope zone was originally ambiguous, in6_setscope() +can finally determine the appropriate ID with the address itself and +the interface, and construct the kernel-internal form. See, for +example, comments in udp6_output() for more concrete example. + +In any case, kernel routines except ones in netinet6/scope6.c MUST NOT +directly refer to the embedded form. They MUST use the above +interface functions. In particular, kernel routines MUST NOT have the +following code fragment: + + /* This is a bad practice. Don't do this */ + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) + sin6->sin6_addr.s6_addr16[1] = htons(ifp->if_index); + +This is bad for several reasons. First, address ambiguity is not +specific to link-local addresses (any non-global multicast addresses +are inherently ambiguous, and this is particularly true for +interface-local addresses). Secondly, this is vulnerable to future +changes of the embedded form (the embedded position may change, or the +zone ID may not actually be the interface index). Only scope6.c +routines should know the details. + +The above code fragment should thus actually be as follows: + + /* This is correct. */ + in6_setscope(&sin6->sin6_addr, ifp, NULL); + (and catch errors if possible and necessary) + 1.3.2 Interaction with API There are several candidates of API to deal with scoped addresses @@ -461,11 +584,11 @@ anyway. getaddrinfo(3) and getnameinfo(3) support an extended numeric IPv6 -syntax, as documented in draft-ietf-ipv6-scoping-arch-xx.txt. You can -specify the outgoing link, by using the name of the outgoing interface -as the link, like "fe80::1%ne0" (again, note that we assume there is -1-to-1 relationship between links and interfaces.) This way you will -be able to specify a link-local scoped address without much trouble. +syntax, as documented in RFC4007. You can specify the outgoing link, +by using the name of the outgoing interface as the link, like +"fe80::1%ne0" (again, note that we assume there is 1-to-1 relationship +between links and interfaces.) This way you will be able to specify a +link-local scoped address without much trouble. Other APIs like inet_pton(3) and inet_ntop(3) are inherently unfriendly with scoped addresses, since they are unable to annotate @@ -550,7 +673,7 @@ node is a router or a host (router if it is 1, host if it is 0). It is NOT recommended to change net.inet6.ip6.forwarding while the node -is in operation. IPv6 specification defines behavior for "host" and "router" +is in operation. IPv6 specification defines behavior for "host" and "router" quite differently, and switching from one to another can cause serious troubles. It is recommended to configure the variable at bootstrap time only. @@ -737,7 +860,7 @@ the packet and compares it to the length specified in the payload length field of the IPv6 header or in the value of the Jumbo Payload option, if any. If the former is shorter than the latter, KAME kernel -discards the packet and increments the statistics. You can see the +discards the packet and increments the statistics. You can see the statistics as output of netstat command with `-s -p ip6' option: % netstat -s -p ip6 ip6: @@ -789,7 +912,7 @@ (including the IPv6 header) in each incoming packet, in order to prevent a DoS attack that tries to send packets with a massive number of extension headers. The upper limit can be configured by the sysctl -value net.inet6.ip6.hdrnestlimit. In particular, if the value is 0, +value net.inet6.ip6.hdrnestlimit. In particular, if the value is 0, the node will allow an arbitrary number of headers. As of writing this document, the default value is 50. @@ -822,7 +945,7 @@ 1.10 Applications For userland programming, we support IPv6 socket API as specified in -RFC2553, RFC2292 and upcoming internet drafts. +RFC2553/3493, RFC3542 and upcoming internet drafts. TCP/UDP over IPv6 is available and quite stable. You can enjoy "telnet", "ftp", "rlogin", "rsh", "ssh", etc. These applications are protocol @@ -922,7 +1045,7 @@ KAME/FreeBSD4x configurable supported default: enabled KAME/NetBSD configurable supported - default: disabled + default: disabled KAME/BSDI4 enabled supported KAME/OpenBSD not supported not supported ==== //depot/projects/hammer/share/man/man4/gif.4#7 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/gif.4,v 1.25 2005/06/08 01:53:25 grog Exp $ +.\" $FreeBSD: src/share/man/man4/gif.4,v 1.26 2005/07/26 18:14:22 trhodes Exp $ .\" .Dd April 10, 1999 .Dt GIF 4 @@ -63,7 +63,7 @@ most easily done with the .Dq Nm ifconfig Cm create command or using the -.Va gifconfig_ Ns Aq Ar interface +.Va ifconfig_ Ns Aq Ar interface variable in .Xr rc.conf 5 . .Pp ==== //depot/projects/hammer/share/man/man9/Makefile#55 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.260 2005/06/14 03:40:01 imp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.261 2005/07/27 02:08:21 scottl Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -238,7 +238,6 @@ VFS_ROOT.9 \ vfs_rootmountalloc.9 \ VFS_SET.9 \ - VFS_START.9 \ VFS_STATFS.9 \ vfs_suser.9 \ VFS_SYNC.9 \ ==== //depot/projects/hammer/share/man/man9/VFS.9#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (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: src/share/man/man9/VFS.9,v 1.11 2005/02/13 22:25:19 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS.9,v 1.12 2005/07/27 02:08:59 scottl Exp $ .\" .Dd July 24, 1996 .Os @@ -49,7 +49,6 @@ .Xr VFS_INIT 9 , .Xr VFS_MOUNT 9 , .Xr VFS_QUOTACTL 9 , -.Xr VFS_START 9 , .Xr VFS_STATFS 9 , .Xr VFS_SYNC 9 , .Xr VFS_UNMOUNT 9 , ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#77 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.440 2005/07/14 15:39:04 kensmith Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.441 2005/07/24 17:55:57 mux Exp $ machine amd64 cpu HAMMER @@ -215,8 +215,7 @@ # ISA Ethernet NICs. pccard NICs included. device cs # Crystal Semiconductor CS89x0 NIC # 'device ed' requires 'device miibus' -# XXX kvtop brokenness, pointer/int warnings -#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards +device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards ==== //depot/projects/hammer/sys/boot/common/help.common#13 (text+ko) ==== @@ -223,7 +223,7 @@ set currdev= - Selects the default device. Syntax for devices is odd. + Selects the default device. See lsdev for available devices. ################################################################################ # Tset Sinit_path DSet the list of init candidates ==== //depot/projects/hammer/sys/conf/NOTES#95 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1326 2005/07/14 15:57:00 takawata Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1327 2005/07/25 10:49:04 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -145,6 +145,7 @@ options GEOM_SUNLABEL # Sun/Solaris partitioning options GEOM_UZIP # Read-only compressed disks options GEOM_VOL # Volume names from UFS superblock +options GEOM_ZERO # Peformance testing helper. # # The root device and filesystem type can be compiled in; ==== //depot/projects/hammer/sys/conf/files#120 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1036 2005/07/20 21:10:56 anholt Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1037 2005/07/25 10:49:04 pjd Exp $ # # The long compile-with and dependency lines are required because of >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 27 19:49:34 2005 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 8E01616A421; Wed, 27 Jul 2005 19:49:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38FFD16A420 for ; Wed, 27 Jul 2005 19:49:33 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E123543D5F for ; Wed, 27 Jul 2005 19:49:32 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6RJnWDN071514 for ; Wed, 27 Jul 2005 19:49:32 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6RJnWdw071511 for perforce@freebsd.org; Wed, 27 Jul 2005 19:49:32 GMT (envelope-from peter@freebsd.org) Date: Wed, 27 Jul 2005 19:49:32 GMT Message-Id: <200507271949.j6RJnWdw071511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 81068 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: Wed, 27 Jul 2005 19:49:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=81068 Change 81068 by peter@peter_overcee on 2005/07/27 19:48:59 Revert another gratuitous ABI change Affected files ... .. //depot/projects/hammer/include/netdb.h#14 edit Differences ... ==== //depot/projects/hammer/include/netdb.h#14 (text+ko) ==== @@ -105,11 +105,28 @@ #define h_addr h_addr_list[0] /* address, for backward compatibility */ }; +/* + * Note: n_net used to be an unsigned long integer. + * In XNS5, and subsequently in POSIX-2001 it was changed to an + * uint32_t. + * To accomodate for this while preserving binary compatibility with + * the old interface, we prepend or append 32 bits of padding, + * depending on the (LP64) architecture's endianness. + * + * This should be deleted the next time the libc major number is + * incremented. + */ struct netent { char *n_name; /* official name of net */ char **n_aliases; /* alias list */ int n_addrtype; /* net address type */ +#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN + uint32_t __n_pad0; /* ABI compatibility */ +#endif uint32_t n_net; /* network # */ +#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN + uint32_t __n_pad0; /* ABI compatibility */ +#endif }; struct servent { @@ -245,7 +262,11 @@ struct hostent *gethostent(void); struct hostent *getipnodebyaddr(const void *, size_t, int, int *); struct hostent *getipnodebyname(const char *, int, int, int *); +#if __LONG_BIT == 64 +struct netent *getnetbyaddr(unsigned long, int); /* ABI compatibility */ +#else struct netent *getnetbyaddr(uint32_t, int); +#endif struct netent *getnetbyname(const char *); struct netent *getnetent(void); int getnetgrent(char **, char **, char **); From owner-p4-projects@FreeBSD.ORG Wed Jul 27 19:50:35 2005 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 143BC16A421; Wed, 27 Jul 2005 19:50:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E4FC816A41F for ; Wed, 27 Jul 2005 19:50:34 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3C0A43D49 for ; Wed, 27 Jul 2005 19:50:34 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6RJoYfe071620 for ; Wed, 27 Jul 2005 19:50:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6RJoYig071617 for perforce@freebsd.org; Wed, 27 Jul 2005 19:50:34 GMT (envelope-from peter@freebsd.org) Date: Wed, 27 Jul 2005 19:50:34 GMT Message-Id: <200507271950.j6RJoYig071617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 81069 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: Wed, 27 Jul 2005 19:50:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=81069 Change 81069 by peter@peter_overcee on 2005/07/27 19:49:34 Unbump after restoring getnetent() ABI Affected files ... .. //depot/projects/hammer/lib/libpcap/Makefile#8 edit Differences ... ==== //depot/projects/hammer/lib/libpcap/Makefile#8 (text+ko) ==== @@ -19,7 +19,7 @@ CFLAGS+=-DINET6 .endif -SHLIB_MAJOR=4 +SHLIB_MAJOR=3 # # Magic to grab sources out of src/contrib From owner-p4-projects@FreeBSD.ORG Wed Jul 27 20:51:56 2005 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 641DB16A421; Wed, 27 Jul 2005 20:51:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DFDC16A41F for ; Wed, 27 Jul 2005 20:51:56 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2867B43D5D for ; Wed, 27 Jul 2005 20:51:53 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6RKprIV080874 for ; Wed, 27 Jul 2005 20:51:53 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6RKpqxc080871 for perforce@freebsd.org; Wed, 27 Jul 2005 20:51:52 GMT (envelope-from peter@freebsd.org) Date: Wed, 27 Jul 2005 20:51:52 GMT Message-Id: <200507272051.j6RKpqxc080871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 81075 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: Wed, 27 Jul 2005 20:51:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=81075 Change 81075 by peter@peter_overcee on 2005/07/27 20:50:59 IFC @81071 Affected files ... .. //depot/projects/hammer/lib/libc/net/inet_pton.c#3 integrate .. //depot/projects/hammer/lib/libz/inftrees.h#3 integrate .. //depot/projects/hammer/sbin/dhclient/bpf.c#2 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#10 integrate .. //depot/projects/hammer/sys/arm/include/endian.h#10 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#28 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#17 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#9 integrate .. //depot/projects/hammer/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#21 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#29 integrate .. //depot/projects/hammer/sys/pci/if_de.c#25 integrate .. //depot/projects/hammer/sys/pci/if_devar.h#9 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#36 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#53 integrate .. //depot/projects/hammer/sys/sparc64/include/cpufunc.h#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/main.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/perform.c#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#11 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/version.h#5 integrate Differences ... ==== //depot/projects/hammer/lib/libc/net/inet_pton.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.11 2002/09/06 11:23:49 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.12 2005/07/27 14:33:36 ume Exp $"); #include #include @@ -88,6 +88,8 @@ if ((pch = strchr(digits, ch)) != NULL) { u_int new = *tp * 10 + (pch - digits); + if (saw_digit && *tp == 0) + return (0); if (new > 255) return (0); *tp = new; @@ -195,6 +197,8 @@ const int n = tp - colonp; int i; + if (tp == endp) + return (0); for (i = 1; i <= n; i++) { endp[- i] = colonp[n - i]; colonp[n - i] = 0; ==== //depot/projects/hammer/lib/libz/inftrees.h#3 (text+ko) ==== @@ -36,12 +36,12 @@ */ /* Maximum size of dynamic tree. The maximum found in a long but non- - exhaustive search was 1004 code structures (850 for length/literals - and 154 for distances, the latter actually the result of an + exhaustive search was 1444 code structures (852 for length/literals + and 592 for distances, the latter actually the result of an exhaustive search). The true maximum is not known, but the value below is more than safe. */ -#define ENOUGH 1440 -#define MAXD 154 +#define ENOUGH 2048 +#define MAXD 592 /* Type of code to build for inftable() */ typedef enum { ==== //depot/projects/hammer/sbin/dhclient/bpf.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: bpf.c,v 1.13 2004/05/05 14:28:58 deraadt Exp $ */ -/* $FreeBSD: src/sbin/dhclient/bpf.c,v 1.2 2005/06/07 04:13:52 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/bpf.c,v 1.3 2005/07/27 19:25:46 brooks Exp $ */ /* BPF socket interface code, originally contributed by Archie Cobbs. */ @@ -316,19 +316,19 @@ continue; } + /* Skip over the BPF header... */ + interface->rbuf_offset += hdr.bh_hdrlen; + /* * If the captured data wasn't the whole packet, or if * the packet won't fit in the input buffer, all we can * do is drop it. */ if (hdr.bh_caplen != hdr.bh_datalen) { - interface->rbuf_offset += hdr.bh_hdrlen = hdr.bh_caplen; + interface->rbuf_offset += hdr.bh_caplen; continue; } - /* Skip over the BPF header... */ - interface->rbuf_offset += hdr.bh_hdrlen; - /* Decode the physical header... */ offset = decode_hw_header(interface->rbuf, interface->rbuf_offset, hfrom); ==== //depot/projects/hammer/sys/arm/include/atomic.h#10 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.9 2005/07/15 18:17:57 jhb Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.10 2005/07/27 20:01:44 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -77,8 +77,10 @@ static __inline uint32_t __swp(uint32_t val, volatile uint32_t *ptr) { - __asm __volatile("swp %0, %1, [%2]" - : "=&r" (val) : "r" (val) , "r" (ptr) : "memory"); + __asm __volatile("swp %0, %2, [%3]" + : "=&r" (val), "=m" (*ptr) + : "r" (val) , "r" (ptr), "m" (*ptr) + : "memory"); return (val); } ==== //depot/projects/hammer/sys/arm/include/endian.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.9 2005/05/24 21:43:16 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $ */ #ifndef _ENDIAN_H_ @@ -100,11 +100,10 @@ __bswap16_var(__uint16_t v) { __asm __volatile( - "mov %0, %1, ror #8\n" + "mov %0, %0, ror #8\n" "orr %0, %0, %0, lsr #16\n" "bic %0, %0, %0, lsl #16" - : "=r" (v) - : "0" (v)); + : "+r" (v)); return (v); } ==== //depot/projects/hammer/sys/boot/i386/libi386/smbios.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.1 2005/07/14 19:52:22 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.2 2005/07/27 19:11:10 jkim Exp $"); #include #include @@ -72,9 +72,6 @@ if (smbios == NULL) return; - /* export values from the SMBIOS */ - setenv("hint.smbios.0.enabled", "YES", 1); - length = *(u_int16_t *)(smbios + 0x16); /* Structure Table Length */ paddr = *(u_int32_t *)(smbios + 0x18); /* Structure Table Address */ count = *(u_int16_t *)(smbios + 0x1c); /* No of SMBIOS Structures */ @@ -91,26 +88,26 @@ switch(dmi[0]) { case 0: /* Type 0: BIOS */ - smbios_setenv("hint.smbios.0.bios.vendor", dmi, 0x04); - smbios_setenv("hint.smbios.0.bios.version", dmi, 0x05); - smbios_setenv("hint.smbios.0.bios.reldate", dmi, 0x08); + smbios_setenv("smbios.bios.vendor", dmi, 0x04); + smbios_setenv("smbios.bios.version", dmi, 0x05); + smbios_setenv("smbios.bios.reldate", dmi, 0x08); break; case 1: /* Type 1: System */ - smbios_setenv("hint.smbios.0.system.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.system.product", dmi, 0x05); - smbios_setenv("hint.smbios.0.system.version", dmi, 0x06); + smbios_setenv("smbios.system.maker", dmi, 0x04); + smbios_setenv("smbios.system.product", dmi, 0x05); + smbios_setenv("smbios.system.version", dmi, 0x06); break; case 2: /* Type 2: Base Board (or Module) */ - smbios_setenv("hint.smbios.0.planar.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.planar.product", dmi, 0x05); - smbios_setenv("hint.smbios.0.planar.version", dmi, 0x06); + smbios_setenv("smbios.planar.maker", dmi, 0x04); + smbios_setenv("smbios.planar.product", dmi, 0x05); + smbios_setenv("smbios.planar.version", dmi, 0x06); break; case 3: /* Type 3: System Enclosure or Chassis */ - smbios_setenv("hint.smbios.0.chassis.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.chassis.version", dmi, 0x06); + smbios_setenv("smbios.chassis.maker", dmi, 0x04); + smbios_setenv("smbios.chassis.version", dmi, 0x06); break; default: /* skip other types */ ==== //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#28 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.44 2005/01/18 20:18:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.45 2005/07/27 15:21:32 jhb Exp $"); #include "opt_acpi.h" #include @@ -955,8 +955,8 @@ } } - if (bootverbose) { - if (PCI_INTERRUPT_VALID(best_irq)) + if (PCI_INTERRUPT_VALID(best_irq)) { + if (bootverbose) device_printf(dev, "Picked IRQ %u with weight %d\n", best_irq, best_weight); } else ==== //depot/projects/hammer/sys/geom/raid3/g_raid3.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.40 2005/03/26 17:24:19 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.41 2005/07/27 09:03:51 pjd Exp $"); #include #include @@ -1688,6 +1688,13 @@ g_raid3_try_destroy(struct g_raid3_softc *sc) { + if (sc->sc_rootmount != NULL) { + G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, + sc->sc_rootmount); + root_mount_rel(sc->sc_rootmount); + sc->sc_rootmount = NULL; + } + g_topology_lock(); if (!g_raid3_can_destroy(sc)) { g_topology_unlock(); @@ -2149,6 +2156,10 @@ * Timeout expired, so destroy device. */ sc->sc_flags |= G_RAID3_DEVICE_FLAG_DESTROY; + G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", + __LINE__, sc->sc_rootmount); + root_mount_rel(sc->sc_rootmount); + sc->sc_rootmount = NULL; } return; } @@ -2291,6 +2302,12 @@ } if (sc->sc_provider == NULL) g_raid3_launch_provider(sc); + if (sc->sc_rootmount != NULL) { + G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, + sc->sc_rootmount); + root_mount_rel(sc->sc_rootmount); + sc->sc_rootmount = NULL; + } break; case G_RAID3_DEVICE_STATE_COMPLETE: /* @@ -2318,6 +2335,12 @@ } if (sc->sc_provider == NULL) g_raid3_launch_provider(sc); + if (sc->sc_rootmount != NULL) { + G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__, + sc->sc_rootmount); + root_mount_rel(sc->sc_rootmount); + sc->sc_rootmount = NULL; + } break; default: KASSERT(1 == 0, ("Wrong device state (%s, %s).", sc->sc_name, @@ -2810,6 +2833,9 @@ G_RAID3_DEBUG(0, "Device %s created (id=%u).", sc->sc_name, sc->sc_id); + sc->sc_rootmount = root_mount_hold("GRAID3"); + G_RAID3_DEBUG(1, "root_mount_hold %p", sc->sc_rootmount); + /* * Run timeout. */ ==== //depot/projects/hammer/sys/geom/raid3/g_raid3.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/raid3/g_raid3.h,v 1.11 2005/02/27 23:07:47 pjd Exp $ + * $FreeBSD: src/sys/geom/raid3/g_raid3.h,v 1.12 2005/07/27 09:03:51 pjd Exp $ */ #ifndef _G_RAID3_H_ @@ -202,6 +202,8 @@ struct mtx sc_events_mtx; struct callout sc_callout; + + struct root_hold_token *sc_rootmount; }; #define sc_name sc_geom->name ==== //depot/projects/hammer/sys/netinet6/ah_aesxcbcmac.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.c,v 1.2 2005/01/07 02:30:34 imp Exp $ + * $FreeBSD: src/sys/netinet6/ah_aesxcbcmac.c,v 1.3 2005/07/27 08:41:17 cperciva Exp $ */ #include @@ -78,6 +78,7 @@ u_int8_t k3seed[AES_BLOCKSIZE] = { 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3 }; u_int32_t r_ks[(RIJNDAEL_MAXNR+1)*4]; aesxcbc_ctx *ctx; + u_int8_t k1[AES_BLOCKSIZE]; if (!state) panic("ah_aes_xcbc_mac_init: what?"); @@ -93,14 +94,15 @@ if ((ctx->r_nr = rijndaelKeySetupEnc(r_ks, (char *)_KEYBUF(sav->key_auth), AES_BLOCKSIZE * 8)) == 0) return -1; - if (rijndaelKeySetupEnc(ctx->r_k1s, k1seed, AES_BLOCKSIZE * 8) == 0) + rijndaelEncrypt(r_ks, ctx->r_nr, k1seed, k1); + rijndaelEncrypt(r_ks, ctx->r_nr, k2seed, ctx->k2); + rijndaelEncrypt(r_ks, ctx->r_nr, k3seed, ctx->k3); + if (rijndaelKeySetupEnc(ctx->r_k1s, k1, AES_BLOCKSIZE * 8) == 0) return -1; - if (rijndaelKeySetupEnc(ctx->r_k2s, k2seed, AES_BLOCKSIZE * 8) == 0) + if (rijndaelKeySetupEnc(ctx->r_k2s, ctx->k2, AES_BLOCKSIZE * 8) == 0) return -1; - if (rijndaelKeySetupEnc(ctx->r_k3s, k3seed, AES_BLOCKSIZE * 8) == 0) + if (rijndaelKeySetupEnc(ctx->r_k3s, ctx->k3, AES_BLOCKSIZE * 8) == 0) return -1; - rijndaelEncrypt(r_ks, ctx->r_nr, k2seed, ctx->k2); - rijndaelEncrypt(r_ks, ctx->r_nr, k3seed, ctx->k3); return 0; } @@ -151,8 +153,8 @@ addr += AES_BLOCKSIZE; } if (addr < ep) { - bcopy(addr, ctx->buf, ep - addr); - ctx->buflen = ep - addr; + bcopy(addr, ctx->buf + ctx->buflen, ep - addr); + ctx->buflen += ep - addr; } } ==== //depot/projects/hammer/sys/nfsclient/nfs_node.c#21 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.77 2005/07/21 22:46:56 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.78 2005/07/27 15:05:31 ps Exp $"); #include #include @@ -154,7 +154,8 @@ return (error); if (nvp != NULL) { *npp = VTONFS(nvp); - /* XXX I wonder of nfs_reclaim will survive the unused vnode */ + /* vrele() the duplicate allocated here, to get it recycled */ + vrele(vp); return (0); } if (fhsize > NFS_SMALLFH) { ==== //depot/projects/hammer/sys/nfsclient/nfs_socket.c#29 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.128 2005/07/19 21:27:25 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.129 2005/07/27 15:06:26 ps Exp $"); /* * Socket operations for use by nfs @@ -1255,12 +1255,14 @@ */ rep->r_flags |= R_REXMIT_INPROG; mtx_unlock(&nfs_reqq_mtx); + NET_LOCK_GIANT(); if ((nmp->nm_flag & NFSMNT_NOCONN) == 0) error = (*so->so_proto->pr_usrreqs->pru_send) (so, 0, m, NULL, NULL, curthread); else error = (*so->so_proto->pr_usrreqs->pru_send) (so, 0, m, nmp->nm_nam, NULL, curthread); + NET_UNLOCK_GIANT(); mtx_lock(&nfs_reqq_mtx); rep->r_flags &= ~R_REXMIT_INPROG; wakeup((caddr_t)&rep->r_flags); ==== //depot/projects/hammer/sys/pci/if_de.c#25 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_de.c,v 1.165 2005/07/21 16:43:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_de.c,v 1.166 2005/07/27 13:51:01 jhb Exp $"); #define TULIP_HDR_DATA @@ -128,6 +128,7 @@ static void tulip_reset(tulip_softc_t * const sc); static void tulip_rx_intr(tulip_softc_t * const sc); static int tulip_srom_decode(tulip_softc_t * const sc); +static void tulip_start(tulip_softc_t * const sc); static struct mbuf * tulip_txput(tulip_softc_t * const sc, struct mbuf *m); static void tulip_txput_setup(tulip_softc_t * const sc); @@ -137,26 +138,28 @@ void *arg) { tulip_softc_t * const sc = arg; - int s = splimp(); TULIP_PERFSTART(timeout) + TULIP_LOCK(sc); sc->tulip_flags &= ~TULIP_TIMEOUTPENDING; sc->tulip_probe_timeout -= 1000 / TULIP_HZ; (sc->tulip_boardsw->bd_media_poll)(sc, TULIP_MEDIAPOLL_TIMER); TULIP_PERFEND(timeout); - splx(s); + TULIP_UNLOCK(sc); } static void tulip_timeout( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); if (sc->tulip_flags & TULIP_TIMEOUTPENDING) return; sc->tulip_flags |= TULIP_TIMEOUTPENDING; - timeout(tulip_timeout_callback, sc, (hz + TULIP_HZ / 2) / TULIP_HZ); + callout_reset(&sc->tulip_callout, (hz + TULIP_HZ / 2) / TULIP_HZ, + tulip_timeout_callback, sc); } @@ -172,6 +175,7 @@ * either is connected so the transmit is the only way * to verify the connectivity. */ + TULIP_LOCK_ASSERT(sc); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) return 0; @@ -207,6 +211,7 @@ { const tulip_media_info_t *mi = sc->tulip_mediums[media]; + TULIP_LOCK_ASSERT(sc); if (mi == NULL) return; @@ -299,6 +304,7 @@ tulip_softc_t * const sc, tulip_media_t media) { + TULIP_LOCK_ASSERT(sc); if ((sc->tulip_flags & TULIP_LINKUP) == 0) sc->tulip_flags |= TULIP_PRINTLINKUP; sc->tulip_flags |= TULIP_LINKUP; @@ -354,6 +360,7 @@ { struct ifnet *ifp = sc->tulip_ifp; + TULIP_LOCK_ASSERT(sc); if ((sc->tulip_flags & TULIP_LINKUP) == 0) return; if (sc->tulip_flags & TULIP_PRINTMEDIA) { @@ -376,6 +383,8 @@ tulip_media_t last_media = TULIP_MEDIA_UNKNOWN; tulip_media_t media; + TULIP_LOCK_ASSERT(sc); + /* * If one of the media blocks contained a default media flag, * use that. @@ -438,6 +447,7 @@ const tulip_media_info_t * const mi = sc->tulip_mediums[sc->tulip_media]; tulip_link_status_t linkup = TULIP_LINK_DOWN; + TULIP_LOCK_ASSERT(sc); if (mi == NULL) { #if defined(DIAGNOSTIC) || defined(TULIP_DEBUG) panic("tulip_media_link_monitor: %s: botch at line %d\n", @@ -548,6 +558,7 @@ { struct ifnet *ifp = sc->tulip_ifp; + TULIP_LOCK_ASSERT(sc); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -835,6 +846,7 @@ tulip_media_select( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); if (sc->tulip_features & TULIP_HAVE_GPR) { TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_PINSET|sc->tulip_gpinit); DELAY(10); @@ -859,6 +871,7 @@ tulip_softc_t * const sc, tulip_media_t media) { + TULIP_LOCK_ASSERT(sc); sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_THRSHLD160 |TULIP_CMD_BACKOFFCTR; sc->tulip_ifp->if_baudrate = 10000000; @@ -882,6 +895,7 @@ tulip_21040_media_probe( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_UNKNOWN); return; } @@ -890,6 +904,7 @@ tulip_21040_10baset_only_media_probe( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_10BASET); tulip_media_set(sc, TULIP_MEDIA_10BASET); sc->tulip_media = TULIP_MEDIA_10BASET; @@ -899,6 +914,7 @@ tulip_21040_10baset_only_media_select( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); sc->tulip_flags |= TULIP_LINKUP; if (sc->tulip_media == TULIP_MEDIA_10BASET_FD) { sc->tulip_cmdmode |= TULIP_CMD_FULLDUPLEX; @@ -914,6 +930,7 @@ tulip_21040_auibnc_only_media_probe( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); tulip_21040_mediainfo_init(sc, TULIP_MEDIA_AUIBNC); sc->tulip_flags |= TULIP_SQETEST|TULIP_LINKUP; tulip_media_set(sc, TULIP_MEDIA_AUIBNC); @@ -924,6 +941,7 @@ tulip_21040_auibnc_only_media_select( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); tulip_media_set(sc, TULIP_MEDIA_AUIBNC); sc->tulip_cmdmode &= ~TULIP_CMD_FULLDUPLEX; } @@ -955,6 +973,7 @@ { tulip_media_info_t * const mi = sc->tulip_mediainfo; + TULIP_LOCK_ASSERT(sc); #ifdef notyet if (sc->tulip_revinfo >= 0x20) { TULIP_MEDIAINFO_SIA_INIT(sc, &mi[0], 21041P2, 10BASET); @@ -974,6 +993,7 @@ tulip_21041_media_probe( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); sc->tulip_ifp->if_baudrate = 10000000; sc->tulip_cmdmode |= TULIP_CMD_CAPTREFFCT|TULIP_CMD_ENHCAPTEFFCT |TULIP_CMD_THRSHLD160|TULIP_CMD_BACKOFFCTR; @@ -988,6 +1008,7 @@ { u_int32_t sia_status; + TULIP_LOCK_ASSERT(sc); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_events[event]++; #endif @@ -1209,6 +1230,8 @@ TULIP_MEDIA_UNKNOWN }; + TULIP_LOCK_ASSERT(sc); + /* * Don't read phy specific registers if link is not up. */ @@ -1258,6 +1281,7 @@ { unsigned phyaddr; + TULIP_LOCK_ASSERT(sc); for (phyaddr = 1; phyaddr < 32; phyaddr++) { unsigned status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS); if (status == 0 || status == 0xFFFF || status < PHYSTS_10BASET) @@ -1280,6 +1304,7 @@ tulip_softc_t * const sc, unsigned abilities) { + TULIP_LOCK_ASSERT(sc); sc->tulip_abilities = abilities; if (abilities & PHYSTS_100BASETX_FD) { sc->tulip_probe_media = TULIP_MEDIA_100BASETX_FD; @@ -1306,6 +1331,7 @@ { struct ifnet *ifp = sc->tulip_ifp; + TULIP_LOCK_ASSERT(sc); switch (sc->tulip_probe_state) { case TULIP_PROBE_MEDIATEST: case TULIP_PROBE_INACTIVE: { @@ -1406,6 +1432,7 @@ const tulip_media_info_t *mi = NULL; tulip_media_t media = sc->tulip_media; + TULIP_LOCK_ASSERT(sc); if (sc->tulip_probe_state == TULIP_PROBE_INACTIVE) media = sc->tulip_media; else @@ -1496,6 +1523,7 @@ unsigned gpdata, unsigned cmdmode) { + TULIP_LOCK_ASSERT(sc); sc->tulip_mediums[media] = mip; mip->mi_type = TULIP_MEDIAINFO_GPR; mip->mi_cmdmode = cmdmode; @@ -1508,6 +1536,7 @@ { tulip_media_info_t *mip = sc->tulip_mediainfo; + TULIP_LOCK_ASSERT(sc); sc->tulip_gpinit = TULIP_GP_EB_PINS; sc->tulip_gpdata = TULIP_GP_EB_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS); @@ -1554,6 +1583,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; unsigned gpdata; + TULIP_LOCK_ASSERT(sc); sc->tulip_gpinit = TULIP_GP_EB_PINS; sc->tulip_gpdata = TULIP_GP_EB_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EB_PINS); @@ -1608,6 +1638,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; int idx, cnt = 0; + TULIP_LOCK_ASSERT(sc); TULIP_CSR_WRITE(sc, csr_command, TULIP_CMD_PORTSELECT|TULIP_CMD_MUSTBEONE); TULIP_CSR_WRITE(sc, csr_busmode, TULIP_BUSMODE_SWRESET); DELAY(10); /* Wait 10 microseconds (actually 50 PCI cycles but at @@ -1664,6 +1695,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; u_int32_t cmdmode = TULIP_CSR_READ(sc, csr_command); + TULIP_LOCK_ASSERT(sc); sc->tulip_gpinit = TULIP_GP_EM100_PINS; sc->tulip_gpdata = TULIP_GP_EM100_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_EM100_PINS); @@ -1711,6 +1743,7 @@ tulip_media_info_t *mip = sc->tulip_mediainfo; int cnt10 = 0, cnt100 = 0, idx; + TULIP_LOCK_ASSERT(sc); sc->tulip_gpinit = TULIP_GP_ZX34X_PINS; sc->tulip_gpdata = TULIP_GP_ZX34X_INIT; TULIP_CSR_WRITE(sc, csr_gp, TULIP_GP_ZX34X_PINS); @@ -1765,6 +1798,7 @@ tulip_2114x_media_probe( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); sc->tulip_cmdmode |= TULIP_CMD_MUSTBEONE |TULIP_CMD_BACKOFFCTR|TULIP_CMD_THRSHLD72; } @@ -1869,6 +1903,7 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); unsigned lastbit = (csr & MII_DOUT) ? msb : 0; + TULIP_LOCK_ASSERT(sc); csr |= MII_WR; MII_EMIT; /* clock low; assert write */ for (; bits > 0; bits--, data <<= 1) { @@ -1889,6 +1924,7 @@ { unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); + TULIP_LOCK_ASSERT(sc); if (cmd == MII_WRCMD) { csr |= MII_DOUT; MII_EMIT; /* clock low; change data */ csr ^= MII_CLKON; MII_EMIT; /* clock high; data valid */ @@ -1909,6 +1945,7 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); int idx; + TULIP_LOCK_ASSERT(sc); for (idx = 0, data = 0; idx < 16; idx++) { data <<= 1; /* this is NOOP on the first pass through */ csr ^= MII_CLKON; MII_EMIT; /* clock high; data valid */ @@ -1930,6 +1967,7 @@ unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); unsigned data; + TULIP_LOCK_ASSERT(sc); csr &= ~(MII_RD|MII_CLK); MII_EMIT; tulip_mii_writebits(sc, MII_PREAMBLE, 32); tulip_mii_writebits(sc, MII_RDCMD, 8); @@ -1953,6 +1991,8 @@ unsigned data) { unsigned csr = TULIP_CSR_READ(sc, csr_srom_mii) & (MII_RD|MII_DOUT|MII_CLK); + + TULIP_LOCK_ASSERT(sc); csr &= ~(MII_RD|MII_CLK); MII_EMIT; tulip_mii_writebits(sc, MII_PREAMBLE, 32); tulip_mii_writebits(sc, MII_WRCMD, 8); @@ -1975,6 +2015,7 @@ tulip_identify_dec_nic( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); strcpy(sc->tulip_boardid, "DEC "); #define D0 4 if (sc->tulip_chipid <= TULIP_21040) @@ -1992,6 +2033,8 @@ tulip_softc_t * const sc) { unsigned id = 0; + + TULIP_LOCK_ASSERT(sc); strcpy(sc->tulip_boardid, "ZNYX ZX3XX "); if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) { unsigned znyx_ptr; @@ -2088,6 +2131,7 @@ int auibnc = 0, utp = 0; char *cp; + TULIP_LOCK_ASSERT(sc); strcpy(sc->tulip_boardid, "SMC "); if (sc->tulip_chipid == TULIP_21041) return; @@ -2133,6 +2177,7 @@ tulip_identify_cogent_nic( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); strcpy(sc->tulip_boardid, "Cogent "); if (sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) { if (sc->tulip_rombuf[32] == TULIP_COGENT_EM100TX_ID) { @@ -2169,6 +2214,7 @@ tulip_identify_accton_nic( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); strcpy(sc->tulip_boardid, "ACCTON "); switch (sc->tulip_chipid) { case TULIP_21140A: @@ -2199,6 +2245,7 @@ tulip_identify_asante_nic( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); strcpy(sc->tulip_boardid, "Asante "); if ((sc->tulip_chipid == TULIP_21140 || sc->tulip_chipid == TULIP_21140A) && sc->tulip_boardsw != &tulip_2114x_isv_boardsw) { @@ -2255,6 +2302,7 @@ tulip_identify_compex_nic( tulip_softc_t * const sc) { + TULIP_LOCK_ASSERT(sc); strcpy(sc->tulip_boardid, "COMPEX "); if (sc->tulip_chipid == TULIP_21140A) { int root_unit; @@ -2303,6 +2351,7 @@ const u_int8_t *dp; u_int32_t leaf_offset, blocks, data; + TULIP_LOCK_ASSERT(sc); for (idx1 = 0; idx1 < shp->sh_adapter_count; idx1++, saip++) { if (shp->sh_adapter_count == 1) break; @@ -2882,6 +2931,7 @@ tulip_media_t media; int medias = 0; + TULIP_LOCK_ASSERT(sc); for (media = TULIP_MEDIA_UNKNOWN; media < TULIP_MEDIA_MAX; media++) { if (sc->tulip_mediums[media] != NULL) { ifmedia_add(&sc->tulip_ifmedia, tulip_media_to_ifmedia[media], @@ -2909,6 +2959,7 @@ { tulip_softc_t * const sc = (tulip_softc_t *)ifp->if_softc; + TULIP_LOCK(sc); sc->tulip_flags |= TULIP_NEEDRESET; sc->tulip_probe_state = TULIP_PROBE_INACTIVE; sc->tulip_media = TULIP_MEDIA_UNKNOWN; @@ -2920,6 +2971,7 @@ sc->tulip_flags |= TULIP_PRINTMEDIA; sc->tulip_flags &= ~TULIP_DIDNWAY; tulip_linkup(sc, media); + TULIP_UNLOCK(sc); return 0; } } @@ -2927,6 +2979,7 @@ sc->tulip_flags &= ~(TULIP_TXPROBE_ACTIVE|TULIP_WANTRXACT); tulip_reset(sc); tulip_init(sc); + TULIP_UNLOCK(sc); return 0; } @@ -2940,14 +2993,18 @@ { tulip_softc_t *sc = (tulip_softc_t *)ifp->if_softc; - if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) + TULIP_LOCK(sc); + if (sc->tulip_media == TULIP_MEDIA_UNKNOWN) { + TULIP_UNLOCK(sc); return; + } req->ifm_status = IFM_AVALID; if (sc->tulip_flags & TULIP_LINKUP) req->ifm_status |= IFM_ACTIVE; req->ifm_active = tulip_media_to_ifmedia[sc->tulip_media]; + TULIP_UNLOCK(sc); } static void @@ -2958,6 +3015,7 @@ u_char *addrp; int multicnt; + TULIP_LOCK_ASSERT(sc); sc->tulip_flags &= ~(TULIP_WANTHASHPERFECT|TULIP_WANTHASHONLY|TULIP_ALLMULTI); sc->tulip_flags |= TULIP_WANTSETUP|TULIP_WANTTXSTART; sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN; @@ -3103,6 +3161,8 @@ tulip_desc_t *di; u_int32_t inreset = (sc->tulip_flags & TULIP_INRESET); + TULIP_LOCK_ASSERT(sc); + /* * Brilliant. Simply brilliant. When switching modes/speeds * on a 2114*, you need to set the appriopriate MII/PCS/SCL/PS @@ -3242,9 +3302,13 @@ static void tulip_ifinit( - void * sc) + void *arg) { - tulip_init((tulip_softc_t *)sc); + tulip_softc_t *sc = (tulip_softc_t *)arg; + + TULIP_LOCK(sc); + tulip_init(sc); + TULIP_UNLOCK(sc); } static void @@ -3302,6 +3366,7 @@ int cnt = 0; #endif + TULIP_LOCK_ASSERT(sc); for (;;) { TULIP_PERFSTART(rxget) tulip_desc_t *eop = ri->ri_nextin; @@ -3499,6 +3564,7 @@ && m0 != NULL #endif ) { + TULIP_UNLOCK(sc); #if !defined(TULIP_COPY_RXDATA) ms->m_pkthdr.len = total_len; ms->m_pkthdr.rcvif = ifp; @@ -3511,6 +3577,7 @@ (*ifp->if_input)(ifp, m0); m0 = ms; #endif /* ! TULIP_COPY_RXDATA */ + TULIP_LOCK(sc); } ms = m0; } @@ -3597,6 +3664,7 @@ int xmits = 0; int descs = 0; + TULIP_LOCK_ASSERT(sc); while (ri->ri_free < ri->ri_max) { u_int32_t d_flag; @@ -3729,6 +3797,7 @@ u_int32_t mask; const char thrsh[] = "72|128\0\0\0" "96|256\0\0\0" "128|512\0\0" "160|1024"; + TULIP_LOCK_ASSERT(sc); csr &= (1 << (sizeof(tulip_status_bits)/sizeof(tulip_status_bits[0]))) - 1; if_printf(sc->tulip_ifp, "abnormal interrupt:"); for (sep = " ", mask = 1; mask <= csr; mask <<= 1, msgp++) { @@ -3756,6 +3825,7 @@ TULIP_PERFSTART(intr) u_int32_t csr; + TULIP_LOCK_ASSERT(sc); while ((csr = TULIP_CSR_READ(sc, csr_status)) & sc->tulip_intrmask) { TULIP_CSR_WRITE(sc, csr_status, csr); @@ -3852,10 +3922,12 @@ tulip_softc_t * sc = arg; for (; sc != NULL; sc = sc->tulip_slaves) { + TULIP_LOCK(sc); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_intrs++; #endif tulip_intr_handler(sc); + TULIP_UNLOCK(sc); } } @@ -3865,10 +3937,12 @@ { tulip_softc_t * sc = (tulip_softc_t *) arg; + TULIP_LOCK(sc); #if defined(TULIP_DEBUG) sc->tulip_dbg.dbg_intrs++; #endif tulip_intr_handler(sc); + TULIP_UNLOCK(sc); } static struct mbuf * @@ -3946,6 +4020,7 @@ struct mbuf *m0; #endif + TULIP_LOCK_ASSERT(sc); #if defined(TULIP_DEBUG) if ((sc->tulip_cmdmode & TULIP_CMD_TXRUN) == 0) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 28 01:58:13 2005 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 F101716A421; Thu, 28 Jul 2005 01:58:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94A0D16A41F for ; Thu, 28 Jul 2005 01:58:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9E9943D46 for ; Thu, 28 Jul 2005 01:58:11 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6S1wBt1099860 for ; Thu, 28 Jul 2005 01:58:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6S1wAvF099857 for perforce@freebsd.org; Thu, 28 Jul 2005 01:58:10 GMT (envelope-from sam@freebsd.org) Date: Thu, 28 Jul 2005 01:58:10 GMT Message-Id: <200507280158.j6S1wAvF099857@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81098 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: Thu, 28 Jul 2005 01:58:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=81098 Change 81098 by sam@sam_ebb on 2005/07/28 01:57:11 IFC @ 81092 Affected files ... .. //depot/projects/wifi/Makefile#10 integrate .. //depot/projects/wifi/Makefile.inc1#22 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#1 branch .. //depot/projects/wifi/UPDATING#18 integrate .. //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/wifi/etc/rc.d/dhclient#6 integrate .. //depot/projects/wifi/games/fortune/fortune/fortune.c#4 integrate .. //depot/projects/wifi/include/Makefile#13 integrate .. //depot/projects/wifi/include/netdb.h#7 integrate .. //depot/projects/wifi/lib/bind/bind/config.h#2 integrate .. //depot/projects/wifi/lib/bind/config.h#3 integrate .. //depot/projects/wifi/lib/bind/config.mk#5 integrate .. //depot/projects/wifi/lib/bind/isc/Makefile#2 integrate .. //depot/projects/wifi/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/wifi/lib/libc/gen/getnetgrent.c#4 integrate .. //depot/projects/wifi/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#10 integrate .. //depot/projects/wifi/lib/libc/net/inet_pton.c#2 integrate .. //depot/projects/wifi/lib/libc/nls/pl_PL.ISO8859-2.msg#2 integrate .. //depot/projects/wifi/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/Makefile#2 integrate .. //depot/projects/wifi/lib/libmemstat/libmemstat.3#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/memstat.h#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_internal.h#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_malloc.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_uma.c#4 integrate .. //depot/projects/wifi/lib/libz/inftrees.h#2 integrate .. //depot/projects/wifi/sbin/dhclient/bpf.c#4 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient-script#7 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.c#9 integrate .. //depot/projects/wifi/sbin/dhclient/tables.c#3 integrate .. //depot/projects/wifi/sbin/geom/class/Makefile#3 integrate .. //depot/projects/wifi/sbin/geom/class/eli/Makefile#1 branch .. //depot/projects/wifi/sbin/geom/class/eli/geli.8#1 branch .. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#1 branch .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#44 integrate .. //depot/projects/wifi/share/doc/IPv6/IMPLEMENTATION#2 integrate .. //depot/projects/wifi/share/man/man4/gif.4#4 integrate .. //depot/projects/wifi/share/man/man7/build.7#3 integrate .. //depot/projects/wifi/share/man/man7/ffs.7#2 integrate .. //depot/projects/wifi/share/man/man9/Makefile#13 integrate .. //depot/projects/wifi/share/man/man9/VFS.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_START.9#4 delete .. //depot/projects/wifi/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/wifi/sys/arm/include/atomic.h#9 integrate .. //depot/projects/wifi/sys/arm/include/clock.h#2 integrate .. //depot/projects/wifi/sys/arm/include/endian.h#6 integrate .. //depot/projects/wifi/sys/boot/common/help.common#3 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/wifi/sys/conf/NOTES#25 integrate .. //depot/projects/wifi/sys/conf/files#30 integrate .. //depot/projects/wifi/sys/conf/options#21 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdInterrupt.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_if.m#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_package.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#10 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpiio.h#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#5 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#92 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#39 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/wifi/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/wifi/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/wifi/sys/geom/geom_io.c#2 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#13 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/wifi/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/wifi/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#13 integrate .. //depot/projects/wifi/sys/libkern/iconv.c#3 integrate .. //depot/projects/wifi/sys/modules/geom/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/geom/geom_eli/Makefile#1 branch .. //depot/projects/wifi/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/wifi/sys/net/bpf.c#12 integrate .. //depot/projects/wifi/sys/net/bpfdesc.h#3 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#4 integrate .. //depot/projects/wifi/sys/net/if_gif.c#4 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#57 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#56 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#49 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#32 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#20 integrate .. //depot/projects/wifi/sys/netgraph/ng_socket.c#8 integrate .. //depot/projects/wifi/sys/netinet/icmp6.h#4 integrate .. //depot/projects/wifi/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/wifi/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/wifi/sys/netinet6/ah_core.c#5 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/wifi/sys/netinet6/in6.c#5 integrate .. //depot/projects/wifi/sys/netinet6/in6.h#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/wifi/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/wifi/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/wifi/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/wifi/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/wifi/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/wifi/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/wifi/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/wifi/sys/netinet6/mld6.c#5 integrate .. //depot/projects/wifi/sys/netinet6/nd6.c#5 integrate .. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/wifi/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/wifi/sys/netinet6/route6.c#3 integrate .. //depot/projects/wifi/sys/netinet6/scope6.c#4 integrate .. //depot/projects/wifi/sys/netinet6/scope6_var.h#3 integrate .. //depot/projects/wifi/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/wifi/sys/netkey/key.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_node.c#11 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#12 integrate .. //depot/projects/wifi/sys/pci/if_de.c#6 integrate .. //depot/projects/wifi/sys/pci/if_devar.h#4 integrate .. //depot/projects/wifi/sys/pci/if_sis.c#6 integrate .. //depot/projects/wifi/sys/pci/if_xl.c#8 integrate .. //depot/projects/wifi/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/wifi/sys/sys/param.h#15 integrate .. //depot/projects/wifi/sys/vm/uma.h#7 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#13 integrate .. //depot/projects/wifi/tools/regression/geom_eli/attach-d.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/delkey.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/detach-l.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/init.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/kill.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/onetime-d.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/onetime.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/setkey.t#1 branch .. //depot/projects/wifi/tools/regression/netinet/msocket/Makefile#1 branch .. //depot/projects/wifi/tools/regression/netinet/msocket/msocket.c#1 branch .. //depot/projects/wifi/tools/regression/netinet/udpconnectjail/udpconnectjail.c#2 integrate .. //depot/projects/wifi/tools/tools/README#6 integrate .. //depot/projects/wifi/tools/tools/ath/80211debug.c#7 integrate .. //depot/projects/wifi/tools/tools/ath/80211stats.c#11 integrate .. //depot/projects/wifi/tools/tools/bpfstat/Makefile#1 branch .. //depot/projects/wifi/tools/tools/bpfstat/bpfstat.8#1 branch .. //depot/projects/wifi/tools/tools/bpfstat/bpfstat.c#1 branch .. //depot/projects/wifi/tools/tools/bpfstat/bpfstat.h#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/Files/root/change_password#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/Files/root/save_sshkeys#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/Files/root/updatep#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/i386.diskimage#8 integrate .. //depot/projects/wifi/tools/tools/nanobsd/make.conf#11 integrate .. //depot/projects/wifi/tools/tools/nanobsd/nanobsd.sh#1 branch .. //depot/projects/wifi/usr.bin/dig/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/host/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/netstat/mbuf.c#3 integrate .. //depot/projects/wifi/usr.bin/nslookup/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/wifi/usr.sbin/acpi/acpiconf/acpiconf.c#4 integrate .. //depot/projects/wifi/usr.sbin/dnssec-keygen/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/dnssec-signzone/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/jail/jail.8#10 integrate .. //depot/projects/wifi/usr.sbin/named-checkconf/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/named-checkzone/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/named/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/ndiscvt/ndisgen.8#3 integrate .. //depot/projects/wifi/usr.sbin/ndiscvt/ndisgen.sh#3 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/main.c#4 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/perform.c#3 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/pkg_version.1#7 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/version.h#3 integrate .. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.c#4 integrate .. //depot/projects/wifi/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/wifi/usr.sbin/rndc-confgen/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/rndc/Makefile#2 integrate Differences ... ==== //depot/projects/wifi/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.321 2005/07/19 11:21:14 ru Exp $ +# $FreeBSD: src/Makefile,v 1.322 2005/07/23 14:23:30 netchild Exp $ # # The user-driven targets are: # @@ -16,6 +16,9 @@ # reinstallkernel.debug # kernel - buildkernel + installkernel. # update - Convenient way to update your source tree (cvs). +# check-old - Print a list of old files/directories in the system. +# delete-old - Delete obsolete files and directories interactively. +# delete-old-libs - Delete obsolete libraries interactively. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -38,15 +41,17 @@ # For individuals wanting to upgrade their sources (even if only a # delta of a few days): # -# 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. `make buildworld' -# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). -# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). -# 5. `reboot' (in single user mode: boot -s from the loader prompt). -# 6. `mergemaster -p' -# 7. `make installworld' -# 8. `mergemaster' -# 9. `reboot' +# 1. `cd /usr/src' (or to the directory containing your source tree). +# 2. `make buildworld' +# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 5. `reboot' (in single user mode: boot -s from the loader prompt). +# 6. `mergemaster -p' +# 7. `make installworld' +# 8. `make delete-old' +# 9. `mergemaster' +# 10. `reboot' +# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) # # See src/UPDATING `COMMON ITEMS' for more complete information. # @@ -62,9 +67,9 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distributeworld \ - distrib-dirs distribution everything \ +TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ + clean cleandepend cleandir delete-old delete-old-libs depend \ + distribute distributeworld distrib-dirs distribution everything \ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ kernel-toolchain libraries lint maninstall \ ==== //depot/projects/wifi/Makefile.inc1#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.500 2005/07/15 14:38:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.502 2005/07/25 14:44:09 des Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -973,14 +973,6 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L -.if !defined(NO_BIND) -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -_prebuild_libs+= lib/libc_r -.else -_prebuild_libs+= lib/libpthread -.endif -.endif - _generic_libs+= lib .if !defined(NO_CRYPT) @@ -1058,3 +1050,95 @@ .endfor .include + +# +# check for / delete old files section +# + +.include "ObsoleteFiles.inc" + +OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \ +else you can not start such an application. Consult UPDATING for more \ +information regarding how to cope with the removal/revision bump of a \ +specific library." + +.if !defined(BATCH_DELETE_OLD_FILES) +RM_I=-i +.endif + +delete-old-files: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old files (only deletes safe to delete libs)" +.for file in ${OLD_FILES} +# Ask for every old file if the user really wants to remove it. +# It's anoying, but beter safe than sorry. + @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ + || ([ -f "${DESTDIR}/${file}" ] \ + && echo "Removing schg flag on ${DESTDIR}/${file}" \ + && chflags noschg "${DESTDIR}/${file}" \ + && rm ${RM_I} "${DESTDIR}/${file}")) +.endfor + @echo ">>> Old files removed" + +check-old-files: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old files" +.for file in ${OLD_FILES} + @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" +.endfor + +delete-old-libs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old libraries" + @echo "${OLD_LIBS_MESSAGE}" | fmt +.for file in ${OLD_LIBS} + @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ + || ([ -f "${DESTDIR}/${file}" ] \ + && echo "Removing schg flag on ${DESTDIR}/${file}" \ + && chflags noschg "${DESTDIR}/${file}" \ + && rm ${RM_I} "${DESTDIR}/${file}")) +.endfor + @echo ">>> Old libraries removed" + +check-old-libs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old libraries" +.for file in ${OLD_LIBS} + @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" +.endfor + +delete-old-dirs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old directories" +.for dir in ${OLD_DIRS} +# Don't fail if an old directory isn't empty. + @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) +.endfor + @echo ">>> Old directories removed" + +check-old-dirs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old directories" +.for dir in ${OLD_DIRS} + @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" +.endfor + +delete-old: delete-old-files delete-old-dirs + @echo "To remove old libraries run '${MAKE} delete-old-libs'." + +check-old: check-old-files check-old-libs check-old-dirs + @echo "To remove old files and directories run '${MAKE} delete-old'." + @echo "To remove old libraries run '${MAKE} delete-old-libs'." + ==== //depot/projects/wifi/UPDATING#18 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20050722: + The ai_addrlen of a struct addrinfo was changed to a socklen_t + to conform to POSIX-2001. This change broke an ABI + compatibility on 64 bit architecture. You have to recompile + userland programs that use getaddrinfo(3) on 64 bit + architecture. + 20050711: RELENG_6 branched here. @@ -270,6 +277,7 @@ [3] mergemaster -p [5] make installworld + make delete-old mergemaster [4] @@ -307,6 +315,7 @@ [3] mergemaster -p [5] make installworld + make delete-old mergemaster -i [4] @@ -400,4 +409,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.417 2005/07/11 15:46:45 kensmith Exp $ +$FreeBSD: src/UPDATING,v 1.419 2005/07/23 14:23:30 netchild Exp $ ==== //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#4 (text+ko) ==== @@ -43,11 +43,12 @@ 7) Generate and run configure: - $ autoconf253 - $ autoheader253 + $ aclocal + $ autoheader + $ autoconf $ ./configure --prefix=/usr \ --infodir=/usr/share/info --mandir=/usr/share/man \ - --enable-threads --enable-libbind --disable-ipv6 \ + --disable-threads --enable-libbind --disable-ipv6 \ --enable-getifaddrs --disable-linux-caps \ --with-openssl=/usr --with-randomdev=/dev/random @@ -55,9 +56,20 @@ command line; src/lib/bind/config.mk will re-enable it at compile time if NO_INET6 is not defined. -8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and - commit it. Do not commit any other file that was modified or - created in steps 6) or 7). +8) Copy the following generated files to src/lib/bind and commit them: + + Path in src/contrib/bind9 Path in src/lib/bind + ------------------------------------------------------------ + config.h config.h + lib/bind/config.h bind/config.h + lib/bind/port_after.h bind/port_after.h + lib/bind/port_before.h bind/port_before.h + lib/isc/include/isc/platform.h isc/isc/platform.h + lib/lwres/include/lwres/netdb.h lwres/lwres/netdb.h + lib/lwres/include/lwres/platform.h lwres/lwres/platform.h + + Do not commit any other file that was modified or created in + steps 6) or 7). 9) cd src/lib/bind/dns && make -DMAINTAINER_MODE generate && rm gen Commit the new versions of the files generated. @@ -102,4 +114,4 @@ -- des@FreeBSD.org -- dougb@FreeBSD.org -$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.4 2005/03/17 08:40:41 dougb Exp $ +$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.5 2005/07/25 17:14:00 des Exp $ ==== //depot/projects/wifi/etc/rc.d/dhclient#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.20 2005/06/30 17:50:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.21 2005/07/26 00:37:19 brooks Exp $ # # PROVIDE: dhclient @@ -23,7 +23,6 @@ if [ -x /usr/bin/pgrep ]; then pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then - echo "${name} ${ifn}: already running?" exit 0 fi fi ==== //depot/projects/wifi/games/fortune/fortune/fortune.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.27 2005/02/17 18:06:37 ru Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.29 2005/07/23 18:24:47 ache Exp $"); # include # include ==== //depot/projects/wifi/include/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.244 2005/06/09 19:45:05 jkoshy Exp $ +# $FreeBSD: src/include/Makefile,v 1.245 2005/07/27 21:47:54 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -42,8 +42,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ - geom/shsec geom/stripe \ + geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \ + geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/wifi/include/netdb.h#7 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.38 2005/06/03 03:32:06 ume Exp $ + * $FreeBSD: src/include/netdb.h,v 1.39 2005/07/22 18:21:28 ume Exp $ */ #ifndef _NETDB_H_ @@ -63,8 +63,6 @@ #include #include -#include -#include #ifndef _SIZE_T_DECLARED typedef __size_t size_t; @@ -125,29 +123,12 @@ int p_proto; /* protocol # */ }; -/* - * Note: ai_addrlen used to be a size_t, per RFC 2553. - * In XNS5.2, and subsequently in POSIX-2001 and RFC 3493 it was - * changed to a socklen_t. - * To accomodate for this while preserving binary compatibility with the - * old interface, we prepend or append 32 bits of padding, depending on - * the (LP64) architecture's endianness. - * - * This should be deleted the next time the libc major number is - * incremented. - */ struct addrinfo { int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ int ai_family; /* PF_xxx */ int ai_socktype; /* SOCK_xxx */ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif socklen_t ai_addrlen; /* length of ai_addr */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif char *ai_canonname; /* canonical name for hostname */ struct sockaddr *ai_addr; /* binary address */ struct addrinfo *ai_next; /* next structure in linked list */ ==== //depot/projects/wifi/lib/bind/bind/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/bind/config.h,v 1.1 2004/09/21 19:01:42 des Exp $ */ +/* $FreeBSD: src/lib/bind/bind/config.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* #undef _SOCKADDR_LEN */ @@ -46,3 +46,11 @@ #endif /* #undef BROKEN_IN6ADDR_INIT_MACROS */ #define HAVE_STRLCAT 1 +/* Shut up warnings about missing braces */ +/* #undef SHUTUP_MUTEX_INITIALIZER */ +#ifdef SHUTUP_MUTEX_INITIALIZER +#define LIBBIND_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } +#else +#define LIBBIND_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif + ==== //depot/projects/wifi/lib/bind/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/config.h,v 1.2 2005/03/17 08:37:32 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/config.h,v 1.3 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -36,7 +36,7 @@ /* #undef NEED_PTHREAD_INIT */ /* define if your system has sigwait() */ -#define HAVE_SIGWAIT 1 +/* #undef HAVE_SIGWAIT */ /* define if sigwait() is the UnixWare flavor */ /* #undef HAVE_UNIXWARE_SIGWAIT */ @@ -48,7 +48,7 @@ /* #undef HAVE_LINUXTHREADS */ /* define if sysconf() is available */ -#define HAVE_SYSCONF 1 +/* #undef HAVE_SYSCONF */ /* define if sysctlbyname() is available */ #define HAVE_SYSCTLBYNAME 1 @@ -129,10 +129,10 @@ #define PATH_RANDOMDEV "/dev/random" /* define if pthread_attr_getstacksize() is available */ -#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */ /* define if pthread_attr_setstacksize() is available */ -#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ /* define if you have strerror in the C library. */ #define HAVE_STRERROR 1 @@ -149,6 +149,9 @@ /* Define if threads need PTHREAD_SCOPE_SYSTEM */ /* #undef NEED_PTHREAD_SCOPE_SYSTEM */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 @@ -165,7 +168,7 @@ /* #undef HAVE_LIBNSL */ /* Define to 1 if you have the `pthread' library (-lpthread). */ -#define HAVE_LIBPTHREAD 1 +/* #undef HAVE_LIBPTHREAD */ /* Define to 1 if you have the `scf' library (-lscf). */ /* #undef HAVE_LIBSCF */ @@ -252,9 +255,11 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus /* #undef inline */ +#endif /* Define to `unsigned' if does not define. */ /* #undef size_t */ ==== //depot/projects/wifi/lib/bind/config.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.14 2005/03/17 08:35:21 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.15 2005/07/25 14:44:09 des Exp $ # BIND version number .if defined(BIND_DIR) && exists(${BIND_DIR}/version) @@ -74,7 +74,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isccfg/include LIBISC= ${LIB_BIND_REL}/isc/libisc.a CFLAGS+= -I${BIND_DIR}/lib/isc/unix/include \ - -I${BIND_DIR}/lib/isc/pthreads/include \ + -I${BIND_DIR}/lib/isc/nothreads/include \ -I${BIND_DIR}/lib/isc/include \ -I${LIB_BIND_DIR}/isc LIBLWRES= ${LIB_BIND_REL}/lwres/liblwres.a @@ -95,17 +95,3 @@ CRYPTO_DPADD= ${LIBCRYPTO} CRYPTO_LDADD= -lcrypto .endif - -# Link against POSIX threads library -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -.if defined(NO_LIBC_R) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBC_R" -.endif -.else -.if defined(NO_LIBPTHREAD) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBPTHREAD" -.endif -.endif - -PTHREAD_DPADD= ${LIBPTHREAD} -PTHREAD_LDADD= -lpthread ==== //depot/projects/wifi/lib/bind/isc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -19,7 +19,7 @@ .PATH: ${SRCDIR}/nls SRCS+= msgcat.c \ -.PATH: ${SRCDIR}/pthreads +.PATH: ${SRCDIR}/nothreads SRCS+= condition.c mutex.c \ thread.c @@ -35,7 +35,7 @@ serial.c sha1.c sockaddr.c string.c strtoul.c \ symtab.c task.c taskpool.c timer.c version.c -CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} DPADD= ${PTHREAD_DPADD} @@ -104,10 +104,10 @@ ${SRCDIR}/include/isc/types.h \ ${SRCDIR}/include/isc/util.h \ ${SRCDIR}/include/isc/version.h \ - ${SRCDIR}/pthreads/include/isc/condition.h \ - ${SRCDIR}/pthreads/include/isc/mutex.h \ - ${SRCDIR}/pthreads/include/isc/once.h \ - ${SRCDIR}/pthreads/include/isc/thread.h \ + ${SRCDIR}/nothreads/include/isc/condition.h \ + ${SRCDIR}/nothreads/include/isc/mutex.h \ + ${SRCDIR}/nothreads/include/isc/once.h \ + ${SRCDIR}/nothreads/include/isc/thread.h \ ${SRCDIR}/unix/include/isc/dir.h \ ${SRCDIR}/unix/include/isc/int.h \ ${SRCDIR}/unix/include/isc/keyboard.h \ ==== //depot/projects/wifi/lib/bind/isc/isc/platform.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.1 2004/09/21 19:01:43 des Exp $ */ +/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") @@ -158,7 +158,7 @@ /* * Defined if we are using threads. */ -#define ISC_PLATFORM_USETHREADS 1 +#undef ISC_PLATFORM_USETHREADS /* * Defined if unistd.h does not cause fd_set to be delared. ==== //depot/projects/wifi/lib/libc/gen/getnetgrent.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33 2005/01/13 18:33:01 jon Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.34 2005/07/22 22:20:26 jon Exp $"); #include #include @@ -305,22 +305,44 @@ } static int -_buildkey(char *key, const char *str, const char *dom, int *rotation) +_revnetgr_lookup(char* lookupdom, char* map, const char* str, + const char* dom, const char* group) { - (*rotation)++; - if (*rotation > 4) - return(0); - switch(*rotation) { - case(1): sprintf((char *)key, "%s.%s", str, dom ? dom : "*"); - break; - case(2): sprintf((char *)key, "%s.*", str); - break; - case(3): sprintf((char *)key, "*.%s", dom ? dom : "*"); - break; - case(4): sprintf((char *)key, "*.*"); - break; + int y, rv, rot; + char key[MAXHOSTNAMELEN]; + char *result; + int resultlen; + + for (rot = 0; ; rot++) { + switch (rot) { + case(0): snprintf(key, MAXHOSTNAMELEN, "%s.%s", + str, dom?dom:lookupdom); + break; + case(1): snprintf(key, MAXHOSTNAMELEN, "%s.*", + str); + break; + case(2): snprintf(key, MAXHOSTNAMELEN, "*.%s", + dom?dom:lookupdom); + break; + case(3): snprintf(key, MAXHOSTNAMELEN, "*.*"); + break; + default: return(0); + } + y = yp_match(lookupdom, map, key, strlen(key), &result, + &resultlen); + if (y == 0) { + rv = _listmatch(result, group, resultlen); + free(result); + if (rv) return(1); + } else if (y != YPERR_KEY) { + /* + * If we get an error other than 'no + * such key in map' then something is + * wrong and we should stop the search. + */ + return(-1); + } } - return(1); } #endif @@ -331,11 +353,6 @@ innetgr(const char *group, const char *host, const char *user, const char *dom) { char *hst, *usr, *dm; -#ifdef YP - char *result; - int resultlen; - int rv; -#endif /* Sanity check */ if (group == NULL || !strlen(group)) @@ -350,44 +367,36 @@ /* * If we're in NIS-only mode, do the search using * NIS 'reverse netgroup' lookups. + * + * What happens with 'reverse netgroup' lookups: + * + * 1) try 'reverse netgroup' lookup + * 1.a) if host is specified and user is null: + * look in netgroup.byhost + * (try host.domain, host.*, *.domain or *.*) + * if found, return yes + * 1.b) if user is specified and host is null: + * look in netgroup.byuser + * (try host.domain, host.*, *.domain or *.*) + * if found, return yes + * 1.c) if both host and user are specified, + * don't do 'reverse netgroup' lookup. It won't work. + * 1.d) if neither host ane user are specified (why?!?) + * don't do 'reverse netgroup' lookup either. + * 2) if domain is specified and 'reverse lookup' is done: + * 'reverse lookup' was authoritative. bye bye. + * 3) otherwise, too bad, try it the slow way. */ - if (_use_only_yp) { - char _key[MAXHOSTNAMELEN]; - int rot = 0, y = 0; - + if (_use_only_yp && (host == NULL) != (user == NULL)) { + int ret; if(yp_get_default_domain(&_netgr_yp_domain)) return(0); - while(_buildkey(_key, user ? user : host, dom, &rot)) { - y = yp_match(_netgr_yp_domain, user? "netgroup.byuser": - "netgroup.byhost", _key, strlen(_key), &result, - &resultlen); - if (y) { - /* - * If we get an error other than 'no - * such key in map' then something is - * wrong and we should stop the search. - */ - if (y != YPERR_KEY) - break; - } else { - rv = _listmatch(result, group, resultlen); - free(result); - if (rv) - return(1); - else - return(0); - } - } - /* - * Couldn't match using NIS-exclusive mode. If the error - * was YPERR_MAP, then the failure happened because there - * was no netgroup.byhost or netgroup.byuser map. The odds - * are we are talking to a Sun NIS+ server in YP emulation - * mode; if this is the case, then we have to do the check - * the 'old-fashioned' way by grovelling through the netgroup - * map and resolving memberships on the fly. - */ - if (y != YPERR_MAP) + ret = _revnetgr_lookup(_netgr_yp_domain, + host?"netgroup.byhost":"netgroup.byuser", + host?host:user, dom, group); + if (ret == 1) + return(1); + else if (ret == 0 && dom != NULL) return(0); } ==== //depot/projects/wifi/lib/libc/gen/getttyent.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.12 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $"); #include #include @@ -105,6 +105,10 @@ zapchar = 0; tty.ty_name = p; + tty.ty_status = 0; + tty.ty_window = NULL; + tty.ty_group = _TTYS_NOGROUP; + p = skip(p); if (!*(tty.ty_getty = p)) tty.ty_getty = tty.ty_type = NULL; @@ -121,9 +125,6 @@ p = skip(p); } } - tty.ty_status = 0; - tty.ty_window = NULL; - tty.ty_group = _TTYS_NOGROUP; for (; *p; p = skip(p)) { if (scmp(_TTYS_OFF)) ==== //depot/projects/wifi/lib/libc/net/getaddrinfo.c#10 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.69 2005/05/15 20:15:15 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.70 2005/07/22 18:21:28 ume Exp $"); #include "namespace.h" #include @@ -1352,9 +1352,6 @@ memset(ai->ai_addr, 0, (size_t)afd->a_socklen); ai->ai_addr->sa_len = afd->a_socklen; ai->ai_addrlen = afd->a_socklen; -#if __LONG_BIT == 64 - ai->__ai_pad0 = 0; /* ABI compatibility */ -#endif ai->ai_addr->sa_family = ai->ai_family = afd->a_af; p = (char *)(void *)(ai->ai_addr); #ifdef FAITH ==== //depot/projects/wifi/lib/libc/net/inet_pton.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.11 2002/09/06 11:23:49 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.12 2005/07/27 14:33:36 ume Exp $"); #include #include @@ -88,6 +88,8 @@ if ((pch = strchr(digits, ch)) != NULL) { u_int new = *tp * 10 + (pch - digits); + if (saw_digit && *tp == 0) + return (0); if (new > 255) return (0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 28 04:47:12 2005 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 98BCF16A421; Thu, 28 Jul 2005 04:47:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37ACD16A41F for ; Thu, 28 Jul 2005 04:47:11 +0000 (GMT) (envelope-from soc-yanjun@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB2E543D45 for ; Thu, 28 Jul 2005 04:47:10 +0000 (GMT) (envelope-from soc-yanjun@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6S4lAsx014506 for ; Thu, 28 Jul 2005 04:47:10 GMT (envelope-from soc-yanjun@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6S4jlwj010624 for perforce@freebsd.org; Thu, 28 Jul 2005 04:45:47 GMT (envelope-from soc-yanjun@freebsd.org) Date: Thu, 28 Jul 2005 04:45:47 GMT Message-Id: <200507280445.j6S4jlwj010624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-yanjun@freebsd.org using -f From: soc-yanjun To: Perforce Change Reviews Cc: Subject: PERFORCE change 81102 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: Thu, 28 Jul 2005 04:47:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=81102 Change 81102 by soc-yanjun@wyj on 2005/07/28 04:45:05 After running "p4 resolve -as", then "p4 submit", this changelist comes out. Is that correct? Affected files ... .. //depot/projects/soc2005/sebsd/src/MERGE#2 integrate .. //depot/projects/soc2005/sebsd/src/README#2 integrate .. //depot/projects/soc2005/sebsd/src/SEBSD-Installation.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/SEBSD.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/cat/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/chmod/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/cp/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/cp/extern.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/csh/config_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/csh/host.defs#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/date/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/date/extern.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/date/netdate.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/date/vary.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/date/vary.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/args.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/conv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/conv_tab.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/dd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/dd.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/extern.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/misc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/position.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ascii#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ebcdic#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ibm#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.lcase#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.oldascii#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.oldebcdic#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.oldibm#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.pareven#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.parnone#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.parodd#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.parset#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.swab#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ucase#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/df/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/domainname/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/echo/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/POSIX#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/README#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/buf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/cbc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/glbl.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/io.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/re.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/sub.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/=.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/README#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/TODO#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ascii.d.uu#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ascii.r.uu#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ascii.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ckscripts.sh#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e4.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e4.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e4.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/f1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/f2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g4.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g4.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g4.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g5.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g5.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g5.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/h.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i3.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/j.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/j.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/j.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k3.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k4.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/l.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/l.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/l.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/mkscripts.sh#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/n.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/n.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/n.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl1.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl1.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl1.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl2.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl2.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl2.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/p.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/p.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/p.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r3.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r3.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r3.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s10.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s4.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s5.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s6.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s7.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s8.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s9.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/v.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/v.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/v.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w.d#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w.r#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w.t#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w1.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w2.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w3.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/x.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/test/z.err#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ed/undo.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/expr/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/getfacl/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/hostname/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/kenv/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/kill/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ln/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ls/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ls/extern.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/mv/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/buf_subs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/cache.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/cache.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/cpio.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/cpio.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/file_subs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/ftree.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/gen_subs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/options.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/options.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/pat_rep.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/pat_rep.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/pax.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/pax.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/sel_subs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/sel_subs.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/tables.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/tables.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/tar.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pax/tty_subs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ps/extern.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ps/fmt.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ps/nlist.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ps/print.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/ps/ps.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/pwd/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/rcp/extern.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/rcp/util.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/realpath/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/realpath/realpath.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/rmdir/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/setfacl/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/TOUR#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/alias.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/alias.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/arith.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/arith.y#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/arith_lex.l#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/bltin/bltin.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/bltin/echo.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/cd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/cd.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/error.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/error.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/eval.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/eval.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/exec.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/exec.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/expand.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/expand.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/histedit.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/init.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/input.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/input.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/jobs.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/mail.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/mail.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/main.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/main.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/memalloc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/memalloc.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/mkinit.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/mknodes.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/mksyntax.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/myhistedit.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/mystring.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/mystring.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/options.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/output.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/output.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/parser.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/redir.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/redir.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/shell.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/show.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/show.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/trap.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/trap.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/var.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sh/var.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sleep/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/stty/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/stty/cchar.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/stty/extern.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/stty/gfmt.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/stty/modes.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/stty/stty.h#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/stty/util.c#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/sync/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/test/Makefile#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/test/TEST.README#2 integrate .. //depot/projects/soc2005/sebsd/src/bin/test/TEST.csh#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/AUTHORS#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/BUGS#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/COPYING#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/ChangeLog#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/INSTALL#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/MIRRORS.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/MIRRORS.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/NEWS#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/README#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/README.ldap#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/README.y2k#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/am_ops.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amd.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_auto.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_direct.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_error.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_host.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_inherit.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_link.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_linkx.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_nfsl.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_nfsx.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_program.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_root.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_toplvl.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_union.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amq_subr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amq_svc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/autil.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/clock.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/conf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/conf_parse.y#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/conf_tok.l#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_file.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_hesiod.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_ldap.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_ndbm.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_nis.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_nisplus.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_passwd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_union.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/map.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/mapc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/mntfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/nfs_prot_svc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/nfs_start.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/nfs_subr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_TEMPLATE.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_cachefs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_cdfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_efs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_lofs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_mfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_nfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_nfs3.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_nullfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_pcfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_tfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_tmpfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_ufs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_umapfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_unionfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_xfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/opts.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/restart.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/rpc_fwd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/sched.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/srvr_amfs_auto.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/srvr_nfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq_clnt.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq_xdr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/pawd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/aux_conf.h.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/bootstrap#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/mtab/mtab_bsd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/transp/transp_sockets.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/trap/trap_default.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/umount/umount_bsd44.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/doc/am-utils.texi#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/doc/texinfo.tex#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/doc/version.texi#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fixmount/fixmount.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_analyze.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_data.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_dict.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_gram.y#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_lex.l#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_util.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsinfo.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsinfo.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_atab.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_bparam.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_dumpset.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_exportfs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_fstab.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/hlfsd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/homedir.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/nfs_prot_svc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/stubs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_compat.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_defs.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_utils.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_xdr_func.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/amq_defs.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/mount_headers1.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/mount_headers2.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/ldap-id.ms#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/ldap-id.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/alloca.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/amu.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/hasmntopt.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/misc_rpc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/mount_fs.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/mtab.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/nfs_prot_xdr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/strerror.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/util.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/wire.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/xdr_func.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/xutil.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/GNUmakefile#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/amdgrep#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/amindent#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/autopat#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/chop-aclocal.pl#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/copy-if-newbig#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/macros/HEADER#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/macros/TRAILER#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/mk-aclocal#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/mkconf#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/rmtspc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/update_build_version#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/mk-amd-map/mk-amd-map.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/Makefile.am#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/am-eject.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd.conf-sample#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd2ldif.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd2sun.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/automount2amd.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/automount2amd.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/ctl-amd.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/ctl-hlfsd.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/expn.1#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/expn.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/fix-amd-map.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/fixrmtab.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/redhat-ctl-amd.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/wait4amd.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/wait4amd2die.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/tasks#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/amd/wire-test/wire-test.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/AUTHORS#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/ChangeLog#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/ckbook.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/pi.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/primes.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/twins.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/FAQ#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/FREEBSD-upgrade#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/INSTALL#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Makefile.am#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/NEWS#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/README#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/BUG.bc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/array.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/arrayp.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/aryprm.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/atan.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/checklib.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/div.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/exp.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/fact.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/jn.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/ln.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/mul.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/raise.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/signum#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sine.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sqrt.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sqrt1.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sqrt2.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/testfn.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/timetest#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/acconfig.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/aclocal.m4#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/Makefile.am#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/bc.y#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/bcdefs.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/const.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/execute.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/fix-libmath_h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/global.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/global.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/libmath.b#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/libmath.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/load.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/main.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/proto.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/sbc.y#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/scan.l#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/storage.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/util.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/config.h.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/configure#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/configure.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/Makefile.am#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/array.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc-proto.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc-regdef.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/eval.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/misc.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/numeric.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/stack.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/string.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/Makefile.am#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/bc.1#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/bc.texi#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/dc.1#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/dc.texi#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/h/number.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/install-sh#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/Makefile.am#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/number.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/testmul.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/vfprintf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/missing#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/mkinstalldirs#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bc/stamp-h.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/README-SGML#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/isc.color.gif#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/validate.sh.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/update#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/dnssec#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/migration-4to9#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/rfc-compliance#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/roadmap#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/sdb#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1032.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1033.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1034.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1035.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1101.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1122.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1123.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1183.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1348.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1535.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1536.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1537.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1591.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1611.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1612.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1706.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1712.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1750.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1876.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1886.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1982.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1995.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1996.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2052.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2104.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2119.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2133.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2136.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2137.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2163.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2168.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2181.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2230.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2308.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2317.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2373.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2374.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2375.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2418.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2535.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2536.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2537.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2538.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2539.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2540.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2541.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2553.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2671.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2672.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2673.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2782.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2825.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2826.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2845.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2874.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2915.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2929.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2930.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2931.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3007.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3008.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3071.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3090.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3110.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3123.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3152.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3197.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3225.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3226.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3258.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3363.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3364.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3425.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3445.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3467.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3490.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3491.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3492.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3493.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3513.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3596.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3597.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3645.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3655.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3658.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3833.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3845.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc952.txt#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/install-sh#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/README#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/daemon.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/ftruncate.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/mktemp.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/putenv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/readv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/setenv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/setitimer.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/strdup.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/strerror.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/strpbrk.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/strsep.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/strtoul.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/utimes.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/bsd/writev.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/dst/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/dst/dst_internal.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/dst/md5_locl.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/arpa/inet.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/arpa/nameser.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/fd_setsize.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/hesiod.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/irp.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/irs.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/assertions.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/ctl.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/dst.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/heap.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/logging.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/memcluster.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/misc.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/isc/tree.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/netgroup.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/res_update.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_addr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_data.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_neta.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_netof.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_network.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/dns_gr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/dns_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/dns_pr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/dns_pw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/dns_sv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_gr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_ng.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_nw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_pr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_pw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gen_sv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getgrent.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getgrent_r.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getnetent.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getnetgrent.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getprotoent.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getpwent.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getservent.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/hesiod_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_gr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_ho.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_ng.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_pr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_pw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irp_sv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irs_data.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/irs_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_gr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_ng.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_nw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_pw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/lcl_sv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_gr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_ho.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_ng.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_nw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_pr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_pw.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nis_sv.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/nul_ng.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/pathnames.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/irs/util.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/assertions.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/assertions.mdoc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/base64.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/bitncmp.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ctl_p.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ctl_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ev_streams.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ev_timers.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/ev_waits.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/heap.mdoc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/logging.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/logging.mdoc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/logging_p.h#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/movefile.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/tree.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/isc/tree.mdoc#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/make/includes.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/make/mkdep.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/mkinstalldirs#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/Makefile.in#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_date.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_name.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_netint.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/soc2005/sebsd/src/contrib/bind9/lib/bind/port/Makefile.in#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jul 28 12:45:55 2005 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 B6C9416A421; Thu, 28 Jul 2005 12:45:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 744EE16A41F for ; Thu, 28 Jul 2005 12:45:54 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F4D443D49 for ; Thu, 28 Jul 2005 12:45:54 +0000 (GMT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6SCjs6w046007 for ; Thu, 28 Jul 2005 12:45:54 GMT (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6SCjrj6046004 for perforce@freebsd.org; Thu, 28 Jul 2005 12:45:53 GMT (envelope-from areisse@nailabs.com) Date: Thu, 28 Jul 2005 12:45:53 GMT Message-Id: <200507281245.j6SCjrj6046004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Cc: Subject: PERFORCE change 81110 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: Thu, 28 Jul 2005 12:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=81110 Change 81110 by areisse@areisse_ibook on 2005/07/28 12:45:10 More updates; still unfinished. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/docs/mach-security.txt#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/docs/mach-security.txt#4 (text+ko) ==== @@ -12,7 +12,7 @@ operations (sending or receiving) that the task can perform on that port. A port is only a destination for a message; messages have no "sending" port. As ports are relatively lightweight, applications often use a port to represent a single higher-level -object, such as a window or hardware device. Unlike Unix IPC mechanisms, only one +object, such as a window or hardware device. Unlike many Unix IPC mechanisms, only one task at a time (possibly the kernel) may hold a "receive right" for a particular port. Mach messages contain a variable number of elements, each of which may be @@ -61,7 +61,7 @@ where the message is sent to the port passed as the first argument. When the window server receives the message, the MiG stub can convert the port into an implementation-specific -pointer through a translation type. This removes the need for application developers +pointer through a translation type. MiG removes the need for application developers to implement wire protocols in many cases. A set of routines @@ -92,6 +92,37 @@ therefore need their own controls in the kernel. Controls on Unix objects are provided by the "original" FreeBSD MAC framework as it was ported to Darwin. +*** Security Framework + +Our implementation is based on a security framework ported to Darwin from the FreeBSD +MAC Framework. The basic structure is identical to that found on FreeBSD. +The FreeBSD MAC framework consists of a kernel interface, a user interface, +a set of policies, and a kernel-to-policy interface. The kernel interface is +used by other parts of the kernel (e.g. filesystems) to label objects and +request access control decisions. Labels in the framework are an abstract notion; +each policy may store a label on any labelled object in whatever format it needs, +since allocation, use, and deallocation hooks are provided by the framework. + +The kernel-to-policy interface is a mechanism for passing a security event to +one or more security policies, and combining the result read from each policy into +one that the system will use. When the kernel needs to label an object, the framework +calls each policy to intialize its label (policies typically manage independant labels), +then the labels are stored in a single structure to be maintained along with the kernel +object. The implementation of an access control check is similar: Each policy is called, +and the least permissive results returned take precedence. + +The kernel interface (called by filesystems and other kernel subsystems) uses +the kernel-to-policy interface to request labels and access control decisions +from each configured policy. All policies use the same interface, but many +methods are not required, allowing for easier implementation of simpler +policies. + +The user interface allows a user program to +change labels, run programs in other domains, request policy decisions, +or administer the policy. Complex policies may export arbitrary additional +interfaces to userspace, such as assistance for labelling userspace objects +or handling login sessions. + **** Security Needs @@ -115,6 +146,7 @@ remaining services are accessed via messaging, and as such can be treated the same as userspace services for security purposes. + //Since multiple kernel objects (port rights or memory) may be transferred via messages, //a single (subject,object) form of access control check is insufficient. @@ -127,16 +159,43 @@ label structure instead of a security identifier. A label structure is added to each port (ipc_port_t) and to each task (task). The convention of using a port to represent a single object means that labels on -ports translate well into labels on objects for policy purposes. +ports translate well into labels on objects for policy purposes. We do not label +messages. + +The policy-agnostic label structure presents implementation challenges over systems +that assume a particular (often small or at least fixed size) label format. Security +policies are given control over the memory management of their labels; this means that +copying a label is a potentially expensive operation compared to copying a security +identifier. In addition, the security framework is not abstract enough for policies +to permit the precomputation of security decisions for later use as many common +policies (type enforcement, MLS, capability models, etc.). ** Subsystem Access Control -There are two approaches to protecting servers: Permission checks in the -handlers, or using proxy servers. A permission check embedded in a handler +We considered three approaches to protecting servers: Permission checks in the +servers, protecting the port rights alone, or using proxy servers. Each of these +approaches provide different levels of possible granularity in policies, usually +accompianied by more work in implementation. + +* Checks in Servers + +A permission check embedded in a server (message handler) simply queries the security policy with the message sender's label (or a label on the message itself), and any service-specific information needed by the policy, such as server-side object labels, or the name or other identifier of the routine -being invoked. A proxy server interposes itself between +being invoked. This approach is provided in our system by the userspace policy query +calls coupled with labels available in message trailers. + +* Protecting Port Rights + +Using an additional policy to restrict the transfers of port rights leverages the +already present capability model, requiring less changes to servers and applications +that the first approach. Our system supports this approach by enforcing access controls +on messaging and the transfer of port rights. + +* Proxy server + +A proxy server interposes itself between clients and servers, examining the messages and forwarding any messages that are in compliance with the security policy. The proxy server can be installed by the bootstrap namespace manager; when a process registers a @@ -165,19 +224,37 @@ compatible, although they may share much. -****** +**** Design and Implementation of Security Extensions -Summary of security events +*** Summary of security events Object creation is straightforward: when a task or port is created, the kernel requests a new label -from the policies, based on the caller and target task labels. +from the policies, based on the caller and target task labels. All access controls +currently present in the mach kernel concern messaging itself (and not higher-level +services built on messaging), and supports both confidentiality and integrity policies. +The first of these is simply the permission to send a +message of any contents to a port. That check has at least two possible security goals: +to prevent information flow (data contained in the message), and to prevent or limit +access to a service built over messaging (e.g, the message is interpreted as a request +to perform an operation). The second group of access checks concern the passing +of port rights (capabilities) from one task to another. This group is further divided, +in a similar manner as rename and relabel checks in the framework: +checks for transferring rights anywhere, and checks for holding rights (of any origin). +Service-specific access checks on messages are also supported by the kernel; currently, +a policy may use the message ID (as well as subject and object labels) to make a +security decision. This is an application level check and not actively enforced by the +kernel; the kernel merely provides the answer given by the policies to the application. +Our security-enhanced MiG can be used to add this kind of enforcement to applications. +Kernel servers are unsecured in the current implementation, except for those calls dealing +with relabelling of tasks and ports. Many of these services can be handled in the same way +as the userspace servers, with our MiG extensions for generated security checks. -Extensions to MiG +*** Extensions to MiG We have extended MiG in a number of ways to take advantage of a central implementation -of messaging functionality that is shared by many applications on the system. +of messaging functionality that is shared by many applications on the system, and the kernel. The MiG server stub generator is an ideal place to implement embedded permission checks, as they will be transparent to applications. We provide a new routine flag "checkaccess", which will cause MiG to include a permission check in the @@ -193,7 +270,7 @@ For example, the server can use of the sender's label to label new objects, or perform access control based on the routine's arguments. -+ MiG Example +** MiG Example The routine specification @@ -230,29 +307,22 @@ occurs in an ordinary Mach system). -Extensions to FreeBSD MAC Framework +*** System-Framework Integration -** Framework overview - -The FreeBSD MAC framework consists of a kernel interface, a user interface, -a set of policies, and a kernel-to-policy interface. The kernel interface is -used by other parts of the kernel (e.g. filesystems) to label objects and -request access control decisions. The user interface allows a user program to -change labels, run programs in other domains, request policy decisions, -or administer the policy. Complex policies may export arbitrary additional -interfaces to userspace, such as assistance for labelling userspace objects -or handling login sessions. - -The kernel interface (called by filesystems and other kernel subsystems) uses -the kernel-to-policy interface to request labels and access control decisions -from each configured policy. All policies use the same interface, but many -methods are not required, allowing for easier implementation of simpler -policies. +Adding the security framework to a kernel requires that, in addition to the +policy infrastructure, that calls to the framework's kernel interface (it's +"entry points") are added where appropriate in the existing system. The calls +to framework entry points are placed in object creation and deallocation routines, +to allow the policies to assign security labels to objects. Calls to entry points +are also placed at appropriate points in kernel feature implementations, such as +system calls or vnode operations, often alongside Unix security checks. The additions for the Mach operating system all follow this model: labelling operations are inserted into object creation and deallocation routines, and access decision calls are inserted into -object usage routines. +object usage routines. More details of the integration follow. + +** Label handles A "label handle" object type was introduced to make using labels in userspace programs easier, and to provide a mechanism to @@ -277,20 +347,8 @@ modified after creation (except for task labels where the handle has no other references). -Labelling events for tasks and ports are defined. -Access control checks for message sending and port right transfers (both sending -and receiving) are defined. All of these checks are based on the model of a -subject performing an operation on one or more objects. The subject is always -a task; objects are either tasks, ports, or higher-level services built on ports. -Note that in userspace all mach kernel objects are accessed via ports. +** Generic Entry Points -If requested, the kernel will supply the message sender's task label in a -mach message trailer (as a label handle). The message recipient can use -the sender's label in making its own access decisions. For example, the -bootstrap namespace server can ensure only a privleged process can examine -the namespace created by a different loginwindow process. - - To allow userspace processes (particularly mach servers) to use the security policy in the kernel, a new group of entry points and kernel calls for generic access checks and labelling computations were added. @@ -310,8 +368,16 @@ of the kernel may use these entry points as well, because of the greater amount of information available to the policies over POSIX capabilities. +** Labelling Events -Changes to Mach Kernel +Labelling events for tasks and ports are defined. +Access control checks for message sending and port right transfers (both sending +and receiving) are defined. All of these checks are based on the model of a +subject performing an operation on one or more objects. The subject is always +a task; objects are either tasks, ports, or higher-level services built on ports. +Note that in userspace all mach kernel objects are accessed via ports. + +** Changes to Mach Kernel Kernel changes made to support the security framework were fairly noninvasive, only affecting a few of the data structures and a small number of functions. @@ -333,16 +399,12 @@ system changes the task port label whenever the task label is changed, but allows the task port label to diverge if desired (and permitted by the policies). +If requested, the kernel will supply the message sender's task label in a +mach message trailer (as a label handle). The message recipient can use +the sender's label in making its own access decisions. For example, the +bootstrap namespace server can ensure only a privleged process can examine +the namespace created by a different loginwindow process. - -Mach "security" services - -A new kernel server was added to handle security-specific requests, such -as relabelling objects. As with the other user-accessible kernel servers in a -Mach system, the security server is implemented as a MiG subsystem. -The security server will also respond to requests for access control decisions, -and allow the creation of label handles. - Security events for messaging As all interaction with the @@ -362,6 +424,7 @@ and into the receiving task, security policies have control over later information flows resulting from port rights in a message. +Sequence of operations 1. Message sent 2. Check for action of sending (check_port_send) @@ -383,9 +446,8 @@ a message sequence number. We add the sender's security labels as a possible trailer field. Unlike the other trailer fields, this is not merely data; a task must make additional system calls to make use of the label handle, -and free it when finished. This feature should not cause performance loss, -as the label handles are only placed in the trailer when requested by the -recipient. We also provide a trailer with pre-calculated policy decisions +and free it when finished. +We also provide a trailer with pre-calculated policy decisions in a form similar to DTOS with its extended mach_msg trap. This trailer provides a single access decision (boolean value) for the called routine, computed by the loaded policies as (subject, port, subsystem, routine). @@ -416,6 +478,15 @@ automated, still requires rebuilding the affected server from source (Clients do not need to be rebuilt or otherwise modified). +* Mach "security" services + +A new kernel server was added to handle security-specific requests, such +as relabelling objects. As with the other user-accessible kernel servers in a +Mach system, the security server is implemented as a MiG subsystem. +The security server will also respond to requests for access control decisions, +and allow the creation of label handles. Documentation on this service can be +found in osfmk/mach/security.defs of the kernel source. + *** Userspace modifications We have selected mach_init as one system service to augment with the extended From owner-p4-projects@FreeBSD.ORG Thu Jul 28 13:09:23 2005 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 689D916A421; Thu, 28 Jul 2005 13:09:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37ED016A41F for ; Thu, 28 Jul 2005 13:09:23 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E487343D49 for ; Thu, 28 Jul 2005 13:09:22 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6SD9Mwf054016 for ; Thu, 28 Jul 2005 13:09:22 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6SD9M2P054013 for perforce@freebsd.org; Thu, 28 Jul 2005 13:09:22 GMT (envelope-from soc-saturnero@freebsd.org) Date: Thu, 28 Jul 2005 13:09:22 GMT Message-Id: <200507281309.j6SD9M2P054013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 81111 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: Thu, 28 Jul 2005 13:09:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=81111 Change 81111 by soc-saturnero@soc-saturnero_sberta on 2005/07/28 13:08:26 Added FREESBIE_CONF variable Affected files ... .. //depot/projects/soc2005/freesbie/scripts/launch.sh#5 edit Differences ... ==== //depot/projects/soc2005/freesbie/scripts/launch.sh#5 (text+ko) ==== @@ -33,7 +33,9 @@ . ./conf/freesbie.defaults.conf -[ -f ./conf/freesbie.conf ] && . ./conf/freesbie.conf +FREESBIE_CONF=${FREESBIE_CONF:-./conf/freesbie.conf} + +[ -f ${FREESBIE_CONF} ] && . ${FREESBIE_CONF} # XXX set $ARCH and mandatory variables here. From owner-p4-projects@FreeBSD.ORG Thu Jul 28 13:29:48 2005 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 92DD916A421; Thu, 28 Jul 2005 13:29:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50D9516A41F for ; Thu, 28 Jul 2005 13:29:48 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1649943D4C for ; Thu, 28 Jul 2005 13:29:48 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6SDTlcu055017 for ; Thu, 28 Jul 2005 13:29:47 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6SDTlxJ055014 for perforce@freebsd.org; Thu, 28 Jul 2005 13:29:47 GMT (envelope-from soc-saturnero@freebsd.org) Date: Thu, 28 Jul 2005 13:29:47 GMT Message-Id: <200507281329.j6SDTlxJ055014@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 81112 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: Thu, 28 Jul 2005 13:29:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=81112 Change 81112 by soc-saturnero@soc-saturnero_sberta on 2005/07/28 13:29:20 Switch to GEOM_LABEL. Affected files ... .. //depot/projects/soc2005/freesbie/ToDo#4 edit .. //depot/projects/soc2005/freesbie/conf/amd64/FREESBIE#2 edit .. //depot/projects/soc2005/freesbie/conf/i386/FREESBIE#2 edit .. //depot/projects/soc2005/freesbie/conf/powerpc/FREESBIE#2 edit .. //depot/projects/soc2005/freesbie/scripts/flash.sh#1 add .. //depot/projects/soc2005/freesbie/scripts/img.sh#3 edit Differences ... ==== //depot/projects/soc2005/freesbie/ToDo#4 (text+ko) ==== @@ -1,4 +1,6 @@ - Write freesbie rcNG script + - eventually write separated files (one for uzip, one for unionfs, ..) + - Add a new target (patch?) for - creating loader.conf - creating rc.conf @@ -7,6 +9,8 @@ - Add FILE_LIST support to clonefs - Add PRUNE_LIST support to clonefs +- Package management +- Extra stuff List of files to be created: ==== //depot/projects/soc2005/freesbie/conf/amd64/FREESBIE#2 (text+ko) ==== @@ -24,7 +24,6 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. -options GEOM_UZIP # Read-only compressed disks options COMPAT_43 # Needed by COMPAT_LINUX32 options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 @@ -262,3 +261,7 @@ options TCP_DROP_SYNFIN #drop TCP packets with SYN+FIN options SC_PIXEL_MODE # add support for the raster text mode + +options GEOM_UZIP # Read-only compressed disks +options GEOM_LABEL # Providers labelization. + ==== //depot/projects/soc2005/freesbie/conf/i386/FREESBIE#2 (text+ko) ==== @@ -25,7 +25,6 @@ options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. -options GEOM_UZIP # Read-only compressed disks options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI @@ -281,6 +280,8 @@ options VESA options SC_PIXEL_MODE +options GEOM_UZIP # Read-only compressed disks +options GEOM_LABEL # Providers labelization. makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols ==== //depot/projects/soc2005/freesbie/conf/powerpc/FREESBIE#2 (text+ko) ==== @@ -30,7 +30,6 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options GEOM_GPT #GUID Partition Tables. -options GEOM_UZIP #Read-only compressed disks options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Keep this for a while options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI @@ -137,3 +136,6 @@ options IPDIVERT options TCP_DROP_SYNFIN #drop TCP packets with SYN+FIN +options GEOM_UZIP # Read-only compressed disks +options GEOM_LABEL # Providers labelization. + ==== //depot/projects/soc2005/freesbie/scripts/img.sh#3 (text+ko) ==== @@ -52,7 +52,7 @@ cd ${CLONEDIR} find . -print -depth | cpio -pvudm ${TMPDIR} >> ${LOGFILE} 2>&1 -echo "/dev/vol/${LABEL} / ufs rw 1 1" > ${CLONEDIR}/etc/fstab +echo "/dev/ufs/${LABEL} / ufs ro 1 1" > ${TMPDIR}/etc/fstab umount ${TMPDIR} cd ${LOCALDIR} From owner-p4-projects@FreeBSD.ORG Thu Jul 28 15:44:35 2005 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 5CDC516A420; Thu, 28 Jul 2005 15:44:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30E2C16A421 for ; Thu, 28 Jul 2005 15:44:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D5C343D5F for ; Thu, 28 Jul 2005 15:44:34 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6SFiX94060912 for ; Thu, 28 Jul 2005 15:44:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6SFiX8a060909 for perforce@freebsd.org; Thu, 28 Jul 2005 15:44:33 GMT (envelope-from sam@freebsd.org) Date: Thu, 28 Jul 2005 15:44:33 GMT Message-Id: <200507281544.j6SFiX8a060909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81122 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: Thu, 28 Jul 2005 15:44:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=81122 Change 81122 by sam@sam_ebb on 2005/07/28 15:43:56 sync with head Affected files ... .. //depot/projects/wifi/sbin/dhclient/options.c#3 edit Differences ... ==== //depot/projects/wifi/sbin/dhclient/options.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.14 2004/11/02 01:18:45 deraadt Exp $ */ +/* $OpenBSD: options.c,v 1.15 2004/12/26 03:17:07 deraadt Exp $ */ /* DHCP options parsing and reassembly. */ @@ -600,7 +600,7 @@ case 'l': opcount = snprintf(op, opleft, "%ld", (long)getLong(dp)); - if (opcount >= opleft) + if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; dp += 4; @@ -608,7 +608,7 @@ case 'L': opcount = snprintf(op, opleft, "%ld", (unsigned long)getULong(dp)); - if (opcount >= opleft) + if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; dp += 4; @@ -616,7 +616,7 @@ case 's': opcount = snprintf(op, opleft, "%d", getShort(dp)); - if (opcount >= opleft) + if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; dp += 2; @@ -624,7 +624,7 @@ case 'S': opcount = snprintf(op, opleft, "%d", getUShort(dp)); - if (opcount >= opleft) + if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; dp += 2; @@ -632,19 +632,19 @@ case 'b': opcount = snprintf(op, opleft, "%d", *(char *)dp++); - if (opcount >= opleft) + if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; break; case 'B': opcount = snprintf(op, opleft, "%d", *dp++); - if (opcount >= opleft) + if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; break; case 'x': opcount = snprintf(op, opleft, "%x", *dp++); - if (opcount >= opleft) + if (opcount >= opleft || opcount == -1) goto toobig; opleft -= opcount; break; From owner-p4-projects@FreeBSD.ORG Thu Jul 28 15:45:37 2005 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 581B516A421; Thu, 28 Jul 2005 15:45:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 19DA516A41F for ; Thu, 28 Jul 2005 15:45:37 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C403C43D45 for ; Thu, 28 Jul 2005 15:45:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6SFjZG7061022 for ; Thu, 28 Jul 2005 15:45:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6SFjZb0061019 for perforce@freebsd.org; Thu, 28 Jul 2005 15:45:35 GMT (envelope-from sam@freebsd.org) Date: Thu, 28 Jul 2005 15:45:35 GMT Message-Id: <200507281545.j6SFjZb0061019@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81123 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: Thu, 28 Jul 2005 15:45:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=81123 Change 81123 by sam@sam_ebb on 2005/07/28 15:44:44 IFC @ 81122 Affected files ... .. //depot/projects/wifi/bin/csh/USD.doc/csh.2#3 integrate .. //depot/projects/wifi/contrib/amd/scripts/amd.conf.5#3 integrate .. //depot/projects/wifi/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/wifi/etc/devd.conf#10 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#8 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_umtx.h#2 integrate .. //depot/projects/wifi/sbin/ccdconfig/ccdconfig.8#6 integrate .. //depot/projects/wifi/sbin/dhclient/bpf.c#5 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.c#10 integrate .. //depot/projects/wifi/sbin/geom/class/Makefile#4 integrate .. //depot/projects/wifi/sbin/geom/class/eli/Makefile#2 integrate .. //depot/projects/wifi/sbin/reboot/boot_i386.8#4 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/wifi/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/wifi/usr.bin/vmstat/vmstat.c#6 integrate Differences ... ==== //depot/projects/wifi/bin/csh/USD.doc/csh.2#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.2 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.10 2005/01/10 08:39:21 imp Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.2,v 1.11 2005/07/28 12:40:23 keramida Exp $ .\" .nr H1 1 .NH @@ -673,7 +673,7 @@ Job numbers remain the same until the job terminates and then are re-used. .PP -When a job is started in the backgound using `&', its number, as well +When a job is started in the background using `&', its number, as well as the process numbers of all its (top level) commands, is typed by the shell before prompting you for another command. For example, @@ -699,7 +699,7 @@ .I stop command described below. When jobs are suspended they merely stop any further progress until started again, either in the foreground -or the backgound. The shell notices when a job becomes stopped and +or the background. The shell notices when a job becomes stopped and reports this fact, much like it reports the termination of background jobs. For foreground jobs this looks like .DS @@ -742,7 +742,7 @@ it in the background allowing more foreground commands to be executed. This is especially helpful when a foreground job ends up taking longer than you expected and you -wish you had started it in the backgound in the beginning. +wish you had started it in the background in the beginning. .PP All .I "job control" @@ -775,7 +775,7 @@ The .I jobs command types the table of jobs, giving the job number, -commands and status (`Stopped' or `Running') of each backgound or +commands and status (`Stopped' or `Running') of each background or suspended job. With the `\-l' option the process numbers are also typed. .DS @@ -874,7 +874,7 @@ Some time later when the `s' command was finished, .I ed tried to read another command and was stopped because jobs -in the backgound cannot read from the terminal. The +in the background cannot read from the terminal. The .I fg command returned the `ed' job to the foreground where it could once again accept commands from the terminal. ==== //depot/projects/wifi/contrib/amd/scripts/amd.conf.5#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amd.conf.5,v 1.7.2.10 2004/01/21 04:04:58 ib42 Exp $ -.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.17 2005/06/16 20:21:03 ru Exp $ +.\" $FreeBSD: src/contrib/amd/scripts/amd.conf.5,v 1.18 2005/07/28 13:03:19 keramida Exp $ .\" .Dd April 7, 1997 .Dt AMD.CONF 5 @@ -571,7 +571,7 @@ .Nm amd . If .Dq yes , -then the name refered to by +then the name referred to by .Va ${rhost} is normalized relative to the host database before being used. The effect is ==== //depot/projects/wifi/contrib/cvs/man/cvs.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.21 2004/04/15 01:17:26 peter Exp $ +.\" $FreeBSD: src/contrib/cvs/man/cvs.1,v 1.22 2005/07/28 13:53:45 keramida Exp $ .de Id .ds Rv \\$3 .ds Dt \\$4 @@ -584,7 +584,7 @@ .B \-T Create/Update CVS/Template by copying it from the (local) repository. This option is useful for developers maintaining a local cvs repository -but commiting to a remote repository. By maintaining CVS/Template the +but committing to a remote repository. By maintaining CVS/Template the remote commits will still be able to bring up the proper template in the commit editor session. Available with the ==== //depot/projects/wifi/etc/devd.conf#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.26 2005/06/07 04:49:11 brooks Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.27 2005/07/28 03:51:54 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -17,11 +17,12 @@ pid-file "/var/run/devd.pid"; # Setup some shorthand for regex that we use later in the file. + #XXX Yes, these are gross -- imp set ethernet-nic-regex - "(an|ar|ath|aue|awi|axe|bfe|bge|cdce|cm|cnw|cs|cue|dc|de|ed|el|em|\ - ep|ex|fe|fxp|gem|hme|ie|iwi|kue|lge|lnc|my|nge|pcn|ray|re|rl|\ - rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|vge|vr|vx|wb|wi|\ - xe|xl)\ + "(an|ar|ath|aue|awi|axe|bfe|bge|cdce|cm|cnw|cs|cue|dc|de|ed|el|\ + em|ep|ex|fe|fxp|gem|hme|ie|ipw|iwi|kue|lge|lnc|my|nge|pcn|ral|\ + ray|re|rl|rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|udav|ural|vge|\ + vr|vx|wb|wi|xe|xl)\ [0-9]+"; set scsi-controller-regex "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\ @@ -89,7 +90,8 @@ }; # -# Rescan scsi device-names on attach, but not detach. +# Rescan scsi device-names on attach, but not detach. However, it is +# disabled by default due to reports of problems. # attach 0 { device-name "$scsi-controller-regex"; ==== //depot/projects/wifi/etc/mtree/BSD.include.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.100 2005/06/09 19:45:05 jkoshy Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.101 2005/07/28 00:53:47 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -94,6 +94,8 @@ geom concat .. + eli + .. gate .. label ==== //depot/projects/wifi/lib/libthr/thread/thr_umtx.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_umtx.h,v 1.1 2005/04/02 01:20:00 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_umtx.h,v 1.2 2005/07/28 03:34:54 davidxu Exp $ */ #ifndef _THR_FBSD_UMTX_H_ @@ -47,30 +47,36 @@ static inline int _thr_umtx_trylock(volatile umtx_t *mtx, long id) { - return umtx_trylock((struct umtx *)mtx, id); + if (atomic_cmpset_acq_ptr((volatile uintptr_t *)mtx, + (uintptr_t)UMTX_UNOWNED, (uintptr_t)id)) + return (0); + return (EBUSY); } static inline int _thr_umtx_lock(volatile umtx_t *mtx, long id) { - if (atomic_cmpset_acq_ptr(mtx, (void *)UMTX_UNOWNED, (void *)id)) + if (atomic_cmpset_acq_ptr((volatile uintptr_t *)mtx, + (uintptr_t)UMTX_UNOWNED, (uintptr_t)id)) return (0); - return __thr_umtx_lock(mtx, id); + return (__thr_umtx_lock(mtx, id)); } static inline int _thr_umtx_timedlock(volatile umtx_t *mtx, long id, const struct timespec *timeout) { - if (atomic_cmpset_acq_ptr(mtx, (void *)UMTX_UNOWNED, (void *)id)) + if (atomic_cmpset_acq_ptr((volatile uintptr_t *)mtx, + (uintptr_t)UMTX_UNOWNED, (uintptr_t)id)) return (0); - return __thr_umtx_timedlock(mtx, id, timeout); + return (__thr_umtx_timedlock(mtx, id, timeout)); } static inline int _thr_umtx_unlock(volatile umtx_t *mtx, long id) { - if (atomic_cmpset_rel_ptr(mtx, (void *)id, (void *)UMTX_UNOWNED)) + if (atomic_cmpset_rel_ptr((volatile uintptr_t *)mtx, + (uintptr_t)id, (uintptr_t)UMTX_UNOWNED)) return (0); return __thr_umtx_unlock(mtx, id); } ==== //depot/projects/wifi/sbin/ccdconfig/ccdconfig.8#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.33 2005/02/10 09:19:28 ru Exp $ +.\" $FreeBSD: src/sbin/ccdconfig/ccdconfig.8,v 1.34 2005/07/28 10:48:07 keramida Exp $ .\" .Dd July 17, 1995 .Dt CCDCONFIG 8 @@ -229,7 +229,7 @@ The initial disklabel returned by .Xr ccd 4 specifies only 3 partitions. -One needs to change the number of paritions to 8 using +One needs to change the number of partitions to 8 using .Dq Nm disklabel Fl e to get the usual .Bx ==== //depot/projects/wifi/sbin/dhclient/bpf.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: bpf.c,v 1.13 2004/05/05 14:28:58 deraadt Exp $ */ -/* $FreeBSD: src/sbin/dhclient/bpf.c,v 1.3 2005/07/27 19:25:46 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/bpf.c,v 1.4 2005/07/28 15:30:19 brooks Exp $ */ /* BPF socket interface code, originally contributed by Archie Cobbs. */ @@ -325,7 +325,9 @@ * do is drop it. */ if (hdr.bh_caplen != hdr.bh_datalen) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } @@ -339,7 +341,9 @@ * this packet. */ if (offset < 0) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } interface->rbuf_offset += offset; @@ -351,7 +355,9 @@ /* If the IP or UDP checksum was bad, skip the packet... */ if (offset < 0) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } interface->rbuf_offset += offset; @@ -363,14 +369,18 @@ * life, though). */ if (hdr.bh_caplen > len) { - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); continue; } /* Copy out the data in the packet... */ memcpy(buf, interface->rbuf + interface->rbuf_offset, hdr.bh_caplen); - interface->rbuf_offset += hdr.bh_caplen; + interface->rbuf_offset = + BPF_WORDALIGN(interface->rbuf_offset + + hdr.bh_caplen); return (hdr.bh_caplen); } while (!length); return (0); ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ -/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.7 2005/07/25 04:32:40 sam Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.8 2005/07/28 00:24:39 brooks Exp $ */ /* * Copyright 2004 Henning Brauer @@ -987,7 +987,12 @@ lease->address.len = sizeof(packet->raw->yiaddr); memcpy(lease->address.iabuf, &packet->raw->yiaddr, lease->address.len); - /* If the server name was filled out, copy it. */ + /* If the server name was filled out, copy it. + Do not attempt to validate the server name as a host name. + RFC 2131 merely states that sname is NUL-terminated (which do + do not assume) and that it is the server's host name. Since + the ISC client and server allow arbitrary characters, we do + as well. */ if ((!packet->options[DHO_DHCP_OPTION_OVERLOAD].len || !(packet->options[DHO_DHCP_OPTION_OVERLOAD].data[0] & 2)) && packet->raw->sname[0]) { @@ -999,12 +1004,6 @@ } memcpy(lease->server_name, packet->raw->sname, DHCP_SNAME_LEN); lease->server_name[DHCP_SNAME_LEN]='\0'; - if (!res_hnok(lease->server_name) ) { - warning("Bogus server name %s", lease->server_name ); - free_client_lease(lease); - return (NULL); - } - } /* Ditto for the filename. */ ==== //depot/projects/wifi/sbin/geom/class/Makefile#4 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sbin/geom/class/Makefile,v 1.7 2005/07/27 23:30:50 pjd Exp $ +# $FreeBSD: src/sbin/geom/class/Makefile,v 1.8 2005/07/27 23:56:32 pjd Exp $ SUBDIR= concat -#SUBDIR+=eli +SUBDIR+=eli SUBDIR+=label SUBDIR+=mirror SUBDIR+=nop ==== //depot/projects/wifi/sbin/geom/class/eli/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/geom/class/eli/Makefile,v 1.1 2005/07/27 21:43:35 pjd Exp $ +# $FreeBSD: src/sbin/geom/class/eli/Makefile,v 1.2 2005/07/27 23:56:01 pjd Exp $ .PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2 @@ -8,10 +8,11 @@ SRCS+= pkcs5v2.c SRCS+= sha2.c -DPADD= ${LIBMD} ${LIBCRYPTO} -LDADD= -lmd -lcrypto +DPADD= ${LIBCRYPTO} +LDADD= -lcrypto + +WARNS?= 3 -NO_MAN= CFLAGS+=-I${.CURDIR}/../../../../sys .include ==== //depot/projects/wifi/sbin/reboot/boot_i386.8#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 .\" -.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.52 2005/01/18 10:09:37 ru Exp $ +.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.53 2005/07/28 10:48:07 keramida Exp $ .\" .Dd September 30, 2004 .Dt BOOT 8 i386 @@ -89,7 +89,7 @@ partition. As a result, slices which are missing an .Ql a -parition require user intervention during the boot process. +partition require user intervention during the boot process. .Pp The remainder of this subsection deals only with the boot blocks. The ==== //depot/projects/wifi/sys/kern/uipc_socket.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.242 2005/07/01 16:28:30 ssouhlal Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.243 2005/07/28 10:10:01 gnn Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -1162,7 +1162,10 @@ } cm = cmn; } - nextrecord = so->so_rcv.sb_mb->m_nextpkt; + if (so->so_rcv.sb_mb) + nextrecord = so->so_rcv.sb_mb->m_nextpkt; + else + nextrecord = NULL; orig_resid = 0; } if (m != NULL) { ==== //depot/projects/wifi/sys/security/mac_bsdextended/mac_bsdextended.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.25 2005/04/22 18:49:30 trhodes Exp $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.26 2005/07/28 13:55:12 trhodes Exp $ */ /* @@ -209,13 +209,10 @@ mtx_unlock(&mac_bsdextended_mtx); if (ruleptr != NULL) FREE(ruleptr, M_MACBSDEXTENDED); - if (req->oldptr && error == 0) { + if (req->oldptr && error == 0) error = SYSCTL_OUT(req, &temprule, sizeof(temprule)); - if (error) - return (error); - } - return (0); + return (error); } SYSCTL_NODE(_security_mac_bsdextended, OID_AUTO, rules, ==== //depot/projects/wifi/tools/tools/tinderbox/tbmaster.pl#4 (text+ko) ==== @@ -26,7 +26,7 @@ # (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: src/tools/tools/tinderbox/tbmaster.pl,v 1.54 2005/07/20 19:58:47 des Exp $ +# $FreeBSD: src/tools/tools/tinderbox/tbmaster.pl,v 1.55 2005/07/28 10:09:22 des Exp $ # use 5.006_001; @@ -71,6 +71,33 @@ my %CONFIG; ### +### Expand a path +### +sub realpath($;$); +sub realpath($;$) { + my $path = shift; + my $base = shift || ""; + + my $realpath = ($path =~ m|^/|) ? "" : $base; + my @parts = split('/', $path); + while (defined(my $part = shift(@parts))) { + if ($part eq '' || $part eq '.') { + # nothing + } elsif ($part eq '..') { + $realpath =~ s|/[^/]+$|| + or die("'$path' is not a valid path relative to '$base'\n"); + } elsif (-l "$realpath/$part") { + my $target = readlink("$realpath/$part") + or die("unable to resolve symlink '$realpath/$part': $!\n"); + $realpath = realpath($target, $realpath); + } else { + $realpath .= "/$part"; + } + } + return $realpath; +} + +### ### Perform variable expansion ### sub expand($); @@ -243,7 +270,7 @@ # Fork and start the tinderbox my @args = @{$CONFIG{'OPTIONS'}}; push(@args, "--hostname=" . expand('HOSTNAME')); - push(@args, "--sandbox=" . expand('SANDBOX')); + push(@args, "--sandbox=" . realpath(expand('SANDBOX'))); push(@args, "--arch=$arch"); push(@args, "--machine=$machine"); push(@args, "--cvsup=" . expand('CVSUP')) @@ -287,7 +314,9 @@ my @lines = (); my $error = 0; my $summary = ""; + my $root = realpath(expand('SANDBOX') . "/$branch/$arch/$machine"); while () { + s/\Q$root\E\/(src|obj)/\/$1/g; print(FULL $_); if (/^TB ---/ || /^>>> /) { if ($error) { ==== //depot/projects/wifi/usr.bin/vmstat/vmstat.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.87 2005/07/25 22:35:10 rwatson Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.88 2005/07/28 09:45:08 rwatson Exp $"); #include #include @@ -897,9 +897,6 @@ (long long)inttotal, (long long)(inttotal / uptime)); } -/* - * Query libmemstat(3) for information on malloc(9). - */ static void domemstat_malloc(void) { @@ -912,17 +909,13 @@ warn("memstat_mtl_alloc"); return; } - if (memstat_sysctl_malloc(mtlp, 0) < 0) { warnx("memstat_sysctl_malloc: %s", memstat_strerror(memstat_mtl_geterror(mtlp))); return; } - - printf("\n"); printf("%13s %5s %6s %7s %8s Size(s)\n", "Type", "InUse", "MemUse", "HighUse", "Requests"); - for (mtp = memstat_mtl_first(mtlp); mtp != NULL; mtp = memstat_mtl_next(mtp)) { if (memstat_get_numallocs(mtp) == 0 && @@ -932,7 +925,6 @@ memstat_get_name(mtp), memstat_get_count(mtp), ((int64_t)memstat_get_bytes(mtp) + 1023) / 1024, "-", memstat_get_numallocs(mtp)); - first = 1; for (i = 0; i < 32; i++) { if (memstat_get_sizemask(mtp) & (1 << i)) { @@ -944,13 +936,9 @@ } printf("\n"); } - memstat_mtl_free(mtlp); } -/* - * Query libmemstat(3) for information on uma(9). - */ static void domemstat_zone(void) { @@ -963,17 +951,13 @@ warn("memstat_mtl_alloc"); return; } - if (memstat_sysctl_uma(mtlp, 0) < 0) { warnx("memstat_sysctl_uma: %s", memstat_strerror(memstat_mtl_geterror(mtlp))); return; } - - printf("\n"); printf("%-15s %-8s %-9s %-7s %-5s %-8s\n\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQUESTS"); - for (mtp = memstat_mtl_first(mtlp); mtp != NULL; mtp = memstat_mtl_next(mtp)) { strlcpy(name, memstat_get_name(mtp), MEMTYPE_MAXNAME); @@ -983,7 +967,6 @@ memstat_get_count(mtp), memstat_get_free(mtp), memstat_get_numallocs(mtp)); } - memstat_mtl_free(mtlp); printf("\n"); } From owner-p4-projects@FreeBSD.ORG Fri Jul 29 01:51:21 2005 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 7C7BD16A421; Fri, 29 Jul 2005 01:51:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C552616A420 for ; Fri, 29 Jul 2005 01:51:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AAAF43D45 for ; Fri, 29 Jul 2005 01:51:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6T1pJXg005366 for ; Fri, 29 Jul 2005 01:51:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6T1pJlB005363 for perforce@freebsd.org; Fri, 29 Jul 2005 01:51:19 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Jul 2005 01:51:19 GMT Message-Id: <200507290151.j6T1pJlB005363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81142 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, 29 Jul 2005 01:51:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=81142 Change 81142 by sam@sam_ebb on 2005/07/29 01:50:27 scan modules Affected files ... .. //depot/projects/wifi/sys/modules/Makefile#26 edit .. //depot/projects/wifi/sys/modules/wlan_scan_ap/Makefile#1 add .. //depot/projects/wifi/sys/modules/wlan_scan_sta/Makefile#1 add Differences ... ==== //depot/projects/wifi/sys/modules/Makefile#26 (text+ko) ==== @@ -270,6 +270,8 @@ wb \ ${_wi} \ wlan \ + wlan_scan_ap \ + wlan_scan_sta \ wlan_acl \ wlan_ccmp \ wlan_tkip \ From owner-p4-projects@FreeBSD.ORG Fri Jul 29 02:37:36 2005 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 055D616A428; Fri, 29 Jul 2005 02:37:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79B4116A422 for ; Fri, 29 Jul 2005 02:37:35 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C8B743DB5 for ; Fri, 29 Jul 2005 01:57:28 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6T1vSF6005679 for ; Fri, 29 Jul 2005 01:57:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6T1vS2f005676 for perforce@freebsd.org; Fri, 29 Jul 2005 01:57:28 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Jul 2005 01:57:28 GMT Message-Id: <200507290157.j6T1vS2f005676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81145 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, 29 Jul 2005 02:37:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=81145 Change 81145 by sam@sam_ebb on 2005/07/29 01:56:46 missing files Affected files ... .. //depot/projects/wifi/sys/modules/wlan/Makefile#4 edit Differences ... ==== //depot/projects/wifi/sys/modules/wlan/Makefile#4 (text+ko) ==== @@ -5,7 +5,8 @@ KMOD= wlan SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c \ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ - ieee80211_node.c ieee80211_output.c ieee80211_proto.c + ieee80211_node.c ieee80211_output.c ieee80211_power.c \ + ieee80211_proto.c ieee80211_scan.c SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h opt_inet.h: From owner-p4-projects@FreeBSD.ORG Fri Jul 29 09:46:34 2005 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 79AB116A421; Fri, 29 Jul 2005 09:46:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2625616A41F for ; Fri, 29 Jul 2005 09:46:34 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D32B043D45 for ; Fri, 29 Jul 2005 09:46:33 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6T9kXYX044114 for ; Fri, 29 Jul 2005 09:46:33 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6T9kXCT044111 for perforce@freebsd.org; Fri, 29 Jul 2005 09:46:33 GMT (envelope-from soc-andrew@freebsd.org) Date: Fri, 29 Jul 2005 09:46:33 GMT Message-Id: <200507290946.j6T9kXCT044111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 81149 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, 29 Jul 2005 09:46:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=81149 Change 81149 by soc-andrew@soc-andrew_serv on 2005/07/29 09:45:49 Add a patch to be applied to the release Makefile you are using to build the BSD Installer release with. Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/RELENG_6_release_Makefile.patch#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jul 29 15:19:21 2005 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 E6F6316A421; Fri, 29 Jul 2005 15:19:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6FDD16A41F for ; Fri, 29 Jul 2005 15:19:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4949F43D46 for ; Fri, 29 Jul 2005 15:19:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6TFJKXN067916 for ; Fri, 29 Jul 2005 15:19:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6TFJJO8067913 for perforce@freebsd.org; Fri, 29 Jul 2005 15:19:19 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 Jul 2005 15:19:19 GMT Message-Id: <200507291519.j6TFJJO8067913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 81161 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, 29 Jul 2005 15:19:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=81161 Change 81161 by jhb@jhb_slimer on 2005/07/29 15:18:26 IFC @81157. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/bios.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#23 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#35 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#19 integrate .. //depot/projects/smpng/sys/amd64/include/atomic.h#23 integrate .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#12 integrate .. //depot/projects/smpng/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#17 integrate .. //depot/projects/smpng/sys/arm/include/clock.h#2 integrate .. //depot/projects/smpng/sys/arm/include/endian.h#13 integrate .. //depot/projects/smpng/sys/boot/common/console.c#4 integrate .. //depot/projects/smpng/sys/boot/common/help.common#18 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#35 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#101 integrate .. //depot/projects/smpng/sys/conf/files#145 integrate .. //depot/projects/smpng/sys/conf/files.amd64#34 integrate .. //depot/projects/smpng/sys/conf/options#104 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#18 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#8 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdStream.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_if.m#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_package.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#58 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#32 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#44 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/amrr/amrr.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/onoe/onoe.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#18 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#24 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#19 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/r300_cmdbuf.c#1 branch .. //depot/projects/smpng/sys/dev/drm/r300_reg.h#1 branch .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#10 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#13 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#23 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#12 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#22 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#11 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#10 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#49 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#7 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#10 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#48 integrate .. //depot/projects/smpng/sys/dev/vkbd/vkbd.c#7 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#20 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#73 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#48 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#18 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/smpng/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/smpng/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/smpng/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/smpng/sys/geom/geom_io.c#36 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#17 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#8 integrate .. //depot/projects/smpng/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#21 integrate .. //depot/projects/smpng/sys/i386/bios/smapi_bios.S#4 integrate .. //depot/projects/smpng/sys/i386/bios/smbios.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#104 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#14 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#4 integrate .. //depot/projects/smpng/sys/i386/include/pc/bios.h#6 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#98 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#38 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#59 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#14 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#71 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#59 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#80 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#106 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#9 integrate .. //depot/projects/smpng/sys/modules/de/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/drm/radeon/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/geom/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/geom/geom_eli/Makefile#1 branch .. //depot/projects/smpng/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf.c#53 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#12 integrate .. //depot/projects/smpng/sys/net/if.c#70 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#19 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#5 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#60 integrate .. //depot/projects/smpng/sys/net/if_gif.c#27 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#26 integrate .. //depot/projects/smpng/sys/net/if_var.h#39 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#14 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#14 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#13 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#17 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#16 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#13 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#37 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#32 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#10 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#57 integrate .. //depot/projects/smpng/sys/netinet/ip6.h#7 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#9 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#56 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#68 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#70 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#39 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#25 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#43 integrate .. //depot/projects/smpng/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/smpng/sys/netinet6/ah_core.c#10 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#30 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#26 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#16 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#8 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#37 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#21 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#12 integrate .. //depot/projects/smpng/sys/netinet6/ip6_forward.c#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#40 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#41 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#16 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#22 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#12 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#26 integrate .. //depot/projects/smpng/sys/netinet6/nd6_nbr.c#16 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#34 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#8 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#7 integrate .. //depot/projects/smpng/sys/netinet6/scope6_var.h#4 integrate .. //depot/projects/smpng/sys/netinet6/udp6_output.c#18 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#34 integrate .. //depot/projects/smpng/sys/netkey/key.c#30 integrate .. //depot/projects/smpng/sys/netnatm/natm.c#23 integrate .. //depot/projects/smpng/sys/netnatm/natm.h#6 integrate .. //depot/projects/smpng/sys/netnatm/natm_pcb.c#7 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#13 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.c#8 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#43 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#21 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#36 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#15 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#41 integrate .. //depot/projects/smpng/sys/pci/if_de.c#26 integrate .. //depot/projects/smpng/sys/pci/if_devar.h#9 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#51 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#59 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#16 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#15 integrate .. //depot/projects/smpng/sys/sparc64/include/cpufunc.h#26 integrate .. //depot/projects/smpng/sys/sys/mchain.h#9 integrate .. //depot/projects/smpng/sys/sys/param.h#84 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#73 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#58 integrate .. //depot/projects/smpng/sys/vm/uma.h#17 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#57 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#73 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/bios.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bios.c,v 1.72 2004/09/24 01:08:34 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bios.c,v 1.73 2005/07/21 09:48:36 phk Exp $"); /* * Subset of the i386 bios support code. We cannot make bios16 nor bios32 @@ -93,18 +93,3 @@ } return(0); } - -const u_char * -bios_string(u_int from, u_int to, const u_char *string, int len) -{ - const char *t, *te; - - if (len == 0) - len = strlen(string); - t = (const char *)(KERNBASE + from); - te = (const char *)(KERNBASE + to); - for (; t <= te; t++) - if (!memcmp(string, t, len)) - return (t); - return (NULL); -} ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.260 2005/06/29 23:23:16 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.261 2005/07/21 21:46:09 peter Exp $"); #include "opt_cpu.h" #include "opt_kdb.h" @@ -95,6 +95,9 @@ /* Free these after use */ void *bootstacks[MAXCPU]; +/* Temporary holder for double fault stack */ +char *doublefault_stack; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -432,6 +435,7 @@ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); + common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], @@ -679,7 +683,8 @@ cpu_apic_ids[cpu] = apic_id; /* allocate and set up an idle stack data page */ - bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#35 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.440 2005/07/14 15:39:04 kensmith Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.441 2005/07/24 17:55:57 mux Exp $ machine amd64 cpu HAMMER @@ -215,8 +215,7 @@ # ISA Ethernet NICs. pccard NICs included. device cs # Crystal Semiconductor CS89x0 NIC # 'device ed' requires 'device miibus' -# XXX kvtop brokenness, pointer/int warnings -#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards +device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards ==== //depot/projects/smpng/sys/amd64/conf/NOTES#19 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36 2005/06/30 05:33:25 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.41 2005/07/22 16:02:40 ru Exp $ # # @@ -210,7 +210,7 @@ device mach64drm # ATI Rage Pro, Rage Mobility P/M, Rage XL device mgadrm # AGP Matrox G200, G400, G450, G550 device r128drm # ATI Rage 128 -device radeondrm # ATI Radeon up to 9200 +device radeondrm # ATI Radeon device sisdrm # SiS 300/305, 540, 630 device tdfxdrm # 3dfx Voodoo 3/4/5 and Banshee options DRM_DEBUG # Include debug printfs (slow) @@ -226,11 +226,11 @@ # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) +device ed +options ED_3C503 +options ED_HPP +options ED_SIC #XXX# still calls MD i386 kvtop function instead of vtophys etc -#XXX#device ed -#XXX#options ED_3C503 -#XXX#options ED_HPP -#XXX#options ED_SIC #XXX#device lnc device ath @@ -297,6 +297,8 @@ # # Miscellaneous hardware: # +# smbios: DMI/SMBIOS entry point +# vpd: Vital Product Data kernel interface # cy: Cyclades serial driver # digi: Digiboard driver @@ -321,6 +323,8 @@ device pbio hint.pbio.0.at="isa" hint.pbio.0.port="0x360" +device smbios +device vpd # sx device is i386 and pc98 only at the moment. device sx options SX_DEBUG ==== //depot/projects/smpng/sys/amd64/include/atomic.h#23 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.35 2005/07/15 18:17:57 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.36 2005/07/21 22:35:02 peter Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -152,10 +152,35 @@ return (res); } +#if defined(_KERNEL) && !defined(SMP) + +/* + * We assume that a = b will do atomic loads and stores. However, on a + * PentiumPro or higher, reads may pass writes, so for that case we have + * to use a serializing instruction (i.e. with LOCK) to do the load in + * SMP kernels. For UP kernels, however, the cache of the single processor + * is always consistent, so we don't need any memory barriers. + */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ + return (*p); \ +} \ + \ +static __inline void \ +atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + *p = v; \ +} \ +struct __hack + +#else /* defined(SMP) */ + +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +static __inline u_##TYPE \ +atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ +{ \ u_##TYPE res; \ \ __asm __volatile(__XSTRING(MPLOCKED) LOP \ @@ -179,6 +204,8 @@ } \ struct __hack +#endif /* SMP */ + #endif /* KLD_MODULE || !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ==== //depot/projects/smpng/sys/amd64/include/bus_dma.h#12 (text+ko) ==== @@ -22,8 +22,9 @@ * 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: src/sys/amd64/include/bus_dma.h,v 1.30 2005/07/22 04:03:25 obrien Exp $ */ -/* $FreeBSD: src/sys/amd64/include/bus_dma.h,v 1.29 2005/03/14 16:46:27 scottl Exp $ */ #ifndef _AMD64_BUS_DMA_H_ #define _AMD64_BUS_DMA_H_ ==== //depot/projects/smpng/sys/amd64/include/pc/bios.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.18 2004/09/24 00:42:36 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pc/bios.h,v 1.19 2005/07/21 09:48:36 phk Exp $ */ #ifndef _MACHINE_PC_BIOS_H_ @@ -48,7 +48,22 @@ u_int32_t type; } __packed; -const u_char *bios_string(u_int from, u_int to, const u_char *string, int len); +struct bios_oem_signature { + char * anchor; /* search anchor string in BIOS memory */ + size_t offset; /* offset from anchor (may be negative) */ + size_t totlen; /* total length of BIOS string to copy */ +} __packed; +struct bios_oem_range { + u_int from; /* shouldn't be below 0xe0000 */ + u_int to; /* shouldn't be above 0xfffff */ +} __packed; +struct bios_oem { + struct bios_oem_range range; + struct bios_oem_signature signature[]; +} __packed; + +extern int +bios_oem_strings(struct bios_oem *oem, u_char *buffer, size_t maxlen); #endif /* _MACHINE_PC_BIOS_H_ */ ==== //depot/projects/smpng/sys/arm/include/atomic.h#17 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.9 2005/07/15 18:17:57 jhb Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.10 2005/07/27 20:01:44 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ ==== //depot/projects/smpng/sys/arm/include/clock.h#2 (text+ko) ==== @@ -23,10 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/clock.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $ */ #ifndef _MACHINE_CLOCK_H_ #define _MACHINE_CLOCK_H_ +#define wall_cmos_clock 0 +#define adjkerntz 0 + #endif /* !_MACHINE_CLOCK_H_ */ ==== //depot/projects/smpng/sys/arm/include/endian.h#13 (text+ko) ==== @@ -27,7 +27,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/arm/include/endian.h,v 1.9 2005/05/24 21:43:16 cognet Exp $ + * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $ */ #ifndef _ENDIAN_H_ ==== //depot/projects/smpng/sys/boot/common/console.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.7 2005/05/27 19:30:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.8 2005/07/29 12:47:42 brian Exp $"); #include #include @@ -217,7 +217,7 @@ if (*curpos == '\0') continue; cons = cons_find(curpos); - if (cons > 0) { + if (cons >= 0) { consoles[cons]->c_flags |= C_ACTIVEIN | C_ACTIVEOUT; consoles[cons]->c_init(0); } ==== //depot/projects/smpng/sys/boot/common/help.common#18 (text+ko) ==== @@ -223,7 +223,7 @@ set currdev= - Selects the default device. Syntax for devices is odd. + Selects the default device. See lsdev for available devices. ################################################################################ # Tset Sinit_path DSet the list of init candidates ==== //depot/projects/smpng/sys/boot/forth/loader.conf#35 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.95 2005/05/19 23:03:02 sobomax Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.96 2005/07/29 12:41:37 brian Exp $ ############################################################## ### Basic configuration options ############################ @@ -47,7 +47,7 @@ # allowed to interrupt autoboot process and # escape to the loader prompt #beastie_disable="NO" # Turn the beastie boot menu on and off -#console="vidconsole" # Set the current console +#console="vidconsole" # A comma separated list of console(s) #currdev="disk1s1a" # Set the current device module_path="/boot/modules" # Set the module search path #prompt="\\${interpret}" # Set the command prompt @@ -59,16 +59,18 @@ ### Kernel settings ######################################## ############################################################## - # The following boot_ variables are enabled - # by setting them to any value. -#boot_askname="" # Prompt the user for the name of the root device -#boot_cdrom="" # Attempt to mount root file system from CD-ROM -#boot_ddb="" # Instructs the kernel to start in the DDB debugger -#boot_gdb="" # Selects gdb-remote mode for the kernel debugger -#boot_multicons="" # Use multiple consoles -#boot_serial="" # Use serial console -#boot_single="" # Start system in single-user mode -#boot_verbose="" # Causes extra debugging information to be printed +# The following boot_ variables are enabled by setting them to any value. +# Their presence in the kernel environment (see kenv(1)) has the same +# effect as setting the given boot flag (see boot(8)). + +#boot_askname="" # -a: Prompt the user for the name of the root device +#boot_cdrom="" # -C: Attempt to mount root file system from CD-ROM +#boot_ddb="" # -d: Instructs the kernel to start in the DDB debugger +#boot_gdb="" # -g: Selects gdb-remote mode for the kernel debugger +#boot_multicons="" # -D: Use multiple consoles +#boot_serial="" # -h: Use serial console +#boot_single="" # -s: Start system in single-user mode +#boot_verbose="" # -v: Causes extra debugging information to be printed #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" # Sets the list of init candidates ==== //depot/projects/smpng/sys/boot/i386/libi386/smbios.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.1 2005/07/14 19:52:22 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.2 2005/07/27 19:11:10 jkim Exp $"); #include #include @@ -72,9 +72,6 @@ if (smbios == NULL) return; - /* export values from the SMBIOS */ - setenv("hint.smbios.0.enabled", "YES", 1); - length = *(u_int16_t *)(smbios + 0x16); /* Structure Table Length */ paddr = *(u_int32_t *)(smbios + 0x18); /* Structure Table Address */ count = *(u_int16_t *)(smbios + 0x1c); /* No of SMBIOS Structures */ @@ -91,26 +88,26 @@ switch(dmi[0]) { case 0: /* Type 0: BIOS */ - smbios_setenv("hint.smbios.0.bios.vendor", dmi, 0x04); - smbios_setenv("hint.smbios.0.bios.version", dmi, 0x05); - smbios_setenv("hint.smbios.0.bios.reldate", dmi, 0x08); + smbios_setenv("smbios.bios.vendor", dmi, 0x04); + smbios_setenv("smbios.bios.version", dmi, 0x05); + smbios_setenv("smbios.bios.reldate", dmi, 0x08); break; case 1: /* Type 1: System */ - smbios_setenv("hint.smbios.0.system.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.system.product", dmi, 0x05); - smbios_setenv("hint.smbios.0.system.version", dmi, 0x06); + smbios_setenv("smbios.system.maker", dmi, 0x04); + smbios_setenv("smbios.system.product", dmi, 0x05); + smbios_setenv("smbios.system.version", dmi, 0x06); break; case 2: /* Type 2: Base Board (or Module) */ - smbios_setenv("hint.smbios.0.planar.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.planar.product", dmi, 0x05); - smbios_setenv("hint.smbios.0.planar.version", dmi, 0x06); + smbios_setenv("smbios.planar.maker", dmi, 0x04); + smbios_setenv("smbios.planar.product", dmi, 0x05); + smbios_setenv("smbios.planar.version", dmi, 0x06); break; case 3: /* Type 3: System Enclosure or Chassis */ - smbios_setenv("hint.smbios.0.chassis.maker", dmi, 0x04); - smbios_setenv("hint.smbios.0.chassis.version", dmi, 0x06); + smbios_setenv("smbios.chassis.maker", dmi, 0x04); + smbios_setenv("smbios.chassis.version", dmi, 0x06); break; default: /* skip other types */ ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.15 2005/05/19 07:21:46 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.16 2005/07/22 23:22:29 grehan Exp $"); /* * MD primitives supporting placement of module data @@ -39,7 +39,9 @@ #define READIN_BUF (4 * 1024) #define PAGE_SIZE 0x1000 #define PAGE_MASK 0x0fff +#define MAPMEM_PAGE_INC 16 + #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) static int @@ -76,10 +78,10 @@ /* * To avoid repeated mappings on small allocations, - * never map anything less than 16 pages at a time + * never map anything less than MAPMEM_PAGE_INC pages at a time */ - if ((nlen + resid) < PAGE_SIZE*8) { - dlen = PAGE_SIZE*8; + if ((nlen + resid) < PAGE_SIZE*MAPMEM_PAGE_INC) { + dlen = PAGE_SIZE*MAPMEM_PAGE_INC; } else dlen = roundup(nlen + resid, PAGE_SIZE); ==== //depot/projects/smpng/sys/conf/NOTES#101 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1326 2005/07/14 15:57:00 takawata Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1328 2005/07/27 21:47:55 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -131,6 +131,7 @@ options GEOM_BDE # Disk encryption. options GEOM_BSD # BSD disklabels options GEOM_CONCAT # Disk concatenation. +options GEOM_ELI # Disk encryption. options GEOM_FOX # Redundant path mitigation options GEOM_GATE # Userland services. options GEOM_GPT # GPT partitioning @@ -145,6 +146,7 @@ options GEOM_SUNLABEL # Sun/Solaris partitioning options GEOM_UZIP # Read-only compressed disks options GEOM_VOL # Volume names from UFS superblock +options GEOM_ZERO # Peformance testing helper. # # The root device and filesystem type can be compiled in; ==== //depot/projects/smpng/sys/conf/files#145 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1034 2005/07/17 03:27:36 obrien Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1038 2005/07/27 21:47:55 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -511,6 +511,7 @@ dev/drm/r128_irq.c optional r128drm dev/drm/r128_state.c optional r128drm \ compile-with "${NORMAL_C} -finline-limit=13500" +dev/drm/r300_cmdbuf.c optional radeondrm dev/drm/radeon_cp.c optional radeondrm dev/drm/radeon_drv.c optional radeondrm dev/drm/radeon_irq.c optional radeondrm @@ -538,7 +539,7 @@ dev/esp/ncr53c9x.c optional esp dev/ex/if_ex.c optional ex dev/ex/if_ex_isa.c optional ex isa -#dev/ex/if_ex_pccard.c optional ex pccard +dev/ex/if_ex_pccard.c optional ex pccard dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fe/if_fe.c optional fe @@ -1027,6 +1028,11 @@ geom/bde/g_bde_lock.c optional geom_bde geom/bde/g_bde_work.c optional geom_bde geom/concat/g_concat.c optional geom_concat +geom/eli/g_eli.c optional geom_eli +geom/eli/g_eli_crypto.c optional geom_eli +geom/eli/g_eli_ctl.c optional geom_eli +geom/eli/g_eli_key.c optional geom_eli +geom/eli/pkcs5v2.c optional geom_eli geom/gate/g_gate.c optional geom_gate geom/geom_aes.c optional geom_aes geom/geom_apple.c optional geom_apple @@ -1065,6 +1071,7 @@ geom/shsec/g_shsec.c optional geom_shsec geom/stripe/g_stripe.c optional geom_stripe geom/uzip/g_uzip.c optional geom_uzip +geom/zero/g_zero.c optional geom_zero gnu/fs/ext2fs/ext2_alloc.c optional ext2fs \ warning "kernel contains GPL contaminated ext2fs filesystem" gnu/fs/ext2fs/ext2_balloc.c optional ext2fs ==== //depot/projects/smpng/sys/conf/files.amd64#34 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.71 2005/06/30 07:49:21 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.75 2005/07/21 21:57:31 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -136,6 +136,12 @@ dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +# There are no systems with isa slots, so all ed isa entries should go.. +dev/ed/if_ed_3c503.c optional ed isa ed_3c503 +dev/ed/if_ed_isa.c optional ed isa +dev/ed/if_ed_wd80x3.c optional ed isa +dev/ed/if_ed_hpp.c optional ed isa ed_hpp +dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash @@ -229,4 +235,8 @@ compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx64_wrap.S optional ndisapi pci +i386/bios/smbios.c optional smbios +i386/bios/vpd.c optional vpd i386/cpufreq/powernow.c optional cpufreq +i386/cpufreq/est.c optional cpufreq +i386/cpufreq/p4tcc.c optional cpufreq ==== //depot/projects/smpng/sys/conf/options#104 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.511 2005/07/15 05:12:49 takawata Exp $ +# $FreeBSD: src/sys/conf/options,v 1.513 2005/07/27 21:47:55 pjd Exp $ # # On the handling of kernel options # @@ -76,6 +76,7 @@ GEOM_BDE opt_geom.h GEOM_BSD opt_geom.h GEOM_CONCAT opt_geom.h +GEOM_ELI opt_geom.h GEOM_FOX opt_geom.h GEOM_GATE opt_geom.h GEOM_GPT opt_geom.h @@ -90,6 +91,7 @@ GEOM_SUNLABEL opt_geom.h GEOM_UZIP opt_geom.h GEOM_VOL opt_geom.h +GEOM_ZERO opt_geom.h KSTACK_MAX_PAGES KSTACK_PAGES KTRACE ==== //depot/projects/smpng/sys/contrib/pf/net/pf.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.34 2005/05/04 19:51:06 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.35 2005/07/20 18:58:27 mlaier Exp $ */ /* $OpenBSD: pf.c,v 1.483 2005/03/15 17:38:43 dhartmei Exp $ */ /* @@ -1085,6 +1085,11 @@ void pf_purge_expired_state(struct pf_state *cur) { +#ifdef __FreeBSD__ + if (cur->sync_flags & PFSTATE_EXPIRING) + return; + cur->sync_flags |= PFSTATE_EXPIRING; +#endif if (cur->src.state == PF_TCPS_PROXY_DST) pf_send_tcp(cur->rule.ptr, cur->af, &cur->ext.addr, &cur->lan.addr, ==== //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.11 2005/05/03 16:43:32 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_norm.c,v 1.12 2005/07/20 10:30:52 ume Exp $ */ /* $OpenBSD: pf_norm.c,v 1.97 2004/09/21 16:59:12 aaron Exp $ */ /* @@ -70,48 +70,6 @@ #include -#if defined(__FreeBSD__) && defined(INET6) -/* - * XXX: This should go to netinet/ip6.h (KAME) - */ -/* IPv6 options: common part */ -struct ip6_opt { - u_int8_t ip6o_type; - u_int8_t ip6o_len; -} __packed; - -/* Jumbo Payload Option */ -struct ip6_opt_jumbo { - u_int8_t ip6oj_type; - u_int8_t ip6oj_len; - u_int8_t ip6oj_jumbo_len[4]; -} __packed; - -/* NSAP Address Option */ -struct ip6_opt_nsap { - u_int8_t ip6on_type; - u_int8_t ip6on_len; - u_int8_t ip6on_src_nsap_len; - u_int8_t ip6on_dst_nsap_len; - /* followed by source NSAP */ - /* followed by destination NSAP */ -} __packed; - -/* Tunnel Limit Option */ -struct ip6_opt_tunnel { - u_int8_t ip6ot_type; - u_int8_t ip6ot_len; - u_int8_t ip6ot_encap_limit; -} __packed; - -/* Router Alert Option */ -struct ip6_opt_router { - u_int8_t ip6or_type; - u_int8_t ip6or_len; - u_int8_t ip6or_value[2]; -} __packed; -#endif /* __FreeBSD__ && INET6 */ - #ifndef __FreeBSD__ struct pf_frent { LIST_ENTRY(pf_frent) fr_next; ==== //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.11 2005/05/03 16:43:32 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pfvar.h,v 1.12 2005/07/20 18:58:27 mlaier Exp $ */ /* $OpenBSD: pfvar.h,v 1.213 2005/03/03 07:13:39 dhartmei Exp $ */ /* @@ -790,6 +790,9 @@ #define PFSTATE_NOSYNC 0x01 #define PFSTATE_FROMSYNC 0x02 #define PFSTATE_STALE 0x04 +#ifdef __FreeBSD__ +#define PFSTATE_EXPIRING 0x10 +#endif u_int8_t pad; }; ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#9 (text+ko) ==== @@ -23,14 +23,15 @@ * 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: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.9 2004/09/02 04:28:05 njl Exp $ */ /* * 6.8 : Debugging support */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.10 2005/07/22 23:10:02 njl Exp $"); + #include "opt_ddb.h" #include #include ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#16 (text+ko) ==== @@ -23,14 +23,15 @@ * 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: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.15 2005/05/29 04:42:16 nyan Exp $ */ /* * 6.7 : Hardware Abstraction */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.16 2005/07/22 23:10:02 njl Exp $"); + #include "acpi.h" #include ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#14 (text+ko) ==== @@ -23,14 +23,15 @@ * 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: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.19 2004/12/02 00:25:35 marks Exp $ */ /* * 6.5 : Interrupt handling */ +#include +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.20 2005/07/22 23:10:02 njl Exp $"); + #include #include #include ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#8 (text+ko) ==== @@ -24,14 +24,15 @@ * 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: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.11 2004/04/14 03:39:08 njl Exp $ */ /* * 6.2 : Memory Management */ +#include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 29 15:25:28 2005 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 7711216A421; Fri, 29 Jul 2005 15:25:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50B2716A41F for ; Fri, 29 Jul 2005 15:25:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 203F243D46 for ; Fri, 29 Jul 2005 15:25:28 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6TFPSKt068198 for ; Fri, 29 Jul 2005 15:25:28 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6TFPRaj068195 for perforce@freebsd.org; Fri, 29 Jul 2005 15:25:27 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 Jul 2005 15:25:27 GMT Message-Id: <200507291525.j6TFPRaj068195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 81162 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, 29 Jul 2005 15:25:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=81162 Change 81162 by jhb@jhb_slimer on 2005/07/29 15:24:32 IFC @81160. Affected files ... .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#8 integrate Differences ... ==== //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_l2cap_llpi.c,v 1.5 2003/09/08 19:11:45 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c,v 1.8 2005/01/07 01:45:43 imp Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c,v 1.9 2005/07/29 14:44:17 emax Exp $ */ #include @@ -250,7 +250,7 @@ /* Create and send LP_ConnectRsp event */ NG_MKMESSAGE(rsp, NGM_HCI_COOKIE, NGM_HCI_LP_CON_RSP, sizeof(*rp), M_NOWAIT); - if (msg == NULL) { + if (rsp == NULL) { ng_l2cap_free_con(con); error = ENOMEM; goto out; From owner-p4-projects@FreeBSD.ORG Fri Jul 29 16:25:43 2005 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 6312616A421; Fri, 29 Jul 2005 16:25:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25F1616A41F for ; Fri, 29 Jul 2005 16:25:43 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B81E243D46 for ; Fri, 29 Jul 2005 16:25:42 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6TGPg4o071753 for ; Fri, 29 Jul 2005 16:25:42 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6TGPg1M071750 for perforce@freebsd.org; Fri, 29 Jul 2005 16:25:42 GMT (envelope-from soc-tyler@freebsd.org) Date: Fri, 29 Jul 2005 16:25:42 GMT Message-Id: <200507291625.j6TGPg1M071750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 81166 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, 29 Jul 2005 16:25:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=81166 Change 81166 by soc-tyler@soc-tyler_launchd on 2005/07/29 16:24:55 Syncing this up before I forget or leave town, whichever comes first. Affected files ... .. //depot/projects/soc2005/launchd/Makefile#9 edit .. //depot/projects/soc2005/launchd/includes/launch.h#7 edit .. //depot/projects/soc2005/launchd/includes/launchd.h#6 edit .. //depot/projects/soc2005/launchd/launchd.c#8 edit Differences ... ==== //depot/projects/soc2005/launchd/Makefile#9 (text+ko) ==== @@ -2,10 +2,10 @@ # $FreeBSD$ PROG= launchd -SRCS= launchd.c liblaunch.c ##init.c +SRCS= launchd.c liblaunch.c init.c #launchdebugd.c launchproxy.c -MAN= launchd.conf.5 launchd.plist.5 init.8 launchd.8 \ - launchd_debug.8 launchproxy.8 rc.8 service.8 +MAN= launchd.conf.5 init.8 launchd.8 launchd_debugd.8 \ + launchproxy.8 service.8 BINMODE=500 INSTALLFLAGS=-b -B.bak @@ -14,7 +14,8 @@ CFLAGS+= -g -Wall -W -Wshadow -Wpadded -Iincludes -D_LAUNCHD_ # init.c related CFLAGS (from src/sbin/init/Makefile) -CFLAGS+= -DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT +# -DSECURE to make secure single-user logins (enter root passwd, etc) +CFLAGS+= -DDEBUGSHELL -DLOGIN_CAP -DCOMPAT_SYSV_INIT # Do not let launchd(8) have init(8) functionality (or I haven't implemented it yet.. ;)) CFLAGS+= -D_NO_INIT_ ==== //depot/projects/soc2005/launchd/includes/launch.h#7 (text+ko) ==== @@ -58,11 +58,6 @@ #define _BUILD_DARWIN_ #endif -#ifndef _BUILD_DARWIN_ -// on Darwin-based systems, LOG_LAUNCHD is defined for syslog() -#define LOG_LAUNCHD LOG_DAEMON -#endif - #define LAUNCH_KEY_SUBMITJOB "SubmitJob" #define LAUNCH_KEY_REMOVEJOB "RemoveJob" #define LAUNCH_KEY_STARTJOB "StartJob" ==== //depot/projects/soc2005/launchd/includes/launchd.h#6 (text+ko) ==== @@ -42,7 +42,7 @@ void init_pre_kevent(void); bool init_check_pid(pid_t); -void update_ttys(void); +void clean_ttys(void); void catatonia(void); void death(void); @@ -51,20 +51,26 @@ void launchd_SessionCreate(const char *who); #endif + #ifndef _BUILD_DARWIN_ +// on Darwin-based systems, LOG_LAUNCHD is defined for syslog() +#define LOG_LAUNCHD LOG_DAEMON + /* on Darwin-based systems, O_EVTONLY helps us track changes to a certain file descriptor * as outlined here: * http://developer.apple.com/documentation/Performance/Conceptual/FileSystem/Articles/TrackingChanges.html#//apple_ref/doc/uid/20001993-118158 * - * on FreeBSD, specifically, EVFILT_VNODE is the closest thing to what we want to do + * in FreeBSDland, EVFILT_VNODE is the closest thing to what we want to do + * see: job_watch():launchd.c and load_job():launchd.c for it's usage. */ #define O_EVTONLY EVFILT_VNODE -/* these are defined in sys/event.h in the Darwin source tree, for now we'll +/* + * these are defined in sys/event.h in the Darwin source tree, for now we'll * define them here (disgusting, but we'll see how it works out. * - * XXX: this may break something ;) + * XXX: this _will_ (most likely) break something ;) */ #define NOTE_SECONDS 0x00000001 /* data is seconds */ #define NOTE_USECONDS 0x00000002 /* data is microseconds */ @@ -72,5 +78,4 @@ #define NOTE_ABSOLUTE 0x00000008 /* absolute timeout */ #endif - #endif ==== //depot/projects/soc2005/launchd/launchd.c#8 (text+ko) ==== @@ -331,9 +331,17 @@ #ifdef _BUILD_DARWIN_ launchd_bootstrap_port = bootstrap_port; #endif + /* + * launchd_server_init() is called now if we're not assuming PID 1, + * i.e. all filesystems are mounted and marked rw; otherwise, we call + * launchd_server_init() from fs_callback() + */ launchd_server_init(argv[0] ? true : false); } + /* this registers for the kqfs_callback (fs_callback()) function to be + * called when the mount table is updated, so we can call some PID 1 stuff */ + /* do this after pid1_magic_init() to not catch ourselves mounting stuff */ if (kevent_mod(0, EVFILT_FS, EV_ADD, 0, 0, &kqfs_callback) == -1) syslog(LOG_ERR, "kevent_mod(EVFILT_FS, &kqfs_callback): %m"); @@ -352,8 +360,10 @@ struct timespec *timeoutp = NULL; if (getpid() == 1) { +#ifndef _NO_INIT_ if (readcfg_pid == 0) init_pre_kevent(); +#endif } else { if (TAILQ_EMPTY(&jobs)) { /* launched on demand */ @@ -457,7 +467,6 @@ init_boot(sflag, vflag, xflag); } - #ifdef PID1_REAP_ADOPTED_CHILDREN static bool launchd_check_pid(pid_t p) { @@ -1041,7 +1050,7 @@ resp = launch_data_new_errno(EACCES); } } else if (!strcmp(cmd, LAUNCH_KEY_RELOADTTYS)) { - update_ttys(); + clean_ttys(); resp = launch_data_new_errno(0); } else if (!strcmp(cmd, LAUNCH_KEY_SHUTDOWN)) { do_shutdown(); @@ -1921,7 +1930,7 @@ { switch (kev->ident) { case SIGHUP: - update_ttys(); + clean_ttys(); reload_launchd_config(); break; case SIGTERM: From owner-p4-projects@FreeBSD.ORG Fri Jul 29 17:52:36 2005 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 45C6816A421; Fri, 29 Jul 2005 17:52:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF55816A41F for ; Fri, 29 Jul 2005 17:52:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C25F643D48 for ; Fri, 29 Jul 2005 17:52:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6THqZVx082959 for ; Fri, 29 Jul 2005 17:52:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6THqZfT082956 for perforce@freebsd.org; Fri, 29 Jul 2005 17:52:35 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 Jul 2005 17:52:35 GMT Message-Id: <200507291752.j6THqZfT082956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 81176 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, 29 Jul 2005 17:52:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=81176 Change 81176 by jhb@jhb_slimer on 2005/07/29 17:52:09 Sync with other linux ABIs in this branch: common module dependencies live in MI code. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#6 edit Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#6 (text+ko) ==== @@ -83,11 +83,6 @@ #include #include -MODULE_VERSION(linux, 1); -MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); -MODULE_DEPEND(linux, sysvsem, 1, 1, 1); -MODULE_DEPEND(linux, sysvshm, 1, 1, 1); - MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures"); #define AUXARGS_ENTRY_32(pos, id, val) \ From owner-p4-projects@FreeBSD.ORG Fri Jul 29 17:53:38 2005 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 D4B3916A421; Fri, 29 Jul 2005 17:53:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B09D316A41F for ; Fri, 29 Jul 2005 17:53:37 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8284C43D46 for ; Fri, 29 Jul 2005 17:53:37 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6THrbXD083003 for ; Fri, 29 Jul 2005 17:53:37 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6THrbPx083000 for perforce@freebsd.org; Fri, 29 Jul 2005 17:53:37 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 Jul 2005 17:53:37 GMT Message-Id: <200507291753.j6THrbPx083000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 81177 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, 29 Jul 2005 17:53:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=81177 Change 81177 by jhb@jhb_slimer on 2005/07/29 17:53:11 Move SYSVIPC module dependencies into the file with the code that actually depends on them. Affected files ... .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#21 edit .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#59 edit Differences ... ==== //depot/projects/smpng/sys/compat/linux/linux_ipc.c#21 (text+ko) ==== @@ -815,3 +815,7 @@ return EINVAL; } } + +MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); +MODULE_DEPEND(linux, sysvsem, 1, 1, 1); +MODULE_DEPEND(linux, sysvshm, 1, 1, 1); ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#59 (text+ko) ==== @@ -1404,6 +1404,3 @@ } MODULE_VERSION(linux, 1); -MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); -MODULE_DEPEND(linux, sysvsem, 1, 1, 1); -MODULE_DEPEND(linux, sysvshm, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Fri Jul 29 17:57:43 2005 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 609E816A421; Fri, 29 Jul 2005 17:57:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2004A16A41F for ; Fri, 29 Jul 2005 17:57:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4B1543D45 for ; Fri, 29 Jul 2005 17:57:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6THvgD7083181 for ; Fri, 29 Jul 2005 17:57:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6THvg2R083178 for perforce@freebsd.org; Fri, 29 Jul 2005 17:57:42 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 Jul 2005 17:57:42 GMT Message-Id: <200507291757.j6THvg2R083178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 81178 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, 29 Jul 2005 17:57:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=81178 Change 81178 by jhb@jhb_slimer on 2005/07/29 17:57:19 Add missing SYSVIPC module depends. Affected files ... .. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#8 edit .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#7 edit Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#8 (text+ko) ==== @@ -385,6 +385,8 @@ return EINVAL; } } + +MODULE_DEPEND(svr4elf, sysvsem, 1, 1, 1); #endif #ifdef SYSVMSG @@ -579,6 +581,8 @@ return EINVAL; } } + +MODULE_DEPEND(svr4elf, sysvmsg, 1, 1, 1); #endif #ifdef SYSVSHM @@ -788,4 +792,6 @@ return ENOSYS; } } + +MODULE_DEPEND(svr4elf, sysvshm, 1, 1, 1); #endif /* SYSVSHM */ ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#7 (text+ko) ==== @@ -405,3 +405,7 @@ } return EINVAL; } + +MODULE_DEPEND(ibcs2, sysvmsg, 1, 1, 1); +MODULE_DEPEND(ibcs2, sysvsem, 1, 1, 1); +MODULE_DEPEND(ibcs2, sysvshm, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Fri Jul 29 19:43:04 2005 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 886C316A421; Fri, 29 Jul 2005 19:43:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5938516A41F for ; Fri, 29 Jul 2005 19:43:03 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2185743D68 for ; Fri, 29 Jul 2005 19:43:00 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6TJh0HY087839 for ; Fri, 29 Jul 2005 19:43:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6TJgx1R087836 for perforce@freebsd.org; Fri, 29 Jul 2005 19:42:59 GMT (envelope-from jhb@freebsd.org) Date: Fri, 29 Jul 2005 19:42:59 GMT Message-Id: <200507291942.j6TJgx1R087836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 81185 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, 29 Jul 2005 19:43:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=81185 Change 81185 by jhb@jhb_slimer on 2005/07/29 19:42:53 Update. Affected files ... .. //depot/projects/smpng/sys/notes#50 edit Differences ... ==== //depot/projects/smpng/sys/notes#50 (text+ko) ==== @@ -22,7 +22,8 @@ - eventually we should not clobber all memory for bus_space, but just the memory we actually touch - arm - - needs real acq variants to get "memory" clobber + - needs real acq variants to get "memory" clobber, then __swp() can stop + clobbering "memory" - dev - drm clobbers memory for write barriers - drm and sym should use bus_space for barriers @@ -37,11 +38,6 @@ - sparc64 - sys + start over saving current state in the ktrace branch so I can break this up - - change sparc64 and arm to treat memory modified in _swp and casa as - input and output - - implement - - test - - commit - stop using '+' with "m" arguments - implement - test From owner-p4-projects@FreeBSD.ORG Sat Jul 30 05:08:24 2005 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 7C3A416A421; Sat, 30 Jul 2005 05:08:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5024616A41F for ; Sat, 30 Jul 2005 05:08:23 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5A8643D49 for ; Sat, 30 Jul 2005 05:08:22 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6U58Mpr033559 for ; Sat, 30 Jul 2005 05:08:22 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6U58M1v033556 for perforce@freebsd.org; Sat, 30 Jul 2005 05:08:22 GMT (envelope-from soc-andrew@freebsd.org) Date: Sat, 30 Jul 2005 05:08:22 GMT Message-Id: <200507300508.j6U58M1v033556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 81195 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: Sat, 30 Jul 2005 05:08:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=81195 Change 81195 by soc-andrew@soc-andrew_serv on 2005/07/30 05:07:32 Spelling fix Pointed out by: Dru Lavigne Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.c#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/extra_flow.c#2 (text+ko) ==== @@ -57,8 +57,8 @@ { "games", "Games" }, { "manpages", "Manual pages" }, { "catpages", "Cat Pages" }, - { "proflibs", "Profilling Libraries" }, - { "dict", "Dictonaries" }, + { "proflibs", "Profiling Libraries" }, + { "dict", "Dictionaries" }, { "info", "Info Pages" }, #ifdef __amd64__ { "lib32", "32bit Libraries" }, From owner-p4-projects@FreeBSD.ORG Sat Jul 30 23:11:15 2005 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 9AA6816A421; Sat, 30 Jul 2005 23:11:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 708FE16A41F for ; Sat, 30 Jul 2005 23:11:14 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB6B043D45 for ; Sat, 30 Jul 2005 23:11:13 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6UNBDRU007045 for ; Sat, 30 Jul 2005 23:11:13 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6UNBDCs007042 for perforce@freebsd.org; Sat, 30 Jul 2005 23:11:13 GMT (envelope-from soc-victor@freebsd.org) Date: Sat, 30 Jul 2005 23:11:13 GMT Message-Id: <200507302311.j6UNBDCs007042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: Victor Cruceru To: Perforce Change Reviews Cc: Subject: PERFORCE change 81218 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: Sat, 30 Jul 2005 23:11:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=81218 Change 81218 by soc-victor@soc-victor_82.76.158.176 on 2005/07/30 23:11:09 Added the SNMP instrumentation for hrDiskStorageTable (the very first version). Updated the hrDeviceTable accordingly. Also fixed a bug in devd Unix socket read part of hrDeviceTable code (zero length read means the devd process is dead). hrDiskStorageTable's instrumentation needs many improvements. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#14 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#6 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 add .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#12 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#16 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#14 (text+ko) ==== @@ -33,11 +33,12 @@ hostres_storage_tbl.c hostres_fs_tbl.c \ hostres_swrun_tbl.c hostres_swrunperf_tbl.c \ hostres_device_tbl.c \ - hostres_processor_tbl.c + hostres_processor_tbl.c \ + hostres_diskstorage_tbl.c WARNS?= 6 #Not having NDEBUG defined will enable assertions and a lot of output on stderr -CFLAGS+= -DNDEBUG +#CFLAGS+= -DNDEBUG XSYM= host hrStorageOther hrStorageRam hrStorageVirtualMemory \ hrStorageFixedDisk hrStorageRemovableDisk hrStorageFloppyDisk \ hrStorageCompactDisc hrStorageRamDisk hrStorageFlashMemory \ ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#6 (text+ko) ==== @@ -42,9 +42,15 @@ #include #include -/*just a prototype*/ +/*some prototypes*/ int hr_device_collector(struct devinfo_dev *dev, void *arg); +void +hrDeviceTblEntry_delete_v( struct hrDeviceTblEntry* entry ); + +struct hrDeviceTblEntry * +hrDeviceTblEntry_find_by_index(int32_t idx); + static struct hrDeviceTblEntry* hrDeviceTblEntry_create( const struct devinfo_dev *dev_p) { @@ -126,7 +132,7 @@ } -static + void hrDeviceTblEntry_delete_v( struct hrDeviceTblEntry* entry ) { struct deviceNameMapEntry *map; @@ -158,7 +164,7 @@ return (NULL); } -static + struct hrDeviceTblEntry * hrDeviceTblEntry_find_by_index(int32_t idx) { @@ -316,8 +322,9 @@ /*mark each entry as missing*/ - TAILQ_FOREACH(entry, &hrState_g.hr_device_tbl, link) + TAILQ_FOREACH(entry, &hrState_g.hr_device_tbl, link) { entry->flags &= ~HR_DEVICE_FOUND; + } hrDevice_OS_get_devices_v(); @@ -327,7 +334,7 @@ entry = TAILQ_FIRST(&hrState_g.hr_device_tbl); while (entry != NULL) { entry_tmp = TAILQ_NEXT(entry, link); - if (!(entry->flags & HR_DEVICE_FOUND)) + if (!(entry->flags & HR_DEVICE_FOUND) && !(entry->flags & HR_DEVICE_IMMUTABLE) ) hrDeviceTblEntry_delete_v(entry); entry = entry_tmp; } @@ -340,7 +347,10 @@ devinfo_free(); hrState_g.dev_root = NULL; - + /* + * Force a refresh for the hrDiskStorageTable + */ + refresh_DiskStorage_tbl_v(); HR_DPRINTF((stderr, "%s: refresh DONE\n ",__func__)); } @@ -390,7 +400,18 @@ } } else if (read_len == 0) { - syslog(LOG_ERR,"zero bytes read from devd pipe...."); + syslog(LOG_ERR,"zero bytes read from devd pipe....closing socket! "); + if (close(hrState_g.devd_sock) < 0 ){ + syslog(LOG_ERR,"Failed to close the devd socket: %m"); + } + hrState_g.devd_sock = -1; + if (hrState_g.devd_fd != NULL) { + fd_deselect(hrState_g.devd_fd); + hrState_g.devd_fd = NULL; + } + syslog(LOG_ERR,"Closing devd_fd, revert to devinfo polling"); + + } else { switch(buf[0]){ case '+': ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#12 (text+ko) ==== @@ -120,17 +120,23 @@ hrState_g.ccpu = 0; TAILQ_INIT(&hrState_g.hr_processor_tbl); + /*data structure initialization for hrDiskStorageTable*/ + TAILQ_INIT(&hrState_g.hr_disk_storage_tbl); + hrState_g.disk_list = NULL; + hrState_g.disk_list_len = 0; + hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; hrState_g.hr_swrun_tick = 0; hrState_g.hr_device_tick = 0; hrState_g.hr_processor_tick = 0; + hrState_g.hr_disk_storage_tick = 0; hrState_g.hrStorage_tbl_age = 0; hrState_g.hrFS_tbl_age = 0; hrState_g.hrSWRun_tbl_age = 0; hrState_g.hrDevice_tbl_age = 0; - + hrState_g.hrDiskStorage_age = 0; init_hrStorage_tbl_v(); init_hrFS_tbl_v(); @@ -139,16 +145,7 @@ init_hrDevice_tbl_v(); init_hrProcessor_tbl_v(); - /* - * Start the cpu stats collector - * The semantics of timer_start parameters is in "SNMP ticks"; - * we have 100 "SNMP ticks" per second, thus we are trying below - * to get MAX_CPU_SAMPLES per minute - */ - - hrState_g.cpus_load_timer = - timer_start(100, 100*60/MAX_CPU_SAMPLES, get_cpus_samples, NULL, mod); - + init_hrDiskStorage_tbl_v(); if ((hrState_g.devd_sock = create_devd_socket()) < 0) { @@ -213,20 +210,22 @@ fini_hrStorage_tbl_v(); fini_hrFS_tbl_v(); fini_hrSWRun_tbl_v(); + fini_hrProcessor_tbl_v(); + fini_DiskStorage_tbl_v(); fini_hrDevice_tbl_v(); - fini_hrProcessor_tbl_v(); hrState_g.hr_storage_tick = 0; hrState_g.hr_fs_tick = 0; hrState_g.hr_swrun_tick = 0; hrState_g.hr_device_tick = 0; hrState_g.hr_processor_tick = 0; + hrState_g.hr_disk_storage_tick = 0; hrState_g.hrStorage_tbl_age = 0; hrState_g.hrFS_tbl_age = 0; hrState_g.hrSWRun_tbl_age = 0; hrState_g.hrDevice_tbl_age = 0; - + hrState_g.hrDiskStorage_age = 0; hrState_g.dev_root = NULL; @@ -322,6 +321,17 @@ syslog(LOG_ERR, "fd_select failed on devd socket: %m"); } } + + /* + * Start the cpu stats collector + * The semantics of timer_start parameters is in "SNMP ticks"; + * we have 100 "SNMP ticks" per second, thus we are trying below + * to get MAX_CPU_SAMPLES per minute + */ + + hrState_g.cpus_load_timer = + timer_start(100, 100*60/MAX_CPU_SAMPLES, get_cpus_samples, NULL, hostres_module); + HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } @@ -369,14 +379,6 @@ } -int op_hrDiskStorageTable(struct snmp_context *ctx __unused, - struct snmp_value *value __unused, - u_int sub __unused, - u_int iidx __unused, - enum snmp_op curr_op __unused) -{ - return (SNMP_ERR_NOSUCHNAME); -} int op_hrPartitionTable(struct snmp_context *ctx __unused, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#16 (text+ko) ==== @@ -216,14 +216,45 @@ u_char cpu_no; /*which cpu, counted from 0*/ pid_t idle_pid; /*the PID of idle process for this CPU */ double samples[MAX_CPU_SAMPLES]; /*the samples from the last - minutes, as required by MIB*/ + minute, as required by MIB*/ uint32_t cur_sample_idx; /*current sample to fill in next time, must be < MAX_CPU_SAMPLES*/ }; TAILQ_HEAD(processor_tbl, hrProcessorTblEntry); +enum hrDiskStrorageAccess { + DS_READ_WRITE = 1, + DS_READ_ONLY = 2 +}; +enum hrDiskStrorageMedia { + DSM_OTHER = 1, + DSM_UNKNOWN = 2, + DSM_HARDDISK = 3, + DSM_FLOPPYDISK = 4, + DSM_OPTICALDISKROM= 5, + DSM_OPTICALDISKWORM= 6, + DSM_OPTICALDISKRW= 7, + DSM_RAMDISK = 8 +}; + +struct hrDiskStorageTblEntry { + int32_t index; + int32_t access; /*enum hrDiskStrorageAccess */ + int32_t media; /*enum hrDiskStrorageMedia*/ + int32_t removable; /*enum snmpTCTruthValue*/ + int32_t capacity; + TAILQ_ENTRY(hrDiskStorageTblEntry) link; + /*next items are not from the SNMP mib table, only to be used internally*/ +#define HR_DISKSTORAGE_FOUND 0x001 + uint32_t flags; + uint64_t r_tick; + +}; + +TAILQ_HEAD(disk_storage_tbl, hrDiskStorageTblEntry); + enum DeviceStatus { DS_UNKNOWN = 1, DR_RUNNING = 2, @@ -245,7 +276,8 @@ int32_t status; /* one item from enum DeviceStatus, see above */ uint32_t errors; -#define HR_DEVICE_FOUND 0x001 +#define HR_DEVICE_FOUND 0x001 +#define HR_DEVICE_IMMUTABLE 0x002 /* not dectected by libdevice, so don't try to refresh it*/ /*next 3 are not from the SNMP mib table, only to be used internally*/ uint32_t flags; u_char name[32+1]; @@ -360,6 +392,16 @@ uint64_t hr_processor_tick; /*last (agent) tick when hrProcessorTable was updated */ void* cpus_load_timer; /*periodic time used to get cpu laod stats*/ + + /* + * next items are used for hrDiskStorageTable + */ + struct + disk_storage_tbl hr_disk_storage_tbl; /*the head of the list with hrDiskStorageTable's entries */ + uint64_t hr_disk_storage_tick; + time_t hrDiskStorage_age; + char* disk_list; /*returned by sysctl("kern.disks")*/ + size_t disk_list_len; }; @@ -446,12 +488,12 @@ hrSWRunTblEntry_find_by_index(int32_t idx); /* - * Init the things for both of hrSWRunTable an hrSWRunPerfTable + * Init the things for both of hrSWRunTable and hrSWRunPerfTable */ void init_hrSWRun_tbl_v(void); /* - * Finalization routine for both of hrSWRunTable an hrSWRunPerfTable + * Finalization routine for both of hrSWRunTable and hrSWRunPerfTable * It destroys the lists and frees any allocated heap memory */ void fini_hrSWRun_tbl_v(void); @@ -533,5 +575,28 @@ * Each CPU is "visited" MAX_CPU_SAMPLES times per one minute */ void get_cpus_samples(void*); + +/* + * Init the things for both of hrDiskStorageTable + */ +void init_hrDiskStorage_tbl_v(void); + +/* + * Finalization routine for hrDiskStorageTable + * It destroys the lists and frees any allocated heap memory + */ +void fini_DiskStorage_tbl_v(void); + +/* + * Next macro represents the number of seconds + * between two consecutive queries to the OS for getting the new data + */ +#define HR_DISKSTORAGE_TBL_REFRESH 3 +/* + * Refresh routine for hrDiskStorageTable + * Usable for polling the system for any changes. + */ +void refresh_DiskStorage_tbl_v(void); + #endif /*__HOSTRES_SNMP_H_INCLUDED__ */