From owner-p4-projects@FreeBSD.ORG Sun Jan 24 10:49:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41BBD1065698; Sun, 24 Jan 2010 10:49:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C519C106566B for ; Sun, 24 Jan 2010 10:49:42 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B17FF8FC17 for ; Sun, 24 Jan 2010 10:49:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OAngbr029916 for ; Sun, 24 Jan 2010 10:49:42 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0OAngwh029914 for perforce@freebsd.org; Sun, 24 Jan 2010 10:49:42 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 Jan 2010 10:49:42 GMT Message-Id: <201001241049.o0OAngwh029914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 10:49:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=173612 Change 173612 by mav@mav_mavtest on 2010/01/24 10:49:20 Implement two-level SCSI error recovery: send request sense request (if needed) for recovery requests errors. For example, it makes cd driver to poll ATAPI CD device while it loading the media, instead of just returning error. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#51 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#26 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#51 (text+ko) ==== @@ -71,7 +71,6 @@ static int camperiphscsistatuserror(union ccb *ccb, cam_flags camflags, u_int32_t sense_flags, - union ccb *save_ccb, int *openings, u_int32_t *relsim_flags, u_int32_t *timeout, @@ -79,7 +78,6 @@ static int camperiphscsisenseerror(union ccb *ccb, cam_flags camflags, u_int32_t sense_flags, - union ccb *save_ccb, int *openings, u_int32_t *relsim_flags, u_int32_t *timeout, @@ -1008,16 +1006,86 @@ } #define saved_ccb_ptr ppriv_ptr0 +#define recovery_depth ppriv_field1 +static void +camperiphsensedone(struct cam_periph *periph, union ccb *done_ccb) +{ + union ccb *saved_ccb = (union ccb *)done_ccb->ccb_h.saved_ccb_ptr; + cam_status status; + int frozen = 0; + u_int sense_key; + int depth = done_ccb->ccb_h.recovery_depth; + + status = done_ccb->ccb_h.status; + if (status & CAM_DEV_QFRZN) { + frozen = 1; + /* + * Clear freeze flag now for case of retry, + * freeze will be dropped later. + */ + done_ccb->ccb_h.status &= ~CAM_DEV_QFRZN; + } + status &= CAM_STATUS_MASK; + switch (status) { + case CAM_REQ_CMP: + { + /* + * If we manually retrieved sense into a CCB and got + * something other than "NO SENSE" send the updated CCB + * back to the client via xpt_done() to be processed via + * the error recovery code again. + */ + sense_key = saved_ccb->csio.sense_data.flags; + sense_key &= SSD_KEY; + if (sense_key != SSD_KEY_NO_SENSE) { + saved_ccb->ccb_h.status |= + CAM_AUTOSNS_VALID; + } else { + saved_ccb->ccb_h.status &= + ~CAM_STATUS_MASK; + saved_ccb->ccb_h.status |= + CAM_AUTOSENSE_FAIL; + } + bcopy(saved_ccb, done_ccb, sizeof(union ccb)); + xpt_free_ccb(saved_ccb); + break; + } + default: + bcopy(saved_ccb, done_ccb, sizeof(union ccb)); + xpt_free_ccb(saved_ccb); + done_ccb->ccb_h.status &= ~CAM_STATUS_MASK; + done_ccb->ccb_h.status |= CAM_AUTOSENSE_FAIL; + break; + } + periph->flags &= ~CAM_PERIPH_SENSE_INPROG; + /* + * If it is the end of recovery, drop freeze, taken due to + * CAM_DEV_QFREEZE flag, set on recovery request. + */ + if (depth == 0) { + cam_release_devq(done_ccb->ccb_h.path, + /*relsim_flags*/0, + /*openings*/0, + /*timeout*/0, + /*getcount_only*/0); + } + /* + * Copy frozen flag from recovery request if it is set there + * for some reason. + */ + if (frozen != 0) + done_ccb->ccb_h.status |= CAM_DEV_QFRZN; + (*done_ccb->ccb_h.cbfcnp)(periph, done_ccb); +} + static void camperiphdone(struct cam_periph *periph, union ccb *done_ccb) { - union ccb *saved_ccb; + union ccb *saved_ccb, *save_ccb; cam_status status; int frozen = 0; - int sense; struct scsi_start_stop_unit *scsi_cmd; u_int32_t relsim_flags, timeout; - int xpt_done_ccb = FALSE; status = done_ccb->ccb_h.status; if (status & CAM_DEV_QFRZN) { @@ -1028,14 +1096,12 @@ */ done_ccb->ccb_h.status &= ~CAM_DEV_QFRZN; } - sense = (status & CAM_AUTOSNS_VALID) != 0; - status &= CAM_STATUS_MASK; timeout = 0; relsim_flags = 0; saved_ccb = (union ccb *)done_ccb->ccb_h.saved_ccb_ptr; - switch (status) { + switch (status & CAM_STATUS_MASK) { case CAM_REQ_CMP: { /* @@ -1044,56 +1110,19 @@ * the inquiry information. Many devices (mostly disks) * don't properly report their inquiry information unless * they are spun up. - * - * If we manually retrieved sense into a CCB and got - * something other than "NO SENSE" send the updated CCB - * back to the client via xpt_done() to be processed via - * the error recovery code again. */ - if (done_ccb->ccb_h.func_code == XPT_SCSI_IO) { - scsi_cmd = (struct scsi_start_stop_unit *) - &done_ccb->csio.cdb_io.cdb_bytes; + scsi_cmd = (struct scsi_start_stop_unit *) + &done_ccb->csio.cdb_io.cdb_bytes; - if (scsi_cmd->opcode == START_STOP_UNIT) - xpt_async(AC_INQ_CHANGED, - done_ccb->ccb_h.path, NULL); - if (scsi_cmd->opcode == REQUEST_SENSE) { - u_int sense_key; - - sense_key = saved_ccb->csio.sense_data.flags; - sense_key &= SSD_KEY; - if (sense_key != SSD_KEY_NO_SENSE) { - saved_ccb->ccb_h.status |= - CAM_AUTOSNS_VALID; -#if 0 - xpt_print(saved_ccb->ccb_h.path, - "Recovered Sense\n"); - cam_error_print(saved_ccb, CAM_ESF_ALL, - CAM_EPF_ALL); -#endif - } else { - saved_ccb->ccb_h.status &= - ~CAM_STATUS_MASK; - saved_ccb->ccb_h.status |= - CAM_AUTOSENSE_FAIL; - } - xpt_done_ccb = TRUE; - } - } - bcopy(done_ccb->ccb_h.saved_ccb_ptr, done_ccb, - sizeof(union ccb)); - - periph->flags &= ~CAM_PERIPH_RECOVERY_INPROG; - - if (xpt_done_ccb == FALSE) - xpt_action(done_ccb); - - break; + if (scsi_cmd->opcode == START_STOP_UNIT) + xpt_async(AC_INQ_CHANGED, + done_ccb->ccb_h.path, NULL); + goto final; } case CAM_SCSI_STATUS_ERROR: scsi_cmd = (struct scsi_start_stop_unit *) &done_ccb->csio.cdb_io.cdb_bytes; - if (sense != 0) { + if (status & CAM_AUTOSNS_VALID) { struct ccb_getdev cgd; struct scsi_sense_data *sense; int error_code, sense_key, asc, ascq; @@ -1102,7 +1131,6 @@ sense = &done_ccb->csio.sense_data; scsi_extract_sense(sense, &error_code, &sense_key, &asc, &ascq); - /* * Grab the inquiry data for this device. */ @@ -1112,7 +1140,6 @@ xpt_action((union ccb *)&cgd); err_action = scsi_error_action(&done_ccb->csio, &cgd.inq_data, 0); - /* * If the error is "invalid field in CDB", * and the load/eject flag is set, turn the @@ -1122,7 +1149,6 @@ * the load/eject flag by default for * removable media. */ - /* XXX KDM * Should we check to see what the specific * scsi status is?? Or does it not matter @@ -1137,9 +1163,7 @@ (done_ccb->ccb_h.retry_count > 0)) { scsi_cmd->how &= ~SSS_LOEJ; - xpt_action(done_ccb); - } else if ((done_ccb->ccb_h.retry_count > 1) && ((err_action & SS_MASK) != SS_FAIL)) { @@ -1150,53 +1174,51 @@ * it another try unless this is an * unretryable error. */ - /* set the timeout to .5 sec */ relsim_flags = RELSIM_RELEASE_AFTER_TIMEOUT; timeout = 500; - xpt_action(done_ccb); - break; - } else { /* * Perform the final retry with the original * CCB so that final error processing is * performed by the owner of the CCB. */ - bcopy(done_ccb->ccb_h.saved_ccb_ptr, - done_ccb, sizeof(union ccb)); - - periph->flags &= ~CAM_PERIPH_RECOVERY_INPROG; - - xpt_action(done_ccb); + goto final; } } else { + save_ccb = xpt_alloc_ccb_nowait(); + if (save_ccb == NULL) + goto final; + bcopy(done_ccb, save_ccb, sizeof(*save_ccb)); + periph->flags |= CAM_PERIPH_SENSE_INPROG; /* - * Eh?? The command failed, but we don't - * have any sense. What's up with that? - * Fire the CCB again to return it to the - * caller. + * Send a Request Sense to the device. We + * assume that we are in a contingent allegiance + * condition so we do not tag this request. */ - bcopy(done_ccb->ccb_h.saved_ccb_ptr, - done_ccb, sizeof(union ccb)); - - periph->flags &= ~CAM_PERIPH_RECOVERY_INPROG; - + scsi_request_sense(&done_ccb->csio, /*retries*/1, + camperiphsensedone, + &save_ccb->csio.sense_data, + sizeof(save_ccb->csio.sense_data), + CAM_TAG_ACTION_NONE, + /*sense_len*/SSD_FULL_SIZE, + /*timeout*/5000); + done_ccb->ccb_h.pinfo.priority--; + done_ccb->ccb_h.flags |= CAM_DEV_QFREEZE; + done_ccb->ccb_h.saved_ccb_ptr = save_ccb; + done_ccb->ccb_h.recovery_depth++; xpt_action(done_ccb); - } break; default: - bcopy(done_ccb->ccb_h.saved_ccb_ptr, done_ccb, - sizeof(union ccb)); - +final: + bcopy(saved_ccb, done_ccb, sizeof(*done_ccb)); + xpt_free_ccb(saved_ccb); periph->flags &= ~CAM_PERIPH_RECOVERY_INPROG; - xpt_action(done_ccb); - break; } @@ -1219,23 +1241,13 @@ /*openings*/0, /*timeout*/timeout, /*getcount_only*/0); - if (xpt_done_ccb == TRUE) { - /* - * Copy frozen flag from recovery request if it is set there - * for some reason. - */ - if (frozen != 0) - done_ccb->ccb_h.status |= CAM_DEV_QFRZN; - (*done_ccb->ccb_h.cbfcnp)(periph, done_ccb); - } else { - /* Drop freeze taken, if this recovery request got error. */ - if (frozen != 0) { - cam_release_devq(done_ccb->ccb_h.path, - /*relsim_flags*/0, - /*openings*/0, - /*timeout*/0, - /*getcount_only*/0); - } + /* Drop freeze taken, if this recovery request got error. */ + if (frozen != 0) { + cam_release_devq(done_ccb->ccb_h.path, + /*relsim_flags*/0, + /*openings*/0, + /*timeout*/0, + /*getcount_only*/0); } } @@ -1296,7 +1308,7 @@ static int camperiphscsistatuserror(union ccb *ccb, cam_flags camflags, - u_int32_t sense_flags, union ccb *save_ccb, + u_int32_t sense_flags, int *openings, u_int32_t *relsim_flags, u_int32_t *timeout, const char **action_string) { @@ -1316,7 +1328,6 @@ error = camperiphscsisenseerror(ccb, camflags, sense_flags, - save_ccb, openings, relsim_flags, timeout, @@ -1414,16 +1425,17 @@ static int camperiphscsisenseerror(union ccb *ccb, cam_flags camflags, - u_int32_t sense_flags, union ccb *save_ccb, + u_int32_t sense_flags, int *openings, u_int32_t *relsim_flags, u_int32_t *timeout, const char **action_string) { struct cam_periph *periph; + union ccb *orig_ccb = ccb; int error; periph = xpt_path_periph(ccb->ccb_h.path); - if (periph->flags & CAM_PERIPH_RECOVERY_INPROG) { - + if (periph->flags & + (CAM_PERIPH_RECOVERY_INPROG | CAM_PERIPH_SENSE_INPROG)) { /* * If error recovery is already in progress, don't attempt * to process this error, but requeue it unconditionally @@ -1441,13 +1453,6 @@ } else { scsi_sense_action err_action; struct ccb_getdev cgd; - union ccb* print_ccb; - - /* - * The location of the orignal ccb - * for sense printing purposes. - */ - print_ccb = ccb; /* * Grab the inquiry data for this device. @@ -1485,8 +1490,9 @@ * Do common portions of commands that * use recovery CCBs. */ - if (save_ccb == NULL) { - *action_string = "No recovery CCB supplied"; + orig_ccb = xpt_alloc_ccb_nowait(); + if (orig_ccb == NULL) { + *action_string = "Can't allocate recovery CCB"; goto sense_error_done; } /* @@ -1494,9 +1500,7 @@ * this freeze will be dropped as part of ERESTART. */ ccb->ccb_h.status &= ~CAM_DEV_QFRZN; - bcopy(ccb, save_ccb, sizeof(*save_ccb)); - print_ccb = save_ccb; - periph->flags |= CAM_PERIPH_RECOVERY_INPROG; + bcopy(ccb, orig_ccb, sizeof(*orig_ccb)); } switch (err_action & SS_MASK) { @@ -1520,6 +1524,7 @@ * then retry the command. */ *action_string = "Attempting to start unit"; + periph->flags |= CAM_PERIPH_RECOVERY_INPROG; /* * Check for removable media and set @@ -1560,6 +1565,7 @@ *action_string = "Testing device for readiness"; retries = 1; } + periph->flags |= CAM_PERIPH_RECOVERY_INPROG; scsi_test_unit_ready(&ccb->csio, retries, camperiphdone, @@ -1578,15 +1584,16 @@ case SS_REQSENSE: { *action_string = "Requesting SCSI sense data"; + periph->flags |= CAM_PERIPH_SENSE_INPROG; /* * Send a Request Sense to the device. We * assume that we are in a contingent allegiance * condition so we do not tag this request. */ scsi_request_sense(&ccb->csio, /*retries*/1, - camperiphdone, - &save_ccb->csio.sense_data, - sizeof(save_ccb->csio.sense_data), + camperiphsensedone, + &orig_ccb->csio.sense_data, + sizeof(orig_ccb->csio.sense_data), CAM_TAG_ACTION_NONE, /*sense_len*/SSD_FULL_SIZE, /*timeout*/5000); @@ -1607,14 +1614,15 @@ */ ccb->ccb_h.pinfo.priority--; ccb->ccb_h.flags |= CAM_DEV_QFREEZE; - ccb->ccb_h.saved_ccb_ptr = save_ccb; + ccb->ccb_h.saved_ccb_ptr = orig_ccb; + ccb->ccb_h.recovery_depth = 0; error = ERESTART; } sense_error_done: if ((err_action & SSQ_PRINT_SENSE) != 0 && (ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0) - cam_error_print(print_ccb, CAM_ESF_ALL, CAM_EPF_ALL); + cam_error_print(orig_ccb, CAM_ESF_ALL, CAM_EPF_ALL); } return (error); } @@ -1650,7 +1658,6 @@ error = camperiphscsistatuserror(ccb, camflags, sense_flags, - save_ccb, &openings, &relsim_flags, &timeout, ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#26 (text+ko) ==== @@ -118,6 +118,7 @@ #define CAM_PERIPH_INVALID 0x08 #define CAM_PERIPH_NEW_DEV_FOUND 0x10 #define CAM_PERIPH_RECOVERY_INPROG 0x20 +#define CAM_PERIPH_SENSE_INPROG 0x40 u_int32_t immediate_priority; u_int32_t refcount; SLIST_HEAD(, ccb_hdr) ccb_list; /* For "immediate" requests */ From owner-p4-projects@FreeBSD.ORG Sun Jan 24 11:07:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6BBE106568B; Sun, 24 Jan 2010 11:07:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AD5E1065676 for ; Sun, 24 Jan 2010 11:07:00 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 586008FC1D for ; Sun, 24 Jan 2010 11:07:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OB70At032184 for ; Sun, 24 Jan 2010 11:07:00 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0OB70PA032182 for perforce@freebsd.org; Sun, 24 Jan 2010 11:07:00 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 Jan 2010 11:07:00 GMT Message-Id: <201001241107.o0OB70PA032182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 11:07:00 -0000 http://p4web.freebsd.org/chv.cgi?CH=173614 Change 173614 by mav@mav_mavtest on 2010/01/24 11:06:25 Use default number of retries. SCSI devices could return several consecutive errors even when functioning correctly. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#37 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#37 (text+ko) ==== @@ -1465,7 +1465,7 @@ bioq_remove(&softc->bio_queue, bp); scsi_read_write(&start_ccb->csio, - /*retries*/cd_retry_count, + /*retries*/ cd_retry_count, /* cbfcnp */ cddone, MSG_SIMPLE_Q_TAG, /* read */bp->bio_cmd == BIO_READ, @@ -1516,7 +1516,7 @@ } csio = &start_ccb->csio; scsi_read_capacity(csio, - /*retries*/1, + /*retries*/ cd_retry_count, cddone, MSG_SIMPLE_Q_TAG, rcap, @@ -2733,7 +2733,7 @@ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); scsi_prevent(&ccb->csio, - /*retries*/ 1, + /*retries*/ cd_retry_count, cddone, MSG_SIMPLE_Q_TAG, action, @@ -2911,7 +2911,7 @@ return (ENOMEM); scsi_read_capacity(&ccb->csio, - /*retries*/ 1, + /*retries*/ cd_retry_count, cddone, MSG_SIMPLE_Q_TAG, rcap_buf, @@ -3159,7 +3159,7 @@ csio = &ccb->csio; cam_fill_csio(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* flags */ CAM_DIR_IN, /* tag_action */ MSG_SIMPLE_Q_TAG, @@ -3206,7 +3206,7 @@ csio = &ccb->csio; cam_fill_csio(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* flags */ CAM_DIR_IN, /* tag_action */ MSG_SIMPLE_Q_TAG, @@ -3267,7 +3267,7 @@ param_len = min(param_len, data->alloc_len); scsi_mode_sense_len(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* tag_action */ MSG_SIMPLE_Q_TAG, /* dbd */ 0, @@ -3410,7 +3410,7 @@ param_len = min(param_len, data->alloc_len); scsi_mode_select_len(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* tag_action */ MSG_SIMPLE_Q_TAG, /* scsi_page_fmt */ 1, @@ -3472,7 +3472,7 @@ cdb_len = sizeof(*scsi_cmd); } cam_fill_csio(csio, - /*retries*/2, + /*retries*/ cd_retry_count, cddone, /*flags*/CAM_DIR_NONE, MSG_SIMPLE_Q_TAG, @@ -3506,7 +3506,7 @@ csio = &ccb->csio; cam_fill_csio(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* flags */ CAM_DIR_NONE, /* tag_action */ MSG_SIMPLE_Q_TAG, @@ -3552,7 +3552,7 @@ csio = &ccb->csio; cam_fill_csio(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* flags */ CAM_DIR_NONE, /* tag_action */ MSG_SIMPLE_Q_TAG, @@ -3594,7 +3594,7 @@ csio = &ccb->csio; cam_fill_csio(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* flags */ CAM_DIR_NONE, /* tag_action */ MSG_SIMPLE_Q_TAG, @@ -3629,7 +3629,7 @@ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); scsi_start_stop(&ccb->csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* tag_action */ MSG_SIMPLE_Q_TAG, /* start */ TRUE, @@ -3657,7 +3657,7 @@ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); scsi_start_stop(&ccb->csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* tag_action */ MSG_SIMPLE_Q_TAG, /* start */ FALSE, @@ -3693,7 +3693,7 @@ wrspeed *= 177; cam_fill_csio(csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* flags */ CAM_DIR_NONE, /* tag_action */ MSG_SIMPLE_Q_TAG, @@ -3768,7 +3768,7 @@ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); scsi_report_key(&ccb->csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* tag_action */ MSG_SIMPLE_Q_TAG, /* lba */ lba, @@ -3946,7 +3946,7 @@ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); scsi_send_key(&ccb->csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* tag_action */ MSG_SIMPLE_Q_TAG, /* agid */ authinfo->agid, @@ -4050,7 +4050,7 @@ ccb = cdgetccb(periph, CAM_PRIORITY_NORMAL); scsi_read_dvd_structure(&ccb->csio, - /* retries */ 1, + /* retries */ cd_retry_count, /* cbfcnp */ cddone, /* tag_action */ MSG_SIMPLE_Q_TAG, /* lba */ address, From owner-p4-projects@FreeBSD.ORG Sun Jan 24 12:24:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B29110656B3; Sun, 24 Jan 2010 12:24:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D382310656B1 for ; Sun, 24 Jan 2010 12:24:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C030C8FC1B for ; Sun, 24 Jan 2010 12:24:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OCOHok038809 for ; Sun, 24 Jan 2010 12:24:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0OCOHBR038807 for perforce@freebsd.org; Sun, 24 Jan 2010 12:24:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Jan 2010 12:24:17 GMT Message-Id: <201001241224.o0OCOHBR038807@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 Precedence: bulk Cc: Subject: PERFORCE change 173616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 12:24:18 -0000 http://p4web.freebsd.org/chv.cgi?CH=173616 Change 173616 by rwatson@rwatson_vimage_client on 2010/01/24 12:23:33 Trim slightly verbose printf in capability code. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#29 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#29 (text+ko) ==== @@ -50,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#28 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#29 $"); #include #include @@ -153,11 +153,8 @@ cap_check(struct capability *c, cap_rights_t rights) { - if ((c->cap_rights | rights) != c->cap_rights) { - printf("ENOTCAPABLE: %016x < %016x\n", - (unsigned int) c->cap_rights, (unsigned int) rights); + if ((c->cap_rights | rights) != c->cap_rights) return (ENOTCAPABLE); - } return (0); } From owner-p4-projects@FreeBSD.ORG Sun Jan 24 12:26:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58FDF1065676; Sun, 24 Jan 2010 12:26:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C08B106566B for ; Sun, 24 Jan 2010 12:26:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 080A28FC1C for ; Sun, 24 Jan 2010 12:26:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OCQJZA038993 for ; Sun, 24 Jan 2010 12:26:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0OCQJ4f038991 for perforce@freebsd.org; Sun, 24 Jan 2010 12:26:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Jan 2010 12:26:19 GMT Message-Id: <201001241226.o0OCQJ4f038991@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 Precedence: bulk Cc: Subject: PERFORCE change 173617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 12:26:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=173617 Change 173617 by rwatson@rwatson_vimage_client on 2010/01/24 12:25:37 Comment on an incorrect comment. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#30 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#30 (text+ko) ==== @@ -50,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#29 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#30 $"); #include #include @@ -118,6 +118,9 @@ * objects, which raises the question as to why the flag exists at * all. * + * XXXRW: Actually, this is not true: kqueue's aren't passable, so we + * do need to do this. + * * No need to set DFLAG_SEEKABLE as any seek operations will fall * through to the underlying object once the capability is verified. */ From owner-p4-projects@FreeBSD.ORG Sun Jan 24 16:30:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 509851065679; Sun, 24 Jan 2010 16:30:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13D2F1065672 for ; Sun, 24 Jan 2010 16:30:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F38888FC1C for ; Sun, 24 Jan 2010 16:30:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OGURCn071811 for ; Sun, 24 Jan 2010 16:30:27 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0OGUQPE071809 for perforce@freebsd.org; Sun, 24 Jan 2010 16:30:26 GMT (envelope-from mav@freebsd.org) Date: Sun, 24 Jan 2010 16:30:26 GMT Message-Id: <201001241630.o0OGUQPE071809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 16:30:28 -0000 http://p4web.freebsd.org/chv.cgi?CH=173640 Change 173640 by mav@mav_mavbook on 2010/01/24 16:29:40 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/Makefile.inc1#14 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#24 integrate .. //depot/projects/scottl-camlock/src/bin/date/date.1#3 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#6 integrate .. //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#5 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#8 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/devfs#2 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libsupc++/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_entry_from_file.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_iso9660.c#7 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_set_format_zip.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#11 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/opendir.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pututxline.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sem.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/ttyname.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/uname.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/utxdb.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/gl_ES.ISO8859-1.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/wait.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libfetch/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/pam_lastlog.8#2 integrate .. //depot/projects/scottl-camlock/src/lib/libtacplus/taclib.c#4 integrate .. //depot/projects/scottl-camlock/src/libexec/comsat/comsat.8#2 integrate .. //depot/projects/scottl-camlock/src/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/scottl-camlock/src/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/pc98/fixit-small_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#5 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/qemu/crunch.conf#2 integrate .. //depot/projects/scottl-camlock/src/rescue/rescue/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#12 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#35 integrate .. //depot/projects/scottl-camlock/src/sbin/init/init.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mdconfig/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mdconfig/mdconfig.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.8#5 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.8#2 integrate .. //depot/projects/scottl-camlock/src/share/doc/usd/05.dc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/share/doc/usd/06.bc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/share/doc/usd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/pthread_join.3#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man3/sysexits.3#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/hier.7#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#15 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/kthread.9#4 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.lib.mk#5 integrate .. //depot/projects/scottl-camlock/src/share/mk/sys.mk#3 integrate .. //depot/projects/scottl-camlock/src/share/security/lomac-policy.contexts#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#31 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_reg.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SIMICS#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#9 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#48 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adfile.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adwalk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmextern.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmrestag.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtable.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/getopt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#9 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asldefine.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslerror.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfiles.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslfold.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslglobal.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllength.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllisting.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asllookup.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmain.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asloperands.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslopt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslresource.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslstubs.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltransform.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/asltypes.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslutils.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbcmds.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbinput.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbstats.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmbuffer.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmnames.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmresrcl.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmresrcs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswload.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswscope.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evevent.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evregion.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evrgnini.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evsci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxfregn.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exconvrt.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/excreate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exdump.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfield.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exfldio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exmutex.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exnames.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg1.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg3.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exoparg6.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exprep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exregion.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exresnte.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exresolv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exresop.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstore.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstoren.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exstorob.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwacpi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwgpe.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwregs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwsleep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwtimer.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/hardware/hwxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acapps.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/accommon.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acconfig.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdebug.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdisasm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdispat.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acevents.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acglobal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/achware.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acinterp.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/aclocal.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acmacros.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnames.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnamesp.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acobject.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acopcode.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acoutput.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acparser.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpi.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpiosxf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpredef.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acresrc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acrestyp.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acstruct.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actables.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl1.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acutils.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/amlcode.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/amlresrc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/platform/acenv.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/platform/acgcc.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsaccess.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsalloc.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsdump.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nseval.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsinit.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsload.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsnames.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsobject.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nspredef.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nswalk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfname.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/osunixxf.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psargs.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psloop.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psopcode.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psparse.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psscope.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/pstree.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/pswalk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psxface.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsaddr.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rscalc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rscreate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsdump.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsirq.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rslist.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsmemory.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsmisc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbfadt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbfind.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbinstal.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tables/tbxfroot.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utalloc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utcache.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utdebug.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utdelete.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/uteval.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utids.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utinit.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utlock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmath.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmisc.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utmutex.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utobject.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utresrc.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utstate.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utxface.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_panasonic.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_wmi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdHardware.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/Osd/OsdSchedule.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_if.m#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_package.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_powerres.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_smbat.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata_if.m#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_sge.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/pcii.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/tnt4882.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/upd7210.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#30 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/pmap.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_mutex.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/adm5120_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/alchemy_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_spi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/files.ar71xx#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/pcf2123_rtc.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/atheros/pcf2123reg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/cavium/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeonreg.h#2 delete .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_bus_octeonusart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/AR71XX.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1.hints#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/QEMU#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/idt_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpu.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/elf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/md_var.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/trap.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/malta_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/db_trace.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_trampoline.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_auth.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_header.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_uio.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsmount.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsnode.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#24 integrate .. //depot/projects/scottl-camlock/src/sys/pci/nfsmb.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#26 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/cdefs.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kthread.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#40 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#31 integrate .. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/scottl-camlock/src/tools/build/mk/OptionalObsoleteFiles.inc#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/at/at.man#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/USD.doc/bc#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/bc.1#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/bc.library#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/bc.y#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/extern.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/pathnames.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/bc/scan.l#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/USD.doc/dc#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/bcode.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/bcode.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/dc.1#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/dc.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/extern.h#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/inout.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/mem.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/dc/stack.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getent/getent.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/last/last.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/last/last.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/talk.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdef.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdef.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdefall.sh#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/users.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/who.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ac/ac.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidb/acpidb.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_smail/ctm_smail.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/extattr/rmextattr.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/lib/lib.h#6 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/rwhod.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_main.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $ +# $FreeBSD: src/Makefile,v 1.363 2010/01/19 15:34:16 ed Exp $ # # The user-driven targets are: # ==== //depot/projects/scottl-camlock/src/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.637 2010/01/14 23:27:23 jilles Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.639 2010/01/23 19:29:42 antoine Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1114,7 +1114,7 @@ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libulog \ + lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} lib/libdwarf lib/libproc @@ -1136,14 +1136,16 @@ _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if ${MK_OPENSSH} != "no" -_secure_lib_libssh= secure/lib/libssh -secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L +.endif +.if ${MK_OPENSSH} != "no" +_secure_lib_libssh= secure/lib/libssh +secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L .endif .endif @@ -1151,6 +1153,10 @@ _secure_lib= secure/lib .endif +.if ${MK_GSSAPI} != "no" +_lib_libgssapi= lib/libgssapi +.endif + .if ${MK_IPX} != "no" _lib_libipx= lib/libipx .endif @@ -1163,7 +1169,6 @@ _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm _kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 -_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.222 2010/01/14 05:35:32 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.224 2010/01/22 23:19:48 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,16 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd +OLD_FILES+=usr/share/doc/papers/bc.ascii.gz +OLD_FILES+=usr/share/doc/papers/dc.ascii.gz +# 20100120: replacing GNU bc/dc with BSDL versions +OLD_FILES+=usr/share/examples/bc/ckbook.b +OLD_FILES+=usr/share/examples/bc/pi.b +OLD_FILES+=usr/share/examples/bc/primes.b +OLD_FILES+=usr/share/examples/bc/twins.b +OLD_FILES+=usr/share/info/dc.info.gz +OLD_DIRS+=usr/share/examples/bc # 20100114: removal of ttyslot(3) OLD_FILES+=usr/share/man/man3/ttyslot.3.gz # 20100113: remove utmp.h, replace it by utmpx.h ==== //depot/projects/scottl-camlock/src/bin/date/date.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.75 2007/06/02 20:15:59 remko Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.76 2010/01/21 17:25:12 ed Exp $ .\" .Dd June 2, 2007 .Dt DATE 1 @@ -299,7 +299,7 @@ .El .Sh FILES .Bl -tag -width /var/log/messages -compact -.It Pa /var/log/wtmp +.It Pa /var/log/utx.log record of date resets and time changes .It Pa /var/log/messages record of the user setting the time @@ -406,9 +406,9 @@ .Sh SEE ALSO .Xr locale 1 , .Xr gettimeofday 2 , +.Xr getutxent 3 , .Xr strftime 3 , .Xr strptime 3 , -.Xr utmp 5 , .Xr timed 8 .Rs .%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD" ==== //depot/projects/scottl-camlock/src/contrib/netcat/nc.1#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $ +.\" $OpenBSD: nc.1,v 1.50 2009/06/05 06:47:12 jmc Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -25,9 +25,9 @@ .\" (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/contrib/netcat/nc.1,v 1.14 2009/07/11 17:35:55 cperciva Exp $ +.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.15 2010/01/19 18:45:29 delphij Exp $ .\" -.Dd May 6 2008 +.Dd June 5 2009 .Dt NC 1 .Os .Sh NAME @@ -46,6 +46,7 @@ .Op Fl p Ar source_port .Op Fl s Ar source_ip_address .Op Fl T Ar ToS +.Op Fl V Ar fib .Op Fl w Ar timeout .Op Fl X Ar proxy_protocol .Oo Xo @@ -208,6 +209,9 @@ Specifies to use Unix Domain Sockets. .It Fl u Use UDP instead of the default option of TCP. +.It Fl V Ar fib +Set the routing table (FIB). +The default is 0. .It Fl v Have .Nm @@ -449,6 +453,7 @@ .Ex -std .Sh SEE ALSO .Xr cat 1 , +.Xr setfib 1 , .Xr ssh 1 , .Xr tcp 4 .Sh AUTHORS ==== //depot/projects/scottl-camlock/src/contrib/netcat/netcat.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */ +/* $OpenBSD: netcat.c,v 1.93 2009/06/05 00:18:10 claudio Exp $ */ /* * Copyright (c) 2001 Eric Jackson * @@ -25,7 +25,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/contrib/netcat/netcat.c,v 1.10 2009/05/28 23:23:49 delphij Exp $ + * $FreeBSD: src/contrib/netcat/netcat.c,v 1.11 2010/01/19 18:45:29 delphij Exp $ */ /* @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -94,6 +95,7 @@ int Oflag; /* TCP send buffer size */ int Sflag; /* TCP MD5 signature option */ int Tflag = -1; /* IP Type of Service */ +u_int rdomain; int timeout = -1; int family = AF_UNSPEC; @@ -124,6 +126,8 @@ main(int argc, char *argv[]) { int ch, s, ret, socksv, ipsec_count; + int numfibs; + size_t intsize = sizeof(int); char *host, *uport; struct addrinfo hints; struct servent *sv; @@ -137,6 +141,7 @@ { NULL, 0, NULL, 0 } }; + rdomain = 0; ret = 1; ipsec_count = 0; s = 0; @@ -146,7 +151,7 @@ sv = NULL; while ((ch = getopt_long(argc, argv, - "46e:DEdhi:jklnoI:O:P:p:rSs:tT:Uuvw:X:x:z", + "46DdEe:hI:i:jklnO:oP:p:rSs:tT:UuV:vw:X:x:z", longopts, NULL)) != -1) { switch (ch) { case '4': @@ -229,6 +234,14 @@ case 'u': uflag = 1; break; + case 'V': + if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1) + errx(1, "Multiple FIBS not supported"); + rdomain = (unsigned int)strtonum(optarg, 0, + numfibs - 1, &errstr); + if (errstr) + errx(1, "FIB %s: %s", errstr, optarg); + break; case 'v': vflag = 1; break; @@ -550,6 +563,11 @@ add_ipsec_policy(s, ipsec_policy[1]); #endif + if (rdomain) { + if (setfib(rdomain) == -1) + err(1, "setfib"); + } + /* Bind to a local port or source address if specified. */ if (sflag || pflag) { struct addrinfo ahints, *ares; @@ -620,6 +638,11 @@ res0->ai_protocol)) < 0) continue; + if (rdomain) { + if (setfib(rdomain) == -1) + err(1, "setfib"); + } + ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x)); if (ret == -1) err(1, NULL); @@ -930,6 +953,7 @@ \t-t Answer TELNET negotiation\n\ \t-U Use UNIX domain socket\n\ \t-u UDP mode\n\ + \t-V fib Specify alternate routing table (FIB)\n\ \t-v Verbose\n\ \t-w secs\t Timeout for connects and final net reads\n\ \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ @@ -974,8 +998,8 @@ "usage: nc [-46DdhklnorStUuvz] [-I length] [-i interval] [-O length]\n" #endif "\t [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n" - "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n" - "\t [port]\n"); + "\t [-V fib] [-w timeout] [-X proxy_protocol]\n" + "\t [-x proxy_address[:port]] [hostname] [port]\n"); if (ret) exit(1); } ==== //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.341 2009/12/29 20:20:51 trasz Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.342 2010/01/22 23:19:48 delphij Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -160,6 +160,10 @@ usd 04.csh .. + 05.dc + .. + 06.bc + .. 07.mail .. 10.exref ==== //depot/projects/scottl-camlock/src/etc/rc.d/devfs#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.12 2006/01/21 14:31:45 matteo Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.13 2010/01/23 11:42:31 kib Exp $ # # PROVIDE: devfs @@ -44,7 +44,7 @@ while read action devicelist parameter; do case "${action}" in l*) for device in ${devicelist}; do - if [ -c ${device} -a ! -e ${parameter} ]; then + if [ ! -e ${parameter} ]; then ln -fs ${device} ${parameter} fi done ==== //depot/projects/scottl-camlock/src/gnu/lib/libstdc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.63 2008/12/31 07:39:23 imp Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.64 2010/01/22 14:09:15 sepotvin Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -21,6 +21,7 @@ CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ -Wno-deprecated +PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} DPADD= ${LIBM} LDADD= -lm ==== //depot/projects/scottl-camlock/src/gnu/lib/libsupc++/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.9 2007/05/19 04:25:56 kan Exp $ +# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.10 2010/01/22 14:09:15 sepotvin Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -23,6 +23,7 @@ CFLAGS+= -I${.CURDIR}/../libstdc++ -I. CFLAGS+= -frandom-seed=RepeatabilityConsideredGood CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections +PO_CXXFLAGS= ${CXXFLAGS:N-ffunction-sections} HDRS= exception new typeinfo cxxabi.h exception_defines.h INCS= ${HDRS:S;^;${SRCDIR}/;} ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,13 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.99 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.100 2010/01/20 21:30:52 gabor Exp $ .include -SUBDIR= bc \ - ${_binutils} \ +SUBDIR= ${_binutils} \ ${_cc} \ ${_cpio} \ ${_cvs} \ - dc \ dialog \ diff \ diff3 \ ==== //depot/projects/scottl-camlock/src/lib/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.240 2009/12/11 14:15:55 ed Exp $ +# $FreeBSD: src/lib/Makefile,v 1.241 2010/01/21 16:56:27 ed Exp $ .include @@ -21,7 +21,6 @@ # librpcsvc must be built before libpam. # libsbuf must be built before libcam. # libtacplus must be built before libpam. -# libulog must be built before libpam. # libutil must be built before libpam. # libypclnt must be built before libpam. # libgssapi must be built before librpcsec_gss @@ -31,7 +30,7 @@ SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \ libmd \ ncurses ${_libnetgraph} libradius librpcsvc libsbuf \ - libtacplus libulog libutil ${_libypclnt} libalias libarchive \ + libtacplus libutil ${_libypclnt} libalias libarchive \ ${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ @@ -39,9 +38,9 @@ ${_libipx} libjail libkiconv libmagic libmemstat ${_libmilter} \ ${_libmp} ${_libncp} ${_libngatm} libopie libpam libpcap \ ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ - ${_libsmdb} \ - ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \ - libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \ + ${_libsmdb} ${_libsmutil} libstand \ + ${_libtelnet} ${_libthr} libthread_db libufs libugidfw libulog \ + ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \ ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) ==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_entry_link_resolver.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.5 2009/12/28 03:05:31 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_entry_link_resolver.c,v 1.6 2010/01/23 07:57:17 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -181,8 +181,10 @@ /* If it has only one link, then we're done. */ if (archive_entry_nlink(*e) == 1) return; - /* Directories never have hardlinks. */ - if (archive_entry_filetype(*e) == AE_IFDIR) + /* Directories, devices never have hardlinks. */ + if (archive_entry_filetype(*e) == AE_IFDIR + || archive_entry_filetype(*e) == AE_IFBLK + || archive_entry_filetype(*e) == AE_IFCHR) return; switch (res->strategy) { ==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_read.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.54 2009/12/29 05:30:23 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.55 2010/01/23 07:52:13 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -57,6 +57,7 @@ static int build_stream(struct archive_read *); static int choose_format(struct archive_read *); +static int cleanup_filters(struct archive_read *); static struct archive_vtable *archive_read_vtable(void); static int _archive_read_close(struct archive *); static int _archive_read_finish(struct archive *); @@ -393,14 +394,13 @@ free(filter); return (r); } + a->filter = filter; /* Verify the filter by asking it for some data. */ __archive_read_filter_ahead(filter, 1, &avail); if (avail < 0) { - /* If the read failed, bail out now. */ - free(filter); - return (avail); + cleanup_filters(a); + return (ARCHIVE_FATAL); } - a->filter = filter; } } @@ -738,18 +738,10 @@ /* TODO: Clean up the formatters. */ - /* Clean up the filter pipeline. */ - while (a->filter != NULL) { - struct archive_read_filter *t = a->filter->upstream; - if (a->filter->close != NULL) { - r1 = (a->filter->close)(a->filter); - if (r1 < r) - r = r1; - } - free(a->filter->buffer); - free(a->filter); - a->filter = t; - } + /* Release the filter objects. */ + r1 = cleanup_filters(a); + if (r1 < r) + r = r1; /* Release the bidder objects. */ n = sizeof(a->bidders)/sizeof(a->bidders[0]); @@ -764,6 +756,25 @@ return (r); } +static int +cleanup_filters(struct archive_read *a) +{ + int r = ARCHIVE_OK; + /* Clean up the filter pipeline. */ + while (a->filter != NULL) { + struct archive_read_filter *t = a->filter->upstream; + if (a->filter->close != NULL) { + int r1 = (a->filter->close)(a->filter); + if (r1 < r) + r = r1; + } + free(a->filter->buffer); + free(a->filter); + a->filter = t; + } + return r; +} + /* * Release memory and other resources. */ ==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_disk_entry_from_file.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_disk_entry_from_file.c,v 1.4 2009/12/28 02:14:09 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_disk_entry_from_file.c,v 1.5 2010/01/23 07:54:15 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H /* Mac OSX requires sys/types.h before sys/acl.h. */ @@ -121,18 +121,27 @@ */ #if HAVE_FSTAT if (fd >= 0) { - if (fstat(fd, &s) != 0) - return (ARCHIVE_FATAL); + if (fstat(fd, &s) != 0) { + archive_set_error(&a->archive, errno, + "Can't fstat"); + return (ARCHIVE_FAILED); + } } else #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 24 20:46:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CDCF1065693; Sun, 24 Jan 2010 20:46:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C491B106568F for ; Sun, 24 Jan 2010 20:46:36 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B0F5B8FC1A for ; Sun, 24 Jan 2010 20:46:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OKkauZ005476 for ; Sun, 24 Jan 2010 20:46:36 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0OKkaLb005474 for perforce@freebsd.org; Sun, 24 Jan 2010 20:46:36 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 24 Jan 2010 20:46:36 GMT Message-Id: <201001242046.o0OKkaLb005474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 20:46:37 -0000 http://p4web.freebsd.org/chv.cgi?CH=173652 Change 173652 by rene@rene_self on 2010/01/24 20:45:53 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#46 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#69 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/flyer/flyer.tex#2 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/share/pgpkeys/des.key#4 integrate .. //depot/projects/docproj_nl/share/pgpkeys/tabthorpe.key#3 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#14 integrate .. //depot/projects/docproj_nl/www/en/events/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/platforms/i386.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/projects/mips/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/where.sgml#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#24 integrate .. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#9 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#46 (text+ko) ==== @@ -1,4 +1,4 @@ - + + 800500 + January 7, 2010 + 8.0-STABLE after __FreeBSD_version + bump to make pkg_add -r + use packages-8-stable. + + + 800501 + January 24, 2010 + 8.0-STABLE after change of the + scandir(3) and + alphasort(3) prototypes to + conform to SUSv4. + + 900000 August 22, 2009 9.0-CURRENT. @@ -13501,6 +13516,12 @@ getutxent(3)) for improved logging of user logins and system events. + + 900008 + January 20, 2010 + 9.0-CURRENT after the import of BSDL bc/dc and + the deprecation of GNU bc/dc. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/flyer/flyer.tex#2 (text+ko) ==== @@ -1,4 +1,4 @@ -% Copyright (c) 2004-2008 Marc Fonvieille +% Copyright (c) 2004-2010 Marc Fonvieille % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -22,7 +22,7 @@ % OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF % SUCH DAMAGE. % -% $FreeBSD: doc/en_US.ISO8859-1/flyer/flyer.tex,v 1.16 2008/01/04 13:41:07 gabor Exp $ +% $FreeBSD: doc/en_US.ISO8859-1/flyer/flyer.tex,v 1.17 2010/01/19 17:52:35 antoine Exp $ % % FreeBSD Flyer % Use make FORMAT (with FORMAT: pdf, ps or dvi) to build the flyer. @@ -140,7 +140,7 @@ \vspace{5mm} \titledframe{Run a huge number of applications!}{ -FreeBSD comes with over 17000 third party software packages +FreeBSD comes with over 21000 third party software packages ready to be installed including: Apache, Samba, MySQL\reg, OpenOffice.org, KDE, GNOME, MPlayer, etc. \medskip @@ -199,7 +199,7 @@ % % Copyrights \begin{center} -\tiny \copyright 2004-2008 The FreeBSD Project\\ +\tiny \copyright 2004-2010 The FreeBSD Project\\ \ifthenelse{\equal{\logo}{true}}{ FreeBSD and the FreeBSD Logo are registered trademarks of the FreeBSD Foundation.\\} ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#14 (text+ko) ==== @@ -1,5 +1,5 @@ + -uid Dag-Erling Smørgrav +uid Dag-Erling Smørgrav +uid Dag-Erling Smørgrav uid [jpeg image of size 3315] ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/tabthorpe.key#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -13,7 +13,10 @@ uid Thomas Abthorpe uid Thomas Abthorpe uid Thomas Abthorpe +uid Thomas Abthorpe (FreeBSD Ports Committer) sub 2048g/16752D82 2005-07-06 +sub 1024g/8CF958AB 2009-11-05 +sub 1024R/985365A2 2009-11-05 ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 24 20:58:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16DBE10656A4; Sun, 24 Jan 2010 20:58:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF9AF1065694 for ; Sun, 24 Jan 2010 20:58:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BC6788FC15 for ; Sun, 24 Jan 2010 20:58:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OKwmEi016743 for ; Sun, 24 Jan 2010 20:58:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0OKwmHH016741 for perforce@freebsd.org; Sun, 24 Jan 2010 20:58:48 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 24 Jan 2010 20:58:48 GMT Message-Id: <201001242058.o0OKwmHH016741@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 20:58:49 -0000 http://p4web.freebsd.org/chv.cgi?CH=173653 Change 173653 by rene@rene_self on 2010/01/24 20:58:13 MFen: * flyer 1.16 -> 1.17 * www/where 1.102 -> 1.103 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#4 edit .. //depot/projects/docproj_nl/www/nl/where.sgml#15 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#4 (text+ko) ==== @@ -1,6 +1,6 @@ % Vertaald door: Siebrand Mazeland % -% Copyright (c) 2004-2008 Marc Fonvieille +% Copyright (c) 2004-2010 Marc Fonvieille % Alle rechten voorbehouden. % % Herdistributie en gebruik in vorm van broncode of binaire vorm, @@ -28,7 +28,7 @@ % % $FreeBSD: doc/nl_NL.ISO8859-1/flyer/flyer.tex,v 1.5 2008/11/07 16:28:18 rene Exp $ % %SOURCE% en_US.ISO8859-1/flyer/flyer.tex -% %SRCID% 1.16 +% %SRCID% 1.17 % % FreeBSD Flyer % Gebruik make FORMAT (waar FORMAT: pdf, ps of dvi) om de flyer te bouwen. @@ -147,7 +147,7 @@ \vspace{5mm} \titledframe{Draai een enorm aantal applicaties!}{ -In FreeBSD zitten meer dan 17.000 softwarepakketten die zo +In FreeBSD zitten meer dan 21.000 softwarepakketten die zo ge\"{i}nstalleerd kunnen worden, waaronder: Apache, Samba, MySQL\reg, OpenOffice.org, KDE, GNOME, MPlayer, enzovoort. \medskip @@ -208,7 +208,7 @@ % % Copyrights \begin{center} -\tiny \copyright 2004-2008 The FreeBSD Project\\ +\tiny \copyright 2004-2010 The FreeBSD Project\\ \ifthenelse{\equal{\logo}{true}}{ FreeBSD en het FreeBSD Logo zijn geregistreerde handelsmerken van de FreeBSD Foundation.\\} ==== //depot/projects/docproj_nl/www/nl/where.sgml#15 (text+ko) ==== @@ -6,7 +6,7 @@ ]> &header; @@ -103,64 +103,46 @@ &os; &rel2.current;-RELEASE - [Bekijk] - [Bekijk] - [Bekijk] + [Bekijk] + [Bekijk] + [Bekijk] [Bekijk] - alpha - [Distributie] - [ISO] - [Bekijk] - [Bekijk] - [Bekijk] - - - amd64 [Distributie] [ISO] - [Bekijk] - [Bekijk] - [Bekijk] i386 - [Distributie] + [Distributie] [ISO] - [Bekijk] - [Bekijk] - [Bekijk] ia64 - [Distributie] + [Distributie] [ISO] - [Bekijk] - [Bekijk] - [Bekijk] pc98 - [Distributie] + [Distributie] [ISO] - [Bekijk] - [Bekijk] - [Bekijk] + + + + powerpc + [Distributie] + [ISO] sparc64 - [Distributie] + [Distributie] [ISO] - [Bekijk] - [Bekijk] - [Bekijk] @@ -265,7 +247,7 @@ &os; &betarel2.current;-&betarel2.vers; - [Bekijk] + [Bekijk] From owner-p4-projects@FreeBSD.ORG Sun Jan 24 23:04:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6616D1065679; Sun, 24 Jan 2010 23:04:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AAF1106566B for ; Sun, 24 Jan 2010 23:04:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16CC78FC12 for ; Sun, 24 Jan 2010 23:04:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ON4stl028786 for ; Sun, 24 Jan 2010 23:04:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ON4sNb028784 for perforce@freebsd.org; Sun, 24 Jan 2010 23:04:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 24 Jan 2010 23:04:54 GMT Message-Id: <201001242304.o0ON4sNb028784@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 Precedence: bulk Cc: Subject: PERFORCE change 173657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 23:04:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=173657 Change 173657 by rwatson@rwatson_vimage_client on 2010/01/24 23:04:52 Clarify interaction of CAP_EVENT and CAP_KEVENT in the cap_new(2) man page. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#11 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 2008-2009 Robert N. M. Watson +.\" Copyright (c) 2008-2010 Robert N. M. Watson .\" All rights reserved. .\" .\" WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -224,7 +224,7 @@ Permit .Xr kevent 2 ; .Dv CAP_EVENT -may also be required on file descriptors to be monitored using +is also required on file descriptors that will be monitored using .Xr kevent 2 . .It Dv CAP_LISTEN Permit From owner-p4-projects@FreeBSD.ORG Mon Jan 25 14:54:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72EF01065670; Mon, 25 Jan 2010 14:54:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2ECD8106566B for ; Mon, 25 Jan 2010 14:54:47 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C29F8FC16 for ; Mon, 25 Jan 2010 14:54:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PEslAt064257 for ; Mon, 25 Jan 2010 14:54:47 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PEslp0064255 for perforce@freebsd.org; Mon, 25 Jan 2010 14:54:47 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 25 Jan 2010 14:54:47 GMT Message-Id: <201001251454.o0PEslp0064255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 14:54:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=173669 Change 173669 by pgj@Binturong on 2010/01/25 14:54:15 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/pgpkeys/des.key#4 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/tabthorpe.key#3 integrate .. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#14 integrate .. //depot/projects/docproj_hu/www/hu/platforms/i386.sgml#7 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#26 integrate .. //depot/projects/docproj_hu/www/hu/where.sgml#21 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/pgpkeys/des.key#4 (text+ko) ==== @@ -1,12 +1,12 @@ - + -uid Dag-Erling Smørgrav +uid Dag-Erling Smørgrav +uid Dag-Erling Smørgrav uid [jpeg image of size 3315] ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/tabthorpe.key#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -13,7 +13,10 @@ uid Thomas Abthorpe uid Thomas Abthorpe uid Thomas Abthorpe +uid Thomas Abthorpe (FreeBSD Ports Committer) sub 2048g/16752D82 2005-07-06 +sub 1024g/8CF958AB 2009-11-05 +sub 1024R/985365A2 2009-11-05 ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 25 16:10:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7D34106575B; Mon, 25 Jan 2010 16:10:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 647F41065672 for ; Mon, 25 Jan 2010 16:10:02 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5276D8FC08 for ; Mon, 25 Jan 2010 16:10:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PGA2QG072206 for ; Mon, 25 Jan 2010 16:10:02 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PGA2VN072204 for perforce@freebsd.org; Mon, 25 Jan 2010 16:10:02 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 25 Jan 2010 16:10:02 GMT Message-Id: <201001251610.o0PGA2VN072204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 16:10:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=173670 Change 173670 by jona@jona-belle-freebsd8 on 2010/01/25 16:09:42 Fixed dupfdopen() error in kern_openat() - we must finstall() the file to give it a valid descriptor before dupfdopen() is called Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#26 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#26 (text+ko) ==== @@ -74,6 +74,9 @@ #ifdef KTRACE #include #endif +#ifdef KDB +#include +#endif #include @@ -1097,7 +1100,7 @@ struct mount *mp; int cmode; struct file *nfp; - int type, indx, error; + int type, indx = -1, error; struct flock lf; struct nameidata nd; int vfslocked; @@ -1159,10 +1162,17 @@ * it ever should. */ if (!nd.ni_basedir && (error == ENODEV || error == ENXIO) && - td->td_dupfd >= 0 && /* XXX from fdopen */ - (error = - dupfdopen(td, fdp, indx, td->td_dupfd, flags, error)) == 0) - goto success; + td->td_dupfd >= 0) { + /* XXX from fdopen */ + int olderror = error; + + if ((error = finstall(td, fp, &indx)) != 0) + goto bad_unlocked; + + if ((error = dupfdopen(td, fdp, indx, td->td_dupfd, + flags, olderror)) == 0) + goto success; + } /* * Clean up the descriptor, but only if another thread hadn't @@ -1238,8 +1248,10 @@ } else #endif - if ((error = finstall(td, fp, &indx)) != 0) - goto bad_unlocked; + /* if we haven't already installed the FD (for dupfdopen), do so now */ + if (indx == -1) + if((error = finstall(td, fp, &indx)) != 0) + goto bad_unlocked; /* * Release our private reference, leaving the one associated with From owner-p4-projects@FreeBSD.ORG Mon Jan 25 16:15:08 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 590141065672; Mon, 25 Jan 2010 16:15:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D2621065694 for ; Mon, 25 Jan 2010 16:15:08 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E50888FC20 for ; Mon, 25 Jan 2010 16:15:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PGF70e072669 for ; Mon, 25 Jan 2010 16:15:07 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PGF7tU072667 for perforce@freebsd.org; Mon, 25 Jan 2010 16:15:07 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 25 Jan 2010 16:15:07 GMT Message-Id: <201001251615.o0PGF7tU072667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 16:15:08 -0000 http://p4web.freebsd.org/chv.cgi?CH=173673 Change 173673 by jona@jona-belle-freebsd8 on 2010/01/25 16:14:56 But we don't need these KDB bits, which were used for debugging only... Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#27 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#27 (text+ko) ==== @@ -74,9 +74,6 @@ #ifdef KTRACE #include #endif -#ifdef KDB -#include -#endif #include From owner-p4-projects@FreeBSD.ORG Mon Jan 25 16:30:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E62C1065693; Mon, 25 Jan 2010 16:30:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 162341065697 for ; Mon, 25 Jan 2010 16:30:35 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 021588FC08 for ; Mon, 25 Jan 2010 16:30:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PGUYvg073833 for ; Mon, 25 Jan 2010 16:30:34 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PGUNT8073819 for perforce@freebsd.org; Mon, 25 Jan 2010 16:30:23 GMT (envelope-from truncs@FreeBSD.org) Date: Mon, 25 Jan 2010 16:30:23 GMT Message-Id: <201001251630.o0PGUNT8073819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173675 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 16:30:35 -0000 http://p4web.freebsd.org/chv.cgi?CH=173675 Change 173675 by truncs@aditya on 2010/01/25 16:29:44 IFC. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_switch.S#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/io.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/mem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/DEFAULTS#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/XENHVM#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/ia32/ia32_reg.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/iodev.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/param.h#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/cpufunc.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/KB920X#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/econa.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/files.econa#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/std.econa#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/timer.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/mv/mv_sata.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/boot.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/commands.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/md.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/module.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/efi/libefi/efifs.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/efi/libefi/efipart.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/gptboot/gptboot.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/spinconsole.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/zfsboot/zfsldr.S#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/zfsloader/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/ia64/efi/conf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/ia64/efi/main.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/ia64/efi/version#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/bios.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/boot.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/boot.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/disk.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/inode.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/io.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/serial_16550.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/sys.c#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_all.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_all.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_periph.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_queue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_queue.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/policy.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/vnode.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_futex.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_videodev.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_videodev_compat.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/x86bios/x86bios_alloc.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/Makefile.mips#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/NOTES#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.amd64#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.arm#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.i386#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.ia64#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.mips#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.pc98#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/kern.mk#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/ldscript.mips#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/ldscript.mips.mips64#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/ldscript.mips.octeon1.32#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/ldscript.mips.octeon1.64#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/ldscript.mips.octeon1.n32#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/makeLINT.mk#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.arm#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.i386#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.mips#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.pc98#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options.sparc64#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/changes.txt#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmrestag.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslfold.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asllength.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asltree.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbexec.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/debugger/dbxface.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmbuffer.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmnames.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmresrcl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmresrcs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dswscope.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evevent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evgpe.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evgpeblk.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evmisc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evrgnini.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evsci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evxface.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evxfevnt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/events/evxfregn.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exconfig.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/excreate.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exdump.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exfield.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exfldio.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exmisc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exmutex.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exnames.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exoparg2.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exoparg3.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exprep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exregion.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exresnte.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exresolv.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exresop.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exstore.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exstoren.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exstorob.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/executer/exutils.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwacpi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwgpe.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwregs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwsleep.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwtimer.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/hardware/hwxface.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/accommon.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acconfig.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acdispat.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acevents.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/achware.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acinterp.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acmacros.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acnames.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acnamesp.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acobject.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acopcode.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acoutput.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acparser.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acpi.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acpiosxf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acpixf.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acpredef.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acresrc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acrestyp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acstruct.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actables.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actbl.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actbl1.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/acutils.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/amlcode.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/amlresrc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/platform/acenv.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/include/platform/acgcc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsaccess.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsalloc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nseval.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsinit.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsload.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsnames.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsobject.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nspredef.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsxfname.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psargs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psloop.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psopcode.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psparse.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psscope.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/pstree.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/pswalk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/parser/psxface.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsaddr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rscalc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rscreate.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsdump.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsinfo.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsirq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rslist.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsmemory.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsmisc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsutils.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/resources/rsxface.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tables/tbfadt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tables/tbfind.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tables/tbinstal.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tables/tbxface.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tables/tbxfroot.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utalloc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utcache.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utcopy.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utdebug.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utdelete.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/uteval.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utids.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utinit.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utlock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utmath.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utmisc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utmutex.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utresrc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utstate.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/acpica/utilities/utxface.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwn/iwlwifi-1000-128.50.3.1.fw.uu#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwn/iwlwifi-5000-8.24.2.12.fw.uu#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwn/iwlwifi-6000-9.176.4.1.fw.uu#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/uath/ar5523.bin.uu#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/x86emu/x86emu_util.c#3 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ddb/db_ps.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_aiboost.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_wmi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_package.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_video.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/agp/agp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amd/amd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amdsbwd/amdsbwd.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-sata.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-usb.c#4 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-acard.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-amd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-ati.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-cenatek.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-cypress.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-cyrix.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-highpoint.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-intel.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-ite.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-micron.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-national.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-netcell.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/atkbdc/atkbd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cfe/cfe_api.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cfe/cfe_env.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_aq100x.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_osdep.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/de/if_de.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/de/if_devar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dpms/dpms.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/r600_blit.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/LICENSE#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_82541.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_82571.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_82575.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_82575.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_api.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_defines.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_hw.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_mac.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_phy.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_phy.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/e1000_regs.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_em.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_em.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_igb.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/et/if_et.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/et/if_etreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/et/if_etvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fatm/if_fatmvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/creator.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/machfb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/s3_pci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vesa.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vesa.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vga.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/flash/mx25l.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/flash/mx25lreg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_xscale.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/hwpmc_xscale.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ic/ns16550.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iir/iir.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/io/iodev.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_82599.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ksyms/ksyms.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/led/led.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/malo/if_malo.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/malo/if_malo.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/md/md.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mge/if_mge.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_msk.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwl.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwl_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwlvar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge_var.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/my/if_myreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nxge/if_nxge.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pcn/if_pcn.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pcn/if_pcnreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pdq/if_fpa.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pdq/pdq_freebsd.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/puc/puc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/siba/siba_cc.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/siis/siis.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/siis/siis.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sn/if_snvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pcm/sndstat.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ste/if_ste.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ste/if_stereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scterm-teken.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/sysmouse.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/tl/if_tl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/tl/if_tlreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/trm/trm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twe.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/atmegadci.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/avr32dci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci_pci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehcireg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci_pci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohcireg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhci_pci.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhcireg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/usb_controller.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/atp.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/uhso.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/quirk/usb_quirk.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/quirk/usb_quirk.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uch341.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uipaq.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_compat_linux.h#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dynamic.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hid.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hub.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_msctest.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_process.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_transfer.c#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_upgt.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_urtw.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_urtwreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/vge/if_vgereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/vx/if_vxvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wb/if_wb.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wb/if_wbreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wl/if_wl.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wpi/if_wpi.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/blkfront/blkfront.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/console/console.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/netfront/netfront.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xl/if_xl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonacl.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonport.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_var.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clsubs.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdcache.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdstate.c#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ntfs/ntfs.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ntfs/ntfs_vfsops.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 25 17:58:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50D0D1065679; Mon, 25 Jan 2010 17:58:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F06CB1065670 for ; Mon, 25 Jan 2010 17:58:02 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DD93F8FC0A for ; Mon, 25 Jan 2010 17:58:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PHw2sf091690 for ; Mon, 25 Jan 2010 17:58:02 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PHw2mZ091688 for perforce@freebsd.org; Mon, 25 Jan 2010 17:58:02 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 25 Jan 2010 17:58:02 GMT Message-Id: <201001251758.o0PHw2mZ091688@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 17:58:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=173679 Change 173679 by jona@jona-capsicum-kent64 on 2010/01/25 17:57:56 Enable more *at(2) system calls Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#18 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#25 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#45 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#28 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#29 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#18 (text+ko) ==== @@ -29,17 +29,18 @@ - Add support for capability-mode *at() system calls: faccessat DONE 2 Dec 2009 JA - fchmodat INPROGRESS JA + fchmodat DONE 22 Jan 2010 JA fchownat ---- fstatat ---- - futimesat ---- + futimesat DONE 22 Jan 2010 JA linkat ---- - mkdirat ---- - mkfifoat ---- - mknodat ---- + mkdirat DONE 22 Jan 2010 JA + rmdirat DONE 22 Jan 2010 JA + mkfifoat DONE 22 Jan 2010 JA + mknodat DONE 22 Jan 2010 JA openat DONE 25 Nov 2009 JA readlinkat ---- - renameat ---- + renameat DONE 22 Jan 2010 JA symlinkat ---- unlinkat ---- ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#25 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#24 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#25 $ ## ## @@ -458,7 +458,13 @@ ## faccessat fchmodat +futimesat +mkdirat +rmdirat +mkfifoat +mknodat openat +renameat ## ## Allow poll(2), which will be scoped by capability rights. ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#45 (text+ko) ==== @@ -528,14 +528,14 @@ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 491 = fchownat */ { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED }, /* 492 = fexecve */ { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0 }, /* 493 = fstatat */ - { AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0 }, /* 494 = futimesat */ + { AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED }, /* 494 = futimesat */ { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0 }, /* 495 = linkat */ - { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0, 0 }, /* 496 = mkdirat */ - { AS(mkfifoat_args), (sy_call_t *)mkfifoat, AUE_MKFIFOAT, NULL, 0, 0, 0 }, /* 497 = mkfifoat */ - { AS(mknodat_args), (sy_call_t *)mknodat, AUE_MKNODAT, NULL, 0, 0, 0 }, /* 498 = mknodat */ + { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIRAT, NULL, 0, 0, SYF_CAPENABLED }, /* 496 = mkdirat */ + { AS(mkfifoat_args), (sy_call_t *)mkfifoat, AUE_MKFIFOAT, NULL, 0, 0, SYF_CAPENABLED }, /* 497 = mkfifoat */ + { AS(mknodat_args), (sy_call_t *)mknodat, AUE_MKNODAT, NULL, 0, 0, SYF_CAPENABLED }, /* 498 = mknodat */ { AS(openat_args), (sy_call_t *)openat, AUE_OPENAT_RWTC, NULL, 0, 0, SYF_CAPENABLED }, /* 499 = openat */ { AS(readlinkat_args), (sy_call_t *)readlinkat, AUE_READLINKAT, NULL, 0, 0, 0 }, /* 500 = readlinkat */ - { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0, 0 }, /* 501 = renameat */ + { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0, SYF_CAPENABLED }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0, 0 }, /* 503 = unlinkat */ { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIX_OPENPT, NULL, 0, 0, 0 }, /* 504 = posix_openpt */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#28 (text+ko) ==== @@ -1372,7 +1372,12 @@ if (error) return (error); restart: + if (IN_CAPABILITY_MODE(td)) + /* only mkfifoat(2) allowed in capability mode */ + return (EOPNOTSUPP); + bwillwrite(); + NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, fd, td); if ((error = namei(&nd)) != 0) @@ -1498,8 +1503,8 @@ AUDIT_ARG_MODE(mode); restart: bwillwrite(); - NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - pathseg, path, fd, td); + NDINIT_ATRIGHTS(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + pathseg, path, fd, CAP_MKFIFO, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -3125,8 +3130,8 @@ AUDIT_ARG_OWNER(uid, gid); follow = (flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : FOLLOW; - NDINIT_AT(&nd, LOOKUP, follow | MPSAFE | AUDITVNODE1, pathseg, path, - fd, td); + NDINIT_ATRIGHTS(&nd, LOOKUP, follow | MPSAFE | AUDITVNODE1, pathseg, path, + fd, CAP_FCHOWN, td); if ((error = namei(&nd)) != 0) return (error); @@ -3341,8 +3346,8 @@ if ((error = getutimes(tptr, tptrseg, ts)) != 0) return (error); - NDINIT_AT(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, - fd, td); + NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW | MPSAFE | AUDITVNODE1, pathseg, path, + fd, CAP_FUTIMES, td); if ((error = namei(&nd)) != 0) return (error); @@ -3672,11 +3677,11 @@ bwillwrite(); #ifdef MAC - NDINIT_AT(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART | MPSAFE | - AUDITVNODE1, pathseg, old, oldfd, td); + NDINIT_ATRIGHTS(&fromnd, DELETE, LOCKPARENT | LOCKLEAF | SAVESTART | + MPSAFE | AUDITVNODE1, pathseg, old, oldfd, CAP_DELETE, td); #else - NDINIT_AT(&fromnd, DELETE, WANTPARENT | SAVESTART | MPSAFE | - AUDITVNODE1, pathseg, old, oldfd, td); + NDINIT_ATRIGHTS(&fromnd, DELETE, WANTPARENT | SAVESTART | MPSAFE | + AUDITVNODE1, pathseg, old, oldfd, CAP_DELETE, td); #endif if ((error = namei(&fromnd)) != 0) @@ -3699,8 +3704,8 @@ vrele(fvp); goto out1; } - NDINIT_AT(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | - MPSAFE | AUDITVNODE2, pathseg, new, newfd, td); + NDINIT_ATRIGHTS(&tond, RENAME, LOCKPARENT | LOCKLEAF | NOCACHE | + SAVESTART | MPSAFE | AUDITVNODE2, pathseg, new, newfd, CAP_CREATE, td); if (fromnd.ni_vp->v_type == VDIR) tond.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&tond)) != 0) { @@ -3826,8 +3831,8 @@ AUDIT_ARG_MODE(mode); restart: bwillwrite(); - NDINIT_AT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, - segflg, path, fd, td); + NDINIT_ATRIGHTS(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, + segflg, path, fd, CAP_MKDIR, td); nd.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&nd)) != 0) return (error); @@ -3915,8 +3920,8 @@ restart: bwillwrite(); - NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, - pathseg, path, fd, td); + NDINIT_ATRIGHTS(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1, + pathseg, path, fd, CAP_RMDIR, td); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#29 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#28 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#29 $ */ /* @@ -98,7 +98,12 @@ #define CAP_FSCK 0x0004000000000000ULL /* sysctl_ffs_fsck */ #define CAP_ATBASE 0x0008000000000000ULL /* openat(2), etc. */ #define CAP_ABSOLUTEPATH 0x0010000000000000ULL /* abs. lookup from '/' */ -#define CAP_MASK_VALID 0x001fffffffffffffULL +#define CAP_CREATE 0x0020000000000000ULL /* open, rename, etc. */ +#define CAP_DELETE 0x0040000000000000ULL /* rename, remove, etc. */ +#define CAP_MKDIR 0x0080000000000000ULL /* mkdirat(2), mknodat(2) */ +#define CAP_RMDIR 0x0100000000000000ULL /* rmdirat(2) */ +#define CAP_MKFIFO 0x0200000000000000ULL /* mkfifoat(2) */ +#define CAP_MASK_VALID 0x03ffffffffffffffULL /* * Notes: From owner-p4-projects@FreeBSD.ORG Mon Jan 25 18:38:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2A8F10656B3; Mon, 25 Jan 2010 18:38:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A691E10656AA for ; Mon, 25 Jan 2010 18:38:46 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94A678FC08 for ; Mon, 25 Jan 2010 18:38:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PIckw1095737 for ; Mon, 25 Jan 2010 18:38:46 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PIckoR095735 for perforce@freebsd.org; Mon, 25 Jan 2010 18:38:46 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 25 Jan 2010 18:38:46 GMT Message-Id: <201001251838.o0PIckoR095735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 18:38:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=173684 Change 173684 by pgj@Binturong on 2010/01/25 18:37:52 MFen (doc): 1.175 -> 1.176 hu_HU.ISO8859-2/books/handbook/book.sgml 1.292 -> 1.293 hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml 1.16 -> 1.17 hu_HU.ISO8859-2/flyer/flyer.tex Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#13 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#18 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/flyer/flyer.tex#4 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#13 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/book.sgml - %SRCID% 1.175 + %SRCID% 1.176 --> 2007 2008 2009 + 2010 A &os; Dokumentációs Projekt ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#18 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2151,6 +2151,53 @@ &man.growisofs.1; man oldaláról tudhatunk meg többet. + + 4,38 GB-nál több adat + írásához egy hibrid UDF/ISO-9660 + típusú állományrendszert kell + létrehoznunk. Ezt úgy tudjuk elérni, ha + &man.mkisofs.8; és a többi hasonló program + (például &man.growisofs.1;) + hívásakor még hozzátesszük az + paramétereket. + Ezekre csak lemezképek + készítésekor vagy az + állományok közvetlen lemezre + írásakor van szükségünk. Az + így létrehozott lemezeket a &man.mount.udf.8; + segédprogram segítségével UDF + állományrendszerként tudjuk + csatlakoztatni. Ezért csak olyan + operációs rendszereken + használható, amelyek ismerik ezt a + formátumot, ellenkezõ esetben csak hibás + állományokat fogunk látni a + lemezen. + + Példa ilyen lemezkép + létrehozására: + + &prompt.root; growisofs -dvd-compat -udf -iso-level 3 -Z /dev/cd0 -J -R /az/új/adat/helye + + Ha a lemezkép már eleve nagyobb + méretû állományokat tartalmaz, a lemez + írásakor a &man.growisofs.1; programnak + már nem kell további paramétereket + átadnunk. + + Lehetõleg mindig a sysutils/cdrtools legfrissebb + verzióját használjuk (amely a + &man.mkisofs.8; programot is tartalmazza), mivel a + régebbi verziók nem támogatják a + nagyobb méretû állományokat. Ha + problémák adódnak a programok + használata során, akkor + próbálkozzunk a fejlesztõi + változattal (sysutils/cdrtools-devel) és + olvassuk el a &man.mkisofs.8; man oldalát. + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/flyer/flyer.tex#4 (text+ko) ==== @@ -1,4 +1,4 @@ -% Copyright (c) 2004-2008 Marc Fonvieille +% Copyright (c) 2004-2010 Marc Fonvieille % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ % The FreeBSD Hungarian Documentation Project % Translated by: Gabor Kovesdan %SOURCE% en_US.ISO8859-1/flyer/flyer.tex -%SRCID% 1.16 +%SRCID% 1.17 \documentclass[11pt]{article} \usepackage[T1]{fontenc} \usepackage[latin2]{inputenc} @@ -142,7 +142,7 @@ \vspace{5mm} \titledframe{Rengeteg alkalmazást futtat!}{ -A FreeBSD több, mint 17000 külön telepíthetõ szoftvercsomagot biztosít, +A FreeBSD több, mint 21~000 külön telepíthetõ szoftvercsomagot biztosít, beleértve például a következõket: Apache, Samba, MySQL\reg, OpenOffice.org, KDE, GNOME, MPlayer, stb. \medskip @@ -199,7 +199,7 @@ % % Copyrights \begin{center} -\tiny \copyright 2004-2008 A FreeBSD Projekt\\ +\tiny \copyright 2004-2010 A FreeBSD Projekt\\ \ifthenelse{\equal{\logo}{true}}{ A FreeBSD és a FreeBSD Logo a FreeBSD Alapítvány bejegyzett védjegyei.\\} {A FreeBSD a FreeBSD Alapítvány bejegyzett védjegye.\\} From owner-p4-projects@FreeBSD.ORG Mon Jan 25 20:48:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB2CF1065670; Mon, 25 Jan 2010 20:48:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 761B9106566B for ; Mon, 25 Jan 2010 20:48:11 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61B478FC28 for ; Mon, 25 Jan 2010 20:48:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0PKmBi0019382 for ; Mon, 25 Jan 2010 20:48:11 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0PKm74E019376 for perforce@freebsd.org; Mon, 25 Jan 2010 20:48:07 GMT (envelope-from peter@wemm.org) Date: Mon, 25 Jan 2010 20:48:07 GMT Message-Id: <201001252048.o0PKm74E019376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2010 20:48:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=173695 Change 173695 by peter@peter_daintree on 2010/01/25 20:47:09 IFC @173693 Affected files ... .. //depot/projects/hammer/Makefile#58 integrate .. //depot/projects/hammer/Makefile.inc1#151 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#77 integrate .. //depot/projects/hammer/UPDATING#142 integrate .. //depot/projects/hammer/bin/cp/cp.1#12 integrate .. //depot/projects/hammer/bin/cp/cp.c#16 integrate .. //depot/projects/hammer/bin/cp/utils.c#18 integrate .. //depot/projects/hammer/bin/date/date.1#16 integrate .. //depot/projects/hammer/bin/ls/ls.c#20 integrate .. //depot/projects/hammer/bin/ls/ls.h#8 integrate .. //depot/projects/hammer/bin/ls/print.c#20 integrate .. //depot/projects/hammer/bin/pkill/Makefile#2 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#19 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#10 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.nsupdate.html#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#7 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/db.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ncache.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/types.h#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#15 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#12 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_buffer.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_config.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_context.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gabn.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gethostent.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getipnode.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_gnba.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_inetntop.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_noop.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_packet.html#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/lwres/man/lwres_resutil.html#6 integrate .. //depot/projects/hammer/contrib/bind9/version#19 integrate .. //depot/projects/hammer/contrib/groff/font/devutf8/R.proto#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/an-old.tmac#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#16 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-old.tmac#3 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-syms#11 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#12 integrate .. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#14 integrate .. //depot/projects/hammer/contrib/netcat/nc.1#12 integrate .. //depot/projects/hammer/contrib/netcat/netcat.c#9 integrate .. //depot/projects/hammer/contrib/smbfs/smbutil/view.c#4 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#17 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#103 integrate .. //depot/projects/hammer/etc/devd/Makefile#3 integrate .. //depot/projects/hammer/etc/devd/uath.conf#1 branch .. //depot/projects/hammer/etc/mtree/BSD.include.dist#58 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#49 integrate .. //depot/projects/hammer/etc/namedb/named.conf#17 integrate .. //depot/projects/hammer/etc/rc.d/devfs#13 integrate .. //depot/projects/hammer/etc/rc.firewall#15 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#32 integrate .. //depot/projects/hammer/gnu/lib/libsupc++/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#22 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#37 integrate .. //depot/projects/hammer/include/Makefile#85 integrate .. //depot/projects/hammer/include/unistd.h#32 integrate .. //depot/projects/hammer/lib/Makefile#80 integrate .. //depot/projects/hammer/lib/bind/dns/code.h#8 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumclass.h#8 integrate .. //depot/projects/hammer/lib/bind/dns/dns/enumtype.h#8 integrate .. //depot/projects/hammer/lib/bind/dns/dns/rdatastruct.h#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry_link_resolver.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#31 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_disk_entry_from_file.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#25 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_zip.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#46 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#20 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/opendir.c#9 integrate .. //depot/projects/hammer/lib/libc/gen/pututxline.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/scandir.c#5 integrate .. //depot/projects/hammer/lib/libc/gen/sem.c#7 integrate .. //depot/projects/hammer/lib/libc/gen/sem_new.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.3#8 integrate .. //depot/projects/hammer/lib/libc/gen/ttyslot.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/uname.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/utxdb.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/utxdb.h#2 integrate .. //depot/projects/hammer/lib/libc/nls/gl_ES.ISO8859-1.msg#2 integrate .. //depot/projects/hammer/lib/libc/string/strsignal.c#5 integrate .. //depot/projects/hammer/lib/libc/sys/wait.2#12 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#20 integrate .. //depot/projects/hammer/lib/libfetch/http.c#19 integrate .. //depot/projects/hammer/lib/libgeom/geom_util.c#4 integrate .. //depot/projects/hammer/lib/libgeom/geom_xml2tree.c#7 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.3#10 integrate .. //depot/projects/hammer/lib/libgeom/libgeom.h#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#9 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/Makefile#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.8#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#12 integrate .. //depot/projects/hammer/lib/libstand/bzipfs.c#6 integrate .. //depot/projects/hammer/lib/libtacplus/taclib.c#5 integrate .. //depot/projects/hammer/lib/libutil/login_tty.c#6 integrate .. //depot/projects/hammer/libexec/comsat/comsat.8#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#16 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#35 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#5 integrate .. //depot/projects/hammer/libexec/getty/ttys.5#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#20 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#12 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#12 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#12 integrate .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#15 integrate .. //depot/projects/hammer/release/picobsd/qemu/crunch.conf#2 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#47 integrate .. //depot/projects/hammer/sbin/adjkerntz/Makefile#3 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.8#13 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.c#16 integrate .. //depot/projects/hammer/sbin/geom/class/Makefile#13 integrate .. //depot/projects/hammer/sbin/geom/class/mountver/Makefile#1 branch .. //depot/projects/hammer/sbin/geom/class/mountver/geom_mountver.c#1 branch .. //depot/projects/hammer/sbin/geom/class/mountver/gmountver.8#1 branch .. //depot/projects/hammer/sbin/geom/core/geom.8#18 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#26 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#16 integrate .. //depot/projects/hammer/sbin/ifconfig/af_inet.c#6 integrate .. //depot/projects/hammer/sbin/init/init.8#17 integrate .. //depot/projects/hammer/sbin/kldconfig/Makefile#3 integrate .. //depot/projects/hammer/sbin/kldload/Makefile#3 integrate .. //depot/projects/hammer/sbin/kldstat/Makefile#3 integrate .. //depot/projects/hammer/sbin/mdconfig/Makefile#5 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#29 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#19 integrate .. //depot/projects/hammer/sbin/natd/Makefile#3 integrate .. //depot/projects/hammer/sbin/natd/natd.c#16 integrate .. //depot/projects/hammer/sbin/newfs/Makefile#4 integrate .. //depot/projects/hammer/sbin/reboot/reboot.8#8 integrate .. //depot/projects/hammer/sbin/setkey/setkey.8#7 integrate .. //depot/projects/hammer/sbin/swapon/Makefile#5 integrate .. //depot/projects/hammer/sbin/tunefs/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/05.dc/Makefile#1 branch .. //depot/projects/hammer/share/doc/usd/06.bc/Makefile#1 branch .. //depot/projects/hammer/share/doc/usd/Makefile#4 integrate .. //depot/projects/hammer/share/examples/kld/cdev/test/Makefile#4 integrate .. //depot/projects/hammer/share/examples/kld/cdev/test/testcdev.c#3 integrate .. //depot/projects/hammer/share/examples/kld/firmware/fwconsumer/fw_consumer.c#2 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#5 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/call.c#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_join.3#5 integrate .. //depot/projects/hammer/share/man/man3/sysexits.3#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#127 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#42 integrate .. //depot/projects/hammer/share/man/man4/acpi_asus.4#3 integrate .. //depot/projects/hammer/share/man/man4/aue.4#13 integrate .. //depot/projects/hammer/share/man/man4/axe.4#14 integrate .. //depot/projects/hammer/share/man/man4/cdce.4#7 integrate .. //depot/projects/hammer/share/man/man4/dc.4#21 integrate .. //depot/projects/hammer/share/man/man4/epair.4#3 integrate .. //depot/projects/hammer/share/man/man4/gif.4#9 integrate .. //depot/projects/hammer/share/man/man4/gpib.4#1 branch .. //depot/projects/hammer/share/man/man4/hme.4#10 integrate .. //depot/projects/hammer/share/man/man4/ipwfw.4#1 branch .. //depot/projects/hammer/share/man/man4/iwifw.4#1 branch .. //depot/projects/hammer/share/man/man4/lge.4#7 integrate .. //depot/projects/hammer/share/man/man4/mac.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/vpd.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.sparc64/ebus.4#3 integrate .. //depot/projects/hammer/share/man/man4/mpt.4#13 integrate .. //depot/projects/hammer/share/man/man4/ndis.4#3 integrate .. //depot/projects/hammer/share/man/man4/nge.4#12 integrate .. //depot/projects/hammer/share/man/man4/pcii.4#1 branch .. //depot/projects/hammer/share/man/man4/pcm.4#24 integrate .. //depot/projects/hammer/share/man/man4/pcn.4#10 integrate .. //depot/projects/hammer/share/man/man4/psm.4#13 integrate .. //depot/projects/hammer/share/man/man4/pts.4#5 integrate .. //depot/projects/hammer/share/man/man4/ral.4#15 integrate .. //depot/projects/hammer/share/man/man4/re.4#21 integrate .. //depot/projects/hammer/share/man/man4/rl.4#20 integrate .. //depot/projects/hammer/share/man/man4/rue.4#11 integrate .. //depot/projects/hammer/share/man/man4/rum.4#8 integrate .. //depot/projects/hammer/share/man/man4/sf.4#9 integrate .. //depot/projects/hammer/share/man/man4/siba.4#1 branch .. //depot/projects/hammer/share/man/man4/sis.4#12 integrate .. //depot/projects/hammer/share/man/man4/sk.4#15 integrate .. //depot/projects/hammer/share/man/man4/smbus.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#18 integrate .. //depot/projects/hammer/share/man/man4/snd_uaudio.4#3 integrate .. //depot/projects/hammer/share/man/man4/ste.4#14 integrate .. //depot/projects/hammer/share/man/man4/sysmouse.4#8 integrate .. //depot/projects/hammer/share/man/man4/targ.4#5 integrate .. //depot/projects/hammer/share/man/man4/tnt4882.4#1 branch .. //depot/projects/hammer/share/man/man4/udav.4#8 integrate .. //depot/projects/hammer/share/man/man4/uhso.4#2 integrate .. //depot/projects/hammer/share/man/man4/ural.4#15 integrate .. //depot/projects/hammer/share/man/man4/urio.4#7 integrate .. //depot/projects/hammer/share/man/man4/urtw.4#5 integrate .. //depot/projects/hammer/share/man/man4/vr.4#16 integrate .. //depot/projects/hammer/share/man/man4/wi.4#35 integrate .. //depot/projects/hammer/share/man/man4/wlan.4#16 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#24 integrate .. //depot/projects/hammer/share/man/man7/hier.7#39 integrate .. //depot/projects/hammer/share/man/man7/release.7#32 integrate .. //depot/projects/hammer/share/man/man9/Makefile#100 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#26 integrate .. //depot/projects/hammer/share/man/man9/kthread.9#11 integrate .. //depot/projects/hammer/share/man/man9/mac.9#12 integrate .. //depot/projects/hammer/share/man/man9/namei.9#9 integrate .. //depot/projects/hammer/share/man/man9/pci.9#10 integrate .. //depot/projects/hammer/share/man/man9/sysctl.9#4 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#13 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#37 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#32 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#22 integrate .. //depot/projects/hammer/share/mk/sys.mk#31 integrate .. //depot/projects/hammer/share/security/lomac-policy.contexts#2 integrate .. //depot/projects/hammer/share/zoneinfo/asia#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#91 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#181 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#196 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#114 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#127 integrate .. //depot/projects/hammer/sys/amd64/conf/XENHVM#4 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#13 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#18 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#53 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#74 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#34 integrate .. //depot/projects/hammer/sys/arm/conf/CRB#9 integrate .. //depot/projects/hammer/sys/arm/conf/EP80219#10 integrate .. //depot/projects/hammer/sys/arm/conf/GUMSTIX#5 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#20 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#17 integrate .. //depot/projects/hammer/sys/arm/conf/SKYEYE#10 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#52 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/main.c#4 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/version#4 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#46 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#16 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#64 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#17 integrate .. //depot/projects/hammer/sys/conf/NOTES#170 integrate .. //depot/projects/hammer/sys/conf/files#208 integrate .. //depot/projects/hammer/sys/conf/files.pc98#79 integrate .. //depot/projects/hammer/sys/conf/kern.mk#31 integrate .. //depot/projects/hammer/sys/conf/ldscript.mips#5 integrate .. //depot/projects/hammer/sys/conf/options.i386#57 integrate .. //depot/projects/hammer/sys/conf/options.pc98#51 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adfile.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adisasm.c#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/adwalk.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmextern.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmrestag.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/common/getopt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslanalyze.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcodegen.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompile.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.l#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslcompiler.y#11 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asldefine.h#5 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslerror.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfiles.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslfold.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslglobal.h#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllength.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllisting.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslload.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asllookup.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmain.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslmap.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopcodes.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asloperands.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslopt.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslresource.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype1.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslrestype2.c#6 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslstubs.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltransform.c#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltree.c#7 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/asltypes.h#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/compiler/aslutils.c#9 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbcmds.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbinput.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbstats.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/debugger/dbxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmbuffer.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmnames.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmresrcl.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmresrcs.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsfield.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsinit.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsmethod.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsobject.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswexec.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswload.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswscope.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/dispatcher/dswstate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evevent.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evgpe.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evregion.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evrgnini.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evsci.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/events/evxfregn.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exconvrt.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/excreate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exdump.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exfield.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exfldio.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exmutex.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exnames.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg1.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg2.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg3.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exoparg6.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exprep.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exregion.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exresnte.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exresolv.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exresop.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exstore.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exstoren.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exstorob.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/executer/exutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwacpi.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwgpe.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwregs.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwsleep.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwtimer.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hardware/hwxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acapps.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/accommon.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acconfig.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acdispat.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acevents.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/achware.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acinterp.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acmacros.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acnames.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acobject.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acopcode.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acoutput.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acparser.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpi.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpiosxf.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acpredef.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acresrc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acrestyp.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acstruct.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actables.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl1.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/acutils.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/amlcode.h#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/amlresrc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/platform/acenv.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/include/platform/acgcc.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsaccess.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsalloc.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsdump.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsdumpdv.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nseval.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsinit.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsload.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsnames.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsobject.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nspredef.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsrepair.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nswalk.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfeval.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfname.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/namespace/nsxfobj.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/osunixxf.c#10 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psargs.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psloop.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psopcode.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psparse.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psscope.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/pstree.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/pswalk.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/parser/psxface.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsaddr.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rscalc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rscreate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsdump.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsinfo.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsio.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsirq.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rslist.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsmemory.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsmisc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsutils.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/resources/rsxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbfadt.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbfind.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbinstal.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbxface.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tables/tbxfroot.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utalloc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utcache.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utdebug.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utdelete.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/uteval.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utids.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utinit.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utlock.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utmath.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utmisc.c#4 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utmutex.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utobject.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utresrc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utstate.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/utilities/utxface.c#3 integrate .. //depot/projects/hammer/sys/contrib/dev/uath/ar5523.bin.uu#2 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#19 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_panasonic.c#10 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_wmi.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#20 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#23 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#46 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_if.m#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#18 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_smbat.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#61 integrate .. //depot/projects/hammer/sys/dev/ata/ata_if.m#7 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#24 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#18 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#95 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#49 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#25 integrate .. //depot/projects/hammer/sys/dev/cs/if_csreg.h#6 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#27 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#39 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#34 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#19 integrate .. //depot/projects/hammer/sys/dev/ichwd/ichwd.h#9 integrate .. //depot/projects/hammer/sys/dev/ieee488/pcii.c#7 integrate .. //depot/projects/hammer/sys/dev/ieee488/tnt4882.c#4 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#9 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.h#6 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#33 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwn.c#12 integrate .. //depot/projects/hammer/sys/dev/iwn/if_iwnreg.h#4 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#38 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#33 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#22 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#38 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/net/uhso.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#128 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_uath.c#6 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vnops.c#10 integrate .. //depot/projects/hammer/sys/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_dinode.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_dir.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/ext2fs.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/fs.h#1 branch .. //depot/projects/hammer/sys/fs/ext2fs/inode.h#1 branch .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#37 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#17 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#18 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli_key.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#18 integrate .. //depot/projects/hammer/sys/geom/mountver/g_mountver.c#1 branch .. //depot/projects/hammer/sys/geom/mountver/g_mountver.h#1 branch .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#13 integrate .. //depot/projects/hammer/sys/geom/part/g_part_vtoc8.c#8 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#21 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_create.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_alloc.c#6 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_balloc.c#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bitops.h#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bmap.c#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_extern.h#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs.h#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs_sb.h#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode.c#8 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#4 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#3 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#9 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_mount.h#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_readwrite.c#2 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_subr.c#3 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#25 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#17 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#5 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/i386-bitops.h#3 delete .. //depot/projects/hammer/sys/gnu/fs/ext2fs/inode.h#3 delete .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs.h#5 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#86 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#48 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#127 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#70 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#25 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#30 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#44 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#49 integrate .. //depot/projects/hammer/sys/i386/xen/pmap.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/iodev_machdep.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#79 integrate .. //depot/projects/hammer/sys/ia64/include/efi.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/iodev.h#2 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#51 integrate .. //depot/projects/hammer/sys/kern/kern_kthread.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#60 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#40 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#101 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#68 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#109 integrate .. //depot/projects/hammer/sys/kern/sys_process.c#51 integrate .. //depot/projects/hammer/sys/kern/tty_inq.c#4 integrate .. //depot/projects/hammer/sys/kern/tty_pts.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#148 integrate .. //depot/projects/hammer/sys/mips/adm5120/adm5120_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/alchemy/alchemy_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xx_spi.c#2 integrate .. //depot/projects/hammer/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/hammer/sys/mips/atheros/files.ar71xx#2 integrate .. //depot/projects/hammer/sys/mips/atheros/pcf2123_rtc.c#1 branch .. //depot/projects/hammer/sys/mips/atheros/pcf2123reg.h#1 branch .. //depot/projects/hammer/sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/obio.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/hammer/sys/mips/cavium/octeonreg.h#2 delete .. //depot/projects/hammer/sys/mips/cavium/uart_bus_octeonusart.c#2 integrate .. //depot/projects/hammer/sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate .. //depot/projects/hammer/sys/mips/conf/AR71XX.hints#2 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1-32#2 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1.hints#2 integrate .. //depot/projects/hammer/sys/mips/conf/QEMU#5 integrate .. //depot/projects/hammer/sys/mips/idt/idt_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/include/cpu.h#3 integrate .. //depot/projects/hammer/sys/mips/include/elf.h#7 integrate .. //depot/projects/hammer/sys/mips/include/md_var.h#3 integrate .. //depot/projects/hammer/sys/mips/include/trap.h#3 integrate .. //depot/projects/hammer/sys/mips/malta/malta_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/db_trace.c#3 integrate .. //depot/projects/hammer/sys/mips/mips/elf_trampoline.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/exception.S#3 integrate .. //depot/projects/hammer/sys/mips/mips/locore.S#3 integrate .. //depot/projects/hammer/sys/mips/mips/machdep.c#10 integrate .. //depot/projects/hammer/sys/mips/mips/swtch.S#3 integrate .. //depot/projects/hammer/sys/mips/mips/tick.c#4 integrate .. //depot/projects/hammer/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/sentry5/s5_machdep.c#5 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_machdep.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#149 integrate .. //depot/projects/hammer/sys/modules/ext2fs/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/geom/Makefile#19 integrate .. //depot/projects/hammer/sys/modules/geom/geom_mountver/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#96 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#55 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#23 integrate .. //depot/projects/hammer/sys/net/if_var.h#64 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#55 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#45 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#26 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#49 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.c#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_sta.c#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#47 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#35 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#39 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#25 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#74 integrate .. //depot/projects/hammer/sys/netinet/ipfw/ip_fw2.c#8 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.c#17 integrate .. //depot/projects/hammer/sys/netinet/sctp_auth.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#25 integrate .. //depot/projects/hammer/sys/netinet/sctp_header.h#9 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#32 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.h#7 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#30 integrate .. //depot/projects/hammer/sys/netinet/sctp_os_bsd.h#27 integrate .. //depot/projects/hammer/sys/netinet/sctp_output.c#36 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#35 integrate .. //depot/projects/hammer/sys/netinet/sctp_structs.h#22 integrate .. //depot/projects/hammer/sys/netinet/sctp_sysctl.c#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_uio.h#21 integrate .. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#32 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#41 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#64 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#50 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#32 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#40 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#72 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#78 integrate .. //depot/projects/hammer/sys/nfsclient/nfsmount.h#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#26 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#19 integrate .. //depot/projects/hammer/sys/pc98/conf/DEFAULTS#12 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#68 integrate .. //depot/projects/hammer/sys/pci/nfsmb.c#8 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#55 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#77 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#25 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#32 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#30 integrate .. //depot/projects/hammer/sys/sys/jail.h#23 integrate .. //depot/projects/hammer/sys/sys/kthread.h#5 integrate .. //depot/projects/hammer/sys/sys/param.h#138 integrate .. //depot/projects/hammer/sys/sys/proc.h#137 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#25 integrate .. //depot/projects/hammer/sys/sys/vnode.h#95 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_acl.c#11 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#67 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#57 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#54 integrate .. //depot/projects/hammer/tools/build/mk/OptionalObsoleteFiles.inc#17 integrate .. //depot/projects/hammer/tools/make_libdeps.sh#9 integrate .. //depot/projects/hammer/usr.bin/Makefile#71 integrate .. //depot/projects/hammer/usr.bin/at/at.man#6 integrate .. //depot/projects/hammer/usr.bin/bc/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bc/USD.doc/bc#1 branch .. //depot/projects/hammer/usr.bin/bc/bc.1#1 branch .. //depot/projects/hammer/usr.bin/bc/bc.library#1 branch .. //depot/projects/hammer/usr.bin/bc/bc.y#1 branch .. //depot/projects/hammer/usr.bin/bc/extern.h#1 branch .. //depot/projects/hammer/usr.bin/bc/pathnames.h#1 branch .. //depot/projects/hammer/usr.bin/bc/scan.l#1 branch .. //depot/projects/hammer/usr.bin/brandelf/brandelf.1#4 integrate .. //depot/projects/hammer/usr.bin/chpass/chpass.1#8 integrate .. //depot/projects/hammer/usr.bin/dc/Makefile#1 branch .. //depot/projects/hammer/usr.bin/dc/USD.doc/dc#1 branch .. //depot/projects/hammer/usr.bin/dc/bcode.c#1 branch .. //depot/projects/hammer/usr.bin/dc/bcode.h#1 branch .. //depot/projects/hammer/usr.bin/dc/dc.1#1 branch .. //depot/projects/hammer/usr.bin/dc/dc.c#1 branch .. //depot/projects/hammer/usr.bin/dc/extern.h#1 branch .. //depot/projects/hammer/usr.bin/dc/inout.c#1 branch .. //depot/projects/hammer/usr.bin/dc/mem.c#1 branch .. //depot/projects/hammer/usr.bin/dc/stack.c#1 branch .. //depot/projects/hammer/usr.bin/elfdump/elfdump.1#4 integrate .. //depot/projects/hammer/usr.bin/finger/finger.1#8 integrate .. //depot/projects/hammer/usr.bin/getent/getent.c#4 integrate .. //depot/projects/hammer/usr.bin/last/last.1#5 integrate .. //depot/projects/hammer/usr.bin/last/last.c#8 integrate .. //depot/projects/hammer/usr.bin/locale/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/ncplist/ncplist.1#3 integrate .. //depot/projects/hammer/usr.bin/talk/talk.1#8 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.1#9 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#11 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdefall.sh#4 integrate .. //depot/projects/hammer/usr.bin/users/users.1#2 integrate .. //depot/projects/hammer/usr.bin/w/w.1#5 integrate .. //depot/projects/hammer/usr.bin/who/who.1#5 integrate .. //depot/projects/hammer/usr.bin/whois/whois.1#9 integrate .. //depot/projects/hammer/usr.bin/whois/whois.c#16 integrate .. //depot/projects/hammer/usr.bin/wtmpcvt/Makefile#1 branch .. //depot/projects/hammer/usr.bin/wtmpcvt/wtmpcvt.1#1 branch .. //depot/projects/hammer/usr.bin/wtmpcvt/wtmpcvt.c#1 branch .. //depot/projects/hammer/usr.sbin/Makefile#106 integrate .. //depot/projects/hammer/usr.sbin/ac/ac.8#4 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpidb/acpidb.c#7 integrate .. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#15 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.c#13 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_smail/ctm_smail.c#3 integrate .. //depot/projects/hammer/usr.sbin/extattr/rmextattr.c#5 integrate .. //depot/projects/hammer/usr.sbin/faithd/faithd.8#6 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#40 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/lastlogin.8#3 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/lastlogin.c#5 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.8#16 integrate .. //depot/projects/hammer/usr.sbin/mergemaster/mergemaster.sh#24 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#16 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#28 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#25 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/main.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/updating/pkg_updating.1#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#13 integrate .. //depot/projects/hammer/usr.sbin/rwhod/rwhod.8#7 integrate .. //depot/projects/hammer/usr.sbin/smbmsg/smbmsg.8#5 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_main.c#8 integrate Differences ... ==== //depot/projects/hammer/Makefile#58 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $ +# $FreeBSD: src/Makefile,v 1.363 2010/01/19 15:34:16 ed Exp $ # # The user-driven targets are: # ==== //depot/projects/hammer/Makefile.inc1#151 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.636 2009/12/31 00:07:26 ed Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.639 2010/01/23 19:29:42 antoine Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1122,7 +1122,7 @@ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libulog \ + lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} lib/libdwarf lib/libproc @@ -1145,14 +1145,16 @@ _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if ${MK_OPENSSH} != "no" -_secure_lib_libssh= secure/lib/libssh -secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L +.endif +.if ${MK_OPENSSH} != "no" +_secure_lib_libssh= secure/lib/libssh +secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L .endif .endif @@ -1160,6 +1162,10 @@ _secure_lib= secure/lib .endif +.if ${MK_GSSAPI} != "no" +_lib_libgssapi= lib/libgssapi +.endif + .if ${MK_IPX} != "no" _lib_libipx= lib/libipx .endif @@ -1172,7 +1178,6 @@ _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm _kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 -_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" @@ -1275,7 +1280,7 @@ fi; \ done # Remove catpages without corresponding manpages. - @3<&0; \ + @exec 3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ while read catpage; do \ ==== //depot/projects/hammer/ObsoleteFiles.inc#77 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.221 2010/01/13 19:03:48 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.224 2010/01/22 23:19:48 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,18 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd +OLD_FILES+=usr/share/doc/papers/bc.ascii.gz +OLD_FILES+=usr/share/doc/papers/dc.ascii.gz +# 20100120: replacing GNU bc/dc with BSDL versions +OLD_FILES+=usr/share/examples/bc/ckbook.b +OLD_FILES+=usr/share/examples/bc/pi.b +OLD_FILES+=usr/share/examples/bc/primes.b +OLD_FILES+=usr/share/examples/bc/twins.b +OLD_FILES+=usr/share/info/dc.info.gz +OLD_DIRS+=usr/share/examples/bc +# 20100114: removal of ttyslot(3) +OLD_FILES+=usr/share/man/man3/ttyslot.3.gz # 20100113: remove utmp.h, replace it by utmpx.h OLD_FILES+=usr/share/man/man3/login.3.gz OLD_FILES+=usr/share/man/man3/logout.3.gz ==== //depot/projects/hammer/UPDATING#142 (text+ko) ==== @@ -37,7 +37,9 @@ After the system has been upgraded, it is safe to remove the old log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*), - assuming their contents is of no importance anymore. + assuming their contents is of no importance anymore. Old wtmp + databases can only be used by last(1) and ac(8) after they have + been converted to the new format using wtmpcvt(1). 20100108: Introduce the kernel thread "deadlock resolver" (which can be enabled @@ -1111,4 +1113,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.652 2010/01/13 19:25:03 ed Exp $ +$FreeBSD: src/UPDATING,v 1.653 2010/01/14 20:58:45 ed Exp $ ==== //depot/projects/hammer/bin/cp/cp.1#12 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.40 2008/03/10 19:58:41 jhb Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.41 2010/01/17 09:37:31 gavin Exp $ .\" -.Dd October 27, 2006 +.Dd January 17, 2010 .Dt CP 1 .Os .Sh NAME @@ -45,7 +45,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file target_file .Nm .Oo @@ -53,7 +53,7 @@ .Op Fl H | Fl L | Fl P .Oc .Op Fl f | i | n -.Op Fl alpv +.Op Fl alpvx .Ar source_file ... target_directory .Sh DESCRIPTION In the first synopsis form, the @@ -183,6 +183,8 @@ Cause .Nm to be verbose, showing files as they are copied. +.It Fl x +File system mount points are not traversed. .El .Pp For each destination file that already exists, its contents are ==== //depot/projects/hammer/bin/cp/cp.c#16 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.60 2008/03/10 19:58:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.61 2010/01/17 09:37:31 gavin Exp $"); /* * Cp copies source files to target files. @@ -101,8 +101,9 @@ int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash; char *target; + fts_options = FTS_NOCHDIR | FTS_PHYSICAL; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRafilnprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRafilnprvx")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -150,6 +151,9 @@ case 'v': vflag = 1; break; + case 'x': + fts_options |= FTS_XDEV; + break; default: usage(); break; @@ -160,7 +164,6 @@ if (argc < 2) usage(); - fts_options = FTS_NOCHDIR | FTS_PHYSICAL; if (Rflag && rflag) errx(1, "the -R and -r options may not be specified together"); if (rflag) ==== //depot/projects/hammer/bin/cp/utils.c#18 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.59 2009/09/02 08:08:57 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.60 2010/01/17 09:37:31 gavin Exp $"); #include #include @@ -518,8 +518,8 @@ { (void)fprintf(stderr, "%s\n%s\n", -"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file target_file", -" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpv] source_file ... " +"usage: cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file target_file", +" cp [-R [-H | -L | -P]] [-f | -i | -n] [-alpvx] source_file ... " "target_directory"); exit(EX_USAGE); } ==== //depot/projects/hammer/bin/date/date.1#16 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 26 00:07:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75917106566B; Tue, 26 Jan 2010 00:07:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C955710656F1 for ; Tue, 26 Jan 2010 00:07:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C23A8FC1A for ; Tue, 26 Jan 2010 00:07:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0Q07WNC042819 for ; Tue, 26 Jan 2010 00:07:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0Q07WC7042817 for perforce@freebsd.org; Tue, 26 Jan 2010 00:07:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 26 Jan 2010 00:07:32 GMT Message-Id: <201001260007.o0Q07WC7042817@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 Precedence: bulk Cc: Subject: PERFORCE change 173710 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2010 00:07:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=173710 Change 173710 by rwatson@rwatson_cinnamon_macosx on 2010/01/26 00:07:22 Minor style tweak. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#7 (text+ko) ==== @@ -62,6 +62,5 @@ write(2, warning, sizeof(warning)); - return -1; + return (-1); } - From owner-p4-projects@FreeBSD.ORG Tue Jan 26 00:12:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56E1210656D2; Tue, 26 Jan 2010 00:12:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B0D710656CE for ; Tue, 26 Jan 2010 00:12:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E53968FC0A for ; Tue, 26 Jan 2010 00:12:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0Q0CbUg043275 for ; Tue, 26 Jan 2010 00:12:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0Q0CbZV043273 for perforce@freebsd.org; Tue, 26 Jan 2010 00:12:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 26 Jan 2010 00:12:37 GMT Message-Id: <201001260012.o0Q0CbZV043273@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 Precedence: bulk Cc: Subject: PERFORCE change 173711 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2010 00:12:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=173711 Change 173711 by rwatson@rwatson_cinnamon_macosx on 2010/01/26 00:12:03 Remove duplicate bzero of msghdr. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.c#10 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.c#11 $ */ #include @@ -179,7 +179,6 @@ iov.iov_base = __DECONST(void *, msg); iov.iov_len = len; - bzero(&msghdr, sizeof(msghdr)); bzero(&cmsgbuf, sizeof(cmsgbuf)); cmsg = (struct cmsghdr *)cmsgbuf; cmsg->cmsg_len = CMSG_SPACE(fdcount * sizeof(int)); From owner-p4-projects@FreeBSD.ORG Tue Jan 26 00:49:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67DDE106568D; Tue, 26 Jan 2010 00:49:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13F8E1065679 for ; Tue, 26 Jan 2010 00:49:15 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 00D478FC18 for ; Tue, 26 Jan 2010 00:49:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0Q0nEOA056465 for ; Tue, 26 Jan 2010 00:49:14 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0Q0nEGd056463 for perforce@freebsd.org; Tue, 26 Jan 2010 00:49:14 GMT (envelope-from jona@FreeBSD.org) Date: Tue, 26 Jan 2010 00:49:14 GMT Message-Id: <201001260049.o0Q0nEGd056463@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2010 00:49:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=173714 Change 173714 by jona@jona-belle-freebsd8 on 2010/01/26 00:48:21 open(2) is now properly constrained (it always fails with EOPNOTSUPP), so we can allow the syscall for auditing / debugging purposes Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/Makefile#17 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#26 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#46 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/Makefile#17 (text+ko) ==== @@ -9,7 +9,8 @@ libcapability_sandbox.c \ libcapability_sandbox_io.c \ libcapability_host.c \ - libcapability_host_io.c + libcapability_host_io.c \ + libcapability_registry.c INCS= libcapability.h ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#26 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#25 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#26 $ */ #ifndef _LIBCAPABILITY_H_ @@ -53,6 +53,30 @@ }; /* + * A file descriptor "registry" + */ +struct lc_fdregistry_entry; +struct lc_fdregistry { + struct lc_fdregistry_entry *entries; /* registry entries */ + + unsigned int count; /* number of entries */ + unsigned int capacity; /* entries that we can hold */ +}; + +/* + * Registry operations + */ +struct lc_fdregistry* lc_fdregistry_new(void); +struct lc_fdregistry* lc_fdregistry_dup(const struct lc_fdregistry *orig); +void lc_fdregistry_free(struct lc_fdregistry *registry); + +int lc_fdregistry_add(const struct lc_fdregistry *reg, + const char *id, const char *name, int fd); + +int lc_fdregistry_lookup(const struct lc_fdregistry *reg, + const char *id, char **name, int *fdp); + +/* * Capability interfaces. */ int lc_limitfd(int fd, cap_rights_t rights); ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#26 (text+ko) ==== @@ -38,7 +38,7 @@ ## - sys_exit(2), abort2(2) and close(2) are very important. ## - Sorted alphabetically, please keep it that way. ## -## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#25 $ +## $P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/capabilities.conf#26 $ ## ## @@ -467,6 +467,13 @@ renameat ## +## Allow entry into open(2). This system call will fail, since access to the global +## file namespace has been disallowed, but allowing entry into the syscall means +## that an audit trail will be generated (which is also very useful for debugging), +## +open + +## ## Allow poll(2), which will be scoped by capability rights. ## ## XXXRW: Perhaps we don't need the OpenBSD version? ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#46 (text+ko) ==== @@ -39,7 +39,7 @@ { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, SYF_CAPENABLED }, /* 2 = fork */ { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 3 = read */ { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 4 = write */ - { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = open */ + { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, SYF_CAPENABLED }, /* 5 = open */ { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED }, /* 6 = close */ { AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = wait4 */ { compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = old creat */ From owner-p4-projects@FreeBSD.ORG Wed Jan 27 20:21:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CCF11065785; Wed, 27 Jan 2010 20:21:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD2561065782 for ; Wed, 27 Jan 2010 20:21:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA0C18FC14 for ; Wed, 27 Jan 2010 20:21:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0RKL4gJ007087 for ; Wed, 27 Jan 2010 20:21:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0RKL4ti007085 for perforce@freebsd.org; Wed, 27 Jan 2010 20:21:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 27 Jan 2010 20:21:04 GMT Message-Id: <201001272021.o0RKL4ti007085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173801 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2010 20:21:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=173801 Change 173801 by hselasky@hselasky_laptop001 on 2010/01/27 20:20:14 LibUSB: - add new USB API functions to check if an opened USB device is still connected. - fix four compile warnings - patch by: HPS Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#20 edit .. //depot/projects/usb/src/lib/libusb/libusb.h#12 edit .. //depot/projects/usb/src/lib/libusb/libusb10.c#21 edit .. //depot/projects/usb/src/lib/libusb/libusb10_io.c#12 edit .. //depot/projects/usb/src/lib/libusb/libusb20.3#7 edit .. //depot/projects/usb/src/lib/libusb/libusb20.c#15 edit .. //depot/projects/usb/src/lib/libusb/libusb20.h#10 edit .. //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#8 edit .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#9 edit .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#12 edit .. //depot/projects/usb/src/lib/libusb/usb.h#4 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#20 (text+ko) ==== @@ -231,6 +231,14 @@ .Pp . .Ft int +.Fn libusb_check_connected "libusb_device_handle *devh" +Test if USB device is still connected. Returns 0 on success, +LIBUSB_ERROR_NO_DEVICE if has been disconnected and a LIBUSB_ERROR +code on failure. +. +.Pp +. +.Ft int .Fn libusb_kernel_driver_active "libusb_device_handle *devh" "int interface" Determine if a driver is active on a interface. Returns 0 if no kernel driver is active, returns 1 if a kernel driver is active, returns LIBUSB_ERROR_NO_DEVICE @@ -488,6 +496,7 @@ .Fn usb_find_devices .Fn usb_device .Fn usb_get_busses +.Fn usb_check_connected . .Sh SEE ALSO .Xr libusb20 3 , ==== //depot/projects/usb/src/lib/libusb/libusb.h#12 (text+ko) ==== @@ -323,6 +323,7 @@ int libusb_claim_interface(libusb_device_handle * devh, int interface_number); int libusb_release_interface(libusb_device_handle * devh, int interface_number); int libusb_reset_device(libusb_device_handle * devh); +int libusb_check_connected(libusb_device_handle * devh); int libusb_kernel_driver_active(libusb_device_handle * devh, int interface); int libusb_detach_kernel_driver(libusb_device_handle * devh, int interface); int libusb_attach_kernel_driver(libusb_device_handle * devh, int interface); ==== //depot/projects/usb/src/lib/libusb/libusb10.c#21 (text+ko) ==== @@ -351,7 +351,7 @@ /* make sure our event loop detects the new device */ dummy = 0; err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy)); - if (err < sizeof(dummy)) { + if (err < (int)sizeof(dummy)) { /* ignore error, if any */ DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open write failed!"); } @@ -426,7 +426,7 @@ /* make sure our event loop detects the closed device */ dummy = 0; err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy)); - if (err < sizeof(dummy)) { + if (err < (int)sizeof(dummy)) { /* ignore error, if any */ DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_close write failed!"); } @@ -658,6 +658,21 @@ } int +libusb_check_connected(struct libusb20_device *pdev) +{ + libusb_device *dev; + int err; + + dev = libusb_get_device(pdev); + if (dev == NULL) + return (LIBUSB20_ERROR_INVALID_PARAM); + + err = libusb20_dev_check_connected(pdev); + + return (err ? LIBUSB_ERROR_NO_DEVICE : 0); +} + +int libusb_kernel_driver_active(struct libusb20_device *pdev, int interface) { if (pdev == NULL) ==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#12 (text+ko) ==== @@ -139,7 +139,7 @@ err = LIBUSB_ERROR_IO; if (err < 1) { - for (i = 0; i != nfds; i++) { + for (i = 0; i != (int)nfds; i++) { if (ppdev[i] != NULL) { CTX_UNLOCK(ctx); libusb_unref_device(libusb_get_device(ppdev[i])); @@ -148,7 +148,7 @@ } goto do_done; } - for (i = 0; i != nfds; i++) { + for (i = 0; i != (int)nfds; i++) { if (ppdev[i] != NULL) { dev = libusb_get_device(ppdev[i]); ==== //depot/projects/usb/src/lib/libusb/libusb20.3#7 (text+ko) ==== @@ -143,6 +143,8 @@ .Ft int .Fn libusb20_dev_reset "struct libusb20_device *pdev" .Ft int +.Fn libusb20_dev_check_connected "struct libusb20_device *pdev" +.Ft int .Fn libusb20_dev_set_power_mode "struct libusb20_device *pdev" "uint8_t power_mode" .Ft uint8_t .Fn libusb20_dev_get_power_mode "struct libusb20_device *pdev" @@ -677,6 +679,15 @@ This function returns zero on success else a LIBUSB20_ERROR value is returned. . +. +.Pp +. +.Fn libusb20_dev_check_connected +will check if an opened USB device is still connected. +. +This function returns zero if the device is still connected else a LIBUSB20_ERROR value is returned. +. +. .Pp . .Fn libusb20_dev_set_power_mode ==== //depot/projects/usb/src/lib/libusb/libusb20.c#15 (text+ko) ==== @@ -67,6 +67,7 @@ #define dummy_set_config_index (void *)dummy_int #define dummy_set_alt_index (void *)dummy_int #define dummy_reset_device (void *)dummy_int +#define dummy_check_connected (void *)dummy_int #define dummy_set_power_mode (void *)dummy_int #define dummy_get_power_mode (void *)dummy_int #define dummy_kernel_driver_active (void *)dummy_int @@ -673,6 +674,15 @@ } int +libusb20_dev_check_connected(struct libusb20_device *pdev) +{ + int error; + + error = pdev->methods->check_connected(pdev); + return (error); +} + +int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode) { int error; ==== //depot/projects/usb/src/lib/libusb/libusb20.h#10 (text+ko) ==== @@ -250,6 +250,7 @@ int libusb20_dev_req_string_sync(struct libusb20_device *pdev, uint8_t index, uint16_t langid, void *ptr, uint16_t len); int libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, uint8_t index, void *ptr, uint16_t len); int libusb20_dev_reset(struct libusb20_device *pdev); +int libusb20_dev_check_connected(struct libusb20_device *pdev); int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); ==== //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#8 (text+ko) ==== @@ -795,6 +795,19 @@ return (usb_close(dev)); } +int +usb_check_connected(usb_dev_handle * dev) +{ + int err; + + err = libusb20_dev_check_connected((void *)dev); + + if (err) + return (-1); + + return (0); +} + const char * usb_strerror(void) { ==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#9 (text+ko) ==== @@ -101,6 +101,7 @@ typedef int (libusb20_get_power_mode_t)(struct libusb20_device *pdev, uint8_t *power_mode); typedef int (libusb20_set_alt_index_t)(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); typedef int (libusb20_set_config_index_t)(struct libusb20_device *pdev, uint8_t index); +typedef int (libusb20_check_connected_t)(struct libusb20_device *pdev); /* USB transfer specific */ typedef int (libusb20_tr_open_t)(struct libusb20_transfer *xfer, uint32_t MaxBufSize, uint32_t MaxFrameCount, uint8_t ep_no); @@ -117,6 +118,7 @@ m(n, kernel_driver_active) \ m(n, process) \ m(n, reset_device) \ + m(n, check_connected) \ m(n, set_power_mode) \ m(n, get_power_mode) \ m(n, set_alt_index) \ ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#12 (text+ko) ==== @@ -67,6 +67,7 @@ static libusb20_set_config_index_t ugen20_set_config_index; static libusb20_set_alt_index_t ugen20_set_alt_index; static libusb20_reset_device_t ugen20_reset_device; +static libusb20_check_connected_t ugen20_check_connected; static libusb20_set_power_mode_t ugen20_set_power_mode; static libusb20_get_power_mode_t ugen20_get_power_mode; static libusb20_kernel_driver_active_t ugen20_kernel_driver_active; @@ -553,6 +554,25 @@ } static int +ugen20_check_connected(struct libusb20_device *pdev) +{ + uint32_t plugtime; + int error = 0; + + if (ioctl(pdev->file_ctrl, USB_GET_PLUGTIME, &plugtime)) { + error = LIBUSB20_ERROR_NO_DEVICE; + goto done; + } + + if (pdev->session_data.plugtime != plugtime) { + error = LIBUSB20_ERROR_NO_DEVICE; + goto done; + } +done: + return (error); +} + +static int ugen20_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode) { int temp; ==== //depot/projects/usb/src/lib/libusb/usb.h#4 (text+ko) ==== @@ -291,6 +291,7 @@ int usb_resetep(usb_dev_handle * dev, unsigned int ep); int usb_clear_halt(usb_dev_handle * dev, unsigned int ep); int usb_reset(usb_dev_handle * dev); +int usb_check_connected(usb_dev_handle * dev); const char *usb_strerror(void); void usb_init(void); void usb_set_debug(int level); From owner-p4-projects@FreeBSD.ORG Wed Jan 27 21:56:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2214B1065672; Wed, 27 Jan 2010 21:56:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9ED51065696 for ; Wed, 27 Jan 2010 21:56:41 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5C1B8FC14 for ; Wed, 27 Jan 2010 21:56:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0RLufrk026112 for ; Wed, 27 Jan 2010 21:56:41 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0RLufpM026108 for perforce@freebsd.org; Wed, 27 Jan 2010 21:56:41 GMT (envelope-from peter@wemm.org) Date: Wed, 27 Jan 2010 21:56:41 GMT Message-Id: <201001272156.o0RLufpM026108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2010 21:56:42 -0000 http://p4web.freebsd.org/chv.cgi?CH=173808 Change 173808 by peter@peter_daintree on 2010/01/27 21:56:17 IFC @173807 Affected files ... .. //depot/projects/hammer/Makefile.inc1#152 integrate .. //depot/projects/hammer/contrib/libpcap/inet.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/CACerts#3 integrate .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#19 integrate .. //depot/projects/hammer/contrib/sendmail/LICENSE#4 integrate .. //depot/projects/hammer/contrib/sendmail/PGPKEYS#10 integrate .. //depot/projects/hammer/contrib/sendmail/README#6 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#16 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#13 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#16 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/ldap_routing.m4#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/cfhead.m4#7 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#14 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#16 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/qtool.pl#4 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/smcontrol.pl#2 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#12 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/mfapi.h#9 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/mfdef.h#6 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#13 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/ldap.h#6 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/sem.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/Makefile.m4#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/comm.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/api.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/overview.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_addheader.html#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_chgheader.html#6 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_insheader.html#3 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/engine.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/example.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/handler.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/libmilter.h#8 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/listener.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/main.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/worker.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/debug.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/ldap.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/mbdb.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/sem.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/t-sem.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsmdb/smdb1.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsmdb/smdb2.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/libsmutil/safefile.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/praliases/praliases.8#2 integrate .. //depot/projects/hammer/contrib/sendmail/praliases/praliases.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/Makefile.m4#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/README#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/TRACEFLAGS#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/collect.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#16 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.h#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/daemon.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/deliver.c#14 integrate .. //depot/projects/hammer/contrib/sendmail/src/envelope.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#15 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#14 integrate .. //depot/projects/hammer/contrib/sendmail/src/map.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/milter.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#16 integrate .. //depot/projects/hammer/contrib/sendmail/src/ratectrl.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/readcf.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/savemail.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.8#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#16 integrate .. //depot/projects/hammer/contrib/sendmail/src/sfsasl.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#16 integrate .. //depot/projects/hammer/contrib/sendmail/src/tls.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#13 integrate .. //depot/projects/hammer/contrib/sendmail/src/util.c#12 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#16 integrate .. //depot/projects/hammer/contrib/sendmail/vacation/vacation.c#8 integrate .. //depot/projects/hammer/etc/etc.amd64/ttys#12 integrate .. //depot/projects/hammer/etc/etc.arm/ttys#10 integrate .. //depot/projects/hammer/etc/etc.i386/ttys#10 integrate .. //depot/projects/hammer/etc/etc.ia64/ttys#11 integrate .. //depot/projects/hammer/etc/etc.mips/ttys#7 integrate .. //depot/projects/hammer/etc/etc.pc98/ttys#2 integrate .. //depot/projects/hammer/etc/etc.powerpc/ttys#11 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#18 integrate .. //depot/projects/hammer/etc/rc.subr#49 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.mc#13 integrate .. //depot/projects/hammer/etc/sendmail/freebsd.submit.mc#8 integrate .. //depot/projects/hammer/etc/services#18 integrate .. //depot/projects/hammer/lib/libc/gen/getttyent.c#8 integrate .. //depot/projects/hammer/lib/libc/nls/msgcat.c#9 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#54 integrate .. //depot/projects/hammer/lib/libc/sys/mount.2#12 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#17 integrate .. //depot/projects/hammer/lib/libgssapi/gss_accept_sec_context.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_acquire_cred.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_add_cred.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_add_oid_set_member.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_canonicalize_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_compare_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_context_time.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_create_empty_oid_set.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_delete_sec_context.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_status.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_duplicate_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_export_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_export_sec_context.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_get_mic.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_import_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_import_sec_context.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_indicate_mechs.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_init_sec_context.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_context.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred_by_mech.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_mechs_for_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_inquire_names_for_mech.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_process_context_token.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_buffer.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_cred.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_name.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_release_oid_set.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_test_oid_set_member.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_unwrap.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_verify_mic.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_wrap.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gss_wrap_size_limit.3#4 integrate .. //depot/projects/hammer/lib/libgssapi/gssapi.3#3 integrate .. //depot/projects/hammer/lib/libgssapi/mech.5#3 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_get_error.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_get_mech_info.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_get_principal_name.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_get_versions.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_getcred.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_is_installed.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_max_data_length.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_qop_to_num.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_seccreate.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_set_callback.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_set_defaults.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_set_svc_name.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#2 integrate .. //depot/projects/hammer/lib/librpcsec_gss/rpcsec_gss.3#2 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#13 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#14 integrate .. //depot/projects/hammer/release/pc98/boot_crunch.conf#13 integrate .. //depot/projects/hammer/release/powerpc/boot_crunch.conf#10 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#13 integrate .. //depot/projects/hammer/release/sun4v/boot_crunch.conf#8 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#60 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#48 integrate .. //depot/projects/hammer/sbin/init/init.c#17 integrate .. //depot/projects/hammer/share/man/man4/Makefile#128 integrate .. //depot/projects/hammer/share/man/man4/netintro.4#7 integrate .. //depot/projects/hammer/share/man/man4/nvram.4#1 branch .. //depot/projects/hammer/share/misc/committers-ports.dot#19 integrate .. //depot/projects/hammer/share/zoneinfo/northamerica#19 integrate .. //depot/projects/hammer/share/zoneinfo/zone.tab#22 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#14 integrate .. //depot/projects/hammer/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#55 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#67 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-marvell.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-promise.c#7 integrate .. //depot/projects/hammer/sys/dev/cfe/cfe_console.c#5 integrate .. //depot/projects/hammer/sys/dev/e1000/LICENSE#3 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_80003es2lan.c#5 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82540.c#5 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82541.c#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82542.c#4 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82543.c#4 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82571.c#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82575.c#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82575.h#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_api.c#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_api.h#4 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_defines.h#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_hw.h#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_ich8lan.c#7 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_ich8lan.h#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_mac.c#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_mac.h#4 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_manage.c#4 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_osdep.h#4 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_phy.c#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_phy.h#6 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_regs.h#6 integrate .. //depot/projects/hammer/sys/dev/e1000/if_em.c#13 integrate .. //depot/projects/hammer/sys/dev/e1000/if_em.h#6 integrate .. //depot/projects/hammer/sys/dev/e1000/if_igb.c#12 integrate .. //depot/projects/hammer/sys/dev/e1000/if_igb.h#6 integrate .. //depot/projects/hammer/sys/dev/fb/vesa.c#5 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#28 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#75 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_urtw.c#6 integrate .. //depot/projects/hammer/sys/dev/usb/wlan/if_urtwvar.h#3 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#20 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#22 integrate .. //depot/projects/hammer/sys/geom/virstor/g_virstor.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#128 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#80 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#59 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#52 integrate .. //depot/projects/hammer/sys/mips/cavium/octeon_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1#2 integrate .. //depot/projects/hammer/sys/mips/conf/OCTEON1-32#3 integrate .. //depot/projects/hammer/sys/mips/conf/XLR#2 integrate .. //depot/projects/hammer/sys/mips/include/cpuregs.h#3 integrate .. //depot/projects/hammer/sys/mips/mips/busdma_machdep.c#5 integrate .. //depot/projects/hammer/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/hammer/sys/mips/mips/exception.S#4 integrate .. //depot/projects/hammer/sys/mips/mips/swtch.S#4 integrate .. //depot/projects/hammer/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/hammer/sys/mips/rmi/clock.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/hammer/sys/mips/rmi/xlr_machdep.c#3 integrate .. //depot/projects/hammer/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/hammer/sys/net/if.c#97 integrate .. //depot/projects/hammer/sys/net/if.h#40 integrate .. //depot/projects/hammer/sys/net/if_var.h#65 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#29 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#52 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_nfsiod.c#19 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#42 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#79 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#27 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#46 integrate .. //depot/projects/hammer/sys/sparc64/pci/fire.c#3 integrate .. //depot/projects/hammer/sys/sys/param.h#139 integrate .. //depot/projects/hammer/sys/sys/priv.h#20 integrate .. //depot/projects/hammer/sys/sys/sockio.h#13 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#74 integrate .. //depot/projects/hammer/usr.bin/make/make.1#40 integrate .. //depot/projects/hammer/usr.bin/uname/uname.1#6 integrate .. //depot/projects/hammer/usr.bin/uname/uname.c#8 integrate .. //depot/projects/hammer/usr.sbin/makefs/makefs.8#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#40 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#152 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.639 2010/01/23 19:29:42 antoine Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.640 2010/01/26 10:00:26 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1113,19 +1113,19 @@ gnu/lib/libgcc__L: lib/libc__L -_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ - ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \ - ${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \ - lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ + ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat \ - ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \ + ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libdwarf lib/libproc + ${_secure_lib_libssl} .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1145,17 +1145,13 @@ _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ - kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ - lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ - lib/libcrypt__L -.endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS_SUPPORT} != "no" -secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ + lib/libmd__L kerberos5/lib/libroken__L .endif .endif .endif @@ -1177,7 +1173,6 @@ _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 .endif .if ${MK_NIS} != "no" ==== //depot/projects/hammer/contrib/libpcap/inet.c#8 (text+ko) ==== @@ -401,10 +401,15 @@ pcap_if_t *curdev; char *description = NULL; pcap_addr_t *curaddr, *prevaddr, *nextaddr; + int s; #ifdef SIOCGIFDESCR struct ifreq ifrdesc; +#ifndef IFDESCRSIZE +#define _IFDESCRSIZE 64 + char ifdescr[_IFDESCRSIZE]; +#else char ifdescr[IFDESCRSIZE]; - int s; +#endif #endif #ifdef SIOCGIFDESCR @@ -413,12 +418,17 @@ */ memset(&ifrdesc, 0, sizeof ifrdesc); strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); +#ifdef __FreeBSD__ + ifrdesc.ifr_buffer.buffer = ifdescr; + ifrdesc.ifr_buffer.length = sizeof(ifdescr); +#else ifrdesc.ifr_data = (caddr_t)&ifdescr; +#endif s = socket(AF_INET, SOCK_DGRAM, 0); if (s >= 0) { if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 && - strlen(ifrdesc.ifr_data) != 0) - description = ifrdesc.ifr_data; + strlen(ifdescr) != 0) + description = ifdescr; close(s); } #endif ==== //depot/projects/hammer/contrib/sendmail/CACerts#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $Id: CACerts,v 8.3 2007/06/11 22:04:46 ca Exp $ +# $Id: CACerts,v 8.4 2009/06/26 05:46:10 ca Exp $ # This file contains some CA certificates that are used to sign the # certificates of mail servers of members of the sendmail consortium # who may reply to questions etc sent to sendmail.org. @@ -11,73 +11,6 @@ Version: 3 (0x2) Serial Number: 0 (0x0) Signature Algorithm: md5WithRSAEncryption - Issuer: C=US, ST=California, L=Berkeley, O=Sendmail Consortium, CN=Certificate Authority/emailAddress=certificates@sendmail.org - Validity - Not Before: Feb 1 21:51:47 2003 GMT - Not After : Jan 31 21:51:47 2008 GMT - Subject: C=US, ST=California, L=Berkeley, O=Sendmail Consortium, CN=Certificate Authority/emailAddress=certificates@sendmail.org - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public Key: (1024 bit) - Modulus (1024 bit): - 00:9a:fb:dc:4c:a3:58:21:1b:84:78:0a:53:56:b3: - 8d:84:05:b7:db:dd:d7:81:ea:dd:c1:ab:d4:be:d9: - 2b:12:e0:6d:3a:31:d5:f0:7b:13:fc:d8:da:09:0b: - 71:11:8e:b9:48:c4:ab:ae:f5:9c:4c:e2:04:27:8e: - c8:03:3a:aa:00:8b:46:f2:79:09:ae:65:b2:9a:66: - e7:ac:a9:ea:32:f7:4a:4e:fd:da:41:48:34:5a:9d: - b0:42:ea:55:40:17:27:5e:67:9e:e5:ce:dc:84:6d: - 1d:48:37:23:11:68:9d:a8:d4:58:02:05:ea:88:35: - bd:0d:b6:28:d5:cd:d4:d8:95 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - DE:CD:6E:B8:89:34:06:3D:E9:CD:A7:FE:45:4F:4E:FB:E1:8D:E7:79 - X509v3 Authority Key Identifier: - keyid:DE:CD:6E:B8:89:34:06:3D:E9:CD:A7:FE:45:4F:4E:FB:E1:8D:E7:79 - DirName:/C=US/ST=California/L=Berkeley/O=Sendmail Consortium/CN=Certificate Authority/emailAddress=certificates@sendmail.org - serial:00 - - X509v3 Basic Constraints: - CA:TRUE - Signature Algorithm: md5WithRSAEncryption - 66:92:b9:57:17:3b:6a:0e:72:b1:85:29:53:9f:11:68:a0:0d: - 79:43:d0:7c:48:73:b9:71:09:50:08:02:03:0b:28:0c:33:9a: - 00:ac:94:69:4f:bc:0f:45:6b:f5:3a:ca:6a:87:a1:7f:28:f7: - 9a:c4:b6:b0:f3:dc:a3:eb:42:95:9f:99:19:f8:b8:84:6d:f1: - 1d:bc:9f:f0:a0:cc:60:2d:00:6b:17:55:33:16:85:d1:73:e1: - 00:59:89:33:19:c4:2e:29:5a:39:a7:0e:e7:9b:d2:4c:c7:b9: - 7d:6a:3e:b4:00:83:86:d3:16:28:fd:ad:55:65:60:4e:14:02: - 46:d3 ------BEGIN CERTIFICATE----- -MIIDsDCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBnTELMAkGA1UEBhMCVVMx -EzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCEJlcmtlbGV5MRwwGgYDVQQK -ExNTZW5kbWFpbCBDb25zb3J0aXVtMR4wHAYDVQQDExVDZXJ0aWZpY2F0ZSBBdXRo -b3JpdHkxKDAmBgkqhkiG9w0BCQEWGWNlcnRpZmljYXRlc0BzZW5kbWFpbC5vcmcw -HhcNMDMwMjAxMjE1MTQ3WhcNMDgwMTMxMjE1MTQ3WjCBnTELMAkGA1UEBhMCVVMx -EzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCEJlcmtlbGV5MRwwGgYDVQQK -ExNTZW5kbWFpbCBDb25zb3J0aXVtMR4wHAYDVQQDExVDZXJ0aWZpY2F0ZSBBdXRo -b3JpdHkxKDAmBgkqhkiG9w0BCQEWGWNlcnRpZmljYXRlc0BzZW5kbWFpbC5vcmcw -gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJr73EyjWCEbhHgKU1azjYQFt9vd -14Hq3cGr1L7ZKxLgbTox1fB7E/zY2gkLcRGOuUjEq671nEziBCeOyAM6qgCLRvJ5 -Ca5lsppm56yp6jL3Sk792kFINFqdsELqVUAXJ15nnuXO3IRtHUg3IxFonajUWAIF -6og1vQ22KNXN1NiVAgMBAAGjgf0wgfowHQYDVR0OBBYEFN7NbriJNAY96c2n/kVP -Tvvhjed5MIHKBgNVHSMEgcIwgb+AFN7NbriJNAY96c2n/kVPTvvhjed5oYGjpIGg -MIGdMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMI -QmVya2VsZXkxHDAaBgNVBAoTE1NlbmRtYWlsIENvbnNvcnRpdW0xHjAcBgNVBAMT -FUNlcnRpZmljYXRlIEF1dGhvcml0eTEoMCYGCSqGSIb3DQEJARYZY2VydGlmaWNh -dGVzQHNlbmRtYWlsLm9yZ4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUA -A4GBAGaSuVcXO2oOcrGFKVOfEWigDXlD0HxIc7lxCVAIAgMLKAwzmgCslGlPvA9F -a/U6ymqHoX8o95rEtrDz3KPrQpWfmRn4uIRt8R28n/CgzGAtAGsXVTMWhdFz4QBZ -iTMZxC4pWjmnDueb0kzHuX1qPrQAg4bTFij9rVVlYE4UAkbT ------END CERTIFICATE----- - - -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 0 (0x0) - Signature Algorithm: md5WithRSAEncryption Issuer: C=US, ST=Illinois, L=De Kalb, O=Northern Illinois University, OU=Computer Science, CN=Neil Rickert/emailAddress=rickert@cs.niu.edu Validity Not Before: May 12 00:40:50 2000 GMT @@ -144,93 +77,93 @@ Data: Version: 3 (0x2) Serial Number: - fa:7c:2c:80:29:3f:c2:64 + c2:3c:61:67:3b:0a:cc:5e Signature Algorithm: md5WithRSAEncryption - Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org + Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2009/emailAddress=ca+ca-rsa2009@esmtp.org Validity - Not Before: May 4 02:07:56 2007 GMT - Not After : May 3 02:07:56 2010 GMT - Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org + Not Before: May 14 04:42:18 2009 GMT + Not After : May 13 04:42:18 2012 GMT + Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2009/emailAddress=ca+ca-rsa2009@esmtp.org Subject Public Key Info: Public Key Algorithm: rsaEncryption RSA Public Key: (2048 bit) Modulus (2048 bit): - 00:b0:28:91:31:af:82:ce:72:ef:36:ab:7d:e9:b1: - f5:77:66:38:4b:38:1f:5f:3d:12:d3:c8:fd:9a:f4: - d4:f6:b8:90:f9:26:5f:29:f7:43:f9:34:ec:65:62: - 01:bb:64:f1:5d:ea:75:04:3d:92:65:60:a2:06:62: - fa:88:ca:d8:20:50:c8:1e:38:53:b5:18:dd:b7:bd: - c7:08:35:4c:d9:dc:c6:97:56:37:b6:65:33:74:5a: - b2:c3:85:08:2b:b7:26:70:ff:38:02:1a:67:6a:d0: - 49:18:10:4b:f8:db:af:06:9c:b1:a8:82:a1:b1:75: - d2:52:9b:53:0c:ca:a7:e3:15:38:79:6d:a1:f5:ef: - 7c:8b:fd:bd:04:78:f9:e8:1e:b9:92:ea:74:d7:45: - 1e:4c:c8:bd:f4:5c:fc:1a:7f:e7:31:c6:ab:cb:78: - c7:4d:2f:b5:72:10:35:27:4a:1a:fa:53:19:f8:a7: - 59:63:eb:e9:15:ab:dc:71:69:8c:42:1c:96:4e:89: - 80:66:c9:9e:21:d5:3d:08:19:74:a5:f5:07:a0:ae: - de:79:af:fd:42:c2:79:7e:8c:f8:39:22:3b:c3:c4: - 58:3b:d0:0d:e6:a9:11:b6:a2:cd:2e:e5:16:66:fd: - 7e:65:33:94:b0:36:80:27:f5:80:76:a9:e5:df:f2: - cf:ef + 00:d5:f8:d3:48:38:75:df:2e:6b:8b:c4:8d:1d:41: + 5e:ad:4b:96:3d:48:c2:dc:e5:ff:61:98:95:32:03: + e9:b6:71:5a:68:31:bc:e1:5c:aa:0e:70:a7:bc:51: + b7:13:6a:78:54:ae:a6:d0:44:49:1b:5e:37:5b:59: + 20:01:47:a7:ec:41:4c:11:79:8c:25:c1:1b:c0:ed: + 85:b2:de:0f:10:9f:e7:b2:a3:c4:f1:fc:85:51:aa: + d6:68:49:51:3e:04:e1:eb:e9:cd:87:1b:d0:9d:97: + 7b:4c:e1:1e:b1:6a:be:01:0a:a9:97:9a:50:89:e3: + 66:06:4c:07:cb:7e:99:70:13:e8:b4:9c:e7:e6:52: + 38:c0:64:90:42:d0:f5:cf:22:46:22:60:e9:34:70: + 1d:e3:d1:13:33:3a:31:ba:13:06:a8:c2:34:90:47: + c5:a1:bd:2d:7d:98:21:70:de:22:d0:13:11:e5:08: + dd:a0:77:0b:df:34:a7:07:55:de:5a:71:f6:6c:9e: + ec:f7:45:75:1f:22:a9:84:06:c6:4f:84:3d:4e:05: + d7:e4:e5:98:41:61:7b:8e:c9:3b:a6:ed:31:80:7d: + fd:fa:f0:dc:b7:07:82:b8:ec:27:20:39:5f:78:95: + f1:0d:93:8d:f9:4d:21:08:fd:72:89:01:ff:2c:a0: + 71:9d Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - B2:49:6B:52:45:EE:90:36:D2:79:47:03:33:D9:A0:BA:80:50:DA:1C + A7:61:FA:31:AF:A8:E2:5E:93:B6:84:9E:74:08:A2:76:50:87:69:7C X509v3 Authority Key Identifier: - keyid:B2:49:6B:52:45:EE:90:36:D2:79:47:03:33:D9:A0:BA:80:50:DA:1C - DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org - serial:FA:7C:2C:80:29:3F:C2:64 + keyid:A7:61:FA:31:AF:A8:E2:5E:93:B6:84:9E:74:08:A2:76:50:87:69:7C + DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2009/emailAddress=ca+ca-rsa2009@esmtp.org + serial:C2:3C:61:67:3B:0A:CC:5E X509v3 Basic Constraints: - CA:TRUE + CA:TRUE X509v3 Subject Alternative Name: - email:ca+ca-rsa2007@esmtp.org + email:ca+ca-rsa2009@esmtp.org X509v3 Issuer Alternative Name: - email:ca+ca-rsa2007@esmtp.org + email:ca+ca-rsa2009@esmtp.org Signature Algorithm: md5WithRSAEncryption - 98:98:7c:d3:d0:5b:72:47:15:e6:22:68:bb:78:0e:78:66:e9: - 56:16:d8:bc:9d:5a:dc:27:29:fb:91:2d:6a:21:35:18:56:b4: - 4f:2a:09:c0:08:6f:9a:59:2b:2e:72:9a:fb:50:ba:c7:a9:91: - a0:f9:6c:be:cf:78:42:43:02:70:53:97:ba:6a:e3:da:17:e8: - 1f:c7:3a:5b:e7:bc:eb:e5:24:4c:f5:cf:61:34:1e:20:ed:17: - 63:ef:81:d3:9e:25:fe:cc:05:19:cc:8a:82:c9:4c:3a:b5:6b: - 49:51:76:46:02:aa:60:bb:c4:b9:61:48:33:da:79:8d:46:a3: - 06:20:98:f3:b2:db:3b:ad:c9:1d:0e:97:3d:b7:14:19:d3:7d: - 04:8b:6a:81:e0:11:5b:e1:35:a3:ff:2f:11:86:1c:31:85:7a: - fd:3f:36:ef:99:25:46:2e:b0:cb:43:45:4a:ec:be:d3:3f:a4: - 77:9b:79:cc:ce:92:63:a5:d9:ed:db:a0:9d:5d:7c:d7:80:f6: - c9:41:fb:02:96:8e:fd:f3:da:05:9d:81:a7:25:da:26:35:3b: - a9:0c:8c:f5:a7:5d:48:ec:87:c7:7a:60:51:76:f2:de:9b:14: - 2b:55:8a:43:df:99:19:f3:eb:e7:03:e6:a7:a2:a2:28:dd:d5: - 07:6a:3f:f7 + b3:38:e0:da:a8:07:d8:cc:b8:4d:8c:20:a6:06:2c:f8:27:db: + 8e:28:0f:39:bd:d9:24:c7:9f:e0:4d:d6:b6:63:42:36:0f:d8: + 70:41:e7:9e:a2:24:64:05:ea:85:97:ac:f2:cc:c2:a6:71:bb: + 30:21:c1:c7:c4:54:34:1d:30:09:f0:9b:74:27:93:59:12:4c: + 53:0b:8c:3e:d0:39:ed:4a:d0:d9:66:24:d8:e7:e5:9c:a8:6d: + 5f:56:5d:9a:91:fe:1b:7d:b9:7c:79:9e:1c:b9:71:74:14:f8: + 0c:30:50:f9:b1:22:56:a8:4d:6f:4b:9b:e5:8a:81:33:1b:77: + 75:f6:d8:ce:d4:90:34:86:34:d1:86:75:a9:e1:23:e6:af:c1: + 8e:28:97:47:20:4d:1b:57:09:39:f4:56:01:d2:87:43:3e:29: + f6:c4:5b:7d:8f:9e:bd:ad:36:79:cf:09:70:43:30:21:98:23: + 31:c8:0d:39:ee:77:e1:4a:44:1a:5c:79:2f:6c:ec:8a:3c:db: + 99:a0:11:bc:1a:46:24:51:e7:75:d6:9a:db:ad:dd:55:d4:dd: + ca:81:a0:10:77:96:91:9c:76:30:38:18:f0:82:43:b3:7c:41: + 64:4c:4e:da:66:22:67:cf:b7:d7:10:ba:ed:f4:6d:43:59:00: + d0:82:1e:07 -----BEGIN CERTIFICATE----- -MIIFJzCCBA+gAwIBAgIJAPp8LIApP8JkMA0GCSqGSIb3DQEBBAUAMIGlMQswCQYD +MIIFJzCCBA+gAwIBAgIJAMI8YWc7CsxeMA0GCSqGSIb3DQEBBAUAMIGlMQswCQYD VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx FDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNNVEExIjAgBgNVBAMTGUNs -YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDcxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz -YTIwMDdAZXNtdHAub3JnMB4XDTA3MDUwNDAyMDc1NloXDTEwMDUwMzAyMDc1Nlow +YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDkxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz +YTIwMDlAZXNtdHAub3JnMB4XDTA5MDUxNDA0NDIxOFoXDTEyMDUxMzA0NDIxOFow gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhC ZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAKBgNVBAsTA01UQTEiMCAG -A1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEmMCQGCSqGSIb3DQEJARYX -Y2ErY2EtcnNhMjAwN0Blc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQCwKJExr4LOcu82q33psfV3ZjhLOB9fPRLTyP2a9NT2uJD5Jl8p90P5 -NOxlYgG7ZPFd6nUEPZJlYKIGYvqIytggUMgeOFO1GN23vccINUzZ3MaXVje2ZTN0 -WrLDhQgrtyZw/zgCGmdq0EkYEEv4268GnLGogqGxddJSm1MMyqfjFTh5baH173yL -/b0EePnoHrmS6nTXRR5MyL30XPwaf+cxxqvLeMdNL7VyEDUnShr6Uxn4p1lj6+kV -q9xxaYxCHJZOiYBmyZ4h1T0IGXSl9Qegrt55r/1Cwnl+jPg5IjvDxFg70A3mqRG2 -os0u5RZm/X5lM5SwNoAn9YB2qeXf8s/vAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU -sklrUkXukDbSeUcDM9mguoBQ2hwwgdoGA1UdIwSB0jCBz4AUsklrUkXukDbSeUcD -M9mguoBQ2hyhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y +A1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwOTEmMCQGCSqGSIb3DQEJARYX +Y2ErY2EtcnNhMjAwOUBlc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDV+NNIOHXfLmuLxI0dQV6tS5Y9SMLc5f9hmJUyA+m2cVpoMbzhXKoO +cKe8UbcTanhUrqbQREkbXjdbWSABR6fsQUwReYwlwRvA7YWy3g8Qn+eyo8Tx/IVR +qtZoSVE+BOHr6c2HG9Cdl3tM4R6xar4BCqmXmlCJ42YGTAfLfplwE+i0nOfmUjjA +ZJBC0PXPIkYiYOk0cB3j0RMzOjG6EwaowjSQR8WhvS19mCFw3iLQExHlCN2gdwvf +NKcHVd5acfZsnuz3RXUfIqmEBsZPhD1OBdfk5ZhBYXuOyTum7TGAff368Ny3B4K4 +7CcgOV94lfENk435TSEI/XKJAf8soHGdAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU +p2H6Ma+o4l6TtoSedAiidlCHaXwwgdoGA1UdIwSB0jCBz4AUp2H6Ma+o4l6TtoSe +dAiidlCHaXyhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y bmlhMREwDwYDVQQHEwhCZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAK -BgNVBAsTA01UQTEiMCAGA1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEm -MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAwN0Blc210cC5vcmeCCQD6fCyAKT/C -ZDAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAu -b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAub3JnMA0GCSqGSIb3 -DQEBBAUAA4IBAQCYmHzT0FtyRxXmImi7eA54ZulWFti8nVrcJyn7kS1qITUYVrRP -KgnACG+aWSsucpr7ULrHqZGg+Wy+z3hCQwJwU5e6auPaF+gfxzpb57zr5SRM9c9h -NB4g7Rdj74HTniX+zAUZzIqCyUw6tWtJUXZGAqpgu8S5YUgz2nmNRqMGIJjzsts7 -rckdDpc9txQZ030Ei2qB4BFb4TWj/y8RhhwxhXr9PzbvmSVGLrDLQ0VK7L7TP6R3 -m3nMzpJjpdnt26CdXXzXgPbJQfsClo7989oFnYGnJdomNTupDIz1p11I7IfHemBR -dvLemxQrVYpD35kZ8+vnA+anoqIo3dUHaj/3 +BgNVBAsTA01UQTEiMCAGA1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwOTEm +MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAwOUBlc210cC5vcmeCCQDCPGFnOwrM +XjAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMDlAZXNtdHAu +b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMDlAZXNtdHAub3JnMA0GCSqGSIb3 +DQEBBAUAA4IBAQCzOODaqAfYzLhNjCCmBiz4J9uOKA85vdkkx5/gTda2Y0I2D9hw +QeeeoiRkBeqFl6zyzMKmcbswIcHHxFQ0HTAJ8Jt0J5NZEkxTC4w+0DntStDZZiTY +5+WcqG1fVl2akf4bfbl8eZ4cuXF0FPgMMFD5sSJWqE1vS5vlioEzG3d19tjO1JA0 +hjTRhnWp4SPmr8GOKJdHIE0bVwk59FYB0odDPin2xFt9j569rTZ5zwlwQzAhmCMx +yA057nfhSkQaXHkvbOyKPNuZoBG8GkYkUed11prbrd1V1N3KgaAQd5aRnHYwOBjw +gkOzfEFkTE7aZiJnz7fXELrt9G1DWQDQgh4H -----END CERTIFICATE----- ==== //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#19 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.35 2008/08/28 06:20:43 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.36 2010/01/26 04:45:26 gshapiro Exp $ -sendmail 8.14.3 +sendmail 8.14.4 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following directories were renamed: @@ -110,4 +110,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -27-August-2008 +25-January-2010 ==== //depot/projects/hammer/contrib/sendmail/LICENSE#4 (text+ko) ==== @@ -1,7 +1,7 @@ SENDMAIL LICENSE The following license terms and conditions apply, unless a different -license is obtained from Sendmail, Inc., 6425 Christie Ave, Fourth Floor, +license is obtained from Sendmail, Inc., 6475 Christie Ave, Suite 350, Emeryville, CA 94608, USA, or by electronic mail at license@sendmail.com. License Terms: @@ -33,7 +33,7 @@ forth as paragraph 6 below, in the documentation and/or other materials provided with the distribution. For the purposes of binary distribution the "Copyright Notice" refers to the following language: - "Copyright (c) 1998-2004 Sendmail, Inc. All rights reserved." + "Copyright (c) 1998-2009 Sendmail, Inc. All rights reserved." 4. Neither the name of Sendmail, Inc. nor the University of California nor the names of their contributors may be used to endorse or promote @@ -76,4 +76,4 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -$Revision: 8.13 $, Last updated $Date: 2004/05/11 23:57:57 $ +$Revision: 8.15 $, Last updated $Date: 2009/03/04 19:58:04 $ ==== //depot/projects/hammer/contrib/sendmail/PGPKEYS#10 (text+ko) ==== @@ -142,6 +142,79 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0xA77F2429 2009-01-01 ---------- RSA Sign & Encrypt +f16 Fingerprint16 = 33 3A 62 61 2C F3 21 AA 4E 87 47 F2 2F 2C 40 4D +uid Sendmail Signing Key/2009 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.8 (OpenBSD) + +mQCNA0lcVHwAAAEEAM7aXDJHNH3g0oxbsSUjqRiKh47W4srnfEYREj2Q26AXWzXE +BSyfl6QMRLbSVNIiPOWlMPbZWjCx4c1TNsj3TiiklCcievlvbAPVa3kY2hZ6pmyU +czJq4S/mT1lt+uPOCjvKxo8OLQoFuJMTIS+Ya7LVjW7fJD5yrhKJbpunfyQpAAUR +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDA5IDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQCVAwUQSVxUfBKJbpunfyQpAQHirwP+JvK4cBqtw9rxSZ0whmC1N4a2r24f +SH2WDC1zNNeiCHg93udKs3PKLPm688U+WxiaSsrGQXQlGojx7jn1XggTPOG+SteJ +JP/Ea9buJK9KaLaniUm84XxHxa71y3v3+SfhJMpJioY4G6qKqfLZFzmpiwUTvtLR +B9LfWvzvUUHJSTyJAJUDBRBJXFY9wZwdJRLTRh0BAcrBBACYcnhE8cx5eA8WqTR4 +2CVZgxxrIMOrqda+hdpSgsRjUEWRpb5+Es1hfM3OLXqbsywCTUvxeoymVYQr3aSP +sbm+rQ4l6gf7ibpiVZA6vDxh0EfwNYE+aI3AoW03ODoCAaj+utOjGdqzIcec0RpS +zXPI1gWW3sBck95KsiDUYmXYTIkAlQMFEElcVkzvWJZk1DLhnQEByUIEAKOdWew/ +M75xyVbugMGUZnAJrTZPKu9y3V3TLqyET3rGYfLjt6M4R+99j+mkhmi2rOckM9VV +30kvjW9BBarnr13XoMVTtLneoLaVrbMw4aZHRkTdRL14LIj+w1jzEKXDwYylJbGZ +UlmZn7lFkJrLIaBDmQl7GswBJRJvFLQbdzzMiQCVAwUQSVxWVW9Sk9ijm6ZVAQHr +DQP9ECF56TGI8YRPVOzZJzUyOmiMAouRoJ74aWfM8TA2Q8gVtedDc6IHiNzcVjq4 +jOZuMgb1KTPPF/TwWL5MHIFldsMdJ/i0Rml+x4h3Ff+8ZYlJgFBylUmx++nW1rbc +nn9RS/Es+zKsDOnTN5fTFo3br1z2saLnuXNB+SuJmSC8i2CJAJUDBRBJXFZgnBy9 +4uNcVjUBAcdaA/9ur7HbueufNbvr0HoDbhBijagbeqRrzmYtsOtYUfBGEtc5JiNH +r7NIAM66Tog8p9ZZA+qOaGHvujecBOTlokLpPKvcQngOz7c53z3Yop90TnMytUL2 +IExcuCdH4BMy72R5nH5YY5pMqb7pFjcyGDDIM8cxMgbZ3gzvbPDHZMUQ6okAlQMF +EElcVmc4IttHzDdPLQEBJ/0EANME79+Z/BItRKlSgzH52JBGGQZrZi57Pz+hJ+du +K7RgSkhpsXnk1kELvig5TCd2YaDZXoZwUrJLObVKAMI4lpGNTkZlzRRrFXcx4Q14 +YPJ/nay5jkqHvR9neKTsifzdsPVLi9nUDBMtURIQo5yn5AYMloiDzw/HpNGvkk92 +ITqwiQCVAwUQSVxWbolpYrhnjAoDAQHLDgP+L+Od/CoHaVUpsZld1SJKwvelIe1S +wT8SBqppQyDbKw0ZczetUSASt+g8OqJKD88I2no5mjEmHx0lncoKJ06qxpJBIu7A +lbByeE9i8Bn52YKhPGka4AwA3DOm5yR967BncOf/zY65t83hocZL1uKQeHW8wnpR +x3o+RBz2354phxyJAJUDBRBJXFZ2IYPhsTlvB4kBARKHA/sHFkKAvCo5Hto2CJWF +gyBCJUsUuHCaQTkfL4IspkIBjmrsr2KKe0WQUqIlebhhWzVhgYsc8AXZil+pLahC +L9CNQVQpoPKD3mit2+Vsi8254QxQjeYD3jUQT1C6uq6l9IORdIxYah9DNBNHCgwX +PuTMmpU1JQj6haKhGa1kbaQq2IkAlQMFEElcVn3I1e0plfYXcQEB2TYD+wYXb+sU +0vmG51lVWj2BPMvv/lbfzU6KnqXNCD2ra0yu6C83WHNFXEz+JuLYlzLnaKm8DJI/ +SFBZZIxpUaoaFHyGrjbWrDI6oMfvp/dMnJjfibNbmZuVIl2z0TKO98jiJ/+/9e/5 +AtCsSFfyZ6FSTtAHbG1ZOJvhPBub9aELiUCiiQCVAwUQSVxWknCgJE0e+ZJRAQHz +NQP7BYHJwViDWqp9c5DmxM6vHrVq/wsDyPgm52+QpopErCRt2iTpocldHQG/9ZdE +0ENn6PhI49xobh+m0HfoZZ+Cr4LPU7g2ftmEtrxtDN1BYdNQHZLZStUp7A8SsLgL +2IvYSI9iKAmQoWQTAOECDD41o1BOnnM1eraeUyqdmZaFm8iJAJUDBRBJXFaZHnuz +yK+VliUBAVgdBACmbsAKzbNnvfaTCJxqhaJI5uNDCdH7rgoCHEJR4aefPY89Do7b +ixLCyW4wUr7pxqvf/xbEGJHNCG5WnmncXBCnoEVqmHb7J9vQw1o3K6pRPqtTjVBR +VEUUK4xe6ZIOft3FOI5fKAPO5Vc9NlxPDjSJcjR6+B//TpecZ2L9A/Dp+4kAlQMF +EElcVqGXQwEYcJO4QQEBl1YD/AsMu6g/4KiwelIz2rDzm4wzvsQm+cYm47hv2IHV +Fkx5f8mS6um39+4J/FHni7i2bfSuHpRn1RdURR7Gebu7HKYfGTNLNYyKt7U/6VFb +ylDxUTS32sier3GlDrlJrBQ+VDIG4dUaioKoKUXxBhEVzAZrvkYhaiGWIl/K4zz5 +C1qdiQCVAwUQSVxWqdiq8Mr2swcpAQFzwgP9FJOM0MysHIjq/KihatPjerxhud6j +bd1Zo/tIKybvPsJNaeTeR+0IKm+vbAWtYL5oBc2wxgdQAs8tUi5SryK1otMAJ6sj +KNN+QxIp2FEumzReGRo+hCETiusjD9Abbh1L9L7FOkhGhH+m6fBVQIYUytmMFpnQ +qn17I9DVPxpwob+JAJUDBRBJXFa9wCnKQBb0zOkBAd0BA/9yRRB2waP3duE2rYKF +Obsbs3XXOQHEl/rjpIHVmYIqqRSglmlTEXwjKJeCEN9q0PRiazhztEhVJWP8ORRP +fkjlscP25T4A4tMC1F49biMak5MI2ffawVkUVsjIWFF/vFQIqKl4JG8SI/r4Oxep +yaozkowCJX3zZtkEfB2Id1nU9IkAlQMFEElcV0e92o/WP+p9/QEBxQID/R4E3pRI +isTe5RJotQKcsQKo3y+8KkmvfZQ6d3h/n4anq6bs1rRrWKqL6XoM7Nc5teLR3QaW +CVTssPtt3P06WqMm8Ct25iZ8dIyqRN0d0k5dJ6d5Qp4WSCL0TmTQ7wO4q9aCOhGK +YFKCP3i2v8zCOhuqk2pLeOYxl6f912COvmwSiQCVAwUQSVxXVXxLZ22gDhVjAQFU +WAP/TjyHxNVsptLRcFRfMCi9fjkrftbma00pzIaj9d6Ybxt6nMQ8C8TCTrurkXpq +9kGIrFVndsovql8++Y9VsDeh/vLX65mZl8FEVFvbl38+YSYeB44upadibU6uB0iL +zFz6da6gZmm/NENX3UCldIWv35L33EFotQ9GxTn8b0MQnY2JAJUDBRBJXFdl1uCh +/k++Kt0BAQ39BACfVZaig8loIuKosYh5Ydcefe0NZTZOCgPZ+mAzShEeBIN/btA0 ++jMXfu6tEgqUKQnyKCXZcPoZwY9Y0hOqGT2AIkWmZHJ/uKrzXIAcwUTS0TQV1k5x +mHPkZmvr55JDYp/JIbxIZ8QTpTuEzlymow12qMOUhPkL/wOQET9duDMKzokAlQMF +EEli68zPHrUDIjJ6AQEBzacD/RPBzReBSsVar0+B4xEW0i11LKV2Q7gH+y256IDX +3SxML4+GZM9FmEMVhlTbHPOE2rfwFvLrMxCmIqGHjMccJRZpV9OFpXa8z15FRDmJ +U01qOITDcIAiIPgGamifxMOYG4+spaj2sxLGnY/6aowhjh1XNbQPuJ6laNq7bz50 +wzfu +=RCyv +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits KeyID Created Expires Algorithm Use pub 1024 0xF6B30729 2008-01-18 ---------- RSA Sign & Encrypt f16 Fingerprint16 = 07 FB 9A F9 F7 94 4B E4 0F 28 D1 8E 23 6F A2 B0 uid Sendmail Signing Key/2008 @@ -1792,4 +1865,4 @@ =nES8 -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.26 $, Last updated $Date: 2008/01/22 06:20:27 $ +$Revision: 8.29 $, Last updated $Date: 2009/01/06 05:59:03 $ ==== //depot/projects/hammer/contrib/sendmail/README#6 (text+ko) ==== @@ -38,6 +38,7 @@ 4. Read cf/README. Sendmail is a trademark of Sendmail, Inc. +US Patent Numbers 6865671, 6986037. +-----------------------+ | DIRECTORY PERMISSIONS | @@ -464,4 +465,4 @@ test Some test scripts (currently only for compilation aids). vacation Source for the vacation program. NOT PART OF SENDMAIL! -$Revision: 8.94 $, Last updated $Date: 2008/02/12 16:40:05 $ +$Revision: 8.95 $, Last updated $Date: 2009/04/10 17:49:18 $ ==== //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#16 (text+ko) ==== @@ -1,11 +1,96 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1926 2008/05/03 03:34:26 ca Exp $ + $Id: RELEASE_NOTES,v 8.1963 2009/12/23 04:43:46 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.14.4/8.14.4 2009/12/30 + SECURITY: Handle bogus certificates containing NUL characters + in CNs by placing a string indicating a bad certificate + in the {cn_subject} or {cn_issuer} macro. Patch inspired + by Matthias Andree's changes for fetchmail. + During the generation of a queue identifier an integer overflow + could occur which might result in bogus characters + being used. Based on patch from John Vannoy of + Pepperdine University. + The value of headers, e.g., Precedence, Content-Type, et.al., + was not processed correctly. Patch from Per Hedeland. + Between 8.11.7 and 8.12.0 the length limitation on a return + path was erroneously reduced from MAXNAME (256) to + MAXSHORTSTR (203). Patch from John Gardiner Myers + of Proofpoint; the problem was also noted by Steve + Hubert of University of Washington. + Prevent a crash when a hostname lookup returns a seemingly + valid result which contains a NULL pointer (this seems + to be happening on some Linux versions). + The process title was missing the current load average when + the MTA was delaying connections due to DelayLA. + Patch from Dick St.Peters of NetHeaven. + Do not reset the number of queue entries in shared memory if + only some of them are processed. + Fix overflow of an internal array when parsing some replies + from a milter. Problem found by Scott Rotondo + of Sun Microsystems. + If STARTTLS is turned off in the server (via M=S) then it + would not be initialized for use in the client either. + Patch from Kazuteru Okahashi of IIJ. + If a Diffie-Hellman cipher is selected for STARTTLS, the + handshake could fail with some TLS implementations + because the prime used by the server is not long enough. + Note: the initialization of the DSA/DH parameters for + the server can take a significant amount of time on slow + machines. This can be turned off by setting DHParameters + to none or a file (see doc/op/op.me). Patch from + Petr Lampa of the Brno University of Technology. + Fix handling of `b' modifier for DaemonPortOptions on little + endian machines for loopback address. Patch from + John Beck of Sun Microsystems. + Fix a potential memory leak in libsmdb/smdb1.c found by parfait. + Based on patch from Jonathan Gray of OpenBSD. + If a milter sets the reply code to "421" during the transfer + of the body, the SMTP server will terminate the SMTP session + with that error to match the behavior of the other callbacks. + Return EX_IOERR (instead of 0) if a mail submission fails due to + missing disk space in the mail queue. Based on patch + from Martin Poole of RedHat. + CONFIG: Using FEATURE(`ldap_routing')'s `nodomain' argument would + cause addresses not found in LDAP to be misparsed. + CONFIG: Using a CN restriction did not work for TLS_Clt as it + referred to a wrong macro. Patch from John Gardiner + Myers of Proofpoint. + CONFIG: The option relaytofulladdress of FEATURE(`access_db') + did not work if FEATURE(`relay_hosts_only') is used too. + Problem noted by Kristian Shaw. + CONFIG: The internal function lower() was broken and hence + strcasecmp() did not work either, which could cause + problems for some FEATURE()s if upper case arguments + were used. Patch from Vesa-Matti J Kari of the + University of Helsinki. + LIBMILTER: Fix internal check whether a milter application + is compiled against the same version of libmilter as + it is linked against (especially useful for dynamic + libraries). + LIBMILTER: Fix memory leak that occurred when smfi_setsymlist() + was used. Based on patch by Dan Lukes. + LIBMILTER: Document the effect of SMFIP_HDR_LEADSPC for filters + which add, insert, or replace headers. From Benjamin + Pineau. + LIBMILTER: Fix error messages which refer to "select()" to be + correct if SM_CONF_POLL is used. Based on patch from + John Nemeth. + LIBSM: Fix handling of LDAP search failures where the error is + carried in the search result itself, such as seen with + OpenLDAP proxy servers. + VACATION: Do not refer to a local variable outside its scope. + Based on patch from Mark Costlow of Southwest Cyberport. + Portability: + Enable HAVE_NANOSLEEP for SunOS 5.11. Patch from + John Beck of Sun Microsystems. + Drop NISPLUS from default SunOS 5.11 map definitions. + Patch from John Beck of Sun Microsystems. + 8.14.3/8.14.3 2008/05/03 During ruleset processing the generation of a key for a map lookup and the parsing of the default value was broken @@ -37,7 +122,7 @@ Support shared libraries in Darwin 8 and 9. Patch from Chris Behrens of Concentric. Add support for SCO OpenServer 6, patch from Boyd Gerber. - DEVTOOLS: Clarify that confSHAREDLIBDIR requires a trailing path. + DEVTOOLS: Clarify that confSHAREDLIBDIR requires a trailing slash. Added Files: devtools/OS/Darwin.9.x devtools/OS/OSR.i386 ==== //depot/projects/hammer/contrib/sendmail/cf/README#13 (text+ko) ==== @@ -3142,7 +3142,7 @@ extensions are: CN:name name must match ${cn_subject} -CN ${server_name} must match ${cn_subject} +CN ${client_name}/${server_name} must match ${cn_subject} CS:name name must match ${cert_subject} CI:name name must match ${cert_issuer} @@ -4701,4 +4701,4 @@ 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.724 $, Last updated $Date: 2008/02/15 23:05:32 $ +$Revision: 8.727 $, Last updated $Date: 2009/05/07 23:46:17 $ ==== //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2004, 2009 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -16,8 +16,8 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by ca@wiz.smi.sendmail.com on Fri May 2 20:39:00 PDT 2008 -##### in /extra/home/ca/sm-8.14.3/OpenSource/sendmail-8.14.3/cf/cf +##### built by ca@wiz.smi.sendmail.com on Tue Dec 22 20:49:09 PST 2009 +##### in /extra/home/ca/sm-8.14.4/OpenSource/sendmail-8.14.4/cf/cf ##### using ../ as configuration include directory ##### ###################################################################### @@ -27,7 +27,7 @@ ###################################################################### ###################################################################### -##### $Id: cfhead.m4,v 8.116 2004/01/28 22:02:22 ca Exp $ ##### +##### $Id: cfhead.m4,v 8.120 2009/01/23 22:39:21 ca Exp $ ##### ##### $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $ ##### ##### $Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $ ##### ##### $Id: msp.m4,v 1.33 2004/02/09 22:32:38 ca Exp $ ##### @@ -35,7 +35,7 @@ ##### $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $ ##### -##### $Id: proto.m4,v 8.734 2008/01/24 23:42:01 ca Exp $ ##### +##### $Id: proto.m4,v 8.741 2009/12/11 00:04:53 ca Exp $ ##### # level 10 config file format V10/Berkeley @@ -114,7 +114,7 @@ # Configuration version number -DZ8.14.3/Submit +DZ8.14.4/Submit ############### @@ -440,6 +440,7 @@ # once the threshold number of recipients have been rejected #O BadRcptThrottle=0 + # shall we get local names from our installed interfaces? O DontProbeInterfaces=True @@ -500,6 +501,7 @@ # SMTP STARTTLS server options #O TLSSrvOptions + # Input mail filters #O InputMailFilters ==== //depot/projects/hammer/contrib/sendmail/cf/feature/ldap_routing.m4#4 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1999-2002, 2004, 2007 Sendmail, Inc. and its suppliers. +# Copyright (c) 1999-2002, 2004, 2007, 2009 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ # divert(0) -VERSIONID(`$Id: ldap_routing.m4,v 8.15 2007/05/01 17:38:25 ca Exp $') +VERSIONID(`$Id: ldap_routing.m4,v 8.17 2009/06/26 21:11:08 ca Exp $') divert(-1) # Check first two arguments. If they aren't set, may need to warn in proto.m4 @@ -35,12 +35,40 @@ _ARG6_, `tempfail', `define(`_LDAP_ROUTE_MAPTEMP_', `_TEMPFAIL_')', _ARG6_, `queue', `define(`_LDAP_ROUTE_MAPTEMP_', `_QUEUE_')') +define(`_ATMPF_', `')dnl +dnl check whether arg contains -T`'_ATMPF_ +dnl unless it is a sequence map or just LDAP +dnl note: this does not work if ARG1 begins with space(s), however, as +dnl we issue a warning, hopefully the user will fix it... +ifelse(defn(`_ARG1_'), `', `', + defn(`_ARG1_'), `LDAP', `', + `ifelse(index(_ARG1_, `sequence '), `0', `', + `ifelse(index(_ARG1_, _ATMPF_), `-1', + `errprint(`*** WARNING: missing -T'_ATMPF_` in first argument of FEATURE(`ldap_routing') +') + define(`_ABP_', index(_ARG1_, ` ')) + define(`_NARG1_', `substr(_ARG1_, 0, _ABP_) -T'_ATMPF_` substr(_ARG1_, _ABP_)') + ') + ') + ') +ifelse(defn(`_ARG2_'), `', `', + defn(`_ARG2_'), `LDAP', `', + `ifelse(index(_ARG2_, `sequence '), `0', `', + `ifelse(index(_ARG2_, _ATMPF_), `-1', + `errprint(`*** WARNING: missing -T'_ATMPF_` in second argument of FEATURE(`ldap_routing') +') + define(`_ABP_', index(_ARG2_, ` ')) + define(`_NARG2_', `substr(_ARG2_, 0, _ABP_) -T'_ATMPF_` substr(_ARG2_, _ABP_)') + ') + ') + ') + LOCAL_CONFIG # LDAP routing maps Kldapmh ifelse(len(X`'_ARG1_), `1', `ldap -1 -T -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', - `_ARG1_') + defn(`_NARG1_'), `', `_ARG1_', `_NARG1_') Kldapmra ifelse(len(X`'_ARG2_), `1', `ldap -1 -T -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 28 07:47:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1A15106568D; Thu, 28 Jan 2010 07:47:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CF90106566B for ; Thu, 28 Jan 2010 07:47:36 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68AB08FC18 for ; Thu, 28 Jan 2010 07:47:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0S7laLu002844 for ; Thu, 28 Jan 2010 07:47:36 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0S7lXPT002837 for perforce@freebsd.org; Thu, 28 Jan 2010 07:47:33 GMT (envelope-from mav@freebsd.org) Date: Thu, 28 Jan 2010 07:47:33 GMT Message-Id: <201001280747.o0S7lXPT002837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 07:47:37 -0000 http://p4web.freebsd.org/chv.cgi?CH=173817 Change 173817 by mav@mav_mavbook on 2010/01/28 07:47:22 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#15 integrate .. //depot/projects/scottl-camlock/src/bin/ls/ls.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/ls/ls.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/ls/print.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#7 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/FAQ#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/FAQ.xml#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/named/query.c#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.named-checkconf.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.named-checkzone.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.named.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.nsupdate.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.rndc-confgen.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.rndc.conf.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/doc/arm/man.rndc.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/db.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/ncache.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/include/dns/types.h#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/rbtdb.c#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/resolver.c#6 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/dns/validator.c#5 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_config.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_context.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_noop.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_packet.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#4 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/version#7 integrate .. //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/CACerts#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/FREEBSD-upgrade#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/LICENSE#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/PGPKEYS#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/README#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/RELEASE_NOTES#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/README#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/cf/submit.cf#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/cfhead.m4#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/proto.m4#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/cf/m4/version.m4#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/qtool.pl#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/contrib/smcontrol.pl#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/doc/op/op.me#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfapi.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/libmilter/mfdef.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/conf.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/ldap.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/include/sm/sem.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/Makefile.m4#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/comm.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/api.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/overview.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_addheader.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/docs/smfi_insheader.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/engine.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/example.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/handler.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/libmilter.h#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/listener.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/main.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libmilter/worker.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/debug.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/ldap.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/mbdb.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsm/t-sem.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmdb/smdb1.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmdb/smdb2.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/libsmutil/safefile.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/praliases/praliases.8#2 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/praliases/praliases.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/Makefile.m4#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/README#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/TRACEFLAGS#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/collect.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/conf.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/daemon.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/deliver.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/envelope.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/main.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/map.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/milter.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/queue.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/ratectrl.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/readcf.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/savemail.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sendmail.8#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/sfsasl.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/srvrsmtp.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/tls.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/usersmtp.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/util.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/src/version.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/sendmail/vacation/vacation.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#5 integrate .. //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#5 integrate .. //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#5 integrate .. //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#5 integrate .. //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.pc98/ttys#2 integrate .. //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#5 integrate .. //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#10 integrate .. //depot/projects/scottl-camlock/src/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/scottl-camlock/src/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/scottl-camlock/src/etc/services#5 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/lib/bind/dns/code.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/bind/dns/dns/enumclass.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/bind/dns/dns/enumtype.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/bind/dns/dns/rdatastruct.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/msgcat.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/mount.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libfetch/fetch.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_accept_sec_context.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_acquire_cred.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_cred.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_add_oid_set_member.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_canonicalize_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_compare_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_context_time.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_create_empty_oid_set.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_delete_sec_context.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_display_status.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_duplicate_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_export_sec_context.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_get_mic.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_import_sec_context.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_indicate_mechs.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_init_sec_context.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_context.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_cred_by_mech.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_mechs_for_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_inquire_names_for_mech.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_process_context_token.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_buffer.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_cred.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_name.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_release_oid_set.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_test_oid_set_member.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_unwrap.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_verify_mic.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gss_wrap_size_limit.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/gssapi.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libgssapi/mech.5#3 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_error.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_mech_info.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_principal_name.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_get_versions.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_getcred.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_is_installed.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_max_data_length.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_qop_to_num.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_seccreate.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_callback.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_defaults.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_set_svc_name.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/rpcsec_gss.3#2 integrate .. //depot/projects/scottl-camlock/src/release/amd64/boot_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/i386/boot_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/pc98/boot_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/powerpc/boot_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/sparc64/boot_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/release/sun4v/boot_crunch.conf#4 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#7 integrate .. //depot/projects/scottl-camlock/src/sbin/init/init.c#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#20 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/gpib.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/netintro.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/nvram.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/pcii.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/tnt4882.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man8/rc.subr.8#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-ports.dot#8 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/northamerica#4 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#6 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#98 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/LICENSE#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_80003es2lan.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82540.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82541.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82542.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82543.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82571.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82575.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_api.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_defines.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_hw.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_ich8lan.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_mac.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_manage.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_osdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_phy.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_regs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_em.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwnreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nve/if_nve.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtwvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_node.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nwfs/nwfs_vnops.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli_key.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mountver/g_mountver.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/vinum/geom_vinum_create.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/virstor/g_virstor.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#41 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/adm5120_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/alchemy_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/obio.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/uart_cpu_octeonusart.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/XLR#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/idt/idt_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/cpuregs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/malta/malta_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/busdma_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/db_trace.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/tick.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/clock.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sentry5/s5_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#42 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#42 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#32 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_sta.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_bio.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_nfsiod.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_subs.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfsnode.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/pci/if_rlreg.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/fire.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#41 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#8 integrate .. //depot/projects/scottl-camlock/src/tools/make_libdeps.sh#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#8 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/make.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uname/uname.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uname/uname.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/makefs/makefs.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.c#6 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.639 2010/01/23 19:29:42 antoine Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.640 2010/01/26 10:00:26 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1105,19 +1105,19 @@ gnu/lib/libgcc__L: lib/libc__L -_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ - ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \ - ${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \ - lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ + ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat \ - ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \ + ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libdwarf lib/libproc + ${_secure_lib_libssl} .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1136,17 +1136,13 @@ _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ - kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ - lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ - lib/libcrypt__L -.endif .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS_SUPPORT} != "no" -secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ + kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ + lib/libmd__L kerberos5/lib/libroken__L .endif .endif .endif @@ -1168,7 +1164,6 @@ _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 .endif .if ${MK_NIS} != "no" ==== //depot/projects/scottl-camlock/src/bin/ls/ls.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.87 2009/10/13 21:51:50 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.89 2010/01/24 19:23:07 jh Exp $"); #include #include @@ -508,7 +508,7 @@ break; case FTS_DNR: case FTS_ERR: - warnx("%s: %s", p->fts_name, strerror(p->fts_errno)); + warnx("%s: %s", p->fts_path, strerror(p->fts_errno)); rval = 1; break; case FTS_D: @@ -559,7 +559,8 @@ long maxblock; u_long btotal, labelstrlen, maxinode, maxlen, maxnlink; u_long maxlabelstr; - int bcfile, maxflags; + u_int devstrlen; + int maxflags; gid_t maxgroup; uid_t maxuser; size_t flen, ulen, glen; @@ -651,7 +652,7 @@ MAKENINES(maxsize); free(jinitmax); } - bcfile = 0; + devstrlen = 0; flags = NULL; for (cur = list, entries = 0; cur; cur = cur->fts_link) { if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) { @@ -791,9 +792,15 @@ np->group = &np->data[ulen + 1]; (void)strcpy(np->group, group); - if (S_ISCHR(sp->st_mode) || - S_ISBLK(sp->st_mode)) - bcfile = 1; + if ((S_ISCHR(sp->st_mode) || + S_ISBLK(sp->st_mode)) && + devstrlen < DEVSTR_HEX_LEN) { + if (minor(sp->st_rdev) > 255 || + minor(sp->st_rdev) < 0) + devstrlen = DEVSTR_HEX_LEN; + else + devstrlen = DEVSTR_LEN; + } if (f_flags) { np->flags = &np->data[ulen + glen + 2]; @@ -825,7 +832,6 @@ d.entries = entries; d.maxlen = maxlen; if (needstats) { - d.bcfile = bcfile; d.btotal = btotal; (void)snprintf(buf, sizeof(buf), "%lu", maxblock); d.s_block = strlen(buf); @@ -836,8 +842,14 @@ d.s_inode = strlen(buf); (void)snprintf(buf, sizeof(buf), "%lu", maxnlink); d.s_nlink = strlen(buf); - (void)snprintf(buf, sizeof(buf), "%ju", maxsize); - d.s_size = strlen(buf); + if (f_humanval) + d.s_size = HUMANVALSTR_LEN; + else { + (void)snprintf(buf, sizeof(buf), "%ju", maxsize); + d.s_size = strlen(buf); + } + if (d.s_size < devstrlen) + d.s_size = devstrlen; d.s_user = maxuser; } printfcn(&d); ==== //depot/projects/scottl-camlock/src/bin/ls/ls.h#3 (text+ko) ==== @@ -30,11 +30,15 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.23 2008/04/04 03:57:46 grog Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.24 2010/01/24 19:23:07 jh Exp $ */ #define NO_PRINT 1 +#define HUMANVALSTR_LEN 5 +#define DEVSTR_LEN 8 +#define DEVSTR_HEX_LEN 15 + extern long blocksize; /* block size units */ extern int f_accesstime; /* use time of last access */ @@ -62,7 +66,6 @@ typedef struct { FTSENT *list; u_long btotal; - int bcfile; int entries; int maxlen; u_int s_block; ==== //depot/projects/scottl-camlock/src/bin/ls/print.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.80 2009/09/02 20:50:39 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.81 2010/01/24 19:23:07 jh Exp $"); #include #include @@ -62,6 +62,7 @@ #include "extern.h" static int printaname(const FTSENT *, u_long, u_long); +static void printdev(size_t, dev_t); static void printlink(const FTSENT *); static void printtime(time_t); static int printtype(u_int); @@ -165,16 +166,7 @@ if (f_label) (void)printf("%-*s ", dp->s_label, np->label); if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) - if (minor(sp->st_rdev) > 255 || minor(sp->st_rdev) < 0) - (void)printf("%3d, 0x%08x ", - major(sp->st_rdev), - (u_int)minor(sp->st_rdev)); - else - (void)printf("%3d, %3d ", - major(sp->st_rdev), minor(sp->st_rdev)); - else if (dp->bcfile) - (void)printf("%*s%*jd ", - 8 - dp->s_size, "", dp->s_size, sp->st_size); + printdev(dp->s_size, sp->st_rdev); else printsize(dp->s_size, sp->st_size); if (f_accesstime) @@ -353,6 +345,24 @@ return (chcnt); } +/* + * Print device special file major and minor numbers. + */ +static void +printdev(size_t width, dev_t dev) +{ + char buf[DEVSTR_HEX_LEN + 1]; + + if (minor(dev) > 255 || minor(dev) < 0) + (void)snprintf(buf, sizeof(buf), "%3d, 0x%08x", + major(dev), (u_int)minor(dev)); + else + (void)snprintf(buf, sizeof(buf), "%3d, %3d", + major(dev), minor(dev)); + + (void)printf("%*s ", (u_int)width, buf); +} + static void printtime(time_t ftime) { @@ -592,11 +602,15 @@ { if (f_humanval) { - char buf[5]; + /* + * Reserve one space before the size and allocate room for + * the trailing '\0'. + */ + char buf[HUMANVALSTR_LEN - 1 + 1]; humanize_number(buf, sizeof(buf), (int64_t)bytes, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); - (void)printf("%5s ", buf); + (void)printf("%*s ", (u_int)width, buf); } else (void)printf("%*jd ", (u_int)width, bytes); } ==== //depot/projects/scottl-camlock/src/contrib/bind9/CHANGES#7 (text+ko) ==== @@ -1,3 +1,15 @@ + --- 9.6.1-P3 released --- + +2831. [security] Do not attempt to validate or cache + out-of-bailiwick data returned with a secure + answer; it must be re-fetched from its original + source and validated in that context. [RT #20819] + +2828. [security] Cached CNAME or DNAME RR could be returned to clients + without DNSSEC validation. [RT #20737] + +2827. [security] Bogus NXDOMAIN could be cached as if valid. [RT #20712] + --- 9.6.1-P2 released --- 2772. [security] When validating, track whether pending data was from ==== //depot/projects/scottl-camlock/src/contrib/bind9/FAQ#4 (text+ko) ==== @@ -153,24 +153,29 @@ Master 10.0.1.1: key "external" { - algorithm hmac-md5; - secret "xxxxxxxx"; + algorithm hmac-sha256; + secret "xxxxxxxxxxxxxxxxxxxxxxxx"; }; view "internal" { - match-clients { !key external; 10.0.1/24; }; + match-clients { !key external; // reject message ment for the + // external view. + 10.0.1/24; }; // accept from these addresses. ... }; view "external" { match-clients { key external; any; }; - server 10.0.1.2 { keys external; }; + server 10.0.1.2 { keys external; }; // tag messages from the + // external view to the + // other servers for the + // view. recursion no; ... }; Slave 10.0.1.2: key "external" { - algorithm hmac-md5; - secret "xxxxxxxx"; + algorithm hmac-sha256; + secret "xxxxxxxxxxxxxxxxxxxxxxxx"; }; view "internal" { match-clients { !key external; 10.0.1/24; }; @@ -220,13 +225,13 @@ Master 10.0.1.1: key "external" { - algorithm hmac-md5; - secret "xxxxxxxx"; + algorithm hmac-sha256; + secret "xxxxxxxxxxxxxxxxxxxxxxxx"; }; key "mykey" { - algorithm hmac-md5; - secret "yyyyyyyy"; + algorithm hmac-sha256; + secret "yyyyyyyyyyyyyyyyyyyyyyyy"; }; view "internal" { @@ -239,7 +244,7 @@ type master; file "internal/example.db"; allow-update { key mykey; }; - notify-also { 10.0.1.1; }; + also-notify { 10.0.1.1; }; }; }; @@ -249,7 +254,7 @@ type slave; file "external/example.db"; masters { 10.0.1.1; }; - transfer-source { 10.0.1.1; }; + transfer-source 10.0.1.1; // allow-update-forwarding { any; }; // allow-notify { ... }; }; ==== //depot/projects/scottl-camlock/src/contrib/bind9/FAQ.xml#4 (text+ko) ==== @@ -17,7 +17,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> - +
Frequently Asked Questions about BIND 9 @@ -319,24 +319,29 @@ Master 10.0.1.1: key "external" { - algorithm hmac-md5; - secret "xxxxxxxx"; + algorithm hmac-sha256; + secret "xxxxxxxxxxxxxxxxxxxxxxxx"; }; view "internal" { - match-clients { !key external; 10.0.1/24; }; + match-clients { !key external; // reject message ment for the + // external view. + 10.0.1/24; }; // accept from these addresses. ... }; view "external" { match-clients { key external; any; }; - server 10.0.1.2 { keys external; }; + server 10.0.1.2 { keys external; }; // tag messages from the + // external view to the + // other servers for the + // view. recursion no; ... }; Slave 10.0.1.2: key "external" { - algorithm hmac-md5; - secret "xxxxxxxx"; + algorithm hmac-sha256; + secret "xxxxxxxxxxxxxxxxxxxxxxxx"; }; view "internal" { match-clients { !key external; 10.0.1/24; }; @@ -424,13 +429,13 @@ Master 10.0.1.1: key "external" { - algorithm hmac-md5; - secret "xxxxxxxx"; + algorithm hmac-sha256; + secret "xxxxxxxxxxxxxxxxxxxxxxxx"; }; key "mykey" { - algorithm hmac-md5; - secret "yyyyyyyy"; + algorithm hmac-sha256; + secret "yyyyyyyyyyyyyyyyyyyyyyyy"; }; view "internal" { @@ -443,7 +448,7 @@ type master; file "internal/example.db"; allow-update { key mykey; }; - notify-also { 10.0.1.1; }; + also-notify { 10.0.1.1; }; }; }; @@ -453,7 +458,7 @@ type slave; file "external/example.db"; masters { 10.0.1.1; }; - transfer-source { 10.0.1.1; }; + transfer-source 10.0.1.1; // allow-update-forwarding { any; }; // allow-notify { ... }; }; ==== //depot/projects/scottl-camlock/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#5 (text+ko) ==== @@ -13,163 +13,287 @@ .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: dnssec-signzone.8,v 1.47.44.4 2009/06/09 01:47:19 each Exp $ +.\" $Id: dnssec-signzone.8,v 1.47.44.4.8.1 2009/12/31 23:17:46 tbox Exp $ .\" .hy 0 .ad l -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "DNSSEC-SIGNZONE" 8 "June 08, 2009" "" "" -.SH NAME -dnssec-signzone \- DNSSEC zone signing tool +.\" Title: dnssec\-signzone +.\" Author: +.\" Generator: DocBook XSL Stylesheets v1.71.1 +.\" Date: June 08, 2009 +.\" Manual: BIND9 +.\" Source: BIND9 +.\" +.TH "DNSSEC\-SIGNZONE" "8" "June 08, 2009" "BIND9" "BIND9" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +dnssec\-signzone \- DNSSEC zone signing tool .SH "SYNOPSIS" .HP 16 -\fBdnssec\-signzone\fR [\fB\-a\fR] [\fB\-c\ \fIclass\fR\fR] [\fB\-d\ \fIdirectory\fR\fR] [\fB\-e\ \fIend\-time\fR\fR] [\fB\-f\ \fIoutput\-file\fR\fR] [\fB\-g\fR] [\fB\-h\fR] [\fB\-k\ \fIkey\fR\fR] [\fB\-l\ \fIdomain\fR\fR] [\fB\-i\ \fIinterval\fR\fR] [\fB\-I\ \fIinput\-format\fR\fR] [\fB\-j\ \fIjitter\fR\fR] [\fB\-N\ \fIsoa\-serial\-format\fR\fR] [\fB\-o\ \fIorigin\fR\fR] [\fB\-O\ \fIoutput\-format\fR\fR] [\fB\-p\fR] [\fB\-r\ \fIrandomdev\fR\fR] [\fB\-s\ \fIstart\-time\fR\fR] [\fB\-t\fR] [\fB\-v\ \fIlevel\fR\fR] [\fB\-z\fR] [\fB\-3\ \fIsalt\fR\fR] [\fB\-H\ \fIiterations\fR\fR] [\fB\-A\fR] {zonefile} [key...] +\fBdnssec\-signzone\fR [\fB\-a\fR] [\fB\-c\ \fR\fB\fIclass\fR\fR] [\fB\-d\ \fR\fB\fIdirectory\fR\fR] [\fB\-e\ \fR\fB\fIend\-time\fR\fR] [\fB\-f\ \fR\fB\fIoutput\-file\fR\fR] [\fB\-g\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkey\fR\fR] [\fB\-l\ \fR\fB\fIdomain\fR\fR] [\fB\-i\ \fR\fB\fIinterval\fR\fR] [\fB\-I\ \fR\fB\fIinput\-format\fR\fR] [\fB\-j\ \fR\fB\fIjitter\fR\fR] [\fB\-N\ \fR\fB\fIsoa\-serial\-format\fR\fR] [\fB\-o\ \fR\fB\fIorigin\fR\fR] [\fB\-O\ \fR\fB\fIoutput\-format\fR\fR] [\fB\-p\fR] [\fB\-r\ \fR\fB\fIrandomdev\fR\fR] [\fB\-s\ \fR\fB\fIstart\-time\fR\fR] [\fB\-t\fR] [\fB\-v\ \fR\fB\fIlevel\fR\fR] [\fB\-z\fR] [\fB\-3\ \fR\fB\fIsalt\fR\fR] [\fB\-H\ \fR\fB\fIiterations\fR\fR] [\fB\-A\fR] {zonefile} [key...] .SH "DESCRIPTION" .PP -\fBdnssec\-signzone\fR signs a zone\&. It generates NSEC and RRSIG records and produces a signed version of the zone\&. The security status of delegations from the signed zone (that is, whether the child zones are secure or not) is determined by the presence or absence of a \fIkeyset\fR file for each child zone\&. +\fBdnssec\-signzone\fR +signs a zone. It generates NSEC and RRSIG records and produces a signed version of the zone. The security status of delegations from the signed zone (that is, whether the child zones are secure or not) is determined by the presence or absence of a +\fIkeyset\fR +file for each child zone. .SH "OPTIONS" -.TP +.PP \-a -Verify all generated signatures\&. -.TP +.RS 4 +Verify all generated signatures. +.RE +.PP \-c \fIclass\fR -Specifies the DNS class of the zone\&. -.TP +.RS 4 +Specifies the DNS class of the zone. +.RE +.PP \-k \fIkey\fR -Treat specified key as a key signing key ignoring any key flags\&. This option may be specified multiple times\&. -.TP +.RS 4 +Treat specified key as a key signing key ignoring any key flags. This option may be specified multiple times. +.RE +.PP \-l \fIdomain\fR -Generate a DLV set in addition to the key (DNSKEY) and DS sets\&. The domain is appended to the name of the records\&. -.TP +.RS 4 +Generate a DLV set in addition to the key (DNSKEY) and DS sets. The domain is appended to the name of the records. +.RE +.PP \-d \fIdirectory\fR -Look for \fIkeyset\fR files in \fBdirectory\fR as the directory -.TP +.RS 4 +Look for +\fIkeyset\fR +files in +\fBdirectory\fR +as the directory +.RE +.PP \-g -Generate DS records for child zones from keyset files\&. Existing DS records will be removed\&. -.TP +.RS 4 +Generate DS records for child zones from keyset files. Existing DS records will be removed. +.RE +.PP \-s \fIstart\-time\fR -Specify the date and time when the generated RRSIG records become valid\&. This can be either an absolute or relative time\&. An absolute start time is indicated by a number in YYYYMMDDHHMMSS notation; 20000530144500 denotes 14:45:00 UTC on May 30th, 2000\&. A relative start time is indicated by +N, which is N seconds from the current time\&. If no \fBstart\-time\fR is specified, the current time minus 1 hour (to allow for clock skew) is used\&. -.TP +.RS 4 +Specify the date and time when the generated RRSIG records become valid. This can be either an absolute or relative time. An absolute start time is indicated by a number in YYYYMMDDHHMMSS notation; 20000530144500 denotes 14:45:00 UTC on May 30th, 2000. A relative start time is indicated by +N, which is N seconds from the current time. If no +\fBstart\-time\fR +is specified, the current time minus 1 hour (to allow for clock skew) is used. +.RE +.PP \-e \fIend\-time\fR -Specify the date and time when the generated RRSIG records expire\&. As with \fBstart\-time\fR, an absolute time is indicated in YYYYMMDDHHMMSS notation\&. A time relative to the start time is indicated with +N, which is N seconds from the start time\&. A time relative to the current time is indicated with now+N\&. If no \fBend\-time\fR is specified, 30 days from the start time is used as a default\&. -.TP +.RS 4 +Specify the date and time when the generated RRSIG records expire. As with +\fBstart\-time\fR, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from the start time. A time relative to the current time is indicated with now+N. If no +\fBend\-time\fR +is specified, 30 days from the start time is used as a default. +.RE +.PP \-f \fIoutput\-file\fR -The name of the output file containing the signed zone\&. The default is to append \fI\&.signed\fR to the input filename\&. -.TP +.RS 4 +The name of the output file containing the signed zone. The default is to append +\fI.signed\fR +to the input filename. +.RE +.PP \-h -Prints a short summary of the options and arguments to \fBdnssec\-signzone\fR\&. -.TP +.RS 4 +Prints a short summary of the options and arguments to +\fBdnssec\-signzone\fR. +.RE +.PP \-i \fIinterval\fR -When a previously\-signed zone is passed as input, records may be resigned\&. The \fBinterval\fR option specifies the cycle interval as an offset from the current time (in seconds)\&. If a RRSIG record expires after the cycle interval, it is retained\&. Otherwise, it is considered to be expiring soon, and it will be replaced\&. -The default cycle interval is one quarter of the difference between the signature end and start times\&. So if neither \fBend\-time\fR or \fBstart\-time\fR are specified, \fBdnssec\-signzone\fR generates signatures that are valid for 30 days, with a cycle interval of 7\&.5 days\&. Therefore, if any existing RRSIG records are due to expire in less than 7\&.5 days, they would be replaced\&. -.TP +.RS 4 +When a previously\-signed zone is passed as input, records may be resigned. The +\fBinterval\fR +option specifies the cycle interval as an offset from the current time (in seconds). If a RRSIG record expires after the cycle interval, it is retained. Otherwise, it is considered to be expiring soon, and it will be replaced. +.sp +The default cycle interval is one quarter of the difference between the signature end and start times. So if neither +\fBend\-time\fR +or +\fBstart\-time\fR +are specified, +\fBdnssec\-signzone\fR +generates signatures that are valid for 30 days, with a cycle interval of 7.5 days. Therefore, if any existing RRSIG records are due to expire in less than 7.5 days, they would be replaced. +.RE +.PP \-I \fIinput\-format\fR -The format of the input zone file\&. Possible formats are \fB"text"\fR (default) and \fB"raw"\fR\&. This option is primarily intended to be used for dynamic signed zones so that the dumped zone file in a non\-text format containing updates can be signed directly\&. The use of this option does not make much sense for non\-dynamic zones\&. -.TP +.RS 4 +The format of the input zone file. Possible formats are +\fB"text"\fR +(default) and +\fB"raw"\fR. This option is primarily intended to be used for dynamic signed zones so that the dumped zone file in a non\-text format containing updates can be signed directly. The use of this option does not make much sense for non\-dynamic zones. +.RE +.PP \-j \fIjitter\fR -When signing a zone with a fixed signature lifetime, all RRSIG records issued at the time of signing expires simultaneously\&. If the zone is incrementally signed, i\&.e\&. a previously\-signed zone is passed as input to the signer, all expired signatures have to be regenerated at about the same time\&. The \fBjitter\fR option specifies a jitter window that will be used to randomize the signature expire time, thus spreading incremental signature regeneration over time\&. -Signature lifetime jitter also to some extent benefits validators and servers by spreading out cache expiration, i\&.e\&. if large numbers of RRSIGs don't expire at the same time from all caches there will be less congestion than if all validators need to refetch at mostly the same time\&. -.TP +.RS 4 +When signing a zone with a fixed signature lifetime, all RRSIG records issued at the time of signing expires simultaneously. If the zone is incrementally signed, i.e. a previously\-signed zone is passed as input to the signer, all expired signatures have to be regenerated at about the same time. The +\fBjitter\fR +option specifies a jitter window that will be used to randomize the signature expire time, thus spreading incremental signature regeneration over time. +.sp +Signature lifetime jitter also to some extent benefits validators and servers by spreading out cache expiration, i.e. if large numbers of RRSIGs don't expire at the same time from all caches there will be less congestion than if all validators need to refetch at mostly the same time. +.RE +.PP \-n \fIncpus\fR -Specifies the number of threads to use\&. By default, one thread is started for each detected CPU\&. -.TP +.RS 4 +Specifies the number of threads to use. By default, one thread is started for each detected CPU. +.RE +.PP \-N \fIsoa\-serial\-format\fR -The SOA serial number format of the signed zone\&. Possible formats are \fB"keep"\fR (default), \fB"increment"\fR and \fB"unixtime"\fR\&. -.RS -.TP +.RS 4 +The SOA serial number format of the signed zone. Possible formats are +\fB"keep"\fR +(default), +\fB"increment"\fR +and +\fB"unixtime"\fR. +.RS 4 +.PP \fB"keep"\fR -Do not modify the SOA serial number\&. -.TP +.RS 4 +Do not modify the SOA serial number. +.RE +.PP \fB"increment"\fR -Increment the SOA serial number using RFC 1982 arithmetics\&. -.TP +.RS 4 +Increment the SOA serial number using RFC 1982 arithmetics. +.RE +.PP \fB"unixtime"\fR -Set the SOA serial number to the number of seconds since epoch\&. +.RS 4 +Set the SOA serial number to the number of seconds since epoch. +.RE +.RE .RE -.IP -.TP +.PP \-o \fIorigin\fR -The zone origin\&. If not specified, the name of the zone file is assumed to be the origin\&. -.TP +.RS 4 +The zone origin. If not specified, the name of the zone file is assumed to be the origin. +.RE +.PP \-O \fIoutput\-format\fR -The format of the output file containing the signed zone\&. Possible formats are \fB"text"\fR (default) and \fB"raw"\fR\&. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 28 07:53:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F03F61065670; Thu, 28 Jan 2010 07:53:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B4D301065692 for ; Thu, 28 Jan 2010 07:53:42 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2EEC8FC17 for ; Thu, 28 Jan 2010 07:53:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0S7rgX7003358 for ; Thu, 28 Jan 2010 07:53:42 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0S7rgM4003356 for perforce@freebsd.org; Thu, 28 Jan 2010 07:53:42 GMT (envelope-from mav@freebsd.org) Date: Thu, 28 Jan 2010 07:53:42 GMT Message-Id: <201001280753.o0S7rgM4003356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 07:53:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=173818 Change 173818 by mav@mav_mavtest on 2010/01/28 07:53:08 Hide freeze problems diagnostic messages behind INVARIANTS. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#145 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#145 (text+ko) ==== @@ -4186,8 +4186,10 @@ { if (count > dev->ccbq.queue.qfrozen_cnt[rl]) { +#ifdef INVARIANTS printf("xpt_release_devq(%d): requested %u > present %u\n", rl, count, dev->ccbq.queue.qfrozen_cnt[rl]); +#endif count = dev->ccbq.queue.qfrozen_cnt[rl]; } dev->sim->devq->alloc_openings -= @@ -4231,8 +4233,10 @@ mtx_assert(sim->mtx, MA_OWNED); sendq = &(sim->devq->send_queue); if (sendq->qfrozen_cnt[0] <= 0) { +#ifdef INVARIANTS printf("xpt_release_simq: requested 1 > present %u\n", sendq->qfrozen_cnt[0]); +#endif } else sendq->qfrozen_cnt[0]--; if (sendq->qfrozen_cnt[0] == 0) { From owner-p4-projects@FreeBSD.ORG Thu Jan 28 11:28:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 575D91065679; Thu, 28 Jan 2010 11:28:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BE07106566B for ; Thu, 28 Jan 2010 11:28:17 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0847E8FC14 for ; Thu, 28 Jan 2010 11:28:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SBSGev033400 for ; Thu, 28 Jan 2010 11:28:16 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SBSGU5033398 for perforce@freebsd.org; Thu, 28 Jan 2010 11:28:16 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 11:28:16 GMT Message-Id: <201001281128.o0SBSGU5033398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 11:28:17 -0000 http://p4web.freebsd.org/chv.cgi?CH=173820 Change 173820 by raj@raj_fdt on 2010/01/28 11:27:27 Bump loader version to reflect FDT handling capabilities. Affected files ... .. //depot/projects/fdt/sys/boot/arm/uboot/version#2 edit .. //depot/projects/fdt/sys/boot/powerpc/uboot/version#2 edit Differences ... ==== //depot/projects/fdt/sys/boot/arm/uboot/version#2 (text+ko) ==== @@ -3,5 +3,6 @@ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.1: Flattened Device Tree blob support. 1.0: Added storage support. Booting from HDD, USB, etc. is now possible. 0.5: Initial U-Boot/arm version (netbooting only). ==== //depot/projects/fdt/sys/boot/powerpc/uboot/version#2 (text+ko) ==== @@ -3,6 +3,7 @@ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.1: Flattened Device Tree blob support. 1.0: Added storage support. 0.6: Integrated with the new U-Boot API 0.5: Full network functionality. From owner-p4-projects@FreeBSD.ORG Thu Jan 28 11:46:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFB7E1065672; Thu, 28 Jan 2010 11:46:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3D54106566B for ; Thu, 28 Jan 2010 11:46:35 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69AC88FC17 for ; Thu, 28 Jan 2010 11:46:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SBkZbb034820 for ; Thu, 28 Jan 2010 11:46:35 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SBkZUA034818 for perforce@freebsd.org; Thu, 28 Jan 2010 11:46:35 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 11:46:35 GMT Message-Id: <201001281146.o0SBkZUA034818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 11:46:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=173821 Change 173821 by raj@raj_fdt on 2010/01/28 11:46:08 Refactor FDT infrastructure to better suit multiple platforms and architectures. - Move fdt_pic_table[] and IRQ info parsing routines to platform specific files. - Introduce machine-specific fdt.h header which is a fron-end interface between platform independent code of {fdt,simple}bus and local platform-specific defines and other items (including IRQ lines number, base VA of the internal registers etc.). - Make the [early access] fdt_is_compatible() a common public routine, as there's multiple consumers besides uart(4) attachment. - Teach fdtbus, simplebus and helper code a bit more endian-safety. - Eliminate diag output from early access routines (where console can be unavailable yet, which could lead to a hang). - Simplify parent #address-cells and #size-cells processing. - There's still a couple of rough edges, but we are capable of running {fdt,simple}bus driver on both ARM and PowerPC systems. Affected files ... .. //depot/projects/fdt/sys/dev/fdt/fdt_common.c#7 edit .. //depot/projects/fdt/sys/dev/fdt/fdt_common.h#3 edit .. //depot/projects/fdt/sys/dev/fdt/fdt_powerpc.c#1 add .. //depot/projects/fdt/sys/dev/fdt/fdtbus.c#3 edit .. //depot/projects/fdt/sys/dev/fdt/simplebus.c#4 edit .. //depot/projects/fdt/sys/dev/uart/uart_cpu_powerpc.c#3 edit .. //depot/projects/fdt/sys/powerpc/include/fdt.h#1 add Differences ... ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.c#7 (text+ko) ==== @@ -32,12 +32,11 @@ #include #include -#include #include #include #include -#include +#include #include #include @@ -58,7 +57,48 @@ #define debugf(fmt, args...) #endif +/* + * This routine is an early-usage version of the ofw_bus_is_compatible() when + * the ofw_bus I/F is not available (like early console routines and similar). + * Note the buffer has to be on the stack since malloc() is usually not + * available in such cases either. + */ int +fdt_is_compatible(phandle_t node, const char *compatstr) +{ +#define FDT_COMPAT_LEN 255 + char *buf[FDT_COMPAT_LEN]; + char *compat; + int len, onelen, l, rv; + + if ((len = OF_getproplen(node, "compatible")) <= 0) + return (0); + + compat = (char *)&buf; + bzero(compat, FDT_COMPAT_LEN); + + if (OF_getprop(node, "compatible", compat, len) < 0) + return (0); + + onelen = strlen(compatstr); + rv = 0; + while (len > 0) { + if (strncasecmp(compat, compatstr, onelen) == 0) { + /* Found it. */ + rv = 1; + break; + } + /* Slide to the next sub-string. */ + l = strlen(compat) + 1; + compat += l; + len -= l; + } + + return (rv); +} + + +int fdt_is_enabled(phandle_t node) { char *stat; @@ -90,7 +130,7 @@ sizeof(addr_cells)) <= 0) addr_cells = 2; - return ((int)addr_cells); + return (fdt32_to_cpu((int)addr_cells)); } void @@ -156,11 +196,11 @@ cell_size = sizeof(cell); if (OF_getprop(node, "#address-cells", &cell, cell_size) < cell_size) cell = 2; - *addr_cells = (int)cell; + *addr_cells = fdt32_to_cpu((int)cell); if (OF_getprop(node, "#size-cells", &cell, cell_size) < cell_size) cell = 1; - *size_cells = (int)cell; + *size_cells = fdt32_to_cpu((int)cell); if (*addr_cells > 2 || *size_cells > 2) return (ERANGE); @@ -215,18 +255,16 @@ { /* Address portion. */ - if (fdt_data_verify((void *)data, addr_cells)) { - debugf("tuple #%d: unsupported addr value\n", addr_cells); + if (fdt_data_verify((void *)data, addr_cells)) return (ERANGE); - } + *start = fdt_data_get((void *)data, addr_cells); data += addr_cells; /* Size portion. */ - if (fdt_data_verify((void *)data, size_cells)) { - debugf("tuple #%d: unsupported size value\n", size_cells); + if (fdt_data_verify((void *)data, size_cells)) return (ERANGE); - } + *count = fdt_data_get((void *)data, size_cells); return (0); } @@ -240,14 +278,8 @@ int tuple_size, tuples; int i, rv; - addr_cells = fdt_parent_addr_cells(node); - if (addr_cells > 0) { - rv = OF_searchprop(OF_parent(node), "#size-cells", - &size_cells, sizeof(size_cells)); - if (rv <= 0) - size_cells = 1; - } else - size_cells = 0; + if (fdt_addrsize_cells(OF_parent(node), &addr_cells, &size_cells) != 0) + return (ENXIO); tuple_size = sizeof(pcell_t) * (addr_cells + size_cells); tuples = OF_getprop_alloc(node, "reg", tuple_size, (void **)®); @@ -286,81 +318,6 @@ } static int -fdt_pic_decode_iic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, - int *pol) -{ - - /* TODO */ - return (ENXIO); -} - -static int -fdt_pic_decode_openpic(phandle_t node, pcell_t *intr, int *interrupt, - int *trig, int *pol) -{ - char *compat; - ssize_t prop_len; - int rv; - - prop_len = OF_getprop_alloc(node, "compatible", 1, (void **)&compat); - if (prop_len <= 0) - return (ENXIO); - - rv = 0; - if (strncmp("open-pic", compat, 8) < 0) { - rv = ENXIO; - goto out; - } - - /* - * XXX The interrupt number read out from the device tree is already - * offset by 16 to reflect the 'internal' IRQ range shift on the - * OpenPIC. We still however need to account for the ISA IRQ block, - * potentially in use as well. - */ - *interrupt = ISA_IRQ_COUNT + intr[0]; - - switch (intr[1]) { - case 0: - /* L to H edge */ - *trig = INTR_TRIGGER_EDGE; - *pol = INTR_POLARITY_HIGH; - break; - case 1: - /* Active L level */ - *trig = INTR_TRIGGER_LEVEL; - *pol = INTR_POLARITY_LOW; - break; - case 2: - /* Active H level */ - *trig = INTR_TRIGGER_LEVEL; - *pol = INTR_POLARITY_HIGH; - break; - case 3: - /* H to L edge */ - *trig = INTR_TRIGGER_EDGE; - *pol = INTR_POLARITY_LOW; - break; - default: - *trig = INTR_TRIGGER_CONFORM; - *pol = INTR_POLARITY_CONFORM; - } - -out: - free(compat, M_OFWPROP); - return (rv); -} - -typedef int (*fdt_pic_decode_t)(phandle_t, pcell_t *, int *, int *, - int *); - -static fdt_pic_decode_t fdt_pic_table[] = { - &fdt_pic_decode_iic, - &fdt_pic_decode_openpic, - NULL -}; - -static int fdt_intr_decode(phandle_t intr_parent, pcell_t *intr, int *interrupt, int *trig, int *pol) { @@ -403,14 +360,17 @@ if (OF_getprop(node, "interrupt-parent", &iph, sizeof(iph)) <= 0) { debugf("no intr-parent phandle\n"); intr_par = OF_parent(node); - } else + } else { + iph = fdt32_to_cpu(iph); intr_par = OF_instance_to_package(iph); + } if (OF_getprop(intr_par, "#interrupt-cells", &intr_cells, sizeof(intr_cells)) <= 0) { debugf("no intr-cells defined, defaulting to 1\n"); intr_cells = 1; } + intr_cells = fdt32_to_cpu(intr_cells); intr_num = OF_getprop_alloc(node, "interrupts", intr_cells * sizeof(pcell_t), (void **)&intr); ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.h#3 (text+ko) ==== @@ -39,6 +39,10 @@ enum intr_polarity pol; }; +typedef int (*fdt_pic_decode_t)(phandle_t, pcell_t *, int *, int *, int *); + +extern fdt_pic_decode_t fdt_pic_table[]; + int fdt_addrsize_cells(phandle_t, int *, int *); u_long fdt_data_get(void *, int); int fdt_parent_addr_cells(phandle_t); @@ -47,6 +51,7 @@ int fdt_reg_to_rl(phandle_t, struct resource_list *, u_long); int fdt_intr_to_rl(phandle_t, struct resource_list *, struct sense_level *); int fdt_data_to_res(pcell_t *, int, int, u_long *, u_long *); +int fdt_is_compatible(phandle_t, const char *); int fdt_is_enabled(phandle_t); #endif /* FDT_COMMON_H */ ==== //depot/projects/fdt/sys/dev/fdt/fdtbus.c#3 (text+ko) ==== @@ -30,6 +30,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_platform.h" #include #include #include @@ -41,7 +42,7 @@ #include -#include +#include #include "fdt_common.h" #include "ofw_bus_if.h" @@ -58,8 +59,6 @@ static MALLOC_DEFINE(M_FDTBUS, "fdtbus", "FDTbus devices information"); -extern struct bus_space bs_be_tag; - struct fdtbus_devinfo { phandle_t di_node; char *di_name; @@ -174,7 +173,7 @@ * IRQ rman. */ start = 0; - end = INTR_VECTORS - 1; + end = FDT_INTR_MAX - 1; sc->sc_irq.rm_start = start; sc->sc_irq.rm_end = end; sc->sc_irq.rm_type = RMAN_ARRAY; @@ -261,6 +260,7 @@ static device_t newbus_device_from_fdt_node(device_t parent, phandle_t node) { + u_long base; device_t child; struct fdtbus_devinfo *di; char *name, *type, *compat; @@ -286,13 +286,17 @@ di->di_compat = compat; resource_list_init(&di->di_res); - +#ifdef MPC85XX /* * XXX this 0x1ef00000 offset is a gross hack, which assumes: * - physical addresses in the DTS are 0xe0000000 range, and * - virtual CCSR base in kernel is 0xfef00000 */ - if (fdt_reg_to_rl(node, &di->di_res, 0x1ef00000)) { + base = 0x1ef00000; +#else + base = 0; +#endif + if (fdt_reg_to_rl(node, &di->di_res, base)) { device_printf(child, "could not process 'reg' " "property\n"); newbus_device_destroy(child); @@ -383,7 +387,7 @@ if (type == SYS_RES_IOPORT || type == SYS_RES_MEMORY) { /* XXX endianess should be set based on SOC node */ - rman_set_bustag(res, &bs_be_tag); + rman_set_bustag(res, fdtbus_bs_tag); rman_set_bushandle(res, rman_get_start(res)); } @@ -427,8 +431,12 @@ if (err) return (err); +#if defined(__powerpc__) err = powerpc_setup_intr(device_get_nameunit(child), rman_get_start(res), filter, ihand, arg, flags, cookiep); +#elif defined(__arm__) + /* TODO */ +#endif return (err); } @@ -455,7 +463,11 @@ void *cookie) { +#if defined(__powerpc__) return (powerpc_teardown_intr(cookie)); +#elif defined(__arm__) + return (arm_remove_irqhandler(rman_get_start(res), cookie)); +#endif } static const char * ==== //depot/projects/fdt/sys/dev/fdt/simplebus.c#4 (text+ko) ==== @@ -30,6 +30,7 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_platform.h" #include #include #include @@ -39,8 +40,7 @@ #include #include -#include -#include +#include #include #include @@ -140,11 +140,16 @@ static int simplebus_probe(device_t dev) { + struct simplebus_softc *sc; if (!ofw_bus_is_compatible(dev, "simple-bus")) return (ENXIO); device_set_desc(dev, "Flattened device tree simple bus"); + + sc = device_get_softc(dev); + sc->sc_start_va = FDT_SIMPLEBUS_VA; + return (BUS_PROBE_DEFAULT); } @@ -240,7 +245,6 @@ } debugf("start = %lx, size = %lx\n", start, size); sc->sc_start_pa = start; - sc->sc_start_va = CCSRBAR_VA; sc->sc_size = size; /* @@ -387,7 +391,13 @@ debugf("intr config: irq = %d, trig = %d, pol = %d\n", irq, trig, pol); +#if defined(__powerpc__) err = powerpc_config_intr(irq, trig, pol); +#elif defined(__arm__) + arm_setup_irqhandler(device_get_nameunit(child), filter, ihand, arg, + irq, flags, cookiep); + return (0); +#endif if (err) return (err); ==== //depot/projects/fdt/sys/dev/uart/uart_cpu_powerpc.c#3 (text) ==== @@ -40,7 +40,7 @@ #include #include #include -#include +#include #endif #include @@ -92,45 +92,6 @@ } #ifdef FDT -/* - * Since ofw_bus_is_compatible() cannot be used at this early stage, we need - * a similar function locally. Note the buffer has to be on the stack since - * malloc() is not yet available. - */ -static int -fdt_is_compatible(phandle_t node, const char *compatstr) -{ -#define FDT_COMPAT_LEN 255 - char *buf[FDT_COMPAT_LEN]; - char *compat; - int len, onelen, l, rv; - - if ((len = OF_getproplen(node, "compatible")) <= 0) - return (0); - - compat = (char *)&buf; - bzero(compat, FDT_COMPAT_LEN); - - if (OF_getprop(node, "compatible", compat, len) < 0) - return (0); - - onelen = strlen(compatstr); - rv = 0; - while (len > 0) { - if (strncasecmp(compat, compatstr, onelen) == 0) { - /* Found it. */ - rv = 1; - break; - } - /* Slide to the next sub-string. */ - l = strlen(compat) + 1; - compat += l; - len -= l; - } - - return (rv); -} - static int fdt_uart_addr(phandle_t node, bus_space_tag_t *tag, bus_space_handle_t *handle) { @@ -179,8 +140,7 @@ rv = fdt_data_to_res(prop, par_addr_cells, par_size_cells, &start, &size); - /* XXX this is an MPC85XX specific hack and needs to go away. */ - start += CCSRBAR_VA; + start += FDT_SIMPLEBUS_VA; rv = bus_space_map(*tag, start, size, 0, handle); if (rv) From owner-p4-projects@FreeBSD.ORG Thu Jan 28 11:48:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 076151065676; Thu, 28 Jan 2010 11:48:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C01481065670 for ; Thu, 28 Jan 2010 11:48:37 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 934D38FC13 for ; Thu, 28 Jan 2010 11:48:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SBmbwP034935 for ; Thu, 28 Jan 2010 11:48:37 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SBmb2x034933 for perforce@freebsd.org; Thu, 28 Jan 2010 11:48:37 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 11:48:37 GMT Message-Id: <201001281148.o0SBmb2x034933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 11:48:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=173822 Change 173822 by raj@raj_fdt on 2010/01/28 11:48:06 Clean up PowerPC MPC85XX build. - Connect and disconnect files. - Eliminate unused #defines. Affected files ... .. //depot/projects/fdt/sys/conf/files.powerpc#15 edit .. //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#3 edit Differences ... ==== //depot/projects/fdt/sys/conf/files.powerpc#15 (text+ko) ==== @@ -32,6 +32,7 @@ dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/fb/fb.c optional sc dev/fdt/fdt_common.c optional fdt +dev/fdt/fdt_powerpc.c optional fdt dev/fdt/fdtbus.c optional fdt dev/fdt/simplebus.c optional fdt dev/hwpmc/hwpmc_powerpc.c optional hwpmc @@ -127,7 +128,6 @@ powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx -powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/openpic_fdt.c optional fdt powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx powerpc/ofw/ofw_cpu.c optional aim ==== //depot/projects/fdt/sys/powerpc/mpc85xx/mpc85xx.h#3 (text+ko) ==== @@ -87,40 +87,6 @@ #define OCP85XX_RSTCR (CCSRBAR_VA + 0xe00b0) /* - * OCP Bus Definitions - */ -#define OCP85XX_I2C0_OFF 0x03000 -#define OCP85XX_I2C1_OFF 0x03100 -#define OCP85XX_I2C_SIZE 0x16 -#define OCP85XX_UART0_OFF 0x04500 -#define OCP85XX_UART1_OFF 0x04600 -#define OCP85XX_UART_SIZE 0x10 -#define OCP85XX_LBC_OFF 0x05000 -#define OCP85XX_LBC_SIZE 0x1000 - -#define OCP85XX_PCI0_OFF 0x0A000 -#define OCP85XX_PCI1_OFF 0x09000 -#define OCP85XX_PCI2_OFF 0x08000 -#if 0 -#define OCP85XX_PCI0_OFF 0x08000 -#define OCP85XX_PCI1_OFF 0x09000 -#define OCP85XX_PCI2_OFF 0x0A000 -#endif - -#define OCP85XX_PCI_SIZE 0x1000 -#define OCP85XX_TSEC0_OFF 0x24000 -#define OCP85XX_TSEC1_OFF 0x25000 -#define OCP85XX_TSEC2_OFF 0x26000 -#define OCP85XX_TSEC3_OFF 0x27000 -#define OCP85XX_TSEC_SIZE 0x1000 -#define OCP85XX_OPENPIC_OFF 0x40000 -#define OCP85XX_OPENPIC_SIZE 0x200B4 -#define OCP85XX_QUICC_OFF 0x80000 -#define OCP85XX_QUICC_SIZE 0x20000 -#define OCP85XX_SEC_OFF 0x30000 -#define OCP85XX_SEC_SIZE 0x10000 - -/* * PIC definitions */ #define ISA_IRQ_START 0 From owner-p4-projects@FreeBSD.ORG Thu Jan 28 11:50:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 185D01065676; Thu, 28 Jan 2010 11:50:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1222106566C for ; Thu, 28 Jan 2010 11:50:39 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD3618FC08 for ; Thu, 28 Jan 2010 11:50:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SBodun035110 for ; Thu, 28 Jan 2010 11:50:39 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SBodEO035108 for perforce@freebsd.org; Thu, 28 Jan 2010 11:50:39 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 11:50:39 GMT Message-Id: <201001281150.o0SBodEO035108@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 11:50:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=173823 Change 173823 by raj@raj_fdt on 2010/01/28 11:50:30 Simplify handling #address-cells and #size-cells in LBC attachment. Affected files ... .. //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.c#4 edit Differences ... ==== //depot/projects/fdt/sys/powerpc/mpc85xx/lbc.c#4 (text+ko) ==== @@ -320,14 +320,8 @@ int tuple_size, tuples; int i, rv, bank; - addr_cells = fdt_parent_addr_cells(node); - if (addr_cells > 0) { - rv = OF_searchprop(OF_parent(node), "#size-cells", - &size_cells, sizeof(size_cells)); - if (rv <= 0) - size_cells = 1; - } else - size_cells = 0; + if (fdt_addrsize_cells(OF_parent(node), &addr_cells, &size_cells) != 0) + return (ENXIO); tuple_size = sizeof(pcell_t) * (addr_cells + size_cells); tuples = OF_getprop_alloc(node, "reg", tuple_size, (void **)®); From owner-p4-projects@FreeBSD.ORG Thu Jan 28 11:51:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 572531065676; Thu, 28 Jan 2010 11:51:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BB591065670 for ; Thu, 28 Jan 2010 11:51:41 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E30688FC0A for ; Thu, 28 Jan 2010 11:51:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SBpeO5035175 for ; Thu, 28 Jan 2010 11:51:40 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SBpei6035173 for perforce@freebsd.org; Thu, 28 Jan 2010 11:51:40 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 11:51:40 GMT Message-Id: <201001281151.o0SBpei6035173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173824 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 11:51:41 -0000 http://p4web.freebsd.org/chv.cgi?CH=173824 Change 173824 by raj@raj_fdt on 2010/01/28 11:51:34 Quiesce diag output unless DEBUG mode. Affected files ... .. //depot/projects/fdt/sys/powerpc/booke/machdep.c#5 edit Differences ... ==== //depot/projects/fdt/sys/powerpc/booke/machdep.c#5 (text+ko) ==== @@ -425,7 +425,7 @@ csr = ccsr_read4(OCP85XX_L2CTL); debugf(" L2CTL = 0x%08x\n", csr); - printf(" dtbp = 0x%08x\n", (uint32_t)dtbp); + debugf(" dtbp = 0x%08x\n", (uint32_t)dtbp); print_bootinfo(); print_kernel_section_addr(); From owner-p4-projects@FreeBSD.ORG Thu Jan 28 11:57:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6EE106568B; Thu, 28 Jan 2010 11:57:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F082106566B for ; Thu, 28 Jan 2010 11:57:47 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B86D8FC1C for ; Thu, 28 Jan 2010 11:57:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SBvl35035593 for ; Thu, 28 Jan 2010 11:57:47 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SBvlCE035591 for perforce@freebsd.org; Thu, 28 Jan 2010 11:57:47 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 11:57:47 GMT Message-Id: <201001281157.o0SBvlCE035591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173826 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 11:57:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=173826 Change 173826 by raj@raj_fdt on 2010/01/28 11:57:10 Connect fdtbus and simple bus to the ARM kernel build. This includes initial IRQ resources decoding routine. Affected files ... .. //depot/projects/fdt/sys/arm/include/fdt.h#1 add .. //depot/projects/fdt/sys/conf/files.arm#4 edit .. //depot/projects/fdt/sys/dev/fdt/fdt_arm.c#1 add Differences ... ==== //depot/projects/fdt/sys/conf/files.arm#4 (text+ko) ==== @@ -53,6 +53,10 @@ contrib/dtc/libfdt/fdt_strerror.c optional fdt contrib/dtc/libfdt/fdt_sw.c optional fdt contrib/dtc/libfdt/fdt_wip.c optional fdt +dev/fdt/fdt_arm.c optional fdt +dev/fdt/fdt_common.c optional fdt +dev/fdt/fdtbus.c optional fdt +dev/fdt/simplebus.c optional fdt dev/hwpmc/hwpmc_arm.c optional hwpmc dev/ofw/openfirm.c optional fdt dev/ofw/openfirmio.c optional fdt From owner-p4-projects@FreeBSD.ORG Thu Jan 28 12:02:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFEEB1065693; Thu, 28 Jan 2010 12:02:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93CF91065670 for ; Thu, 28 Jan 2010 12:02:52 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F7AB8FC1F for ; Thu, 28 Jan 2010 12:02:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SC2qYx035947 for ; Thu, 28 Jan 2010 12:02:52 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SC2qID035945 for perforce@freebsd.org; Thu, 28 Jan 2010 12:02:52 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 12:02:52 GMT Message-Id: <201001281202.o0SC2qID035945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 12:02:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=173827 Change 173827 by raj@raj_fdt on 2010/01/28 12:01:56 Marvell SOC: Initial support for processing Multi-purpose pin (MPP) data and programming the controller, based on config data retrieved from the DTB blob (instead of using hard coded values). Affected files ... .. //depot/projects/fdt/sys/arm/mv/kirkwood/db88f6xxx.c#2 edit .. //depot/projects/fdt/sys/arm/mv/mv_machdep.c#4 edit .. //depot/projects/fdt/sys/arm/mv/mvvar.h#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/mv/kirkwood/db88f6xxx.c#2 (text+ko) ==== @@ -102,47 +102,6 @@ { -1, -1, -1 } }; -void -platform_mpp_init(void) -{ - - /* - * MPP configuration for DB-88F6281-BP and DB-88F6281-BP-A - * - * MPP[0]: NF_IO[2] - * MPP[1]: NF_IO[3] - * MPP[2]: NF_IO[4] - * MPP[3]: NF_IO[5] - * MPP[4]: NF_IO[6] - * MPP[5]: NF_IO[7] - * MPP[6]: SYSRST_OUTn - * MPP[7]: SPI_SCn - * MPP[8]: TW_SDA - * MPP[9]: TW_SCK - * MPP[10]: UA0_TXD - * MPP[11]: UA0_RXD - * MPP[12]: SD_CLK - * MPP[13]: SD_CMD - * MPP[14]: SD_D[0] - * MPP[15]: SD_D[1] - * MPP[16]: SD_D[2] - * MPP[17]: SD_D[3] - * MPP[18]: NF_IO[0] - * MPP[19]: NF_IO[1] - * MPP[20]: SATA1_AC - * MPP[21]: SATA0_AC - * - * Others: GPIO - */ - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL0, 0x21111111); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL1, 0x11113311); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL2, 0x00551111); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL3, 0x00000000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL4, 0x00000000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL5, 0x00000000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL6, 0x00000000); -} - static void platform_identify(void *dummy) { ==== //depot/projects/fdt/sys/arm/mv/mv_machdep.c#4 (text+ko) ==== @@ -63,10 +63,13 @@ #include #include #include +#include #include #include +#include #include +#include "../../contrib/dtc/libfdt/libfdt_env.h" #include #include @@ -86,6 +89,7 @@ #include #include +#include /* XXX */ #include /* XXX eventually this should be eliminated */ #include @@ -162,6 +166,7 @@ static void print_bootinfo(void); static void physmap_init(int); +static int platform_mpp_init(void); static char * kenv_next(char *cp) @@ -557,6 +562,14 @@ setttb(kernel_l1pt.pv_pa); cpu_tlb_flushID(); cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)); + + /* + * Re-initialise MPP. It is important to call this prior to using + * console as the physical connection can be routed via MPP. + */ + if (platform_mpp_init() != 0) + while (1); + cninit(); physmem = memsize / PAGE_SIZE; @@ -569,11 +582,6 @@ print_kenv(); /* - * Re-initialise MPP - */ - platform_mpp_init(); - - /* * Re-initialise decode windows */ if (soc_decode_win() != 0) @@ -649,6 +657,131 @@ sizeof(struct pcb))); } +#define MPP_PIN_MAX 50 +#define MPP_PIN_CELLS 2 +#define MPP_PINS_PER_REG 8 +#define MPP_SEL(pin,func) (((func) & 0xf) << \ + (((pin) % MPP_PINS_PER_REG) * 4)) + +static int +platform_mpp_init(void) +{ + pcell_t pinmap[MPP_PIN_MAX * MPP_PIN_CELLS]; + int mpp[MPP_PIN_MAX]; + char buf[64]; + uint32_t ctrl_val, ctrl_offset; + pcell_t reg[4]; + u_long start, size; + phandle_t node; + pcell_t pin_cells, *pinmap_ptr, pin_max; + ssize_t len; + int par_addr_cells, par_size_cells; + int tuple_size, tuples, rv, pins, i, j; + int mpp_pin, mpp_function; + + /* + * Try to access the MPP node directly i.e. through /aliases/mpp. + */ + if ((node = OF_finddevice("/aliases")) != 0) + if (OF_getprop(node, "mpp", buf, sizeof(buf)) > 0) { + if ((node = OF_finddevice(buf)) == 0) + return (ENXIO); + if (!fdt_is_compatible(node, "mrvl,mpp")) + return (ENXIO); + goto moveon; + } + + /* + * Find the node the long way. + * TODO + */ + +moveon: + /* + * Process 'reg' prop. + */ + if ((rv = fdt_addrsize_cells(OF_parent(node), &par_addr_cells, + &par_size_cells)) != 0) + return(ENXIO); + + tuple_size = sizeof(pcell_t) * (par_addr_cells + par_size_cells); + len = OF_getprop(node, "reg", reg, sizeof(reg)); + tuples = len / tuple_size; + if (tuple_size <= 0) + return (EINVAL); + + /* + * Get address/size. XXX we assume only the first 'reg' tuple is used. + */ + rv = fdt_data_to_res(reg, par_addr_cells, par_size_cells, + &start, &size); + if (rv != 0) + return (rv); + start += FDT_SIMPLEBUS_VA; + + /* + * Process 'pin-max' and 'pin-map' props. + */ + if (OF_getprop(node, "pin-max", &pin_max, sizeof(pin_max)) <= 0) + return (ENXIO); + pin_max = fdt32_to_cpu(pin_max); + if (pin_max > MPP_PIN_MAX) + return (ERANGE); + + if (OF_getprop(node, "#pin-cells", &pin_cells, sizeof(pin_cells)) <= 0) + pin_cells = MPP_PIN_CELLS; + pin_cells = fdt32_to_cpu(pin_cells); + if (pin_cells > MPP_PIN_CELLS) + return (ERANGE); + tuple_size = sizeof(pcell_t) * pin_cells; + + bzero(pinmap, sizeof(pinmap)); + len = OF_getprop(node, "pin-map", pinmap, sizeof(pinmap)); + if (len <= 0) + return (ERANGE); + if (len % tuple_size) + return (ERANGE); + pins = len / tuple_size; + if (pins > pin_max) + return (ERANGE); + /* + * Fill out a "mpp[pin] => function" table. All pins unspecified in + * the 'pin-map' property are defaulted to 0 function i.e. GPIO. + */ + bzero(mpp, sizeof(mpp)); + pinmap_ptr = pinmap; + for (i = 0; i < pins; i++) { + mpp_pin = fdt32_to_cpu(*pinmap_ptr); + mpp_function = fdt32_to_cpu(*(pinmap_ptr + 1)); + mpp[mpp_pin] = mpp_function; + pinmap_ptr += pin_cells; + } + + /* + * Prepare and program MPP control register values. + */ + ctrl_offset = 0; + for (i = 0; i < pin_max;) { + ctrl_val = 0; + + for (j = 0; j < MPP_PINS_PER_REG; j++) { + if (i + j == pin_max - 1) + break; + ctrl_val |= MPP_SEL(i + j, mpp[i + j]); + } + i += MPP_PINS_PER_REG; + bus_space_write_4(obio_tag, start, ctrl_offset, ctrl_val); + + /* + * XXX this needs to be worked around for Orion, where MPP + * control regs are not placed linearly. + */ + ctrl_offset += 4; + } + + return (0); +} + struct arm32_dma_range * bus_dma_get_range(void) { ==== //depot/projects/fdt/sys/arm/mv/mvvar.h#2 (text+ko) ==== @@ -129,7 +129,6 @@ void mv_gpio_out(uint32_t pin, uint8_t val, uint8_t enable); uint8_t mv_gpio_in(uint32_t pin); -void platform_mpp_init(void); int soc_decode_win(void); void soc_id(uint32_t *dev, uint32_t *rev); void soc_identify(void); From owner-p4-projects@FreeBSD.ORG Thu Jan 28 12:02:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFC9E106575D; Thu, 28 Jan 2010 12:02:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3D401065676 for ; Thu, 28 Jan 2010 12:02:52 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A073E8FC20 for ; Thu, 28 Jan 2010 12:02:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SC2qOK035952 for ; Thu, 28 Jan 2010 12:02:52 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SC2qbE035950 for perforce@freebsd.org; Thu, 28 Jan 2010 12:02:52 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 12:02:52 GMT Message-Id: <201001281202.o0SC2qbE035950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 12:02:54 -0000 http://p4web.freebsd.org/chv.cgi?CH=173828 Change 173828 by raj@raj_fdt on 2010/01/28 12:02:42 Enable FDT support for DB-88F6XXX kernel. Affected files ... .. //depot/projects/fdt/sys/arm/conf/DB-88F6XXX#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/conf/DB-88F6XXX#2 (text+ko) ==== @@ -13,6 +13,7 @@ #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" +options FDT #Flattened Device Tree options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols From owner-p4-projects@FreeBSD.ORG Thu Jan 28 12:03:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21B771065692; Thu, 28 Jan 2010 12:03:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DA3FD106568D for ; Thu, 28 Jan 2010 12:03:53 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C6B138FC0A for ; Thu, 28 Jan 2010 12:03:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SC3rIl037036 for ; Thu, 28 Jan 2010 12:03:53 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SC3rC1037034 for perforce@freebsd.org; Thu, 28 Jan 2010 12:03:53 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 12:03:53 GMT Message-Id: <201001281203.o0SC3rC1037034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 12:03:54 -0000 http://p4web.freebsd.org/chv.cgi?CH=173829 Change 173829 by raj@raj_fdt on 2010/01/28 12:03:53 Convert Marvell RTC driver to FDT/simplebus convention. This is the very first ARM driver to run in FDT environment! Affected files ... .. //depot/projects/fdt/sys/arm/mv/rtc.c#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/mv/rtc.c#2 (text+ko) ==== @@ -45,6 +45,9 @@ #include #include +#include +#include + #include "clock_if.h" #define MV_RTC_TIME_REG 0x00 @@ -88,14 +91,17 @@ }; static devclass_t mv_rtc_devclass; -DRIVER_MODULE(mv_rtc, mbus, mv_rtc_driver, mv_rtc_devclass, 0, 0); +DRIVER_MODULE(mv_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0); static int mv_rtc_probe(device_t dev) { + if (!ofw_bus_is_compatible(dev, "mrvl,rtc")) + return (ENXIO); + device_set_desc(dev, "Marvell Integrated RTC"); - return (0); + return (BUS_PROBE_DEFAULT); } static int From owner-p4-projects@FreeBSD.ORG Thu Jan 28 12:04:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 481CE1065694; Thu, 28 Jan 2010 12:04:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CB4B106568B for ; Thu, 28 Jan 2010 12:04:55 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED31B8FC17 for ; Thu, 28 Jan 2010 12:04:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SC4sSv037100 for ; Thu, 28 Jan 2010 12:04:54 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SC4s2g037098 for perforce@freebsd.org; Thu, 28 Jan 2010 12:04:54 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 12:04:54 GMT Message-Id: <201001281204.o0SC4s2g037098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 12:04:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=173830 Change 173830 by raj@raj_fdt on 2010/01/28 12:04:41 Convert Marvell TWSI (I2C) driver to FDT/simplebus convention. Affected files ... .. //depot/projects/fdt/sys/arm/mv/twsi.c#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/mv/twsi.c#2 (text+ko) ==== @@ -57,6 +57,9 @@ #include #include +#include +#include + #include "iicbus_if.h" #define MV_TWSI_NAME "twsi" @@ -151,7 +154,7 @@ sizeof(struct mv_twsi_softc), }; -DRIVER_MODULE(twsi, mbus, mv_twsi_driver, mv_twsi_devclass, 0, 0); +DRIVER_MODULE(twsi, simplebus, mv_twsi_driver, mv_twsi_devclass, 0, 0); DRIVER_MODULE(iicbus, twsi, iicbus_driver, iicbus_devclass, 0, 0); MODULE_DEPEND(twsi, iicbus, 1, 1, 1); @@ -289,6 +292,9 @@ mv_twsi_probe(device_t dev) { + if (!ofw_bus_is_compatible(dev, "mrvl,twsi")) + return (ENXIO); + device_set_desc(dev, "Marvell Integrated I2C Bus Controller"); return (BUS_PROBE_DEFAULT); } From owner-p4-projects@FreeBSD.ORG Thu Jan 28 12:05:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 942401065693; Thu, 28 Jan 2010 12:05:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5856D1065676 for ; Thu, 28 Jan 2010 12:05:56 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1ECC48FC22 for ; Thu, 28 Jan 2010 12:05:56 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SC5ugT037242 for ; Thu, 28 Jan 2010 12:05:56 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SC5tH1037240 for perforce@freebsd.org; Thu, 28 Jan 2010 12:05:55 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 12:05:55 GMT Message-Id: <201001281205.o0SC5tH1037240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 12:05:56 -0000 http://p4web.freebsd.org/chv.cgi?CH=173831 Change 173831 by raj@raj_fdt on 2010/01/28 12:05:25 Minor formatting fix. Affected files ... .. //depot/projects/fdt/sys/arm/include/metadata.h#3 edit Differences ... ==== //depot/projects/fdt/sys/arm/include/metadata.h#3 (text+ko) ==== @@ -30,6 +30,6 @@ #define _MACHINE_METADATA_H_ #define MODINFOMD_BOOTINFO 0x1001 -#define MODINFOMD_DTBP 0x1002 +#define MODINFOMD_DTBP 0x1002 #endif /* !_MACHINE_METADATA_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jan 28 13:41:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7762D1065676; Thu, 28 Jan 2010 13:41:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 217AE1065692 for ; Thu, 28 Jan 2010 13:41:32 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0E0088FC0A for ; Thu, 28 Jan 2010 13:41:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SDfVJ8055511 for ; Thu, 28 Jan 2010 13:41:31 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SDfVw8055509 for perforce@freebsd.org; Thu, 28 Jan 2010 13:41:31 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 28 Jan 2010 13:41:31 GMT Message-Id: <201001281341.o0SDfVw8055509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173834 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 13:41:32 -0000 http://p4web.freebsd.org/chv.cgi?CH=173834 Change 173834 by jona@jona-belle-freebsd8 on 2010/01/28 13:41:06 Initial lc_fdlist work. No mmap'ing yet. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/Makefile#18 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#27 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_fdlist.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/Makefile#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#1 add Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/Makefile#18 (text+ko) ==== @@ -10,7 +10,7 @@ libcapability_sandbox_io.c \ libcapability_host.c \ libcapability_host_io.c \ - libcapability_registry.c + libcapability_fdlist.c INCS= libcapability.h ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#27 (text+ko) ==== @@ -30,13 +30,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#26 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#27 $ */ #ifndef _LIBCAPABILITY_H_ #define _LIBCAPABILITY_H_ #include +#include __BEGIN_DECLS @@ -52,29 +53,53 @@ int lcl_fd; }; + +/* A list of file descriptors, which can be passed around in shared memory */ +struct lc_fdlist; + + +struct lc_fdlist* lc_fdlist_new(void); +struct lc_fdlist* lc_fdlist_dup(struct lc_fdlist *orig); +void lc_fdlist_free(struct lc_fdlist *l); + +/* Size of an FD list in bytes, including all associated string data */ +int lc_fdlist_size(struct lc_fdlist *l); + + /* - * A file descriptor "registry" + * Add a file descriptor to the list. + * + * l the list to add to + * subsystem a software component name, e.g. "org.freebsd.rtld-elf" + * classname a class name, e.g. "libdir" or "library" + * name an instance name, e.g. "system library dir" or "libc.so.6" + * fd the file descriptor */ -struct lc_fdregistry_entry; -struct lc_fdregistry { - struct lc_fdregistry_entry *entries; /* registry entries */ +int lc_fdlist_add(struct lc_fdlist **l, + const char *subsystem, const char *classname, + const char *name, int fd); - unsigned int count; /* number of entries */ - unsigned int capacity; /* entries that we can hold */ -}; +/* + * Like lc_fdlist_add(), but allows capability rights to be specified. The file + * descriptor will be wrapped in a capability with the given rights (so if the + * descriptor *is* a capability, its rights will be constrained according to this + * rights mask) + */ +int lc_fdlist_addcap(struct lc_fdlist **l, + const char *subsystem, const char *classname, + const char *name, int fd, cap_rights_t rights); /* - * Registry operations + * Look up a file descriptor. + * + * Multiple entries with the same classname are allowed, so iterating through + * all instances of a class is done by supplying an integer 'pos' which is used + * internally to skip entries which have already been seen. If 'pos' is 0 or NULL, + * the first matching entry will be returned. */ -struct lc_fdregistry* lc_fdregistry_new(void); -struct lc_fdregistry* lc_fdregistry_dup(const struct lc_fdregistry *orig); -void lc_fdregistry_free(struct lc_fdregistry *registry); - -int lc_fdregistry_add(const struct lc_fdregistry *reg, - const char *id, const char *name, int fd); - -int lc_fdregistry_lookup(const struct lc_fdregistry *reg, - const char *id, char **name, int *fdp); +int lc_fdlist_lookup(struct lc_fdlist *l, + const char *subsystem, const char *classname, + char **name, int *fdp, int *pos); /* * Capability interfaces. From owner-p4-projects@FreeBSD.ORG Thu Jan 28 13:50:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E4BD1065692; Thu, 28 Jan 2010 13:50:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6330B106568D for ; Thu, 28 Jan 2010 13:50:41 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 505748FC17 for ; Thu, 28 Jan 2010 13:50:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SDofU5056201 for ; Thu, 28 Jan 2010 13:50:41 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SDofKY056199 for perforce@freebsd.org; Thu, 28 Jan 2010 13:50:41 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 28 Jan 2010 13:50:41 GMT Message-Id: <201001281350.o0SDofKY056199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 13:50:41 -0000 http://p4web.freebsd.org/chv.cgi?CH=173835 Change 173835 by jona@jona-belle-freebsd8 on 2010/01/28 13:49:55 Create -> MMAP -> Copy -> Read works Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#2 (text+ko) ==== @@ -83,8 +83,41 @@ int shmfd = shm_open(SHM_ANON, O_RDWR, 0600); if (shmfd < 0) err(-1, "Error opening shared memory"); - else - printf("Opened POSIX shared memory @ FD %i\n", shmfd); + + int size = lc_fdlist_size(fds); + if (ftruncate(shmfd, size) < 0) + err(-1, "Error truncating shmfd"); + + void *shm = mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_NOSYNC | MAP_SHARED, shmfd, 0); + + if (shm == MAP_FAILED) + err(-1, "Error mmap'ing shared memory"); + + + memcpy(shm, fds, lc_fdlist_size(fds)); + + + struct lc_fdlist *copy = (struct lc_fdlist*) shm; + + pos = 0; + for (int i = 0; i < 20; i++) { + char *name; + int value; + + lc_fdlist_lookup(copy, "org.freebsd.Capsicum", "testjunk", + &name, &value, &pos); + + if (strcmp("garbage", name)) + warnx("i=%i\tGot '%s' instead of 'garbage'", i, name); + + if (value != 50 + i) + warnx("i=%i\tGot 'FD' %i instead of %i", i, value, 50 + i); + } + + + printf("OK\n"); + return 0; } From owner-p4-projects@FreeBSD.ORG Thu Jan 28 14:04:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16BE51065672; Thu, 28 Jan 2010 14:04:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF70B106566C for ; Thu, 28 Jan 2010 14:04:55 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A36948FC16 for ; Thu, 28 Jan 2010 14:04:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SE4t7f058218 for ; Thu, 28 Jan 2010 14:04:55 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SE4tkW058216 for perforce@freebsd.org; Thu, 28 Jan 2010 14:04:55 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 14:04:55 GMT Message-Id: <201001281404.o0SE4tkW058216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 14:04:56 -0000 http://p4web.freebsd.org/chv.cgi?CH=173836 Change 173836 by raj@raj_fdt on 2010/01/28 14:04:25 Import device tree source file for MPC8572DS. Many thanks to Freescale Semiconductor, Inc. for dual-licensing the MPC85XX DTS files for the benfit of using them in FreeBSD FDT environment. Special thank-you to Phil Brownfield for support and help with re-licensing. Obtained from: Freescale Semiconductor, Inc. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/mpc8572ds.dts#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 28 14:07:59 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F4C6106568B; Thu, 28 Jan 2010 14:07:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 438AB106566C for ; Thu, 28 Jan 2010 14:07:59 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 17A7D8FC2C for ; Thu, 28 Jan 2010 14:07:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SE7wUJ058482 for ; Thu, 28 Jan 2010 14:07:58 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SE7wj3058480 for perforce@freebsd.org; Thu, 28 Jan 2010 14:07:58 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 14:07:58 GMT Message-Id: <201001281407.o0SE7wj3058480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 14:07:59 -0000 http://p4web.freebsd.org/chv.cgi?CH=173838 Change 173838 by raj@raj_fdt on 2010/01/28 14:07:04 Import initial device tree source file for DB-88F6281. Also provide bindings description of the newly devised MPP node. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/bindings-mpp.txt#1 add .. //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 28 15:10:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A4AC1065693; Thu, 28 Jan 2010 15:10:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFA9B106568D for ; Thu, 28 Jan 2010 15:10:01 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A65138FC0C for ; Thu, 28 Jan 2010 15:10:01 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SFA1i5064341 for ; Thu, 28 Jan 2010 15:10:01 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SFA1vI064339 for perforce@freebsd.org; Thu, 28 Jan 2010 15:10:01 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 28 Jan 2010 15:10:01 GMT Message-Id: <201001281510.o0SFA1vI064339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 15:10:02 -0000 http://p4web.freebsd.org/chv.cgi?CH=173842 Change 173842 by jona@jona-capsicum-kent64 on 2010/01/28 15:09:18 libcapability => libcapsicum Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/Makefile#14 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_enter.2#7 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#12 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/Makefile#19 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.3#22 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.c#12 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability.h#28 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_fdlist.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.3#9 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host.c#24 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_host_io.c#5 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_internal.h#5 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_sandbox.3#7 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_sandbox.c#9 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_sandbox_api.h#5 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapability/libcapability_sandbox_io.c#5 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.3#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.c#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.3#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host_io.c#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox.3#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox.c#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_api.h#1 add .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_io.c#1 add .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/Makefile#2 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/Makefile#4 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#7 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/Makefile#3 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/fdsendrecv.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/Makefile#6 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#11 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#11 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.pro#6 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/Makefile#2 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/Makefile#8 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/Makefile#14 (text+ko) ==== @@ -33,7 +33,7 @@ ncurses ${_libnetgraph} libradius librpcsvc libsbuf \ libtacplus libulog libutil ${_libypclnt} libalias libarchive \ ${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \ - libcalendar libcam libcapability libcompat \ + libcalendar libcam libcapsicum libcompat \ libdevinfo libdevstat \ libdisk \ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_enter.2#7 (text+ko) ==== @@ -68,7 +68,7 @@ may be used to create kernel-enforced sandboxes in which appropriately-crafted applications or application components may be run. Most sandboxes will be created and managed using the -.Xr libcapability +.Xr libcapsicum library, rather than using system calls directly. .Pp .Fn cap_getmode @@ -97,7 +97,7 @@ .Sh SEE ALSO .Xr cap_new 2 , .Xr fexecve 2 , -.Xr libcapability 3 +.Xr libcapsicum 3 .Sh HISTORY Support for capabilities and capabilities mode was developed as part of the .Tn TrustedBSD ==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/cap_new.2#12 (text+ko) ==== @@ -88,7 +88,7 @@ Many applications will prefer to use the .Xr cap_limitfd 3 library call, part of -.Xr libcapability 3 , +.Xr libcapsicum 3 , as it offers a more convenient interface. .Pp .Fn cap_getrights @@ -455,7 +455,7 @@ .Xr unlinkat 2 , .Xr write 2 , .Xr cap_limitfd 3 , -.Xr libcapability 3 , +.Xr libcapsicum 3 , .Xr sem_getvalue 3 , .Xr sem_post 3 , .Xr sem_trywait 3 , ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/Makefile#2 (text+ko) ==== @@ -3,6 +3,6 @@ CFLAGS=-Wall -Werror -g -rdynamic DPADD= ${LIBCAPABILITY} ${LIBSBUF} -LDADD= -lcapability -lsbuf +LDADD= -lcapsicum -lsbuf .include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/Makefile#4 (text+ko) ==== @@ -3,6 +3,6 @@ CFLAGS=-Wall -g -rdynamic DPADD= ${LIBCAPABILITY} ${LIBSBUF} -LDADD= -lcapability -lsbuf +LDADD= -lcapsicum -lsbuf .include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/Makefile#3 (text+ko) ==== @@ -3,6 +3,6 @@ CFLAGS=-Wall -g -rdynamic DPADD= ${LIBCAPABILITY} ${LIBSBUF} -LDADD= -lcapability -lsbuf +LDADD= -lcapsicum -lsbuf .include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdsendrecv/fdsendrecv.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/Makefile#6 (text+ko) ==== @@ -3,6 +3,6 @@ CFLAGS=-Wall -g -rdynamic DPADD= ${LIBCAPABILITY} ${LIBSBUF} -LDADD= -lcapability -lsbuf +LDADD= -lcapsicum -lsbuf .include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include @@ -103,8 +103,8 @@ * requests to it. Otherwise, service the requests in this sandbox. */ if (argc > 1 && strcmp(argv[1], "nested") == 0) { - if (ld_caplibindex_lookup(MYNAME, &fd) < 0) - err(-10, "ld_caplibindex_lookup(%s)", MYNAME); + if (ld_libcache_lookup(MYNAME, &fd) < 0) + err(-10, "ld_libcache_lookup(%s)", MYNAME); if (lch_startfd(fd, MYNAME, sandbox_argv, LCH_PERMIT_STDERR, &lcsp) < 0) ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.cpp#11 (text+ko) ==== @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/sandbox_qt.pro#6 (text+ko) ==== @@ -5,7 +5,7 @@ DEPENDPATH += . INCLUDEPATH += . -LIBS += -lcapability -luserangel -lsbuf +LIBS += -lcapsicum -luserangel -lsbuf QMAKE_LFLAGS += -rdynamic # Input ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/Makefile#2 (text+ko) ==== @@ -3,6 +3,6 @@ CFLAGS=-Wall -g -rdynamic DPADD= ${LIBCAPABILITY} ${LIBSBUF} -LDADD= -lcapability -lsbuf +LDADD= -lcapsicum -lsbuf .include ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/Makefile#8 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS= gzip.c gzsandbox.c DPADD= ${LIBZ} ${LIBCAPABILITY} -LDADD= -lz -lcapability +LDADD= -lz -lcapsicum CFLAGS+= -rdynamic # For sandbox cap_main .if ${MK_BZIP2_SUPPORT} != "no" ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#10 (text+ko) ==== @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -361,7 +361,7 @@ size_t len; if (lcs_get(&lchp) < 0) - errx(-1, "libcapability sandbox binary"); + errx(-1, "libcapsicum sandbox binary"); while (1) { fdcount = 2; From owner-p4-projects@FreeBSD.ORG Thu Jan 28 15:23:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2066D1065679; Thu, 28 Jan 2010 15:23:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6844106566C for ; Thu, 28 Jan 2010 15:23:19 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C1D098FC12 for ; Thu, 28 Jan 2010 15:23:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SFNJf4065352 for ; Thu, 28 Jan 2010 15:23:19 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SFNFg0065346 for perforce@freebsd.org; Thu, 28 Jan 2010 15:23:15 GMT (envelope-from raj@freebsd.org) Date: Thu, 28 Jan 2010 15:23:15 GMT Message-Id: <201001281523.o0SFNFg0065346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 15:23:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=173844 Change 173844 by raj@raj_fdt on 2010/01/28 15:22:46 IFC @173839 Affected files ... .. //depot/projects/fdt/Makefile#4 integrate .. //depot/projects/fdt/Makefile.inc1#8 integrate .. //depot/projects/fdt/ObsoleteFiles.inc#7 integrate .. //depot/projects/fdt/bin/cp/cp.1#2 integrate .. //depot/projects/fdt/bin/cp/cp.c#2 integrate .. //depot/projects/fdt/bin/cp/utils.c#2 integrate .. //depot/projects/fdt/bin/date/date.1#2 integrate .. //depot/projects/fdt/bin/ls/ls.c#2 integrate .. //depot/projects/fdt/bin/ls/ls.h#2 integrate .. //depot/projects/fdt/bin/ls/print.c#2 integrate .. //depot/projects/fdt/bin/pkill/Makefile#2 integrate .. //depot/projects/fdt/contrib/bind9/CHANGES#3 integrate .. //depot/projects/fdt/contrib/bind9/FAQ#2 integrate .. //depot/projects/fdt/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/fdt/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/fdt/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/fdt/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.nsupdate.html#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/fdt/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/include/dns/types.h#3 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/fdt/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/fdt/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/fdt/contrib/bind9/version#3 integrate .. //depot/projects/fdt/contrib/libpcap/inet.c#4 integrate .. //depot/projects/fdt/contrib/netcat/nc.1#2 integrate .. //depot/projects/fdt/contrib/netcat/netcat.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/CACerts#2 integrate .. //depot/projects/fdt/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/fdt/contrib/sendmail/LICENSE#2 integrate .. //depot/projects/fdt/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/fdt/contrib/sendmail/README#2 integrate .. //depot/projects/fdt/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/fdt/contrib/sendmail/cf/README#2 integrate .. //depot/projects/fdt/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/fdt/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate .. //depot/projects/fdt/contrib/sendmail/cf/m4/cfhead.m4#2 integrate .. //depot/projects/fdt/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/fdt/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/fdt/contrib/sendmail/contrib/qtool.pl#2 integrate .. //depot/projects/fdt/contrib/sendmail/contrib/smcontrol.pl#2 integrate .. //depot/projects/fdt/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/fdt/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/include/libmilter/mfdef.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/include/sm/ldap.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/include/sm/sem.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/docs/overview.html#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/docs/smfi_insheader.html#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/example.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/handler.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/libmilter.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsm/debug.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsm/mbdb.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsmdb/smdb1.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsmdb/smdb2.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/libsmutil/safefile.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/praliases/praliases.8#2 integrate .. //depot/projects/fdt/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/README#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/tls.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/fdt/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/fdt/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/fdt/etc/defaults/rc.conf#4 integrate .. //depot/projects/fdt/etc/devd/Makefile#2 integrate .. //depot/projects/fdt/etc/devd/uath.conf#1 branch .. //depot/projects/fdt/etc/etc.amd64/ttys#3 integrate .. //depot/projects/fdt/etc/etc.arm/ttys#3 integrate .. //depot/projects/fdt/etc/etc.i386/ttys#3 integrate .. //depot/projects/fdt/etc/etc.ia64/ttys#3 integrate .. //depot/projects/fdt/etc/etc.mips/ttys#3 integrate .. //depot/projects/fdt/etc/etc.pc98/ttys#2 integrate .. //depot/projects/fdt/etc/etc.powerpc/ttys#3 integrate .. //depot/projects/fdt/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/fdt/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/fdt/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/fdt/etc/namedb/named.conf#3 integrate .. //depot/projects/fdt/etc/rc.d/devfs#2 integrate .. //depot/projects/fdt/etc/rc.firewall#5 integrate .. //depot/projects/fdt/etc/rc.subr#3 integrate .. //depot/projects/fdt/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/fdt/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/fdt/etc/services#2 integrate .. //depot/projects/fdt/gnu/lib/libstdc++/Makefile#2 integrate .. //depot/projects/fdt/gnu/lib/libsupc++/Makefile#2 integrate .. //depot/projects/fdt/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/fdt/include/Makefile#5 integrate .. //depot/projects/fdt/lib/Makefile#4 integrate .. //depot/projects/fdt/lib/bind/dns/code.h#2 integrate .. //depot/projects/fdt/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/fdt/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/fdt/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/fdt/lib/libarchive/archive_entry_link_resolver.c#3 integrate .. //depot/projects/fdt/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_disk_entry_from_file.c#3 integrate .. //depot/projects/fdt/lib/libarchive/archive_read_support_format_iso9660.c#3 integrate .. //depot/projects/fdt/lib/libarchive/archive_write_set_format_zip.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/Symbol.map#4 integrate .. //depot/projects/fdt/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/fdt/lib/libc/gen/getutxent.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/getutxent.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/opendir.c#3 integrate .. //depot/projects/fdt/lib/libc/gen/pututxline.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/scandir.3#3 integrate .. //depot/projects/fdt/lib/libc/gen/scandir.c#3 integrate .. //depot/projects/fdt/lib/libc/gen/sem.c#3 integrate .. //depot/projects/fdt/lib/libc/gen/sem_new.c#4 integrate .. //depot/projects/fdt/lib/libc/gen/ttyname.3#3 integrate .. //depot/projects/fdt/lib/libc/gen/ttyslot.c#3 integrate .. //depot/projects/fdt/lib/libc/gen/uname.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/utxdb.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/utxdb.h#2 integrate .. //depot/projects/fdt/lib/libc/nls/gl_ES.ISO8859-1.msg#2 integrate .. //depot/projects/fdt/lib/libc/nls/msgcat.c#2 integrate .. //depot/projects/fdt/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/fdt/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/fdt/lib/libc/sys/mount.2#2 integrate .. //depot/projects/fdt/lib/libc/sys/wait.2#2 integrate .. //depot/projects/fdt/lib/libfetch/Makefile#2 integrate .. //depot/projects/fdt/lib/libfetch/fetch.3#2 integrate .. //depot/projects/fdt/lib/libfetch/http.c#2 integrate .. //depot/projects/fdt/lib/libgeom/geom_util.c#2 integrate .. //depot/projects/fdt/lib/libgeom/geom_xml2tree.c#2 integrate .. //depot/projects/fdt/lib/libgeom/libgeom.3#2 integrate .. //depot/projects/fdt/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/gssapi.3#2 integrate .. //depot/projects/fdt/lib/libgssapi/mech.5#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_krb5/Makefile#3 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_lastlog/Makefile#3 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_lastlog/pam_lastlog.8#2 integrate .. //depot/projects/fdt/lib/libpam/modules/pam_lastlog/pam_lastlog.c#5 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_get_error.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_get_mech_info.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_get_mechanisms.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_get_principal_name.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_get_versions.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_getcred.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_is_installed.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_max_data_length.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_mech_to_oid.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_oid_to_mech.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_qop_to_num.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_seccreate.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_set_callback.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_set_defaults.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_set_svc_name.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3#2 integrate .. //depot/projects/fdt/lib/librpcsec_gss/rpcsec_gss.3#2 integrate .. //depot/projects/fdt/lib/libstand/bzipfs.c#3 integrate .. //depot/projects/fdt/lib/libtacplus/taclib.c#4 integrate .. //depot/projects/fdt/lib/libutil/login_tty.c#2 integrate .. //depot/projects/fdt/libexec/comsat/comsat.8#2 integrate .. //depot/projects/fdt/libexec/ftpd/ftpd.8#2 integrate .. //depot/projects/fdt/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/fdt/libexec/ftpd/logwtmp.c#3 integrate .. //depot/projects/fdt/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/fdt/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/fdt/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/fdt/release/i386/fixit_crunch.conf#3 integrate .. //depot/projects/fdt/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/fdt/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/fdt/release/pc98/fixit_crunch.conf#3 integrate .. //depot/projects/fdt/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/fdt/release/picobsd/qemu/crunch.conf#2 integrate .. //depot/projects/fdt/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/fdt/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/fdt/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/fdt/rescue/rescue/Makefile#3 integrate .. //depot/projects/fdt/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/fdt/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/fdt/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/fdt/sbin/geom/class/Makefile#2 integrate .. //depot/projects/fdt/sbin/geom/class/mountver/Makefile#1 branch .. //depot/projects/fdt/sbin/geom/class/mountver/geom_mountver.c#1 branch .. //depot/projects/fdt/sbin/geom/class/mountver/gmountver.8#1 branch .. //depot/projects/fdt/sbin/geom/core/geom.8#3 integrate .. //depot/projects/fdt/sbin/geom/core/geom.c#2 integrate .. //depot/projects/fdt/sbin/ifconfig/Makefile#2 integrate .. //depot/projects/fdt/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/fdt/sbin/ifconfig/ifconfig.c#5 integrate .. //depot/projects/fdt/sbin/init/init.8#2 integrate .. //depot/projects/fdt/sbin/init/init.c#4 integrate .. //depot/projects/fdt/sbin/kldconfig/Makefile#2 integrate .. //depot/projects/fdt/sbin/kldload/Makefile#2 integrate .. //depot/projects/fdt/sbin/kldstat/Makefile#2 integrate .. //depot/projects/fdt/sbin/mdconfig/Makefile#2 integrate .. //depot/projects/fdt/sbin/mdconfig/mdconfig.c#2 integrate .. //depot/projects/fdt/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/fdt/sbin/natd/Makefile#2 integrate .. //depot/projects/fdt/sbin/natd/natd.c#3 integrate .. //depot/projects/fdt/sbin/newfs/Makefile#2 integrate .. //depot/projects/fdt/sbin/reboot/reboot.8#2 integrate .. //depot/projects/fdt/sbin/swapon/Makefile#2 integrate .. //depot/projects/fdt/sbin/tunefs/Makefile#2 integrate .. //depot/projects/fdt/share/doc/usd/05.dc/Makefile#1 branch .. //depot/projects/fdt/share/doc/usd/06.bc/Makefile#1 branch .. //depot/projects/fdt/share/doc/usd/Makefile#2 integrate .. //depot/projects/fdt/share/examples/kld/cdev/test/Makefile#2 integrate .. //depot/projects/fdt/share/examples/kld/cdev/test/testcdev.c#2 integrate .. //depot/projects/fdt/share/examples/kld/firmware/fwconsumer/fw_consumer.c#2 integrate .. //depot/projects/fdt/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/fdt/share/examples/kld/syscall/test/call.c#2 integrate .. //depot/projects/fdt/share/man/man3/pthread_join.3#2 integrate .. //depot/projects/fdt/share/man/man3/sysexits.3#2 integrate .. //depot/projects/fdt/share/man/man4/Makefile#7 integrate .. //depot/projects/fdt/share/man/man4/epair.4#2 integrate .. //depot/projects/fdt/share/man/man4/gpib.4#1 branch .. //depot/projects/fdt/share/man/man4/netintro.4#4 integrate .. //depot/projects/fdt/share/man/man4/nvram.4#1 branch .. //depot/projects/fdt/share/man/man4/pcii.4#1 branch .. //depot/projects/fdt/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/fdt/share/man/man4/sysmouse.4#2 integrate .. //depot/projects/fdt/share/man/man4/tnt4882.4#1 branch .. //depot/projects/fdt/share/man/man5/src.conf.5#2 integrate .. //depot/projects/fdt/share/man/man7/hier.7#2 integrate .. //depot/projects/fdt/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/fdt/share/man/man9/Makefile#4 integrate .. //depot/projects/fdt/share/man/man9/kthread.9#2 integrate .. //depot/projects/fdt/share/man/man9/sysctl.9#2 integrate .. //depot/projects/fdt/share/misc/committers-ports.dot#3 integrate .. //depot/projects/fdt/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/fdt/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/fdt/share/mk/bsd.own.mk#3 integrate .. //depot/projects/fdt/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/fdt/share/mk/sys.mk#2 integrate .. //depot/projects/fdt/share/security/lomac-policy.contexts#2 integrate .. //depot/projects/fdt/share/zoneinfo/asia#4 integrate .. //depot/projects/fdt/share/zoneinfo/northamerica#2 integrate .. //depot/projects/fdt/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/fdt/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/fdt/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/fdt/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/fdt/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/fdt/sys/amd64/conf/XENHVM#3 integrate .. //depot/projects/fdt/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/fdt/sys/amd64/ia32/ia32_syscall.c#3 integrate .. //depot/projects/fdt/sys/arm/conf/CRB#2 integrate .. //depot/projects/fdt/sys/arm/conf/EP80219#2 integrate .. //depot/projects/fdt/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/fdt/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/fdt/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/fdt/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/fdt/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/fdt/sys/boot/ia64/efi/main.c#3 integrate .. //depot/projects/fdt/sys/boot/ia64/efi/version#3 integrate .. //depot/projects/fdt/sys/cam/ata/ata_all.c#7 integrate .. //depot/projects/fdt/sys/cam/ata/ata_da.c#5 integrate .. //depot/projects/fdt/sys/cam/ata/ata_pmp.c#6 integrate .. //depot/projects/fdt/sys/cam/ata/ata_xpt.c#7 integrate .. //depot/projects/fdt/sys/cam/cam.c#3 integrate .. //depot/projects/fdt/sys/cam/cam.h#3 integrate .. //depot/projects/fdt/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/fdt/sys/cam/cam_periph.c#4 integrate .. //depot/projects/fdt/sys/cam/cam_periph.h#4 integrate .. //depot/projects/fdt/sys/cam/cam_queue.h#3 integrate .. //depot/projects/fdt/sys/cam/cam_sim.c#2 integrate .. //depot/projects/fdt/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/fdt/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/fdt/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/fdt/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/fdt/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/fdt/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/fdt/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/fdt/sys/compat/linux/linux_ioctl.h#3 integrate .. //depot/projects/fdt/sys/conf/NOTES#9 integrate .. //depot/projects/fdt/sys/conf/files#10 integrate .. //depot/projects/fdt/sys/conf/files.pc98#2 integrate .. //depot/projects/fdt/sys/conf/kern.mk#3 integrate .. //depot/projects/fdt/sys/conf/ldscript.mips#3 integrate .. //depot/projects/fdt/sys/conf/options.pc98#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/changes.txt#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/adfile.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/adwalk.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/dmextern.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/dmrestag.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/dmtable.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbexec.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbstats.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbutils.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbxface.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmbuffer.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmnames.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmresrcl.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmresrcs.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/disassembler/dmwalk.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsinit.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsmethod.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsobject.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dswexec.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dswscope.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dswstate.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evevent.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evgpeblk.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evmisc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evregion.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evrgnini.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evsci.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evxface.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/events/evxfregn.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exconfig.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exconvrt.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/excreate.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exdump.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exfield.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exmisc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exmutex.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exnames.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg1.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg2.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg3.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg6.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exprep.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exregion.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exresnte.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exresolv.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exresop.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exstore.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exstoren.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/hardware/hwacpi.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/accommon.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acconfig.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acdispat.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acevents.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acmacros.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acnames.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acobject.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acopcode.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acoutput.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acpi.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acpiosxf.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acpixf.h#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acresrc.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acrestyp.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acstruct.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/actables.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/acutils.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/amlresrc.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/platform/acenv.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/include/platform/acgcc.h#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsaccess.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsdump.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsdumpdv.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nseval.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsinit.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsnames.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsobject.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nspredef.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsrepair.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsrepair2.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsutils.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nswalk.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsxfeval.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsxfname.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsxfobj.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psargs.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psloop.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psopcode.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psparse.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psscope.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/pstree.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psutils.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/pswalk.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psxface.c#4 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsaddr.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rscalc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rscreate.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsdump.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsinfo.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsio.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsirq.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rslist.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsmemory.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsmisc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsutils.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/resources/rsxface.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbfadt.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbfind.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbinstal.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbxface.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tables/tbxfroot.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utalloc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utcache.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utdebug.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utdelete.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utids.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utlock.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utmath.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utmisc.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utmutex.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utobject.c#3 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utresrc.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utstate.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/fdt/sys/contrib/dev/uath/ar5523.bin.uu#2 integrate .. //depot/projects/fdt/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/fdt/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/fdt/sys/dev/acpi_support/acpi_wmi.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.h#5 integrate .. //depot/projects/fdt/sys/dev/asr/asr.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/fdt/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/fdt/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/fdt/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/fdt/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-promise.c#5 integrate .. //depot/projects/fdt/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/fdt/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/fdt/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/fdt/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/fdt/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/fdt/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/fdt/sys/dev/cs/if_csreg.h#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/LICENSE#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_80003es2lan.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_82541.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_82543.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_82571.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_82575.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_82575.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_api.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_defines.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_hw.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_ich8lan.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_ich8lan.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_mac.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_manage.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_osdep.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_phy.c#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_phy.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/e1000_regs.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/fdt/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/fdt/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/fdt/sys/dev/e1000/if_igb.h#3 integrate .. //depot/projects/fdt/sys/dev/fb/vesa.c#5 integrate .. //depot/projects/fdt/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/fdt/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/fdt/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/fdt/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/fdt/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/fdt/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/fdt/sys/dev/ieee488/tnt4882.c#2 integrate .. //depot/projects/fdt/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/fdt/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/fdt/sys/dev/iwn/if_iwnreg.h#3 integrate .. //depot/projects/fdt/sys/dev/mly/mly.c#4 integrate .. //depot/projects/fdt/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/fdt/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/fdt/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/fdt/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/fdt/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/fdt/sys/dev/re/if_re.c#4 integrate .. //depot/projects/fdt/sys/dev/siis/siis.c#7 integrate .. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/fdt/sys/dev/trm/trm.c#3 integrate .. //depot/projects/fdt/sys/dev/twa/tw_osl_cam.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/fdt/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/fdt/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/fdt/sys/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/fdt/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/fdt/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/fdt/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/fdt/sys/geom/geom_dump.c#2 integrate .. //depot/projects/fdt/sys/geom/mountver/g_mountver.c#1 branch .. //depot/projects/fdt/sys/geom/mountver/g_mountver.h#1 branch .. //depot/projects/fdt/sys/geom/part/g_part_bsd.c#2 integrate .. //depot/projects/fdt/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/fdt/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/fdt/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/fdt/sys/geom/virstor/g_virstor.c#2 integrate .. //depot/projects/fdt/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/fdt/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/fdt/sys/i386/i386/trap.c#4 integrate .. //depot/projects/fdt/sys/i386/include/pmap.h#3 integrate .. //depot/projects/fdt/sys/i386/isa/clock.c#3 integrate .. //depot/projects/fdt/sys/i386/xen/pmap.c#6 integrate .. //depot/projects/fdt/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/fdt/sys/ia64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_intr.c#3 integrate .. //depot/projects/fdt/sys/kern/kern_jail.c#7 integrate .. //depot/projects/fdt/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_sig.c#5 integrate .. //depot/projects/fdt/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/fdt/sys/kern/sched_ule.c#5 integrate .. //depot/projects/fdt/sys/kern/sys_process.c#3 integrate .. //depot/projects/fdt/sys/kern/tty_inq.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/fdt/sys/mips/adm5120/adm5120_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/alchemy/alchemy_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/atheros/ar71xx_spi.c#2 integrate .. //depot/projects/fdt/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/fdt/sys/mips/atheros/files.ar71xx#2 integrate .. //depot/projects/fdt/sys/mips/atheros/pcf2123_rtc.c#1 branch .. //depot/projects/fdt/sys/mips/atheros/pcf2123reg.h#1 branch .. //depot/projects/fdt/sys/mips/cavium/dev/rgmii/octeon_fpa.c#3 integrate .. //depot/projects/fdt/sys/mips/cavium/obio.c#3 integrate .. //depot/projects/fdt/sys/mips/cavium/octeon_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/fdt/sys/mips/cavium/octeonreg.h#2 delete .. //depot/projects/fdt/sys/mips/cavium/uart_bus_octeonusart.c#3 integrate .. //depot/projects/fdt/sys/mips/cavium/uart_cpu_octeonusart.c#3 integrate .. //depot/projects/fdt/sys/mips/conf/AR71XX.hints#2 integrate .. //depot/projects/fdt/sys/mips/conf/OCTEON1#3 integrate .. //depot/projects/fdt/sys/mips/conf/OCTEON1-32#3 integrate .. //depot/projects/fdt/sys/mips/conf/OCTEON1.hints#2 integrate .. //depot/projects/fdt/sys/mips/conf/QEMU#2 integrate .. //depot/projects/fdt/sys/mips/conf/XLR#2 integrate .. //depot/projects/fdt/sys/mips/idt/idt_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/include/cpu.h#3 integrate .. //depot/projects/fdt/sys/mips/include/cpuregs.h#3 integrate .. //depot/projects/fdt/sys/mips/include/elf.h#3 integrate .. //depot/projects/fdt/sys/mips/include/md_var.h#3 integrate .. //depot/projects/fdt/sys/mips/include/trap.h#3 integrate .. //depot/projects/fdt/sys/mips/malta/malta_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/busdma_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/db_trace.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/elf_trampoline.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/exception.S#3 integrate .. //depot/projects/fdt/sys/mips/mips/locore.S#3 integrate .. //depot/projects/fdt/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/fdt/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/fdt/sys/mips/mips/swtch.S#3 integrate .. //depot/projects/fdt/sys/mips/mips/tick.c#3 integrate .. //depot/projects/fdt/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/fdt/sys/mips/rmi/clock.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/fdt/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/fdt/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/sentry5/s5_machdep.c#3 integrate .. //depot/projects/fdt/sys/mips/sibyte/sb_machdep.c#2 integrate .. //depot/projects/fdt/sys/modules/Makefile#4 integrate .. //depot/projects/fdt/sys/modules/geom/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/geom/geom_mountver/Makefile#1 branch .. //depot/projects/fdt/sys/net/if.c#6 integrate .. //depot/projects/fdt/sys/net/if.h#5 integrate .. //depot/projects/fdt/sys/net/if_bridge.c#4 integrate .. //depot/projects/fdt/sys/net/if_lagg.c#3 integrate .. //depot/projects/fdt/sys/net/if_var.h#6 integrate .. //depot/projects/fdt/sys/net/if_vlan.c#3 integrate .. //depot/projects/fdt/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/fdt/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/fdt/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/fdt/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/fdt/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_fw2.c#6 integrate .. //depot/projects/fdt/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/fdt/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_indata.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/fdt/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/fdt/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/fdt/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/fdt/sys/netinet/sctputil.c#4 integrate .. //depot/projects/fdt/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/fdt/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/fdt/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/fdt/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/fdt/sys/nfsclient/nfs.h#2 integrate .. //depot/projects/fdt/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/fdt/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/fdt/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/fdt/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/fdt/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/fdt/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/fdt/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/fdt/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/fdt/sys/pc98/conf/DEFAULTS#4 integrate .. //depot/projects/fdt/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/fdt/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/fdt/sys/pci/nfsmb.c#2 integrate .. //depot/projects/fdt/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/fdt/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/fdt/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/fdt/sys/sparc64/pci/fire.c#3 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/trap.c#5 integrate .. //depot/projects/fdt/sys/sys/cdefs.h#2 integrate .. //depot/projects/fdt/sys/sys/jail.h#3 integrate .. //depot/projects/fdt/sys/sys/kthread.h#2 integrate .. //depot/projects/fdt/sys/sys/param.h#9 integrate .. //depot/projects/fdt/sys/sys/priv.h#4 integrate .. //depot/projects/fdt/sys/sys/proc.h#5 integrate .. //depot/projects/fdt/sys/sys/signalvar.h#5 integrate .. //depot/projects/fdt/sys/sys/sockio.h#4 integrate .. //depot/projects/fdt/sys/sys/vnode.h#3 integrate .. //depot/projects/fdt/sys/ufs/ufs/ufs_acl.c#3 integrate .. //depot/projects/fdt/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/fdt/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/fdt/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/fdt/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate .. //depot/projects/fdt/tools/make_libdeps.sh#2 integrate .. //depot/projects/fdt/usr.bin/Makefile#4 integrate .. //depot/projects/fdt/usr.bin/at/at.man#2 integrate .. //depot/projects/fdt/usr.bin/bc/Makefile#1 branch .. //depot/projects/fdt/usr.bin/bc/USD.doc/bc#1 branch .. //depot/projects/fdt/usr.bin/bc/bc.1#1 branch .. //depot/projects/fdt/usr.bin/bc/bc.library#1 branch .. //depot/projects/fdt/usr.bin/bc/bc.y#1 branch .. //depot/projects/fdt/usr.bin/bc/extern.h#1 branch .. //depot/projects/fdt/usr.bin/bc/pathnames.h#1 branch .. //depot/projects/fdt/usr.bin/bc/scan.l#1 branch .. //depot/projects/fdt/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/fdt/usr.bin/dc/Makefile#1 branch .. //depot/projects/fdt/usr.bin/dc/USD.doc/dc#1 branch .. //depot/projects/fdt/usr.bin/dc/bcode.c#1 branch .. //depot/projects/fdt/usr.bin/dc/bcode.h#1 branch .. //depot/projects/fdt/usr.bin/dc/dc.1#1 branch .. //depot/projects/fdt/usr.bin/dc/dc.c#1 branch .. //depot/projects/fdt/usr.bin/dc/extern.h#1 branch .. //depot/projects/fdt/usr.bin/dc/inout.c#1 branch .. //depot/projects/fdt/usr.bin/dc/mem.c#1 branch .. //depot/projects/fdt/usr.bin/dc/stack.c#1 branch .. //depot/projects/fdt/usr.bin/finger/finger.1#2 integrate .. //depot/projects/fdt/usr.bin/getent/getent.c#3 integrate .. //depot/projects/fdt/usr.bin/last/last.1#2 integrate .. //depot/projects/fdt/usr.bin/last/last.c#3 integrate .. //depot/projects/fdt/usr.bin/locale/Makefile#2 integrate .. //depot/projects/fdt/usr.bin/make/make.1#3 integrate .. //depot/projects/fdt/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/fdt/usr.bin/talk/talk.1#2 integrate .. //depot/projects/fdt/usr.bin/uname/uname.1#2 integrate .. //depot/projects/fdt/usr.bin/uname/uname.c#2 integrate .. //depot/projects/fdt/usr.bin/unifdef/unifdef.1#3 integrate .. //depot/projects/fdt/usr.bin/unifdef/unifdef.c#4 integrate .. //depot/projects/fdt/usr.bin/unifdef/unifdefall.sh#3 integrate .. //depot/projects/fdt/usr.bin/users/users.1#2 integrate .. //depot/projects/fdt/usr.bin/w/w.1#2 integrate .. //depot/projects/fdt/usr.bin/who/who.1#2 integrate .. //depot/projects/fdt/usr.sbin/Makefile#5 integrate .. //depot/projects/fdt/usr.sbin/ac/ac.8#2 integrate .. //depot/projects/fdt/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/fdt/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/fdt/usr.sbin/ctm/ctm_smail/ctm_smail.c#2 integrate .. //depot/projects/fdt/usr.sbin/extattr/rmextattr.c#2 integrate .. //depot/projects/fdt/usr.sbin/jail/jail.8#3 integrate .. //depot/projects/fdt/usr.sbin/lastlogin/lastlogin.8#2 integrate .. //depot/projects/fdt/usr.sbin/lastlogin/lastlogin.c#5 integrate .. //depot/projects/fdt/usr.sbin/makefs/makefs.8#2 integrate .. //depot/projects/fdt/usr.sbin/mergemaster/mergemaster.sh#6 integrate .. //depot/projects/fdt/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/fdt/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/lib/lib.h#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/updating/main.c#2 integrate .. //depot/projects/fdt/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate .. //depot/projects/fdt/usr.sbin/ppp/Makefile#2 integrate .. //depot/projects/fdt/usr.sbin/rwhod/rwhod.8#2 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/fdt/usr.sbin/ypserv/yp_main.c#4 integrate Differences ... ==== //depot/projects/fdt/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.361 2010/01/11 17:58:15 bz Exp $ +# $FreeBSD: src/Makefile,v 1.363 2010/01/19 15:34:16 ed Exp $ # # The user-driven targets are: # ==== //depot/projects/fdt/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.637 2010/01/14 23:27:23 jilles Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.640 2010/01/26 10:00:26 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1110,19 +1110,19 @@ gnu/lib/libgcc__L: lib/libc__L -_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ - ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \ - ${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \ - lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \ +_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ + ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ + ${_kerberos5_lib_libroken} \ + lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libexpat \ - ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \ + ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libulog \ + lib/libradius lib/libsbuf lib/libtacplus \ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libdwarf lib/libproc + ${_secure_lib_libssl} .if ${MK_LIBTHR} != "no" _lib_libthr= lib/libthr @@ -1144,18 +1144,20 @@ .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L -.if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ +.if ${MK_KERBEROS_SUPPORT} != "no" +secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ - lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ - lib/libcrypt__L -secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L + lib/libmd__L kerberos5/lib/libroken__L .endif .endif .endif _secure_lib= secure/lib .endif +.if ${MK_GSSAPI} != "no" +_lib_libgssapi= lib/libgssapi +.endif + .if ${MK_IPX} != "no" _lib_libipx= lib/libipx .endif @@ -1167,8 +1169,6 @@ _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm -_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 -_lib_libgssapi= lib/libgssapi .endif .if ${MK_NIS} != "no" ==== //depot/projects/fdt/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.222 2010/01/14 05:35:32 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.224 2010/01/22 23:19:48 delphij Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,16 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd +OLD_FILES+=usr/share/doc/papers/bc.ascii.gz +OLD_FILES+=usr/share/doc/papers/dc.ascii.gz +# 20100120: replacing GNU bc/dc with BSDL versions +OLD_FILES+=usr/share/examples/bc/ckbook.b +OLD_FILES+=usr/share/examples/bc/pi.b +OLD_FILES+=usr/share/examples/bc/primes.b +OLD_FILES+=usr/share/examples/bc/twins.b +OLD_FILES+=usr/share/info/dc.info.gz +OLD_DIRS+=usr/share/examples/bc # 20100114: removal of ttyslot(3) OLD_FILES+=usr/share/man/man3/ttyslot.3.gz # 20100113: remove utmp.h, replace it by utmpx.h ==== //depot/projects/fdt/bin/cp/cp.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 28 16:42:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA5DC1065672; Thu, 28 Jan 2010 16:42:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 66B79106566C for ; Thu, 28 Jan 2010 16:42:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 544328FC1A for ; Thu, 28 Jan 2010 16:42:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SGgdLd072049 for ; Thu, 28 Jan 2010 16:42:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SGgdaG072047 for perforce@freebsd.org; Thu, 28 Jan 2010 16:42:39 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 28 Jan 2010 16:42:39 GMT Message-Id: <201001281642.o0SGgdaG072047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 16:42:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=173847 Change 173847 by hselasky@hselasky_laptop001 on 2010/01/28 16:42:37 USB input: - fix for leftover key-presses after polling - patch by: HPS PR: usb/143286, kern/141011 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#41 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#41 (text+ko) ==== @@ -283,7 +283,8 @@ static int ukbd_enable(keyboard_t *); static int ukbd_disable(keyboard_t *); static void ukbd_interrupt(struct ukbd_softc *); -static int ukbd_is_polling(struct ukbd_softc *sc); +static int ukbd_is_polling(struct ukbd_softc *); +static void ukbd_event_keyinput(struct ukbd_softc *); static device_probe_t ukbd_probe; static device_attach_t ukbd_attach; @@ -395,7 +396,6 @@ uint32_t o_mod; uint32_t now = sc->sc_time_ms; uint32_t dtime; - uint32_t c; uint8_t key; uint8_t i; uint8_t j; @@ -482,6 +482,17 @@ if (sc->sc_inputs == 0) goto done; + ukbd_event_keyinput(sc); + +done: + return; +} + +static void +ukbd_event_keyinput(struct ukbd_softc *sc) +{ + int c; + if (KBD_IS_ACTIVE(&sc->sc_kbd) && KBD_IS_BUSY(&sc->sc_kbd)) { /* let the callback function process the input */ @@ -493,8 +504,6 @@ c = ukbd_read_char(&sc->sc_kbd, 0); } while (c != NOKEY); } -done: - return; } static void @@ -509,6 +518,9 @@ ukbd_interrupt(sc); if (ukbd_any_key_pressed(sc)) { + if (ukbd_is_polling(sc) == 0) + ukbd_event_keyinput(sc); + ukbd_start_timer(sc); } else { sc->sc_flags &= ~UKBD_FLAG_TIMER_RUNNING; From owner-p4-projects@FreeBSD.ORG Thu Jan 28 17:07:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2402E106568D; Thu, 28 Jan 2010 17:07:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCA261065670 for ; Thu, 28 Jan 2010 17:07:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA1F48FC3E for ; Thu, 28 Jan 2010 17:07:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SH73vm085172 for ; Thu, 28 Jan 2010 17:07:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SH73oS085170 for perforce@freebsd.org; Thu, 28 Jan 2010 17:07:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 28 Jan 2010 17:07:03 GMT Message-Id: <201001281707.o0SH73oS085170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173848 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 17:07:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=173848 Change 173848 by hselasky@hselasky_laptop001 on 2010/01/28 17:06:32 USB input: - improve last patch PR: usb/143286, kern/141011 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#42 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#42 (text+ko) ==== @@ -517,10 +517,11 @@ ukbd_interrupt(sc); - if (ukbd_any_key_pressed(sc)) { - if (ukbd_is_polling(sc) == 0) - ukbd_event_keyinput(sc); + /* Make sure any leftover key events gets read out */ + if (ukbd_is_polling(sc) == 0) + ukbd_event_keyinput(sc); + if (ukbd_any_key_pressed(sc) || (sc->sc_inputs != 0)) { ukbd_start_timer(sc); } else { sc->sc_flags &= ~UKBD_FLAG_TIMER_RUNNING; @@ -1662,6 +1663,7 @@ ukbd_is_polling(sc); /* update state */ } else { sc->sc_flags &= ~UKBD_FLAG_POLLING; + ukbd_start_timer(sc); /* start timer */ } return (0); } From owner-p4-projects@FreeBSD.ORG Thu Jan 28 18:45:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99F661065679; Thu, 28 Jan 2010 18:45:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E887106566C for ; Thu, 28 Jan 2010 18:45:43 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 334458FC0A for ; Thu, 28 Jan 2010 18:45:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SIjh08093311 for ; Thu, 28 Jan 2010 18:45:43 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SIjhIO093309 for perforce@freebsd.org; Thu, 28 Jan 2010 18:45:43 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 28 Jan 2010 18:45:43 GMT Message-Id: <201001281845.o0SIjhIO093309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 18:45:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=173854 Change 173854 by jona@jona-capsicum-kent64 on 2010/01/28 18:45:03 Makefile was missed earlier... Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 28 19:14:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D5341065693; Thu, 28 Jan 2010 19:14:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4107106568F for ; Thu, 28 Jan 2010 19:14:11 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B81B38FC16 for ; Thu, 28 Jan 2010 19:14:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SJEBXB096359 for ; Thu, 28 Jan 2010 19:14:11 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SJEBhh096357 for perforce@freebsd.org; Thu, 28 Jan 2010 19:14:11 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 28 Jan 2010 19:14:11 GMT Message-Id: <201001281914.o0SJEBhh096357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 19:14:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=173855 Change 173855 by jona@jona-capsicum-kent64 on 2010/01/28 19:13:15 Changed the libcapsicum startfd API to accept an lc_fdlist (no implementation changes yet) Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#2 $ */ #ifndef _LIBCAPABILITY_H_ @@ -121,7 +121,7 @@ struct lc_library *lclp, u_int lcl_count, struct lc_sandbox **lcspp); int lch_startfd(int fd_sandbox, const char *binname, char *const argv[], - u_int flags, struct lc_sandbox **lcspp); + u_int flags, struct lc_fdlist *fds, struct lc_sandbox **lcspp); int lch_startfd_libs(int fd_sandbox, const char *binname, char *const argv[], u_int flags, struct lc_library *lclp, u_int lcl_count, struct lc_sandbox **lcspp); ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#2 $ */ #include @@ -349,7 +349,7 @@ int lch_startfd(int fd_sandbox, const char *binname, char *const argv[], - u_int flags, struct lc_sandbox **lcspp) + u_int flags, __unused struct lc_fdlist *fds, struct lc_sandbox **lcspp) { return (lch_startfd_libs(fd_sandbox, binname, argv, flags, NULL, 0, From owner-p4-projects@FreeBSD.ORG Thu Jan 28 19:23:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 554D9106568B; Thu, 28 Jan 2010 19:23:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 196581065676 for ; Thu, 28 Jan 2010 19:23:21 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 069EF8FC20 for ; Thu, 28 Jan 2010 19:23:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SJNK7s097008 for ; Thu, 28 Jan 2010 19:23:20 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SJNKMu097006 for perforce@freebsd.org; Thu, 28 Jan 2010 19:23:20 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 28 Jan 2010 19:23:20 GMT Message-Id: <201001281923.o0SJNKMu097006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173856 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2010 19:23:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=173856 Change 173856 by jona@jona-capsicum-kent64 on 2010/01/28 19:23:18 Added lc_fdlist_global() and tests, although there is no implementation. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#2 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#3 $ */ #ifndef _LIBCAPABILITY_H_ @@ -57,11 +57,12 @@ /* A list of file descriptors, which can be passed around in shared memory */ struct lc_fdlist; - struct lc_fdlist* lc_fdlist_new(void); +struct lc_fdlist* lc_fdlist_global(void); struct lc_fdlist* lc_fdlist_dup(struct lc_fdlist *orig); void lc_fdlist_free(struct lc_fdlist *l); + /* Size of an FD list in bytes, including all associated string data */ int lc_fdlist_size(struct lc_fdlist *l); ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#2 $ */ #include @@ -81,6 +81,16 @@ +struct lc_fdlist *global_fdlist = NULL; + + +struct lc_fdlist* +lc_fdlist_global(void) { + + return global_fdlist; +} + + #define INITIAL_ENTRIES 16 #define INITIAL_NAMEBYTES (64 * INITIAL_ENTRIES) @@ -143,6 +153,12 @@ struct lc_fdlist *l = *fdlist; + if (l == NULL) { + + errno = EINVAL; + return -1; + } + LOCK(l); /* do we need more entry space? */ @@ -258,6 +274,11 @@ const char *subsystem, const char *id, char **name, int *fdp, int *pos) { + if (l == NULL) { + errno = EINVAL; + return -1; + } + LOCK(l); int successful = 0; ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#4 (text+ko) ==== @@ -46,40 +46,31 @@ #include + +int add_junk(struct lc_fdlist**); +int find_junk(struct lc_fdlist*); + + /* * Unsandboxed host process with full user rights. */ int main(int argc, char *argv[]) { + /* create an FD list and add some junk to it */ struct lc_fdlist *fds = lc_fdlist_new(); - if (fds == NULL) - err(-1, "Error in lc_fdlist_new()"); + if (fds == NULL) err(-1, "Error in lc_fdlist_new()"); lc_fdlist_add(&fds, "org.freebsd.Capsicum", "testfile", "/etc/passwd", open("/etc/passwd", O_RDONLY)); lc_fdlist_addcap(&fds, "org.freebsd.Capsicum", "testfile", "/etc/group", open("/etc/group", O_RDONLY), CAP_READ); - for (int i = 0; i < 20; i++) - lc_fdlist_add(&fds, "org.freebsd.Capsicum", "testjunk", - "garbage", 50 + i); + if (add_junk(&fds) < 0) err(-1, "Error in add_junk()"); + if (find_junk(fds) < 0) err(-1, "Error in find_junk()"); - int pos = 0; - for (int i = 0; i < 20; i++) { - char *name; - int value; - lc_fdlist_lookup(fds, "org.freebsd.Capsicum", "testjunk", - &name, &value, &pos); - - if (strcmp("garbage", name)) - warnx("i=%i\tGot '%s' instead of 'garbage'", i, name); - - if (value != 50 + i) - warnx("i=%i\tGot 'FD' %i instead of %i", i, value, 50 + i); - } - + /* copy it into a shared memory segment and see if it still works */ int shmfd = shm_open(SHM_ANON, O_RDWR, 0600); if (shmfd < 0) err(-1, "Error opening shared memory"); @@ -99,14 +90,67 @@ struct lc_fdlist *copy = (struct lc_fdlist*) shm; + if (find_junk(copy) < 0) err(-1, "Error in find_junk(copy)"); + + printf("OK\n"); + + + /* run sandbox */ + int me = open(argv[0], O_RDONLY); + if (me < 0) err(-1, "Error opening my own binary, '%s'", argv[0]); + + char *sargv[] = { "fdlist-sandbox", NULL }; + struct lc_sandbox *sandbox; + + if (lch_startfd(me, "fdlist-sandbox", sargv, + LCH_PERMIT_STDOUT | LCH_PERMIT_STDERR, fds, &sandbox)) + + err(-1, "Error starting sandbox"); + + sleep(1); + return 0; +} + + + +int cap_main(__unused int argc, __unused char *argv[]) +{ + printf("cap_main() alive\n"); fflush(stdout); + + struct lc_fdlist *global_fdlist = lc_fdlist_global(); + if (find_junk(global_fdlist) < 0) + err(-1, "Error in find_junk(global_fdlist)"); + + struct lc_fdlist *copy = lc_fdlist_dup(global_fdlist); + if (find_junk(copy) < 0) + err(-1, "Error in find_junk(copy)"); + + printf("OK\n"); + + return 0; +} + - pos = 0; +int add_junk(struct lc_fdlist **fds) +{ + for (int i = 0; i < 20; i++) + if (lc_fdlist_add(fds, "org.freebsd.Capsicum", "testjunk", + "garbage", 50 + i) < 0) + return -1; + + return 0; +} + +int find_junk(struct lc_fdlist *fds) +{ + int pos = 0; for (int i = 0; i < 20; i++) { char *name; int value; - lc_fdlist_lookup(copy, "org.freebsd.Capsicum", "testjunk", - &name, &value, &pos); + if (lc_fdlist_lookup(fds, "org.freebsd.Capsicum", "testjunk", + &name, &value, &pos) < 0) + return -1; if (strcmp("garbage", name)) warnx("i=%i\tGot '%s' instead of 'garbage'", i, name); @@ -115,10 +159,6 @@ warnx("i=%i\tGot 'FD' %i instead of %i", i, value, 50 + i); } - - printf("OK\n"); - - return 0; } From owner-p4-projects@FreeBSD.ORG Fri Jan 29 01:59:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 407471065672; Fri, 29 Jan 2010 01:59:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 039CE106566C for ; Fri, 29 Jan 2010 01:59:10 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E30148FC19 for ; Fri, 29 Jan 2010 01:59:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0T1x96I054388 for ; Fri, 29 Jan 2010 01:59:09 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0T1x1V8054378 for perforce@freebsd.org; Fri, 29 Jan 2010 01:59:01 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 29 Jan 2010 01:59:01 GMT Message-Id: <201001290159.o0T1x1V8054378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 01:59:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=173884 Change 173884 by thompsa@thompsa_pea on 2010/01/29 01:58:13 IFC @173882 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/io.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#21 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#29 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#35 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#21 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#35 integrate .. //depot/projects/usb/src/sys/amd64/conf/XENHVM#4 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_reg.c#4 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#6 integrate .. //depot/projects/usb/src/sys/amd64/include/apicvar.h#10 integrate .. //depot/projects/usb/src/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/usb/src/sys/amd64/isa/clock.c#11 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#20 integrate .. //depot/projects/usb/src/sys/arm/conf/CRB#7 integrate .. //depot/projects/usb/src/sys/arm/conf/EP80219#11 integrate .. //depot/projects/usb/src/sys/arm/conf/GUMSTIX#5 integrate .. //depot/projects/usb/src/sys/arm/conf/IQ31244#11 integrate .. //depot/projects/usb/src/sys/arm/conf/SIMICS#11 integrate .. //depot/projects/usb/src/sys/arm/conf/SKYEYE#10 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#23 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/main.c#4 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/version#4 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.c#8 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_da.c#10 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_pmp.c#4 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#10 integrate .. //depot/projects/usb/src/sys/cam/cam.c#6 integrate .. //depot/projects/usb/src/sys/cam/cam.h#6 integrate .. //depot/projects/usb/src/sys/cam/cam_ccb.h#11 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#16 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.h#8 integrate .. //depot/projects/usb/src/sys/cam/cam_queue.h#4 integrate .. //depot/projects/usb/src/sys/cam/cam_sim.c#4 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#27 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.h#6 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt_internal.h#5 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt_periph.h#4 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt_sim.h#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#15 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ch.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#18 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_low.c#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#12 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_xpt.c#4 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.c#14 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#21 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.h#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_uid16.c#7 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#13 integrate .. //depot/projects/usb/src/sys/conf/NOTES#53 integrate .. //depot/projects/usb/src/sys/conf/files#92 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#16 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#21 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#12 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips#5 integrate .. //depot/projects/usb/src/sys/conf/options.i386#11 integrate .. //depot/projects/usb/src/sys/conf/options.pc98#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adfile.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adisasm.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adwalk.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmextern.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmrestag.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtable.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbdump.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbinfo.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/getopt.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asldefine.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslerror.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslfiles.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslfold.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslglobal.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllength.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllisting.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslload.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllookup.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmap.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asloperands.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslopt.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslresource.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslstubs.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltransform.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslutils.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbcmds.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbdisply.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbexec.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbinput.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbstats.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbutils.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmbuffer.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmnames.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmresrcl.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmresrcs.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmutils.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswload.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswscope.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evevent.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpe.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeblk.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evmisc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evregion.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evrgnini.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evsci.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxface.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfevnt.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfregn.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exconfig.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exconvrt.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/excreate.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exdump.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfield.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfldio.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exmisc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exmutex.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exnames.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg1.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg2.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg3.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exoparg6.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exprep.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exregion.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exresnte.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exresolv.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exresop.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exstore.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exstoren.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exstorob.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exsystem.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exutils.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwacpi.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwgpe.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwregs.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwsleep.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwtimer.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwxface.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acapps.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/accommon.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acconfig.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdebug.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdisasm.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdispat.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acevents.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acexcep.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/achware.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acinterp.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acmacros.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnames.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acobject.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acopcode.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acoutput.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acparser.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpi.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpiosxf.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpredef.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acresrc.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acrestyp.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acstruct.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actables.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl1.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl2.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actypes.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acutils.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/amlcode.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/amlresrc.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acenv.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acgcc.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsaccess.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsalloc.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsdump.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nseval.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsinit.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsload.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsnames.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsobject.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nspredef.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsutils.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nswalk.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfname.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/osunixxf.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psargs.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psloop.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psopcode.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psparse.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psscope.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/pstree.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/pswalk.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psxface.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsaddr.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rscalc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rscreate.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsdump.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsinfo.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsio.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsirq.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rslist.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsmemory.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsmisc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsxface.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbfadt.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbfind.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbinstal.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbutils.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbxfroot.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utalloc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utcache.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utcopy.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utdebug.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utdelete.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/uteval.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utids.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utinit.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utlock.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmath.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmisc.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmutex.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utobject.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utresrc.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utstate.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utxface.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/run/LICENSE#1 branch .. //depot/projects/usb/src/sys/contrib/dev/run/run-rt2870#1 branch .. //depot/projects/usb/src/sys/contrib/dev/uath/ar5523.bin.uu#2 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#12 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_panasonic.c#6 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_wmi.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdHardware.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#11 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_if.m#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_package.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_smbat.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#14 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#11 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.h#6 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/asr/asr.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#24 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#18 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#26 integrate .. //depot/projects/usb/src/sys/dev/ata/ata_if.m#5 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#35 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#24 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#15 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#27 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/usb/src/sys/dev/cfe/cfe_api.c#2 integrate .. //depot/projects/usb/src/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#19 integrate .. //depot/projects/usb/src/sys/dev/cs/if_cs.c#7 integrate .. //depot/projects/usb/src/sys/dev/cs/if_csreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/ct/ct_isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#14 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#26 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#21 integrate .. //depot/projects/usb/src/sys/dev/e1000/LICENSE#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82540.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82542.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.h#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#16 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#17 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#6 integrate .. //depot/projects/usb/src/sys/dev/fb/vesa.c#8 integrate .. //depot/projects/usb/src/sys/dev/hptiop/hptiop.c#6 integrate .. //depot/projects/usb/src/sys/dev/hptrr/hptrr_osm_bsd.c#4 integrate .. //depot/projects/usb/src/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#11 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.h#5 integrate .. //depot/projects/usb/src/sys/dev/ieee488/pcii.c#3 integrate .. //depot/projects/usb/src/sys/dev/ieee488/tnt4882.c#3 integrate .. //depot/projects/usb/src/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/usb/src/sys/dev/ieee488/upd7210.h#2 integrate .. //depot/projects/usb/src/sys/dev/io/iodev.c#4 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#12 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#15 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwnreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#16 integrate .. //depot/projects/usb/src/sys/dev/mly/mly.c#8 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#12 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#19 integrate .. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.h#6 integrate .. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.h#6 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#21 integrate .. //depot/projects/usb/src/sys/dev/mxge/rss_eth_z8e.h#5 integrate .. //depot/projects/usb/src/sys/dev/mxge/rss_ethp_z8e.h#5 integrate .. //depot/projects/usb/src/sys/dev/nve/if_nve.c#11 integrate .. //depot/projects/usb/src/sys/dev/ppbus/vpo.c#10 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#25 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.c#10 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#40 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac_private.h#8 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#15 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sndstat.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sndstat.h#2 integrate .. //depot/projects/usb/src/sys/dev/trm/trm.c#6 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_cam.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#47 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#102 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtwvar.h#5 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_dinode.h#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_dir.h#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/ext2fs.h#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/fs.h#1 branch .. //depot/projects/usb/src/sys/fs/ext2fs/inode.h#1 branch .. //depot/projects/usb/src/sys/fs/nfsclient/nfs.h#4 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#9 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnfsiod.c#2 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfsmount.h#2 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_node.c#5 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vnops.c#7 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#18 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#9 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#13 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_key.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_dump.c#2 integrate .. //depot/projects/usb/src/sys/geom/mountver/g_mountver.c#1 branch .. //depot/projects/usb/src/sys/geom/mountver/g_mountver.h#1 branch .. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#11 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_vtoc8.c#7 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum.c#8 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_create.c#4 integrate .. //depot/projects/usb/src/sys/geom/virstor/g_virstor.c#3 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_balloc.c#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_bitops.h#3 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_bmap.c#3 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_extern.h#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_fs.h#4 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#4 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode.c#6 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#3 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#3 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_lookup.c#6 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_mount.h#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_subr.c#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#12 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vnops.c#12 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/fs.h#3 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/i386-bitops.h#2 delete .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/inode.h#3 delete .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/usb/src/sys/i386/i386/io.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#21 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#31 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#18 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_misc.c#11 integrate .. //depot/projects/usb/src/sys/i386/include/apicvar.h#12 integrate .. //depot/projects/usb/src/sys/i386/include/iodev.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/pmap.h#16 integrate .. //depot/projects/usb/src/sys/i386/isa/clock.c#12 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#20 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#11 integrate .. //depot/projects/usb/src/sys/ia64/ia64/efi.c#3 integrate .. //depot/projects/usb/src/sys/ia64/ia64/iodev_machdep.c#1 branch .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/usb/src/sys/ia64/ia64/sys_machdep.c#3 integrate .. //depot/projects/usb/src/sys/ia64/include/efi.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/iodev.h#1 branch .. //depot/projects/usb/src/sys/ia64/include/sysarch.h#2 integrate .. //depot/projects/usb/src/sys/ia64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#36 integrate .. //depot/projects/usb/src/sys/kern/kern_kthread.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#23 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#15 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#24 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#12 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#17 integrate .. //depot/projects/usb/src/sys/kern/tty_inq.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#22 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#31 integrate .. //depot/projects/usb/src/sys/mips/adm5120/adm5120_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/alchemy/alchemy_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_pci.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_spi.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xxreg.h#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/files.ar71xx#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/pcf2123_rtc.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/pcf2123reg.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_fpa.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_ipd.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_ipd.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pip.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pko.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_pko.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/driveid.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/obio.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/obiovar.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_ebt3000_cf.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_ebt3000_cf.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_pcmap_regs.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeonreg.h#2 delete .. //depot/projects/usb/src/sys/mips/cavium/uart_bus_octeonusart.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate .. //depot/projects/usb/src/sys/mips/conf/ALCHEMY#2 integrate .. //depot/projects/usb/src/sys/mips/conf/AR71XX#2 integrate .. //depot/projects/usb/src/sys/mips/conf/AR71XX.hints#2 integrate .. //depot/projects/usb/src/sys/mips/conf/MALTA64#2 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1#2 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1-32#2 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1.hints#2 integrate .. //depot/projects/usb/src/sys/mips/conf/QEMU#5 integrate .. //depot/projects/usb/src/sys/mips/conf/SWARM#2 integrate .. //depot/projects/usb/src/sys/mips/conf/XLR#2 integrate .. //depot/projects/usb/src/sys/mips/idt/idt_machdep.c#3 integrate .. //depot/projects/usb/src/sys/mips/include/cpu.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/cpuregs.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/elf.h#6 integrate .. //depot/projects/usb/src/sys/mips/include/md_var.h#3 integrate .. //depot/projects/usb/src/sys/mips/include/trap.h#3 integrate .. //depot/projects/usb/src/sys/mips/malta/malta_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#7 integrate .. //depot/projects/usb/src/sys/mips/mips/db_trace.c#3 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_trampoline.c#2 integrate .. //depot/projects/usb/src/sys/mips/mips/exception.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/locore.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#10 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#16 integrate .. //depot/projects/usb/src/sys/mips/mips/swtch.S#3 integrate .. //depot/projects/usb/src/sys/mips/mips/tick.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/clock.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/ehcireg.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/ehcivar.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/intr_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/pcibus.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/pcibus.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/pic.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/uart_bus_xlr_iodi.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_i2c.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/xls_ehci.c#2 integrate .. //depot/projects/usb/src/sys/mips/sentry5/s5_machdep.c#5 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_machdep.c#2 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbbus.c#2 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbpci.c#2 integrate .. //depot/projects/usb/src/sys/modules/Makefile#48 integrate .. //depot/projects/usb/src/sys/modules/ext2fs/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/geom/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_mountver/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/runfw/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/Makefile#26 integrate .. //depot/projects/usb/src/sys/modules/usb/uhso/Makefile#1 branch .. //depot/projects/usb/src/sys/net/if.c#45 integrate .. //depot/projects/usb/src/sys/net/if.h#15 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#24 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#15 integrate .. //depot/projects/usb/src/sys/net/if_var.h#34 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#22 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#31 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#22 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#25 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_mesh.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_mesh.h#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_sta.c#14 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#27 integrate .. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#17 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#18 integrate .. //depot/projects/usb/src/sys/netgraph/ng_fec.c#7 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#33 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.c#12 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.h#6 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#17 integrate .. //depot/projects/usb/src/sys/netinet/sctp_header.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#23 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.h#7 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#22 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#23 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#27 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#23 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#17 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#19 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#19 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#28 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#24 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#23 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#21 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#23 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs.h#12 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#20 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_nfsiod.c#6 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_subs.c#13 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#23 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#34 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsmount.h#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsnode.h#9 integrate .. //depot/projects/usb/src/sys/pc98/cbus/clock.c#10 integrate .. //depot/projects/usb/src/sys/pc98/conf/DEFAULTS#10 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/pci/if_rlreg.h#18 integrate .. //depot/projects/usb/src/sys/pci/nfsmb.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#27 integrate .. //depot/projects/usb/src/sys/rpc/authunix_prot.c#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_arg.c#14 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#27 integrate .. //depot/projects/usb/src/sys/sparc64/conf/NOTES#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/fire.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#13 integrate .. //depot/projects/usb/src/sys/sys/cdefs.h#9 integrate .. //depot/projects/usb/src/sys/sys/jail.h#21 integrate .. //depot/projects/usb/src/sys/sys/kthread.h#3 integrate .. //depot/projects/usb/src/sys/sys/param.h#50 integrate .. //depot/projects/usb/src/sys/sys/priv.h#23 integrate .. //depot/projects/usb/src/sys/sys/proc.h#26 integrate .. //depot/projects/usb/src/sys/sys/signalvar.h#9 integrate .. //depot/projects/usb/src/sys/sys/sockio.h#8 integrate .. //depot/projects/usb/src/sys/sys/syscallsubr.h#15 integrate .. //depot/projects/usb/src/sys/sys/systm.h#22 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#28 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_alloc.c#11 integrate .. //depot/projects/usb/src/sys/ufs/ffs/fs.h#5 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_acl.c#7 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#15 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#19 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/io.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.2 2006/11/06 13:41:49 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io.c,v 1.3 2010/01/11 18:10:13 marcel Exp $"); #include #include @@ -76,3 +76,12 @@ return (0); } + +/* ARGSUSED */ +int +ioioctl(struct cdev *dev __unused, u_long cmd __unused, caddr_t data __unused, + int fflag __unused, struct thread *td __unused) +{ + + return (ENXIO); +} ==== //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#21 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.61 2009/09/02 00:39:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.63 2010/01/15 16:04:30 attilio Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -160,6 +160,9 @@ struct pic lapic_pic = { .pic_resume = lapic_resume }; +static int lapic_allclocks; +TUNABLE_INT("machdep.lapic_allclocks", &lapic_allclocks); + static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value) { @@ -415,10 +418,11 @@ /* * Called by cpu_initclocks() on the BSP to setup the local APIC timer so * that it can drive hardclock, statclock, and profclock. This function - * returns true if it is able to use the local APIC timer to drive the - * clocks and false if it is not able. + * returns a positive integer if it is convenient to use the local APIC + * for all the clocks, a negative integer if it is convenient to use the + * local APIC only for the hardclock and 0 if none of them can be handled. */ -int +enum lapic_clock lapic_setup_clock(void) { u_long value; @@ -426,10 +430,10 @@ /* Can't drive the timer without a local APIC. */ if (lapic == NULL) - return (0); + return (LAPIC_CLOCK_NONE); if (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0) - return (0); + return (LAPIC_CLOCK_NONE); /* Start off with a divisor of 2 (power on reset default). */ lapic_timer_divisor = 2; @@ -448,7 +452,7 @@ panic("lapic: Divisor too big"); value /= 2; if (bootverbose) - printf("lapic: Divisor %lu, Frequency %lu hz\n", + printf("lapic: Divisor %lu, Frequency %lu Hz\n", lapic_timer_divisor, value); /* @@ -461,19 +465,27 @@ * (and profhz) run at hz. If 'hz' is below 1500 but above * 750, then we let the lapic timer run at 2 * 'hz'. If 'hz' * is below 750 then we let the lapic timer run at 4 * 'hz'. + * + * Please note that stathz and profhz are set only if all the + * clocks are handled through the local APIC. */ - if (hz >= 1500) + if (lapic_allclocks != 0) { + if (hz >= 1500) + lapic_timer_hz = hz; + else if (hz >= 750) + lapic_timer_hz = hz * 2; + else + lapic_timer_hz = hz * 4; + } else lapic_timer_hz = hz; - else if (hz >= 750) - lapic_timer_hz = hz * 2; - else - lapic_timer_hz = hz * 4; - if (lapic_timer_hz < 128) - stathz = lapic_timer_hz; - else - stathz = lapic_timer_hz / (lapic_timer_hz / 128); - profhz = lapic_timer_hz; lapic_timer_period = value / lapic_timer_hz; + if (lapic_allclocks != 0) { + if (lapic_timer_hz < 128) + stathz = lapic_timer_hz; + else + stathz = lapic_timer_hz / (lapic_timer_hz / 128); + profhz = lapic_timer_hz; + } /* * Start up the timer on the BSP. The APs will kick off their @@ -481,7 +493,7 @@ */ lapic_timer_periodic(lapic_timer_period); lapic_timer_enable_intr(); - return (1); + return (lapic_allclocks == 0 ? LAPIC_CLOCK_HARDCLOCK : LAPIC_CLOCK_ALL); } void @@ -784,20 +796,23 @@ else hardclock_cpu(TRAPF_USERMODE(frame)); } + if (lapic_allclocks != 0) { - /* Fire statclock at stathz. */ - la->la_stat_ticks += stathz; - if (la->la_stat_ticks >= lapic_timer_hz) { - la->la_stat_ticks -= lapic_timer_hz; - statclock(TRAPF_USERMODE(frame)); - } + /* Fire statclock at stathz. */ + la->la_stat_ticks += stathz; + if (la->la_stat_ticks >= lapic_timer_hz) { + la->la_stat_ticks -= lapic_timer_hz; + statclock(TRAPF_USERMODE(frame)); + } - /* Fire profclock at profhz, but only when needed. */ - la->la_prof_ticks += profhz; - if (la->la_prof_ticks >= lapic_timer_hz) { - la->la_prof_ticks -= lapic_timer_hz; - if (profprocs != 0) - profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + /* Fire profclock at profhz, but only when needed. */ + la->la_prof_ticks += profhz; + if (la->la_prof_ticks >= lapic_timer_hz) { + la->la_prof_ticks -= lapic_timer_hz; + if (profprocs != 0) + profclock(TRAPF_USERMODE(frame), + TRAPF_PC(frame)); + } } critical_exit(); } ==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#29 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.712 2009/11/13 13:07:01 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.713 2010/01/23 20:28:37 alc Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -157,6 +157,8 @@ extern vm_offset_t ksym_start, ksym_end; #endif +struct msgbuf *msgbufp; + /* Intel ICH registers */ #define ICH_PMBASE 0x400 #define ICH_SMI_EN ICH_PMBASE + 0x30 @@ -1275,7 +1277,7 @@ static void getmemsize(caddr_t kmdp, u_int64_t first) { - int i, off, physmap_idx, pa_indx, da_indx; + int i, physmap_idx, pa_indx, da_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; u_long physmem_tunable; pt_entry_t *pte; @@ -1508,9 +1510,7 @@ phys_avail[pa_indx] -= round_page(MSGBUF_SIZE); /* Map the message buffer. */ - for (off = 0; off < round_page(MSGBUF_SIZE); off += PAGE_SIZE) - pmap_kenter((vm_offset_t)msgbufp + off, phys_avail[pa_indx] + - off); + msgbufp = (struct msgbuf *)PHYS_TO_DMAP(phys_avail[pa_indx]); } u_int64_t ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#35 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.677 2010/01/11 16:01:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.679 2010/01/23 20:28:37 alc Exp $"); /* * Manages physical address maps. @@ -105,7 +105,6 @@ * and to when physical maps must be made correct. */ -#include "opt_msgbuf.h" #include "opt_pmap.h" #include "opt_vm.h" @@ -116,7 +115,6 @@ #include #include #include -#include #include #include #include @@ -153,7 +151,7 @@ #endif #if !defined(DIAGNOSTIC) -#define PMAP_INLINE __gnu89_inline +#define PMAP_INLINE extern inline #else #define PMAP_INLINE #endif @@ -206,7 +204,6 @@ */ pt_entry_t *CMAP1 = 0; caddr_t CADDR1 = 0; -struct msgbuf *msgbufp = 0; /* * Crashdump maps. @@ -570,11 +567,6 @@ */ SYSMAP(caddr_t, unused, crashdumpmap, MAXDUMPPGS) - /* - * msgbufp is used to map the system message buffer. - */ - SYSMAP(struct msgbuf *, unused, msgbufp, atop(round_page(MSGBUF_SIZE))) - virtual_avail = va; *CMAP1 = 0; ==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.338 2009/11/27 20:24:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.339 2010/01/23 11:45:35 kib Exp $"); /* * AMD64 Trap and System call handling @@ -885,95 +885,131 @@ panic("double fault"); } -/* - * syscall - system call request C handler - * - * A system call is essentially treated as a trap. - */ -void -syscall(struct trapframe *frame) -{ - caddr_t params; +struct syscall_args { + u_int code; struct sysent *callp; - struct thread *td = curthread; - struct proc *p = td->td_proc; - register_t orig_tf_rflags; - int error; - int narg; register_t args[8]; register_t *argp; - u_int code; - int reg, regcnt; - ksiginfo_t ksi; + int narg; +}; - PCPU_INC(cnt.v_syscall); +static int +fetch_syscall_args(struct thread *td, struct syscall_args *sa) +{ + struct proc *p; + struct trapframe *frame; + caddr_t params; + int reg, regcnt, error; -#ifdef DIAGNOSTIC - if (ISPL(frame->tf_cs) != SEL_UPL) { - panic("syscall"); - /* NOT REACHED */ - } -#endif - + p = td->td_proc; + frame = td->td_frame; reg = 0; regcnt = 6; - td->td_pticks = 0; - td->td_frame = frame; - if (td->td_ucred != p->p_ucred) - cred_update_thread(td); + params = (caddr_t)frame->tf_rsp + sizeof(register_t); - code = frame->tf_rax; - orig_tf_rflags = frame->tf_rflags; + sa->code = frame->tf_rax; if (p->p_sysent->sv_prepsyscall) { - (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); + (*p->p_sysent->sv_prepsyscall)(frame, (int *)sa->args, + &sa->code, ¶ms); } else { - if (code == SYS_syscall || code == SYS___syscall) { - code = frame->tf_rdi; + if (sa->code == SYS_syscall || sa->code == SYS___syscall) { + sa->code = frame->tf_rdi; reg++; regcnt--; } } - if (p->p_sysent->sv_mask) - code &= p->p_sysent->sv_mask; + sa->code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 29 09:15:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95B6C106568B; Fri, 29 Jan 2010 09:15:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58E60106566B for ; Fri, 29 Jan 2010 09:15:27 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 43B2E8FC1F for ; Fri, 29 Jan 2010 09:15:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0T9FR67015647 for ; Fri, 29 Jan 2010 09:15:27 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0T9FQXR015641 for perforce@freebsd.org; Fri, 29 Jan 2010 09:15:26 GMT (envelope-from mav@freebsd.org) Date: Fri, 29 Jan 2010 09:15:26 GMT Message-Id: <201001290915.o0T9FQXR015641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 09:15:27 -0000 http://p4web.freebsd.org/chv.cgi?CH=173891 Change 173891 by mav@mav_mavbook on 2010/01/29 09:14:27 IFC Affected files ... .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_int.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#6 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#21 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ahci.4#8 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/gpib.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/run.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man9/locking.9#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#48 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#74 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#38 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#52 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#146 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#53 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_pass.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#49 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#63 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/run/LICENSE#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/run/rt2870.fw.uu#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#99 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#34 integrate .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#49 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptiop/hptiop.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptrr/hptrr_osm_bsd.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptrr/os_bsd.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#42 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_run.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_runreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_runvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clbio.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clnfsiod.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clsubs.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfsmount.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xx_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/asm_octeon.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_ipd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_ipd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pip.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pko.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_pko.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/driveid.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/obiovar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_ebt3000_cf.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_ebt3000_cf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/ALCHEMY#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/locore.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/on_chip.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pic.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#43 integrate .. //depot/projects/scottl-camlock/src/sys/modules/runfw/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#14 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/run/Makefile#1 branch Differences ... ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20.3#4 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.5 2009/11/20 08:57:25 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.6 2010/01/29 02:44:06 thompsa Exp $ .\" .Dd November 18, 2009 .Dt LIBUSB20 3 @@ -143,6 +143,8 @@ .Ft int .Fn libusb20_dev_reset "struct libusb20_device *pdev" .Ft int +.Fn libusb20_dev_check_connected "struct libusb20_device *pdev" +.Ft int .Fn libusb20_dev_set_power_mode "struct libusb20_device *pdev" "uint8_t power_mode" .Ft uint8_t .Fn libusb20_dev_get_power_mode "struct libusb20_device *pdev" @@ -677,6 +679,15 @@ This function returns zero on success else a LIBUSB20_ERROR value is returned. . +. +.Pp +. +.Fn libusb20_dev_check_connected +will check if an opened USB device is still connected. +. +This function returns zero if the device is still connected else a LIBUSB20_ERROR value is returned. +. +. .Pp . .Fn libusb20_dev_set_power_mode ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.7 2010/01/10 19:18:49 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.8 2010/01/29 02:44:06 thompsa Exp $ */ /*- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * @@ -67,6 +67,7 @@ #define dummy_set_config_index (void *)dummy_int #define dummy_set_alt_index (void *)dummy_int #define dummy_reset_device (void *)dummy_int +#define dummy_check_connected (void *)dummy_int #define dummy_set_power_mode (void *)dummy_int #define dummy_get_power_mode (void *)dummy_int #define dummy_kernel_driver_active (void *)dummy_int @@ -673,6 +674,15 @@ } int +libusb20_dev_check_connected(struct libusb20_device *pdev) +{ + int error; + + error = pdev->methods->check_connected(pdev); + return (error); +} + +int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode) { int error; ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.6 2009/11/20 08:57:25 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.7 2010/01/29 02:44:06 thompsa Exp $ */ /*- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. @@ -250,6 +250,7 @@ int libusb20_dev_req_string_sync(struct libusb20_device *pdev, uint8_t index, uint16_t langid, void *ptr, uint16_t len); int libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, uint8_t index, void *ptr, uint16_t len); int libusb20_dev_reset(struct libusb20_device *pdev); +int libusb20_dev_check_connected(struct libusb20_device *pdev); int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20_int.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.4 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.5 2010/01/29 02:44:06 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -101,6 +101,7 @@ typedef int (libusb20_get_power_mode_t)(struct libusb20_device *pdev, uint8_t *power_mode); typedef int (libusb20_set_alt_index_t)(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); typedef int (libusb20_set_config_index_t)(struct libusb20_device *pdev, uint8_t index); +typedef int (libusb20_check_connected_t)(struct libusb20_device *pdev); /* USB transfer specific */ typedef int (libusb20_tr_open_t)(struct libusb20_transfer *xfer, uint32_t MaxBufSize, uint32_t MaxFrameCount, uint8_t ep_no); @@ -117,6 +118,7 @@ m(n, kernel_driver_active) \ m(n, process) \ m(n, reset_device) \ + m(n, check_connected) \ m(n, set_power_mode) \ m(n, get_power_mode) \ m(n, set_alt_index) \ ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.6 2009/11/08 20:03:52 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.7 2010/01/29 02:44:06 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -67,6 +67,7 @@ static libusb20_set_config_index_t ugen20_set_config_index; static libusb20_set_alt_index_t ugen20_set_alt_index; static libusb20_reset_device_t ugen20_reset_device; +static libusb20_check_connected_t ugen20_check_connected; static libusb20_set_power_mode_t ugen20_set_power_mode; static libusb20_get_power_mode_t ugen20_get_power_mode; static libusb20_kernel_driver_active_t ugen20_kernel_driver_active; @@ -553,6 +554,25 @@ } static int +ugen20_check_connected(struct libusb20_device *pdev) +{ + uint32_t plugtime; + int error = 0; + + if (ioctl(pdev->file_ctrl, USB_GET_PLUGTIME, &plugtime)) { + error = LIBUSB20_ERROR_NO_DEVICE; + goto done; + } + + if (pdev->session_data.plugtime != plugtime) { + error = LIBUSB20_ERROR_NO_DEVICE; + goto done; + } +done: + return (error); +} + +static int ugen20_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode) { int temp; ==== //depot/projects/scottl-camlock/src/share/man/man4/Makefile#21 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.472 2010/01/27 00:34:52 delphij Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.473 2010/01/28 22:28:01 thompsa Exp $ MAN= aac.4 \ acpi.4 \ @@ -328,6 +328,7 @@ rp.4 \ rue.4 \ rum.4 \ + run.4 \ sa.4 \ safe.4 \ sbp.4 \ ==== //depot/projects/scottl-camlock/src/share/man/man4/ahci.4#8 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (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/man4/ahci.4,v 1.3 2009/08/30 15:20:13 mav Exp $ +.\" $FreeBSD: src/share/man/man4/ahci.4,v 1.4 2010/01/28 18:15:19 mav Exp $ .\" -.Dd August 24, 2009 +.Dd January 28, 2010 .Dt AHCI 4 .Os .Sh NAME @@ -114,14 +114,11 @@ etc. .Pp Driver features include support for Serial ATA and ATAPI devices, -Port Multipliers, hardware command queues (up to 32 commands per port), +Port Multipliers (including FIS-based switching, when supported), +hardware command queues (up to 32 commands per port), Native Command Queuing, SATA interface Power Management, device hot-plug and Message Signaled Interrupts. .Pp -The Port Multiplier FIS Based Switching feature added in the AHCI 1.2 -specification, which is required for effective parallel operation of devices -behind Port Multipliers, is not yet supported. -.Pp AHCI hardware is also supported by ataahci driver from .Xr ata 4 subsystem. If both drivers are loaded at the same time, this one will be @@ -131,6 +128,10 @@ .Nm driver supports AHCI compatible controllers having PCI class 1 (mass storage), subclass 6 (SATA) and programming interface 1 (AHCI). +.Pp +Also, in cooperation with atamarvell and atajmicron drivers of ata(4), +it supports AHCI part of legacy-PATA + AHCI-SATA combined controllers, +such as JMicron JMB36x and Marvell 88SX61xx. .Sh SEE ALSO .Xr ada 4 , .Xr cd 4 , ==== //depot/projects/scottl-camlock/src/share/man/man4/gpib.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/gpib.4,v 1.2 2010/01/25 06:37:44 joerg Exp $ +.\" $FreeBSD: src/share/man/man4/gpib.4,v 1.3 2010/01/28 19:12:40 joerg Exp $ .\" .Dd January 24, 2010 .Dt GPIB 4 @@ -88,7 +88,7 @@ .El .Sh SEE ALSO .\" .Xr libgpib 3 , -.Xr gpib 4 , +.Xr pcii 4 , .Xr tnt4882 4 .Sh HISTORY The ==== //depot/projects/scottl-camlock/src/share/man/man9/locking.9#3 (text+ko) ==== @@ -22,17 +22,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/locking.9,v 1.12 2007/11/08 14:47:54 ups Exp $ +.\" $FreeBSD: src/share/man/man9/locking.9,v 1.15 2010/01/28 21:14:12 trasz Exp $ .\" -.Dd March 14, 2007 +.Dd January 29, 2010 .Dt LOCKING 9 .Os .Sh NAME .Nm locking .Nd kernel synchronization primitives -.Sh SYNOPSIS -All sorts of stuff to go here. -.Pp .Sh DESCRIPTION The .Em FreeBSD @@ -43,21 +40,19 @@ These include: .Bl -enum .It -Spin Mutexes +Mutexes .It -Sleep Mutexes +Spin mutexes .It -pool Mutexes +Pool mutexes .It -Shared-Exclusive locks +Shared/exclusive locks .It -Reader-Writer locks +Reader/writer locks .It -Read-Mostly locks +Read-mostly locks .It -Turnstiles -.It -Semaphores +Counting semaphores .It Condition variables .It @@ -70,62 +65,45 @@ .Pp The primitives interact and have a number of rules regarding how they can and can not be combined. -There are too many for the average -human mind and they keep changing. -(if you disagree, please write replacement text) :-) -.Pp -Some of these primitives may be used at the low (interrupt) level and -some may not. -.Pp -There are strict ordering requirements and for some of the types this -is checked using the +Many of these rules are checked using the .Xr witness 4 code. .Pp -.Ss SPIN Mutexes -Mutexes are the basic primitive. -You either hold it or you don't. -If you don't own it then you just spin, waiting for the holder (on -another CPU) to release it. -Hopefully they are doing something fast. +.Ss Mutexes +Mutexes are the most commonly used synchronization primitive in the kernel. +Thread acquires (locks) a mutex before accessing data shared with other +threads (including interrupt threads), and releases (unlocks) it afterwards. +If the mutex cannot be acquired, the thread requesting it will sleep. +Mutexes fully support priority propagation. +.Pp +See +.Xr mutex 9 +for details. +.Ss Spin mutexes +Spin mutexes are variation of basic mutexes; the main difference between +the two is that spin mutexes never sleep - instead, they spin, waiting +for the thread holding the lock, which runs on another CPU, to release it. +Differently from ordinary mutex, spin mutexes disable interrupts when acquired. +Since disabling interrupts is expensive, they are also generally slower. +Spin mutexes should only be used to protect data shared with primary +(INTR_FILTER) interrupt code. You .Em must not do anything that deschedules the thread while you -are holding a SPIN mutex. -.Ss Mutexes -Basically (regular) mutexes will deschedule the thread if the -mutex can not be acquired. -A non-spin mutex can be considered to be equivalent -to getting a write lock on an -.Em rw_lock -(see below), and in fact non-spin mutexes and rw_locks may soon become the same thing. -As in spin mutexes, you either get it or you don't. -You may only call the -.Xr sleep 9 -call via -.Fn msleep -or the new -.Fn mtx_sleep -variant. -These will atomically drop the mutex and reacquire it -as part of waking up. -This is often however a -.Em BAD -idea because it generally relies on you having -such a good knowledge of all the call graph above you -and what assumptions it is making that there are a lot -of ways to make hard-to-find mistakes. -For example you MUST re-test all the assumptions you made before, -all the way up the call graph to where you got the lock. -You can not just assume that mtx_sleep can be inserted anywhere. -If any caller above you has any mutex or -rwlock, your sleep, will cause a panic. -If the sleep only happens rarely it may be years before the -bad code path is found. -.Ss Pool Mutexes -A variant of regular mutexes where the allocation of the mutex is handled -more by the system. -.Ss Rw_locks +are holding a spin mutex. +.Ss Pool mutexes +With most synchronisaton primitives, such as mutexes, programmer must +provide a piece of allocated memory to hold the primitive. +For example, a mutex may be embedded inside the structure it protects. +Pool mutex is a variant of mutex without this requirement - to lock or unlock +a pool mutex, one uses address of the structure being protected with it, +not the mutex itself. +Pool mutexes are seldom used. +.Pp +See +.Xr mtx_pool 9 +for details. +.Ss Reader/writer locks Reader/writer locks allow shared access to protected data by multiple threads, or exclusive access by a single thread. The threads with shared access are known as @@ -135,23 +113,12 @@ .Em writer since it may modify protected data. .Pp -Although reader/writer locks look very similar to -.Xr sx 9 -(see below) locks, their usage pattern is different. Reader/writer locks can be treated as mutexes (see above and .Xr mutex 9 ) with shared/exclusive semantics. More specifically, regular mutexes can be considered to be equivalent to a write-lock on an .Em rw_lock. -In the future this may in fact -become literally the fact. -An -.Em rw_lock -can be locked while holding a regular mutex, but -can -.Em not -be held while sleeping. The .Em rw_lock locks have priority propagation like mutexes, but priority @@ -163,54 +130,48 @@ can recurse, but exclusive locks are not allowed to recurse. This ability should not be used lightly and .Em may go away. -Users of recursion in any locks should be prepared to -defend their decision against vigorous criticism. -.Ss Rm_locks +.Pp +See +.Xr rwlock 9 +for details. +.Ss Read-mostly locks Mostly reader locks are similar to -.Em Reader/write -locks but optimized for very infrequent -.Em writer -locking. -.Em rm_lock +.Em reader/writer +locks but optimized for very infrequent write locking. +.Em Read-mostly locks implement full priority propagation by tracking shared owners using a lock user supplied .Em tracker data structure. -.Ss Sx_locks -Shared/exclusive locks are used to protect data that are read far more often -than they are written. -Mutexes are inherently more efficient than shared/exclusive locks, so -shared/exclusive locks should be used prudently. -The main reason for using an -.Em sx_lock -is that a thread may hold a shared or exclusive lock on an -.Em sx_lock -lock while sleeping. -As a consequence of this however, an -.Em sx_lock -lock may not be acquired while holding a mutex. -The reason for this is that, if one thread slept while holding an -.Em sx_lock -lock while another thread blocked on the same -.Em sx_lock -lock after acquiring a mutex, then the second thread would effectively -end up sleeping while holding a mutex, which is not allowed. -The -.Em sx_lock -should be considered to be closely related to +.Pp +See +.Xr rmlock 9 +for details. +.Ss Shared/exclusive locks +Shared/exclusive locks are similar to reader/writer locks; the main difference +between them is that shared/exclusive locks may be held during unbounded sleep +(and may thus perform an unbounded sleep). +They are inherently less efficient than mutexes, reader/writer locks +and read-mostly locks. They don't support priority propagation. +They should be considered to be closely related to .Xr sleep 9 . In fact it could in some cases be considered a conditional sleep. -.Ss Turnstiles -Turnstiles are used to hold a queue of threads blocked on -non-sleepable locks. -Sleepable locks use condition variables to implement their queues. -Turnstiles differ from a sleep queue in that turnstile queue's -are assigned to a lock held by an owning thread. -Thus, when one thread is enqueued onto a turnstile, it can lend its -priority to the owning thread. -If this sounds confusing, we need to describe it better. -.Ss Semaphores +.Pp +See +.Xr sx 9 +for details. +.Ss Counting semaphores +Counting semaphores provide a mechanism for synchronizing access +to a pool of resources. +Unlike mutexes, semaphores do not have the concept of an owner, +so they can be useful in situations where one thread needs +to acquire a resource, and another thread needs to release it. +They are largely deprecated. +.Pp +See +.Xr sema 9 +for details. .Ss Condition variables Condition variables are used in conjunction with mutexes to wait for conditions to occur. @@ -220,9 +181,12 @@ When a thread waits on a condition, the mutex is atomically released before the thread is blocked, then reacquired before the function call returns. +.Pp +See +.Xr condvar 9 +for details. .Ss Giant -Giant is a special instance of a sleep lock. -It has several special characteristics. +Giant is an instance of a mutex, with some special characteristics: .Bl -enum .It It is recursive. @@ -237,7 +201,7 @@ There are places in the kernel that drop Giant and pick it back up again. Sleep locks will do this before sleeping. -Parts of the Network or VM code may do this as well, depending on the +Parts of the network or VM code may do this as well, depending on the setting of a sysctl. This means that you cannot count on Giant keeping other code from running if your code sleeps, even if you want it to. @@ -298,26 +262,72 @@ .Va Giant mutex before the function returns. .Pp -.Ss lockmanager locks -Largely deprecated. -See the +See +.Xr sleep 9 +for details. +.Pp +.Ss Lockmanager locks +Shared/exclusive locks, used mostly in +.Xr VFS 9 , +in particular as a +.Xr vnode 9 +lock. +They have features other lock types don't have, such as sleep timeout, +writer starvation avoidance, draining, and interlock mutex, but this makes them +complicated to implement; for this reason, they are deprecated. +.Pp +See .Xr lock 9 -page for more information. -I don't know what the downsides are but I'm sure someone will fill in this part. -.Sh Usage tables. -.Ss Interaction table. +for details. +.Sh INTERACTIONS +.Ss Bounded vs. unbounded sleep +The following primitives perform bounded sleep: mutexes, pool mutexes, +reader/writer locks and read-mostly locks. +.Pp +The following primitives block (perform unbounded sleep): shared/exclusive locks, +counting semaphores, condition variables, sleep/wakeup and lockmanager locks. +.Pp +It is an error to do any operation that could result in any kind of sleep while +holding spin mutex. +.Pp +As a general rule, it is an error to do any operation that could result +in unbounded sleep while holding any primitive from the 'bounded sleep' group. +For example, it is an error to try to acquire shared/exclusive lock while +holding mutex, or to try to allocate memory with M_WAITOK while holding +read-write lock. +.Pp +As a special case, it is possible to call +.Fn sleep 9 +or +.Fn mtx_sleep 9 +while holding a mutex. +It will atomically drop the mutex and reacquire it +as part of waking up. +This is often however a bad +idea because it generally relies on you having +such a good knowledge of all the call graph above you +and what assumptions it is making that there are a lot +of ways to make hard-to-find mistakes. +For example you must re-test all the assumptions you made before, +all the way up the call graph to where you got the lock. +You can not just assume that mtx_sleep can be inserted anywhere. +If any caller above you has any mutex or +rwlock, your sleep, will cause a panic. +If the sleep only happens rarely it may be years before the +bad code path is found. +.Ss Interaction table The following table shows what you can and can not do if you hold one of the synchronization primitives discussed here: (someone who knows what they are talking about should write this table) -.Bl -column ".Ic xxxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXX" -offset indent +.Bl -column ".Ic xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent .It Xo -.Em "You have: You want:" Ta Spin_mtx Ta Slp_mtx Ta sx_lock Ta rw_lock Ta rm_lock Ta sleep +.Em "You have: You want:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .Xc -.It Ic SPIN mutex Ta \&ok-1 Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-3 -.It Ic Sleep mutex Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3 -.It Ic sx_lock Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4 -.It Ic rw_lock Ta \&ok Ta \&ok Ta \&no Ta \&ok-2 Ta \&ok Ta \&no-3 -.It Ic rm_lock Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok-2 Ta \&no +.It Ic spin mtx Ta \&ok-1 Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-3 +.It Ic mutex Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3 +.It Ic sx Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4 +.It Ic rwlock Ta \&ok Ta \&ok Ta \&no Ta \&ok-2 Ta \&ok Ta \&no-3 +.It Ic rmlock Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok-2 Ta \&no .El .Pp .Em *1 @@ -342,12 +352,12 @@ .Fn sx_sleep which atomically release this primitive when going to sleep and reacquire it on wakeup. -.Ss Context mode table. +.Ss Context mode table The next table shows what can be used in different contexts. At this time this is a rather easy to remember table. -.Bl -column ".Ic Xxxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXX" -offset indent +.Bl -column ".Ic Xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent .It Xo -.Em "Context:" Ta Spin_mtx Ta Slp_mtx Ta sx_lock Ta rw_lock Ta rm_lock Ta sleep +.Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .Xc .It interrupt: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no .It idle: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no @@ -362,11 +372,13 @@ .Xr sema 9 , .Xr sleep 9 , .Xr sx 9 , -.Xr LOCK_PROFILING 9 , -.Xr WITNESS 9 +.Xr witness 9 , +.Xr LOCK_PROFILING 9 .Sh HISTORY These functions appeared in .Bsx 4.1 through .Fx 7.0 +.Sh BUGS +There are too many locking primitives to choose from. ==== //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.103 2009/12/10 14:41:47 kib Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.104 2010/01/28 19:41:26 uqs Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -187,6 +187,7 @@ trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/05/28"] tuexen [label="Michael Tuexen\ntuexen@FreeBSD.org\n2009/06/06"] ume [label="Hajimu UMEMOTO\nume@FreeBSD.org\n2000/02/26"] +uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2010/01/28"] vanhu [label="Yvan Vanhullebus\nvanhu@FreeBSD.org\n2008/07/21"] versus [label="Konrad Jankowski\nversus@FreeBSD.org\n2008/10/27"] weongyo [label="Weongyo Jeong\nweongyo@FreeBSD.org\n2007/12/21"] @@ -398,6 +399,7 @@ philip -> ed philip -> jls philip -> matteo +philip -> uqs pjd -> kib pjd -> lulf ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#36 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.12 2009/12/28 20:08:01 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.13 2010/01/28 08:41:30 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#48 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.14 2009/12/28 20:08:01 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.15 2010/01/28 08:41:30 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.5 2009/12/07 16:23:25 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_pmp.c,v 1.6 2010/01/28 08:41:30 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#74 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.19 2010/01/10 09:20:56 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.20 2010/01/28 08:41:30 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.15 2009/11/11 11:10:36 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.16 2010/01/28 08:41:30 mav Exp $"); #include #ifdef _KERNEL ==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam.h,v 1.16 2009/11/03 11:19:05 mav Exp $ + * $FreeBSD: src/sys/cam/cam.h,v 1.17 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#38 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.42 2009/11/26 08:49:46 mav Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.43 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#52 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.87 2009/11/14 20:30:42 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.88 2010/01/28 08:41:30 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#27 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.h,v 1.23 2009/12/06 11:48:53 mav Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.24 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_PERIPH_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#9 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_queue.h,v 1.12 2009/11/14 20:30:42 mav Exp $ + * $FreeBSD: src/sys/cam/cam_queue.h,v 1.13 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_QUEUE_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.13 2008/12/19 14:33:29 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.14 2010/01/28 08:41:30 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#146 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.236 2009/11/24 12:47:58 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.237 2010/01/28 08:41:30 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.10 2009/07/10 08:18:08 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.11 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_XPT_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#17 (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/cam/cam_xpt_internal.h,v 1.5 2009/11/11 11:10:36 mav Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.6 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_XPT_INTERNAL_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_periph.h#14 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.8 2009/07/10 08:18:08 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.9 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_XPT_PERIPH_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_sim.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.10 2009/01/08 17:26:51 trasz Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.11 2010/01/28 08:41:30 mav Exp $ */ #ifndef _CAM_CAM_XPT_SIM_H ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_all.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.56 2009/10/23 08:27:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.57 2010/01/28 08:41:30 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#38 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.116 2009/12/18 14:41:30 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.117 2010/01/28 08:41:30 mav Exp $"); #include "opt_cd.h" ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#22 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.50 2009/11/14 20:13:38 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.51 2010/01/28 08:41:30 mav Exp $"); #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 29 13:10:06 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CAAB106568D; Fri, 29 Jan 2010 13:10:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62E3E106566C for ; Fri, 29 Jan 2010 13:10:06 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 47FD78FC14 for ; Fri, 29 Jan 2010 13:10:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TDA6qH047306 for ; Fri, 29 Jan 2010 13:10:06 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0TDA64B047304 for perforce@freebsd.org; Fri, 29 Jan 2010 13:10:06 GMT (envelope-from jona@FreeBSD.org) Date: Fri, 29 Jan 2010 13:10:06 GMT Message-Id: <201001291310.o0TDA64B047304@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 13:10:06 -0000 http://p4web.freebsd.org/chv.cgi?CH=173905 Change 173905 by jona@jona-belle-freebsd8 on 2010/01/29 13:09:11 fdlist changes to libcapsicum - WARNING: due to some kernel bug, this library code might cause a panic Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host_io.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_api.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_io.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.c#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.c#2 $ */ #include ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#3 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#4 $ */ #ifndef _LIBCAPABILITY_H_ @@ -117,15 +117,15 @@ * Interfaces to start and stop capability mode sandboxs. */ int lch_start(const char *sandbox, char *const argv[], u_int flags, - struct lc_sandbox **lcspp); + struct lc_fdlist *fds, struct lc_sandbox **lcspp); int lch_start_libs(const char *sandbox, char *const argv[], u_int flags, - struct lc_library *lclp, u_int lcl_count, + struct lc_library *lclp, u_int lcl_count, struct lc_fdlist *fds, struct lc_sandbox **lcspp); int lch_startfd(int fd_sandbox, const char *binname, char *const argv[], u_int flags, struct lc_fdlist *fds, struct lc_sandbox **lcspp); int lch_startfd_libs(int fd_sandbox, const char *binname, char *const argv[], u_int flags, struct lc_library *lclp, - u_int lcl_count, struct lc_sandbox **lcspp); + u_int lcl_count, struct lc_fdlist *fds, struct lc_sandbox **lcspp); void lch_stop(struct lc_sandbox *lcsp); /* ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#3 (text+ko) ==== @@ -30,15 +30,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#2 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#3 $ */ +#include +#include + #include #include #include +#include #include #include +#include "libcapsicum_sandbox_api.h" + struct lc_fdlist_entry { @@ -87,6 +93,41 @@ struct lc_fdlist* lc_fdlist_global(void) { + if (global_fdlist == NULL) { + + char *env = getenv(LIBCAPABILITY_SANDBOX_FDLIST); + printf("%s: %s\n", LIBCAPABILITY_SANDBOX_FDLIST, env); + + if ((env != NULL) && (strnlen(env, 8) < 7)) { + + for (int i = 0; (i < 7) && env[i]; i++) + if ((env[i] < '0') || (env[i] > '9')) + return NULL; + + int fd = -1; + if (sscanf(env, "%d", &fd) != 1) + return NULL; + + if (fd < 0) + return NULL; + + printf("testing FD %i...", fd); fflush(stdout); + struct stat stats; + if (fstat(fd, &stats) < 0) + return NULL; + + printf(" done. Size: %lu\n", stats.st_size); + + printf("mapping FD %i... ", fd); fflush(stdout); + /* + global_fdlist = mmap(NULL, stats.st_size, + PROT_READ | PROT_WRITE, + MAP_NOSYNC | MAP_PRIVATE, fd, 0); + */ + printf(" done.\n"); + } + } + return global_fdlist; } ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#3 (text+ko) ==== @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#2 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#3 $ */ #include #include +#include #include #include #include @@ -147,12 +148,41 @@ lch_sandbox(int fd_sock, int fd_sandbox, int fd_ldso, int fd_libc, int fd_libcapsicum, int fd_libsbuf, int fd_devnull, u_int flags, struct lc_library *lclp, u_int lcl_count, const char *binname, - char *const argv[]) + char *const argv[], struct lc_fdlist *fds) { int *fd_array, fdcount; struct sbuf *sbufp; + int shmfd, fdlistsize; + /*void *shm;*/ + char fdliststr[8]; u_int i; + + /* create an anonymous shared memory segment for the FD list */ + shmfd = shm_open(SHM_ANON, O_RDWR, 0600); + if (shmfd < 0) return; + + fdlistsize = lc_fdlist_size(fds); + if (ftruncate(shmfd, fdlistsize) < 0) return; + + + printf("%dB of memory to mmap\n", fdlistsize); + + + /* map it and copy the list */ + /* + shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, + MAP_NOSYNC | MAP_SHARED, shmfd, 0); + + if (shm == MAP_FAILED) return; + memcpy(shm, fds, fdlistsize); + + if (munmap(shm, fdlistsize)) return; + */ + + + + if (lc_limitfd(fd_devnull, LIBCAPABILITY_CAPMASK_DEVNULL) < 0) return; if (lc_limitfd(fd_sandbox, LIBCAPABILITY_CAPMASK_SANDBOX) < 0) @@ -168,7 +198,7 @@ if (lc_limitfd(fd_libsbuf, LIBCAPABILITY_CAPMASK_LIB) < 0) return; - fdcount = 10 + lcl_count; + fdcount = 11 + lcl_count; fd_array = malloc(fdcount * sizeof(int)); if (fd_array == NULL) return; @@ -193,10 +223,11 @@ fd_array[7] = fd_libcapsicum; fd_array[8] = fd_libsbuf; fd_array[9] = fd_devnull; + fd_array[10] = shmfd; for (i = 0; i < lcl_count; i++) { if (lc_limitfd(lclp->lcl_fd, LIBCAPABILITY_CAPMASK_LIB) < 0) return; - fd_array[i + 10] = lclp[i].lcl_fd; + fd_array[i + 11] = lclp[i].lcl_fd; } if (lch_installfds(fdcount, fd_array) < 0) @@ -209,7 +240,7 @@ 3, binname, 5, LD_ELF_CAP_SO, 6, LIBC_SO, 7, LIBCAPABILITY_SO, 8, LIBSBUF_SO, 9, _PATH_DEVNULL); for (i = 0; i < lcl_count; i++) - (void)sbuf_printf(sbufp, ",%d:%s", i + 10, + (void)sbuf_printf(sbufp, ",%d:%s", i + 11, lclp[i].lcl_libname); sbuf_finish(sbufp); if (sbuf_overflowed(sbufp)) @@ -229,6 +260,10 @@ return; sbuf_delete(sbufp); + sprintf(fdliststr, "%d", 10); + if (setenv(LIBCAPABILITY_SANDBOX_FDLIST, fdliststr, 1) == -1) + return; + if (cap_enter() < 0) return; @@ -238,7 +273,7 @@ int lch_startfd_libs(int fd_sandbox, const char *binname, char *const argv[], u_int flags, struct lc_library *lclp, u_int lcl_count, - struct lc_sandbox **lcspp) + struct lc_fdlist *fds, struct lc_sandbox **lcspp) { struct lc_sandbox *lcsp; int fd_devnull, fd_ldso, fd_libc, fd_libcapsicum, fd_libsbuf; @@ -304,7 +339,7 @@ if (pid == 0) { lch_sandbox(fd_sockpair[1], fd_sandbox, fd_ldso, fd_libc, fd_libcapsicum, fd_libsbuf, fd_devnull, flags, lclp, - lcl_count, binname, argv); + lcl_count, binname, argv, fds); exit(-1); } #ifndef IN_CAP_MODE @@ -353,12 +388,13 @@ { return (lch_startfd_libs(fd_sandbox, binname, argv, flags, NULL, 0, - lcspp)); + fds, lcspp)); } int lch_start_libs(const char *sandbox, char *const argv[], u_int flags, - struct lc_library *lclp, u_int lcl_count, struct lc_sandbox **lcspp) + struct lc_library *lclp, u_int lcl_count, struct lc_fdlist *fds, + struct lc_sandbox **lcspp) { char binname[MAXPATHLEN]; int error, fd_sandbox, ret; @@ -371,7 +407,7 @@ return (-1); ret = lch_startfd_libs(fd_sandbox, binname, argv, flags, lclp, - lcl_count, lcspp); + lcl_count, fds, lcspp); error = errno; close(fd_sandbox); errno = error; @@ -380,10 +416,10 @@ int lch_start(const char *sandbox, char *const argv[], u_int flags, - struct lc_sandbox **lcspp) + struct lc_fdlist *fds, struct lc_sandbox **lcspp) { - return (lch_start_libs(sandbox, argv, flags, NULL, 0, lcspp)); + return (lch_start_libs(sandbox, argv, flags, NULL, 0, fds, lcspp)); } void ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host_io.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host_io.c#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host_io.c#2 $ */ #include ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#2 $ */ #ifndef _LIBCAPABILITY_INTERNAL_H_ ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_api.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_api.h#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_api.h#2 $ */ #ifndef _LIBCAPABILITY_SANDBOX_API_H_ @@ -41,6 +41,7 @@ * make about the runtime environment set up by libcapsicum hosts. */ #define LIBCAPABILITY_SANDBOX_API_ENV "LIBCAPABILITY_SANDBOX" +#define LIBCAPABILITY_SANDBOX_FDLIST "LIBCAPABILITY_FDLIST" #define LIBCAPABILITY_SANDBOX_API_SOCK "sock" /* ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_sandbox_io.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jan 29 17:40:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09B4E106566C; Fri, 29 Jan 2010 17:40:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C22A710656A3 for ; Fri, 29 Jan 2010 17:40:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFAF48FC1A for ; Fri, 29 Jan 2010 17:40:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0THebHx082288 for ; Fri, 29 Jan 2010 17:40:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0THebjV082286 for perforce@freebsd.org; Fri, 29 Jan 2010 17:40:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 Jan 2010 17:40:37 GMT Message-Id: <201001291740.o0THebjV082286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173914 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 17:40:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=173914 Change 173914 by hselasky@hselasky_laptop001 on 2010/01/29 17:40:27 USB input: - improve kernel polling support. PR: usb/143286, kern/141011 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#43 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#43 (text+ko) ==== @@ -151,6 +151,7 @@ struct ukbd_data sc_ndata; struct ukbd_data sc_odata; + struct thread *sc_poll_thread; struct usb_device *sc_udev; struct usb_interface *sc_iface; struct usb_xfer *sc_xfer[UKBD_N_TRANSFER]; @@ -284,6 +285,7 @@ static int ukbd_disable(keyboard_t *); static void ukbd_interrupt(struct ukbd_softc *); static int ukbd_is_polling(struct ukbd_softc *); +static int ukbd_polls_other_thread(struct ukbd_softc *); static void ukbd_event_keyinput(struct ukbd_softc *); static device_probe_t ukbd_probe; @@ -335,9 +337,19 @@ { DPRINTFN(2, "polling\n"); + /* update stats about last polling event */ + sc->sc_poll_tick_last = ticks; + sc->sc_poll_detected = 1; + if (kdb_active == 0) { - /* make sure the USB code gets a chance to run */ - pause("UKBD", 1); + while (sc->sc_inputs == 0) { + /* make sure the USB code gets a chance to run */ + pause("UKBD", 1); + + /* check if we should wait */ + if (!wait) + break; + } return; /* Only poll if KDB is active */ } @@ -373,9 +385,13 @@ /* start transfer, if not already started */ usbd_transfer_start(sc->sc_xfer[UKBD_INTR_DT]); } - if (sc->sc_flags & UKBD_FLAG_POLLING) { + + if (ukbd_polls_other_thread(sc)) + return (-1); + + if (sc->sc_flags & UKBD_FLAG_POLLING) ukbd_do_poll(sc, wait); - } + if (sc->sc_inputs == 0) { c = -1; } else { @@ -400,9 +416,9 @@ uint8_t i; uint8_t j; - if (sc->sc_ndata.keycode[0] == KEY_ERROR) { - goto done; - } + if (sc->sc_ndata.keycode[0] == KEY_ERROR) + return; + n_mod = sc->sc_ndata.modifiers; o_mod = sc->sc_odata.modifiers; if (n_mod != o_mod) { @@ -475,17 +491,9 @@ sc->sc_odata = sc->sc_ndata; - bcopy(sc->sc_ntime, sc->sc_otime, sizeof(sc->sc_otime)); + memcpy(sc->sc_otime, sc->sc_ntime, sizeof(sc->sc_otime)); - if (ukbd_is_polling(sc)) - goto done; - if (sc->sc_inputs == 0) - goto done; - ukbd_event_keyinput(sc); - -done: - return; } static void @@ -493,6 +501,12 @@ { int c; + if (ukbd_is_polling(sc)) + return; + + if (sc->sc_inputs == 0) + return; + if (KBD_IS_ACTIVE(&sc->sc_kbd) && KBD_IS_BUSY(&sc->sc_kbd)) { /* let the callback function process the input */ @@ -518,8 +532,7 @@ ukbd_interrupt(sc); /* Make sure any leftover key events gets read out */ - if (ukbd_is_polling(sc) == 0) - ukbd_event_keyinput(sc); + ukbd_event_keyinput(sc); if (ukbd_any_key_pressed(sc) || (sc->sc_inputs != 0)) { ukbd_start_timer(sc); @@ -1102,13 +1115,19 @@ mtx_unlock(&Giant); return (retval); } - ukbd_do_poll(sc, 0); } else { /* XXX the keyboard layer requires Giant */ if (!mtx_owned(&Giant)) return (0); } + /* check if key belongs to this thread */ + if (ukbd_polls_other_thread(sc)) + return (0); + + if (sc->sc_flags & UKBD_FLAG_POLLING) + ukbd_do_poll(sc, 0); + #ifdef UKBD_EMULATE_ATSCANCODE if (sc->sc_buffered_char[0]) { return (1); @@ -1144,6 +1163,10 @@ return (0); } + /* check if key belongs to this thread */ + if (ukbd_polls_other_thread(sc)) + return (0); + if ((sc->sc_composed_char > 0) && (!(sc->sc_flags & UKBD_FLAG_COMPOSE))) { return (1); @@ -1182,6 +1205,10 @@ return (-1); } + /* check if key belongs to this thread */ + if (ukbd_polls_other_thread(sc)) + return (-1); + #ifdef UKBD_EMULATE_ATSCANCODE if (sc->sc_buffered_char[0]) { scancode = sc->sc_buffered_char[0]; @@ -1246,6 +1273,10 @@ return (NOKEY); } + /* check if key belongs to this thread */ + if (ukbd_polls_other_thread(sc)) + return (NOKEY); + next_code: /* do we have a composed char to return ? */ @@ -1629,11 +1660,8 @@ { int delta; - if (sc->sc_flags & UKBD_FLAG_POLLING) { - sc->sc_poll_tick_last = ticks; - sc->sc_poll_detected = 1; + if (sc->sc_flags & UKBD_FLAG_POLLING) return (1); /* polling */ - } delta = ticks - sc->sc_poll_tick_last; if ((delta < 0) || (delta >= hz)) { @@ -1645,6 +1673,13 @@ } static int +ukbd_polls_other_thread(struct ukbd_softc *sc) +{ + return (ukbd_is_polling(sc) && + (sc->sc_poll_thread != curthread)); +} + +static int ukbd_poll(keyboard_t *kbd, int on) { struct ukbd_softc *sc = kbd->kb_data; @@ -1660,7 +1695,7 @@ if (on) { sc->sc_flags |= UKBD_FLAG_POLLING; - ukbd_is_polling(sc); /* update state */ + sc->sc_poll_thread = curthread; } else { sc->sc_flags &= ~UKBD_FLAG_POLLING; ukbd_start_timer(sc); /* start timer */ From owner-p4-projects@FreeBSD.ORG Fri Jan 29 18:36:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4145D1065672; Fri, 29 Jan 2010 18:36:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06333106566B for ; Fri, 29 Jan 2010 18:36:34 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E81E28FC13 for ; Fri, 29 Jan 2010 18:36:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TIaXik087614 for ; Fri, 29 Jan 2010 18:36:33 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0TIaX1j087612 for perforce@freebsd.org; Fri, 29 Jan 2010 18:36:33 GMT (envelope-from jona@FreeBSD.org) Date: Fri, 29 Jan 2010 18:36:33 GMT Message-Id: <201001291836.o0TIaX1j087612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 18:36:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=173917 Change 173917 by jona@jona-capsicum-kent64 on 2010/01/29 18:36:01 Fixed an assertion in vm_map_insert which led to unnecessary panic Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#11 (text+ko) ==== @@ -1136,7 +1136,7 @@ ((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) { if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start)) return (KERN_RESOURCE_SHORTAGE); - KASSERT(object == NULL || (cow & MAP_ENTRY_NEEDS_COPY) || + KASSERT(object == NULL || (protoeflags & MAP_ENTRY_NEEDS_COPY) || object->uip == NULL, ("OVERCOMMIT: vm_map_insert o %p", object)); uip = curthread->td_ucred->cr_ruidinfo; From owner-p4-projects@FreeBSD.ORG Fri Jan 29 19:15:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37FC01065696; Fri, 29 Jan 2010 19:15:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0AEC1065693 for ; Fri, 29 Jan 2010 19:15:12 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE7668FC1B for ; Fri, 29 Jan 2010 19:15:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TJFC5i091346 for ; Fri, 29 Jan 2010 19:15:12 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0TJFCp7091344 for perforce@freebsd.org; Fri, 29 Jan 2010 19:15:12 GMT (envelope-from jona@FreeBSD.org) Date: Fri, 29 Jan 2010 19:15:12 GMT Message-Id: <201001291915.o0TJFCp7091344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 19:15:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=173920 Change 173920 by jona@jona-capsicum-kent64 on 2010/01/29 19:14:39 Basic testing of lc_fdlist stuff Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#6 (text+ko) ==== @@ -57,6 +57,8 @@ int main(int argc, char *argv[]) { + printf("fdlist\n"); + /* create an FD list and add some junk to it */ struct lc_fdlist *fds = lc_fdlist_new(); if (fds == NULL) err(-1, "Error in lc_fdlist_new()"); @@ -92,7 +94,7 @@ struct lc_fdlist *copy = (struct lc_fdlist*) shm; if (find_junk(copy) < 0) err(-1, "Error in find_junk(copy)"); - printf("OK\n"); + printf("Starting sandbox...\n"); /* run sandbox */ @@ -118,14 +120,18 @@ printf("cap_main() alive\n"); fflush(stdout); struct lc_fdlist *global_fdlist = lc_fdlist_global(); - if (find_junk(global_fdlist) < 0) - err(-1, "Error in find_junk(global_fdlist)"); + int result = find_junk(global_fdlist); + + if (result < 0) err(-1, "Error in find_junk(global_fdlist)"); + else if (result == 0) printf("find_junk() found no FD entries\n"); struct lc_fdlist *copy = lc_fdlist_dup(global_fdlist); - if (find_junk(copy) < 0) - err(-1, "Error in find_junk(copy)"); + result = find_junk(copy); + + if (result < 0) err(-1, "Error in find_junk(copy)"); + else if (result == 0) printf("find_junk() found no FD entries\n"); - printf("OK\n"); + printf("Received FD list OK\n"); fflush(stdout); return 0; } @@ -144,6 +150,8 @@ int find_junk(struct lc_fdlist *fds) { int pos = 0; + int parsed = 0; + for (int i = 0; i < 20; i++) { char *name; int value; @@ -157,8 +165,10 @@ if (value != 50 + i) warnx("i=%i\tGot 'FD' %i instead of %i", i, value, 50 + i); + + parsed++; } - return 0; + return parsed; } From owner-p4-projects@FreeBSD.ORG Fri Jan 29 19:15:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3C32106572D; Fri, 29 Jan 2010 19:15:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D9335106568F for ; Fri, 29 Jan 2010 19:15:12 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BDBC68FC1A for ; Fri, 29 Jan 2010 19:15:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0TJFCdG091341 for ; Fri, 29 Jan 2010 19:15:12 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0TJFClT091339 for perforce@freebsd.org; Fri, 29 Jan 2010 19:15:12 GMT (envelope-from jona@FreeBSD.org) Date: Fri, 29 Jan 2010 19:15:12 GMT Message-Id: <201001291915.o0TJFClT091339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2010 19:15:14 -0000 http://p4web.freebsd.org/chv.cgi?CH=173919 Change 173919 by jona@jona-capsicum-kent64 on 2010/01/29 19:14:24 Enable libcapsicum_fdlist stuff, since the mmap panic is gone Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#3 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#4 $ */ #include @@ -42,6 +42,7 @@ #include #include #include +#include #include "libcapsicum_sandbox_api.h" @@ -96,7 +97,6 @@ if (global_fdlist == NULL) { char *env = getenv(LIBCAPABILITY_SANDBOX_FDLIST); - printf("%s: %s\n", LIBCAPABILITY_SANDBOX_FDLIST, env); if ((env != NULL) && (strnlen(env, 8) < 7)) { @@ -111,20 +111,13 @@ if (fd < 0) return NULL; - printf("testing FD %i...", fd); fflush(stdout); struct stat stats; if (fstat(fd, &stats) < 0) return NULL; - printf(" done. Size: %lu\n", stats.st_size); - - printf("mapping FD %i... ", fd); fflush(stdout); - /* global_fdlist = mmap(NULL, stats.st_size, PROT_READ | PROT_WRITE, - MAP_NOSYNC | MAP_PRIVATE, fd, 0); - */ - printf(" done.\n"); + MAP_NOSYNC | MAP_SHARED, fd, 0); } } @@ -166,9 +159,12 @@ LOCK(orig); int size = lc_fdlist_size(orig); + struct lc_fdlist *copy = NULL; - struct lc_fdlist *copy = malloc(size); - if (copy == NULL) return (NULL); + if (size > 0) { + copy = malloc(size); + if (copy != NULL) memcpy(copy, orig, size); + } UNLOCK(orig); ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#3 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 $ */ #include @@ -153,7 +153,7 @@ int *fd_array, fdcount; struct sbuf *sbufp; int shmfd, fdlistsize; - /*void *shm;*/ + void *shm; char fdliststr[8]; u_int i; @@ -166,11 +166,7 @@ if (ftruncate(shmfd, fdlistsize) < 0) return; - printf("%dB of memory to mmap\n", fdlistsize); - - /* map it and copy the list */ - /* shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, MAP_NOSYNC | MAP_SHARED, shmfd, 0); @@ -178,8 +174,6 @@ memcpy(shm, fds, fdlistsize); if (munmap(shm, fdlistsize)) return; - */ - From owner-p4-projects@FreeBSD.ORG Sat Jan 30 00:40:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2385E10656A3; Sat, 30 Jan 2010 00:40:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC5AF106568F for ; Sat, 30 Jan 2010 00:40:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8EB58FC19 for ; Sat, 30 Jan 2010 00:40:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0U0edHV035302 for ; Sat, 30 Jan 2010 00:40:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0U0ed50035300 for perforce@freebsd.org; Sat, 30 Jan 2010 00:40:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 00:40:39 GMT Message-Id: <201001300040.o0U0ed50035300@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 Precedence: bulk Cc: Subject: PERFORCE change 173934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 00:40:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=173934 Change 173934 by rwatson@rwatson_vimage_client on 2010/01/30 00:40:13 LIBCAPABILITY->LIBCAPSICUM Affected files ... .. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#11 edit .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/Makefile#9 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.libnames.mk#11 (text+ko) ==== @@ -30,7 +30,7 @@ LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a -LIBCAPABILITY?= ${DESTDIR}${LIBDIR}/libcapability.a +LIBCAPSICUM?= ${DESTDIR}${LIBDIR}/libcapsicum.a LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/Makefile#9 (text+ko) ==== @@ -7,7 +7,7 @@ MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1 SRCS= gzip.c gzsandbox.c -DPADD= ${LIBZ} ${LIBCAPABILITY} +DPADD= ${LIBZ} ${LIBCAPSICUM} LDADD= -lz -lcapsicum CFLAGS+= -rdynamic # For sandbox cap_main From owner-p4-projects@FreeBSD.ORG Sat Jan 30 01:27:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27D031065672; Sat, 30 Jan 2010 01:27:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0907106566C for ; Sat, 30 Jan 2010 01:27:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CD2728FC08 for ; Sat, 30 Jan 2010 01:27:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0U1RQtj050150 for ; Sat, 30 Jan 2010 01:27:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0U1RQGw050148 for perforce@freebsd.org; Sat, 30 Jan 2010 01:27:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 01:27:26 GMT Message-Id: <201001300127.o0U1RQGw050148@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 Precedence: bulk Cc: Subject: PERFORCE change 173935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 01:27:27 -0000 http://p4web.freebsd.org/chv.cgi?CH=173935 Change 173935 by rwatson@rwatson_fledge on 2010/01/30 01:27:18 Remove several todo items that are todone. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#19 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#19 (text+ko) ==== @@ -13,16 +13,6 @@ user databases, libraries, etc, with a POSIX interface within the capability mode process. -- Get shared objects working in capability mode by creating a cap_ld-elf.so - that will take the binary to run as a file descriptor argument in order - to avoid needing to run the interpreter directly from the fexecve(2) - context. Consider carefully the implications on creating binaries, ELF, - etc. - -- Implement libcapability, a lightweight framework for starting code in a - capability mode sandbox using fexecve(2), etc, and providing a simple - local procedure call interface to compartmentalized services. - - ... bigger and better things ... Low-level TODO list: @@ -75,4 +65,5 @@ - Add support (a.k.a. find test platforms) for arm, ia64, etc. in lib/csu -- It would be nice if we didn't need -rdynamic; can we export just _capstart? Should we add more information (a capability entry point) to ELF? +- It would be nice if we didn't need -rdynamic; can we export just _capstart? + Should we add more information (a capability entry point) to ELF? From owner-p4-projects@FreeBSD.ORG Sat Jan 30 01:36:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83ED61065672; Sat, 30 Jan 2010 01:36:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 489101065670 for ; Sat, 30 Jan 2010 01:36:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B8DF8FC0A for ; Sat, 30 Jan 2010 01:36:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0U1aZil050895 for ; Sat, 30 Jan 2010 01:36:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0U1aZtG050893 for perforce@freebsd.org; Sat, 30 Jan 2010 01:36:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 01:36:35 GMT Message-Id: <201001300136.o0U1aZtG050893@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 Precedence: bulk Cc: Subject: PERFORCE change 173936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 01:36:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=173936 Change 173936 by rwatson@rwatson_fledge on 2010/01/30 01:36:23 Clean up some loose end references to libcapability. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/groff/tmac/mdoc.local#9 edit .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/gnu/usr.bin/groff/tmac/mdoc.local#9 (text+ko) ==== @@ -38,7 +38,7 @@ .ds doc-str-Lb-libc_r Reentrant C\~Library (libc_r, \-lc_r) .ds doc-str-Lb-libcalendar Calendar Arithmetic Library (libcalendar, \-lcalendar) .ds doc-str-Lb-libcam Common Access Method User Library (libcam, \-lcam) -.ds doc-str-Lb-libcapability Capability Services Library (libcapability, \-lcapability) +.ds doc-str-Lb-libcapsicum Capability Services Library (libcapsicum, \-lcapsicum) .ds doc-str-Lb-libcipher FreeSec Crypt Library (libcipher, \-lcipher) .ds doc-str-Lb-libdevinfo Device and Resource Information Utility Library (libdevinfo, \-ldevinfo) .ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf-cap/rtld-elf-cap.1#11 (text+ko) ==== @@ -45,7 +45,7 @@ is a version of .Xr ld-elf.so.1 1 specific to the sandbox environment created using -.Xr libcapability 3 , +.Xr libcapsicum 3 , which provides certain extended or modified linker services for that environment: .Bl -bullet @@ -72,7 +72,7 @@ allowing file descriptors for binaries and libraries passed across .Xr fexecve 2 to be used by -.Xr libcapability 3 , +.Xr libcapsicum 3 , as well as applications. .It Implements a version of @@ -88,7 +88,7 @@ command line flag. .Pp Most capability-mode applications will be started using the APIs defined in -.Xr libcapability 3 , +.Xr libcapsicum 3 , which properly set up the run-time environment for .Nm . .Sh SEE ALSO @@ -96,7 +96,7 @@ .Xr ld-elf.so.1 1 , .Xr cap_enter 2 , .Xr fexecve 2 , -.Xr libcapability 3 +.Xr libcapsicum 3 .Sh HISTORY Support for capabilities and capabilities mode was developed as part of the .Tn TrustedBSD From owner-p4-projects@FreeBSD.ORG Sat Jan 30 01:44:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECCE11065670; Sat, 30 Jan 2010 01:44:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B189B106566B for ; Sat, 30 Jan 2010 01:44:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E6708FC2C for ; Sat, 30 Jan 2010 01:44:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0U1iifo051441 for ; Sat, 30 Jan 2010 01:44:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0U1iia7051439 for perforce@freebsd.org; Sat, 30 Jan 2010 01:44:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 01:44:44 GMT Message-Id: <201001300144.o0U1iia7051439@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 Precedence: bulk Cc: Subject: PERFORCE change 173937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 01:44:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=173937 Change 173937 by rwatson@rwatson_fledge on 2010/01/30 01:44:02 Add some new TODO. Affected files ... .. //depot/projects/trustedbsd/capabilities/TODO#20 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/TODO#20 (text+ko) ==== @@ -67,3 +67,5 @@ - It would be nice if we didn't need -rdynamic; can we export just _capstart? Should we add more information (a capability entry point) to ELF? + +- Fix handling of DFLAG_PASSABLE. From owner-p4-projects@FreeBSD.ORG Sat Jan 30 09:37:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE394106568B; Sat, 30 Jan 2010 09:37:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A28A41065670 for ; Sat, 30 Jan 2010 09:37:37 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FE318FC2F for ; Sat, 30 Jan 2010 09:37:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0U9bbmL015514 for ; Sat, 30 Jan 2010 09:37:37 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0U9bbio015512 for perforce@freebsd.org; Sat, 30 Jan 2010 09:37:37 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 30 Jan 2010 09:37:37 GMT Message-Id: <201001300937.o0U9bbio015512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 09:37:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=173942 Change 173942 by rene@rene_self on 2010/01/30 09:37:24 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#47 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#35 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#20 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#70 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#29 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#5 integrate .. //depot/projects/docproj_nl/share/pgpkeys/avilla.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/brucec.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#31 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#28 integrate .. //depot/projects/docproj_nl/share/pgpkeys/uqs.key#1 branch .. //depot/projects/docproj_nl/www/en/developers.sgml#29 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#15 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2009-10-2009-12.xml#4 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#16 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#25 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#63 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#47 (text+ko) ==== @@ -1,4 +1,4 @@ - + + 9.0-CURRENT after the import of BSDL bc/dc and the deprecation of GNU bc/dc. + + 900009 + January 26, 2010 + 9.0-CURRENT after the addition of SIOCGIFDESCR + and SIOCSIFDESCR ioctls to network interfaces. These + ioctl can be used to manipulate interface description, + as inspired by OpenBSD. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#29 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.493 2009/12/22 15:43:15 ryusuke Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.496 2010/01/28 14:55:44 uqs Exp $ --> aaron@FreeBSD.org"> @@ -96,6 +96,8 @@ avg@FreeBSD.org"> +avilla@FreeBSD.org"> + avl@FreeBSD.org"> awebster@pubnix.net"> @@ -936,6 +938,8 @@ roger@FreeBSD.org"> +romain@FreeBSD.org"> + rpaulo@FreeBSD.org"> rpratt@FreeBSD.org"> @@ -1140,6 +1144,8 @@ ups@FreeBSD.org"> +uqs@FreeBSD.org"> + vanhu@FreeBSD.org"> vanilla@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#5 (text+ko) ==== @@ -26,7 +26,7 @@ % OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF % SUCH DAMAGE. % -% $FreeBSD: doc/nl_NL.ISO8859-1/flyer/flyer.tex,v 1.5 2008/11/07 16:28:18 rene Exp $ +% $FreeBSD: doc/nl_NL.ISO8859-1/flyer/flyer.tex,v 1.6 2010/01/24 21:05:26 rene Exp $ % %SOURCE% en_US.ISO8859-1/flyer/flyer.tex % %SRCID% 1.17 % ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#31 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -159,6 +159,11 @@ &pgpkey.jmb; + + &a.brucec; + &pgpkey.brucec; + + &a.brueffer; &pgpkey.brueffer; @@ -1271,6 +1276,11 @@ &pgpkey.ssouhlal; + + &a.uqs; + &pgpkey.uqs; + + &a.rink; &pgpkey.rink; @@ -1406,6 +1416,11 @@ &pgpkey.nectar; + + &a.avilla; + &pgpkey.avilla; + + &a.nivit; &pgpkey.nivit; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#28 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -23,6 +23,7 @@ + @@ -41,6 +42,7 @@ + @@ -305,6 +307,7 @@ + ==== //depot/projects/docproj_nl/www/en/developers.sgml#29 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.236 2009/12/22 15:48:47 ryusuke Exp $ +$FreeBSD: www/en/developers.sgml,v 1.240 2010/01/29 14:27:20 brucec Exp $ --> @@ -51,6 +51,7 @@ + @@ -77,6 +78,7 @@ + @@ -467,6 +469,7 @@ + @@ -568,6 +571,7 @@ + ==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#15 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -48,6 +48,13 @@ + brueffer + Switzerland + 512MB or 1GB PC2700 SO-DIMM RAM module + Keeping an elderly Thinkpad T41p (my main machine) usable. + + + cognet France A Zaurus, with hard disk preferably. @@ -305,6 +312,13 @@ + rpaulo + Portugal + Intel Mac, possibly Mac Mini for a small shipment fee + EFI support under FreeBSD and other Mac development work. + + + sam USA crypto devices (pci, pcmcia, cardbus cards, @@ -404,13 +418,6 @@ Qty 2, PC133 SODIMM, 512MB. 256MB also welcome if nothing else. Bring a bit more life in an old notebook I use for testing. - - - rui - Portugal - Intel Mac, possibly Mac Mini for a small shipment fee - EFI support under FreeBSD and other Mac development work. - &footer; ==== //depot/projects/docproj_nl/www/en/news/status/report-2009-10-2009-12.xml#4 (text+ko) ==== @@ -2,7 +2,7 @@ - + October-December @@ -1827,12 +1827,12 @@
  • Enable vbox's shared MAC feature when using bridged mode on a Wifi interface, together with the virtualbox-ose-kmod change this should fix bridged mode for Wifi users.
    • + -
  • We would like to say thanks to all the people that helped us - by reporting bugs and submitting fixes. We also thank the - VirtualBox developers for their help with the ongoing effort - to port VirtualBox to &os;
    • - +

    We would like to say thanks to all the people that helped us + by reporting bugs and submitting fixes. We also thank the + VirtualBox developers for their help with the ongoing effort + to port VirtualBox to &os;

    ==== //depot/projects/docproj_nl/www/nl/where.sgml#16 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#25 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.80 2010/01/20 17:16:06 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.81 2010/01/27 22:46:51 brueffer Exp $ @@ -205,6 +205,30 @@ charge. + + Chemnitzer Linux-Tage 2010 + http://chemnitzer.linux-tage.de/2010/ + + 2010 + 3 + 13 + + + 2010 + 3 + 14 + + + Germany + Chemnitz + Technical University Chemnitz + + Chemnitzer Linux-Tage is a two day event on Linux and Free + Software in general. There will be workshops, talks and room for various + projects to present themselves. FreeBSD will be present with a booth. + + + AsiaBSDCon 2010 http://2010.asiabsdcon.org/ ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#63 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.284 2010/01/17 17:34:02 danger Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.289 2010/01/29 14:37:34 brucec Exp $ @@ -36,6 +36,38 @@ 1 + 29 + + +

    New committer: Bruce + Cran (src)

    +     +     + + + 28 + + +

    New committer: Ulrich + Spörlein (src)

    +     +     + + + 26 + + +

    New committer: Romain + Tartière (ports)

    +     + + +

    New committer: Alberto + Villa (ports)

    +     +     + + 17 From owner-p4-projects@FreeBSD.ORG Sat Jan 30 11:20:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A598B1065695; Sat, 30 Jan 2010 11:20:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68D7F1065670 for ; Sat, 30 Jan 2010 11:20:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 557F78FC18 for ; Sat, 30 Jan 2010 11:20:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UBKK1D033936 for ; Sat, 30 Jan 2010 11:20:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UBKKpu033934 for perforce@freebsd.org; Sat, 30 Jan 2010 11:20:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 11:20:20 GMT Message-Id: <201001301120.o0UBKKpu033934@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 Precedence: bulk Cc: Subject: PERFORCE change 173944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 11:20:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=173944 Change 173944 by rwatson@rwatson_vimage_client on 2010/01/30 11:20:14 Only set up a file descriptor list (and its corresponding POSIX shared memory segment + environmental variable) if we're going to use it. Update copyright year. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Robert N. M. Watson + * Copyright (c) 2009-2010 Robert N. M. Watson * All rights reserved. * * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#4 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#5 $ */ #include @@ -152,31 +152,35 @@ { int *fd_array, fdcount; struct sbuf *sbufp; - int shmfd, fdlistsize; + int shmfd = -1; + size_t fdlistsize; void *shm; char fdliststr[8]; u_int i; + /* + * Create an anonymous shared memory segment for the FD list. + */ + if (fds != NULL) { + shmfd = shm_open(SHM_ANON, O_RDWR, 0600); + if (shmfd < 0) + return; + fdlistsize = lc_fdlist_size(fds); + if (ftruncate(shmfd, fdlistsize) < 0) + return; - /* create an anonymous shared memory segment for the FD list */ - shmfd = shm_open(SHM_ANON, O_RDWR, 0600); - if (shmfd < 0) return; - - fdlistsize = lc_fdlist_size(fds); - if (ftruncate(shmfd, fdlistsize) < 0) return; + /* + * Map it and copy the list. + */ + shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, + MAP_NOSYNC | MAP_SHARED, shmfd, 0); + if (shm == MAP_FAILED) + return; + memcpy(shm, fds, fdlistsize); + if (munmap(shm, fdlistsize)) + return; + } - - /* map it and copy the list */ - shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, - MAP_NOSYNC | MAP_SHARED, shmfd, 0); - - if (shm == MAP_FAILED) return; - memcpy(shm, fds, fdlistsize); - - if (munmap(shm, fdlistsize)) return; - - - if (lc_limitfd(fd_devnull, LIBCAPABILITY_CAPMASK_DEVNULL) < 0) return; if (lc_limitfd(fd_sandbox, LIBCAPABILITY_CAPMASK_SANDBOX) < 0) @@ -254,9 +258,11 @@ return; sbuf_delete(sbufp); - sprintf(fdliststr, "%d", 10); - if (setenv(LIBCAPABILITY_SANDBOX_FDLIST, fdliststr, 1) == -1) - return; + if (fds != NULL) { + sprintf(fdliststr, "%d", 10); + if (setenv(LIBCAPABILITY_SANDBOX_FDLIST, fdliststr, 1) == -1) + return; + } if (cap_enter() < 0) return; From owner-p4-projects@FreeBSD.ORG Sat Jan 30 11:39:40 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1466C1065679; Sat, 30 Jan 2010 11:39:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD4C5106566C for ; Sat, 30 Jan 2010 11:39:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA00F8FC15 for ; Sat, 30 Jan 2010 11:39:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UBddVr035375 for ; Sat, 30 Jan 2010 11:39:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UBddgB035373 for perforce@freebsd.org; Sat, 30 Jan 2010 11:39:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 11:39:39 GMT Message-Id: <201001301139.o0UBddgB035373@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 Precedence: bulk Cc: Subject: PERFORCE change 173945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 11:39:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=173945 Change 173945 by rwatson@rwatson_vimage_client on 2010/01/30 11:38:39 Support optionally passing the pshm segment into the sandbox better; don't try to install the fd if we don't have one. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#5 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#6 $ */ #include @@ -150,7 +150,7 @@ struct lc_library *lclp, u_int lcl_count, const char *binname, char *const argv[], struct lc_fdlist *fds) { - int *fd_array, fdcount; + int *fd_array, fdcount, fdnum; struct sbuf *sbufp; int shmfd = -1; size_t fdlistsize; @@ -196,7 +196,11 @@ if (lc_limitfd(fd_libsbuf, LIBCAPABILITY_CAPMASK_LIB) < 0) return; - fdcount = 11 + lcl_count; + fdnum = 10; + if (shmfd != -1) + fdnum++; + + fdcount = fdnum + lcl_count; fd_array = malloc(fdcount * sizeof(int)); if (fd_array == NULL) return; @@ -221,11 +225,12 @@ fd_array[7] = fd_libcapsicum; fd_array[8] = fd_libsbuf; fd_array[9] = fd_devnull; - fd_array[10] = shmfd; + if (shmfd != -1) + fd_array[10] = shmfd; for (i = 0; i < lcl_count; i++) { if (lc_limitfd(lclp->lcl_fd, LIBCAPABILITY_CAPMASK_LIB) < 0) return; - fd_array[i + 11] = lclp[i].lcl_fd; + fd_array[i + fdnum] = lclp[i].lcl_fd; } if (lch_installfds(fdcount, fd_array) < 0) @@ -238,7 +243,7 @@ 3, binname, 5, LD_ELF_CAP_SO, 6, LIBC_SO, 7, LIBCAPABILITY_SO, 8, LIBSBUF_SO, 9, _PATH_DEVNULL); for (i = 0; i < lcl_count; i++) - (void)sbuf_printf(sbufp, ",%d:%s", i + 11, + (void)sbuf_printf(sbufp, ",%d:%s", i + fdnum, lclp[i].lcl_libname); sbuf_finish(sbufp); if (sbuf_overflowed(sbufp)) @@ -258,7 +263,7 @@ return; sbuf_delete(sbufp); - if (fds != NULL) { + if (shmfd != -1) { sprintf(fdliststr, "%d", 10); if (setenv(LIBCAPABILITY_SANDBOX_FDLIST, fdliststr, 1) == -1) return; From owner-p4-projects@FreeBSD.ORG Sat Jan 30 11:40:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AE221065692; Sat, 30 Jan 2010 11:40:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F34EA1065670 for ; Sat, 30 Jan 2010 11:40:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E00BF8FC18 for ; Sat, 30 Jan 2010 11:40:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UBeejs035525 for ; Sat, 30 Jan 2010 11:40:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UBeePb035523 for perforce@freebsd.org; Sat, 30 Jan 2010 11:40:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 11:40:40 GMT Message-Id: <201001301140.o0UBeePb035523@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 Precedence: bulk Cc: Subject: PERFORCE change 173946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 11:40:41 -0000 http://p4web.freebsd.org/chv.cgi?CH=173946 Change 173946 by rwatson@rwatson_vimage_client on 2010/01/30 11:39:41 libcapsicum now expects an (optional) fdlist when creating a sandbox, so update gzip. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#11 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/gzsandbox.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009 Robert N. M. Watson + * Copyright (c) 2009-2010 Robert N. M. Watson * All rights reserved. * * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED @@ -104,8 +104,8 @@ err(-1, "open: %s", gzsandbox_libs[i].lcl_libname); } if (lch_start_libs(LC_USR_BIN_GZIP_SANDBOX, lc_sandbox_argv, - LCH_PERMIT_STDERR, gzsandbox_libs, gzsandbox_libs_count, &lcsp) - < 0) + LCH_PERMIT_STDERR, gzsandbox_libs, gzsandbox_libs_count, NULL, + &lcsp) < 0) err(-1, "lch_start %s", LC_USR_BIN_GZIP_SANDBOX); } From owner-p4-projects@FreeBSD.ORG Sat Jan 30 12:58:59 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B3921065679; Sat, 30 Jan 2010 12:58:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FB671065672 for ; Sat, 30 Jan 2010 12:58:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4BB608FC1B for ; Sat, 30 Jan 2010 12:58:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UCwx0T052835 for ; Sat, 30 Jan 2010 12:58:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UCwx0Q052833 for perforce@freebsd.org; Sat, 30 Jan 2010 12:58:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 12:58:59 GMT Message-Id: <201001301258.o0UCwx0Q052833@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 Precedence: bulk Cc: Subject: PERFORCE change 173948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 12:58:59 -0000 http://p4web.freebsd.org/chv.cgi?CH=173948 Change 173948 by rwatson@rwatson_vimage_client on 2010/01/30 12:58:42 Trim excess vertical whitespace. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#6 (text+ko) ==== @@ -94,8 +94,6 @@ exit( main(argc, argv, env) ); } - - /* The Capsicum entry function. */ void _capstart(char **ap, void (*cleanup)(void)) ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#8 (text+ko) ==== @@ -52,8 +52,6 @@ __FreeBSD_version }; - - extern int cap_main(int, char **, char **) __attribute__((weak)); int cap_main(__unused int argc, __unused char **argv, __unused char **env) { @@ -61,6 +59,5 @@ "ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n"; write(2, warning, sizeof(warning)); - return (-1); } From owner-p4-projects@FreeBSD.ORG Sat Jan 30 14:09:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7FE3106568B; Sat, 30 Jan 2010 14:09:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB5541065672 for ; Sat, 30 Jan 2010 14:09:09 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 96F8E8FC17 for ; Sat, 30 Jan 2010 14:09:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UE99Fi059995 for ; Sat, 30 Jan 2010 14:09:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UE99jF059993 for perforce@freebsd.org; Sat, 30 Jan 2010 14:09:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 14:09:09 GMT Message-Id: <201001301409.o0UE99jF059993@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 Precedence: bulk Cc: Subject: PERFORCE change 173950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 14:09:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=173950 Change 173950 by rwatson@rwatson_vimage_client on 2010/01/30 14:08:51 Revert two whitespace-only changes relative to SVN. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_lookup.c#16 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_lookup.c#16 (text+ko) ==== @@ -505,7 +505,7 @@ int dvfslocked; /* VFS Giant state for parent */ int tvfslocked; int lkflags_save; - + /* * Setup: break out flag bits into variables. */ @@ -531,7 +531,6 @@ cnp->cn_lkflags = LK_SHARED; else cnp->cn_lkflags = LK_EXCLUSIVE; - dp = ndp->ni_startdir; ndp->ni_startdir = NULLVP; vn_lock(dp, From owner-p4-projects@FreeBSD.ORG Sat Jan 30 14:10:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A16D10656A8; Sat, 30 Jan 2010 14:10:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D261D1065670 for ; Sat, 30 Jan 2010 14:10:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE43A8FC15 for ; Sat, 30 Jan 2010 14:10:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UEAAca060105 for ; Sat, 30 Jan 2010 14:10:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UEAAhD060103 for perforce@freebsd.org; Sat, 30 Jan 2010 14:10:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 14:10:10 GMT Message-Id: <201001301410.o0UEAAhD060103@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 Precedence: bulk Cc: Subject: PERFORCE change 173951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 14:10:11 -0000 http://p4web.freebsd.org/chv.cgi?CH=173951 Change 173951 by rwatson@rwatson_vimage_client on 2010/01/30 14:09:55 Revert whitespace-only change relative to SVN. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#29 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#29 (text+ko) ==== @@ -1083,8 +1083,6 @@ return (kern_openat(td, AT_FDCWD, path, pathseg, flags, mode)); } - - int kern_openat(struct thread *td, int fd, char *path, enum uio_seg pathseg, int flags, int mode) From owner-p4-projects@FreeBSD.ORG Sat Jan 30 14:12:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D80B106568B; Sat, 30 Jan 2010 14:12:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31871106566B for ; Sat, 30 Jan 2010 14:12:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D5608FC14 for ; Sat, 30 Jan 2010 14:12:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UECDWO060299 for ; Sat, 30 Jan 2010 14:12:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UECC3w060297 for perforce@freebsd.org; Sat, 30 Jan 2010 14:12:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 14:12:12 GMT Message-Id: <201001301412.o0UECC3w060297@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 Precedence: bulk Cc: Subject: PERFORCE change 173952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 14:12:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=173952 Change 173952 by rwatson@rwatson_vimage_client on 2010/01/30 14:11:25 Revert whitespace-only change from SVN. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#17 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/file.h#17 (text+ko) ==== @@ -259,6 +259,7 @@ fo_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, struct thread *td) { + return ((*fp->f_ops->fo_ioctl)(fp, com, data, active_cred, td)); } From owner-p4-projects@FreeBSD.ORG Sat Jan 30 14:14:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E7D31065670; Sat, 30 Jan 2010 14:14:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5BBEB106566C for ; Sat, 30 Jan 2010 14:14:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4757E8FC13 for ; Sat, 30 Jan 2010 14:14:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UEEF5F060414 for ; Sat, 30 Jan 2010 14:14:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UEEFfx060412 for perforce@freebsd.org; Sat, 30 Jan 2010 14:14:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 14:14:15 GMT Message-Id: <201001301414.o0UEEFfx060412@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 Precedence: bulk Cc: Subject: PERFORCE change 173953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 14:14:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=173953 Change 173953 by rwatson@rwatson_vimage_client on 2010/01/30 14:13:53 Eliminate collision on capabiity sysctl flags due to new flags being added in SVN. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysctl.h#14 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysctl.h#14 (text+ko) ==== @@ -87,8 +87,8 @@ #define CTLFLAG_MPSAFE 0x00040000 /* Handler is MP safe */ #define CTLFLAG_VNET 0x00020000 /* Prisons with vnet can fiddle */ #define CTLFLAG_RDTUN (CTLFLAG_RD|CTLFLAG_TUN) -#define CTLFLAG_CAPRD 0x00040000 /* Can be read in capability mode */ -#define CTLFLAG_CAPWR 0x00020000 /* Can be written in capability mode */ +#define CTLFLAG_CAPRD 0x00010000 /* Can be read in capability mode */ +#define CTLFLAG_CAPWR 0x00008000 /* Can be written in capability mode */ #define CTLFLAG_CAPRW (CTLFLAG_CAPRD|CTLFLAG_CAPWR) /* From owner-p4-projects@FreeBSD.ORG Sat Jan 30 14:16:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C216D1065670; Sat, 30 Jan 2010 14:16:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 862CE106568B for ; Sat, 30 Jan 2010 14:16:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 71E1A8FC2C for ; Sat, 30 Jan 2010 14:16:17 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UEGH74060590 for ; Sat, 30 Jan 2010 14:16:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UEGHUF060588 for perforce@freebsd.org; Sat, 30 Jan 2010 14:16:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 14:16:17 GMT Message-Id: <201001301416.o0UEGHUF060588@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 Precedence: bulk Cc: Subject: PERFORCE change 173954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 14:16:18 -0000 http://p4web.freebsd.org/chv.cgi?CH=173954 Change 173954 by rwatson@rwatson_vimage_client on 2010/01/30 14:15:19 Fix typo in comment. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#16 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/sys/user.h#16 (text+ko) ==== @@ -334,7 +334,7 @@ struct sockaddr_storage kf_sa_peer; /* Peer address. */ pid_t kf_pid; /* Process identifier. */ int _kf_ispare0; /* Space for more stuff. */ - cap_rights_t kf_cap_rights; /* Capabiity rights. */ + cap_rights_t kf_cap_rights; /* Capability rights. */ int _kf_ispare[12]; /* Space for more stuff. */ /* Truncated before copyout in sysctl */ char kf_path[PATH_MAX]; /* Path to file, if any. */ From owner-p4-projects@FreeBSD.ORG Sat Jan 30 15:54:55 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50C871065670; Sat, 30 Jan 2010 15:54:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F101A106566B for ; Sat, 30 Jan 2010 15:54:54 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC6848FC0A for ; Sat, 30 Jan 2010 15:54:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UFssJd070412 for ; Sat, 30 Jan 2010 15:54:54 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UFss54070410 for perforce@freebsd.org; Sat, 30 Jan 2010 15:54:54 GMT (envelope-from jona@FreeBSD.org) Date: Sat, 30 Jan 2010 15:54:54 GMT Message-Id: <201001301554.o0UFss54070410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 15:54:55 -0000 http://p4web.freebsd.org/chv.cgi?CH=173958 Change 173958 by jona@jona-belle-freebsd8 on 2010/01/30 15:53:54 File descriptor reordering via lc_fdlist_reorder() Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#5 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#7 edit .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#7 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#4 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#5 $ */ #ifndef _LIBCAPABILITY_H_ @@ -103,6 +103,23 @@ char **name, int *fdp, int *pos); /* + * Look up a file descriptor without a name. Repeated calls to this function will + * iterate through all descriptors in the list. + */ +int lc_fdlist_getentry(struct lc_fdlist *l, + char **subsystem, char **classname, + char **name, int *fdp, int *pos); + +/* + * Reorder FD list (WARNING: this could be dangerous!). + * + * This call takes all of the file descriptors in the FD list, and moves them into + * a continuous array, starting at the FD given by 'start'. Any file descriptors + * above 'start' which are not in the FD list are closed. + */ +int lc_fdlist_reorder(struct lc_fdlist *l); + +/* * Capability interfaces. */ int lc_limitfd(int fd, cap_rights_t rights); ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#4 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#5 $ */ #include @@ -52,8 +52,8 @@ unsigned int sysoff; /* offset of e.g. "org.freebsd.rtld-elf-cap" */ unsigned int syslen; /* length of above */ - unsigned int idoff; /* offset of variable ID e.g. "libs" */ - unsigned int idlen; /* length of above */ + unsigned int classoff; /* offset of variable ID e.g. "libs" */ + unsigned int classlen; /* length of above */ unsigned int nameoff; /* offset of entry name (e.g. "libc.so.7") */ unsigned int namelen; /* length of above */ @@ -243,10 +243,10 @@ /* do we need more name space? */ int subsyslen = strlen(subsystem); - int idlen = strlen(id); + int classlen = strlen(id); int namelen = strlen(name); - if ((l->namelen + subsyslen + idlen + namelen) >= l->namecapacity) { + if ((l->namelen + subsyslen + classlen + namelen) >= l->namecapacity) { /* double the name capacity */ struct lc_fdlist* enlarged @@ -276,10 +276,10 @@ entry->syslen = subsyslen; head += subsyslen + 1; - strncpy(head, id, idlen + 1); - entry->idoff = (head - names); - entry->idlen = idlen; - head += idlen + 1; + strncpy(head, id, classlen + 1); + entry->classoff = (head - names); + entry->classlen = classlen; + head += classlen + 1; strncpy(head, name, namelen + 1); entry->nameoff = (head - names); @@ -313,20 +313,28 @@ if (l == NULL) { errno = EINVAL; - return -1; + return (-1); } LOCK(l); + if ((pos != NULL) && (*pos >= (int) l->count)) { + UNLOCK(l); + errno = EINVAL; + return (-1); + } + int successful = 0; const char *names = lc_fdlist_names(l); - for (unsigned int i = (pos ? *pos + 1 : 0); i < l->count; i++) { + for (unsigned int i = (pos ? *pos : 0); i < l->count; i++) { struct lc_fdlist_entry *entry = l->entries + i; - if (!strncmp(subsystem, names + entry->sysoff, entry->syslen + 1) - && !strncmp(id, names + entry->idoff, entry->idlen + 1)) { + if ((!subsystem || + !strncmp(subsystem, names + entry->sysoff, entry->syslen + 1)) + && (!id || + !strncmp(id, names + entry->classoff, entry->classlen + 1))) { /* found a matching entry! */ *name = malloc(entry->namelen + 1); @@ -334,7 +342,7 @@ *fdp = entry->fd; - if (pos) *pos = i; + if (pos) *pos = i + 1; successful = 1; break; @@ -352,6 +360,97 @@ int +lc_fdlist_getentry(struct lc_fdlist *l, + char **subsystem, char **classname, + char **name, int *fdp, int *pos) { + + LOCK(l); + + if ((pos == NULL) || (*pos < 0) || (*pos >= (int) l->count) + || (subsystem == NULL) || (classname == NULL) + || (name == NULL) || (fdp == NULL)) { + + errno = EINVAL; + return (-1); + } + + struct lc_fdlist_entry *entry = l->entries + *pos; + char *names = lc_fdlist_names(l); + int size = entry->syslen + entry->classlen + entry->namelen; + char *head = malloc(size); + + strncpy(head, names + entry->sysoff, entry->syslen + 1); + *subsystem = head; + head += size; + + strncpy(head, names + entry->classoff, entry->classlen + 1); + *classname = head; + head += size; + + strncpy(head, names + entry->nameoff, entry->namelen + 1); + *name = head; + head += size; + + *fdp = entry->fd; + + UNLOCK(l); + + (*pos)++; + + return 0; +} + + +int +lc_fdlist_reorder(struct lc_fdlist *l) { + + LOCK(l); + + /* Do we really need to do this? */ + if (l->count == 0) + return (0); + + /* + * Identify the highest source file descriptor we care about so that + * when we play the dup2() rearranging game, we don't overwrite any + * we care about. + */ + int highestfd = -1; + for (unsigned int i = 0; i < l->count; i++) { + if (l->entries[i].fd > highestfd) + highestfd = l->entries[i].fd; + } + highestfd++; /* Don't tread on the highest */ + + /* + * First, move all our descriptors up the range. + */ + for (unsigned int i = 0; i < l->count; i++) { + if (dup2(l->entries[i].fd, highestfd + i) < 0) + return (-1); + } + + /* + * Now put them back. + */ + for (unsigned int i = 0; i < l->count; i++) { + if (dup2(highestfd + i, i) < 0) + return (-1); + + l->entries[i].fd = i; + } + + /* + * Close the descriptors that we moved, as well as any others that + * were left open by the caller. + */ + closefrom(l->count); + + return 0; +} + + +int lc_fdlist_size(struct lc_fdlist* l) { LOCK(l); ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#6 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#7 $ */ #include @@ -161,26 +161,62 @@ /* * Create an anonymous shared memory segment for the FD list. */ - if (fds != NULL) { - shmfd = shm_open(SHM_ANON, O_RDWR, 0600); - if (shmfd < 0) - return; - fdlistsize = lc_fdlist_size(fds); - if (ftruncate(shmfd, fdlistsize) < 0) - return; + if (fds == NULL) fds = lc_fdlist_new(); + + shmfd = shm_open(SHM_ANON, O_RDWR, 0600); + if (shmfd < 0) + return; + fdlistsize = lc_fdlist_size(fds); + if (ftruncate(shmfd, fdlistsize) < 0) + return; + + /* + * Map it and copy the list. + */ + shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, + MAP_NOSYNC | MAP_SHARED, shmfd, 0); + if (shm == MAP_FAILED) + return; + memcpy(shm, fds, fdlistsize); + if (munmap(shm, fdlistsize)) + return; + + if (lc_fdlist_addcap(&fds, "org.freebsd.libcapsicum", "/dev/null", "", + fd_devnull, LIBCAPABILITY_CAPMASK_DEVNULL) < 0) + return; + if (lc_fdlist_addcap(&fds, "org.freebsd.libcapsicum", "sandbox", "", + fd_sandbox, LIBCAPABILITY_CAPMASK_SANDBOX) < 0) + return; + if (lc_fdlist_addcap(&fds, "org.freebsd.libcapsicum", "socket", "", + fd_sock, LIBCAPABILITY_CAPMASK_SOCK) < 0) + return; + if (lc_fdlist_addcap(&fds, "org.freebsd.rtld-elf-cap", "ldso", "", + fd_ldso, LIBCAPABILITY_CAPMASK_LDSO) < 0) + return; + if (lc_fdlist_addcap(&fds, "org.freebsd.rtld-elf-cap", "lib", "libc", + fd_libc, LIBCAPABILITY_CAPMASK_LIB) < 0) + return; + if (lc_fdlist_addcap(&fds, "org.freebsd.rtld-elf-cap", "lib", "libcapsicum", + fd_libcapsicum, LIBCAPABILITY_CAPMASK_LIB) < 0) + return; + if (lc_fdlist_addcap(&fds, "org.freebsd.rtld-elf-cap", "lib", "libsbuf", + fd_libsbuf, LIBCAPABILITY_CAPMASK_LIB) < 0) + return; +/* + { + int pos = 0; + char *subsystem; + char *class; + char *name; + int fd; - /* - * Map it and copy the list. - */ - shm = mmap(NULL, fdlistsize, PROT_READ | PROT_WRITE, - MAP_NOSYNC | MAP_SHARED, shmfd, 0); - if (shm == MAP_FAILED) - return; - memcpy(shm, fds, fdlistsize); - if (munmap(shm, fdlistsize)) - return; + while (lc_fdlist_getentry(fds, &subsystem, &class, &name, &fd, &pos) + >= 0) { + printf("%d\t'%s'.'%s': '%s' (%d)\n", + pos, subsystem, class, name, fd); + } } - +*/ if (lc_limitfd(fd_devnull, LIBCAPABILITY_CAPMASK_DEVNULL) < 0) return; if (lc_limitfd(fd_sandbox, LIBCAPABILITY_CAPMASK_SANDBOX) < 0) ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#2 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_internal.h#3 $ */ #ifndef _LIBCAPABILITY_INTERNAL_H_ @@ -46,6 +46,8 @@ pid_t lcs_pid; }; + + /* * Communications flags for recv/send calls (lc_flags). */ ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdlist/fdlist.c#7 (text+ko) ==== @@ -47,8 +47,7 @@ -int add_junk(struct lc_fdlist**); -int find_junk(struct lc_fdlist*); +void print_fdlist(struct lc_fdlist* fds); /* @@ -57,25 +56,48 @@ int main(int argc, char *argv[]) { - printf("fdlist\n"); + printf("fdlist: PID %d\n", getpid()); + + /* create a shared memory segment for FDs */ + int shmfd = shm_open(SHM_ANON, O_RDWR, 0600); + if (shmfd < 0) + err(-1, "Error opening shared memory"); + /* create an FD list and add some junk to it */ struct lc_fdlist *fds = lc_fdlist_new(); if (fds == NULL) err(-1, "Error in lc_fdlist_new()"); - lc_fdlist_add(&fds, "org.freebsd.Capsicum", "testfile", + lc_fdlist_addcap(&fds, "org.freebsd.Capsicum.fdlist", "stdin", "", + 0, CAP_READ); + + lc_fdlist_addcap(&fds, "org.freebsd.Capsicum.fdlist", "stdout", "", + 1, CAP_WRITE | CAP_SEEK); + + lc_fdlist_addcap(&fds, "org.freebsd.Capsicum.fdlist", "stderr", "", + 2, CAP_WRITE | CAP_SEEK); + + lc_fdlist_add(&fds, "org.freebsd.Capsicum.fdlist", "testfile", "/etc/passwd", open("/etc/passwd", O_RDONLY)); - lc_fdlist_addcap(&fds, "org.freebsd.Capsicum", "testfile", + lc_fdlist_addcap(&fds, "org.freebsd.Capsicum.fdlist", "testfile", "/etc/group", open("/etc/group", O_RDONLY), CAP_READ); + lc_fdlist_add(&fds, "org.freebsd.Capsicum.fdlist", "fdlist", + "", shmfd); - if (add_junk(&fds) < 0) err(-1, "Error in add_junk()"); - if (find_junk(fds) < 0) err(-1, "Error in find_junk()"); + print_fdlist(fds); + + printf("Reordering FDs...\n"); + if (lc_fdlist_reorder(fds)) + err(-1, "lc_fdlist_reorder(fds) failed"); + + print_fdlist(fds); - /* copy it into a shared memory segment and see if it still works */ - int shmfd = shm_open(SHM_ANON, O_RDWR, 0600); - if (shmfd < 0) - err(-1, "Error opening shared memory"); + char *name; + if (lc_fdlist_lookup(fds, "org.freebsd.Capsicum.fdlist", "fdlist", + &name, &shmfd, NULL) < 0) { + err(-1, "Error in lc_fdlist_lookup()"); + } int size = lc_fdlist_size(fds); if (ftruncate(shmfd, size) < 0) @@ -91,9 +113,6 @@ memcpy(shm, fds, lc_fdlist_size(fds)); - struct lc_fdlist *copy = (struct lc_fdlist*) shm; - if (find_junk(copy) < 0) err(-1, "Error in find_junk(copy)"); - printf("Starting sandbox...\n"); @@ -120,55 +139,38 @@ printf("cap_main() alive\n"); fflush(stdout); struct lc_fdlist *global_fdlist = lc_fdlist_global(); - int result = find_junk(global_fdlist); + printf("Received FD list:\n"); fflush(stdout); - if (result < 0) err(-1, "Error in find_junk(global_fdlist)"); - else if (result == 0) printf("find_junk() found no FD entries\n"); + int pos = 0; + char *subsystem; + char *class; + char *name; + int fd; - struct lc_fdlist *copy = lc_fdlist_dup(global_fdlist); - result = find_junk(copy); + while (lc_fdlist_getentry(global_fdlist, &subsystem, &class, + &name, &fd, &pos) >= 0) + printf("%d\t'%s'.'%s': '%s' (%d)\n", + pos, subsystem, class, name, fd); - if (result < 0) err(-1, "Error in find_junk(copy)"); - else if (result == 0) printf("find_junk() found no FD entries\n"); + printf("OK.\n"); - printf("Received FD list OK\n"); fflush(stdout); - return 0; } -int add_junk(struct lc_fdlist **fds) -{ - for (int i = 0; i < 20; i++) - if (lc_fdlist_add(fds, "org.freebsd.Capsicum", "testjunk", - "garbage", 50 + i) < 0) - return -1; - return 0; -} - -int find_junk(struct lc_fdlist *fds) +void print_fdlist(struct lc_fdlist* fds) { int pos = 0; - int parsed = 0; + char *subsystem; + char *class; + char *name; + int fd; - for (int i = 0; i < 20; i++) { - char *name; - int value; - - if (lc_fdlist_lookup(fds, "org.freebsd.Capsicum", "testjunk", - &name, &value, &pos) < 0) - return -1; - - if (strcmp("garbage", name)) - warnx("i=%i\tGot '%s' instead of 'garbage'", i, name); - - if (value != 50 + i) - warnx("i=%i\tGot 'FD' %i instead of %i", i, value, 50 + i); - - parsed++; + while (lc_fdlist_getentry(fds, &subsystem, &class, &name, &fd, &pos) + >= 0) { + printf("%d\t'%s'.'%s': '%s' (%d)\n", + pos, subsystem, class, name, fd); } - - return parsed; } From owner-p4-projects@FreeBSD.ORG Sat Jan 30 17:36:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48437106568F; Sat, 30 Jan 2010 17:36:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C851106568B for ; Sat, 30 Jan 2010 17:36:37 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED5768FC36 for ; Sat, 30 Jan 2010 17:36:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UHaa5Z090389 for ; Sat, 30 Jan 2010 17:36:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UHaahG090387 for perforce@freebsd.org; Sat, 30 Jan 2010 17:36:36 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 30 Jan 2010 17:36:36 GMT Message-Id: <201001301736.o0UHaahG090387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 17:36:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=173962 Change 173962 by pgj@Binturong on 2010/01/30 17:36:34 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#42 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#14 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#19 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/flyer/flyer.tex#5 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/avilla.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/brucec.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#37 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#35 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/uqs.key#1 branch .. //depot/projects/docproj_hu/www/en/developers.sgml#38 integrate .. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#15 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2009-10-2009-12.xml#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#25 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#81 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#42 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.493 2009/12/22 15:43:15 ryusuke Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.496 2010/01/28 14:55:44 uqs Exp $ --> aaron@FreeBSD.org"> @@ -96,6 +96,8 @@ avg@FreeBSD.org"> +avilla@FreeBSD.org"> + avl@FreeBSD.org"> awebster@pubnix.net"> @@ -936,6 +938,8 @@ roger@FreeBSD.org"> +romain@FreeBSD.org"> + rpaulo@FreeBSD.org"> rpratt@FreeBSD.org"> @@ -1140,6 +1144,8 @@ ups@FreeBSD.org"> +uqs@FreeBSD.org"> + vanhu@FreeBSD.org"> vanilla@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/book.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -159,6 +159,11 @@ &pgpkey.jmb; + + &a.brucec; + &pgpkey.brucec; + + &a.brueffer; &pgpkey.brueffer; @@ -1271,6 +1276,11 @@ &pgpkey.ssouhlal; + + &a.uqs; + &pgpkey.uqs; + + &a.rink; &pgpkey.rink; @@ -1406,6 +1416,11 @@ &pgpkey.nectar; + + &a.avilla; + &pgpkey.avilla; + + &a.nivit; &pgpkey.nivit; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#35 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -23,6 +23,7 @@ + @@ -41,6 +42,7 @@ + @@ -305,6 +307,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#38 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.236 2009/12/22 15:48:47 ryusuke Exp $ +$FreeBSD: www/en/developers.sgml,v 1.240 2010/01/29 14:27:20 brucec Exp $ --> @@ -51,6 +51,7 @@ + @@ -77,6 +78,7 @@ + @@ -467,6 +469,7 @@ + @@ -568,6 +571,7 @@ + ==== //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#15 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -48,6 +48,13 @@ + brueffer + Switzerland + 512MB or 1GB PC2700 SO-DIMM RAM module + Keeping an elderly Thinkpad T41p (my main machine) usable. + + + cognet France A Zaurus, with hard disk preferably. @@ -305,6 +312,13 @@ + rpaulo + Portugal + Intel Mac, possibly Mac Mini for a small shipment fee + EFI support under FreeBSD and other Mac development work. + + + sam USA crypto devices (pci, pcmcia, cardbus cards, @@ -404,13 +418,6 @@ Qty 2, PC133 SODIMM, 512MB. 256MB also welcome if nothing else. Bring a bit more life in an old notebook I use for testing. - - - rui - Portugal - Intel Mac, possibly Mac Mini for a small shipment fee - EFI support under FreeBSD and other Mac development work. - &footer; ==== //depot/projects/docproj_hu/www/en/news/status/report-2009-10-2009-12.xml#3 (text+ko) ==== @@ -2,7 +2,7 @@ - + October-December @@ -1827,12 +1827,12 @@
  • Enable vbox's shared MAC feature when using bridged mode on a Wifi interface, together with the virtualbox-ose-kmod change this should fix bridged mode for Wifi users.
    • + -
  • We would like to say thanks to all the people that helped us - by reporting bugs and submitting fixes. We also thank the - VirtualBox developers for their help with the ongoing effort - to port VirtualBox to &os;
    • - +

    We would like to say thanks to all the people that helped us + by reporting bugs and submitting fixes. We also thank the + VirtualBox developers for their help with the ongoing effort + to port VirtualBox to &os;

    ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#25 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.80 2010/01/20 17:16:06 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.81 2010/01/27 22:46:51 brueffer Exp $ @@ -205,6 +205,30 @@ charge.     + + Chemnitzer Linux-Tage 2010 + http://chemnitzer.linux-tage.de/2010/ + + 2010 + 3 + 13 + + + 2010 + 3 + 14 + + + Germany + Chemnitz + Technical University Chemnitz + + Chemnitzer Linux-Tage is a two day event on Linux and Free + Software in general. There will be workshops, talks and room for various + projects to present themselves. FreeBSD will be present with a booth. + + + AsiaBSDCon 2010 http://2010.asiabsdcon.org/ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#81 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.284 2010/01/17 17:34:02 danger Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.289 2010/01/29 14:37:34 brucec Exp $ @@ -36,6 +36,38 @@ 1 + 29 + + +

    New committer: Bruce + Cran (src)

    +     +     + + + 28 + + +

    New committer: Ulrich + Spörlein (src)

    +     +     + + + 26 + + +

    New committer: Romain + Tartière (ports)

    +     + + +

    New committer: Alberto + Villa (ports)

    +     +     + + 17 From owner-p4-projects@FreeBSD.ORG Sat Jan 30 19:10:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEF921065692; Sat, 30 Jan 2010 19:10:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82BEA106568D for ; Sat, 30 Jan 2010 19:10:10 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 71C6D8FC17 for ; Sat, 30 Jan 2010 19:10:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UJAAwW099089 for ; Sat, 30 Jan 2010 19:10:10 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UJAAQg099087 for perforce@freebsd.org; Sat, 30 Jan 2010 19:10:10 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 30 Jan 2010 19:10:10 GMT Message-Id: <201001301910.o0UJAAQg099087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 19:10:11 -0000 http://p4web.freebsd.org/chv.cgi?CH=173963 Change 173963 by pgj@Binturong on 2010/01/30 19:09:59 MFen (www): 1.80 -> 1.81 hu/share/sgml/events.xml 1.284 -> 1.289 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#27 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#77 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#27 (text+ko) ==== @@ -11,7 +11,7 @@ @@ -247,6 +247,34 @@ &os;-t. A belépés ingyenes. + + Chemnitzer Linux-Tage 2010 + http://chemnitzer.linux-tage.de/ + + 2010 + 3 + 13 + + + 2010 + 3 + 14 + + + Németország + Chemnitz + Chemnitzi Mûszaki Egyetem + + A chemnitzi linux napok egy általánosan + linux-szal és szabad szoftverekkel foglalkozó, + kétnapos esemény. Lesznek ott mindenféle + mûhelyek, elõadások és + különbözõ egyéb + lehetõségek, ahol az egyes projektek bemutatkozhatnak. + A &os; is képviselteti magát ezen a + rendezvényen. + + AsiaBSDCon 2010 http://2010.asiabsdcon.org/ ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#77 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,33 @@ 1 + 29 + + +

    Új tag: Bruce + Cran (src)

    +     +     + + + 28 + + +

    Új tag: Ulrich + Spörlein (src)

    +     +     + + + 26 + + +

    Új tag: Alberto + Villa (ports)

    +     +     + + 17 From owner-p4-projects@FreeBSD.ORG Sat Jan 30 19:37:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2D21106568B; Sat, 30 Jan 2010 19:37:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8734B1065670 for ; Sat, 30 Jan 2010 19:37:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76A1A8FC25 for ; Sat, 30 Jan 2010 19:37:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UJbcPe001384 for ; Sat, 30 Jan 2010 19:37:38 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UJbcbB001382 for perforce@freebsd.org; Sat, 30 Jan 2010 19:37:38 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 30 Jan 2010 19:37:38 GMT Message-Id: <201001301937.o0UJbcbB001382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 19:37:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=173966 Change 173966 by pgj@Binturong on 2010/01/30 19:36:44 - Add missing entry for Romain Tartiere Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#78 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#78 (text+ko) ==== @@ -43,6 +43,11 @@ 26 +

    Új tag: Romain + Tartière (ports)

    +     + +

    Új tag: Alberto Villa (ports)

     From owner-p4-projects@FreeBSD.ORG Sat Jan 30 21:34:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 478DC1065679; Sat, 30 Jan 2010 21:34:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C1311065672 for ; Sat, 30 Jan 2010 21:34:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED9828FC12 for ; Sat, 30 Jan 2010 21:34:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ULYZuP022558 for ; Sat, 30 Jan 2010 21:34:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ULYZXU022556 for perforce@freebsd.org; Sat, 30 Jan 2010 21:34:35 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 21:34:35 GMT Message-Id: <201001302134.o0ULYZXU022556@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 Precedence: bulk Cc: Subject: PERFORCE change 173971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 21:34:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=173971 Change 173971 by rwatson@rwatson_vimage_client on 2010/01/30 21:34:01 For sample CAPABILITIES configuration files, set the kernel ident, and synchronize between amd64/i386 options. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/CAPABILITIES#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/CAPABILITIES#3 (text+ko) ==== @@ -1,4 +1,5 @@ include GENERIC +ident CAPABILITIES options CAPABILITIES options PROCDESC @@ -6,4 +7,3 @@ options WITNESS options KDB options DDB - ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#4 (text+ko) ==== @@ -1,4 +1,9 @@ include GENERIC +ident CAPABILITIES + options CAPABILITIES options PROCDESC options KDTRACE_HOOKS +options WITNESS +options KDB +options DDB From owner-p4-projects@FreeBSD.ORG Sat Jan 30 22:18:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46BC81065672; Sat, 30 Jan 2010 22:18:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A58F106566C for ; Sat, 30 Jan 2010 22:18:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA8E58FC24 for ; Sat, 30 Jan 2010 22:18:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UMILK5027279 for ; Sat, 30 Jan 2010 22:18:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UMIL1J027277 for perforce@freebsd.org; Sat, 30 Jan 2010 22:18:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 22:18:21 GMT Message-Id: <201001302218.o0UMIL1J027277@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 Precedence: bulk Cc: Subject: PERFORCE change 173988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 22:18:22 -0000 http://p4web.freebsd.org/chv.cgi?CH=173988 Change 173988 by rwatson@rwatson_fledge on 2010/01/30 22:18:21 Update developer list, copyright dates. Affected files ... .. //depot/projects/trustedbsd/www/developers.page#3 edit .. //depot/projects/trustedbsd/www/page.xsl#12 edit Differences ... ==== //depot/projects/trustedbsd/www/developers.page#3 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/developers.page#2 $ + $P4: //depot/projects/trustedbsd/www/developers.page#3 $ @@ -80,6 +80,11 @@ Stacey Son + Edward Tomasz Napierala + Zhouyi ZHOU + + + Jonathan Anderson ==== //depot/projects/trustedbsd/www/page.xsl#12 (text+ko) ==== @@ -103,9 +103,9 @@

      - Copyright 2000-2008 Robert Watson. All rights reserved.
      + Copyright 2000-2010 Robert N. M. Watson. All rights reserved.
      Copyright 2005 SPARTA, Inc. All rights reserved.
      - Copyright 2002, Leigh Denault. All rights reserved.
      + Copyright 2002, Leigh T. Denault. All rights reserved.
      Copyright 2002, 2003 Networks Associates, Inc. All rights reserved.
      From owner-p4-projects@FreeBSD.ORG Sat Jan 30 23:14:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7325C1065672; Sat, 30 Jan 2010 23:14:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 364CF106566C for ; Sat, 30 Jan 2010 23:14:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 225EC8FC16 for ; Sat, 30 Jan 2010 23:14:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UNEI3o032495 for ; Sat, 30 Jan 2010 23:14:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UNEISw032493 for perforce@freebsd.org; Sat, 30 Jan 2010 23:14:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 23:14:18 GMT Message-Id: <201001302314.o0UNEISw032493@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 Precedence: bulk Cc: Subject: PERFORCE change 173990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 23:14:18 -0000 http://p4web.freebsd.org/chv.cgi?CH=173990 Change 173990 by rwatson@rwatson_vimage_client on 2010/01/30 23:14:12 Report capability-mode C runtime to i386, which was apparently lost during integration of a rearrangement of this code. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/Makefile#3 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_c.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_s.S#2 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/Makefile#3 (text+ko) ==== @@ -20,13 +20,13 @@ crt1.o: crt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o - objcopy --localize-symbol _start1 crt1.o + objcopy --localize-symbol _start1 -localize-symbol _capstart1 crt1.o Scrt1_c.o: crt1_c.c ${CC} ${CFLAGS} -DGCRT -fPIC -DPIC -c -o Scrt1_c.o ${.CURDIR}/crt1_c.c Scrt1.o: Scrt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o - objcopy --localize-symbol _start1 Scrt1.o + objcopy --localize-symbol _start1 -localize-symbol _capstart1 Scrt1.o .include ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_c.c#2 (text+ko) ==== @@ -46,6 +46,7 @@ extern void _init(void); extern int main(int, char **, char **); extern void _start(char *, ...); +extern void _capstart(char *, ...); #ifdef GCRT extern void _mcleanup(void); @@ -58,6 +59,7 @@ const char *__progname = ""; void _start1(fptr, int, char *[]) __dead2; +void _capstart1(fptr, int, char *[]) __dead2; /* The entry function, C part. */ void @@ -93,3 +95,38 @@ } __asm(".hidden _start1"); + +/* The Capsicum entry function. */ +void +_capstart1(fptr cleanup, int argc, char *argv[]) +{ + char **env; + const char *s; + + env = argv + argc + 1; + environ = env; + if (argc > 0 && argv[0] != NULL) { + __progname = argv[0]; + for (s = __progname; *s != '\0'; s++) + if (*s == '/') + __progname = s + 1; + } + + if (&_DYNAMIC != NULL) + atexit(cleanup); + else + _init_tls(); + +#ifdef GCRT + atexit(_mcleanup); +#endif + atexit(_fini); +#ifdef GCRT + monstartup(&eprol, &etext); +__asm__("eprol:"); +#endif + _init(); + exit( cap_main(argc, argv, env) ); +} + +__asm(".hidden _capstart1"); ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_s.S#2 (text+ko) ==== @@ -41,4 +41,17 @@ call _start1 .size _start, . - _start + .globl _capstart + .type _capstart, @function +_capstart: xorl %ebp,%ebp + pushl %ebp + movl %esp,%ebp + andl $0xfffffff0,%esp # align stack + leal 8(%ebp),%eax + pushl %eax # argv + pushl 4(%ebp) # argc + pushl %edx # rtld cleanup + call _capstart1 + .size _capstart, . - _capstart + .ident "$FreeBSD: src/lib/csu/i386-elf/crt1_s.S,v 1.1 2009/12/02 16:34:20 kib Exp $" From owner-p4-projects@FreeBSD.ORG Sat Jan 30 23:25:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1B771065672; Sat, 30 Jan 2010 23:25:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6370106566B for ; Sat, 30 Jan 2010 23:25:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 92ABC8FC1C for ; Sat, 30 Jan 2010 23:25:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UNPTZP033366 for ; Sat, 30 Jan 2010 23:25:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UNPT7B033364 for perforce@freebsd.org; Sat, 30 Jan 2010 23:25:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 23:25:29 GMT Message-Id: <201001302325.o0UNPT7B033364@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 Precedence: bulk Cc: Subject: PERFORCE change 173992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 23:25:30 -0000 http://p4web.freebsd.org/chv.cgi?CH=173992 Change 173992 by rwatson@rwatson_vimage_client on 2010/01/30 23:24:46 Comment out profiling-related code in capstart on i386 until we work out how to deal with this. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_c.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1_c.c#3 (text+ko) ==== @@ -122,8 +122,8 @@ #endif atexit(_fini); #ifdef GCRT - monstartup(&eprol, &etext); -__asm__("eprol:"); +/* XXXCAP: monstartup(&eprol, &etext); */ +/* XXXCAP: __asm__("eprol:"); */ #endif _init(); exit( cap_main(argc, argv, env) ); From owner-p4-projects@FreeBSD.ORG Sat Jan 30 23:28:33 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B1F71065672; Sat, 30 Jan 2010 23:28:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3CAE1065670 for ; Sat, 30 Jan 2010 23:28:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C05478FC12 for ; Sat, 30 Jan 2010 23:28:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UNSWTE033556 for ; Sat, 30 Jan 2010 23:28:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0UNSWHD033554 for perforce@freebsd.org; Sat, 30 Jan 2010 23:28:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 30 Jan 2010 23:28:32 GMT Message-Id: <201001302328.o0UNSWHD033554@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 Precedence: bulk Cc: Subject: PERFORCE change 173993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 23:28:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=173993 Change 173993 by rwatson@rwatson_vimage_client on 2010/01/30 23:27:47 Correct use of --localizesymbol when constructing capability mode bits of csu on i386. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/Makefile#4 (text+ko) ==== @@ -20,13 +20,13 @@ crt1.o: crt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o - objcopy --localize-symbol _start1 -localize-symbol _capstart1 crt1.o + objcopy --localize-symbol _start1 --localize-symbol _capstart1 crt1.o Scrt1_c.o: crt1_c.c ${CC} ${CFLAGS} -DGCRT -fPIC -DPIC -c -o Scrt1_c.o ${.CURDIR}/crt1_c.c Scrt1.o: Scrt1_c.o crt1_s.o ${LD} ${LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o - objcopy --localize-symbol _start1 -localize-symbol _capstart1 Scrt1.o + objcopy --localize-symbol _start1 --localize-symbol _capstart1 Scrt1.o .include