From owner-p4-projects@FreeBSD.ORG Sun Nov 4 00:11:35 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80E5C16A47B; Sun, 4 Nov 2007 00:11: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 190C616A418 for ; Sun, 4 Nov 2007 00:11:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 09D4413C4BE for ; Sun, 4 Nov 2007 00:11:35 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA40BY7N005253 for ; Sun, 4 Nov 2007 00:11:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA40BYB9005250 for perforce@freebsd.org; Sun, 4 Nov 2007 00:11:34 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Nov 2007 00:11:34 GMT Message-Id: <200711040011.lA40BYB9005250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 00:11:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=128597 Change 128597 by kmacy@kmacy:storage:toestack on 2007/11/04 00:11:32 add prototypes for functions returning credits to HW Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 (text+ko) ==== @@ -14,6 +14,9 @@ void t3_init_offload_ops(void); void t3_init_wr_tab(unsigned int wr_len); int t3_push_frames(struct socket *so, int req_completion); +uint32_t t3_send_rx_credits(struct tcpcb *tp, uint32_t credits, uint32_t dack, int nofail); +void t3_cleanup_rbuf(struct tcpcb *tp); + void toepcb_hold(struct toepcb *); void toepcb_release(struct toepcb *); From owner-p4-projects@FreeBSD.ORG Sun Nov 4 00:12:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D37616A419; Sun, 4 Nov 2007 00:12: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 5F1EA16A417 for ; Sun, 4 Nov 2007 00:12:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4FF5B13C491 for ; Sun, 4 Nov 2007 00:12:36 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA40Caof005303 for ; Sun, 4 Nov 2007 00:12:36 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA40Cant005295 for perforce@freebsd.org; Sun, 4 Nov 2007 00:12:36 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Nov 2007 00:12:36 GMT Message-Id: <200711040012.lA40Cant005295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 00:12:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=128598 Change 128598 by kmacy@kmacy:storage:toestack on 2007/11/04 00:12:27 add new flags for shutdown, some extra accounting sequence numbers and purging of WR queue Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#4 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#4 (text+ko) ==== @@ -78,8 +78,10 @@ #define T3C_DEV(sk) ((TOM_DATA(TOE_DEV(sk)))->cdev) #define TOM_TUNABLE(dev, param) (TOM_DATA(dev)->conf.param) -#define TP_DATASENT (1 << 0) -#define TP_TX_WAIT_IDLE (1 << 1) +#define TP_DATASENT (1 << 0) +#define TP_TX_WAIT_IDLE (1 << 1) +#define TP_FIN_SENT (1 << 2) +#define TP_ABORT_RPL_PENDING (1 << 3) struct toepcb { struct toedev *tp_toedev; @@ -95,8 +97,11 @@ int tp_mss_clamp; int tp_qset; int tp_flags; + tcp_seq tp_delack_seq; + tcp_seq tp_rcv_wup; + tcp_seq tp_copied_seq; + uint64_t tp_write_seq; - volatile int tp_refcount; struct tcpcb *tp_tp; @@ -113,6 +118,15 @@ mbufq_init(&toep->wr_list); } +static inline void purge_wr_queue(struct tcpcb *tp) +{ + struct toepcb *toep = tp->t_toe; + struct mbuf *m; + + while ((m = mbufq_dequeue(&toep->wr_list)) != NULL) + m_freem(m); +} + static inline void enqueue_wr(struct tcpcb *tp, struct mbuf *m) { struct toepcb *toep = tp->t_toe; From owner-p4-projects@FreeBSD.ORG Sun Nov 4 00:13:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACA4216A46C; Sun, 4 Nov 2007 00:13: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 3057216A417 for ; Sun, 4 Nov 2007 00:13:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 08A6C13C4B9 for ; Sun, 4 Nov 2007 00:13:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA40DbAZ005338 for ; Sun, 4 Nov 2007 00:13:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA40Dboj005335 for perforce@freebsd.org; Sun, 4 Nov 2007 00:13:37 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Nov 2007 00:13:37 GMT Message-Id: <200711040013.lA40Dboj005335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128599 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 00:13:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=128599 Change 128599 by kmacy@kmacy:storage:toestack on 2007/11/04 00:13:02 remove no longer needed kdb_backtrace Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#12 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#12 (text+ko) ==== @@ -1572,8 +1572,6 @@ m_freem(m); return 0; } - - kdb_backtrace(); wrp->wr_hi |= htonl(F_WR_SOP | F_WR_EOP); wrp->wr_lo = htonl(V_WR_TID(q->token)); From owner-p4-projects@FreeBSD.ORG Sun Nov 4 00:14:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C691116A421; Sun, 4 Nov 2007 00:14: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 8C61516A419 for ; Sun, 4 Nov 2007 00:14:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6524213C4B0 for ; Sun, 4 Nov 2007 00:14:39 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA40EdWf005388 for ; Sun, 4 Nov 2007 00:14:39 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA40Ednn005385 for perforce@freebsd.org; Sun, 4 Nov 2007 00:14:39 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Nov 2007 00:14:39 GMT Message-Id: <200711040014.lA40Ednn005385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 00:14:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=128600 Change 128600 by kmacy@kmacy:storage:toestack on 2007/11/04 00:13:55 free toepcb when the refcount goes to zero Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 (text+ko) ==== @@ -130,6 +130,14 @@ void toepcb_release(struct toepcb *toep) { + if (toep->tp_refcount == 1) { + /* + * XXX clear our reference on the inpcb + */ + free(toep, M_DEVBUF); + return; + } + atomic_add_acq_int(&toep->tp_refcount, -1); } From owner-p4-projects@FreeBSD.ORG Sun Nov 4 00:17:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89B5716A41B; Sun, 4 Nov 2007 00:17: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 2176B16A419 for ; Sun, 4 Nov 2007 00:17:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1186813C49D for ; Sun, 4 Nov 2007 00:17:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA40HgPq005499 for ; Sun, 4 Nov 2007 00:17:42 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA40HgRp005496 for perforce@freebsd.org; Sun, 4 Nov 2007 00:17:42 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 4 Nov 2007 00:17:42 GMT Message-Id: <200711040017.lA40HgRp005496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 00:17:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=128601 Change 128601 by kmacy@kmacy:storage:toestack on 2007/11/04 00:16:43 - add support for rx - add support for returning rx credits (update receive window) - but credit calculation needs to be fixed (clearly marked) - add partial support for connection close (some shutdown states are not handled yet) Affected files ... .. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 edit Differences ... ==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#12 (text+ko) ==== @@ -172,9 +172,6 @@ req->param |= htonl(V_TX_SNDBUF(so->so_snd.sb_hiwat >> 15)); toep->tp_flags |= TP_DATASENT; } - - - } int @@ -200,7 +197,7 @@ cdev = d->cdev; last = tail = so->so_snd.sb_sndptr ? so->so_snd.sb_sndptr : so->so_snd.sb_mb; total_bytes = 0; - if (toep->tp_m_last == last) { + if (last && toep->tp_m_last == last) { KASSERT(tail, ("sbdrop error")); last = tail = tail->m_next; } @@ -233,6 +230,7 @@ so->so_snd.sb_sndptroff += bytes; total_bytes += bytes; + toep->tp_write_seq += bytes; /* @@ -266,14 +264,170 @@ l2t_send(cdev, m0, toep->tp_l2t); } + + + return (total_bytes); +} + + + +/* + * Close a connection by sending a CPL_CLOSE_CON_REQ message. Cannot fail + * under any circumstances. We take the easy way out and always queue the + * message to the write_queue. We can optimize the case where the queue is + * already empty though the optimization is probably not worth it. + */ +static void +close_conn(struct socket *so) +{ + struct mbuf *m; + struct cpl_close_con_req *req; + struct tom_data *d; + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + unsigned int tid = toep->tp_tid; + + d = TOM_DATA(TOE_DEV(so)); + + if (tp->t_state != TCPS_SYN_SENT) + t3_push_frames(so, 1); + + if (toep->tp_flags & TP_FIN_SENT) + return; + + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m == NULL) { + /* + * XXX + */ + printf("need to defer connection close to taskq thread!!!\n"); + return; + } + toep->tp_flags |= TP_FIN_SENT; + req = mtod(m, struct cpl_close_con_req *); + m->m_pkthdr.len = m->m_len = sizeof(*req); + + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_CLOSE_CON)); + req->wr.wr_lo = htonl(V_WR_TID(tid)); + OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_CON_REQ, tid)); + req->rsvd = htonl(toep->tp_write_seq); + + /* + * XXX - need to defer shutdown while there is still data in the queue + * + */ + cxgb_ofld_send(d->cdev, m); + +} + + +/* + * Send RX credits through an RX_DATA_ACK CPL message. If nofail is 0 we are + * permitted to return without sending the message in case we cannot allocate + * an sk_buff. Returns the number of credits sent. + */ +uint32_t +t3_send_rx_credits(struct tcpcb *tp, uint32_t credits, uint32_t dack, int nofail) +{ + struct mbuf *m; + struct cpl_rx_data_ack *req; + struct toepcb *toep = tp->t_toe; + struct toedev *tdev = toep->tp_toedev; + + m = m_gethdr(M_NOWAIT, MT_DATA); + + if (m == NULL) { + /* + * XXX need to cache mbufs for nofail allocation + */ + if (nofail) + log(LOG_ERR, "failing nofail t3_send_rx_credits!!!\n"); + return (0); + } + + printf("returning %u credits to HW\n", credits); + + req = mtod(m, struct cpl_rx_data_ack *); + m->m_pkthdr.len = m->m_len = sizeof(*req); + req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD)); + OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_RX_DATA_ACK, toep->tp_tid)); + req->credit_dack = htonl(dack | V_RX_CREDITS(credits)); + m_set_priority(m, mkprio(CPL_PRIORITY_ACK, toeptoso(toep))); + cxgb_ofld_send(TOM_DATA(tdev)->cdev, m); + return (credits); +} + + +/* + * Set of states for which we should return RX credits. + */ +#define CREDIT_RETURN_STATE (TCPF_ESTABLISHED | TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2) + +/* + * Called after some received data has been read. It returns RX credits + * to the HW for the amount of data processed. + */ +void +t3_cleanup_rbuf(struct tcpcb *tp) +{ + struct toepcb *toep = tp->t_toe; + struct toedev *dev; + int dack_mode, must_send; + u32 thres, credits, dack = 0; + + if (!((tp->t_state == TCPS_ESTABLISHED) || (tp->t_state == TCPS_FIN_WAIT_1) || + (tp->t_state == TCPS_FIN_WAIT_2))) + return; + + printf("inaccurately calculating return credits - PLZ FIX\n"); + /* + * XXX this won't accurately reflect credit return - we need + * to look at the difference between the amount that has been + * put in the recv sockbuf and what is there now + */ + credits = toep->tp_copied_seq - toep->tp_rcv_wup; + if (__predict_false(!credits)) + return; + + dev = toep->tp_toedev; + thres = TOM_TUNABLE(dev, rx_credit_thres); + + if (__predict_false(thres == 0)) + return; + + if (toep->tp_ulp_mode) + dack = F_RX_DACK_CHANGE | V_RX_DACK_MODE(1); + else { + dack_mode = TOM_TUNABLE(dev, delack); + if (__predict_false(dack_mode != toep->tp_delack_mode)) { + u32 r = tp->rcv_nxt - toep->tp_delack_seq; + + if (r >= tp->rcv_wnd || r >= 16 * toep->tp_mss_clamp) + dack = F_RX_DACK_CHANGE | + V_RX_DACK_MODE(dack_mode); + } + } + + /* + * For coalescing to work effectively ensure the receive window has + * at least 16KB left. + */ + must_send = credits + 16384 >= tp->rcv_wnd; - return (total_bytes); + if (must_send || credits >= thres) + toep->tp_rcv_wup += t3_send_rx_credits(tp, credits, dack, must_send); } static int cxgb_toe_disconnect(struct tcpcb *tp) { - printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + struct socket *so; + + printf("cxgb_toe_disconnect\n"); + + so = tp->t_inpcb->inp_socket; + close_conn(so); + return (0); } @@ -313,7 +467,8 @@ static int cxgb_toe_rcvd(struct tcpcb *tp) { - printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__); + t3_cleanup_rbuf(tp); + return (0); } @@ -385,7 +540,82 @@ return (idx); } +void +t3_release_ddp_resources(struct socket *so) +{ + /* + * This is a no-op until we have DDP support + */ +} + +static inline void +free_atid(struct t3cdev *cdev, unsigned int tid) +{ + struct socket *so = cxgb_free_atid(cdev, tid); + if (so) { + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + + toepcb_release(toep); + } +} + +/* + * Release resources held by an offload connection (TID, L2T entry, etc.) + */ static void +t3_release_offload_resources(struct socket *so) +{ + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + struct toedev *tdev = TOE_DEV(so); + struct t3cdev *cdev; + unsigned int tid = toep->tp_tid; + + if (!tdev) + return; + + cdev = T3C_DEV(so); + if (!cdev) + return; + + toep->tp_qset = 0; + t3_release_ddp_resources(so); + +#ifdef CTRL_SKB_CACHE + kfree_skb(CTRL_SKB_CACHE(tp)); + CTRL_SKB_CACHE(tp) = NULL; +#endif + + if (toep->tp_wr_avail != toep->tp_wr_max) { + purge_wr_queue(tp); + reset_wr_list(tp); + } + + if (toep->tp_l2t) { + l2t_release(L2DATA(cdev), toep->tp_l2t); + toep->tp_l2t = NULL; + } + + if (tp->t_state == TCPS_SYN_SENT) { + free_atid(cdev, tid); +#ifdef notyet + __skb_queue_purge(&tp->out_of_order_queue); +#endif + } else { // we have TID + cxgb_remove_tid(cdev, (void *)so, tid); + toepcb_release(toep); + } +#ifdef notyet + t3_set_ca_ops(sk, &tcp_init_congestion_ops); +#endif + TOE_DEV(so) = NULL; +#if 0 + log(LOG_INFO, "closing TID %u, state %u\n", tid, tp->t_state); +#endif +} + +static void install_offload_ops(struct socket *so) { struct tcpcb *tp = sototcpcb(so); @@ -580,15 +810,14 @@ static void fail_act_open(struct socket *so, int errno) { + struct tcpcb *tp = sototcpcb(so); + + t3_release_offload_resources(so); + tcp_drop(tp, errno); + #ifdef notyet - sk->sk_err = errno; - sk->sk_error_report(sk); - t3_release_offload_resources(sk); - connection_done(sk); TCP_INC_STATS_BH(TCP_MIB_ATTEMPTFAILS); #endif - printf("%s:%s:%d implement me", __FUNCTION__, __FILE__, __LINE__); - } /* @@ -719,13 +948,287 @@ return (0); free_tid: - cxgb_free_atid(d->cdev, atid); + free_atid(d->cdev, atid); out_err: return (ENOMEM); } +/* + * Process new data received for a connection. + */ +static void +new_rx_data(struct socket *so, struct mbuf *m) +{ + struct cpl_rx_data *hdr = cplhdr(m); + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + int len = be16toh(hdr->len); + +#ifdef notyet + if (__predict_false(sk_no_receive(sk))) { + handle_excess_rx(sk, skb); + return; + } + if (ULP_MODE(tp) == ULP_MODE_TCPDDP) + handle_ddp_data(sk, skb); + + TCP_SKB_CB(skb)->seq = ntohl(hdr->seq); + TCP_SKB_CB(skb)->flags = 0; + skb_ulp_mode(skb) = 0; /* for iSCSI */ +#endif +#if VALIDATE_SEQ + if (__predict_false(TCP_SKB_CB(skb)->seq != tp->rcv_nxt)) { + printk(KERN_ERR + "%s: TID %u: Bad sequence number %u, expected %u\n", + TOE_DEV(sk)->name, TID(tp), TCP_SKB_CB(skb)->seq, + tp->rcv_nxt); + __kfree_skb(skb); + return; + } +#endif + m_adj(m, sizeof(*hdr)); + +#ifdef notyet + /* + * We don't handle urgent data yet + */ + if (__predict_false(hdr->urg)) + handle_urg_ptr(sk, tp->rcv_nxt + ntohs(hdr->urg)); + if (__predict_false(tp->urg_data == TCP_URG_NOTYET && + tp->urg_seq - tp->rcv_nxt < skb->len)) + tp->urg_data = TCP_URG_VALID | skb->data[tp->urg_seq - + tp->rcv_nxt]; +#endif + if (__predict_false(hdr->dack_mode != toep->tp_delack_mode)) { + toep->tp_delack_mode = hdr->dack_mode; + toep->tp_delack_seq = tp->rcv_nxt; + } + + printf("appending mbuf=%p pktlen=%d m_len=%d len=%d\n", m, m->m_pkthdr.len, m->m_len, len); + + if (len < m->m_pkthdr.len) + m->m_pkthdr.len = m->m_len = len; + + tp->rcv_nxt += m->m_pkthdr.len; + tp->t_rcvtime = ticks; + +#ifdef T3_TRACE + T3_TRACE2(TIDTB(sk), + "new_rx_data: seq 0x%x len %u", + TCP_SKB_CB(skb)->seq, skb->len); +#endif + + sbappend(&so->so_rcv, m); + if (__predict_true((so->so_state & SS_NOFDREF) == 0)) + sorwakeup(so); +} + /* + * Handler for RX_DATA CPL messages. + */ +static int +do_rx_data(struct t3cdev *cdev, struct mbuf *m, void *ctx) +{ + struct socket *so = (struct socket *)ctx; + + VALIDATE_SOCK(so); + + new_rx_data(so, m); + + return (0); +} + +/* + * Move a socket to TIME_WAIT state. We need to make some adjustments to the + * socket state before calling tcp_time_wait to comply with its expectations. + */ +static void +enter_timewait(struct socket *so) +{ + struct tcpcb *tp = sototcpcb(so); + + /* + * Bump rcv_nxt for the peer FIN. We don't do this at the time we + * process peer_close because we don't want to carry the peer FIN in + * the socket's receive queue and if we increment rcv_nxt without + * having the FIN in the receive queue we'll confuse facilities such + * as SIOCINQ. + */ + tp->rcv_nxt++; + + tp->ts_recent_age = 0; /* defeat recycling */ + tp->t_srtt = 0; /* defeat tcp_update_metrics */ + tcp_twstart(tp); +} + + +/* + * Handle a peer FIN. + */ +static void +do_peer_fin(struct socket *so, struct mbuf *m) +{ + struct tcpcb *tp = sototcpcb(so); + struct toepcb *toep = tp->t_toe; + int keep = 0, dead = (so->so_state & SS_NOFDREF); + +#ifdef T3_TRACE + T3_TRACE0(TIDTB(sk),"do_peer_fin:"); +#endif +#ifdef notyet + if (!is_t3a(TOE_DEV(sk)) && sock_flag(sk, ABORT_RPL_PENDING)) + goto out; + + if (ULP_MODE(tp) == ULP_MODE_TCPDDP) { + keep = handle_peer_close_data(sk, skb); + if (keep < 0) + return; + } + sk->sk_shutdown |= RCV_SHUTDOWN; + sock_set_flag(sk, SOCK_DONE); +#endif + switch (tp->t_state) { + case TCPS_SYN_RECEIVED: + case TCPS_ESTABLISHED: + tp->t_state = TCPS_CLOSE_WAIT; + break; + case TCPS_FIN_WAIT_1: + tp->t_state = TCPS_CLOSING; + break; + case TCPS_FIN_WAIT_2: + /* + * If we've sent an abort_req we must have sent it too late, + * HW will send us a reply telling us so, and this peer_close + * is really the last message for this connection and needs to + * be treated as an abort_rpl, i.e., transition the connection + * to TCP_CLOSE (note that the host stack does this at the + * time of generating the RST but we must wait for HW). + * Otherwise we enter TIME_WAIT. + */ + t3_release_offload_resources(so); + if (toep->tp_flags & TP_ABORT_RPL_PENDING) + tcp_close(tp); + else + enter_timewait(so); + break; + default: + log(LOG_ERR, + "%s: TID %u received PEER_CLOSE in bad state %d\n", + TOE_DEV(so)->name, toep->tp_tid, tp->t_state); + } + + if (!dead) { +#ifdef notyet + sk->sk_state_change(sk); + + /* Do not send POLL_HUP for half duplex close. */ + if ((sk->sk_shutdown & SEND_SHUTDOWN) || + sk->sk_state == TCP_CLOSE) + sk_wake_async(sk, 1, POLL_HUP); + else + sk_wake_async(sk, 1, POLL_IN); +#endif + } +#ifdef notyet +out: +#endif + if (!keep) + m_free(m); +} + +/* + * Handler for PEER_CLOSE CPL messages. + */ +static int +do_peer_close(struct t3cdev *cdev, struct mbuf *m, void *ctx) +{ + struct socket *so = (struct socket *)ctx; + + VALIDATE_SOCK(so); + + do_peer_fin(so, m); + return (0); +} + +static void +process_close_con_rpl(struct socket *so, struct mbuf *m) +{ + struct tcpcb *tp = sototcpcb(so); + struct cpl_close_con_rpl *rpl = cplhdr(m); + struct toepcb *toep = tp->t_toe; + + tp->snd_una = ntohl(rpl->snd_nxt) - 1; /* exclude FIN */ + +#if 0 + if (!is_t3a(TOE_DEV(so)) && (toep->tp_flags & TP_ABORT_RPL_PENDING)) + goto out; +#endif + + switch (tp->t_state) { + case TCPS_CLOSING: /* see FIN_WAIT2 case in do_peer_fin */ + t3_release_offload_resources(so); + if (toep->tp_flags & TP_ABORT_RPL_PENDING) + tcp_close(tp); + else + enter_timewait(so); + break; + case TCPS_LAST_ACK: + /* + * In this state we don't care about pending abort_rpl. + * If we've sent abort_req it was post-close and was sent too + * late, this close_con_rpl is the actual last message. + */ + t3_release_offload_resources(so); + tcp_close(tp); + break; + case TCPS_FIN_WAIT_1: +#ifdef notyet + dst_confirm(sk->sk_dst_cache); +#endif + if ((so->so_state & SS_NOFDREF) == 0) { + /* + * Wake up lingering close + */ + sowwakeup(so); + sorwakeup(so); + + } else + printf("FIN_WAIT1 shutdown handling incomplete\n"); + +#if 0 + else if (tcp_sk(sk)->linger2 < 0 && + !sock_flag(sk, ABORT_SHUTDOWN)) + abort_conn(sk, skb, LINUX_MIB_TCPABORTONLINGER); +#endif + break; + default: + log(LOG_ERR, + "%s: TID %u received CLOSE_CON_RPL in bad state %d\n", + TOE_DEV(so)->name, toep->tp_tid, + tp->t_state); + } +#if 0 +out: +#endif + m_free(m); +} + +/* + * Handler for CLOSE_CON_RPL CPL messages. + */ +static int do_close_con_rpl(struct t3cdev *cdev, struct mbuf *m, + void *ctx) +{ + struct socket *so = (struct socket *)ctx; + + VALIDATE_SOCK(so); + + process_close_con_rpl(so, m); + return (0); +} + +/* * Called when a connection is established to translate the TCP options * reported by HW to Linux's native format. */ @@ -750,17 +1253,19 @@ * * snd_isn here is the ISN after the SYN, i.e., the true ISN + 1. */ -static void make_established(struct socket *so, u32 snd_isn, unsigned int opt) +static void +make_established(struct socket *so, u32 snd_isn, unsigned int opt) { struct tcpcb *tp = sototcpcb(so); - - tp->iss = tp->snd_max = tp->snd_nxt = tp->snd_una = snd_isn; + struct toepcb *toep = tp->t_toe; + + toep->tp_write_seq = tp->iss = tp->snd_max = tp->snd_nxt = tp->snd_una = snd_isn; + assign_rxopt(so, opt); #if 0 inet_sk(sk)->id = tp->write_seq ^ jiffies; #endif - assign_rxopt(so, opt); + -#ifdef notyet /* * XXX not clear what rcv_wup maps to */ @@ -768,9 +1273,10 @@ * Causes the first RX_DATA_ACK to supply any Rx credits we couldn't * pass through opt0. */ - if (tp->rcv_wnd > (M_RCV_BUFSIZ << 102)) - tp->rcv_wup -= tp->rcv_wnd - (M_RCV_BUFSIZ << 10); + if (tp->rcv_wnd > (M_RCV_BUFSIZ << 10)) + toep->tp_rcv_wup -= tp->rcv_wnd - (M_RCV_BUFSIZ << 10); +#ifdef notyet /* * no clean interface for marking ARP up to date */ @@ -823,9 +1329,8 @@ tp->ts_recent_age = ticks; tp->irs = tp->rcv_wnd = tp->rcv_nxt = rcv_isn; -#if 0 - DELACK_SEQ(tp) = tp->copied_seq = tp->rcv_wup = tp->rcv_nxt = rcv_isn; -#endif + toep->tp_delack_seq = toep->tp_rcv_wup = toep->tp_copied_seq = tp->irs; + make_established(so, ntohl(req->snd_isn), ntohs(req->tcp_opt)); /* @@ -894,7 +1399,7 @@ */ toep->tp_tid = tid; so_insert_tid(d, so, tid); - cxgb_free_atid(cdev, atid); + free_atid(cdev, atid); toep->tp_qset = G_QNUM(ntohl(m->m_pkthdr.csum_data)); socket_act_establish(so, m); @@ -1037,7 +1542,7 @@ #ifdef notyet tcphdr_skb = alloc_skb(sizeof(struct tcphdr), GFP_KERNEL); if (!tcphdr_skb) { - printk(KERN_ERR + log(LOG_ERR, "Chelsio TCP offload: can't allocate sk_buff\n"); return -1; } @@ -1049,17 +1554,17 @@ t3tom_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish); t3tom_register_cpl_handler(CPL_ACT_OPEN_RPL, do_act_open_rpl); t3tom_register_cpl_handler(CPL_TX_DMA_ACK, do_wr_ack); + t3tom_register_cpl_handler(CPL_RX_DATA, do_rx_data); + t3tom_register_cpl_handler(CPL_CLOSE_CON_RPL, do_close_con_rpl); + t3tom_register_cpl_handler(CPL_PEER_CLOSE, do_peer_close); #ifdef notyet t3tom_register_cpl_handler(CPL_PASS_ESTABLISH, do_pass_establish); t3tom_register_cpl_handler(CPL_PASS_ACCEPT_REQ, do_pass_accept_req); t3tom_register_cpl_handler(CPL_RX_URG_NOTIFY, do_rx_urg_notify); - t3tom_register_cpl_handler(CPL_RX_DATA, do_rx_data); t3tom_register_cpl_handler(CPL_RX_DATA_DDP, do_rx_data_ddp); t3tom_register_cpl_handler(CPL_RX_DDP_COMPLETE, do_rx_ddp_complete); - t3tom_register_cpl_handler(CPL_PEER_CLOSE, do_peer_close); t3tom_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req); t3tom_register_cpl_handler(CPL_ABORT_RPL_RSS, do_abort_rpl); - t3tom_register_cpl_handler(CPL_CLOSE_CON_RPL, do_close_con_rpl); t3tom_register_cpl_handler(CPL_TRACE_PKT, do_trace_pkt); t3tom_register_cpl_handler(CPL_GET_TCB_RPL, do_get_tcb_rpl); #endif From owner-p4-projects@FreeBSD.ORG Sun Nov 4 02:56:31 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B3B016A420; Sun, 4 Nov 2007 02:56:31 +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 4B50F16A41A for ; Sun, 4 Nov 2007 02:56:31 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 241BE13C4B0 for ; Sun, 4 Nov 2007 02:56:31 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA42uVnV024861 for ; Sun, 4 Nov 2007 02:56:31 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA42uUiu024858 for perforce@freebsd.org; Sun, 4 Nov 2007 02:56:30 GMT (envelope-from andrew@freebsd.org) Date: Sun, 4 Nov 2007 02:56:30 GMT Message-Id: <200711040256.lA42uUiu024858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 128605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 02:56:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=128605 Change 128605 by andrew@andrew_hermies on 2007/11/04 02:55:54 Add the Neo1973 specific code and included configuration files Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.neo1973#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/std.neo1973#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Nov 4 03:32:11 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F9AF16A421; Sun, 4 Nov 2007 03:32: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 0458116A417 for ; Sun, 4 Nov 2007 03:32:11 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E997B13C4A8 for ; Sun, 4 Nov 2007 03:32:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA43WAm6027923 for ; Sun, 4 Nov 2007 03:32:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA43WAIf027920 for perforce@freebsd.org; Sun, 4 Nov 2007 03:32:10 GMT (envelope-from jb@freebsd.org) Date: Sun, 4 Nov 2007 03:32:10 GMT Message-Id: <200711040332.lA43WAIf027920@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 03:32:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=128606 Change 128606 by jb@jb_freebsd1 on 2007/11/04 03:31:54 Revise the extra memory allocation for DTrace struct proc and struct thread data based on advice from rwatson and jhb that adding an extra pointer to struct proc and struct thread won't break the kernel ABI. This adds event handlers to allocate and free proc/thread data for DTrace plus a memory allocation type for DTrace hooks. Note that adding the event handler definitions to proc.h tended to expose all the event handler junk everywhere in the kernel that references proc.h. It turned out to be cleaner to add proc_event.h and just include that where _really_ needed. Affected files ... .. //depot/projects/dtrace/src/sys/conf/files#49 edit .. //depot/projects/dtrace/src/sys/kern/init_main.c#19 edit .. //depot/projects/dtrace/src/sys/kern/kern_dtrace.c#1 add .. //depot/projects/dtrace/src/sys/kern/kern_thread.c#14 edit .. //depot/projects/dtrace/src/sys/sys/dtrace_bsd.h#2 edit .. //depot/projects/dtrace/src/sys/sys/proc.h#24 edit .. //depot/projects/dtrace/src/sys/sys/proc_event.h#1 add Differences ... ==== //depot/projects/dtrace/src/sys/conf/files#49 (text+ko) ==== @@ -1416,6 +1416,7 @@ kern/kern_cpu.c standard kern/kern_context.c standard kern/kern_descrip.c standard +kern/kern_dtrace.c standard kern/kern_environment.c standard kern/kern_event.c standard kern/kern_exec.c standard ==== //depot/projects/dtrace/src/sys/kern/init_main.c#19 (text+ko) ==== @@ -98,15 +98,6 @@ struct vmspace vmspace0; struct proc *initproc; -/* DTrace data for the primary thread in proc0. */ -char kdtrace_thread0[KDTRACE_THREAD_SIZE]; - -/* Offset from 'struct thread *' to the opaque DTrace fields. */ -int kdtrace_thread_offset; - -/* Overall per-thread allocation size. */ -int kdtrace_thread_size; - int boothowto = 0; /* initialized so that it can be patched */ SYSCTL_INT(_debug, OID_AUTO, boothowto, CTLFLAG_RD, &boothowto, 0, ""); int bootverbose; @@ -186,18 +177,6 @@ int verbose; #endif - /* Get the size of 'struct thread' plus 'struct td_sched' */ - kdtrace_thread_offset = sched_sizeof_thread(); - - /* - * Allow for the DTrace-specific thread data after - * struct td_sched. This space is allocated opaquely to - * avoid license issues. The value of KDTRACE_THREAD_SIZE - * set in sys/proc.h must be larger than that required by - * the DTrace kernel modules. - */ - kdtrace_thread_size = kdtrace_thread_offset + KDTRACE_THREAD_SIZE; - if (sysinit == NULL) { sysinit = SET_BEGIN(sysinit_set); sysinit_end = SET_LIMIT(sysinit_set); ==== //depot/projects/dtrace/src/sys/kern/kern_thread.c#14 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -186,6 +187,7 @@ td->td_sleepqueue = sleepq_alloc(); td->td_turnstile = turnstile_alloc(); td->td_sched = (struct td_sched *)&td[1]; + EVENTHANDLER_INVOKE(thread_ctor, td); sched_newthread(td); umtx_thread_init(td); return (0); @@ -200,6 +202,7 @@ struct thread *td; td = (struct thread *)mem; + EVENTHANDLER_INVOKE(thread_dtor, td); turnstile_free(td->td_turnstile); sleepq_free(td->td_sleepqueue); umtx_thread_fini(td); @@ -243,7 +246,7 @@ mtx_init(&tid_lock, "TID lock", NULL, MTX_DEF); tid_unrhdr = new_unrhdr(PID_MAX + 1, INT_MAX, &tid_lock); - thread_zone = uma_zcreate("THREAD", kdtrace_thread_size, + thread_zone = uma_zcreate("THREAD", sched_sizeof_thread(), thread_ctor, thread_dtor, thread_init, thread_fini, 16 - 1, 0); #ifdef KSE ==== //depot/projects/dtrace/src/sys/sys/dtrace_bsd.h#2 (text+ko) ==== @@ -37,4 +37,12 @@ /* Global variable in trap.c */ extern dtrace_invop_func_t dtrace_invop_func; +/* + * Functions which allow the dtrace module to check that the kernel + * hooks have been compiled with sufficient space for it's private + * structures. + */ +size_t kdtrace_proc_size(void); +size_t kdtrace_thread_size(void); + #endif /* _SYS_DTRACE_BSD_H */ ==== //depot/projects/dtrace/src/sys/sys/proc.h#24 (text+ko) ==== @@ -163,6 +163,8 @@ struct trapframe; struct turnstile; struct mqueue_notifier; +struct kdtrace_proc; +struct kdtrace_thread; /* * Here we define the two structures used for process information. @@ -298,6 +300,7 @@ struct td_sched *td_sched; /* (*) Scheduler-specific data. */ struct kaudit_record *td_ar; /* (k) Active audit record, if any. */ int td_syscalls; /* per-thread syscall count (used by NFS :)) */ + struct kdtrace_thread *td_dtrace; /* (*) DTrace-specific data. */ }; struct mtx *thread_lock_block(struct thread *); @@ -587,6 +590,7 @@ struct p_sched *p_sched; /* (*) Scheduler-specific data. */ STAILQ_HEAD(, ktr_request) p_ktr; /* (o) KTR event queue. */ LIST_HEAD(, mqueue_notifier) p_mqnotifier; /* (c) mqueue notifiers.*/ + struct kdtrace_proc *p_dtrace; /* (*) DTrace-specific data. */ }; #define p_session p_pgrp->pg_session @@ -804,21 +808,6 @@ extern int maxprocperuid; /* Max procs per uid. */ extern u_long ps_arg_cache_limit; -/* - * Space to append to struct thread for DTrace specific thread - * variables. This space is after the 'struct td_sched'. - */ -#define KDTRACE_THREAD_SIZE 128 - -/* Offset from 'struct thread *' to the opaque DTrace fields. */ -extern int kdtrace_thread_offset; - -/* Overall per-thread allocation size. */ -extern int kdtrace_thread_size; - -/* DTrace data for the primary thread in proc0. */ -extern char kdtrace_thread0[]; - LIST_HEAD(proclist, proc); TAILQ_HEAD(procqueue, proc); TAILQ_HEAD(threadqueue, thread); From owner-p4-projects@FreeBSD.ORG Sun Nov 4 14:51:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11F3516A468; Sun, 4 Nov 2007 14:51:51 +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 7031416A417 for ; Sun, 4 Nov 2007 14:51:50 +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 5A9CE13C4BA for ; Sun, 4 Nov 2007 14:51:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4EpoZ8024099 for ; Sun, 4 Nov 2007 14:51:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4EphC0024096 for perforce@freebsd.org; Sun, 4 Nov 2007 14:51:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 4 Nov 2007 14:51:43 GMT Message-Id: <200711041451.lA4EphC0024096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128618 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 14:51:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=128618 Change 128618 by rwatson@rwatson_zoo on 2007/11/04 14:51:40 Integrate TrustedBSD base from FreeBSD CVS: - Adaptive mutexes for user threads - rescue toolset grows geom support - if_bridge maximum segement address limit support - ipfilter fixed - 802.11n work - sctp bug fixes Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#89 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#31 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.1#11 integrate .. //depot/projects/trustedbsd/base/etc/namedb/named.root#5 integrate .. //depot/projects/trustedbsd/base/include/_ctype.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/valloc.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/ethers.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/minherit.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#25 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#22 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#25 integrate .. //depot/projects/trustedbsd/base/sbin/geom/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/geom/core/geom.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/boot.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifbridge.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#52 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#27 integrate .. //depot/projects/trustedbsd/base/sbin/route/route.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/route/route.c#17 integrate .. //depot/projects/trustedbsd/base/share/man/man3/queue.3#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mac.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/md.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_car.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_netflow.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man5/bluetooth.device.conf.5#3 integrate .. //depot/projects/trustedbsd/base/share/man/man5/quota.user.5#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/xfs.5#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/uio.9#10 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#36 integrate .. //depot/projects/trustedbsd/base/share/misc/committers-ports.dot#9 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/asia#15 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/northamerica#15 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/pacificnew#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#45 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/cpufunc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/cpuconf.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/opensolaris/kern/opensolaris_vfs.c#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#22 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#17 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#18 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#16 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#18 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#18 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#44 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_cpu.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/safe/safe.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#71 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/PAE#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#80 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_cpu.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#70 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#95 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridge.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridgevar.h#11 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211.h#15 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_freebsd.h#12 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.h#17 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#25 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.h#20 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#29 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.c#24 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.h#16 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#23 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_pcb.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/sctputil.h#16 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#28 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_ali.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_amd.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_amd64.c#9 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_ati.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#26 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_intel.c#23 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_nvidia.c#9 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_sis.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_via.c#16 integrate .. //depot/projects/trustedbsd/base/sys/pci/agppriv.h#4 integrate .. //depot/projects/trustedbsd/base/sys/vm/phys_pager.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#59 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/main.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/statfoo.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/wlanstats.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#61 integrate .. //depot/projects/trustedbsd/base/usr.bin/file2c/file2c.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/file2c/file2c.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/lockf/lockf.1#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/make.1#28 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/read.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/reverse.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/tail/tail.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/xstr/xstr.1#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/faithd/faithd.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/faithd/tcp.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ifmcstat/ifmcstat.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/mtree.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pciconf/cap.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/match.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/lockd.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/rpc.lockd.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/rpc.statd.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/statd.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/tcpdrop/tcpdrop.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#89 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -159,7 +159,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -265,14 +272,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -564,6 +573,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -574,19 +591,20 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - cp $$progpath ${INSTALLTMP}; \ + progs="$$progs $$progpath"; \ else \ - echo "Required install tool $$prog not found" >&2; \ + echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + done; \ + cp $$progs ${INSTALLTMP}; \ + cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ + sort -u` ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # # reinstall ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -17,6 +17,7 @@ # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd +OLD_FILES+=etc/cached.conf OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached OLD_FILES+=usr/share/man/man5/cached.conf.5.gz ==== //depot/projects/trustedbsd/base/bin/mv/mv.1#11 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $ .\" -.Dd July 9, 2002 +.Dd May 12, 2007 .Dt MV 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/base/etc/namedb/named.root#5 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.12 2004/06/06 11:46:29 schweikh Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.13 2007/11/02 22:37:15 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Jan 29, 2004 -; related version of root zone: 2004012900 +; last update: Nov 01, 2007 +; related version of root zone: 2007110100 ; ; ; formerly NS.INTERNIC.NET @@ -75,7 +75,7 @@ ; operated by ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. -L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12 +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 ; ; operated by WIDE ; ==== //depot/projects/trustedbsd/base/include/_ctype.h#4 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.34 2007/11/01 03:18:02 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c & ~0x7F) ? 0 : + return (_c < 0 || _c >= 128) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/trustedbsd/base/lib/libc/gen/valloc.3#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)valloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.14 2007/03/28 18:55:44 jasone Exp $ +.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.15 2007/10/30 15:26:20 keramida Exp $ .\" -.Dd September 13, 2005 +.Dd October 30, 2007 .Dt VALLOC 3 .Os .Sh NAME @@ -46,7 +46,6 @@ function is obsoleted by .Xr posix_memalign 3 , which can be used to request page-aligned allocations. -.Ef .Pp The .Fn valloc ==== //depot/projects/trustedbsd/base/lib/libc/net/ethers.3#7 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.24 2007/05/13 13:57:45 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.25 2007/10/30 15:31:41 keramida Exp $ .\" -.Dd May 13, 2007 +.Dd October 30, 2007 .Dt ETHERS 3 .Os .Sh NAME @@ -166,7 +166,6 @@ .Fn ether_ntoa_r stores the result in a user-passed buffer. .Pp - Likewise, .Fn ether_aton and ==== //depot/projects/trustedbsd/base/lib/libc/sys/minherit.2#7 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/lib/libc/sys/minherit.2,v 1.22 2007/09/21 14:05:26 obrien Exp $ +.\" $FreeBSD: src/lib/libc/sys/minherit.2,v 1.24 2007/10/30 15:28:43 keramida Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)minherit.2 8.1 (Berkeley) 6/9/93 .\" -.Dd February 17, 1996 +.Dd October 30, 2007 .Dt MINHERIT 2 .Os .Sh NAME @@ -129,7 +129,7 @@ system call first appeared in .Ox and then in -.Fx 2.2.0 . +.Fx 2.2 . .Sh BUGS Once you set inheritance to .Dv MAP_PRIVATE ==== //depot/projects/trustedbsd/base/lib/libc/sys/sctp_generic_recvmsg.2#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sctp_generic_recvmsg.2,v 1.2 2007/02/26 12:23:31 rrs Exp $ +.\" $FreeBSD: src/lib/libc/sys/sctp_generic_recvmsg.2,v 1.3 2007/10/30 15:36:40 keramida Exp $ .\" -.Dd December 15, 2006 +.Dd October 30, 2007 .Dt SCTP_GENERIC_RECVMSG 2 .Os .Sh NAME @@ -73,4 +73,3 @@ .Sh SEE ALSO .Xr sctp 4 , .Xr sctp_recvmsg 3 , - ==== //depot/projects/trustedbsd/base/lib/libc/sys/sctp_generic_sendmsg.2#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sctp_generic_sendmsg.2,v 1.2 2007/02/26 12:23:31 rrs Exp $ +.\" $FreeBSD: src/lib/libc/sys/sctp_generic_sendmsg.2,v 1.3 2007/10/30 15:36:40 keramida Exp $ .\" -.Dd December 15, 2006 +.Dd October 30, 2007 .Dt SCTP_GENERIC_SENDMSG 2 .Os .Sh NAME @@ -48,7 +48,6 @@ .Fn sctp_generic_sendmsg "int s" "void *msg" "int msglen" "struct sockaddr *to" "socklen_t len" "struct sctp_sndrcvinfo *sinfo" "int flags" .Ft int .Fn sctp_generic_sendmsg_iov "int s" "struct iovec *iov" "int iovlen" "struct sockaddr *to" "struct sctp_sndrcvinfo *sinfo" "int flags" - .Sh DESCRIPTION The .Fn sctp_generic_sendmsg @@ -85,4 +84,3 @@ .Xr sctp_sendx 3 , .Xr sctp_sendmsg 3 , .Xr sctp_sendmsgx 3 , - ==== //depot/projects/trustedbsd/base/lib/libc/sys/sctp_peeloff.2#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sctp_peeloff.2,v 1.2 2007/02/26 12:23:31 rrs Exp $ +.\" $FreeBSD: src/lib/libc/sys/sctp_peeloff.2,v 1.3 2007/10/30 15:36:40 keramida Exp $ .\" -.Dd December 15, 2006 +.Dd October 30, 2007 .Dt SCTP_PEELOFF 2 .Os .Sh NAME @@ -79,4 +79,3 @@ .El .Sh SEE ALSO .Xr sctp 4 , - ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_accept_sec_context.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ACCEPT_SEC_CONTEXT 3 PRM .Sh NAME @@ -448,7 +448,6 @@ .It RFC 2744 Generic Security Service API Version 2 : C-bindings .El -.\" .Sh HISTORY .Sh HISTORY The .Nm ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_acquire_cred.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_acquire_cred.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_acquire_cred.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ACQUIRE_CRED 3 PRM .Sh NAME @@ -201,7 +201,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_cred.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_add_cred.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_add_cred.3,v 1.3 2007/10/30 15:55:04 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ADD_CRED 3 PRM .Sh NAME @@ -86,7 +86,7 @@ .Dv GSS_C_ACCEPT or .Dv GSS_C_BOTH ). -.PP +.Pp This routine is expected to be used primarily by context acceptors, since implementations are likely to provide mechanism-specific ways of obtaining GSS-API initiator credentials from the system login process. @@ -301,7 +301,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_oid_set_member.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_add_oid_set_member.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_add_oid_set_member.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ADD_OID_SET_MEMBER 3 PRM .Sh NAME @@ -93,7 +93,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_canonicalize_name.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_canonicalize_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_canonicalize_name.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_CANONICALIZE_NAME 3 PRM .Sh NAME @@ -100,7 +100,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_compare_name.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_compare_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_compare_name.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_COMPARE_NAME PRM .Sh NAME @@ -85,7 +85,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_context_time.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_context_time.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_context_time.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_CONTEXT_TIME 3 PRM .Sh NAME @@ -71,7 +71,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_create_empty_oid_set.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_create_empty_oid_set.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_create_empty_oid_set.3,v 1.3 2007/10/30 15:56:12 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_CREATE_EMPTY_OID_SET 3 PRM .Sh NAME @@ -55,7 +55,6 @@ .It minor_status Mechanism specific status code. .It oid_set - The empty object identifier set. The routine will allocate the gss_OID_set_desc object, which the application must free after use with a call to @@ -75,7 +74,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_delete_sec_context.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_delete_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_delete_sec_context.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DELETE_SEC_CONTEXT 3 PRM .Sh NAME @@ -126,7 +126,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_name.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_display_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_display_name.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DISPLAY_NAME 3 PRM .Sh NAME @@ -114,7 +114,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_status.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_display_status.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_display_status.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DISPLAY_STATUS 3 PRM .Sh NAME @@ -173,7 +173,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_duplicate_name.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_duplicate_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_duplicate_name.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_DUPLICATE_NAME 3 PRM .Sh NAME @@ -86,7 +86,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_name.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_export_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_export_name.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_EXPORT_NAME 3 PRM .Sh NAME @@ -91,7 +91,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_sec_context.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_export_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_export_sec_context.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_EXPORT_SEC_CONTEXT 3 PRM .Sh NAME @@ -131,7 +131,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_get_mic.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_get_mic.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_get_mic.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_GET_MIC 3 PRM .Sh NAME @@ -128,7 +128,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_name.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_import_name.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_import_name.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_IMPORT_NAME 3 PRM .Sh NAME @@ -102,7 +102,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_sec_context.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_import_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_import_sec_context.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_IMPORT_SEC_CONTEXT 3 PRM .Sh NAME @@ -83,7 +83,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_indicate_mechs.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_indicate_mechs.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_indicate_mechs.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INDICATE_MECHS 3 PRM .Sh NAME @@ -70,7 +70,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_init_sec_context.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_init_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_init_sec_context.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INIT_SEC_CONTEXT 3 PRM .Sh NAME @@ -535,7 +535,6 @@ .It RFC 2744 Generic Security Service API Version 2 : C-bindings .El -.\" .Sh HISTORY .Sh HISTORY The .Nm ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_context.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_inquire_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_inquire_context.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_INQUIRE_CONTEXT 3 PRM .Sh NAME @@ -247,7 +247,6 @@ Generic Security Service Application Program Interface Version 2, Update 1 .It RFC 2744 Generic Security Service API Version 2 : C-bindings -.\" .Sh HISTORY .El .Sh HISTORY The ==== //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_cred.3#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 4 15:42:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D96D116A468; Sun, 4 Nov 2007 15:42: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 7916B16A417 for ; Sun, 4 Nov 2007 15:42: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 630B513C49D for ; Sun, 4 Nov 2007 15:42:55 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4FgtHn027876 for ; Sun, 4 Nov 2007 15:42:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4FgjuW027873 for perforce@freebsd.org; Sun, 4 Nov 2007 15:42:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 4 Nov 2007 15:42:45 GMT Message-Id: <200711041542.lA4FgjuW027873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 128620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 15:42:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=128620 Change 128620 by rwatson@rwatson_zoo on 2007/11/04 15:42:43 Integrate TrustedBSD audit3 branch through TrustedBSD base branch @128618. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#24 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#22 integrate .. //depot/projects/trustedbsd/audit3/bin/mv/mv.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#23 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#21 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#21 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#22 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#24 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#6 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#13 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#27 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.in#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#6 integrate .. //depot/projects/trustedbsd/audit3/etc/namedb/named.root#3 integrate .. //depot/projects/trustedbsd/audit3/include/_ctype.h#4 integrate .. //depot/projects/trustedbsd/audit3/include/pthread.h#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/valloc.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/net/ethers.3#4 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/minherit.2#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/sctp_peeloff.2#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libkse/thread/thr_mutex.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#15 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#17 integrate .. //depot/projects/trustedbsd/audit3/libexec/Makefile#7 integrate .. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#14 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/core/geom.c#11 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/boot.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.c#9 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifbridge.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifconfig.8#22 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#14 integrate .. //depot/projects/trustedbsd/audit3/sbin/route/route.8#5 integrate .. //depot/projects/trustedbsd/audit3/sbin/route/route.c#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man3/queue.3#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mac.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/md.4#4 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_car.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_netflow.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/nxge.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/bluetooth.device.conf.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/quota.user.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/xfs.5#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/uio.9#5 integrate .. //depot/projects/trustedbsd/audit3/share/misc/bsd-family-tree#16 integrate .. //depot/projects/trustedbsd/audit3/share/misc/committers-ports.dot#8 integrate .. //depot/projects/trustedbsd/audit3/share/zoneinfo/asia#9 integrate .. //depot/projects/trustedbsd/audit3/share/zoneinfo/northamerica#10 integrate .. //depot/projects/trustedbsd/audit3/share/zoneinfo/pacificnew#1 branch .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/DEFAULTS#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/cpufunc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/ohci_atmelarm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/cpuconf.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#41 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/opensolaris/kern/opensolaris_vfs.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#14 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/fil.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_compat.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_log.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_cam.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/gentbi.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/if_nxge.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/if_nxge.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/build-version.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xge-debug.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xge-defs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xge-list.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xge-os-pal.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xge-os-template.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xge-queue.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-channel.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-config.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-device.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-driver.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-event.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-fifo.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-mm.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-regs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-ring.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-stats.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal-types.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/include/xgehal.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xge-queue.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nxge/xgell-version.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/safe/safe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_zyd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/DEFAULTS#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#18 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/PAE#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_cpu.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#29 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_intr.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#25 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/nxge/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridge.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_bridgevar.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_freebsd.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_freebsd.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_input.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#15 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_node.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_node.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_proto.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_scan_ap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_var.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_constants.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_pcb.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/sctputil.h#13 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_ali.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_amd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_amd64.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_ati.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_i810.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_intel.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_nvidia.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_sis.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_via.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agppriv.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#52 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_bsdextended/mac_bsdextended.c#17 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_ifoff/mac_ifoff.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_lomac/mac_lomac.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_mls/mac_mls.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_partition/mac_partition.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_seeotheruids/mac_seeotheruids.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/phys_pager.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#19 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/statfoo.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/wlanstats.c#4 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nxge/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nxge/xge_cmn.h#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nxge/xge_info.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nxge/xge_info.h#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nxge/xge_log.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nxge/xge_log.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#22 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/io.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file2c/file2c.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/file2c/file2c.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/lockf/lockf.1#7 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/make/make.1#10 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/msgs/msgs.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tail/read.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tail/reverse.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tail/tail.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/xstr/xstr.1#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/fwcontrol/fwcontrol.8#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ifmcstat/ifmcstat.8#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mtree/mtree.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pciconf/cap.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pciconf/pciconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/match.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/lockd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/rpc.lockd.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/rpc.statd.8#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/statd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/config.c#10 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dmenu.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/tcpdrop/tcpdrop.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.589 2007/10/15 13:50:46 emaste Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -159,7 +159,14 @@ STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) INSTALLTMP!= /usr/bin/mktemp -d -u -t install +.endif # # Building a world goes through the following stages @@ -265,14 +272,16 @@ .endif # install stage +IMAKEENV= ${CROSSENV} +IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 .if empty(.MAKEFLAGS:M-n) -IMAKEENV= ${CROSSENV} \ - PATH=${STRICTTMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${STRICTTMPPATH}:${INSTALLTMP} \ + LD_LIBRARY_PATH=${INSTALLTMP} \ + PATH_LOCALE=${INSTALLTMP}/locale +IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else -IMAKEENV= ${CROSSENV} \ - PATH=${TMPPATH}:${INSTALLTMP} +IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} .endif -IMAKE= ${IMAKEENV} ${MAKE} -f Makefile.inc1 # kernel stage KMAKEENV= ${WMAKEENV} @@ -564,6 +573,14 @@ .endfor # +# Required install tools to be saved in a scratch dir for safety. +# +ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ + date echo egrep find grep install-info \ + ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + test true uname wc zic + +# # distributeworld # # Distributes everything compiled by a `buildworld'. @@ -574,19 +591,20 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cap_mkdb cat chflags chmod chown \ - date echo egrep find grep install-info \ - ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - cp $$progpath ${INSTALLTMP}; \ + progs="$$progs $$progpath"; \ else \ - echo "Required install tool $$prog not found" >&2; \ + echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done - ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} - rm -rf ${INSTALLTMP} + done; \ + cp $$progs ${INSTALLTMP}; \ + cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ + sort -u` ${INSTALLTMP} + cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale + ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ + ${IMAKEENV} rm -rf ${INSTALLTMP} # # reinstall ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.115 2007/10/25 18:10:05 mtm Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.116 2007/10/30 11:37:37 bushman Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -17,6 +17,7 @@ # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd +OLD_FILES+=etc/cached.conf OLD_FILES+=etc/rc.d/cached OLD_FILES+=usr/sbin/cached OLD_FILES+=usr/share/man/man5/cached.conf.5.gz ==== //depot/projects/trustedbsd/audit3/bin/mv/mv.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.30 2007/11/01 09:49:45 ru Exp $ .\" -.Dd July 9, 2002 +.Dd May 12, 2007 .Dt MV 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#23 (text+ko) ==== @@ -302,4 +302,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#22 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#23 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#6 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#5 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/Makefile.in#6 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/VERSION#21 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/aclocal.m4#4 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#6 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#5 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/Makefile.in#6 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/audit/Makefile.in#4 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditd/Makefile.in#4 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditfilterd/Makefile.in#4 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/Makefile.in#4 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#14 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#14 $ */ /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/Makefile.in#4 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#8 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/praudit/praudit.c#9 $ */ /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#6 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#5 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/Makefile.in#6 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h#8 (text+ko) ==== @@ -1,6 +1,6 @@ -/* config/config.h. Generated by configure. */ +/* config/config.h. Generated from config.h.in by configure. */ /* config/config.h.in. Generated from configure.ac by autoheader. */ -/* $FreeBSD: src/contrib/openbsm/config/config.h,v 1.6 2007/07/22 12:22:25 rwatson Exp $ */ +/* $FreeBSD: src/contrib/openbsm/config/config.h,v 1.7 2007/10/29 18:45:40 rwatson Exp $ */ /* Define to 1 if you have the `alarm' function. */ #define HAVE_ALARM 1 @@ -150,13 +150,13 @@ #define PACKAGE_NAME "OpenBSM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "OpenBSM 1.0alpha15" +#define PACKAGE_STRING "OpenBSM 1.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "openbsm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0alpha15" +#define PACKAGE_VERSION "1.0" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -171,7 +171,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "1.0alpha15" +#define VERSION "1.0" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ @@ -185,7 +185,7 @@ /* Define to `int' if does not define. */ /* #undef pid_t */ -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ /* #undef size_t */ /* Define to `int' if doesn't define. */ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#10 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/ltmain.sh#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#21 (xtext) ==== ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#22 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#21 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#22 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#8 (text+ko) ==== @@ -1,6 +1,6 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#7 $ -# $FreeBSD: src/contrib/openbsm/etc/audit_class,v 1.2 2006/03/26 01:44:35 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#8 $ +# $FreeBSD: src/contrib/openbsm/etc/audit_class,v 1.3 2007/10/29 18:43:05 rwatson Exp $ # 0x00000000:no:invalid class 0x00000001:fr:file read ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#24 (text+ko) ==== @@ -1,6 +1,6 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#23 $ -# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.8 2007/07/22 12:20:42 rwatson Exp $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#24 $ +# $FreeBSD: src/contrib/openbsm/etc/audit_event,v 1.9 2007/10/29 18:43:05 rwatson Exp $ # # The mapping between event identifiers and values is also hard-codedd in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#6 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#5 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/Makefile.in#6 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#12 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#13 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#27 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#26 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#27 $ */ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/Makefile.in#4 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/Makefile.in#4 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/modules/auditfilter_noop/Makefile.in#4 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/Makefile.in#4 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.in#4 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.in#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/Makefile.in#4 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#6 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#5 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#6 $ # VPATH = @srcdir@ ==== //depot/projects/trustedbsd/audit3/etc/namedb/named.root#3 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.12 2004/06/06 11:46:29 schweikh Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.13 2007/11/02 22:37:15 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Jan 29, 2004 -; related version of root zone: 2004012900 +; last update: Nov 01, 2007 +; related version of root zone: 2007110100 ; ; ; formerly NS.INTERNIC.NET @@ -75,7 +75,7 @@ ; operated by ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. -L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12 +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 ; ; operated by WIDE ; ==== //depot/projects/trustedbsd/audit3/include/_ctype.h#4 (text+ko) ==== @@ -40,7 +40,7 @@ * * From @(#)ctype.h 8.4 (Berkeley) 1/21/94 * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp - * $FreeBSD: src/include/_ctype.h,v 1.33 2007/10/27 22:32:27 ache Exp $ + * $FreeBSD: src/include/_ctype.h,v 1.34 2007/11/01 03:18:02 ache Exp $ */ #ifndef __CTYPE_H_ @@ -126,7 +126,7 @@ static __inline int __isctype(__ct_rune_t _c, unsigned long _f) { - return (_c & ~0x7F) ? 0 : + return (_c < 0 || _c >= 128) ? 0 : !!(_DefaultRuneLocale.__runetype[_c] & _f); } ==== //depot/projects/trustedbsd/audit3/include/pthread.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread.h,v 1.40 2005/10/24 05:53:54 davidxu Exp $ + * $FreeBSD: src/include/pthread.h,v 1.41 2007/10/29 21:01:47 kris Exp $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -98,6 +98,7 @@ * Static initialization values. */ #define PTHREAD_MUTEX_INITIALIZER NULL +#define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP NULL #define PTHREAD_COND_INITIALIZER NULL #define PTHREAD_RWLOCK_INITIALIZER NULL @@ -128,6 +129,7 @@ PTHREAD_MUTEX_ERRORCHECK = 1, /* Default POSIX mutex */ PTHREAD_MUTEX_RECURSIVE = 2, /* Recursive mutex */ PTHREAD_MUTEX_NORMAL = 3, /* No error checking */ + PTHREAD_MUTEX_ADAPTIVE_NP = 4, /* Adaptive mutex, spins briefly before blocking on lock */ PTHREAD_MUTEX_TYPE_MAX }; ==== //depot/projects/trustedbsd/audit3/lib/libc/gen/valloc.3#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)valloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.14 2007/03/28 18:55:44 jasone Exp $ +.\" $FreeBSD: src/lib/libc/gen/valloc.3,v 1.15 2007/10/30 15:26:20 keramida Exp $ .\" -.Dd September 13, 2005 +.Dd October 30, 2007 .Dt VALLOC 3 .Os .Sh NAME @@ -46,7 +46,6 @@ function is obsoleted by .Xr posix_memalign 3 , which can be used to request page-aligned allocations. -.Ef .Pp The .Fn valloc ==== //depot/projects/trustedbsd/audit3/lib/libc/net/ethers.3#4 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.24 2007/05/13 13:57:45 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.25 2007/10/30 15:31:41 keramida Exp $ .\" -.Dd May 13, 2007 +.Dd October 30, 2007 .Dt ETHERS 3 .Os .Sh NAME @@ -166,7 +166,6 @@ .Fn ether_ntoa_r stores the result in a user-passed buffer. .Pp - Likewise, .Fn ether_aton and ==== //depot/projects/trustedbsd/audit3/lib/libc/sys/minherit.2#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/lib/libc/sys/minherit.2,v 1.22 2007/09/21 14:05:26 obrien Exp $ +.\" $FreeBSD: src/lib/libc/sys/minherit.2,v 1.24 2007/10/30 15:28:43 keramida Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)minherit.2 8.1 (Berkeley) 6/9/93 .\" -.Dd February 17, 1996 +.Dd October 30, 2007 .Dt MINHERIT 2 .Os .Sh NAME @@ -129,7 +129,7 @@ system call first appeared in .Ox and then in -.Fx 2.2.0 . +.Fx 2.2 . .Sh BUGS Once you set inheritance to .Dv MAP_PRIVATE ==== //depot/projects/trustedbsd/audit3/lib/libc/sys/sctp_generic_recvmsg.2#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sctp_generic_recvmsg.2,v 1.2 2007/02/26 12:23:31 rrs Exp $ +.\" $FreeBSD: src/lib/libc/sys/sctp_generic_recvmsg.2,v 1.3 2007/10/30 15:36:40 keramida Exp $ .\" -.Dd December 15, 2006 +.Dd October 30, 2007 .Dt SCTP_GENERIC_RECVMSG 2 .Os .Sh NAME @@ -73,4 +73,3 @@ .Sh SEE ALSO .Xr sctp 4 , .Xr sctp_recvmsg 3 , - ==== //depot/projects/trustedbsd/audit3/lib/libc/sys/sctp_generic_sendmsg.2#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sctp_generic_sendmsg.2,v 1.2 2007/02/26 12:23:31 rrs Exp $ +.\" $FreeBSD: src/lib/libc/sys/sctp_generic_sendmsg.2,v 1.3 2007/10/30 15:36:40 keramida Exp $ .\" -.Dd December 15, 2006 +.Dd October 30, 2007 .Dt SCTP_GENERIC_SENDMSG 2 .Os .Sh NAME @@ -48,7 +48,6 @@ .Fn sctp_generic_sendmsg "int s" "void *msg" "int msglen" "struct sockaddr *to" "socklen_t len" "struct sctp_sndrcvinfo *sinfo" "int flags" .Ft int .Fn sctp_generic_sendmsg_iov "int s" "struct iovec *iov" "int iovlen" "struct sockaddr *to" "struct sctp_sndrcvinfo *sinfo" "int flags" - .Sh DESCRIPTION The .Fn sctp_generic_sendmsg @@ -85,4 +84,3 @@ .Xr sctp_sendx 3 , .Xr sctp_sendmsg 3 , .Xr sctp_sendmsgx 3 , - ==== //depot/projects/trustedbsd/audit3/lib/libc/sys/sctp_peeloff.2#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/sctp_peeloff.2,v 1.2 2007/02/26 12:23:31 rrs Exp $ +.\" $FreeBSD: src/lib/libc/sys/sctp_peeloff.2,v 1.3 2007/10/30 15:36:40 keramida Exp $ .\" -.Dd December 15, 2006 +.Dd October 30, 2007 .Dt SCTP_PEELOFF 2 .Os .Sh NAME @@ -79,4 +79,3 @@ .El .Sh SEE ALSO .Xr sctp 4 , - ==== //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_accept_sec_context.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 .Os .Dt GSS_ACCEPT_SEC_CONTEXT 3 PRM .Sh NAME @@ -448,7 +448,6 @@ .It RFC 2744 Generic Security Service API Version 2 : C-bindings .El -.\" .Sh HISTORY .Sh HISTORY The .Nm ==== //depot/projects/trustedbsd/audit3/lib/libgssapi/gss_acquire_cred.3#2 (text+ko) ==== @@ -24,10 +24,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgssapi/gss_acquire_cred.3,v 1.2 2006/01/25 10:06:28 dfr Exp $ +.\" $FreeBSD: src/lib/libgssapi/gss_acquire_cred.3,v 1.3 2007/10/30 15:52:55 keramida Exp $ .\" .\" The following commands are required for all man pages. -.Dd November 12, 2005 +.Dd October 30, 2007 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 4 16:08:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29BC516A419; Sun, 4 Nov 2007 16:08:23 +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 D6E7616A418 for ; Sun, 4 Nov 2007 16:08:22 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4BBF13C48E for ; Sun, 4 Nov 2007 16:08:22 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4G8MBc030365 for ; Sun, 4 Nov 2007 16:08:22 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4G8MmP030362 for perforce@freebsd.org; Sun, 4 Nov 2007 16:08:22 GMT (envelope-from piso@freebsd.org) Date: Sun, 4 Nov 2007 16:08:22 GMT Message-Id: <200711041608.lA4G8MmP030362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 128623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 16:08:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=128623 Change 128623 by piso@piso_newluxor on 2007/11/04 16:07:28 Expand a macro used only in one place. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#27 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#27 (text+ko) ==== @@ -191,11 +191,9 @@ #ifdef _KERNEL typedef struct mbuf ** pkt_t; -#define MYMTOD(p, foo) (p != NULL) ? mtod(p, foo) : NULL - #define PULLUP_SIZE(pip, ptr, s) do { \ *ptr = m_pullup((*ptr), s); \ - (pip) = MYMTOD(*ptr, struct ip *); \ + (pip) = (*ptr != NULL) ? mtod(*ptr, struct ip *) : NULL; \ } while (0) #define PULLUP_IPHDR(pip, ptr) do { \ From owner-p4-projects@FreeBSD.ORG Sun Nov 4 22:08:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 021CA16A41A; Sun, 4 Nov 2007 22:08: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 4DAA016A417 for ; Sun, 4 Nov 2007 22:08:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3FB7B13C4A3 for ; Sun, 4 Nov 2007 22:08:27 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4M8QBP082041 for ; Sun, 4 Nov 2007 22:08:26 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4M8Qcu082038 for perforce@freebsd.org; Sun, 4 Nov 2007 22:08:26 GMT (envelope-from gonzo@FreeBSD.org) Date: Sun, 4 Nov 2007 22:08:26 GMT Message-Id: <200711042208.lA4M8Qcu082038@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 128634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 22:08:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=128634 Change 128634 by gonzo@gonzo_jeeves on 2007/11/04 22:07:25 o Add 16 bytes to default stackframe of GenericException, Intr, UserGenericException, UserIntr. These functions are non-leaves, so sizeof(register) * MAX(max_args, 4) bytes should be reserved as a placeholders for arguments. max_args is the maximum number of arguments through all functions that are called from non-leaf routine. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#26 edit .. //depot/projects/mips2/src/sys/mips/mips/locore.S#19 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#26 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#25 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#26 $ */ /* $NetBSD: mipsX_subr.S,v 1.19 2005/12/11 12:18:09 christos Exp $ */ @@ -283,14 +283,15 @@ /* fall through to GenericEception */ .set at -LEAF(GenericException) +NESTED(GenericException, TF_SIZE + 16, ra) .set noat + .set noreorder la k0, 1f j exception_save_registers subu k1, sp, TF_SIZE 1: - subu sp, sp, TF_SIZE + subu sp, sp, TF_SIZE + 16 /* * A generic exception may result in DDB being invoked. If we @@ -303,7 +304,6 @@ #endif /* DDB */ /* - * Call trap() with arguments: * trapframe, cause, badvaddr. * @@ -325,7 +325,7 @@ */ mtc0 zero, MIPS_COP_0_CAUSE - move k1, sp + addu k1, sp, 16 jal exception_restore_registers nop @@ -343,12 +343,13 @@ LEAF(KernIntr) .set noat + .set noreorder la k0, 1f j exception_save_registers subu k1, sp, TF_SIZE 1: - subu sp, sp, TF_SIZE + subu sp, sp, TF_SIZE + 16 /* * A generic exception may result in DDB being invoked. If we @@ -379,7 +380,7 @@ */ mtc0 zero, MIPS_COP_0_CAUSE - move k1, sp + addu k1, sp, 16 jal exception_restore_registers nop @@ -654,7 +655,7 @@ /* * Handle trap from userspace (VM-related, syscall, etc..) */ -NESTED(UserGenericException, TF_SIZE, ra) +NESTED(UserGenericException, 16, ra) .set noat .set noreorder .mask 0x80000000, -4 @@ -666,7 +667,9 @@ nop 1: move a0, k1 # For following trap call - addu sp, k1, -TF_SIZE # Switch to kernel's stack + subu sp, k1, 16 # Switch to kernel's stack, + # keep 16 bytes as + # placefholders for a0..a3 ### ### Fill out trap arcguments and call it @@ -702,7 +705,7 @@ ### ### Restore regiters and bail out ### - addu sp, sp, TF_SIZE ## Restore pointer to saved + addu sp, sp, 16 ## Restore pointer to saved ## registers move k1, sp jal exception_restore_registers @@ -717,7 +720,7 @@ /* * Handle interrupt from userspace */ -NESTED(UserIntr, TF_SIZE, ra) +NESTED(UserIntr, 16, ra) .set noat .set noreorder .mask 0x80000000, -4 @@ -729,7 +732,9 @@ nop 1: move a0, k1 # For following trap call - addu sp, k1, -TF_SIZE # Switch to kernel's stack + subu sp, k1, 16 # Switch to kernel's stack, + # keep 16 bytes as + # placefholders for a0..a3 mfc0 t0, MIPS_COP_0_STATUS .set at ==== //depot/projects/mips2/src/sys/mips/mips/locore.S#19 (text+ko) ==== @@ -50,9 +50,8 @@ GLOBAL(stackspace) .space PAGE_SIZE /* Smaller than it should be since it's temp. */ -.align 8 + .align 8 GLOBAL(topstack) - .set noreorder .text @@ -110,6 +109,7 @@ * Set up our temporary stack. */ la sp, topstack + subu sp, sp, 16 /* Placeholders for a0..a3 */ #ifdef YAMON /* @@ -149,9 +149,7 @@ li v0, SYS_sigreturn syscall break 0 +esigcode: -esigcode: - .data - .global szsigcode -szsigcode: - .long esigcode-sigcode +GLOBAL(szsigcode) + .long esigcode - sigcode From owner-p4-projects@FreeBSD.ORG Sun Nov 4 22:28:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A727116A468; Sun, 4 Nov 2007 22:28:50 +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 584AC16A417 for ; Sun, 4 Nov 2007 22:28:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 49ED713C480 for ; Sun, 4 Nov 2007 22:28:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4MSoIV083090 for ; Sun, 4 Nov 2007 22:28:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4MSnj1083086 for perforce@freebsd.org; Sun, 4 Nov 2007 22:28:49 GMT (envelope-from jb@freebsd.org) Date: Sun, 4 Nov 2007 22:28:49 GMT Message-Id: <200711042228.lA4MSnj1083086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 128638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Nov 2007 22:28:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=128638 Change 128638 by jb@jb_freebsd1 on 2007/11/04 22:28:32 IFC Affected files ... .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/Makefile#5 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 integrate .. //depot/projects/dtrace/ports/MOVED#51 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildenv#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dologs#4 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#5 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/reportload#4 integrate .. //depot/projects/dtrace/src/etc/namedb/named.root#4 integrate .. //depot/projects/dtrace/src/rescue/rescue/Makefile#9 integrate .. //depot/projects/dtrace/src/sbin/geom/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/dtrace/src/sbin/geom/core/geom.c#6 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifbridge.c#9 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/dtrace/src/sbin/route/route.c#5 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#8 integrate .. //depot/projects/dtrace/src/share/zoneinfo/northamerica#7 integrate .. //depot/projects/dtrace/src/share/zoneinfo/pacificnew#1 branch .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#20 integrate .. //depot/projects/dtrace/src/sys/dev/safe/safe.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/atiixp.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/atiixp.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/usb/if_zydfw.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/dtrace/src/sys/i386/conf/PAE#8 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/dtrace/src/sys/net/if_bridge.c#25 integrate .. //depot/projects/dtrace/src/sys/net/if_bridgevar.h#12 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs.h#7 integrate .. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#8 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#6 integrate .. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpcontrol/search.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/faithd/faithd.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/faithd/tcp.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/Makefile#1 branch .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/main.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/pathnames.h#1 branch .. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch .. //depot/projects/dtrace/www/en/gnome/docs/gnome2_porting.sgml#7 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#18 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#26 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#12 integrate Differences ... ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/Makefile#5 (text+ko) ==== @@ -1,8 +1,8 @@ # The FreeBSD Documentation Project # The FreeBSD French Documentation Project # -# $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/Makefile,v 1.32 2007/07/15 12:05:58 blackend Exp $ -# Original revision: 1.106 manque 1.91 +# $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/Makefile,v 1.33 2007/11/04 18:57:25 blackend Exp $ +# Original revision: 1.108 manque 1.91 # # Build the FreeBSD Handbook. # @@ -49,6 +49,7 @@ IMAGES_EN+= install/adduser1.scr IMAGES_EN+= install/adduser2.scr IMAGES_EN+= install/adduser3.scr +IMAGES_EN+= install/boot-loader-menu.scr IMAGES_EN+= install/boot-mgr.scr IMAGES_EN+= install/config-country.scr IMAGES_EN+= install/console-saver1.scr @@ -145,6 +146,19 @@ IMAGES_EN+= virtualization/parallels-freebsd11.png IMAGES_EN+= virtualization/parallels-freebsd12.png IMAGES_EN+= virtualization/parallels-freebsd13.png +IMAGES_EN+= virtualization/virtualpc-freebsd1.png +IMAGES_EN+= virtualization/virtualpc-freebsd2.png +IMAGES_EN+= virtualization/virtualpc-freebsd3.png +IMAGES_EN+= virtualization/virtualpc-freebsd4.png +IMAGES_EN+= virtualization/virtualpc-freebsd5.png +IMAGES_EN+= virtualization/virtualpc-freebsd6.png +IMAGES_EN+= virtualization/virtualpc-freebsd7.png +IMAGES_EN+= virtualization/virtualpc-freebsd8.png +IMAGES_EN+= virtualization/virtualpc-freebsd9.png +IMAGES_EN+= virtualization/virtualpc-freebsd10.png +IMAGES_EN+= virtualization/virtualpc-freebsd11.png +IMAGES_EN+= virtualization/virtualpc-freebsd12.png +IMAGES_EN+= virtualization/virtualpc-freebsd13.png # Images from the cross-document image library IMAGES_LIB= callouts/1.png ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.2 2007/04/30 18:15:45 blackend Exp $ - Original revision: 1.10 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.3 2007/11/04 19:01:46 blackend Exp $ + Original revision: 1.13 --> @@ -43,13 +43,18 @@ + Comment installer &os; sur un ordinateur &apple; + &macintosh; à base &intel;. + + + Comment installer &os; sur &linux; avec &xen;. - Comment installer &os; sur un ordinateur &apple; - &macintosh; à base &intel;. + Comment installer &os; sur µsoft.windows; avec + Virtual PC. @@ -240,10 +245,10 @@ Après avoir installé avec succès &os; sur &macos; X avec - Parallels, il y a un certain - nombre d'opérations de configuration à - effectuer pour optimiser le système pour une - utilisation en tant que système virtuel. + Parallels, + il reste plusieurs points à + configurer pour optimiser le système + virtuel. @@ -612,6 +617,231 @@ + + Virtual PC sur &windows; + + Virtual PC pour &windows; est + un logiciel µsoft; librement + téléchargeable. Consultez la page concernant la + configuration + minimale requise. Une fois Virtual + PC installé sous µsoft.windows;, + l'utilisateur doit configurer une machine virtuelle puis + installer le système d'exploitation invité + désiré. + + + Installer &os; sous Virtual + PC/µsoft.windows; + + La première étape de l'installation de + &os; sous µsoft.windows;/Virtual + PC est la création d'une nouvelle + machine virtuelle pour permettre l'installation de &os;. + Sélectionnez Create a virtual + machine: + + + + + + + + + + + + + + Puis sélectionnez + Other pour + Operating system: + + + + + + + + Choisissez ensuite une quantité raisonnable + d'espace disque et de mémoire en fonction de vos + projets pour cette installation de &os;. 4Go d'espace de + disque et 512Mo de mémoire vive conviennent pour la + plupart des utilisateurs de &os; sous Virtual + PC: + + + + + + + + + + + + + + Sauvegardez et poursuivez la configuration: + + + + + + + + Sélectionnez votre machine virtuelle &os;, + cliquez sur Settings, puis + précisez le type de réseau et l'interface + réseau: + + + + + + + + + + + + + + Une fois votre machine virtuelle &os; + créée, vous devrez y installer &os;. La + meilleure manière étant d'utiliser un CDROM + &os; officiel ou une image ISO + téléchargée depuis un site FTP + officiel. Quand vous avez l'image ISO appropriée + sur votre système de fichiers &windows; ou sur un + CDROM dans votre lecteur de CD, double-cliquez sur votre + machine virtuelle &os; pour démarrer. Puis cliquez + sur CD et sélectionnez + Capture ISO Image... dans la + fenêtre Virtual PC. Une + fenêtre apparaîtra et vous permettra + d'associer le lecteur de CDROM de votre machine virtuelle + avec une image ISO ou votre lecteur de CDROM + réel. + + + + + + + + + + + + + + L'association avec votre CDROM source + effectuée, redémarrez votre machine + virtuelle &os; en cliquant sur Action + puis sur Reset. Virtual + PC redémarrera, son BIOS + vérifiera tout d'abord que vous disposez d'un CDROM + comme le ferait n'importe quel BIOS normal. + + + + + + + + Dans ce cas, le support d'installation &os; sera + trouvé et une installation classique basée + sur sysinstall débutera + comme décrit dans le . + Vous pouvez installez X11 mais ne tentez pas pour le + moment de le configurer. + + + + + + + + Quand vous avez achevé l'installation, pensez + à éjecter le CDROM ou l'image ISO. Enfin, + redémarrez dans votre machine virtuelle &os; + fraîchement installée. + + + + + + + + + + Configuration de &os; sous + µsoft.windows;/Virtual PC + + Après avoir installé avec succès + &os; sur µsoft.windows; avec Virtual + PC, il reste plusieurs points à + configurer pour optimiser le système + virtuel. + + + + Paramétrer les variables du + chargeur + + L'étape la plus importante est la + diminution du paramètre + afin de réduire + l'utilisation du CPU de &os; sous l'environnement + Virtual PC. Pour cela, il + faut ajouter la ligne suivante au fichier + /boot/loader.conf: + + kern.hz=100 + + Sans ce paramétrage, un système + d'exploitation invité &os; inactif sous + Virtual PC + utilisera environ 40% du CPU pour un + micro-ordinateur monoprocesseur. Après ce + changement l'utilisation du processeur sera plus + proche d'un petit 3%. + + + + Créer un nouveau fichier de configuration + du noyau + + Vous pouvez retirer tous les pilotes de + périphériques SCSI, FireWire, et USB. + Virtual PC fournit une + interface réseau virtuelle utilisant + le pilote &man.de.4;, aussi tous les autres pilotes + réseau en dehors de &man.de.4; et + &man.miibus.4; peuvent être supprimés du + noyau. + + + + Configuration du réseau + + La configuration réseau la plus simple + utilise DHCP pour connecter votre machine virtuelle + sur le même réseau local que votre + machine &mac; hôte. Cette configuration se fait + en ajoutant la ligne + ifconfig_de0="DHCP" au fichier + /etc/rc.conf. Des configurations + réseau plus avancées sont + présentées dans le . + + + + + VMware sur &windows;/&mac;/&linux; ==== //depot/projects/dtrace/ports/MOVED#51 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1511 2007/11/01 13:01:57 beech Exp $ +# $FreeBSD: ports/MOVED,v 1.1512 2007/11/03 23:36:39 gerald Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3324,3 +3324,4 @@ print/yatex-mule||2007-10-25|Has expired: emacs19 and related ports are obsolete devel/py-qt4-qct|devel/qct|2007-10-26|Since it's an application but not a Py/Qt library the port was renamed net-mgmt/wispy-tools|net-mgmt/spectools|2007-10-29|project renamed +lang/gcc40|lang/gcc42|2007-11-04|Superseded by gcc41 and later, gcc42 being the recommended update path ==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildenv#4 (text+ko) ==== @@ -27,6 +27,12 @@ x7) export INDEXFILE=INDEX-7 ;; + x7-exp) + export INDEXFILE=INDEX-7 + ;; + x8) + export INDEXFILE=INDEX-8 + ;; *) echo "buildenv: invalid branch" exit 1 @@ -41,7 +47,8 @@ export PKGSUFFIX=.tbz export PKGZIPCMD=bzip2 export X_WINDOW_SYSTEM=xorg - export XORG_UPGRADE=1 + + #export USA_RESIDENT=yes # Have to use realpath because 'make index' doesn't deal with symlinks in PORTSDIR # - kk 020311 @@ -71,8 +78,6 @@ export BATCH=1 export PACKAGE_BUILDING=1 - export USA_RESIDENT=yes - export FTP_PASSIVE_MODE=yes #export FETCH_BEFORE_ARGS=-vvv } ==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/dologs#4 (text+ko) ==== @@ -9,11 +9,11 @@ scripts=${pb}/scripts for ver in latest full; do - for num in 5 5-exp 6 6-exp 6-exp2 7; do + for num in 5 5-exp 6 6-exp 6-exp2 7 7-exp 8; do cd $home/$arch-$num-$ver && ${scripts}/processlogs ${arch} cd ${pb}/${arch}/${num} && ${scripts}/processfail ${arch} ${num} done - for num in 5 5-exp 6 6-exp 6-exp2 7; do + for num in 5 5-exp 6 6-exp 6-exp2 7 7-exp 8; do cd $home/$arch-$num-$ver-logs && ${scripts}/processlogs2 done # for num in 5 6 6-exp 7; do ==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#5 (text+ko) ==== @@ -253,7 +253,7 @@ branch=$1 date=$2 -if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != "x6-exp2" -a "x$branch" != x7 ]; then +if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != "x6-exp2" -a "x$branch" != x7 -a "x$branch" != x7-exp -a "x$branch" != x8 ]; then usage fi ==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/reportload#4 (text+ko) ==== @@ -20,7 +20,7 @@ done if [ ${error} = 0 ]; then - num=$(echo $(ls -1d ${scratchdir}/*/chroot/*/used 2>/dev/null| wc -l)) + num=$(echo $(ls -1d ${scratchdir}/*/*/used ${scratchdir}/*/chroot/*/used 2>/dev/null| wc -l)) else num=ERR fi ==== //depot/projects/dtrace/src/etc/namedb/named.root#4 (text+ko) ==== @@ -1,5 +1,5 @@ ; -; $FreeBSD: src/etc/namedb/named.root,v 1.12 2004/06/06 11:46:29 schweikh Exp $ +; $FreeBSD: src/etc/namedb/named.root,v 1.13 2007/11/02 22:37:15 dougb Exp $ ; ; This file holds the information on root name servers needed to @@ -13,8 +13,8 @@ ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: Jan 29, 2004 -; related version of root zone: 2004012900 +; last update: Nov 01, 2007 +; related version of root zone: 2007110100 ; ; ; formerly NS.INTERNIC.NET @@ -75,7 +75,7 @@ ; operated by ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. -L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12 +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 ; ; operated by WIDE ; ==== //depot/projects/dtrace/src/rescue/rescue/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.57 2007/10/27 18:18:58 yar Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.58 2007/11/04 00:44:10 marcel Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= @@ -110,10 +110,10 @@ # headers in addition to the standard 'paths.h' header. # CRUNCH_SRCDIRS+= sbin -CRUNCH_PROGS_sbin= atacontrol badsect bsdlabel \ +CRUNCH_PROGS_sbin= atacontrol badsect \ camcontrol ccdconfig clri devfs dmesg dump \ dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \ - fsirand gbde ifconfig init \ + fsirand gbde geom ifconfig init \ kldconfig kldload kldstat kldunload ldconfig \ md5 mdconfig mdmfs mknod mount mount_cd9660 \ mount_msdosfs mount_nfs mount_ntfs mount_nullfs \ @@ -147,7 +147,7 @@ CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz .if ${MACHINE_ARCH} == "i386" -CRUNCH_PROGS_sbin+= sconfig fdisk +CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk CRUNCH_ALIAS_bsdlabel= disklabel #.if ${MK_NCP} != "no" #CRUNCH_PROGS+= mount_nwfs @@ -158,19 +158,20 @@ .endif .if ${MACHINE} == "pc98" +CRUNCH_PROGS_sbin+= bsdlabel CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98 .endif .if ${MACHINE_ARCH} == "ia64" -CRUNCH_PROGS_sbin+= mca gpt fdisk +CRUNCH_PROGS_sbin+= mca .endif .if ${MACHINE_ARCH} == "sparc64" -CRUNCH_PROGS_sbin+= sunlabel +CRUNCH_PROGS_sbin+= bsdlabel sunlabel .endif .if ${MACHINE_ARCH} == "amd64" -CRUNCH_PROGS_sbin+= fdisk +CRUNCH_PROGS_sbin+= bsdlabel fdisk CRUNCH_ALIAS_bsdlabel= disklabel .endif @@ -184,6 +185,7 @@ CRUNCH_ALIAS_restore= rrestore CRUNCH_ALIAS_dump= rdump CRUNCH_ALIAS_fsck_ffs= fsck_4.2bsd fsck_ufs +CRUNCH_ALIAS_geom= gpart # dhclient has historically been troublesome... CRUNCH_PROGS_sbin+= dhclient ==== //depot/projects/dtrace/src/sbin/geom/Makefile#4 (text+ko) ==== @@ -1,5 +1,23 @@ -# $FreeBSD: src/sbin/geom/Makefile,v 1.1 2004/05/20 10:09:55 pjd Exp $ +# $FreeBSD: src/sbin/geom/Makefile,v 1.2 2007/11/04 00:32:53 marcel Exp $ + +.if defined(RESCUE) + +.PATH: ${.CURDIR}/class/part ${.CURDIR}/core ${.CURDIR}/misc + +PROG= geom +SRCS= geom.c geom_part.c subr.c + +CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core + +DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} +LDADD= -lgeom -lsbuf -lbsdxml -lutil + +.include + +.else SUBDIR= core class .include + +.endif ==== //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.3 2007/10/21 19:38:21 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $"); #include #include @@ -43,15 +43,21 @@ #include "core/geom.h" #include "misc/subr.h" -uint32_t lib_version = G_LIB_VERSION; -uint32_t version = 0; +#ifdef RESCUE +#define PUBSYM(x) gpart_##x +#else +#define PUBSYM(x) x +#endif + +uint32_t PUBSYM(lib_version) = G_LIB_VERSION; +uint32_t PUBSYM(version) = 0; static char optional[] = ""; static char flags[] = "C"; static void gpart_show(struct gctl_req *, unsigned); -struct g_command class_commands[] = { +struct g_command PUBSYM(class_commands)[] = { { "add", 0, NULL, { { 'b', "start", NULL, G_TYPE_STRING }, { 's', "size", NULL, G_TYPE_STRING }, ==== //depot/projects/dtrace/src/sbin/geom/core/geom.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.32 2007/09/21 10:00:05 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.33 2007/11/04 00:32:54 marcel Exp $"); #include #include @@ -51,6 +51,10 @@ #include "misc/subr.h" +#ifdef RESCUE +extern uint32_t gpart_version; +extern struct g_command gpart_class_commands[]; +#endif static char comm[MAXPATHLEN], *class_name = NULL, *gclass_name = NULL; static uint32_t *version = NULL; @@ -466,6 +470,7 @@ exit(EXIT_SUCCESS); } +#ifndef RESCUE static const char * library_path(void) { @@ -524,6 +529,7 @@ exit(EXIT_FAILURE); } } +#endif /* !RESCUE */ /* * Class name should be all capital letters. @@ -571,8 +577,18 @@ } else { errx(EXIT_FAILURE, "Invalid utility name."); } + +#ifndef RESCUE + load_library(); +#else + if (!strcasecmp(class_name, "part")) { + version = &gpart_version; + class_commands = gpart_class_commands; + } else + errx(EXIT_FAILURE, "Invalid class name."); +#endif /* !RESCUE */ + set_class_name(); - load_library(); if (*argc < 1) usage(); } ==== //depot/projects/dtrace/src/sbin/ifconfig/ifbridge.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.11 2007/08/01 00:33:52 thompsa Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.12 2007/11/04 08:32:26 thompsa Exp $"; #endif /* not lint */ #include @@ -177,12 +177,14 @@ printf("%s%s ", prefix, req->ifbr_ifsname); printb("flags", req->ifbr_ifsflags, IFBIFBITS); printf("\n"); - + + printf("%s", pad); + printf("ifmaxaddr %u", req->ifbr_addrmax); + printf(" port %u priority %u", req->ifbr_portno, + req->ifbr_priority); + printf(" path cost %u", req->ifbr_path_cost); + if (req->ifbr_ifsflags & IFBIF_STP) { - printf("%s", pad); - printf("port %u priority %u", - req->ifbr_portno, req->ifbr_priority); - printf(" path cost %u", req->ifbr_path_cost); if (req->ifbr_proto < sizeof(stpproto) / sizeof(stpproto[0])) printf(" proto %s", stpproto[req->ifbr_proto]); @@ -203,8 +205,8 @@ else printf(" ", req->ifbr_state); - printf("\n"); } + printf("\n"); } free(inbuf); @@ -651,6 +653,25 @@ } static void +setbridge_ifmaxaddr(const char *ifn, const char *arg, int s, + const struct afswtch *afp) +{ + struct ifbreq req; + u_long val; + + memset(&req, 0, sizeof(req)); + + if (get_val(arg, &val) < 0 || (val & ~0xffffffff) != 0) + errx(1, "invalid value: %s", arg); + + strlcpy(req.ifbr_ifsname, ifn, sizeof(req.ifbr_ifsname)); + req.ifbr_addrmax = val & 0xffffffff; + + if (do_cmd(s, BRDGSIFAMAX, &req, sizeof(req), 1) < 0) + err(1, "BRDGSIFAMAX %s", arg); +} + +static void setbridge_timeout(const char *arg, int d, int s, const struct afswtch *afp) { struct ifbrparam param; @@ -714,6 +735,7 @@ DEF_CMD_ARG("holdcnt", setbridge_holdcount), DEF_CMD_ARG2("ifpriority", setbridge_ifpriority), DEF_CMD_ARG2("ifpathcost", setbridge_ifpathcost), + DEF_CMD_ARG2("ifmaxaddr", setbridge_ifmaxaddr), DEF_CMD_ARG("timeout", setbridge_timeout), DEF_CMD_ARG("private", setbridge_private), DEF_CMD_ARG("-private", unsetbridge_private), ==== //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#15 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.143 2007/11/02 05:23:22 sam Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.144 2007/11/04 08:32:26 thompsa Exp $ .\" .Dd October 31, 2007 .Dt IFCONFIG 8 @@ -1623,6 +1623,11 @@ To change a previously selected path cost back to automatic, set the cost to 0. The minimum is 1 and the maximum is 200000000. +.It Cm ifmaxaddr Ar interface Ar size +Set the maximum number of hosts allowed from an interface, packets with unknown +source addresses are dropped until an existing host cache entry expires or is +removed. +Set to 0 to disable. .El .Pp The following parameters are specific to lagg interfaces: ==== //depot/projects/dtrace/src/sbin/route/route.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/route/route.c,v 1.82 2007/10/29 00:08:24 mtm Exp $"; + "$FreeBSD: src/sbin/route/route.c,v 1.83 2007/11/04 11:12:40 mtm Exp $"; #endif /* not lint */ #include @@ -823,7 +823,6 @@ else mask = 0xffffffff; } - addr &= mask; } sin->sin_addr.s_addr = htonl(addr); sin = &so_mask.sin; ==== //depot/projects/dtrace/src/share/zoneinfo/asia#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)asia 8.12 +# @(#)asia 8.13 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -1771,7 +1771,31 @@
 # For lack of better info, assume the rule changed to "last Friday in March"
 # this year.
 Rule	Syria	2007	max	-	Mar	lastFri	0:00	1:00	S
-Rule	Syria	2007	max	-	Oct	 1	0:00	0	-
+# From Jesper Norgard (2007-10-27):
+# The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
+# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or
+# rather Midnight between Thursday and Friday. This does make more sence than
+# having it between Wednesday and Thursday (two workdays in Syria) since the
+# weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now
+# it is implemented at midnight of the last workday before weekend...
+# 
+# From Steffen Thorsen (2007-10-27):
+# Jesper Norgaard Welen wrote:
+# 
+# > "Winter local time in Syria will be observed at midnight of Thursday 1
+# > November 2007, and the clock will be put back 1 hour."
+# 
+# I found confirmation on this in this gov.sy-article (Arabic):
+# http://wehda.alwehda.gov.sy/_print_veiw.asp?FileName=12521710520070926111247
+# 
+# which using Google's translate tools says:
+# Council of Ministers also approved the commencement of work on 
+# identifying the winter time as of Friday, 2/11/2007 where the 60th 
+# minute delay at midnight Thursday 1/11/2007.
+#
+# From Arthur David Olson (2007-10-30):
+# My best guess for the future is first Friday in November.
+Rule	Syria	2007	max	-	Nov	 Fri>=1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq
 			2:00	Syria	EE%sT

==== //depot/projects/dtrace/src/share/zoneinfo/northamerica#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)northamerica	8.18
+# @(#)northamerica	8.19
 # 
 
 # also includes Central America and the Caribbean
@@ -2187,6 +2187,23 @@
 # says Cuban clocks will advance at midnight on March 10.
 # For lack of better information, assume Cuba will use US rules,
 # except that it switches at midnight standard time as usual.
+#
+# From Steffen Thorsen (2007-10-25):
+# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week 
+# earlier - on the last Sunday of October, just like in 2006.
+# 
+# He supplied these references:
+# 
+# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
+# http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
+# 
+# From Alex Kryvenishev (2007-10-25):
+# Here is also article from Granma (Cuba):
+# 
+# [Regira] el Horario Normal desde el [proximo] domingo 28 de octubre
+# http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_cuba03.html
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
@@ -2218,9 +2235,8 @@
 Rule	Cuba	1998	1999	-	Mar	lastSun	0:00s	1:00	D
 Rule	Cuba	1998	2003	-	Oct	lastSun	0:00s	0	S
 Rule	Cuba	2000	2006	-	Apr	Sun>=1	0:00s	1:00	D
-Rule	Cuba	2006	only	-	Oct	lastSun	0:00s	0	S
+Rule	Cuba	2006	max	-	Oct	lastSun	0:00s	0	S
 Rule	Cuba	2007	max	-	Mar	Sun>=8	0:00s	1:00	D
-Rule	Cuba	2007	max	-	Nov	Sun>=1	0:00s	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Havana	-5:29:28 -	LMT	1890

==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#21 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.591 2007/11/03 05:15:25 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1732,7 +1732,10 @@
 	PV_STAT(pv_entry_allocs++);
 	pv_entry_count++;
 	if (pv_entry_count > pv_entry_high_water)
-		pagedaemon_wakeup();
+		if (ratecheck(&lastprint, &printinterval))
+			printf("Approaching the limit on PV entries, consider "
+			    "increasing either the vm.pmap.shpgperproc or the "
+			    "vm.pmap.pv_entry_max sysctl.\n");
 	pc = TAILQ_FIRST(&pmap->pm_pvchunk);
 	if (pc != NULL) {
 		for (field = 0; field < _NPCM; field++) {
@@ -1767,10 +1770,6 @@
 		 * pages.  After that, if a pv chunk entry is still needed,
 		 * destroy mappings to active pages.
 		 */
-		if (ratecheck(&lastprint, &printinterval))
-			printf("Approaching the limit on PV entries, consider "
-			    "increasing sysctl vm.pmap.shpgperproc or "
-			    "vm.pmap.pv_entry_max\n");
 		PV_STAT(pmap_collect_inactive++);
 		pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]);
 		m = vm_page_alloc(NULL, colour,

==== //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.7 2007/11/04 21:54:52 cognet Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
@@ -39,7 +39,6 @@
  * in the Intel Access Library (IAL) and the OS-specific driver.
  *
  * XXX add vlan support
- * XXX NPE-C port doesn't work yet
  */
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"

==== //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#20 (text+ko) ====

@@ -96,7 +96,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.45 2007/10/12 06:03:43 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.46 2007/11/03 17:33:41 scottl Exp $");
 
 #include 
 #include  /* XXX For static handler registration */
@@ -562,7 +562,8 @@
 				"Event %#x (ACK %sequired).\n",
 				msg->Event, msg->AckRequired? "r" : "not r");
 		} else if (handled == 0) {
-			mpt_lprt(mpt, MPT_PRT_WARN,
+			mpt_lprt(mpt,
+				msg->AckRequired? MPT_PRT_WARN : MPT_PRT_INFO,
 				"Unhandled Event Notify Frame. Event %#x "
 				"(ACK %sequired).\n",
 				msg->Event, msg->AckRequired? "r" : "not r");

==== //depot/projects/dtrace/src/sys/dev/safe/safe.c#8 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.19 2007/11/03 19:10:14 sam Exp $");
 
 /*
  * SafeNet SafeXcel-1141 hardware crypto accelerator
@@ -307,7 +307,7 @@
 		goto bad4;
 	}
 	if (bus_dma_tag_create(NULL,			/* parent */
-			       sizeof(u_int32_t),	/* alignment */
+			       1,			/* alignment */
 			       SAFE_MAX_DSIZE,		/* boundary */
 			       BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
 			       BUS_SPACE_MAXADDR,	/* highaddr */

==== //depot/projects/dtrace/src/sys/dev/sound/pci/atiixp.c#8 (text+ko) ====

@@ -63,7 +63,7 @@
 
 #include 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Nov  4 22:30:53 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 151C116A474; Sun,  4 Nov 2007 22:30: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 CDD3F16A418
	for ; Sun,  4 Nov 2007 22:30:52 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A8AB313C48A
	for ; Sun,  4 Nov 2007 22:30:52 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4MUqAP083245
	for ; Sun, 4 Nov 2007 22:30:52 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4MUqlB083241
	for perforce@freebsd.org; Sun, 4 Nov 2007 22:30:52 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sun, 4 Nov 2007 22:30:52 GMT
Message-Id: <200711042230.lA4MUqlB083241@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128640 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 04 Nov 2007 22:30:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=128640

Change 128640 by gonzo@gonzo_jeeves on 2007/11/04 22:29:57

	o Disable optimization for a while, even -O1 generates wrong code.

Affected files ...

.. //depot/projects/mips2/src/sys/conf/kern.pre.mk#6 edit

Differences ...

==== //depot/projects/mips2/src/sys/conf/kern.pre.mk#6 (text+ko) ====

@@ -25,7 +25,7 @@
 COPTFLAGS?=	-O
 .else
 . if defined(DEBUG)
-_MINUS_O=	-O
+_MINUS_O=	
 . else
 _MINUS_O=	-O2
 . endif

From owner-p4-projects@FreeBSD.ORG  Sun Nov  4 22:41:05 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 530A416A420; Sun,  4 Nov 2007 22:41: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 D091716A41A
	for ; Sun,  4 Nov 2007 22:41:04 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C3F2413C4B6
	for ; Sun,  4 Nov 2007 22:41:04 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4Mf4Af083895
	for ; Sun, 4 Nov 2007 22:41:04 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4Mf4xG083891
	for perforce@freebsd.org; Sun, 4 Nov 2007 22:41:04 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 4 Nov 2007 22:41:04 GMT
Message-Id: <200711042241.lA4Mf4xG083891@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128645 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 04 Nov 2007 22:41:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=128645

Change 128645 by kmacy@kmacy:storage:toestack on 2007/11/04 22:40:52

	add configuration option of DISABLE_TCP_OFFLOAD so that offload hooks become no-ops
	add hooks for offload listen close
	add eventhandler hooks for listen offload start and stop

Affected files ...

.. //depot/projects/toestack/sys/netinet/tcp_ofld.c#5 edit
.. //depot/projects/toestack/sys/netinet/tcp_ofld.h#6 edit
.. //depot/projects/toestack/sys/netinet/tcp_subr.c#7 edit
.. //depot/projects/toestack/sys/netinet/tcp_usrreq.c#7 edit

Differences ...

==== //depot/projects/toestack/sys/netinet/tcp_ofld.c#5 (text+ko) ====

@@ -65,43 +65,40 @@
 }
 
 int
-ofld_disconnect(struct tcpcb *tp)
+ofld_send(struct tcpcb *tp)
 {
-
-       	return tp->t_tu->tu_disconnect(tp);
+	return tp->t_tu->tu_send(tp);
 }
 
 int
-ofld_abort(struct tcpcb *tp)
+ofld_rcvd(struct tcpcb *tp)
 {
 
-	return tp->t_tu->tu_abort(tp);
+	return tp->t_tu->tu_rcvd(tp);
 }
 
 int
-ofld_send(struct tcpcb *tp)
+ofld_disconnect(struct tcpcb *tp)
 {
-
-	return tp->t_tu->tu_send(tp);
+       	return tp->t_tu->tu_disconnect(tp);
 }
 
 int
-ofld_listen(struct tcpcb *tp)
+ofld_abort(struct tcpcb *tp)
 {
+	return tp->t_tu->tu_abort(tp);
+}
 
-	return tp->t_tu->tu_listen_start(tp);
+void
+ofld_listen_open(struct tcpcb *tp)
+{
+	EVENTHANDLER_INVOKE(ofld_listen, OFLD_LISTEN_OPEN, tp);
 }
 
-int
+void
 ofld_listen_close(struct tcpcb *tp)
 {
-
-	return tp->t_tu->tu_listen_stop(tp);
+	EVENTHANDLER_INVOKE(ofld_listen, OFLD_LISTEN_CLOSE, tp);
 }
 
-int
-ofld_rcvd(struct tcpcb *tp)
-{
 
-	return tp->t_tu->tu_rcvd(tp);
-}

==== //depot/projects/toestack/sys/netinet/tcp_ofld.h#6 (text+ko) ====

@@ -5,18 +5,18 @@
 #define tp_offload(tp) ((tp)->t_flags & TF_TOE)
 #define SO_OFFLOADABLE(so) ((so->so_options & SO_NOOFFLOAD) == 0)
 
-
 int ofld_connect(struct socket *so, struct sockaddr *nam);
 int ofld_can_offload(struct tcpcb *tp, struct sockaddr *nam);
+
+int ofld_send(struct tcpcb *tp);
+int ofld_rcvd(struct tcpcb *tp);
 int ofld_disconnect(struct tcpcb *tp);
 int ofld_abort(struct tcpcb *tp);
-int ofld_send(struct tcpcb *tp);
-int ofld_listen(struct tcpcb *tp);
-int ofld_listen_close(struct tcpcb *tp);
-int ofld_rcvd(struct tcpcb *tp);
 
+void ofld_listen_open(struct tcpcb *tp);
+void ofld_listen_close(struct tcpcb *tp);
 
-
+#ifndef DISABLE_TCP_OFFLOAD
 static __inline int
 tcp_gen_connect(struct socket *so, struct sockaddr *nam)
 {
@@ -72,36 +72,81 @@
 }
 
 static __inline int
-tcp_gen_listen(struct tcpcb *tp)
+tcp_gen_rcvd(struct tcpcb *tp)
 {
 	int error;
 
 	if (tp_offload(tp))
-		error = ofld_listen(tp);
+		error = ofld_rcvd(tp);
+	else
+		error = tcp_output(tp);
 
 	return (error);
 }
 
+static __inline void
+tcp_gen_listen_open(struct tcpcb *tp)
+{
+	if (SO_OFFLOADABLE(tp->t_inpcb->inp_socket))
+	    ofld_listen_open(tp);
+}
+
+static __inline void
+tcp_gen_listen_close(struct tcpcb *tp)
+{
+	ofld_listen_close(tp);
+}
+#else
+
 static __inline int
+tcp_gen_connect(struct socket *so, struct sockaddr *nam)
+{
+	return tcp_output(tp);
+}
+
+static __inline int
+tcp_gen_disconnect(struct tcpcb *tp)
+{
+	return tcp_output(tp);
+}
+
+static __inline int
+tcp_gen_abort(struct tcpcb *tp)
+{
+	return tcp_output(tp);
+}
+
+static __inline int
+tcp_gen_send(struct tcpcb *tp)
+{
+	return tcp_output(tp);
+}
+
+static __inline int
 tcp_gen_rcvd(struct tcpcb *tp)
 {
-	int error;
+	return tcp_output(tp);
+}
+
+static __inline void
+tcp_gen_listen_open(struct tcpcb *tp) {}
 
-	if (tp_offload(tp))
-		error = ofld_rcvd(tp);
-	else
-		error = tcp_output(tp);
+static __inline void
+tcp_gen_listen_close(struct tcpcb *tp) {}
 
-	return (error);
-}
+#endif
 
 struct toe_usrreqs {
+	int (*tu_send)(struct tcpcb *tp);
+	int (*tu_rcvd)(struct tcpcb *tp);
 	int (*tu_disconnect)(struct tcpcb *tp);
 	int (*tu_abort)(struct tcpcb *tp);
-	int (*tu_send)(struct tcpcb *tp);
-	int (*tu_listen_start)(struct tcpcb *tp);
-	int (*tu_listen_stop)(struct tcpcb *tp);
-	int (*tu_rcvd)(struct tcpcb *tp);
+
 };
 
+#define OFLD_LISTEN_OPEN       1
+#define OFLD_LISTEN_CLOSE      2
+typedef void (*ofld_listen_fn)(void *, int, struct tcpcb *);
+EVENTHANDLER_DECLARE(ofld_listen, ofld_listen_fn);
+
 #endif

==== //depot/projects/toestack/sys/netinet/tcp_subr.c#7 (text+ko) ====

@@ -769,6 +769,9 @@
 	INP_INFO_WLOCK_ASSERT(&tcbinfo);
 	INP_LOCK_ASSERT(inp);
 
+	if (tp->t_state == TCPS_LISTEN)
+		tcp_gen_listen_close(tp);
+	
 	in_pcbdrop(inp);
 	tcpstat.tcps_closed++;
 	KASSERT(inp->inp_socket != NULL, ("tcp_close: inp_socket NULL"));

==== //depot/projects/toestack/sys/netinet/tcp_usrreq.c#7 (text+ko) ====

@@ -386,7 +386,7 @@
 	if (error == 0) {
 		tp->t_state = TCPS_LISTEN;
 		solisten_proto(so, backlog);
-		tcp_gen_listen(tp);
+		tcp_gen_listen_open(tp);
 	}
 	SOCK_UNLOCK(so);
 
@@ -1513,8 +1513,9 @@
 	INP_LOCK_ASSERT(tp->t_inpcb);
 
 	switch (tp->t_state) {
+	case TCPS_LISTEN:
+		tcp_gen_listen_close(tp);
 	case TCPS_CLOSED:
-	case TCPS_LISTEN:
 		tp->t_state = TCPS_CLOSED;
 		tp = tcp_close(tp);
 		/*

From owner-p4-projects@FreeBSD.ORG  Sun Nov  4 22:44:08 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85E5A16A469; Sun,  4 Nov 2007 22:44: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 11D0716A41B
	for ; Sun,  4 Nov 2007 22:44:08 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 03BFD13C491
	for ; Sun,  4 Nov 2007 22:44:08 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4Mi7up084068
	for ; Sun, 4 Nov 2007 22:44:07 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4Mi7RY084065
	for perforce@freebsd.org; Sun, 4 Nov 2007 22:44:07 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 4 Nov 2007 22:44:07 GMT
Message-Id: <200711042244.lA4Mi7RY084065@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128646 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 04 Nov 2007 22:44:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=128646

Change 128646 by kmacy@kmacy:storage:toestack on 2007/11/04 22:43:20

	add initial hooks for listen offload 
	add support code for reset

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 (text+ko) ====

@@ -132,6 +132,8 @@
 extern int tcp_autorcvbuf_max;
 extern int tcp_autosndbuf_max;
 
+static void t3_send_reset(struct socket *so);
+
 static inline unsigned int
 mkprio(unsigned int cntrl, const struct socket *so)
 {
@@ -427,14 +429,16 @@
 	
 	so = tp->t_inpcb->inp_socket;
 	close_conn(so);
-
 	return (0);
 }
 
 static int
 cxgb_toe_abort(struct tcpcb *tp)
 {
-	printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__);
+	struct socket *so;
+
+	so = tp->t_inpcb->inp_socket;
+	t3_send_reset(so);
 	return (0);
 }
 
@@ -451,20 +455,6 @@
 }
 
 static int
-cxgb_toe_listen_start(struct tcpcb *tp)
-{
-	printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__);
-	return (0);
-}
-
-static int
-cxgb_toe_listen_stop(struct tcpcb *tp)
-{
-	printf("%s UNIMPLEMENTED!!!!\n", __FUNCTION__);
-	return (0);
-}
-
-static int
 cxgb_toe_rcvd(struct tcpcb *tp)
 {
 	t3_cleanup_rbuf(tp);
@@ -476,8 +466,6 @@
 	.tu_disconnect = cxgb_toe_disconnect,
 	.tu_abort = cxgb_toe_abort,
 	.tu_send = cxgb_toe_send,
-	.tu_listen_start = cxgb_toe_listen_start,
-	.tu_listen_stop = cxgb_toe_listen_stop,
 	.tu_rcvd = cxgb_toe_rcvd,
 };
 
@@ -954,6 +942,57 @@
 }
 
 /*
+ * Send an ABORT_REQ message.  Cannot fail.  This routine makes sure we do
+ * not send multiple ABORT_REQs for the same connection and also that we do
+ * not try to send a message after the connection has closed.  Returns 1 if
+ * an ABORT_REQ wasn't generated after all, 0 otherwise.
+ */
+static void
+t3_send_reset(struct socket *so)
+{
+	printf("t3_send_reset unimplemented\n");
+	
+#ifdef notyet
+	struct cpl_abort_req *req;
+	struct tcp_sock *tp = tcp_sk(sk);
+	unsigned int tid = TID(tp);
+	int mode = CPL_ABORT_SEND_RST;
+	
+	if (unlikely(sock_flag(sk, ABORT_SHUTDOWN) || !TOE_DEV(sk))) {
+		if (skb)
+			__kfree_skb(skb);
+		return 1;
+	}
+
+	sock_set_flag(sk, ABORT_RPL_PENDING);
+	sock_set_flag(sk, ABORT_SHUTDOWN);
+
+	/* Purge the send queue so we don't send anything after an abort. */
+	t3_purge_write_queue(sk);
+
+	if (sock_flag(sk, CLOSE_CON_REQUESTED) && is_t3a(TOE_DEV(sk)))
+		mode |= CPL_ABORT_POST_CLOSE_REQ;
+
+	if (!skb)
+		skb = alloc_skb_nofail(sizeof(*req));
+	skb->priority = mkprio(CPL_PRIORITY_DATA, sk);
+	set_arp_failure_handler(skb, abort_arp_failure);
+
+	req = (struct cpl_abort_req *)skb_put(skb, sizeof(*req));
+	req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_REQ));
+	req->wr.wr_lo = htonl(V_WR_TID(tid));
+	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ABORT_REQ, tid));
+	req->rsvd0 = htonl(tp->snd_nxt);
+	req->rsvd1 = !sock_flag(sk, TX_DATA_SENT);
+	req->cmd = mode;
+	if (sk->sk_state == TCP_SYN_SENT)
+		__skb_queue_tail(&tp->out_of_order_queue, skb);	// defer
+	else
+		l2t_send(T3C_DEV(sk), skb, L2T_ENTRY(sk));
+#endif
+}
+
+/*
  * Process new data received for a connection.
  */
 static void

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 (text+ko) ====

@@ -6,14 +6,16 @@
 #define toeptoso(toep) ((toep)->tp_tp->t_inpcb->inp_socket)
 #define sototoep(so) (sototcpcb((so))->t_toe)
 
+void t3tom_register_cpl_handler(unsigned int opcode, cxgb_cpl_handler_func h);
+void t3_listen_start(struct toedev *dev, struct socket *so, struct t3cdev *cdev);
+void t3_listen_stop(struct toedev *dev, struct socket *so, struct t3cdev *cdev);
+int t3_push_frames(struct socket *so, int req_completion);
 void t3_enable_ddp(struct socket *so, int on);
 int t3_connect(struct toedev *tdev, struct socket *so, struct ifnet *egress_ifp);
 void t3_init_listen_cpl_handlers(void);
 int t3_init_cpl_io(void);
-void t3tom_register_cpl_handler(unsigned int opcode, cxgb_cpl_handler_func h);
 void t3_init_offload_ops(void);
 void t3_init_wr_tab(unsigned int wr_len);
-int t3_push_frames(struct socket *so, int req_completion);
 uint32_t t3_send_rx_credits(struct tcpcb *tp, uint32_t credits, uint32_t dack, int nofail);
 void t3_cleanup_rbuf(struct tcpcb *tp);
 

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 (text+ko) ====

@@ -1,6 +1,3 @@
-
-
-
 /**************************************************************************
 
 Copyright (c) 2007, Chelsio Inc.
@@ -42,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -98,3 +96,112 @@
 	t3tom_register_cpl_handler(CPL_PASS_OPEN_RPL, do_pass_open_rpl);
 	t3tom_register_cpl_handler(CPL_CLOSE_LISTSRV_RPL, do_close_server_rpl);
 }
+
+
+/*
+ * Start a listening server by sending a passive open request to HW.
+ */
+void
+t3_listen_start(struct toedev *dev, struct socket *so, struct t3cdev *cdev)
+{
+	printf("start listen\n");
+#if 0
+	int stid;
+	struct sk_buff *skb;
+	struct cpl_pass_open_req *req;
+	struct tom_data *d = TOM_DATA(dev);
+	struct listen_ctx *ctx;
+
+	if (!TOM_TUNABLE(dev, activated))
+		return;
+
+	ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
+	if (!ctx)
+		return;
+
+	ctx->tom_data = d;
+	ctx->lsk = sk;
+
+	stid = cxgb3_alloc_stid(d->cdev, d->client, ctx);
+	if (stid < 0)
+		goto free_ctx;
+	
+	sock_hold(sk);
+
+	skb = alloc_skb(sizeof(*req), GFP_KERNEL);
+	if (!skb)
+		goto free_stid;
+
+	if (!listen_hash_add(d, sk, stid))
+		goto free_all;
+
+	req = (struct cpl_pass_open_req *)__skb_put(skb, sizeof(*req));
+	req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
+	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_PASS_OPEN_REQ, stid));
+#ifdef	LINUX_2_4
+	req->local_port = sk->sport;
+	req->local_ip = sk->rcv_saddr;
+#else
+	req->local_port = inet_sk(sk)->sport;
+	req->local_ip = inet_sk(sk)->rcv_saddr;
+#endif	/* LINUX_2_4 */
+	req->peer_port = 0;
+	req->peer_ip = 0;
+	req->peer_netmask = 0;
+	req->opt0h = htonl(F_DELACK | F_TCAM_BYPASS);
+	req->opt0l = htonl(V_RCV_BUFSIZ(16));
+	req->opt1 = htonl(V_CONN_POLICY(CPL_CONN_POLICY_ASK));
+
+	skb->priority = CPL_PRIORITY_LISTEN;
+	cxgb3_ofld_send(cdev, skb);
+	return;
+
+free_all:
+	__kfree_skb(skb);
+free_stid:
+	cxgb3_free_stid(cdev, stid);
+	sock_put(sk);
+free_ctx:
+	kfree(ctx);
+#endif
+}
+
+/*
+ * Stop a listening server by sending a close_listsvr request to HW.
+ * The server TID is freed when we get the reply.
+ */
+void
+t3_listen_stop(struct toedev *dev, struct socket *so, struct t3cdev *cdev)
+{
+	printf("stop listen\n");
+#if 0
+	struct sk_buff *skb;
+	struct cpl_close_listserv_req *req;
+
+	int stid = listen_hash_del(TOM_DATA(dev), sk);
+	if (stid < 0)
+		return;
+
+	/*
+	 * Do this early so embryonic connections are marked as being aborted
+	 * while the stid is still open.  This ensures pass_establish messages
+	 * that arrive while we are closing the server will be able to locate
+	 * the listening socket.
+	 */
+	t3_reset_synq(sk);
+
+	/* Send the close ASAP to stop further passive opens */
+	skb = alloc_skb_nofail(sizeof(*req));
+	req = (struct cpl_close_listserv_req *)__skb_put(skb, sizeof(*req));
+	req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
+	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_LISTSRV_REQ, stid));
+	req->cpu_idx = 0;
+	skb->priority = CPL_PRIORITY_LISTEN;
+	cxgb3_ofld_send(cdev, skb);
+
+	t3_disconnect_acceptq(sk);
+#endif
+}
+
+
+

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#5 (text+ko) ====

@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -56,8 +57,10 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -89,11 +92,7 @@
  */
 static cxgb_cpl_handler_func tom_cpl_handlers[NUM_CPL_CMDS];
 
-#ifdef notyet
-static struct notifier_block listen_notifier = {
-	.notifier_call = listen_notify_handler
-};
-#endif
+static eventhandler_tag listen_tag;
 
 static struct offload_id t3_toe_id_tab[] = {
 	{ TOE_ID_CHELSIO_T3, 0 },
@@ -346,16 +345,51 @@
 	return (0);
 }
 
+static void
+cxgb_toe_listen(void *unused, int event, struct tcpcb *tp)
+{
+	struct socket *so = tp->t_inpcb->inp_socket;
+	struct tom_data *p;
+
+	switch (event) {
+	case OFLD_LISTEN_OPEN:
+	case OFLD_LISTEN_CLOSE:
+		mtx_lock(&cxgb_list_lock);
+		TAILQ_FOREACH(p, &cxgb_list, entry) {
+			if (event == OFLD_LISTEN_OPEN)
+				t3_listen_start(&p->tdev, so, p->cdev);
+			else
+				t3_listen_stop(&p->tdev, so, p->cdev);
+		}
+		mtx_unlock(&cxgb_list_lock);
+		break;
+	default:
+		log(LOG_ERR, "unrecognized listen event %d\n", event);
+		break;
+	}
+}
+
+static void
+cxgb_register_listeners(void)
+{
+	struct inpcb *inp;
+	struct tcpcb *tp;
+	
+	INP_INFO_RLOCK(&tcbinfo);
+	LIST_FOREACH(inp, tcbinfo.ipi_listhead, inp_list) {
+		tp = intotcpcb(inp);
+
+		if (tp->t_state == TCPS_LISTEN)
+			cxgb_toe_listen(NULL, OFLD_LISTEN_OPEN, tp);
+	}
+	INP_INFO_RUNLOCK(&tcbinfo);
+}
+
 static int
 t3_tom_init(void)
 {
 
 #if 0
-#ifdef CONFIG_CHELSIO_T3_OFFLOAD_MODULE
-	err = prepare_tom_for_offload();
-	if (err)
-		return err;
-#endif
 	struct socket *sock;
 	err = sock_create_kern(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);
 	if (err < 0) {
@@ -380,20 +414,18 @@
 		    "Unable to register Chelsio T3 TCP offload module.\n");
 		return -1;
 	}
-#ifdef notyet
-	register_listen_offload_notifier(&listen_notifier);
-#endif
+
+	mtx_init(&cxgb_list_lock, "cxgb tom list", NULL, MTX_DEF);
+	listen_tag = EVENTHANDLER_REGISTER(ofld_listen, cxgb_toe_listen, NULL, EVENTHANDLER_PRI_ANY);
 	TAILQ_INIT(&cxgb_list);
 	
-	mtx_init(&cxgb_list_lock, "cxgb tom list", NULL, MTX_DEF);
 	/* Register to offloading devices */
 	t3c_tom_client.add = t3c_tom_add;
 	cxgb_register_client(&t3c_tom_client);
-
-	return 0;
+	cxgb_register_listeners();
+	return (0);
 }
 
-
 static int
 t3_tom_load(module_t mod, int cmd, void *arg)
 {

From owner-p4-projects@FreeBSD.ORG  Sun Nov  4 22:45:09 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B313A16A46D; Sun,  4 Nov 2007 22:45: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 76E9C16A46B
	for ; Sun,  4 Nov 2007 22:45:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5297113C491
	for ; Sun,  4 Nov 2007 22:45:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4Mj9Sq084139
	for ; Sun, 4 Nov 2007 22:45:09 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4Mj9Tk084136
	for perforce@freebsd.org; Sun, 4 Nov 2007 22:45:09 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 4 Nov 2007 22:45:09 GMT
Message-Id: <200711042245.lA4Mj9Tk084136@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128647 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 04 Nov 2007 22:45:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=128647

Change 128647 by kmacy@kmacy:storage:toestack on 2007/11/04 22:44:56

	unimplemented functionality in tom

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/notes#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sun Nov  4 23:10:23 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D20F216A46C; Sun,  4 Nov 2007 23:10: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 8612516A419
	for ; Sun,  4 Nov 2007 23:10:22 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 615D813C491
	for ; Sun,  4 Nov 2007 23:10:22 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA4NAMOs086659
	for ; Sun, 4 Nov 2007 23:10:22 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA4NAMGr086656
	for perforce@freebsd.org; Sun, 4 Nov 2007 23:10:22 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Sun, 4 Nov 2007 23:10:22 GMT
Message-Id: <200711042310.lA4NAMGr086656@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128649 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 04 Nov 2007 23:10:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=128649

Change 128649 by gonzo@gonzo_jeeves on 2007/11/04 23:09:27

	o gxemul emulates 64M of memory

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#3 (text+ko) ====

@@ -167,7 +167,7 @@
 	printf("entry: mips_init()\n");
 
 	bootverbose = 1;
-	realmem = btoc(16 << 20);
+	realmem = btoc(64 << 20);
 
 	for (i = 0; i < 10; i++) {
 		phys_avail[i] = 0;

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 00:21:02 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C1E5F16A47C; Mon,  5 Nov 2007 00:21: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 85A2116A478;
	Mon,  5 Nov 2007 00:21:02 +0000 (UTC)
	(envelope-from flata@magnesium.net)
Received: from toxic.magnesium.net (toxic.magnesium.net [207.154.84.15])
	by mx1.freebsd.org (Postfix) with ESMTP id 76B5713C48A;
	Mon,  5 Nov 2007 00:21:02 +0000 (UTC)
	(envelope-from flata@magnesium.net)
Received: by toxic.magnesium.net (Postfix, from userid 1212)
	id 6261BDA824; Sun,  4 Nov 2007 15:20:21 -0800 (PST)
Date: Sun, 4 Nov 2007 13:20:21 -1000
From: Juli Mallett 
To: Oleksandr Tymoshenko 
Message-ID: <20071104232021.GA5721@toxic.magnesium.net>
References: <200711042310.lA4NAMGr086656@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200711042310.lA4NAMGr086656@repoman.freebsd.org>
User-Agent: Mutt/1.5.15 (2007-04-06)
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 128649 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 00:21:03 -0000

a3 on startup should contain memsize on malta.  If you don't clobber a0-a4
before calling into mips_init from the assembly startup, you can just declare it
as taking 4 args (argc, argv, envp, memsize) on malta.

* Oleksandr Tymoshenko  [ 2007-11-04 ]
	[ PERFORCE change 128649 for review ]
> http://perforce.freebsd.org/chv.cgi?CH=128649
> 
> Change 128649 by gonzo@gonzo_jeeves on 2007/11/04 23:09:27
> 
> 	o gxemul emulates 64M of memory
> 
> Affected files ...
> 
> .. //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#3 edit
> 
> Differences ...
> 
> ==== //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#3 (text+ko) ====
> 
> @@ -167,7 +167,7 @@
>  	printf("entry: mips_init()\n");
>  
>  	bootverbose = 1;
> -	realmem = btoc(16 << 20);
> +	realmem = btoc(64 << 20);
>  
>  	for (i = 0; i < 10; i++) {
>  		phys_avail[i] = 0;

-- 

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 02:26:33 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E6C516A468; Mon,  5 Nov 2007 02:26: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 B468216A417
	for ; Mon,  5 Nov 2007 02:26:32 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A7B9013C491
	for ; Mon,  5 Nov 2007 02:26:32 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA52QWeF035441
	for ; Mon, 5 Nov 2007 02:26:32 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA52QWtW035438
	for perforce@freebsd.org; Mon, 5 Nov 2007 02:26:32 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 5 Nov 2007 02:26:32 GMT
Message-Id: <200711050226.lA52QWtW035438@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128663 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 02:26:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=128663

Change 128663 by kmacy@kmacy:storage:toestack on 2007/11/05 02:26:04

	- add RST send on abort
	- add listen setup and teardown infrastructure
	- reflect changes in notes

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#14 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#5 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/notes#2 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#14 (text+ko) ====

@@ -322,7 +322,19 @@
 
 }
 
+/*
+ * Handle an ARP failure for a CPL_ABORT_REQ.  Change it into a no RST variant
+ * and send it along.
+ */
+static void
+abort_arp_failure(struct t3cdev *cdev, struct mbuf *m)
+{
+	struct cpl_abort_req *req = cplhdr(m);
 
+	req->cmd = CPL_ABORT_NO_RST;
+	cxgb_ofld_send(cdev, m);
+}
+
 /*
  * Send RX credits through an RX_DATA_ACK CPL message.  If nofail is 0 we are
  * permitted to return without sending the message in case we cannot allocate
@@ -873,7 +885,8 @@
  * check SOCK_DEAD or sk->sk_sock.  Or maybe generate the error here but don't
  * free the atid.  Hmm.
  */
-static void act_open_req_arp_failure(struct t3cdev *dev, struct mbuf *m)
+static void
+act_open_req_arp_failure(struct t3cdev *dev, struct mbuf *m)
 {
 	struct toepcb *toep = m_get_toep(m);
 	struct tcpcb *tp = toep->tp_tp;
@@ -950,46 +963,46 @@
 static void
 t3_send_reset(struct socket *so)
 {
-	printf("t3_send_reset unimplemented\n");
 	
-#ifdef notyet
 	struct cpl_abort_req *req;
-	struct tcp_sock *tp = tcp_sk(sk);
-	unsigned int tid = TID(tp);
+	struct tcpcb *tp = sototcpcb(so);
+	struct toepcb *toep = tp->t_toe;
+	unsigned int tid = toep->tp_tid;
 	int mode = CPL_ABORT_SEND_RST;
+	struct mbuf *m;
 	
-	if (unlikely(sock_flag(sk, ABORT_SHUTDOWN) || !TOE_DEV(sk))) {
-		if (skb)
-			__kfree_skb(skb);
-		return 1;
-	}
+	if (__predict_false((toep->tp_flags & TP_ABORT_SHUTDOWN) || !TOE_DEV(so)))
+		return;
 
-	sock_set_flag(sk, ABORT_RPL_PENDING);
-	sock_set_flag(sk, ABORT_SHUTDOWN);
-
+	toep->tp_flags |= (TP_ABORT_RPL_PENDING|TP_ABORT_SHUTDOWN);
+	
 	/* Purge the send queue so we don't send anything after an abort. */
-	t3_purge_write_queue(sk);
-
+	sbflush(&so->so_snd);
+#ifdef notyet
 	if (sock_flag(sk, CLOSE_CON_REQUESTED) && is_t3a(TOE_DEV(sk)))
 		mode |= CPL_ABORT_POST_CLOSE_REQ;
+#endif
+	m = m_gethdr(M_NOWAIT, MT_DATA);
+	if (m == NULL) {
+		/*
+		 * XXX add lowmem cache
+		 */
+	}
+	m->m_pkthdr.len = m->m_len = sizeof(*req);
+	m_set_priority(m, mkprio(CPL_PRIORITY_DATA, so));
+	set_arp_failure_handler(m, abort_arp_failure);
 
-	if (!skb)
-		skb = alloc_skb_nofail(sizeof(*req));
-	skb->priority = mkprio(CPL_PRIORITY_DATA, sk);
-	set_arp_failure_handler(skb, abort_arp_failure);
-
-	req = (struct cpl_abort_req *)skb_put(skb, sizeof(*req));
+	req = mtod(m, struct cpl_abort_req *);
 	req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_REQ));
 	req->wr.wr_lo = htonl(V_WR_TID(tid));
 	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ABORT_REQ, tid));
 	req->rsvd0 = htonl(tp->snd_nxt);
-	req->rsvd1 = !sock_flag(sk, TX_DATA_SENT);
+	req->rsvd1 = !(toep->tp_flags & TP_DATASENT);
 	req->cmd = mode;
-	if (sk->sk_state == TCP_SYN_SENT)
-		__skb_queue_tail(&tp->out_of_order_queue, skb);	// defer
+	if (tp->t_state == TCPS_SYN_SENT)
+		mbufq_tail(&toep->out_of_order_queue, m);	// defer
 	else
-		l2t_send(T3C_DEV(sk), skb, L2T_ENTRY(sk));
-#endif
+		l2t_send(T3C_DEV(so), m, toep->tp_l2t);
 }
 
 /*
@@ -1256,7 +1269,8 @@
 /*
  * Handler for CLOSE_CON_RPL CPL messages.
  */
-static int do_close_con_rpl(struct t3cdev *cdev, struct mbuf *m,
+static int
+do_close_con_rpl(struct t3cdev *cdev, struct mbuf *m,
 			    void *ctx)
 {
 	struct socket *so = (struct socket *)ctx;
@@ -1267,7 +1281,44 @@
 	return (0);
 }
 
+
 /*
+ * Add a passively open socket to its parent's accept queue.  Note that the
+ * child may be in any state by now, including TCP_CLOSE.  We can guarantee
+ * though that it has not been orphaned yet.
+ */
+static void
+add_pass_open_to_parent(struct socket *child, struct socket *lso,
+    struct toedev *dev)
+{
+	struct tcpcb *tp = sototcpcb(lso);
+	/*
+	 * If the server is closed it has already killed its embryonic
+	 * children.  There is nothing further to do about child.
+	 */
+	if (tp->t_state != TCPS_LISTEN)
+		return;
+
+	printf("need to move connection from syncache to so_comp for accept XXX\n");
+#ifdef notyet
+	oreq = child->sk_user_data;
+	child->sk_user_data = NULL;
+
+	inet_csk_reqsk_queue_removed(lsk, oreq);
+	synq_remove(tcp_sk(child));
+
+	if (sk_acceptq_is_full(lsk) && !TOM_TUNABLE(dev, soft_backlog_limit)) {
+		NET_INC_STATS_BH(LINUX_MIB_LISTENOVERFLOWS);
+		NET_INC_STATS_BH(LINUX_MIB_LISTENDROPS);
+		__reqsk_free(oreq);
+		add_to_reap_list(child);
+	} else {
+		inet_csk_reqsk_queue_add(lsk, oreq, child);
+		lsk->sk_data_ready(lsk, 0);
+	}
+#endif	
+}
+/*
  * Called when a connection is established to translate the TCP options
  * reported by HW to Linux's native format.
  */
@@ -1325,6 +1376,74 @@
 }
 
 /*
+ * Process a CPL_PASS_ESTABLISH message.  XXX a lot of the locking doesn't work
+ * if we are in TCP_SYN_RECV due to crossed SYNs
+ */
+static int
+do_pass_establish(struct t3cdev *cdev, struct mbuf *m, void *ctx)
+{
+	struct cpl_pass_establish *req = cplhdr(m);
+	struct socket *lso, *so = (struct socket *)ctx;
+	struct toedev *tdev = TOE_DEV(so);
+	// Complete socket initialization now that we have the SND_ISN
+	struct tcpcb *tp = sototcpcb(so);
+	struct toepcb *toep = tp->t_toe;
+	struct toe_tid_entry *t3c_stid;
+	struct tid_info *t;
+	unsigned int stid;
+	
+	VALIDATE_SOCK(so);
+
+	SOCK_LOCK(so);
+
+	toep->tp_wr_max = toep->tp_wr_avail = TOM_TUNABLE(tdev, max_wrs);
+	toep->tp_wr_unacked = 0;
+	toep->tp_qset = G_QNUM(ntohl(m->m_pkthdr.csum_data));
+	make_established(so, ntohl(req->snd_isn), ntohs(req->tcp_opt));
+#ifdef notyet
+	/*
+	 * XXX not sure how these checks map to us
+	 */
+	if (unlikely(sk->sk_socket)) {   // simultaneous opens only
+		sk->sk_state_change(sk);
+		sk_wake_async(sk, 0, POLL_OUT);
+	}
+	/*
+	 * The state for the new connection is now up to date.
+	 * Next check if we should add the connection to the parent's
+	 * accept queue.  When the parent closes it resets connections
+	 * on its SYN queue, so check if we are being reset.  If so we
+	 * don't need to do anything more, the coming ABORT_RPL will
+	 * destroy this socket.  Otherwise move the connection to the
+	 * accept queue.
+	 *
+	 * Note that we reset the synq before closing the server so if
+	 * we are not being reset the stid is still open.
+	 */
+	if (unlikely(!tp->forward_skb_hint)) { // removed from synq
+		__kfree_skb(skb);
+		goto unlock;
+	}
+#endif
+
+	stid = G_PASS_OPEN_TID(ntohl(req->tos_tid));
+	t = &(T3C_DATA(cdev))->tid_maps;
+	t3c_stid = lookup_stid(t, stid);
+	lso = ((struct listen_ctx *)t3c_stid->ctx)->lso;
+
+	SOCK_LOCK(lso);
+	m_free(m);
+	add_pass_open_to_parent(so, lso, tdev);
+	SOCK_UNLOCK(lso);
+#if 0
+unlock:
+#endif
+	SOCK_UNLOCK(so);
+		
+	return 0;
+}
+
+/*
  * Fill in the right TID for CPL messages waiting in the out-of-order queue
  * and send them to the TOE.
  */
@@ -1544,7 +1663,8 @@
 /*
  * Handler for TX_DATA_ACK CPL messages.
  */
-static int do_wr_ack(struct t3cdev *dev, struct mbuf *m, void *ctx)
+static int
+do_wr_ack(struct t3cdev *dev, struct mbuf *m, void *ctx)
 {
 	struct socket *so = (struct socket *)ctx;
 
@@ -1556,7 +1676,61 @@
 	return 0;
 }
 
+
+/*
+ * Reset a connection that is on a listener's SYN queue or accept queue,
+ * i.e., one that has not had a struct socket associated with it.
+ * Must be called from process context.
+ *
+ * Modeled after code in inet_csk_listen_stop().
+ */
+static void
+t3_reset_listen_child(struct socket *child)
+{
+	SOCK_LOCK(child);
+	t3_send_reset(child);
+	SOCK_UNLOCK(child);
+}
+
+/*
+ * Disconnect offloaded established but not yet accepted connections sitting
+ * on a server's accept_queue.  We just send an ABORT_REQ at this point and
+ * finish off the disconnect later as we may need to wait for the ABORT_RPL.
+ */
 void
+t3_disconnect_acceptq(struct socket *listen_so)
+{
+	struct socket *so;
+	struct tcpcb *tp;
+
+	TAILQ_FOREACH(so, &listen_so->so_comp, so_list) {
+		tp = sototcpcb(so);
+		
+		if (tp->t_flags & TF_TOE)
+			t3_reset_listen_child(so);
+	}
+}
+
+/*
+ * Reset offloaded connections sitting on a server's syn queue.  As above
+ * we send ABORT_REQ and finish off when we get ABORT_RPL.
+ */
+
+void
+t3_reset_synq(struct socket *listen_so)
+{
+	struct socket *so;
+	struct tcpcb *tp;
+
+	TAILQ_FOREACH(so, &listen_so->so_incomp, so_list) {
+		tp = sototcpcb(so);
+		
+		if (tp->t_flags & TF_TOE)
+			t3_reset_listen_child(so);
+	}
+}
+
+void
 t3_init_wr_tab(unsigned int wr_len)
 {
 	int i;
@@ -1596,14 +1770,15 @@
 	t3tom_register_cpl_handler(CPL_RX_DATA, do_rx_data);
 	t3tom_register_cpl_handler(CPL_CLOSE_CON_RPL, do_close_con_rpl);
 	t3tom_register_cpl_handler(CPL_PEER_CLOSE, do_peer_close);
+	t3tom_register_cpl_handler(CPL_PASS_ESTABLISH, do_pass_establish);
 #ifdef notyet	
-	t3tom_register_cpl_handler(CPL_PASS_ESTABLISH, do_pass_establish);
 	t3tom_register_cpl_handler(CPL_PASS_ACCEPT_REQ, do_pass_accept_req);
+	t3tom_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req);
+	t3tom_register_cpl_handler(CPL_ABORT_RPL_RSS, do_abort_rpl);
+
 	t3tom_register_cpl_handler(CPL_RX_URG_NOTIFY, do_rx_urg_notify);
 	t3tom_register_cpl_handler(CPL_RX_DATA_DDP, do_rx_data_ddp);
 	t3tom_register_cpl_handler(CPL_RX_DDP_COMPLETE, do_rx_ddp_complete);
-	t3tom_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req);
-	t3tom_register_cpl_handler(CPL_ABORT_RPL_RSS, do_abort_rpl);
 	t3tom_register_cpl_handler(CPL_TRACE_PKT, do_trace_pkt);
 	t3tom_register_cpl_handler(CPL_GET_TCB_RPL, do_get_tcb_rpl);
 #endif

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_defs.h#5 (text+ko) ====

@@ -1,6 +1,8 @@
 #ifndef CXGB_DEFS_H_
 #define CXGB_DEFS_H_
 
+#define VALIDATE_TID 0
+
 #define TOEPCB(so)  ((struct toepcb *)(sototcpcb((so))->t_toe))
 #define TOE_DEV(so) (TOEPCB((so))->tp_toedev)
 #define toeptoso(toep) ((toep)->tp_tp->t_inpcb->inp_socket)
@@ -19,6 +21,8 @@
 uint32_t t3_send_rx_credits(struct tcpcb *tp, uint32_t credits, uint32_t dack, int nofail);
 void t3_cleanup_rbuf(struct tcpcb *tp);
 
+void t3_disconnect_acceptq(struct socket *listen_so);
+void t3_reset_synq(struct socket *listen_so);
 
 void toepcb_hold(struct toepcb *);
 void toepcb_release(struct toepcb *);

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 (text+ko) ====

@@ -70,6 +70,9 @@
 #include 
 #include 
 
+static struct listen_info *listen_hash_add(struct tom_data *d, struct socket *so, unsigned int stid);
+static int listen_hash_del(struct tom_data *d, struct socket *so);
+
 /*
  * Process a CPL_CLOSE_LISTSRV_RPL message.  If the status is good we release
  * the STID.
@@ -87,7 +90,41 @@
 static int
 do_pass_open_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx)
 {
-	UNIMPLEMENTED();
+       	struct cpl_pass_open_rpl *rpl = cplhdr(m);
+
+	if (rpl->status != CPL_ERR_NONE) {
+		int stid = GET_TID(rpl);
+		struct listen_ctx *listen_ctx = (struct listen_ctx *)ctx;
+		struct tom_data *d = listen_ctx->tom_data;
+		struct socket *lso = listen_ctx->lso;
+
+#if VALIDATE_TID
+		if (!lso)
+			return (CPL_RET_UNKNOWN_TID | CPL_RET_BUF_DONE);
+#endif
+		/*
+		 * Note: It is safe to unconditionally call listen_hash_del()
+		 * at this point without risking unhashing a reincarnation of
+		 * an already closed socket (i.e., there is no listen, close,
+		 * listen, free the sock for the second listen while processing
+		 * a message for the first race) because we are still holding
+		 * a reference on the socket.  It is possible that the unhash
+		 * will fail because the socket is already closed, but we can't
+		 * unhash the wrong socket because it is impossible for the
+		 * socket to which this message refers to have reincarnated.
+		 */
+		listen_hash_del(d, lso);
+		cxgb_free_stid(cdev, stid);
+#ifdef notyet
+		/*
+		 * XXX need to unreference the inpcb
+		 * but we have no way of knowing that other TOMs aren't referencing it 
+		 */
+		sock_put(lso);
+#endif
+		free(listen_ctx, M_DEVBUF);
+	}
+	return CPL_RET_BUF_DONE;
 }
 
 void __init
@@ -97,6 +134,82 @@
 	t3tom_register_cpl_handler(CPL_CLOSE_LISTSRV_RPL, do_close_server_rpl);
 }
 
+static inline int
+listen_hashfn(const struct socket *so)
+{
+	return ((unsigned long)so >> 10) & (LISTEN_INFO_HASH_SIZE - 1);
+}
+
+/*
+ * Create and add a listen_info entry to the listen hash table.  This and the
+ * listen hash table functions below cannot be called from softirqs.
+ */
+static struct listen_info *
+listen_hash_add(struct tom_data *d, struct socket *so, unsigned int stid)
+{
+	struct listen_info *p;
+
+	p = malloc(sizeof(*p), M_DEVBUF, M_NOWAIT|M_ZERO);
+	if (p) {
+		int bucket = listen_hashfn(so);
+
+		p->so = so;	/* just a key, no need to take a reference */
+		p->stid = stid;
+		mtx_lock(&d->listen_lock);		
+		p->next = d->listen_hash_tab[bucket];
+		d->listen_hash_tab[bucket] = p;
+		mtx_unlock(&d->listen_lock);
+	}
+	return p;
+}
+
+#if 0
+/*
+ * Given a pointer to a listening socket return its server TID by consulting
+ * the socket->stid map.  Returns -1 if the socket is not in the map.
+ */
+static int
+listen_hash_find(struct tom_data *d, struct socket *so)
+{
+	int stid = -1, bucket = listen_hashfn(so);
+	struct listen_info *p;
+
+	spin_lock(&d->listen_lock);
+	for (p = d->listen_hash_tab[bucket]; p; p = p->next)
+		if (p->sk == sk) {
+			stid = p->stid;
+			break;
+		}
+	spin_unlock(&d->listen_lock);
+	return stid;
+}
+#endif
+
+/*
+ * Delete the listen_info structure for a listening socket.  Returns the server
+ * TID for the socket if it is present in the socket->stid map, or -1.
+ */
+static int
+listen_hash_del(struct tom_data *d, struct socket *so)
+{
+	int bucket, stid = -1;
+	struct listen_info *p, **prev;
+
+	bucket = listen_hashfn(so);
+	prev  = &d->listen_hash_tab[bucket];
+
+	mtx_lock(&d->listen_lock);
+	for (p = *prev; p; prev = &p->next, p = p->next)
+		if (p->so == so) {
+			stid = p->stid;
+			*prev = p->next;
+			free(p, M_DEVBUF);
+			break;
+		}
+	mtx_unlock(&d->listen_lock);
+	
+	return (stid);
+}
 
 /*
  * Start a listening server by sending a passive open request to HW.
@@ -104,47 +217,51 @@
 void
 t3_listen_start(struct toedev *dev, struct socket *so, struct t3cdev *cdev)
 {
-	printf("start listen\n");
-#if 0
 	int stid;
-	struct sk_buff *skb;
+	struct mbuf *m;
 	struct cpl_pass_open_req *req;
 	struct tom_data *d = TOM_DATA(dev);
+	struct inpcb *inp = sotoinpcb(so);
+	struct tcpcb *tp = sototcpcb(so);
 	struct listen_ctx *ctx;
 
 	if (!TOM_TUNABLE(dev, activated))
 		return;
 
-	ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
+	printf("start listen\n");
+	
+	ctx = malloc(sizeof(*ctx), M_DEVBUF, M_NOWAIT);
+	
 	if (!ctx)
 		return;
 
 	ctx->tom_data = d;
-	ctx->lsk = sk;
+	ctx->lso = so;
 
-	stid = cxgb3_alloc_stid(d->cdev, d->client, ctx);
+	stid = cxgb_alloc_stid(d->cdev, d->client, ctx);
 	if (stid < 0)
 		goto free_ctx;
-	
+
+#ifdef notyet
+	/*
+	 * XXX need to mark inpcb as referenced
+	 */
 	sock_hold(sk);
-
-	skb = alloc_skb(sizeof(*req), GFP_KERNEL);
-	if (!skb)
+#endif
+	m = m_gethdr(M_NOWAIT, MT_DATA);
+	if (m == NULL)
 		goto free_stid;
-
-	if (!listen_hash_add(d, sk, stid))
+	m->m_pkthdr.len = m->m_len = sizeof(*req);
+	
+	if (!listen_hash_add(d, so, stid))
 		goto free_all;
 
-	req = (struct cpl_pass_open_req *)__skb_put(skb, sizeof(*req));
+	tp->t_flags |= TF_TOE;
+	req = mtod(m, struct cpl_pass_open_req *);
 	req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
 	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_PASS_OPEN_REQ, stid));
-#ifdef	LINUX_2_4
-	req->local_port = sk->sport;
-	req->local_ip = sk->rcv_saddr;
-#else
-	req->local_port = inet_sk(sk)->sport;
-	req->local_ip = inet_sk(sk)->rcv_saddr;
-#endif	/* LINUX_2_4 */
+	req->local_port = inp->inp_lport; 
+	memcpy(&req->local_ip, &inp->inp_laddr, 4);
 	req->peer_port = 0;
 	req->peer_ip = 0;
 	req->peer_netmask = 0;
@@ -152,18 +269,19 @@
 	req->opt0l = htonl(V_RCV_BUFSIZ(16));
 	req->opt1 = htonl(V_CONN_POLICY(CPL_CONN_POLICY_ASK));
 
-	skb->priority = CPL_PRIORITY_LISTEN;
-	cxgb3_ofld_send(cdev, skb);
+	m_set_priority(m, CPL_PRIORITY_LISTEN); 
+	cxgb_ofld_send(cdev, m);
 	return;
 
 free_all:
-	__kfree_skb(skb);
+	m_free(m);
 free_stid:
-	cxgb3_free_stid(cdev, stid);
+	cxgb_free_stid(cdev, stid);
+#if 0	
 	sock_put(sk);
+#endif	
 free_ctx:
-	kfree(ctx);
-#endif
+	free(ctx, M_DEVBUF);
 }
 
 /*
@@ -173,12 +291,11 @@
 void
 t3_listen_stop(struct toedev *dev, struct socket *so, struct t3cdev *cdev)
 {
+	struct mbuf *m;
+	struct cpl_close_listserv_req *req;
+	int stid = listen_hash_del(TOM_DATA(dev), so);
 	printf("stop listen\n");
-#if 0
-	struct sk_buff *skb;
-	struct cpl_close_listserv_req *req;
 
-	int stid = listen_hash_del(TOM_DATA(dev), sk);
 	if (stid < 0)
 		return;
 
@@ -188,20 +305,23 @@
 	 * that arrive while we are closing the server will be able to locate
 	 * the listening socket.
 	 */
-	t3_reset_synq(sk);
+	t3_reset_synq(so);
 
 	/* Send the close ASAP to stop further passive opens */
-	skb = alloc_skb_nofail(sizeof(*req));
-	req = (struct cpl_close_listserv_req *)__skb_put(skb, sizeof(*req));
+	m = m_gethdr(M_NOWAIT, MT_DATA);
+	if (m == NULL) {
+		/*
+		 * XXX allocate from lowmem cache
+		 */
+	}
+	m->m_pkthdr.len = m->m_len = sizeof(*req);
+
+	req = mtod(m, struct cpl_close_listserv_req *);
 	req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
 	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_LISTSRV_REQ, stid));
 	req->cpu_idx = 0;
-	skb->priority = CPL_PRIORITY_LISTEN;
-	cxgb3_ofld_send(cdev, skb);
+	m_set_priority(m, CPL_PRIORITY_LISTEN);
+	cxgb_ofld_send(cdev, m);
 
-	t3_disconnect_acceptq(sk);
-#endif
+	t3_disconnect_acceptq(so);
 }
-
-
-

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 (text+ko) ====

@@ -301,9 +301,9 @@
 	skb_queue_head_init(&t->deferq);
 	T3_INIT_WORK(&t->deferq_task, process_deferq, t);
 	spin_lock_init(&t->listen_lock);
-	spin_lock_init(&t->synq_lock);
 #endif
 	t3_init_tunables(t);
+	mtx_init(&t->listen_lock, "tom data listeners", NULL, MTX_DEF);
 
 	/* Adjust TOE activation for this module */
 	t->conf.activated = activated;

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.h#5 (text+ko) ====

@@ -4,6 +4,13 @@
 
 #define LISTEN_INFO_HASH_SIZE 32 
 
+struct listen_info {
+	struct listen_info *next;  /* Link to next entry */
+	struct socket *so;         /* The listening socket */
+	unsigned int stid;         /* The server TID */
+};
+
+
 /*
  * TOM tunable parameters.  They can be manipulated through sysctl(2) or /proc.
  */
@@ -49,13 +56,13 @@
          */
 
         struct listen_info *listen_hash_tab[LISTEN_INFO_HASH_SIZE];
-        spinlock_t listen_lock;
+        struct mtx listen_lock;
 
         struct mbuf_head deferq;
         struct task deferq_task;
 
-        struct sock **tid_release_list;
-        spinlock_t tid_release_lock;
+        struct socket **tid_release_list;
+        struct mtx tid_release_lock;
         struct task tid_release_task;
 
 #if defined(CONFIG_T3_ZCOPY_SENDMSG) || defined(CONFIG_T3_ZCOPY_SENDMSG_MODULE)
@@ -69,9 +76,15 @@
 
         u8 *ppod_map;
         unsigned int nppods;
-        spinlock_t ppod_map_lock;
+        struct mtx ppod_map_lock;
+	
+        struct adap_ports *ports;
+};
+
 
-        struct adap_ports *ports;
+struct listen_ctx {
+	struct socket *lso;
+	struct tom_data *tom_data;
 };
 
 #define TOM_DATA(dev) (*(struct tom_data **)&(dev)->l4opt)
@@ -82,6 +95,7 @@
 #define TP_TX_WAIT_IDLE      (1 << 1)
 #define TP_FIN_SENT          (1 << 2)
 #define TP_ABORT_RPL_PENDING (1 << 3)
+#define TP_ABORT_SHUTDOWN    (1 << 4)
 
 struct toepcb {
 	struct toedev *tp_toedev;

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/notes#2 (text+ko) ====

@@ -1,8 +1,9 @@
+Currently untested:
+ - abort
 
 Currently unimplemented:
  - correct credit return accounting
- - listen
- - abort
+ - complete listen handling
  - close for a subset of states
  - correct ARP failure handling
  - urgent data

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 03:15:27 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D91016A421; Mon,  5 Nov 2007 03: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 9D45D16A41A
	for ; Mon,  5 Nov 2007 03:15:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9392B13C4B5
	for ; Mon,  5 Nov 2007 03:15:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA53FQVv043487
	for ; Mon, 5 Nov 2007 03:15:26 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA53FQ4r043484
	for perforce@freebsd.org; Mon, 5 Nov 2007 03:15:26 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 5 Nov 2007 03:15:26 GMT
Message-Id: <200711050315.lA53FQ4r043484@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128665 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 03:15:27 -0000

http://perforce.freebsd.org/chv.cgi?CH=128665

Change 128665 by jb@jb_freebsd1 on 2007/11/05 03:14:56

	Remove some temporary hacks.
	
	Fix 3 function prototypes definitions.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#3 (text) ====

@@ -35,17 +35,8 @@
 
 #ifndef _ASM
 #include 
-#if defined(sun)
 #include 
 #include 
-#else
-#ifdef _KERNEL
-#include 
-typepdef struct pcpu cpu_t;
-#else
-#define cpu_t	void
-#endif
-#endif
 #endif /* !_ASM */
 
 #define	CY_LOW_LEVEL		0
@@ -88,15 +79,15 @@
 extern cyclic_id_t cyclic_add_omni(cyc_omni_handler_t *);
 extern void cyclic_remove(cyclic_id_t);
 extern void cyclic_bind(cyclic_id_t, cpu_t *, cpupart_t *);
-extern hrtime_t cyclic_getres();
+extern hrtime_t cyclic_getres(void);
 
 extern int cyclic_offline(cpu_t *cpu);
 extern void cyclic_online(cpu_t *cpu);
 extern int cyclic_juggle(cpu_t *cpu);
 extern void cyclic_move_in(cpu_t *);
 extern int cyclic_move_out(cpu_t *);
-extern void cyclic_suspend();
-extern void cyclic_resume();
+extern void cyclic_suspend(void);
+extern void cyclic_resume(void);
 
 extern void cyclic_fire(cpu_t *cpu);
 extern void cyclic_softint(cpu_t *cpu, cyc_level_t level);

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 03:17:29 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F88116A41A; Mon,  5 Nov 2007 03:17: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 222F816A418
	for ; Mon,  5 Nov 2007 03:17:29 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F411D13C4A3
	for ; Mon,  5 Nov 2007 03:17:28 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA53HSwo043547
	for ; Mon, 5 Nov 2007 03:17:28 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA53HSBU043544
	for perforce@freebsd.org; Mon, 5 Nov 2007 03:17:28 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 5 Nov 2007 03:17:28 GMT
Message-Id: <200711050317.lA53HSBU043544@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128666 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 03:17:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=128666

Change 128666 by jb@jb_freebsd1 on 2007/11/05 03:17:22

	Avoid discarding qualifiers when casting.

Affected files ...

.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/atomic.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/atomic.h#2 (text+ko) ====

@@ -106,7 +106,7 @@
 static __inline void *
 atomic_cas_ptr(volatile void *target, void *cmp,  void *newval)
 {
-	return ((void *)atomic_cas_64((uint64_t *)target, (uint64_t)cmp,
+	return ((void *)atomic_cas_64((volatile uint64_t *)target, (uint64_t)cmp,
 	    (uint64_t)newval));
 }
 #endif

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 07:47:34 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 681EA16A419; Mon,  5 Nov 2007 07:47: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 065AA16A524
	for ; Mon,  5 Nov 2007 07:47:34 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F0B6513C4B5
	for ; Mon,  5 Nov 2007 07:47:33 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA57lXjo045915
	for ; Mon, 5 Nov 2007 07:47:33 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA57lXlB045912
	for perforce@freebsd.org; Mon, 5 Nov 2007 07:47:33 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 5 Nov 2007 07:47:33 GMT
Message-Id: <200711050747.lA57lXlB045912@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128668 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 07:47:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=128668

Change 128668 by kmacy@kmacy:storage:toestack on 2007/11/05 07:47:18

	handle listen close
	don't set offload flag so as to avoid dereferencing null toe_usrreqs

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 (text+ko) ====

@@ -56,6 +56,7 @@
 #include 
 #include 
 #include 
+
 #include 
 #include 
 
@@ -80,7 +81,23 @@
 static int
 do_close_server_rpl(struct t3cdev *cdev, struct mbuf *m, void *ctx)
 {
-	UNIMPLEMENTED();
+	struct cpl_close_listserv_rpl *rpl = cplhdr(m);
+	unsigned int stid = GET_TID(rpl);
+
+	if (rpl->status != CPL_ERR_NONE)
+		log(LOG_ERR, "Unexpected CLOSE_LISTSRV_RPL status %u for "
+		       "STID %u\n", rpl->status, stid);
+	else {
+		struct listen_ctx *listen_ctx = (struct listen_ctx *)ctx;
+
+		cxgb_free_stid(cdev, stid);
+#if 0		
+		sock_put(listen_ctx->lsk);
+#endif		
+		free(listen_ctx, M_DEVBUF);
+	}
+
+	return (CPL_RET_BUF_DONE);
 }
 
 /*
@@ -222,7 +239,6 @@
 	struct cpl_pass_open_req *req;
 	struct tom_data *d = TOM_DATA(dev);
 	struct inpcb *inp = sotoinpcb(so);
-	struct tcpcb *tp = sototcpcb(so);
 	struct listen_ctx *ctx;
 
 	if (!TOM_TUNABLE(dev, activated))
@@ -256,7 +272,6 @@
 	if (!listen_hash_add(d, so, stid))
 		goto free_all;
 
-	tp->t_flags |= TF_TOE;
 	req = mtod(m, struct cpl_pass_open_req *);
 	req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
 	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_PASS_OPEN_REQ, stid));
@@ -294,8 +309,7 @@
 	struct mbuf *m;
 	struct cpl_close_listserv_req *req;
 	int stid = listen_hash_del(TOM_DATA(dev), so);
-	printf("stop listen\n");
-
+	
 	if (stid < 0)
 		return;
 

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#7 (text+ko) ====

@@ -358,8 +358,13 @@
 		TAILQ_FOREACH(p, &cxgb_list, entry) {
 			if (event == OFLD_LISTEN_OPEN)
 				t3_listen_start(&p->tdev, so, p->cdev);
-			else
+			else if (tp->t_state == TCPS_LISTEN) {
+				printf("stopping listen on port=%d\n",
+				    ntohs(tp->t_inpcb->inp_lport));
+				
 				t3_listen_stop(&p->tdev, so, p->cdev);
+			}
+			
 		}
 		mtx_unlock(&cxgb_list_lock);
 		break;

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 13:29:53 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 12CC916A41B; Mon,  5 Nov 2007 13:29: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 31A5916A417
	for ; Mon,  5 Nov 2007 13:29:52 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FBF413C480
	for ; Mon,  5 Nov 2007 13:29:52 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5DTphk085182
	for ; Mon, 5 Nov 2007 13:29:52 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5DTp3A085179
	for perforce@freebsd.org; Mon, 5 Nov 2007 13:29:51 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 13:29:51 GMT
Message-Id: <200711051329.lA5DTp3A085179@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128680 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 13:29:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=128680

Change 128680 by gonzo@gonzo_jeeves on 2007/11/05 13:29:17

	o Make new interface for platform_start. Now this function
	    accepts for arguments of __register_t which correspond
	    to a0..a3 registers respectively. It's up to platform_start
	    implementation to use them in a machine-dependent fashion.
	o MALTA board obtaines memory size from a3 register

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/hwfunc.h#2 edit
.. //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#2 edit
.. //depot/projects/mips2/src/sys/mips/mips32/idt/idt_machdep.c#5 edit
.. //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#4 edit
.. //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5_machdep.c#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/hwfunc.h#2 (text+ko) ====

@@ -37,6 +37,6 @@
 void platform_halt(void);
 void platform_intr(struct trapframe *);
 void platform_reset(void);
-void platform_start(int, char *[]);
+void platform_start(__register_t, __register_t,  __register_t, __register_t);
 
 #endif /* !_MACHINE_HWFUNC_H_ */

==== //depot/projects/mips2/src/sys/mips/mips32/adm5120/adm5120_machdep.c#2 (text+ko) ====

@@ -146,7 +146,8 @@
 }
 
 void
-platform_start(int argc, char **argv)
+platform_start(__register_t a0 __unused, __register_t a1 __unused, 
+    __register_t a2 __unused, __register_t a3 __unused)
 {
 	vm_offset_t kernend;
 	uint64_t platform_counter_freq = 175 * 1000 * 1000;

==== //depot/projects/mips2/src/sys/mips/mips32/idt/idt_machdep.c#5 (text+ko) ====

@@ -109,7 +109,8 @@
 }
 
 void
-platform_start(int argc, char **argv)
+platform_start(__register_t a0 __unused, __register_t a1 __unused, 
+    __register_t a2 __unused, __register_t a3 __unused)
 {
 	uint64_t platform_counter_freq;
 	vm_offset_t kernend;

==== //depot/projects/mips2/src/sys/mips/mips32/malta/malta_machdep.c#4 (text+ko) ====

@@ -159,16 +159,11 @@
 }
 #endif
 
-void
+static void
 mips_init(void)
 {
 	int i;
 
-	printf("entry: mips_init()\n");
-
-	bootverbose = 1;
-	realmem = btoc(64 << 20);
-
 	for (i = 0; i < 10; i++) {
 		phys_avail[i] = 0;
 	}
@@ -238,18 +233,41 @@
 }
 
 void
-platform_start(int argc, char **argv)
+platform_start(__register_t a0, __register_t a1,  __register_t a2, 
+    __register_t a3)
 {
 	vm_offset_t kernend;
 	uint64_t platform_counter_freq;
+	int argc = a0;
+	char **argv = (char **)a1;
+	char **envp = (char **)a2;
+	unsigned int memsize = a3;
+	int i;
 
 	/* clear the BSS and SBSS segments */
 	kernend = round_page((vm_offset_t)&end);
 	memset(&edata, 0, kernend - (vm_offset_t)(&edata));
 
 	cninit();
+	printf("entry: platform_start()\n");
 
+	bootverbose = 1;
+	if (bootverbose) {
+		printf("cmd line: ");
+		for (i = 0; i < argc; i++)
+			printf("%s ", argv[i]);
+		printf("\n");
+
+		printf("envp:\n");
+		for (i = 0; envp[i]; i += 2)
+			printf("\t%s = %s\n", envp[i], envp[i+1]);
+
+		printf("memsize = %08x\n", memsize);
+	}
+
+	realmem = btoc(memsize);
 	mips_init();
+
 	do {
 #if defined(TICK_USE_YAMON_FREQ)
 		/*

==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/s5_machdep.c#3 (text+ko) ====

@@ -187,7 +187,8 @@
 }
 
 void
-platform_start(int argc, char **argv)
+platform_start(__register_t a0 __unused, __register_t a1 __unused, 
+    __register_t a2 __unused, __register_t a3 __unused)
 {
 	vm_offset_t kernend;
 	uint64_t platform_counter_freq;

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 15:28:04 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 321D716A41B; Mon,  5 Nov 2007 15:28: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 B3F5916A419
	for ; Mon,  5 Nov 2007 15:28:03 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DFB713C4B0
	for ; Mon,  5 Nov 2007 15:28:03 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5FS38L093246
	for ; Mon, 5 Nov 2007 15:28:03 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5FS38Z093243
	for perforce@freebsd.org; Mon, 5 Nov 2007 15:28:03 GMT
	(envelope-from swise@FreeBSD.org)
Date: Mon, 5 Nov 2007 15:28:03 GMT
Message-Id: <200711051528.lA5FS38Z093243@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128682 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 15:28:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=128682

Change 128682 by swise@swise:vic10:iwarp on 2007/11/05 15:27:49

	Get rdma_add.c to compile and load.

Affected files ...

.. //depot/projects/iwarp/sys/contrib/rdma/ib_addr.h#3 edit
.. //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#2 edit

Differences ...

==== //depot/projects/iwarp/sys/contrib/rdma/ib_addr.h#3 (text+ko) ====

@@ -31,10 +31,15 @@
 #define IB_ADDR_H
 
 #include 
+#include 
+#include 
+
+#define MAX_ADDR_LEN ETHER_ADDR_LEN	/* XXX doesn't support IB! */
 
 struct rdma_addr_client {
 	atomic_t refcount;
 	struct cv comp;
+	struct mtx lock;
 };
 
 /**
@@ -86,7 +91,7 @@
 
 void rdma_addr_cancel(struct rdma_dev_addr *addr);
 
-int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
+int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct ifnet *dev,
 	      const unsigned char *dst_dev_addr);
 
 static inline int ip_addr_size(struct sockaddr *addr)

==== //depot/projects/iwarp/sys/contrib/rdma/rdma_addr.c#2 (text+ko) ====

@@ -31,9 +31,11 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -41,10 +43,18 @@
 #include 
 #include 
 #include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
 
+#include 
 
-#include 
 #include 
+#include 
 
 #include 
 
@@ -67,50 +77,51 @@
 	int status;
 };
 
-static void process_req(struct work_struct *work);
+static void process_req(void *ctx, int pending);
 
 static struct mtx lock;
 
-static TAILQ_HEAD(, addr_req) req_list;
-static DECLARE_DELAYED_WORK(work, process_req);
-static struct taskqueue *addr_wq;
+static TAILQ_HEAD(addr_req_list, addr_req) req_list;
+static struct task addr_task;
+static struct taskqueue *addr_taskq;
+static struct callout addr_ch;
+static eventhandler_tag route_event_tag;
+
+static void addr_timeout(void *arg)
+{
+	taskqueue_enqueue(addr_taskq, &addr_task);
+}
 
 void rdma_addr_register_client(struct rdma_addr_client *client)
 {
 	atomic_set(&client->refcount, 1);
-	init_completion(&client->comp);
+	mtx_init(&client->lock, "rdma_addr client lock", NULL, MTX_DEF);
+	cv_init(&client->comp, "rdma_addr cv");
 }
 EXPORT_SYMBOL(rdma_addr_register_client);
 
 static inline void put_client(struct rdma_addr_client *client)
 {
+	mtx_lock(&client->lock);
 	if (atomic_dec_and_test(&client->refcount))
-		complete(&client->comp);
+		cv_signal(&client->comp);
+	mtx_unlock(&client->lock);
 }
 
 void rdma_addr_unregister_client(struct rdma_addr_client *client)
 {
 	put_client(client);
-	wait_for_completion(&client->comp);
+	mtx_lock(&client->lock);
+	cv_wait(&client->comp, &client->lock);
 }
 EXPORT_SYMBOL(rdma_addr_unregister_client);
 
-int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
+int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct ifnet *dev,
 		     const unsigned char *dst_dev_addr)
 {
-	switch (dev->type) {
-	case ARPHRD_INFINIBAND:
-		dev_addr->dev_type = RDMA_NODE_IB_CA;
-		break;
-	case ARPHRD_ETHER:
-		dev_addr->dev_type = RDMA_NODE_RNIC;
-		break;
-	default:
-		return (EADDRNOTAVAIL);
-	}
-
-	memcpy(dev_addr->src_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
-	memcpy(dev_addr->broadcast, dev->broadcast, MAX_ADDR_LEN);
+	dev_addr->dev_type = RDMA_NODE_RNIC;
+	memcpy(dev_addr->src_dev_addr, IF_LLADDR(dev), MAX_ADDR_LEN);
+	memcpy(dev_addr->broadcast, dev->if_broadcastaddr, MAX_ADDR_LEN);
 	if (dst_dev_addr)
 		memcpy(dev_addr->dst_dev_addr, dst_dev_addr, MAX_ADDR_LEN);
 	return 0;
@@ -119,167 +130,138 @@
 
 int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
 {
-	struct net_device *dev;
-	__be32 ip = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
 	int ret;
+	struct route iproute;
+	struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst;
 
-	dev = ip_dev_find(ip);
-	if (!dev)
+	bzero(&iproute, sizeof iproute);
+	dst->sin_family = AF_INET;
+	dst->sin_len = sizeof dst;
+	dst->sin_addr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
+
+	rtalloc(&iproute);
+	if (iproute.ro_rt == NULL);
 		return (EADDRNOTAVAIL);
 
-	ret = rdma_copy_addr(dev_addr, dev, NULL);
-	dev_put(dev);
+	ret = rdma_copy_addr(dev_addr, iproute.ro_rt->rt_ifp, NULL);
+	rtfree(iproute.ro_rt);
 	return ret;
 }
 EXPORT_SYMBOL(rdma_translate_ip);
 
 static void queue_req(struct addr_req *req)
 {
-	struct addr_req *temp_req;
+	struct addr_req *tmp_req;
 	
 	mtx_lock(&lock);
-	TAILQ_FOREACH_REVERSE(tmp_req, &req_list, req_list, entry)
-	    if (time_after_eq(req->timeout, temp_req->timeout))
+	TAILQ_FOREACH_REVERSE(tmp_req, &req_list, addr_req_list, entry)
+	    if (time_after_eq(req->timeout, tmp_req->timeout))
 		    break;
 	
 	TAILQ_INSERT_AFTER(&req_list, tmp_req, req, entry);
 	
 	if (TAILQ_FIRST(&req_list) == req)	
-		callout_reset(&work, req->timeout - ticks);
+		callout_reset(&addr_ch, req->timeout - ticks, addr_timeout, NULL);
 	mtx_unlock(&lock);
 }
 
 static void addr_send_arp(struct sockaddr_in *dst_in)
 {
-	struct rtenry *rt;
-	u32 dst_ip = dst_in->sin_addr.s_addr;
+	struct route iproute;
+	struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst;
+	char dmac[ETHER_ADDR_LEN];
+
+	bzero(&iproute, sizeof iproute);
+	*dst = *dst_in;
 
-	memset(&fl, 0, sizeof fl);
-	fl.nl_u.ip4_u.daddr = dst_ip;
-	if (ip_route_output_key(&rt, &fl))
+	rtalloc(&iproute);
+	if (iproute.ro_rt == NULL);
 		return;
 
-	arp_send(ARPOP_REQUEST, ETH_P_ARP, rt->rt_gateway, rt->idev->dev,
-		 rt->rt_src, NULL, rt->idev->dev->dev_addr, NULL);
-	ip_rt_put(rt);
+	arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, 
+		   rt_key(iproute.ro_rt), dmac);
+
+	rtfree(iproute.ro_rt);
 }
 
 static int addr_resolve_remote(struct sockaddr_in *src_in,
 			       struct sockaddr_in *dst_in,
 			       struct rdma_dev_addr *addr)
 {
-	u32 src_ip = src_in->sin_addr.s_addr;
-	u32 dst_ip = dst_in->sin_addr.s_addr;
-	struct flowi fl;
-	struct rtable *rt;
-	struct neighbour *neigh;
-	int ret;
+	int ret = 0;
+	struct route iproute;
+	struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst;
+	char dmac[ETHER_ADDR_LEN];
+
+	bzero(&iproute, sizeof iproute);
+	*dst = *dst_in;
 
-	memset(&fl, 0, sizeof fl);
-	fl.nl_u.ip4_u.daddr = dst_ip;
-	fl.nl_u.ip4_u.saddr = src_ip;
-	ret = ip_route_output_key(&rt, &fl);
-	if (ret)
+	rtalloc(&iproute);
+	if (iproute.ro_rt == NULL);
 		goto out;
 
 	/* If the device does ARP internally, return 'done' */
-	if (rt->idev->dev->flags & IFF_NOARP) {
-		rdma_copy_addr(addr, rt->idev->dev, NULL);
+	if (iproute.ro_rt->rt_ifp->if_flags & IFF_NOARP) {
+		rdma_copy_addr(addr, iproute.ro_rt->rt_ifp, NULL);
 		goto put;
 	}
-
-	neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->idev->dev);
-	if (!neigh) {
-		ret = ENODATA;
+ 	ret = arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, 
+		rt_key(iproute.ro_rt), dmac);
+	if (ret) {
 		goto put;
 	}
 
-	if (!(neigh->nud_state & NUD_VALID)) {
-		ret = ENODATA;
-		goto release;
-	}
-
-	if (!src_ip) {
+	if (!src_in->sin_addr.s_addr) {
+		src_in->sin_len = sizeof *src_in;
 		src_in->sin_family = dst_in->sin_family;
-		src_in->sin_addr.s_addr = rt->rt_src;
+		src_in->sin_addr.s_addr = ((struct sockaddr_in *)iproute.ro_rt->rt_ifa->ifa_addr)->sin_addr.s_addr;
 	}
 
-	ret = rdma_copy_addr(addr, neigh->dev, neigh->ha);
-release:
-	neigh_release(neigh);
+	ret = rdma_copy_addr(addr, iproute.ro_rt->rt_ifp, dmac);
 put:
-	ip_rt_put(rt);
+	rtfree(iproute.ro_rt);
 out:
 	return ret;
 }
 
-static void process_req(struct work_struct *work)
+static void process_req(void *ctx, int pending)
 {
-	struct addr_req *req, *temp_req;
+	struct addr_req *req, *tmp_req;
 	struct sockaddr_in *src_in, *dst_in;
-	struct list_head done_list;
+	TAILQ_HEAD(, addr_req) done_list;
 
 	TAILQ_INIT(&done_list);
 
 	mtx_lock(&lock);
-	list_for_each_entry_safe(req, temp_req, &req_list, list) {
-		if (req->status == ENODATA) {
+	TAILQ_FOREACH_SAFE(req, &req_list, entry, tmp_req) {
+		if (req->status == EWOULDBLOCK) {
 			src_in = (struct sockaddr_in *) &req->src_addr;
 			dst_in = (struct sockaddr_in *) &req->dst_addr;
 			req->status = addr_resolve_remote(src_in, dst_in,
 							  req->addr);
-			if (req->status && time_after_eq(jiffies, req->timeout))
+			if (req->status && time_after_eq(ticks, req->timeout))
 				req->status = ETIMEDOUT;
-			else if (req->status == ENODATA)
+			else if (req->status == EWOULDBLOCK)
 				continue;
 		}
-		list_move_tail(&req->list, &done_list);
+		TAILQ_REMOVE(&req_list, req, entry);
+		TAILQ_INSERT_TAIL(&done_list, req, entry);
 	}
 
-	if (!list_empty(&req_list)) {
-		req = list_entry(req_list.next, struct addr_req, list);
-		callout_reset(&work, req->timeout - ticks);
+	if (!TAILQ_EMPTY(&req_list)) {
+		req = TAILQ_FIRST(&req_list);
+		callout_reset(&addr_ch, req->timeout - ticks, addr_timeout, 
+			NULL);
 	}
 	mtx_unlock(&lock);
 
-	list_for_each_entry_safe(req, temp_req, &done_list, list) {
-		list_del(&req->list);
+	TAILQ_FOREACH_SAFE(req, &done_list, entry, tmp_req) {
+		TAILQ_REMOVE(&done_list, req, entry);
 		req->callback(req->status, &req->src_addr, req->addr,
 			      req->context);
 		put_client(req->client);
-		kfree(req);
-	}
-}
-
-static int addr_resolve_local(struct sockaddr_in *src_in,
-			      struct sockaddr_in *dst_in,
-			      struct rdma_dev_addr *addr)
-{
-	struct net_device *dev;
-	u32 src_ip = src_in->sin_addr.s_addr;
-	__be32 dst_ip = dst_in->sin_addr.s_addr;
-	int ret;
-
-	dev = ip_dev_find(dst_ip);
-	if (!dev)
-		return (EADDRNOTAVAIL);
-
-	if (ZERONET(src_ip)) {
-		src_in->sin_family = dst_in->sin_family;
-		src_in->sin_addr.s_addr = dst_ip;
-		ret = rdma_copy_addr(addr, dev, dev->dev_addr);
-	} else if (LOOPBACK(src_ip)) {
-		ret = rdma_translate_ip((struct sockaddr *)dst_in, addr);
-		if (!ret)
-			memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
-	} else {
-		ret = rdma_translate_ip((struct sockaddr *)src_in, addr);
-		if (!ret)
-			memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
+		free(req, M_DEVBUF);
 	}
-
-	dev_put(dev);
-	return ret;
 }
 
 int rdma_resolve_ip(struct rdma_addr_client *client,
@@ -293,7 +275,7 @@
 	struct addr_req *req;
 	int ret = 0;
 
-	req = kmalloc(sizeof *req, GFP_KERNEL);
+	req = malloc(sizeof *req, M_DEVBUF, M_WAITOK);
 	if (!req)
 		return (ENOMEM);
 	memset(req, 0, sizeof *req);
@@ -310,24 +292,22 @@
 	src_in = (struct sockaddr_in *) &req->src_addr;
 	dst_in = (struct sockaddr_in *) &req->dst_addr;
 
-	req->status = addr_resolve_local(src_in, dst_in, addr);
-	if (req->status == EADDRNOTAVAIL)
-		req->status = addr_resolve_remote(src_in, dst_in, addr);
+	req->status = addr_resolve_remote(src_in, dst_in, addr);
 
 	switch (req->status) {
 	case 0:
-		req->timeout = jiffies;
+		req->timeout = ticks;
 		queue_req(req);
 		break;
-	case ENODATA:
-		req->timeout = msecs_to_jiffies(timeout_ms) + jiffies;
+	case EWOULDBLOCK:
+		req->timeout = msecs_to_ticks(timeout_ms) + ticks;
 		queue_req(req);
 		addr_send_arp(dst_in);
 		break;
 	default:
 		ret = req->status;
 		atomic_dec(&client->refcount);
-		kfree(req);
+		free(req, M_DEVBUF);
 		break;
 	}
 	return ret;
@@ -336,15 +316,16 @@
 
 void rdma_addr_cancel(struct rdma_dev_addr *addr)
 {
-	struct addr_req *req, *temp_req;
+	struct addr_req *req, *tmp_req;
 
 	mtx_lock(&lock);
-	list_for_each_entry_safe(req, temp_req, &req_list, list) {
+	TAILQ_FOREACH_SAFE(req, &req_list, entry, tmp_req) {
 		if (req->addr == addr) {
 			req->status = ECANCELED;
-			req->timeout = jiffies;
-			list_move(&req->list, &req_list);
-			callout_reset(&work, req->timeout - ticks);
+			req->timeout = ticks;
+			TAILQ_REMOVE(&req_list, req, entry);
+			TAILQ_INSERT_HEAD(&req_list, req, entry);
+			callout_reset(&addr_ch, req->timeout - ticks, addr_timeout, NULL);
 			break;
 		}
 	}
@@ -352,36 +333,77 @@
 }
 EXPORT_SYMBOL(rdma_addr_cancel);
 
-static int netevent_callback(struct notifier_block *self, unsigned long event,
-	void *ctx)
+static void
+route_event_callback(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1)
 {
-	if (event == NETEVENT_NEIGH_UPDATE) {
-		struct neighbour *neigh = ctx;
-
-		if (neigh->nud_state & NUD_VALID) {
-			callout_reset(&work, 0);
-		}
+	if (event == RTEVENT_ARP_UPDATE) {
+		callout_stop(&addr_ch);
+		taskqueue_enqueue(addr_taskq, &addr_task);
 	}
-	return 0;
 }
 
-static struct notifier_block nb = {
-	.notifier_call = netevent_callback
-};
-
 static int addr_init(void)
 {
+	TAILQ_INIT(&req_list);
+	mtx_init(&lock, "rdma_addr req_list lock", NULL, MTX_DEF);
+
+	addr_taskq = taskqueue_create("rdma_addr_taskq", M_WAITOK,
+		taskqueue_thread_enqueue, &addr_taskq);
+        if (addr_taskq == NULL) {
+                printf("failed to allocate rdma_addr taskqueue\n");
+                return (ENOMEM);
+        }
+        taskqueue_start_threads(&addr_taskq, 1, PI_NET, "rdma_addr taskq");
+        TASK_INIT(&addr_task, 0, process_req, NULL);
+
 	callout_init(&addr_ch, TRUE);
 
-	register_netevent_notifier(&nb);
+	route_event_tag = EVENTHANDLER_REGISTER(route_event, 
+		route_event_callback, NULL, EVENTHANDLER_PRI_ANY);
+
 	return 0;
 }
 
 static void addr_cleanup(void)
 {
-	unregister_netevent_notifier(&nb);
-	taskqueue_free(addr_wq);
+	EVENTHANDLER_DEREGISTER(route_event_callback, route_event_tag);
+	callout_stop(&addr_ch);
+	taskqueue_drain(addr_taskq, &addr_task);
+	taskqueue_free(addr_taskq);
+}
+
+static int 
+addr_load(module_t mod, int cmd, void *arg)
+{
+        int err = 0;
+
+        switch (cmd) {
+        case MOD_LOAD:
+                printf("Loading rdma_addr.\n");
+
+                addr_init();
+                break;
+        case MOD_QUIESCE:
+                break;
+        case MOD_UNLOAD:
+                printf("Unloading rdma_addr.\n");
+		addr_cleanup();
+                break;
+        case MOD_SHUTDOWN:
+                break;
+        default:
+                err = EOPNOTSUPP;
+                break;
+        }
+
+        return (err);
 }
 
-module_init(addr_init);
-module_exit(addr_cleanup);
+static moduledata_t mod_data = {
+	"rdma_addr",
+	addr_load,
+	0
+};
+
+MODULE_VERSION(rdma_addr, 1);
+DECLARE_MODULE(rdma_addr, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 18:54:52 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AAD6C16A418; Mon,  5 Nov 2007 18:54: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 846E216A41B
	for ; Mon,  5 Nov 2007 18:54:51 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 54AB513C480
	for ; Mon,  5 Nov 2007 18:54:51 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5IspQT014788
	for ; Mon, 5 Nov 2007 18:54:51 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5IspJx014785
	for perforce@freebsd.org; Mon, 5 Nov 2007 18:54:51 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 18:54:51 GMT
Message-Id: <200711051854.lA5IspJx014785@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128688 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 18:54:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=128688

Change 128688 by gonzo@gonzo_jeeves on 2007/11/05 18:53:51

	o Perform PCI registers fixup for Korina ethernet on 
	    PCI bridge initialization.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips32/idt/idtpci.c#4 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips32/idt/idtpci.c#4 (text+ko) ====

@@ -111,6 +111,13 @@
 #define REG_READ(o) *((volatile uint32_t *)MIPS_PHYS_TO_KSEG1(IDT_BASE_PCI + (o)))
 #define REG_WRITE(o,v) (REG_READ(o)) = (v)
 
+unsigned int korina_fixup[24] = { 
+	0x00000157, 0x00000000, 0x00003c04, 0x00000008, 0x18800001, 0x18000001,
+	0x48000008, 0x00000000, 0x00000000, 0x00000000, 0x011d0214, 0x00000000,
+	0x00000000, 0x00000000, 0x38080101, 0x00008080, 0x00000d6e, 0x00000000,
+	0x00000051, 0x00000000, 0x00000055, 0x18000000, 0x00000000, 0x00000000 
+};
+
 struct idtpci_softc {
 	device_t		sc_dev;
 
@@ -122,6 +129,13 @@
 	uint32_t		sc_io;
 };
 
+static uint32_t
+idtpci_make_addr(int bus, int slot, int func, int reg)
+{
+
+	return 0x80000000 | (bus << 16) | (slot << 11) | (func << 8) | reg;
+}
+
 static int
 idtpci_probe(device_t dev)
 {
@@ -135,6 +149,8 @@
 	int busno = 0;
 	struct idtpci_softc *sc = device_get_softc(dev);
 	unsigned int pci_data, force_endianess = 0;
+	int		i;
+	bus_addr_t	addr;
 
 	sc->sc_dev = dev;
 	sc->sc_busno = busno;
@@ -210,6 +226,19 @@
 	/* Rewrite Target Control register with default values */
 	REG_WRITE(IDT_PCI_TC, (IDT_PCI_TC_DTIMER << 8) | IDT_PCI_TC_RTIMER);
 
+	/* Perform Korina fixup */
+	addr = idtpci_make_addr(0, 0, 0, 4);
+	for (i = 0; i < 24; i++) {
+
+		REG_WRITE(IDT_PCI_CFG_ADDR, addr);
+		REG_WRITE(IDT_PCI_CFG_DATA, korina_fixup[i]);
+		__asm__ volatile ("sync");
+
+		REG_WRITE(IDT_PCI_CFG_ADDR, 0);
+		REG_WRITE(IDT_PCI_CFG_DATA, 0);
+		addr += 4;
+	}
+
 	/* Use KSEG1 to access IO ports for it is uncached */
 	sc->sc_io = 0;
 	sc->sc_io_rman.rm_type = RMAN_ARRAY;
@@ -249,13 +278,6 @@
 }
 
 static uint32_t
-idtpci_make_addr(int bus, int slot, int func, int reg)
-{
-
-	return 0x80000000 | (bus << 16) | (slot << 11) | (func << 8) | reg;
-}
-
-static uint32_t
 idtpci_read_config(device_t dev, int bus, int slot, int func, int reg,
     int bytes)
 {
@@ -455,6 +477,7 @@
 	}
 
 	rv = rman_reserve_resource(rm, start, end, count, flags, child);
+
 	if (rv == NULL)
 		return (NULL);
 
@@ -493,7 +516,7 @@
 		int flags, driver_filter_t *filt, driver_intr_t *handler, 
 		void *arg, void **cookiep)
 {
-
+	panic("setup_intr");
 #if 0
 	struct idtpci_softc *sc = device_get_softc(dev);
 	struct intr_event *event;

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 18:55:53 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E80E216A468; Mon,  5 Nov 2007 18:55: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 A8A1716A419
	for ; Mon,  5 Nov 2007 18:55:52 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 90E8313C4B5
	for ; Mon,  5 Nov 2007 18:55:52 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5ItqSZ014885
	for ; Mon, 5 Nov 2007 18:55:52 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5ItqXE014882
	for perforce@freebsd.org; Mon, 5 Nov 2007 18:55:52 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 18:55:52 GMT
Message-Id: <200711051855.lA5ItqXE014882@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128689 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 18:55:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=128689

Change 128689 by gonzo@gonzo_jeeves on 2007/11/05 18:55:07

	o Add IRQ dispatching routine.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips32/idt/idtreg.h#5 edit
.. //depot/projects/mips2/src/sys/mips/mips32/idt/obio.c#4 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips32/idt/idtreg.h#5 (text+ko) ====

@@ -134,10 +134,15 @@
 #define	ICU_IP_BIT(irq)	(1 << ICU_IP(irq))
 #define	ICU_GROUP(irq)	(((irq) - IRQ_BASE) >> 5)
 
-#define	ICU_GROUP_MASK_REG(irq)	\
-    (ICU_IMASK2 + ((((irq) - IRQ_BASE) >> 5) * ICU_GROUP_REG_OFFSET))
-#define	ICU_GROUP_PEND_REG(irq)	\
-    (ICU_IPEND2 + ((((irq) - IRQ_BASE) >> 5) * ICU_GROUP_REG_OFFSET))
+#define	ICU_GROUP_MASK_REG(group)	\
+    (ICU_IMASK2 + ((((group) - 2) * ICU_GROUP_REG_OFFSET)))
+#define	ICU_GROUP_IPEND_REG(group)	\
+    (ICU_IPEND2 + ((((group) - 2) * ICU_GROUP_REG_OFFSET)))
+
+#define	ICU_IRQ_MASK_REG(irq)	\
+    (ICU_IMASK2 + ((ICU_GROUP(irq) * ICU_GROUP_REG_OFFSET)))
+#define	ICU_IRQ_IPEND_REG(irq)	\
+    (ICU_IPEND2 + ((ICU_GROUP(irq) * ICU_GROUP_REG_OFFSET)))
 
 #define	PCI_IRQ_BASE		IP_IRQ(6, 4)
 #define	PCI_IRQ_END		IP_IRQ(6, 7)

==== //depot/projects/mips2/src/sys/mips/mips32/idt/obio.c#4 (text+ko) ====

@@ -270,7 +270,7 @@
 	    handler, arg, intr_priority(flags), flags, cookiep);
 
 	/* unmask IRQ */
-	mask_register = ICU_GROUP_MASK_REG(irq);
+	mask_register = ICU_IRQ_MASK_REG(irq);
 	ip_bit = ICU_IP_BIT(irq);
 
 	mask = ICU_REG_READ(mask_register);
@@ -295,7 +295,7 @@
 		panic("Trying to teardown unoccupied IRQ");
 
 	/* mask IRQ */
-	mask_register = ICU_GROUP_MASK_REG(irq);
+	mask_register = ICU_IRQ_MASK_REG(irq);
 	ip_bit = ICU_IP_BIT(irq);
 
 	mask = ICU_REG_READ(mask_register);
@@ -315,14 +315,43 @@
 	struct obio_softc *sc = arg;
 	struct intr_event *event;
 	struct intr_handler *ih;
-	uint32_t irqstat, ipend;
-	int irq, thread = 0;
+	uint32_t irqstat, ipend, imask, xpend;
+	int irq, thread = 0, group, i;
 
 	/* TODO: handle all IRQs */
 	irqstat = 0;
+	irq = 0;
+	for (group = 2; group <= 6; group++) {
+		ipend = ICU_REG_READ(ICU_GROUP_IPEND_REG(group));
+		imask = ICU_REG_READ(ICU_GROUP_MASK_REG(group));
+		xpend = ipend;
+		ipend &= ~imask;
+		while ((i = fls(xpend)) != 0) {
+			xpend &= ~(1 << (i - 1));
+			irq = IP_IRQ(group, i - 1);
+		}
+	
+		while ((i = fls(ipend)) != 0) {
+			ipend &= ~(1 << (i - 1));
+			irq = IP_IRQ(group, i - 1);
+			event = sc->sc_eventstab[irq];
+			if (event && !TAILQ_EMPTY(&event->ie_handlers)) {
+				/* Execute fast handlers. */
+				TAILQ_FOREACH(ih, &event->ie_handlers,
+				    ih_next) {
+					if (ih->ih_filter == NULL)
+						thread = 1;
+					else
+						ih->ih_filter(ih->ih_argument);
+				}
+			}
 
-	irq = 0;
+			/* Schedule thread if needed. */
+			if (thread)
+				intr_event_schedule_thread(event);
 
+		}
+	}
 #if 0
 	ipend = ICU_REG_READ(ICU_IPEND2);
 	printf("ipend2 = %08x!\n", ipend);
@@ -340,21 +369,6 @@
 #endif
 	while (irqstat != 0) {
 		if ((irqstat & 1) == 1) {
-			event = sc->sc_eventstab[irq];
-			if (event && !TAILQ_EMPTY(&event->ie_handlers)) {
-				/* Execute fast handlers. */
-				TAILQ_FOREACH(ih, &event->ie_handlers,
-				    ih_next) {
-					if (ih->ih_filter == NULL)
-						thread = 1;
-					else
-						ih->ih_filter(ih->ih_argument);
-				}
-			}
-
-			/* Schedule thread if needed. */
-			if (thread)
-				intr_event_schedule_thread(event);
 		}
 
 		irq++;

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 18:57:55 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B35AB16A41B; Mon,  5 Nov 2007 18:57: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 28D2E16A475
	for ; Mon,  5 Nov 2007 18:57:55 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EDB5D13C4BF
	for ; Mon,  5 Nov 2007 18:57:54 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5Ivscf014966
	for ; Mon, 5 Nov 2007 18:57:54 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5Ivsra014963
	for perforce@freebsd.org; Mon, 5 Nov 2007 18:57:54 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 18:57:54 GMT
Message-Id: <200711051857.lA5Ivsra014963@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128690 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 18:57:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=128690

Change 128690 by gonzo@gonzo_jeeves on 2007/11/05 18:57:23

	o Add uart to hinted devices.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/conf/IDT.hints#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/conf/IDT.hints#3 (text+ko) ====

@@ -9,3 +9,7 @@
 # hint.pcib.0.msize=0x100000
 # hint.pcib.0.io=0x11500000
 # hint.pcib.0.iosize=0x100000
+
+# uart0
+hint.uart.0.at="obio0"
+hint.uart.0.maddr=0xb8058000

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 19:08:11 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5875716A468; Mon,  5 Nov 2007 19:08: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 1D2A316A41A
	for ; Mon,  5 Nov 2007 19:08:11 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0607113C4A6
	for ; Mon,  5 Nov 2007 19:08:11 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5J8Acc016520
	for ; Mon, 5 Nov 2007 19:08:10 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5J8Akh016517
	for perforce@freebsd.org; Mon, 5 Nov 2007 19:08:10 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 19:08:10 GMT
Message-Id: <200711051908.lA5J8Akh016517@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128692 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 19:08:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=128692

Change 128692 by gonzo@gonzo_jeeves on 2007/11/05 19:07:45

	o Add explicit cast to gat rid of warning

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#8 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/busdma_machdep.c#8 (text+ko) ====

@@ -448,7 +448,7 @@
 		void *tmpaddr = (void *)*vaddr;
 
 		if (tmpaddr) {
-			tmpaddr = MIPS_PHYS_TO_KSEG1(vtophys(tmpaddr));
+			tmpaddr = (void *)MIPS_PHYS_TO_KSEG1(vtophys(tmpaddr));
 			newmap->origbuffer = *vaddr;
 			newmap->allocbuffer = tmpaddr;
 			mips_dcache_wbinv_range((vm_offset_t)*vaddr,

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 19:09:12 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C046B16A41A; Mon,  5 Nov 2007 19:09: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 502B116A419
	for ; Mon,  5 Nov 2007 19:09:12 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 385C513C4A5
	for ; Mon,  5 Nov 2007 19:09:12 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5J9CYZ016556
	for ; Mon, 5 Nov 2007 19:09:12 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5J9C3B016553
	for perforce@freebsd.org; Mon, 5 Nov 2007 19:09:12 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 19:09:12 GMT
Message-Id: <200711051909.lA5J9C3B016553@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128693 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 19:09:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=128693

Change 128693 by gonzo@gonzo_jeeves on 2007/11/05 19:09:07

	o Try bootp on vr0
	o Add and comment out options for ath(4)
	o Enable uart

Affected files ...

.. //depot/projects/mips2/src/sys/mips/conf/IDT#3 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/conf/IDT#3 (text+ko) ====

@@ -26,10 +26,10 @@
 options		BOOTP
 options		BOOTP_NFSROOT
 options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=admsw0
+options		BOOTP_WIRED_TO=vr0
 options		BOOTP_COMPAT
 
-options		ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"
+options		ROOTDEVNAME=\"nfs:192.168.0.52:/mnt/bsd\"
 
 
 # Debugging for use in -current
@@ -42,3 +42,15 @@
 device		ether
 device		miibus
 device		vr
+device		uart
+device		uart_ns8250
+
+# Wireless NIC cards
+#device          wlan            # 802.11 support
+#device         wlan_wep        # 802.11 WEP support
+#device         wlan_ccmp       # 802.11 CCMP support
+#device         wlan_tkip       # 802.11 TKIP support
+#device          ath             # Atheros pci/cardbus NIC's
+#device          ath_hal         # Atheros HAL (Hardware Access Layer)
+#device          ath_rate_sample # SampleRate tx rate control for ath
+#options         ATH_DEBUG

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 19:54:49 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B114916A421; Mon,  5 Nov 2007 19:54: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 6142A16A417
	for ; Mon,  5 Nov 2007 19:54:49 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B67B13C49D
	for ; Mon,  5 Nov 2007 19:54:49 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5Jsn9R018461
	for ; Mon, 5 Nov 2007 19:54:49 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5Jrx4k018438
	for perforce@freebsd.org; Mon, 5 Nov 2007 19:53:59 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 19:53:59 GMT
Message-Id: <200711051953.lA5Jrx4k018438@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128696 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 19:54:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=128696

Change 128696 by gonzo@gonzo_jeeves on 2007/11/05 19:53:55

	IFC

Affected files ...

.. //depot/projects/mips2/src/Makefile#4 integrate
.. //depot/projects/mips2/src/Makefile.inc1#6 integrate
.. //depot/projects/mips2/src/ObsoleteFiles.inc#8 integrate
.. //depot/projects/mips2/src/UPDATING#7 integrate
.. //depot/projects/mips2/src/bin/getfacl/getfacl.c#2 integrate
.. //depot/projects/mips2/src/bin/mv/mv.1#3 integrate
.. //depot/projects/mips2/src/bin/ps/extern.h#2 integrate
.. //depot/projects/mips2/src/bin/ps/keyword.c#2 integrate
.. //depot/projects/mips2/src/bin/ps/print.c#2 integrate
.. //depot/projects/mips2/src/bin/ps/ps.c#2 integrate
.. //depot/projects/mips2/src/bin/sh/eval.c#2 integrate
.. //depot/projects/mips2/src/bin/sh/sh.1#4 integrate
.. //depot/projects/mips2/src/cddl/lib/Makefile#3 integrate
.. //depot/projects/mips2/src/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/mips2/src/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/mips2/src/cddl/usr.bin/Makefile#3 integrate
.. //depot/projects/mips2/src/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/mips2/src/cddl/usr.sbin/Makefile#3 integrate
.. //depot/projects/mips2/src/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/mips2/src/contrib/gcc/opts.c#3 integrate
.. //depot/projects/mips2/src/contrib/groff/tmac/doc-common#3 integrate
.. //depot/projects/mips2/src/contrib/groff/tmac/doc-syms#3 integrate
.. //depot/projects/mips2/src/contrib/groff/tmac/groff_mdoc.man#3 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/BSD/Makefile#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/BSD/kupgrade#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/HISTORY#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/Makefile#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/ip_fil.c#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/iplang/Makefile#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/ipsend/iptests.c#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/ipsend/sock.c#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/l4check/Makefile#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/l4check/l4check.c#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/lib/Makefile#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/lib/alist_new.c#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/lib/ipft_tx.c#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/lib/printnat.c#3 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/lib/printpacket.c#3 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/lib/printpool_live.c#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/lib/printstate.c#3 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/man/ippool.5#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/md5.h#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/radix.c#3 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/radix_ipf.h#3 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/Makefile#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/dotest#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/Makefile#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/f11#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/f24#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i19.dist#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/i21#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/in1#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/in6#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/ipv6.6#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/expected/n16#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/input/f11#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/input/f24#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/input/ipv6.6#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/input/l1#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/input/n16#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/nattest#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/regress/f24#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i21#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/regress/i3#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/regress/in1#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/regress/in6#2 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/test/regress/ipv6.6#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/regress/n16#1 branch
.. //depot/projects/mips2/src/contrib/ipfilter/test/test.format#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/tools/ipf_y.y#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/tools/ipfstat.c#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/tools/ipmon.c#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/tools/ipnat.c#3 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/tools/ipnat_y.y#4 integrate
.. //depot/projects/mips2/src/contrib/ipfilter/tools/lexer.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/NEWS#4 integrate
.. //depot/projects/mips2/src/contrib/less/README#4 integrate
.. //depot/projects/mips2/src/contrib/less/ch.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/charset.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/configure#4 integrate
.. //depot/projects/mips2/src/contrib/less/configure.ac#4 integrate
.. //depot/projects/mips2/src/contrib/less/filename.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/funcs.h#4 integrate
.. //depot/projects/mips2/src/contrib/less/jump.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/less.h#4 integrate
.. //depot/projects/mips2/src/contrib/less/less.man#4 integrate
.. //depot/projects/mips2/src/contrib/less/less.nro#4 integrate
.. //depot/projects/mips2/src/contrib/less/lessecho.man#3 integrate
.. //depot/projects/mips2/src/contrib/less/lessecho.nro#3 integrate
.. //depot/projects/mips2/src/contrib/less/lesskey.man#4 integrate
.. //depot/projects/mips2/src/contrib/less/lesskey.nro#4 integrate
.. //depot/projects/mips2/src/contrib/less/line.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/main.c#6 integrate
.. //depot/projects/mips2/src/contrib/less/search.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/signal.c#4 integrate
.. //depot/projects/mips2/src/contrib/less/version.c#4 integrate
.. //depot/projects/mips2/src/contrib/libpcap/CHANGES#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/CREDITS#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/FILES#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/INSTALL#2 delete
.. //depot/projects/mips2/src/contrib/libpcap/INSTALL.txt#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/README.dag#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/TODO#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/VERSION#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/bpf_image.c#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/config.h.in#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/configure#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/configure.in#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/fad-getad.c#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/fad-win32.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/gencode.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/gencode.h#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/grammar.y#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/lbl/gnuc.h#2 delete
.. //depot/projects/mips2/src/contrib/libpcap/nametoaddr.c#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/optimize.c#2 integrate
.. //depot/projects/mips2/src/contrib/libpcap/packaging/pcap.spec.in#1 branch
.. //depot/projects/mips2/src/contrib/libpcap/pcap-bpf.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap-bpf.h#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap-dag.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap-dlpi.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap-int.h#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap-linux.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap-win32.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap.3#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pcap.h#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/pf.h#2 delete
.. //depot/projects/mips2/src/contrib/libpcap/savefile.c#3 integrate
.. //depot/projects/mips2/src/contrib/libpcap/scanner.l#3 integrate
.. //depot/projects/mips2/src/contrib/one-true-awk/FIXES#3 integrate
.. //depot/projects/mips2/src/contrib/one-true-awk/FREEBSD-upgrade#3 integrate
.. //depot/projects/mips2/src/contrib/one-true-awk/lib.c#3 integrate
.. //depot/projects/mips2/src/contrib/one-true-awk/tran.c#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/HISTORY#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/VERSION#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/aclocal.m4#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#4 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bin/praudit/praudit.c#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/bsm/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/config/config.h#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/config/config.h.in#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/config/ltmain.sh#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/configure#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/configure.ac#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/etc/audit_class#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/etc/audit_event#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_event.c#3 integrate
.. //depot/projects/mips2/src/contrib/openbsm/libbsm/bsm_io.c#5 integrate
.. //depot/projects/mips2/src/contrib/openbsm/man/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/modules/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate
.. //depot/projects/mips2/src/contrib/openbsm/tools/Makefile.in#3 integrate
.. //depot/projects/mips2/src/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/mips2/src/contrib/pf/pflogd/pflogd.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/CACerts#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/FREEBSD-upgrade#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/INSTALL#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/RELEASE_NOTES#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/cf/cf/submit.cf#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/cf/m4/proto.m4#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/cf/m4/version.m4#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/contrib/buildvirtuser#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/doc/op/op.me#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/editmap/editmap.c#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/include/sm/conf.h#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/include/sm/ldap.h#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/include/sm/tailq.h#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libmilter/engine.c#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libmilter/listener.c#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libmilter/main.c#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libmilter/monitor.c#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libmilter/smfi.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libsm/ldap.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/libsm/mpeix.c#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/makemap/makemap.c#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/praliases/praliases.c#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/Makefile.m4#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/conf.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/deliver.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/envelope.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/headers.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/macro.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/main.c#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/map.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/milter.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/mime.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/parseaddr.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/queue.c#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/readcf.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/recipient.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/sendmail.8#2 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/sendmail.h#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/sm_resolve.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/srvrsmtp.c#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/usersmtp.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/util.c#3 integrate
.. //depot/projects/mips2/src/contrib/sendmail/src/version.c#4 integrate
.. //depot/projects/mips2/src/contrib/sendmail/vacation/vacation.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/CHANGES#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/CREDITS#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/FILES#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/INSTALL#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/Makefile.in#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/README#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/VERSION#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/addrtoname.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/af.c#1 branch
.. //depot/projects/mips2/src/contrib/tcpdump/af.h#1 branch
.. //depot/projects/mips2/src/contrib/tcpdump/bootp.h#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/config.h.in#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/configure#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/configure.in#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/ieee802_11.h#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/ieee802_11_radio.h#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/interface.h#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/llc.h#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/nameser.h#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/netdissect.h#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/ospf.h#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/parsenfsfh.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/pf.h#2 delete
.. //depot/projects/mips2/src/contrib/tcpdump/print-802_11.c#4 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-atm.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-bfd.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-bgp.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-bootp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-chdlc.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-dhcp6.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-domain.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-ether.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-fddi.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-fr.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-icmp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-ip.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-ip6.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-ipfc.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-isoclns.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-juniper.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-lane.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-ldp.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-llc.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-lmp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-lspping.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-nfs.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-null.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-olsr.c#1 branch
.. //depot/projects/mips2/src/contrib/tcpdump/print-ospf.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-pflog.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-pim.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-ppp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-rsvp.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-rx.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-sctp.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-sll.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-smb.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-tcp.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-token.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/print-udp.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/smbutil.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/tcpdump-stdinc.h#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/tcpdump.1#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/tcpdump.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/tests/print-capX.out#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/tests/print-capXX.out#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/tftp.h#1 branch
.. //depot/projects/mips2/src/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/mips2/src/contrib/tcpdump/util.c#2 integrate
.. //depot/projects/mips2/src/contrib/tcsh/sh.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcsh/sh.lex.c#4 integrate
.. //depot/projects/mips2/src/contrib/tcsh/sh.proc.c#3 integrate
.. //depot/projects/mips2/src/contrib/tcsh/tc.const.c#3 integrate
.. //depot/projects/mips2/src/contrib/wpa_supplicant/main.c#3 integrate
.. //depot/projects/mips2/src/crypto/heimdal/appl/su/Makefile.am#2 integrate
.. //depot/projects/mips2/src/crypto/heimdal/appl/su/su.c#2 integrate
.. //depot/projects/mips2/src/crypto/openssl/ssl/d1_both.c#2 integrate
.. //depot/projects/mips2/src/crypto/openssl/ssl/dtls1.h#2 integrate
.. //depot/projects/mips2/src/crypto/openssl/ssl/ssl.h#3 integrate
.. //depot/projects/mips2/src/crypto/openssl/ssl/ssl_err.c#3 integrate
.. //depot/projects/mips2/src/crypto/openssl/ssl/ssl_lib.c#3 integrate
.. //depot/projects/mips2/src/etc/Makefile#4 integrate
.. //depot/projects/mips2/src/etc/cached.conf#2 delete
.. //depot/projects/mips2/src/etc/defaults/devfs.rules#2 integrate
.. //depot/projects/mips2/src/etc/defaults/rc.conf#6 integrate
.. //depot/projects/mips2/src/etc/mtree/BSD.include.dist#5 integrate
.. //depot/projects/mips2/src/etc/mtree/BSD.local.dist#3 integrate
.. //depot/projects/mips2/src/etc/mtree/BSD.x11-4.dist#2 integrate
.. //depot/projects/mips2/src/etc/mtree/README#2 integrate
.. //depot/projects/mips2/src/etc/namedb/named.root#2 integrate
.. //depot/projects/mips2/src/etc/network.subr#4 integrate
.. //depot/projects/mips2/src/etc/nscd.conf#1 branch
.. //depot/projects/mips2/src/etc/rc.d/Makefile#5 integrate
.. //depot/projects/mips2/src/etc/rc.d/amd#3 integrate
.. //depot/projects/mips2/src/etc/rc.d/cached#2 delete
.. //depot/projects/mips2/src/etc/rc.d/early.sh#2 integrate
.. //depot/projects/mips2/src/etc/rc.d/ftp-proxy#1 branch
.. //depot/projects/mips2/src/etc/rc.d/kerberos#3 integrate
.. //depot/projects/mips2/src/etc/rc.d/lockd#3 integrate
.. //depot/projects/mips2/src/etc/rc.d/named#2 integrate
.. //depot/projects/mips2/src/etc/rc.d/nfslocking#6 delete
.. //depot/projects/mips2/src/etc/rc.d/nscd#2 integrate
.. //depot/projects/mips2/src/etc/rc.d/ppp#3 integrate
.. //depot/projects/mips2/src/etc/rc.subr#5 integrate
.. //depot/projects/mips2/src/etc/sendmail/freebsd.mc#4 integrate
.. //depot/projects/mips2/src/etc/sendmail/freebsd.submit.mc#4 integrate
.. //depot/projects/mips2/src/etc/services#4 integrate
.. //depot/projects/mips2/src/games/fortune/datfiles/fortunes#5 integrate
.. //depot/projects/mips2/src/games/fortune/datfiles/fortunes-o.real#3 integrate
.. //depot/projects/mips2/src/games/fortune/datfiles/limerick#3 integrate
.. //depot/projects/mips2/src/gnu/lib/csu/Makefile#3 integrate
.. //depot/projects/mips2/src/gnu/lib/libobjc/Makefile#3 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/binutils/ld/Makefile#2 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/binutils/ld/genscripts.sh#3 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_int/Makefile#4 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/auto-host.h#5 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/diff/Makefile#3 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/man/man/man.c#2 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/sort/Makefile#2 integrate
.. //depot/projects/mips2/src/gnu/usr.bin/texinfo/info/Makefile#2 integrate
.. //depot/projects/mips2/src/include/Makefile#5 integrate
.. //depot/projects/mips2/src/include/_ctype.h#2 integrate
.. //depot/projects/mips2/src/include/ctype.h#2 integrate
.. //depot/projects/mips2/src/include/pthread.h#2 integrate
.. //depot/projects/mips2/src/include/pthread_np.h#2 integrate
.. //depot/projects/mips2/src/include/wctype.h#2 integrate
.. //depot/projects/mips2/src/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/mips2/src/lib/Makefile#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_read.3#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_read_support_compression_none.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_tar.c#6 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_read_support_format_zip.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_write_disk.c#5 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_cpio.c#4 integrate
.. //depot/projects/mips2/src/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_disk.c#3 integrate
.. //depot/projects/mips2/src/lib/libarchive/test/test_write_format_cpio.c#2 integrate
.. //depot/projects/mips2/src/lib/libbsm/Makefile#4 integrate
.. //depot/projects/mips2/src/lib/libc/Makefile#6 integrate
.. //depot/projects/mips2/src/lib/libc/arm/Symbol.map#3 integrate
.. //depot/projects/mips2/src/lib/libc/arm/string/ffs.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/arm/string/memcpy.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/arm/string/memset.S#2 integrate
.. //depot/projects/mips2/src/lib/libc/gdtoa/Symbol.map#3 integrate
.. //depot/projects/mips2/src/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/mips2/src/lib/libc/gen/sysctl.3#4 integrate
.. //depot/projects/mips2/src/lib/libc/gen/valloc.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/ia64/Symbol.map#3 integrate
.. //depot/projects/mips2/src/lib/libc/locale/Symbol.map#3 integrate
.. //depot/projects/mips2/src/lib/libc/locale/big5.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/locale/euc.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/locale/gb18030.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/locale/gb2312.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/locale/gbk.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/locale/isctype.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/locale/iswctype.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/locale/mskanji.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/locale/none.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/locale/setrunelocale.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/locale/utf8.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/net/ethers.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/net/getaddrinfo.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/net/nscache.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/net/sctp_connectx.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/net/sctp_opt_info.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/net/sctp_recvmsg.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/net/sctp_send.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/net/sctp_sendmsg.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/powerpc/Symbol.map#3 integrate
.. //depot/projects/mips2/src/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/rpc/getnetconfig.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/rpc/getnetpath.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/rpc/rpc_generic.c#2 integrate
.. //depot/projects/mips2/src/lib/libc/rpc/rpcb_clnt.c#3 integrate
.. //depot/projects/mips2/src/lib/libc/stdlib/atoi.3#3 integrate
.. //depot/projects/mips2/src/lib/libc/stdlib/getenv.c#4 integrate
.. //depot/projects/mips2/src/lib/libc/sys/Makefile.inc#4 integrate
.. //depot/projects/mips2/src/lib/libc/sys/kldstat.2#2 integrate
.. //depot/projects/mips2/src/lib/libc/sys/kqueue.2#3 integrate
.. //depot/projects/mips2/src/lib/libc/sys/minherit.2#3 integrate
.. //depot/projects/mips2/src/lib/libc/sys/ntp_adjtime.2#3 integrate
.. //depot/projects/mips2/src/lib/libc/sys/ntp_gettime.2#2 delete
.. //depot/projects/mips2/src/lib/libc/sys/sctp_generic_recvmsg.2#2 integrate
.. //depot/projects/mips2/src/lib/libc/sys/sctp_generic_sendmsg.2#2 integrate
.. //depot/projects/mips2/src/lib/libc/sys/sctp_peeloff.2#2 integrate
.. //depot/projects/mips2/src/lib/libdisk/open_disk.c#3 integrate
.. //depot/projects/mips2/src/lib/libdisk/open_ia64_disk.c#2 integrate
.. //depot/projects/mips2/src/lib/libelf/elf.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/elf_flagdata.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/elf_getscn.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/elf_update.c#2 integrate
.. //depot/projects/mips2/src/lib/libelf/gelf_getphdr.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/gelf_newehdr.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/gelf_newphdr.3#2 integrate
.. //depot/projects/mips2/src/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_accept_sec_context.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_acquire_cred.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_add_cred.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_add_oid_set_member.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_canonicalize_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_compare_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_context_time.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_delete_sec_context.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_display_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_display_status.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_duplicate_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_export_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_export_sec_context.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_get_mic.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_import_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_import_sec_context.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_indicate_mechs.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_init_sec_context.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_inquire_context.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_inquire_cred.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_process_context_token.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_release_buffer.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_release_cred.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_release_name.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_release_oid_set.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_test_oid_set_member.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_unwrap.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_verify_mic.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_wrap.3#2 integrate
.. //depot/projects/mips2/src/lib/libgssapi/gss_wrap_size_limit.3#2 integrate
.. //depot/projects/mips2/src/lib/libkse/Makefile#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/amd64/context.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/arm/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/arm/arm/context.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/arm/include/atomic_ops.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/i386/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/i386/include/atomic_ops.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/ia64/context.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/ia64/include/pthread_md.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/powerpc/context.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch
.. //depot/projects/mips2/src/lib/libkse/kse.map#1 branch
.. //depot/projects/mips2/src/lib/libkse/support/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/support/thr_support.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/sys/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/sys/lock.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/sys/lock.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/sys/thr_error.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/Makefile#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/README#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/guard_b.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/guard_b.exp#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/guard_s.pl#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/hello_b.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/hello_d.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/hello_d.exp#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/hello_s.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/join_leak_d.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/join_leak_d.exp#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/mutex_d.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/mutex_d.exp#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/propagate_s.pl#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/sem_d.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/sem_d.exp#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/sigsuspend_d.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/sigsuspend_d.exp#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/sigwait_d.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/sigwait_d.exp#1 branch
.. //depot/projects/mips2/src/lib/libkse/test/verify#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/Makefile.inc#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_accept.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_aio_suspend.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_atfork.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_destroy.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_get_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getguardsize.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getschedparam.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getscope.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getstack.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_getstacksize.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_init.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setguardsize.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setschedparam.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setscope.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setstack.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_attr_setstacksize.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_autoinit.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_barrier.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_barrierattr.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_cancel.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_clean.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_close.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_concurrency.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_cond.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_condattr_destroy.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_condattr_init.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_condattr_pshared.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_connect.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_creat.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_create.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_detach.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_equal.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_execve.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_exit.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_fcntl.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_find_thread.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_fork.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_fsync.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_getprio.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_getschedparam.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_info.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_init.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_join.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_kern.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_kill.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_main_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mattr_init.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mattr_kind_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mattr_pshared.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_msync.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_multi_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutex.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutex_protocol.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_nanosleep.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_once.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_open.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_pause.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_poll.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_printf.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_priority_queue.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_private.h#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_pselect.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_pspinlock.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_raise.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_read.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_readv.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_resume_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_rtld.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_rwlock.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_rwlockattr.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_select.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_self.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sem.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_seterrno.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_setprio.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_setschedparam.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sig.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigaction.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigmask.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigpending.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigprocmask.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigsuspend.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sigwait.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_single_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_sleep.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_spec.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_spinlock.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_stack.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_suspend_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_switch_np.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_symbols.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_system.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_tcdrain.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_vfork.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_wait.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_wait4.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_waitpid.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_write.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_writev.c#1 branch
.. //depot/projects/mips2/src/lib/libkse/thread/thr_yield.c#1 branch
.. //depot/projects/mips2/src/lib/libkvm/kvm_proc.c#5 integrate
.. //depot/projects/mips2/src/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#2 integrate
.. //depot/projects/mips2/src/lib/libpam/modules/pam_unix/Makefile#2 integrate
.. //depot/projects/mips2/src/lib/libpcap/Makefile#3 integrate
.. //depot/projects/mips2/src/lib/libpcap/config.h#2 integrate
.. //depot/projects/mips2/src/lib/libpthread/Makefile#4 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/amd64/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/amd64/amd64/context.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/amd64/amd64/enter_uts.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/amd64/amd64/pthread_md.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/amd64/include/atomic_ops.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/amd64/include/pthread_md.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/arm/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/arm/arm/context.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/arm/arm/pthread_md.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/arm/include/atomic_ops.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/arm/include/pthread_md.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/i386/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/i386/i386/pthread_md.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/i386/i386/thr_getcontext.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/i386/include/atomic_ops.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/i386/include/pthread_md.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/ia64/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/ia64/ia64/context.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/ia64/ia64/enter_uts.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/ia64/ia64/pthread_md.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/ia64/include/atomic_ops.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/ia64/include/pthread_md.h#3 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/include/atomic_ops.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/include/pthread_md.h#3 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/powerpc/assym.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/powerpc/assym.s#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/powerpc/context.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/powerpc/enter_uts.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/powerpc/powerpc/pthread_md.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/sparc64/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/sparc64/include/atomic_ops.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/sparc64/include/pthread_md.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/sparc64/sparc64/assym.s#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/sparc64/sparc64/pthread_md.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/arch/sparc64/sparc64/thr_getcontext.S#2 delete
.. //depot/projects/mips2/src/lib/libpthread/pthread.map#3 delete
.. //depot/projects/mips2/src/lib/libpthread/support/thr_support.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/sys/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/sys/lock.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/sys/lock.h#2 delete
.. //depot/projects/mips2/src/lib/libpthread/sys/thr_error.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/Makefile#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/README#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/guard_b.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/guard_b.exp#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/guard_s.pl#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/hello_b.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/hello_d.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/hello_d.exp#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/hello_s.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/join_leak_d.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/join_leak_d.exp#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/mutex_d.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/mutex_d.exp#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/propagate_s.pl#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/sem_d.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/sem_d.exp#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/sigsuspend_d.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/sigsuspend_d.exp#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/sigwait_d.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/sigwait_d.exp#2 delete
.. //depot/projects/mips2/src/lib/libpthread/test/verify#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/Makefile.inc#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_accept.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_aio_suspend.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_atfork.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_destroy.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_get_np.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getdetachstate.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getguardsize.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getinheritsched.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getschedparam.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getscope.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getstack.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getstackaddr.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_getstacksize.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_init.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setdetachstate.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setguardsize.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setinheritsched.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setschedparam.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setscope.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setstack.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setstackaddr.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_attr_setstacksize.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_autoinit.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_barrier.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_barrierattr.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_cancel.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_clean.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_close.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_concurrency.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_cond.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_condattr_destroy.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_condattr_init.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_condattr_pshared.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_connect.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_creat.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_create.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_detach.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_equal.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_execve.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_exit.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_fcntl.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_find_thread.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_fork.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_fsync.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_getprio.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_getschedparam.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_info.c#4 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_init.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_join.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_kern.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_kill.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_main_np.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_mattr_init.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_mattr_kind_np.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_mattr_pshared.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_msync.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_multi_np.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_mutex.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_mutex_prioceiling.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_mutex_protocol.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_mutexattr_destroy.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_nanosleep.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_once.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_open.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_pause.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_poll.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_printf.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_priority_queue.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_private.h#4 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_pselect.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_pspinlock.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_raise.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_read.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_readv.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_resume_np.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_rtld.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_rwlock.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_rwlockattr.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_select.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_self.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sem.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_seterrno.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_setprio.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_setschedparam.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sig.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sigaction.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sigaltstack.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sigmask.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sigpending.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sigprocmask.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sigsuspend.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sigwait.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_single_np.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_sleep.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_spec.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_spinlock.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_stack.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_suspend_np.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_switch_np.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_symbols.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_system.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_tcdrain.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_vfork.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_wait.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_wait4.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_waitpid.c#2 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_write.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_writev.c#3 delete
.. //depot/projects/mips2/src/lib/libpthread/thread/thr_yield.c#3 delete
.. //depot/projects/mips2/src/lib/libstand/Makefile#3 integrate
.. //depot/projects/mips2/src/lib/libstand/tftp.c#2 integrate
.. //depot/projects/mips2/src/lib/libthr/Makefile#5 integrate
.. //depot/projects/mips2/src/lib/libthr/libthr.3#2 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_init.c#5 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_mutex.c#5 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_once.c#2 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_private.h#5 integrate
.. //depot/projects/mips2/src/lib/libthr/thread/thr_pspinlock.c#3 integrate
.. //depot/projects/mips2/src/lib/libutil/Makefile#4 integrate
.. //depot/projects/mips2/src/lib/libutil/expand_number.3#1 branch
.. //depot/projects/mips2/src/lib/libutil/expand_number.c#1 branch
.. //depot/projects/mips2/src/lib/libutil/flopen.3#3 integrate
.. //depot/projects/mips2/src/lib/libutil/humanize_number.3#4 integrate
.. //depot/projects/mips2/src/lib/libutil/kld.3#4 integrate
.. //depot/projects/mips2/src/lib/libutil/libutil.h#3 integrate
.. //depot/projects/mips2/src/lib/libutil/pidfile.3#2 integrate
.. //depot/projects/mips2/src/lib/libutil/pidfile.c#4 integrate
.. //depot/projects/mips2/src/lib/ncurses/ncurses/Makefile#4 integrate
.. //depot/projects/mips2/src/libexec/Makefile#3 integrate
.. //depot/projects/mips2/src/libexec/atrun/Makefile#3 integrate
.. //depot/projects/mips2/src/libexec/rtld-elf/sparc64/reloc.c#4 integrate
.. //depot/projects/mips2/src/release/Makefile#5 integrate
.. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate
.. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate
.. //depot/projects/mips2/src/release/doc/share/misc/dev.archlist.txt#6 integrate
.. //depot/projects/mips2/src/release/doc/share/sgml/release.ent#4 integrate
.. //depot/projects/mips2/src/rescue/rescue/Makefile#4 integrate
.. //depot/projects/mips2/src/sbin/camcontrol/Makefile#2 integrate
.. //depot/projects/mips2/src/sbin/camcontrol/camcontrol.8#3 integrate
.. //depot/projects/mips2/src/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/mips2/src/sbin/dhclient/dhclient.8#3 integrate
.. //depot/projects/mips2/src/sbin/fsck_ffs/Makefile#3 integrate
.. //depot/projects/mips2/src/sbin/fsck_ffs/main.c#4 integrate
.. //depot/projects/mips2/src/sbin/geom/Makefile#2 integrate
.. //depot/projects/mips2/src/sbin/geom/class/Makefile#4 integrate
.. //depot/projects/mips2/src/sbin/geom/class/eli/geli.8#3 integrate
.. //depot/projects/mips2/src/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/mips2/src/sbin/geom/class/part/gpart.8#2 integrate
.. //depot/projects/mips2/src/sbin/geom/class/virstor/Makefile#1 branch
.. //depot/projects/mips2/src/sbin/geom/class/virstor/geom_virstor.c#1 branch
.. //depot/projects/mips2/src/sbin/geom/class/virstor/gvirstor.8#1 branch
.. //depot/projects/mips2/src/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/mips2/src/sbin/geom/core/geom.c#4 integrate
.. //depot/projects/mips2/src/sbin/ggate/Makefile#3 integrate
.. //depot/projects/mips2/src/sbin/gpt/Makefile#2 integrate
.. //depot/projects/mips2/src/sbin/gpt/add.c#3 integrate
.. //depot/projects/mips2/src/sbin/gpt/boot.c#1 branch
.. //depot/projects/mips2/src/sbin/gpt/gpt.8#2 integrate
.. //depot/projects/mips2/src/sbin/gpt/gpt.c#3 integrate
.. //depot/projects/mips2/src/sbin/gpt/gpt.h#2 integrate
.. //depot/projects/mips2/src/sbin/gpt/show.c#2 integrate
.. //depot/projects/mips2/src/sbin/ifconfig/ifbridge.c#5 integrate
.. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.8#7 integrate
.. //depot/projects/mips2/src/sbin/ifconfig/ifconfig.c#5 integrate
.. //depot/projects/mips2/src/sbin/ifconfig/ifieee80211.c#5 integrate
.. //depot/projects/mips2/src/sbin/ipfw/ipfw.8#6 integrate
.. //depot/projects/mips2/src/sbin/ipfw/ipfw2.c#5 integrate
.. //depot/projects/mips2/src/sbin/kldstat/kldstat.c#2 integrate
.. //depot/projects/mips2/src/sbin/mount/mount.8#5 integrate
.. //depot/projects/mips2/src/sbin/mount_unionfs/mount_unionfs.8#3 integrate
.. //depot/projects/mips2/src/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/mips2/src/sbin/quotacheck/quotacheck.c#3 integrate
.. //depot/projects/mips2/src/sbin/route/route.8#2 integrate
.. //depot/projects/mips2/src/sbin/route/route.c#2 integrate
.. //depot/projects/mips2/src/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/mips2/src/sbin/sysctl/sysctl.c#5 integrate
.. //depot/projects/mips2/src/sbin/tunefs/tunefs.8#4 integrate
.. //depot/projects/mips2/src/share/doc/legal/intel_wpi/Makefile#1 branch
.. //depot/projects/mips2/src/share/examples/cvsup/cvs-supfile#4 integrate
.. //depot/projects/mips2/src/share/examples/cvsup/doc-supfile#2 integrate
.. //depot/projects/mips2/src/share/examples/cvsup/gnats-supfile#2 integrate
.. //depot/projects/mips2/src/share/examples/cvsup/ports-supfile#4 integrate
.. //depot/projects/mips2/src/share/examples/cvsup/stable-supfile#3 integrate
.. //depot/projects/mips2/src/share/examples/cvsup/standard-supfile#3 integrate
.. //depot/projects/mips2/src/share/examples/cvsup/www-supfile#2 integrate
.. //depot/projects/mips2/src/share/man/man3/Makefile#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_attr.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_attr_get_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_attr_setcreatesuspend_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_barrier_destroy.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_barrierattr.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cancel.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cleanup_pop.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cleanup_push.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cond_broadcast.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cond_destroy.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cond_init.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cond_signal.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cond_timedwait.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_cond_wait.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_condattr.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_create.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_detach.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_equal.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_exit.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_getconcurrency.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_getspecific.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_join.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_key_create.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_key_delete.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_kill.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_main_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_multi_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutex_destroy.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutex_init.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutex_lock.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutex_timedlock.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutex_trylock.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutex_unlock.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutexattr.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_mutexattr_getkind_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_once.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_resume_all_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_resume_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlock_destroy.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlock_init.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlock_rdlock.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlock_timedrdlock.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlock_timedwrlock.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlock_unlock.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlock_wrlock.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlockattr_destroy.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlockattr_getpshared.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlockattr_init.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_rwlockattr_setpshared.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_schedparam.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_self.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_set_name_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_setspecific.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_sigmask.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_spin_init.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_spin_lock.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_switch_add_np.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_testcancel.3#3 integrate
.. //depot/projects/mips2/src/share/man/man3/pthread_yield.3#2 integrate
.. //depot/projects/mips2/src/share/man/man3/queue.3#3 integrate
.. //depot/projects/mips2/src/share/man/man4/Makefile#10 integrate
.. //depot/projects/mips2/src/share/man/man4/ata.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/coretemp.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/cxgb.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/gem.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/hwpmc.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/if_bridge.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/mac.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/md.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/ng_car.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/ng_netflow.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/nxge.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/pci.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/ral.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/rum.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/sctp.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/snd_emu10kx.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/ural.4#4 integrate
.. //depot/projects/mips2/src/share/man/man4/uscanner.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/wlan.4#3 integrate
.. //depot/projects/mips2/src/share/man/man4/wlan_amrr.4#2 integrate
.. //depot/projects/mips2/src/share/man/man4/zyd.4#1 branch
.. //depot/projects/mips2/src/share/man/man5/Makefile#5 integrate
.. //depot/projects/mips2/src/share/man/man5/ar.5#1 branch
.. //depot/projects/mips2/src/share/man/man5/bluetooth.device.conf.5#3 integrate
.. //depot/projects/mips2/src/share/man/man5/elf.5#3 integrate
.. //depot/projects/mips2/src/share/man/man5/fstab.5#2 integrate
.. //depot/projects/mips2/src/share/man/man5/nsswitch.conf.5#3 integrate
.. //depot/projects/mips2/src/share/man/man5/quota.user.5#3 integrate
.. //depot/projects/mips2/src/share/man/man5/rc.conf.5#6 integrate
.. //depot/projects/mips2/src/share/man/man5/src.conf.5#5 integrate
.. //depot/projects/mips2/src/share/man/man5/xfs.5#2 integrate
.. //depot/projects/mips2/src/share/man/man7/Makefile#3 integrate
.. //depot/projects/mips2/src/share/man/man8/rc.subr.8#5 integrate
.. //depot/projects/mips2/src/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/Makefile#5 integrate
.. //depot/projects/mips2/src/share/man/man9/crypto.9#3 integrate
.. //depot/projects/mips2/src/share/man/man9/kproc.9#1 branch
.. //depot/projects/mips2/src/share/man/man9/kthread.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/pci.9#2 integrate
.. //depot/projects/mips2/src/share/man/man9/sleepqueue.9#3 integrate
.. //depot/projects/mips2/src/share/man/man9/suser.9#4 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 20:01:59 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0692916A469; Mon,  5 Nov 2007 20:01: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 88FDF16A420;
	Mon,  5 Nov 2007 20:01:58 +0000 (UTC)
	(envelope-from flata@magnesium.net)
Received: from toxic.magnesium.net (toxic.magnesium.net [207.154.84.15])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C35013C4B0;
	Mon,  5 Nov 2007 20:01:58 +0000 (UTC)
	(envelope-from flata@magnesium.net)
Received: by toxic.magnesium.net (Postfix, from userid 1212)
	id F28A5DA82E; Mon,  5 Nov 2007 12:02:09 -0800 (PST)
Date: Mon, 5 Nov 2007 10:02:09 -1000
From: Juli Mallett 
To: Oleksandr Tymoshenko 
Message-ID: <20071105200209.GA45751@toxic.magnesium.net>
References: <200711051909.lA5J9C3B016553@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200711051909.lA5J9C3B016553@repoman.freebsd.org>
User-Agent: Mutt/1.5.15 (2007-04-06)
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 128693 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 20:01:59 -0000

Great work you're doing!

* Oleksandr Tymoshenko  [ 2007-11-05 ]
	[ PERFORCE change 128693 for review ]
> http://perforce.freebsd.org/chv.cgi?CH=128693
> 
> Change 128693 by gonzo@gonzo_jeeves on 2007/11/05 19:09:07
> 
> 	o Try bootp on vr0
> 	o Add and comment out options for ath(4)
> 	o Enable uart
> 
> Affected files ...
> 
> .. //depot/projects/mips2/src/sys/mips/conf/IDT#3 edit
> 
> Differences ...
> 
> ==== //depot/projects/mips2/src/sys/mips/conf/IDT#3 (text+ko) ====
> 
> @@ -26,10 +26,10 @@
>  options		BOOTP
>  options		BOOTP_NFSROOT
>  options		BOOTP_NFSV3
> -options		BOOTP_WIRED_TO=admsw0
> +options		BOOTP_WIRED_TO=vr0
>  options		BOOTP_COMPAT
>  
> -options		ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"
> +options		ROOTDEVNAME=\"nfs:192.168.0.52:/mnt/bsd\"
>  
>  
>  # Debugging for use in -current
> @@ -42,3 +42,15 @@
>  device		ether
>  device		miibus
>  device		vr
> +device		uart
> +device		uart_ns8250
> +
> +# Wireless NIC cards
> +#device          wlan            # 802.11 support
> +#device         wlan_wep        # 802.11 WEP support
> +#device         wlan_ccmp       # 802.11 CCMP support
> +#device         wlan_tkip       # 802.11 TKIP support
> +#device          ath             # Atheros pci/cardbus NIC's
> +#device          ath_hal         # Atheros HAL (Hardware Access Layer)
> +#device          ath_rate_sample # SampleRate tx rate control for ath
> +#options         ATH_DEBUG

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 20:18:15 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D28916A41B; Mon,  5 Nov 2007 20:18: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 AC80116A41A
	for ; Mon,  5 Nov 2007 20:18:14 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9319813C4B2
	for ; Mon,  5 Nov 2007 20:18:14 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5KIEO7020569
	for ; Mon, 5 Nov 2007 20:18:14 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5KIEme020566
	for perforce@freebsd.org; Mon, 5 Nov 2007 20:18:14 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 20:18:14 GMT
Message-Id: <200711052018.lA5KIEme020566@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128698 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 20:18:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=128698

Change 128698 by gonzo@gonzo_jeeves on 2007/11/05 20:18:08

	o Three free pages pools by default
	o Add VM_FREEPOOL_CACHE

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/vmparam.h#10 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/vmparam.h#10 (text+ko) ====

@@ -111,12 +111,13 @@
 #define	VM_PHYSSEG_DENSE
 
 /*
- * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool
+ * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool
  * from which physical pages are allocated and VM_FREEPOOL_DIRECT is
  * the pool from which physical pages for small UMA objects are
  * allocated.
  */
-#define	VM_NFREEPOOL		2
+#define	VM_NFREEPOOL		3
+#define	VM_FREEPOOL_CACHE	2
 #define	VM_FREEPOOL_DEFAULT	0
 #define	VM_FREEPOOL_DIRECT	1
 

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 20:20:17 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 263DE16A41B; Mon,  5 Nov 2007 20:20: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 E030716A41A
	for ; Mon,  5 Nov 2007 20:20:16 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C758E13C4B6
	for ; Mon,  5 Nov 2007 20:20:16 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5KKGgF020680
	for ; Mon, 5 Nov 2007 20:20:16 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5KKG9h020677
	for perforce@freebsd.org; Mon, 5 Nov 2007 20:20:16 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Mon, 5 Nov 2007 20:20:16 GMT
Message-Id: <200711052020.lA5KKG9h020677@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128699 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 20:20:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=128699

Change 128699 by gonzo@gonzo_jeeves on 2007/11/05 20:19:18

	o pmap_pinit now returns int, also s/struct pmap \*/pmap_t/

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/pmap.c#28 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#28 (text+ko) ====

@@ -763,9 +763,8 @@
  * Initialize a preallocated and zeroed pmap structure,
  * such as one in a vmspace structure.
  */
-void
-pmap_pinit(pmap)
-	register struct pmap *pmap;
+int
+pmap_pinit(pmap_t pmap)
 {
 	vm_page_t lev1pg;
 
@@ -799,6 +798,8 @@
 	mtx_lock_spin(&allpmaps_lock);
 	LIST_INSERT_HEAD(&allpmaps, pmap, pm_list);
 	mtx_unlock_spin(&allpmaps_lock);
+
+	return (1);
 }
 
 /*

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 22:12:20 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1183316A419; Mon,  5 Nov 2007 22:12: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 7FA2716A417
	for ; Mon,  5 Nov 2007 22:12:19 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6416513C49D
	for ; Mon,  5 Nov 2007 22:12:19 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5MCJrq035909
	for ; Mon, 5 Nov 2007 22:12:19 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5MCH01035906
	for perforce@freebsd.org; Mon, 5 Nov 2007 22:12:17 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 5 Nov 2007 22:12:17 GMT
Message-Id: <200711052212.lA5MCH01035906@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 128704 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 22:12:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=128704

Change 128704 by jb@jb_freebsd1 on 2007/11/05 22:11:46

	IFC

Affected files ...

.. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#7 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/CACerts#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/FREEBSD-upgrade#7 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/INSTALL#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/RELEASE_NOTES#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/cf/submit.cf#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/feature/ldap_routing.m4#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/m4/proto.m4#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/cf/m4/version.m4#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/contrib/buildvirtuser#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/doc/op/op.me#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/editmap/editmap.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/include/sm/conf.h#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/include/sm/ldap.h#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/include/sm/tailq.h#2 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/engine.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/listener.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/main.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/monitor.c#2 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libmilter/smfi.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libsm/ldap.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/libsm/mpeix.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/makemap/makemap.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/praliases/praliases.c#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/Makefile.m4#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/conf.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/deliver.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/envelope.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/headers.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/macro.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/main.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/map.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/milter.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/mime.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/parseaddr.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/queue.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/readcf.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/recipient.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/sendmail.8#4 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/sendmail.h#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/sm_resolve.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/srvrsmtp.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/usersmtp.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/util.c#5 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/src/version.c#6 integrate
.. //depot/projects/dtrace/src/contrib/sendmail/vacation/vacation.c#5 integrate
.. //depot/projects/dtrace/src/etc/network.subr#11 integrate
.. //depot/projects/dtrace/src/etc/sendmail/freebsd.mc#7 integrate
.. //depot/projects/dtrace/src/etc/sendmail/freebsd.submit.mc#7 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate
.. //depot/projects/dtrace/src/share/doc/legal/intel_wpi/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#21 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#22 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#20 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#20 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/ep80219_machdep.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/dtrace/src/sys/compat/pecoff/imgact_pecoff.c#5 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/imgact_svr4.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/wpi/LICENSE#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace.h#26 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 edit
.. //depot/projects/dtrace/src/sys/dev/ciss/ciss.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/isp/isp_sbus.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/ukbd.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#1 branch
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpireg.h#1 branch
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpivar.h#1 branch
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#20 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#18 integrate
.. //depot/projects/dtrace/src/sys/i386/ibcs2/imgact_coff.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/imgact_linux.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/pmap.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_aout.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#7 integrate
.. //depot/projects/dtrace/src/sys/kern/imgact_gzip.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_exec.c#17 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_fork.c#21 edit
.. //depot/projects/dtrace/src/sys/kern/kern_kse.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_proc.c#9 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sig.c#16 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thr.c#19 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_thread.c#15 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#25 integrate
.. //depot/projects/dtrace/src/sys/modules/wpi/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/wpifw/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#17 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#10 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powerpc/pmap_dispatch.c#8 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#12 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#13 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#24 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#25 integrate
.. //depot/projects/dtrace/src/sys/sys/signalvar.h#5 integrate
.. //depot/projects/dtrace/src/sys/vm/pmap.h#7 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_extern.h#4 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_glue.c#10 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_map.c#12 integrate
.. //depot/projects/dtrace/src/sys/vm/vm_page.c#23 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#6 integrate
.. //depot/projects/dtrace/www/de/developers.sgml#5 integrate
.. //depot/projects/dtrace/www/de/docs/books.sgml#10 integrate
.. //depot/projects/dtrace/www/de/index.xsl#14 integrate
.. //depot/projects/dtrace/www/de/ports/Makefile#3 integrate
.. //depot/projects/dtrace/www/de/share/sgml/news.xml#14 integrate
.. //depot/projects/dtrace/www/de/share/sgml/press.xml#13 integrate
.. //depot/projects/dtrace/www/de/where.sgml#11 integrate

Differences ...

==== //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#7 (text+ko) ====

@@ -31,7 +31,7 @@
 # If you are wondering what your port exactly does, use "make test-gcc"
 # to see some debugging.
 #
-# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.14 2007/07/27 21:40:10 pav Exp $
+# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.15 2007/11/05 19:26:16 gerald Exp $
 #
 
 GCC_Include_MAINTAINER=		gerald@FreeBSD.org
@@ -40,7 +40,7 @@
 # All GCC versions supported by the ports framework.
 # Please keep them in ascending order.
 #
-GCCVERSIONS=	020702 020801 029500 030200 030301 030402 040000 040100 040200
+GCCVERSIONS=	020702 020801 029500 030200 030301 030402 040100 040200
 
 #
 # Versions of GCC shipped.
@@ -55,7 +55,6 @@
 GCCVERSION_030200=	500039 501103 3.2
 GCCVERSION_030301=	501103 502126 3.3
 GCCVERSION_030402=	502126 700042 3.4
-GCCVERSION_040000=	999999 999999 4.0
 GCCVERSION_040100=	999999 999999 4.1
 GCCVERSION_040200=	700042 999999 4.2
 

==== //depot/projects/dtrace/src/contrib/sendmail/CACerts#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $Id: CACerts,v 8.1 2004/03/01 22:05:47 ca Exp $
+# $Id: CACerts,v 8.3 2007/06/11 22:04:46 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.
@@ -78,73 +78,6 @@
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-        Validity
-            Not Before: Jan  1 04:39:54 2002 GMT
-            Not After : Dec 31 04:39:54 2006 GMT
-        Subject: C=US, ST=California, L=Emeryville, O=gshapiro.net, CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:aa:dd:a2:fe:3b:fa:2f:5c:3d:f1:e1:d4:1d:55:
-                    04:27:6b:01:62:00:d7:02:cb:74:47:69:84:d7:c6:
-                    c5:71:55:79:35:3a:a8:ce:de:48:23:53:80:3c:cd:
-                    54:2e:e9:fe:b1:76:5a:be:cb:fd:2d:dc:a3:36:c5:
-                    c7:1e:4e:ef:76:f0:55:8f:a0:a5:f8:07:c5:52:1d:
-                    a2:42:81:4d:8a:c8:42:3f:f3:01:80:f9:46:35:a6:
-                    bc:c0:9b:9f:33:8b:49:9b:1d:87:8f:19:48:15:21:
-                    23:57:df:6e:4d:03:ed:ae:9f:0b:91:b7:a9:47:66:
-                    f1:0d:1b:1c:5d:b4:57:60:c7
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-            A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA
-            X509v3 Authority Key Identifier: 
-            keyid:A0:6D:E0:06:AF:61:94:B4:C6:84:15:B4:8B:74:22:67:4A:43:60:CA
-            DirName:/C=US/ST=California/L=Emeryville/O=gshapiro.net/CN=Certificate Authority/emailAddress=certificates@gshapiro.net
-            serial:00
-
-            X509v3 Basic Constraints: 
-            CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        87:27:d2:2a:3a:dc:04:cd:ef:e8:7b:1c:34:47:2e:13:34:a5:
-        08:f9:4d:df:d8:e1:6d:e6:9a:db:38:ee:20:6d:4a:ae:6f:1e:
-        bc:71:61:a4:b4:d6:40:24:ee:65:ca:e9:81:5a:ef:ee:62:57:
-        70:05:46:91:6b:d0:c6:a6:e9:38:65:ae:ea:50:b3:5c:27:c4:
-        7a:bd:95:8c:cb:45:ef:fc:fc:99:e5:6a:61:c3:44:77:d8:1f:
-        d6:b4:17:44:15:9a:bc:26:5b:ec:4e:29:5d:fd:cf:61:f3:be:
-        91:a4:3b:51:e6:73:5b:17:82:9d:5a:56:2c:63:c2:f1:d6:a2:
-        4c:5a
------BEGIN CERTIFICATE-----
-MIIDoTCCAwqgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExEzARBgNVBAcTCkVtZXJ5dmlsbGUxFTATBgNV
-BAoTDGdzaGFwaXJvLm5ldDEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MSgwJgYJKoZIhvcNAQkBFhljZXJ0aWZpY2F0ZXNAZ3NoYXBpcm8ubmV0MB4XDTAy
-MDEwMTA0Mzk1NFoXDTA2MTIzMTA0Mzk1NFowgZgxCzAJBgNVBAYTAlVTMRMwEQYD
-VQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxlMRUwEwYDVQQKEwxn
-c2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEoMCYG
-CSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5ldDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAqt2i/jv6L1w98eHUHVUEJ2sBYgDXAst0R2mE18bF
-cVV5NTqozt5II1OAPM1ULun+sXZavsv9LdyjNsXHHk7vdvBVj6Cl+AfFUh2iQoFN
-ishCP/MBgPlGNaa8wJufM4tJmx2HjxlIFSEjV99uTQPtrp8LkbepR2bxDRscXbRX
-YMcCAwEAAaOB+DCB9TAdBgNVHQ4EFgQUoG3gBq9hlLTGhBW0i3QiZ0pDYMowgcUG
-A1UdIwSBvTCBuoAUoG3gBq9hlLTGhBW0i3QiZ0pDYMqhgZ6kgZswgZgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRMwEQYDVQQHEwpFbWVyeXZpbGxl
-MRUwEwYDVQQKEwxnc2hhcGlyby5uZXQxHjAcBgNVBAMTFUNlcnRpZmljYXRlIEF1
-dGhvcml0eTEoMCYGCSqGSIb3DQEJARYZY2VydGlmaWNhdGVzQGdzaGFwaXJvLm5l
-dIIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAIcn0io63ATN7+h7
-HDRHLhM0pQj5Td/Y4W3mmts47iBtSq5vHrxxYaS01kAk7mXK6YFa7+5iV3AFRpFr
-0Mam6ThlrupQs1wnxHq9lYzLRe/8/JnlamHDRHfYH9a0F0QVmrwmW+xOKV39z2Hz
-vpGkO1Hmc1sXgp1aVixjwvHWokxa
------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
@@ -210,93 +143,94 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 0 (0x0)
+        Serial Number:
+            fa:7c:2c:80:29:3f:c2:64
         Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
+        Issuer: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2007/emailAddress=ca+ca-rsa2007@esmtp.org
         Validity
-            Not Before: Aug  7 15:56:45 2003 GMT
-            Not After : Aug  6 15:56:45 2006 GMT
-        Subject: C=US, ST=California, L=Berkeley, O=Endmail Org, OU=MTA, CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
+            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
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (2048 bit)
                 Modulus (2048 bit):
-                    00:aa:37:0f:09:a9:1c:e3:1a:0c:fe:bd:6c:37:a4:
-                    cf:87:db:af:6b:b4:19:d4:11:db:c6:56:ca:39:80:
-                    c6:a4:38:b0:bc:ac:7e:be:71:30:86:2c:dc:fa:b5:
-                    fd:58:23:a0:c1:ad:11:53:85:ca:fb:e6:d8:7e:28:
-                    eb:84:3b:cd:a3:fa:28:a5:cb:c7:b2:54:99:3e:40:
-                    2a:27:43:4b:0c:26:4b:af:97:3d:92:82:d9:eb:2c:
-                    7f:77:fd:b8:cd:7e:1e:04:81:17:3c:e2:44:68:ce:
-                    88:66:02:90:24:35:24:c4:4c:ad:77:04:1a:3a:d5:
-                    59:28:28:03:da:03:9d:f4:2e:52:6e:b5:36:96:4b:
-                    14:f8:fc:8e:c6:d3:9b:e2:80:90:8b:71:d7:d0:5c:
-                    43:b2:49:f1:5a:26:f3:5d:9e:3b:01:98:db:e3:ed:
-                    5e:8d:dd:cf:aa:68:9d:0b:c9:e2:4e:fc:16:44:72:
-                    93:07:62:18:05:c1:47:81:3c:3d:e4:e4:22:da:2c:
-                    d6:4a:44:52:06:7a:83:b5:e9:52:38:97:2f:75:a6:
-                    5c:6f:87:8a:8d:83:f4:d0:04:a5:34:18:5e:a1:06:
-                    16:b3:54:ce:64:47:ca:70:56:a3:6f:b9:7f:af:91:
-                    76:78:70:b4:ab:ae:8e:d5:22:26:57:b1:ba:e7:4b:
-                    18:21
+                    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
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-            3A:12:03:DB:0F:9E:28:45:A6:34:8D:38:AB:BA:47:8C:2A:A0:E4:2E
+                B2:49:6B:52:45:EE:90:36:D2:79:47:03:33:D9:A0:BA:80:50:DA:1C
             X509v3 Authority Key Identifier: 
-            keyid:3A:12:03:DB:0F:9E:28:45:A6:34:8D:38:AB:BA:47:8C:2A:A0:E4:2E
-            DirName:/C=US/ST=California/L=Berkeley/O=Endmail Org/OU=MTA/CN=Claus Assmann CA RSA 2003/emailAddress=ca+ca-rsa2003@esmtp.org
-            serial:00
+                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
 
             X509v3 Basic Constraints: 
-            CA:TRUE
+                CA:TRUE
             X509v3 Subject Alternative Name: 
-            email:ca+ca-rsa2003@esmtp.org
+                email:ca+ca-rsa2007@esmtp.org
             X509v3 Issuer Alternative Name: 
-            email:ca+ca-rsa2003@esmtp.org
+                email:ca+ca-rsa2007@esmtp.org
     Signature Algorithm: md5WithRSAEncryption
-        96:83:b6:54:93:df:38:d0:48:a7:a1:c8:08:c9:0f:e9:80:05:
-        e3:7e:c3:61:51:88:7b:7a:bb:24:b0:69:a3:22:e4:98:38:da:
-        c8:c3:eb:52:70:63:e2:66:f2:59:ef:56:be:aa:7c:87:6e:94:
-        85:d4:71:ba:35:f7:ee:d0:6e:52:1d:1f:e4:fd:2f:e2:70:31:
-        5d:b7:8b:13:cc:70:10:21:fa:34:29:8f:8d:d8:4a:c7:0f:b2:
-        36:e7:1e:1e:46:d1:11:84:80:7c:bb:24:c4:63:be:2a:24:53:
-        74:0c:89:e0:6a:f4:08:63:bf:54:d3:0a:d9:fc:fe:6c:de:4f:
-        97:61:08:a0:10:92:eb:af:06:ec:50:86:c4:cc:6b:31:32:60:
-        25:7a:09:47:f8:42:7a:a2:d5:90:fa:48:be:bf:0a:e1:03:b8:
-        56:24:b9:12:e9:ba:09:30:47:be:a5:8e:a2:92:a4:dc:a6:a7:
-        c6:29:39:65:6e:64:4a:1b:b2:c3:07:29:f5:c0:7e:78:e0:22:
-        9b:98:d4:87:91:ca:e1:66:9d:2f:70:f1:4c:a5:8e:2e:68:52:
-        b3:bd:95:76:56:40:0e:46:47:e4:b3:ec:aa:3c:e8:86:96:5a:
-        ed:fa:c9:10:95:53:04:13:71:01:91:ce:cd:3a:51:c6:30:e9:
-        48:49:64:a3
+        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
 -----BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBpTELMAkGA1UEBhMCVVMx
-EzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCEJlcmtlbGV5MRQwEgYDVQQK
-EwtFbmRtYWlsIE9yZzEMMAoGA1UECxMDTVRBMSIwIAYDVQQDExlDbGF1cyBBc3Nt
-YW5uIENBIFJTQSAyMDAzMSYwJAYJKoZIhvcNAQkBFhdjYStjYS1yc2EyMDAzQGVz
-bXRwLm9yZzAeFw0wMzA4MDcxNTU2NDVaFw0wNjA4MDYxNTU2NDVaMIGlMQswCQYD
+MIIFJzCCBA+gAwIBAgIJAPp8LIApP8JkMA0GCSqGSIb3DQEBBAUAMIGlMQswCQYD
 VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx
 FDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNNVEExIjAgBgNVBAMTGUNs
-YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDMxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
-YTIwMDNAZXNtdHAub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qjcPCakc4xoM/r1sN6TPh9uva7QZ1BHbxlbKOYDGpDiwvKx+vnEwhizc+rX9WCOg
-wa0RU4XK++bYfijrhDvNo/oopcvHslSZPkAqJ0NLDCZLr5c9koLZ6yx/d/24zX4e
-BIEXPOJEaM6IZgKQJDUkxEytdwQaOtVZKCgD2gOd9C5SbrU2lksU+PyOxtOb4oCQ
-i3HX0FxDsknxWibzXZ47AZjb4+1ejd3PqmidC8niTvwWRHKTB2IYBcFHgTw95OQi
-2izWSkRSBnqDtelSOJcvdaZcb4eKjYP00ASlNBheoQYWs1TOZEfKcFajb7l/r5F2
-eHC0q66O1SImV7G650sYIQIDAQABo4IBTjCCAUowHQYDVR0OBBYEFDoSA9sPnihF
-pjSNOKu6R4wqoOQuMIHSBgNVHSMEgcowgceAFDoSA9sPnihFpjSNOKu6R4wqoOQu
-oYGrpIGoMIGlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8G
-A1UEBxMIQmVya2VsZXkxFDASBgNVBAoTC0VuZG1haWwgT3JnMQwwCgYDVQQLEwNN
-VEExIjAgBgNVBAMTGUNsYXVzIEFzc21hbm4gQ0EgUlNBIDIwMDMxJjAkBgkqhkiG
-9w0BCQEWF2NhK2NhLXJzYTIwMDNAZXNtdHAub3JnggEAMAwGA1UdEwQFMAMBAf8w
-IgYDVR0RBBswGYEXY2ErY2EtcnNhMjAwM0Blc210cC5vcmcwIgYDVR0SBBswGYEX
-Y2ErY2EtcnNhMjAwM0Blc210cC5vcmcwDQYJKoZIhvcNAQEEBQADggEBAJaDtlST
-3zjQSKehyAjJD+mABeN+w2FRiHt6uySwaaMi5Jg42sjD61JwY+Jm8lnvVr6qfIdu
-lIXUcbo19+7QblIdH+T9L+JwMV23ixPMcBAh+jQpj43YSscPsjbnHh5G0RGEgHy7
-JMRjviokU3QMieBq9Ahjv1TTCtn8/mzeT5dhCKAQkuuvBuxQhsTMazEyYCV6CUf4
-Qnqi1ZD6SL6/CuEDuFYkuRLpugkwR76ljqKSpNymp8YpOWVuZEobssMHKfXAfnjg
-IpuY1IeRyuFmnS9w8Uylji5oUrO9lXZWQA5GR+Sz7Ko86IaWWu36yRCVUwQTcQGR
-zs06UcYw6UhJZKM=
+YXVzIEFzc21hbm4gQ0EgUlNBIDIwMDcxJjAkBgkqhkiG9w0BCQEWF2NhK2NhLXJz
+YTIwMDdAZXNtdHAub3JnMB4XDTA3MDUwNDAyMDc1NloXDTEwMDUwMzAyMDc1Nlow
+gaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhC
+ZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAKBgNVBAsTA01UQTEiMCAG
+A1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEmMCQGCSqGSIb3DQEJARYX
+Y2ErY2EtcnNhMjAwN0Blc210cC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwKJExr4LOcu82q33psfV3ZjhLOB9fPRLTyP2a9NT2uJD5Jl8p90P5
+NOxlYgG7ZPFd6nUEPZJlYKIGYvqIytggUMgeOFO1GN23vccINUzZ3MaXVje2ZTN0
+WrLDhQgrtyZw/zgCGmdq0EkYEEv4268GnLGogqGxddJSm1MMyqfjFTh5baH173yL
+/b0EePnoHrmS6nTXRR5MyL30XPwaf+cxxqvLeMdNL7VyEDUnShr6Uxn4p1lj6+kV
+q9xxaYxCHJZOiYBmyZ4h1T0IGXSl9Qegrt55r/1Cwnl+jPg5IjvDxFg70A3mqRG2
+os0u5RZm/X5lM5SwNoAn9YB2qeXf8s/vAgMBAAGjggFWMIIBUjAdBgNVHQ4EFgQU
+sklrUkXukDbSeUcDM9mguoBQ2hwwgdoGA1UdIwSB0jCBz4AUsklrUkXukDbSeUcD
+M9mguoBQ2hyhgaukgagwgaUxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9y
+bmlhMREwDwYDVQQHEwhCZXJrZWxleTEUMBIGA1UEChMLRW5kbWFpbCBPcmcxDDAK
+BgNVBAsTA01UQTEiMCAGA1UEAxMZQ2xhdXMgQXNzbWFubiBDQSBSU0EgMjAwNzEm
+MCQGCSqGSIb3DQEJARYXY2ErY2EtcnNhMjAwN0Blc210cC5vcmeCCQD6fCyAKT/C
+ZDAMBgNVHRMEBTADAQH/MCIGA1UdEQQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAu
+b3JnMCIGA1UdEgQbMBmBF2NhK2NhLXJzYTIwMDdAZXNtdHAub3JnMA0GCSqGSIb3
+DQEBBAUAA4IBAQCYmHzT0FtyRxXmImi7eA54ZulWFti8nVrcJyn7kS1qITUYVrRP
+KgnACG+aWSsucpr7ULrHqZGg+Wy+z3hCQwJwU5e6auPaF+gfxzpb57zr5SRM9c9h
+NB4g7Rdj74HTniX+zAUZzIqCyUw6tWtJUXZGAqpgu8S5YUgz2nmNRqMGIJjzsts7
+rckdDpc9txQZ030Ei2qB4BFb4TWj/y8RhhwxhXr9PzbvmSVGLrDLQ0VK7L7TP6R3
+m3nMzpJjpdnt26CdXXzXgPbJQfsClo7989oFnYGnJdomNTupDIz1p11I7IfHemBR
+dvLemxQrVYpD35kZ8+vnA+anoqIo3dUHaj/3
 -----END CERTIFICATE-----

==== //depot/projects/dtrace/src/contrib/sendmail/FREEBSD-upgrade#7 (text+ko) ====

@@ -1,6 +1,6 @@
-$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.33 2007/04/09 01:46:43 gshapiro Exp $
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.34 2007/11/05 00:21:32 gshapiro Exp $
 
-sendmail 8.14.1
+sendmail 8.14.2
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
 
 For the import of sendmail, the following files were removed:
@@ -21,8 +21,8 @@
 
 Imported using:
 
-	cvs import -m 'Import sendmail 8.14.1' \
-		src/contrib/sendmail SENDMAIL v8_14_1
+	cvs import -m 'Import sendmail 8.14.2' \
+		src/contrib/sendmail SENDMAIL v8_14_2
 
 After importing, bump the version of src/etc/sendmail/freebsd*mc
 so mergemaster will merge /etc/mail/freebsd*cf:
@@ -97,4 +97,4 @@
 	usr.sbin/mailwrapper/Makefile
 
 gshapiro@FreeBSD.org
-08-April-2007
+04-November-2007

==== //depot/projects/dtrace/src/contrib/sendmail/INSTALL#4 (text+ko) ====

@@ -12,13 +12,13 @@
 2. Create any necessary site configuration build files, as noted in
    devtools/Site/README.
 
-3. In the sendmail/ directory, run "sh Build" (see sendmail/README for
+3. In the sendmail/ directory, run "sh ./Build" (see sendmail/README for
    details).
 
 4. Change to the cf/cf/ directory (that's not a typo): Copy whichever .mc
    file best matches your environment to sendmail.mc.  Next, tailor it
    as explained in cf/README.  Then run
-   "sh Build sendmail.cf".
+   "sh ./Build sendmail.cf".
 
 5. Back up your current /etc/mail/sendmail.cf and the sendmail binary (whose
    location varies from operating system to operating system, but is usually
@@ -26,21 +26,21 @@
 
 6. Install sendmail.cf as /etc/mail/sendmail.cf and submit.cf as
    /etc/mail/submit.cf.  This can be done in the cf/cf by using
-   "sh Build install-cf".
+   "sh ./Build install-cf".
 
    Please read sendmail/SECURITY before continuing; you have to create a
    new user smmsp and a new group smmsp for the default installation.
    Then install the sendmail binary built in step 3 by cd-ing back to
-   sendmail/ and running "sh Build install".
+   sendmail/ and running "sh ./Build install".
 
 7. For each of the associated sendmail utilities (makemap, mailstats,
    etc.), read the README in the utility's directory if it exists.  When
-   you are ready to install it, back up your installed version and type "sh
-   Build install".
+   you are ready to install it, back up your installed version and type
+   "sh ./Build install".
 
 8. If you are upgrading from an older version of sendmail and are using any
    database maps, be sure to rebuild them with the new version of makemap,
    in case you are now using a different (and thereby incompatible) version
    of Berkeley DB.
 
-$Revision: 8.15 $, Last updated $Date: 2002/05/28 18:09:25 $
+$Revision: 8.16 $, Last updated $Date: 2007/10/03 21:00:28 $

==== //depot/projects/dtrace/src/contrib/sendmail/RELEASE_NOTES#6 (text+ko) ====

@@ -1,11 +1,76 @@
 			SENDMAIL RELEASE NOTES
-      $Id: RELEASE_NOTES,v 8.1888 2007/04/03 23:28:40 ca Exp $
+      $Id: RELEASE_NOTES,v 8.1909 2007/10/31 16:04:13 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.2/8.14.2	2007/11/01
+	If a message was queued and it contained 8 bit characters in
+		a From: or To: header, then those characters could be
+		"mistaken" for internal control characters during a queue
+		run and trigger various consistency checks.  Problem
+		noted by Neil Rickert of Northern Illinois University.
+	If MaxMimeHeaderLength is set to a value greater than 0 (which
+		it is by default) then even if the Linelimit parameter
+		is 0, sendmail corrupted in the non-transfer-encoding
+		case every MAXLINE-1 characters.  Patch from John Gardiner
+		Myers of Proofpoint.
+	Setting the suboption DeliveryMode for DaemonPortOptions did not
+		work in earlier 8.14 versions.
+	Note: DeliveryMode=interactive is silently converted to
+		background if a milter can reject or delete a recipient.
+		Prior to 8.14 this happened only if milter could delete
+		recipients.
+	ClientRate should trigger when the limit was exceeded (as
+		documented), not when it was reached.  Patch from 
+		John Beck of Sun Microsystems.
+	Force a queue run for -qGqueuegroup even if no runners are
+		specified (R=0) and forking (F=f) is requested.
+	When multiple results are requested for a DNS map lookup
+		(-z and -Z), return only those that are relevant for
+		the query (not also those in the "additional section".)
+	If the message transfer time to sendmail (when acting as server)
+		exceeds Timeout.queuewarn or Timeout.queuereturn and
+		the message is refused (by a milter), sendmail previously
+		created a delivery status notification (DSN).  Patch
+		from Doug Heath of The Hertz Corporation.
+	A code change in Cyrus-SASL 2.1.22 for sasl_decode64() requires
+		the MTA to deal with some input (i.e., "=") itself.
+		Problem noted by Eliot Lear.
+	sendmail counted a delivery as successful if PIPELINING is
+		compiled in but not offered by the server and the
+		delivery failed temporarily.  Patch from Werner Wiethege.
+	If getting the result of an LDAP query times out then close the
+		map so it will be reopened on the next lookup.  This
+		should help "failover" configurations that specify more
+		than one LDAP server.
+	If check_compat returns $#discard then a "savemail panic" could
+		be triggered under some circumstances (e.g., requiring
+		a system which does not have the compile time flag
+		HASFLOCK set). Based on patch by Motonori Nakamura
+		of National Institute of Informatics, Japan.
+	If a milter rejected a recipient, the count for nrcpts= in the
+		logfile entry might have been wrong.  Problem found by
+		Petra Humann of TU Dresden.
+	If a milter invoked smfi_chgfrom() where ESMTP arguments are not
+		NULL, the message body was lost.  Patch from Motonori
+		Nakamura of National Institute of Informatics, Japan.
+	sendmail(8) had a bogus space in -qGname.  Patch from Peng Haitao.
+	CONTRIB: buildvirtuser: Preserve ownership and permissions when
+		replacing files.
+	CONTRIB: buildvirtuser: Skip dot-files (e.g., .cvsignore) when
+		reading the /etc/mail/virtusers/ directory.
+	CONTRIB: buildvirtuser: Emit warnings instead of exiting where
+		appropriate.
+	LIBMILTER: Fix ABI backwards compatibility so milters compiled
+		against an older libmilter.so shared library can use an
+		8.14 libmilter.so shared library.
+	LIBMILTER: smfi_version() did not properly extract the patchlevel
+		from the version number, however, the returned value was
+		correct for the current libmilter version.
+
 8.14.1/8.14.1	2007/04/03
 	Even though a milter rejects a recipient the MTA will still keep
 		it in its list of recipients and deliver to it if the

==== //depot/projects/dtrace/src/contrib/sendmail/cf/cf/submit.cf#6 (text+ko) ====

@@ -16,8 +16,8 @@
 #####
 #####		SENDMAIL CONFIGURATION FILE
 #####
-##### built by ca@nother.smi.sendmail.com on Tue Apr 3 16:32:55 PDT 2007
-##### in /extra/home/ca/sm-8.14.1/OpenSource/sendmail-8.14.1/cf/cf
+##### built by ca@nother.smi.sendmail.com on Wed Oct 31 09:24:27 PDT 2007
+##### in /extra/home/ca/sm-8.14.2/OpenSource/sendmail-8.14.2/cf/cf
 ##### using ../ as configuration include directory
 #####
 ######################################################################
@@ -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.730 2007/02/01 18:50:03 ca Exp $  #####
+#####  $Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -114,7 +114,7 @@
 
 
 # Configuration version number
-DZ8.14.1/Submit
+DZ8.14.2/Submit
 
 
 ###############

==== //depot/projects/dtrace/src/contrib/sendmail/cf/feature/ldap_routing.m4#4 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2002, 2004 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2002, 2004, 2007 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.14 2004/02/18 02:45:11 gshapiro Exp $')
+VERSIONID(`$Id: ldap_routing.m4,v 8.15 2007/05/01 17:38:25 ca Exp $')
 divert(-1)
 
 # Check first two arguments.  If they aren't set, may need to warn in proto.m4

==== //depot/projects/dtrace/src/contrib/sendmail/cf/m4/proto.m4#5 (text+ko) ====

@@ -13,7 +13,7 @@
 #
 divert(0)
 
-VERSIONID(`$Id: proto.m4,v 8.730 2007/02/01 18:50:03 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.732 2007/04/20 00:53:30 ca Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -2962,9 +2962,9 @@
 R<$* _ATMPF_>	$#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
 dnl use the generic routine (for now)
 R<0>		$@ OK		no limit
-R<$+>		$: <$1> $| $(arith l $@ $&{client_rate} $@ $1 $)
+R<$+>		$: <$1> $| $(arith l $@ $1 $@ $&{client_rate} $)
 dnl log this? Connection rate $&{client_rate} exceeds limit $1.
-R<$+> $| FALSE	$#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded.
+R<$+> $| TRUE	$#error $@ 4.3.2 $: _RATE_CONTROL_REPLY Connection rate limit exceeded.
 ')')
 
 ifdef(`_CONN_CONTROL_',`dnl
@@ -2984,9 +2984,9 @@
 R<$* _ATMPF_>	$#error $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
 dnl use the generic routine (for now)
 R<0>		$@ OK		no limit
-R<$+>		$: <$1> $| $(arith l $@ $&{client_connections} $@ $1 $)
+R<$+>		$: <$1> $| $(arith l $@ $1 $@ $&{client_connections} $)
 dnl log this: Open connections $&{client_connections} exceeds limit $1.
-R<$+> $| FALSE	$#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections.
+R<$+> $| TRUE	$#error $@ 4.3.2 $: _CONN_CONTROL_REPLY Too many open connections.
 ')')
 
 undivert(9)dnl LOCAL_RULESETS

==== //depot/projects/dtrace/src/contrib/sendmail/cf/m4/version.m4#6 (text+ko) ====

@@ -11,8 +11,8 @@
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.178 2007/04/03 21:21:18 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.186 2007/10/31 16:04:13 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.14.1`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.14.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')

==== //depot/projects/dtrace/src/contrib/sendmail/contrib/buildvirtuser#4 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (c) 1999-2003 Gregory Neil Shapiro.  All Rights Reserved.
+# Copyright (c) 1999-2004, 2007 Gregory Neil Shapiro.  All Rights Reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-# $Id: buildvirtuser,v 1.6 2003/03/15 23:30:09 gshapiro Exp $
+# $Id: buildvirtuser,v 1.8 2007/10/08 18:44:15 gshapiro Exp $
 
 =head1 NAME
 
@@ -70,30 +70,21 @@
 
 =head1 EXAMPLES
 
-Here are some example files from the /etc/mail/virtusers/ directory:
+Here is an example file from the /etc/mail/virtusers/ directory:
 
-=head2 /etc/mail/virtusers/bsdunix.org:
+=head2 /etc/mail/virtusers/example.org:
 
  # Services
- MAILER-DAEMON	gshapiro+bounce.$DOMAIN@gshapiro.net
- postmaster	gshapiro+$LHS.$DOMAIN@gshapiro.net
- webmaster	gshapiro+$LHS.$DOMAIN@gshapiro.net
+ MAILER-DAEMON	gshapiro+bounce.$DOMAIN@example.net
+ postmaster	gshapiro+$LHS.$DOMAIN@example.net
+ webmaster	gshapiro+$LHS.$DOMAIN@example.net
  
  # Defaults
  		error:nouser No such user
  
  # Users
- gshapiro	gshapiro+$DOMAIN@gshapiro.net
- bob		robert@smtp.org
-
-=head2 /etc/mail/virtusers/smtp.org:
-
- # Defaults
- 		gshapiro+$DOMAIN@gshapiro.net
- 
- # Users
- john		john@wookie.org
- nancy		n@milter.com
+ gshapiro	gshapiro+$DOMAIN@example.net
+ zoe		zoe@example.com
 
 =head1 AUTHOR
 
@@ -102,6 +93,7 @@
 =cut
 
 use strict;
+use File::stat;
 use Getopt::Std;
 
 my $makemap = "/usr/sbin/makemap";
@@ -117,6 +109,18 @@
 my ($lhs, $domain, $key, $value);
 my $opts = {};
 
+sub preserve_perms ($$)
+{
+	my $old = shift;
+	my $new = shift;
+	my $st;
+
+	$st = stat($old);
+	return if (!defined($st));
+	chmod($st->mode, $new) || warn "Could not chmod($st->mode, $new): $!\n";
+	chown($st->uid, $st->gid, $new) || warn "Could not chmod($st->uid, $st->gid, $new): $!\n";
+}
+
 getopts('ft', $opts) || die "Usage: $0 [-f] [-t]\n";
 
 if ($opts->{t})
@@ -131,9 +135,12 @@
 
 foreach $domain (@virts)
 {
+	next if ($domain =~ m/^\./);
 	open(DOMAIN, "$virts/$domain") || die "Could not open file $virts/$domain: $!\n";
 	my $line = 0;
-	my $mtime = (stat(DOMAIN))[9] || 0;
+	my $mtime = 0;
+	my $st = stat("$virts/$domain");
+	$mtime = $st->mtime if (defined($st));
 	if ($mtime > $newest)
 	{
 		$newest = $mtime;
@@ -160,7 +167,7 @@
 		}
 		else
 		{
-			die "Bogus line $line in $virts/$domain\n";
+			warn "Bogus line $line in $virts/$domain\n";
 		}
 
 		# Variable subsitution
@@ -172,7 +179,9 @@
 	close(DOMAIN) || die "Could not close $virts/$domain: $!\n";
 }
 
-my $virtmtime = (stat($virt))[9] || 0;
+my $virtmtime = 0;
+my $st = stat($virt);
+$virtmtime = $st->mtime if (defined($st));
 if ($opts->{f} || $virtmtime < $newest)
 {
 	print STDOUT "Rebuilding $virt\n";
@@ -191,14 +200,17 @@
 		print MAKEMAP "$key\t\t$virt{$key}\n";
 	}
 	close(MAKEMAP) || die "Could not close makemap ($?): $!\n";
+	preserve_perms($virt, $newvirt);
 	rename($newvirt, $virt) || die "Could not rename $newvirt to $virt: $!\n";
 
 	open(VIRTHOST, ">$newvirthosts") || die "Could not open file $newvirthosts: $!\n";
 	foreach $domain (sort @virts)
 	{
+		next if ($domain =~ m/^\./);
 		print VIRTHOST "$domain\n";
 	}
 	close(VIRTHOST) || die "Could not close $newvirthosts: $!\n";
+	preserve_perms($virthosts, $newvirthosts);
 	rename($newvirthosts, $virthosts) || die "Could not rename $newvirthosts to $virthosts: $!\n";
 }
 exit 0;

==== //depot/projects/dtrace/src/contrib/sendmail/doc/op/op.me#5 (text+ko) ====

@@ -9,7 +9,7 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	$Id: op.me,v 8.739 2007/03/22 17:56:01 ca Exp $
+.\"	$Id: op.me,v 8.741 2007/06/22 23:08:59 ca Exp $
 .\"
 .\" eqn op.me | pic | troff -me
 .\"
@@ -90,7 +90,7 @@
 .de Ve
 Version \\$2
 ..
-.Ve $Revision: 8.739 $
+.Ve $Revision: 8.741 $
 .rm Ve
 .sp
 For Sendmail Version 8.14
@@ -6939,6 +6939,10 @@
 .b \-v
 command line flag sets this to
 .b i .
+Note: for internal reasons,
+``i'' does not work
+if a milter is enabled which can reject or delete recipients.
+In that case the mode will be changed to ``b''.
 .ip DialDelay=\fIsleeptime\fP
 [no short name]
 Dial-on-demand network connections can see timeouts
@@ -8932,7 +8936,8 @@
  ' ' 
 .)b
 
-The status indicator is one of the following upper case words:
+The status indicator specifies the result of the lookup operation itself
+and is one of the following upper case words:
 .(b
 .ta 9n
 OK	the key was found, result contains the looked up value
@@ -8944,13 +8949,19 @@
 
 In case of errors (status TEMP, TIMEOUT or PERM) the result field may 
 contain an explanatory message.
+However, the explanatory message is not used any further by
+.i sendmail .
 
 Example replies:
 .(b
 31:OK resolved.address@example.com,
 .)b
 
-in case of a successful lookup, or:
+.(b
+56:OK error:550 5.7.1 User does not accept mail from sender,
+.)b
+
+in case of successful lookups, or:
 .(b
 8:NOTFOUND, 
 .)b
@@ -8960,7 +8971,7 @@
 55:TEMP this text explains that we had a temporary failure,
 .)b
 
-in case of a failure.
+in case of a temporary map lookup failure.
 
 The socket map uses the same syntax as milters
 (see Section "X \*- Mail Filter (Milter) Definitions")
@@ -11424,7 +11435,7 @@
 .\".sz 10
 .\"Eric Allman
 .\".sp
-.\"Version $Revision: 8.739 $
+.\"Version $Revision: 8.741 $
 .\".ce 0
 .bp 3
 .ce

==== //depot/projects/dtrace/src/contrib/sendmail/editmap/editmap.c#4 (text+ko) ====

@@ -22,7 +22,7 @@
 #endif /* ! lint */
 
 #ifndef lint
-SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.24 2004/08/03 18:40:10 ca Exp $";
+SM_UNUSED(static char id[]) = "@(#)$Id: editmap.c,v 1.25 2007/05/11 18:50:35 ca Exp $";
 #endif /* ! lint */
 
 
@@ -46,7 +46,7 @@
 gid_t	RealGid;
 char	*RealUserName;
 uid_t	RunAsUid;
-uid_t	RunAsGid;
+gid_t	RunAsGid;
 char	*RunAsUserName;
 int	Verbose = 2;
 bool	DontInitGroups = false;

==== //depot/projects/dtrace/src/contrib/sendmail/include/sm/conf.h#5 (text+ko) ====

@@ -10,7 +10,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: conf.h,v 1.132 2007/03/21 23:56:18 ca Exp $
+ *	$Id: conf.h,v 1.134 2007/09/24 23:05:37 ca Exp $
  */
 
 /*
@@ -458,6 +458,9 @@
 #   if SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210)
 #    define HASUNSETENV 1       /* unsetenv() added in S10 */
 #   endif /* SOLARIS >= 21000 || (SOLARIS < 10000 && SOLARIS >= 210) */
+#   if SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211)
+#    define GETLDAPALIASBYNAME_VERSION 2	/* changed in S11 */
+#   endif /* SOLARIS >= 21100 || (SOLARIS < 10000 && SOLARIS >= 211) */
 #   ifndef HASGETUSERSHELL
 #    define HASGETUSERSHELL 0	/* getusershell(3) causes core dumps pre-2.7 */
 #   endif /* ! HASGETUSERSHELL */

==== //depot/projects/dtrace/src/contrib/sendmail/include/sm/ldap.h#5 (text+ko) ====

@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2001-2003, 2005, 2006 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2001-2003, 2005-2007 Sendmail, Inc. and its suppliers.
  *      All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: ldap.h,v 1.32 2006/08/30 22:56:58 ca Exp $
+ *	$Id: ldap.h,v 1.33 2007/10/10 00:06:44 ca Exp $
  */
 
 #ifndef	SM_LDAP_H
@@ -91,6 +91,10 @@
 	/* ldapmap_lookup options */
 	char		ldap_attrsep;
 
+# if _FFR_LDAP_NETWORK_TIMEOUT
+	struct timeval	ldap_networktmo;
+# endif /* _FFR_LDAP_NETWORK_TIMEOUT */
+
 	/* Linked list of maps sharing the same LDAP binding */
 	void		*ldap_next;
 };

==== //depot/projects/dtrace/src/contrib/sendmail/include/sm/tailq.h#2 (text+ko) ====

@@ -36,8 +36,12 @@
 #define	SM_TAILQ_H_
 
 /*
+ * $Id: tailq.h,v 1.2 2007/06/29 23:09:57 ca Exp $
+ *
  * This file is a modified copy of queue.h from a BSD system:
  * we only need tail queues here.
+ * We do not use queue.h directly because there is a conflict with
+ * some versions of that file on some OSs.
  *
  * A tail queue is headed by a pair of pointers, one to the head of the
  * list and the other to the tail of the list. The elements are doubly

==== //depot/projects/dtrace/src/contrib/sendmail/libmilter/docs/xxfi_unknown.html#2 (text+ko) ====

@@ -2,7 +2,7 @@
 xxfi_unknown
 
 
 
xxfi_unknown

 
@@ -53,12 +53,12 @@
   Return valueDescription
   
      SMFIS_TEMPFAIL
-     Reject this message with a temporary error.
+     Reject this command with a temporary error.
      
   
   
      SMFIS_REJECT
-     Reject this message.
+     Reject this command.
      
   
 

==== //depot/projects/dtrace/src/contrib/sendmail/libmilter/engine.c#5 (text+ko) ====

@@ -9,7 +9,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Nov  5 22:35:45 2007
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E41D16A419; Mon,  5 Nov 2007 22:35: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 1CCE516A46B
	for ; Mon,  5 Nov 2007 22:35:45 +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 0176013C4AC
	for ; Mon,  5 Nov 2007 22:35:45 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5MZiLZ036746
	for ; Mon, 5 Nov 2007 22:35:44 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5MZiIj036743
	for perforce@freebsd.org; Mon, 5 Nov 2007 22:35:44 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Mon, 5 Nov 2007 22:35:44 GMT
Message-Id: <200711052235.lA5MZiIj036743@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 
Cc: 
Subject: PERFORCE change 128707 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Mon, 05 Nov 2007 22:35:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=128707

Change 128707 by pgj@disznohal on 2007/11/05 22:34:48

	Add initial Hungarian translation of Chapter 5: The X Window System.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#2 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/x11/chapter.sgml#2 (text+ko) ====

@@ -4,13 +4,17 @@
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.184 2007/07/10 07:06:24 blackend Exp $
 -->
 
-
+
+
+
   
     
       
 	Ken
 	Tom
-	Updated for X.Org's X11 server by 
+	Az X.Org X11 szerverére alkalmazta: 
       
       
 	Marc
@@ -19,437 +23,618 @@
     
   
 
-  The X Window System
+  Az X Window System
 
   
-    Synopsis
+    Áttekintés
 
-    FreeBSD uses X11 to provide users with
-      a powerful graphical user interface.  X11
-      is a freely available version of the X Window System that
-      is implemented in both &xorg; and
-      &xfree86; (and other software
-      packages not discussed here).  &os; versions up to and
-      including &os; 5.2.1-RELEASE
-      will find the default installation to be
-      &xfree86;, the X11 server released by
-      The &xfree86; Project, Inc.  As of &os; 5.3-RELEASE, the
-      default and official flavor of X11 was changed to
-      &xorg;, the X11 server developed by
-      the X.Org Foundation under a license very similar to the one used
-      by &os;.  Commercial X servers for &os; are also available.
+    A &os; az X11-en keresztül nyújt a
+      felhasználók számára erõteljes
+      grafikus felhasználói felületet.  Az X11 az X
+      Window System szabadon elérhetõ változata,
+      melyet az &xorg; és az
+      &xfree86; egyaránt
+      implementál (valamint más egyéb
+      programcsomagok is, amelyeket itt viszont nem tárgyalunk).
+      A &os; verziói a &os; 5.2.1-RELEASE kiadással
+      bezárólag a The &xfree86; Project, Inc.
+      által kiadott X11 szervert, az
+      &xfree86;-ot tartalmazzák
+      alapértelmezés szerint.  A &os; 5.3-RELEASE
+      kiadástól kezdve az X11 alapértelmezett
+      és hivatalos változata az
+      &xorg;, melyet az X.Org
+      alapítvány a &os;-éhez nagyon hasonló
+      licensz alatt fejleszt.  A &os;-hez kereskedelmi X szerverek is
+      elérhetõek.
 
-    This chapter will cover the installation and configuration
-      of X11 with emphasis on &xorg; &xorg.version; release.  For
-      information about configuring &xfree86;
-      (i.e. on older releases of &os; where
-      &xfree86; was the default X11
-      distribution) or previous releases of &xorg;, it is always possible to refer to archived versions
-      of the &os; Handbook at .
+    Ebben a fejezetben az X11 telepítését
+    és beállítását járjuk
+      végig, miközben a hangsúlyt az
+      &xorg; &xorg.version;
+      kiadására helyezzük.  Az
+      &xfree86; (vagyis a &os; olyan
+      régebbi változata, ahol az
+      &xfree86; az alapértelmezett X11
+      rendszer) vagy az &xorg; korábbi
+      kiadásainak beállításával
+      kapcsolatban mindig találhatunk információkat
+      a &os; kézikönyv  címen
+      található archivált
+      változataiban.
 
-    For more information on the video hardware that X11
-      supports, check the &xorg; web site.
+    Az X11 által támogatott
+      megjelenítõkrõl bõvebben az &xorg; honlapján
+      olvashatunk.
 
-    After reading this chapter, you will know:
+    A fejezet elolvasása során
+      megismerjük:
 
     
       
-        The various components of the X Window System, and how they
-          interoperate.
+	Az X Window System különbözõ
+	  alkotóelemeit, és hogy ezek miként
+	  mûködnek együtt.
       
 
       
-	How to install and configure X11.
+	Hogyan telepítsük és
+	  állítsuk be az X11-et.
       
 
       
-        How to install and use different window managers.
+	Hogyan telepítsük és használjuk
+	  a különféle ablakkezelõket.
       
 
       
-	How to use &truetype; fonts in X11.
+	Hogyan használjunk &truetype;
+	  betûtípusokat az X11-ben.
       
 
       
-        How to set up your system for graphical logins
-          (XDM).
+	Hogyan állítsuk be rendszerünkön a
+	  grafikus bejelentkezést
+	  (XDM).
       
     
 
-    Before reading this chapter, you should:
+    A fejezet elolvasásához ajánlott:
 
     
-      Know how to install additional third-party
-        software ().
+      
+	Külsõs programok
+	  telepítésének ismerete ().
+      
     
   
 
   
-    Understanding X
+    Az X megértése
 
-    Using X for the first time can be somewhat of a shock to someone
-      familiar with other graphical environments, such as µsoft.windows; or
-      &macos;.
+    Az X használata elsõre megdöbbentõ lehet
+      azok számára, akik olyan más grafikus
+      környezetekben járatosak, mint mondjuk a
+      µsoft.windows; vagy a &macos;.
 
-    While it is not necessary to understand all of the details of various
-      X components and how they interact, some basic knowledge makes
-      it possible to take advantage of X's strengths.
+    Míg az X minden komponensének részleteit
+      és azok kapcsolatát nem szükséges
+      megérteni a használatukhoz, néhány
+      alapvetõ ismeret velük kapcsolatban
+      elõsegíti kiaknázni az X
+      erõsségeit.
 
     
-      Why X?
+      Miért X?
 
-      X is not the first window system written for &unix;, but it is the
-        most popular of them.  X's original development team had worked on another
-        window system prior to writing X.  That system's name was
-        W (for Window).  X was just the next
-        letter in the Roman alphabet.
+      Az X ugyan nem az elsõ &unix;-ra íródott
+	ablakozó rendszer, de a legnépszerûbb a
+	fajtájában.  Az X eredeti fejlesztõcsapata az
+	X elõtt egy másik ablakozó rendszeren
+	dolgozott, aminek a neve W (mint
+	Window (ablak)) volt.  Az X pedig az arab
+	ábécében pontosan ezt a betût
+	követi.
 
-      X can be called X, X Window System,
-	X11, and a number of other terms.  You may find
-	that using the term X Windows to describe X11
-	can be offensive to some people; for a bit more insight on
-	this, see &man.X.7;.
+      Az X-et hívhatjuk X-nek, X
+	Window System-nek, és még sok más
+	néven.  Elõfordulhat azonban, hogy az X
+	Windows elnevezés sértõ lehet egyes
+	emberek számára.  Errõl többet a
+	&man.X.7; man oldalon tudhatunk meg többet.
     
 
     
-      The X Client/Server Model
+      Az X kliens/szerver modellje
 
-      X was designed from the beginning to be network-centric, and
-        adopts a client-server model.
+      Az X-et már az elejétõl kezdve
+	hálózatközpontúnak tervezték,
+	és ezért az ún.
+	kliens-szerver modellt használja.
 
-      In the X model, the
-        X server runs on the computer that has the keyboard,
-        monitor, and mouse attached.  The server's responsibility includes tasks such as managing
-        the display, handling input from the keyboard and mouse, and so on.
-        Each X application (such as XTerm, or
-        &netscape;) is a client.  A
-        client sends messages to the server such as Please draw a
-          window at these coordinates, and the server sends back
-          messages such as The user just clicked on the OK
-          button.
+      Az X modelljében az X szerver egy
+	olyan számítógépen fut, amihez
+	billentyûzetet, monitort és egeret csatlakoztattunk.
+	A szerver feladatai között találjuk a
+	megjelenítés
+	irányítását, az egérrõl
+	és a billentyûzetrõl érkezõ adatok
+	feldolgozását és így tovább.
+	Mindegyik X alkalmazás (mint mondjuk az
+	XTerm vagy a
+	&netscape;) egy kliens.  A kliens
+	üzeneteket küld a szervernek, például
+	Kérlek, rajzolj egy ablakot ezekre a
+	koordinátákra, és a szerver pedig
+	olyan üzeneteket küld, mint mondjuk A
+	felhasználó az OK gombra
+	kattintott.
 
-      In a home or small
-        office environment, the X server and the X clients commonly run on
-        the same computer.  However, it is perfectly possible to run the X
-        server on a less powerful desktop computer, and run X applications
-        (the clients) on, say, the powerful and expensive machine that serves
-        the office.  In this scenario the communication between the X client
-        and server takes place over the network.
+      Az otthoni vagy a kisebb irodai környezetben az X
+	szerver és az X kliensek általában ugyanazon
+	a számítógépen futnak.  Azonban
+	nagyon is lehetséges, hogy az X szerver egy
+	kevésbé erõs gépen fusson,
+	miközben az X alkalmazások (a kliensek) az
+	irodát kiszolgáló erõsebb és
+	drágább gépen fussanak.  Egy ilyen
+	felállásban az X kliensei és szerverei
+	közti kommunikáció a hálózaton
+	keresztül zajlik.
 
-      This confuses some people, because the X terminology is
-        exactly backward to what they expect.  They expect the X
-          server to be the big powerful machine down the hall, and
-        the X client to be the machine on their desk.
+      Jegyezzük meg, hogy az X szerver az a
+	számítógép, ahol a monitor és a
+	billentyûzet található, az X kliensek pedig
+	azok a programok, amelyek az ablakokat jelenítik
+	meg.
 
-      It is important to remember that the X server is the machine with the monitor and
-        keyboard, and the X clients are the programs that display the
-        windows.
-
-      There is nothing in the protocol that forces the client and
-        server machines to be running the same operating system, or even to
-        be running on the same type of computer.  It is certainly possible to
-        run an X server on µsoft.windows; or Apple's &macos;, and there are
-        various free and commercial applications available that do exactly
-        that.
+      A protokollban semmi sem várja el, hogy a kliens
+	és a szerver ugyanazon az operációs
+	rendszeren vagy éppen ugyanolyan típusú
+	számítógépen fusson.  Ezért
+	akár µsoft.windows;-on vagy az &apple;
+	&macos;-én is indíthatunk X szervert,
+	számos különbözõ szabad és
+	kereskedelmi alkalmazás képes pontosan
+	erre.
     
 
     
-      The Window Manager
+      Az ablakkezelõ
 
-      The X design philosophy is much like the &unix; design philosophy,
-        tools, not policy.  This means that X does not try to
-        dictate how a task is to be accomplished.  Instead, tools are provided
-        to the user, and it is the user's responsibility to decide how to use
-        those tools.
+      Az X kialakításának
+      filozófiája leginkább a &unix;
+	kialakításának
+	filozófiájához hasonlítható,
+	vagyis eszközöket, ne
+	szabályokat.  Ez tehát azt jelenti, hogy
+	az X nem köti meg miként oldjuk meg vele a
+	feladatokat.  Helyette különféle
+	eszközeket ad a felhasználó kezébe
+	és onnantól az õ felelõssége
+	eldönteni, hogyan használja ki ezeket.
 
-      This philosophy extends to X not dictating what windows should
-        look like on screen, how to move them around with the mouse, what
-        keystrokes should be used to move between windows (i.e.,
-        
-          Alt
-          Tab
-        , in the case of µsoft.windows;), what the title bars
-        on each window should look like, whether or not they have close
-        buttons on them, and so on.
+      Ez a filozófia az X-ben egészen addig terjed,
+	hogy nem rögzíti, hogyan nézzenek ki a
+	képernyõn megjelenõ ablakok, miként kell
+	õket mozgatni az egérrel, milyen billentyûk
+	lenyomásával közlekedhetünk az ablakok
+	között (ez az 
+	AltTab a
+	µsoft.windows; esetén), hogyan nézzen ki az
+	ablakok címsora, legyen-e rajtuk gombja a
+	bezárás funkciónak, és így
+	tovább.
 
-      Instead, X delegates this responsibility to an application called
-        a Window Manager.  There are dozens of window
-        managers available for X: AfterStep,
-        Blackbox, ctwm,
-        Enlightenment,
-        fvwm, Sawfish,
-        twm,
-        Window Maker, and more.  Each of these
-        window managers provides a different look and feel; some of them
-        support virtual desktops; some of them allow customized
-        keystrokes to manage the desktop; some have a Start
-        button or similar device; some are themeable, allowing
-        a complete change of look-and-feel by applying a new theme.  These
-        window managers, and many more, are available in the
-        x11-wm category of the Ports Collection.
+      Ehelyett az X az összes ezzel járó
+	felelõsséget átadja az
+	ablakkezelõ (window manager)
+	részére.  Tucatnyi ilyen ablakkezelõt
+	találhatunk az X-hez:
+	AfterStep,
+	Blackbox,
+	ctwm,
+	Enlightement,
+	fvwm,
+	Sawfish,
+	twm, Window
+	Maker és még sok más.  Ezen
+	ablakkezelõk mindegyike más és más
+	kinézetet és hangulatot kínál fel:
+	némelyikük támogatja a
+	virtuális munkaasztalok (virtual desktop)
+	létrehozását; néhányuk pedig
+	megengedi, hogy mi magunk állítsuk be az asztal
+	irányításához használt
+	gombkombinációkat; köztük
+	találhatunk olyat is, aminek van Start
+	gombja vagy ehhez hasonló eszköze; némelyek
+	közülük ismerik a
+	témákat, aminek révén
+	a kinézetük és hangulatuk teljesen
+	megváltoztatható.  Az említett
+	ablakkezelõk és társaik
+	elérhetõek a Portgyûjtemény
+	x11-wm
+	kategóriájában.
 
-      In addition, the KDE and
-	GNOME desktop environments both have their
-	own window managers which integrate with the desktop.
+      Ráadásul a KDE
+	és a GNOME munkakörnyezetek
+	mindegyikének van saját integrált
+	ablakkezelõje.
 
-      Each window manager also has a different configuration mechanism;
-        some expect configuration file written by hand, others feature
-        GUI tools for most of the configuration tasks; at least one
-        (Sawfish) has a configuration file written
-        in a dialect of the Lisp language.
+      Az egyes ablakkezelõk mellesleg eltérõ
+	beállítási módszerrel rendelkeznek.
+	Némelyikük kézzel
+	összeállított konfigurációs
+	állományt vár, mások pedig
+	külön grafikus eszközöket tartalmaznak erre
+	a feladatra is.  Az egyikük
+	(Sawfish) konfigurációs
+	állományát pedig a Lisp programozási
+	nyelv egyik dialektuásban kell megírni.
 
       
-        Focus Policy
+	Az irányítás
+	  átadása
 
-        Another feature the window manager is responsible for is the
-          mouse focus policy.  Every windowing system
-          needs some means of choosing a window to be actively receiving
-          keystrokes, and should visibly indicate which window is active as
-          well.
+	Az ablakkezelõ másik fontos feladata az
+	  irányítás egérrel
+	  történõ
+	  átadásának, vagy rövidebben
+	  szólva a fókusz átadásának
+	  kezelése (focus policy).  Minden ablakkezelõ
+	  rendszerben el kell tudnunk valahogy dönteni, hogy a
+	  beérkezõ billentyûleütések melyik
+	  ablakhoz vándoroljanak, valamint az ilyen
+	  értelemben aktív ablakot valamilyen módon
+	  jeleznünk is kell.
 
-        A familiar focus policy is called click-to-focus.
-          This is the model utilized by µsoft.windows;, in which a window
-          becomes active upon receiving a mouse click.
+	Ennek egyik ismert módszere a fókusz
+	  kattintásra megoldás, amely modellt a
+	  µsoft.windows; rendszerekben találhatjuk meg.  Itt
+	  az ablakok akkor válnak aktívvá, amikor
+	  rájuk kattintunk az egérrel.
 
-        X does not support any particular focus policy.  Instead, the
-          window manager controls which window has the focus at any one time.
-          Different window managers will support different focus methods.  All
-          of them support click to focus, and the majority of them support
-          several others.
+	Az X viszont nem kötelezi el magát egyik
+	  vezérlésátadási módszer
+	  mellett, helyette az ablakkezelõ fogja majd
+	  eldönteni, melyik ablak birtokolja a fókuszt az
+	  adott pillanatban.  A különbözõ
+	  ablakkezelõk különbözõ
+	  fókuszvezérlési technikákat
+	  ismernek.  Mindegyikük ismeri a kattintásos
+	  fókuszt, azonban a többségük
+	  még sok más megoldást is
+	  felkínál.
 
-        The most popular focus policies are:
+	A legnépszerûbb
+	  fókuszvezérlési elvek:
 
-        
-          
-            focus-follows-mouse
+	
+	  
+	    A fókusz az egeret követi
+	      (focus-follows-mouse)
 
-            
-              The window that is under the mouse pointer is the
-                window that has the focus.  This may not necessarily be
-                the window that is on top of all the other windows.
-                The focus is changed by pointing at another window, there
-                is no need to click in it as well.
-            
-          
+	    
+	      Az egérmutató alatt
+		található ablak kapja meg fókuszt.
+		Az érintett ablaknak nem kell
+		feltétlenül az összes többi felett
+		elhelyezkednie.  Ilyenkor a fókuszt
+		egyszerûen úgy vihetjük át egy
+		másik ablakra, ha rámutatunk az
+		egérrel, amihez még kattintanunk sem
+		kell.
+	    
+	  
 
-          
-            sloppy-focus
+	  
+	    Hanyag fókusz (sloppy-focus)
 
-            
-              This policy is a small extension to focus-follows-mouse.
-                With focus-follows-mouse, if the mouse is moved over the
-                root window (or background) then no window has the focus,
-                and keystrokes are simply lost.  With sloppy-focus, focus is
-                only changed when the cursor enters a new window, and not
-                when exiting the current window.
-            
-          
+	    
+	      Ez az elv az elõbbi apró
+		kibõvítése.  Amikor a fókusz az
+		egérmutatót követi, és az
+		egeret a leghátsó ablakra (vagy a
+		háttérre) visszük, akkor
+		valójában egyik ablak sem birtokolja az
+		irányítást, ezért a
+		leütött billentyûk elvesznek.  A hanyag
+		fókusz használatával azonban az
+		irányítás csak abban az esetben
+		kerül át máshová, amikor egy
+		másik ablakba lépünk be, nem pedig
+		akkor, amikor a jelenlegibõl lépünk
+		ki.
+	    
+	  
 
-          
-            click-to-focus
+	  
+	    Fókusz kattintásra
+	      (click-to-focus)
 
-            
-              The active window is selected by mouse click.  The
-                window may then be raised, and appear in
-                front of all other windows.  All keystrokes will now be
-                directed to this window, even if the cursor is moved to
-                another window.
-            
-          
-        
+	    
+	      Az aktív ablakot egy
+		egérkattintással választjuk ki.
+		Ilyenkor a kiválasztott ablak
+		felemelkedhet és a többi
+		elõtt jelenhet meg.  Ezt követõen az
+		összes irányítás ebbe az
+		ablakba vándorol, még abban az esetben is,
+		amikor egy másik ablakra visszük az
+		egérmutatót.
+	    
+	  
+	
 
-        Many window managers support other policies, as well as
-          variations on these.  Be sure to consult the documentation for
-          the window manager itself.
+	Sok ablakkezelõ ismer ezekbõl
+	  különbözõ variációikat,
+	  valamint rajtuk kivül más egyéb
+	  vezérlési elvet is.  Ezzel kapcsolatban az adott
+	  ablakkezelõ dokumentációjából
+	  deríthetünk ki a legtöbbet.
       
     
 
     
-      Widgets
+      <quote>Mütyürkék</quote>
 
-      The X approach of providing tools and not policy extends to the
-        widgets seen on screen in each application.
+      Az X megközelítése, vagyis az
+	eszközök és nem a szabályok
+	felsorakoztatása, kiterjed az egyes
+	alkalmazásokban látható
+	különféle ketyerékre is.
 
-      Widget is a term for all the items in the user
-        interface that can be clicked or manipulated in some way; buttons,
-        check boxes, radio buttons, icons, lists, and so on.  µsoft.windows;
-        calls these controls.
+      Az ablakmütyürke (window gadget,
+	widget) elnevezést azokra a felhasználói
+	felületen megjelenõ elemekre használjuk,
+	amelyekkel valamilyen módon kapcsolatba
+	léphetünk: kattinthatunk rájuk,
+	piszkálhatjuk õket.  Ilyenek
+	többek közt a gombok,
+	jelölõnégyzetek, rádiógombok,
+	ikonok, listák és a többi.  A
+	µsoft.windows; nyelvén ezeket
+	vezérlõknek nevezzük.
 
-      µsoft.windows; and Apple's &macos; both have a very rigid widget
-        policy.  Application developers are supposed to ensure that their
-        applications share a common look and feel.  With X, it was not
-        considered sensible to mandate a particular graphical style, or set
-        of widgets to adhere to.
+      A µsoft.windows; és az &apple; &macos; ezen a
+	téren nagyon merev.  Az alkalmazások
+	fejlesztõinek gondoskodniuk kell róla, hogy a
+	programjaik az elterjedt kinézetet és
+	kialakítást kövessék.  Az X
+	esetén semmilyen konkrét grafikai stílust
+	vagy a vezérlõeszközök következetes
+	használatát nem szerették volna
+	diktálni.
 
-      As a result, do not expect X applications to have a common
-        look and feel.  There are several popular widget sets and
-        variations, including the original Athena widget set from MIT,
-        &motif; (on which the widget set in
-        µsoft.windows; was modeled, all bevelled edges and three shades of
-        grey), OpenLook, and others.
+      Ennek eredményeképpen az X cseppet sem
+	várja el az alkalmazásoktól, hogy
+	közös kinézetben vagy viselkedésben
+	osztozzanak.  Léteznek ugyan népszerû
+	eszközrendszerek és azoknak számos
+	variációja is kialakult, beleértve az MIT
+	Athena-ját, a &motif;-ot
+	(amirõl a µsoft.windows; eszközeit is
+	mintázták, az összes ferde élet
+	és a három szürkeárnyalatot), az
+	OpenLookot és
+	társaikat.
 
-      Most newer X applications today will use a modern-looking widget
-        set, either Qt, used by KDE, or
-        GTK+, used by the
-        GNOME
-        project.  In this respect, there is some convergence in
-        look-and-feel of the &unix; desktop, which certainly makes things
-        easier for the novice user.
+      Napjaink X alkalmazásai a
+	KDE fejlesztéséhez
+	használt Qt, esetleg a
+	GNOME-hoz használt GTK+
+	könyvtárból származó,
+	korszerû kinézetû mütyürkéket
+	tartalmaznak.  Ebbõl a szempontból
+	megfigyelhetõ egyfajta tendencia a grafikus
+	&unix;-alkalmazások
+	felépítésében, ami minden bizonnyal
+	megkönnyíti a kezdõ felhasználók
+	tájékozódását.
     
   
 
   
-    Installing X11
+    Az X11 telepítése
 
-    &xorg; is the default X11
-      implementation for &os;.  &xorg; is
-      the X server of the open source X Window System implementation released by the X.Org
-      Foundation.  &xorg; is based on the code of
-      &xfree86 4.4RC2 and X11R6.6.
-      The version of &xorg; currently
-      available in the &os; Ports Collection is &xorg.version;.
+    Az X11 &os;-n alapértelmezett
+      implementációja az &xorg;.
+      Az &xorg; az X.Org
+      alapítvány által kiadott, az X Window
+      Systemet megvalósító nyílt
+      forráskódú X szerver.  Az
+      &xorg; az
+      &xfree86; 4.4RC2 és X11R6.6
+      kódja alapján készült.  A &os;
+      Portgyûjteményében jelenleg az
+      &xorg; &xorg.version; változata
+      érhetõ el.
 
-    To build and install &xorg; from the
-      Ports Collection:
+    Az &xorg;-ot a
+      Portgyûjteménybõl így tudjuk
+      lefordítani majd telepíteni:
 
     &prompt.root; cd /usr/ports/x11/xorg
 &prompt.root; make install clean
 
     
-      To build &xorg; in its
-	entirety, be sure to have at least 4 GB of free space
-	available.
+      Az egész &xorg;
+	lefordításához legalább 4 GB
+	szabad helyre van szükségünk.
     
 
-    Alternatively, X11
-      can be installed directly from packages.
-      Binary packages to use with &man.pkg.add.1; tool are also available for
-      X11.  When the remote fetching
-      feature of &man.pkg.add.1; is used, the version number of the
-      package must be removed.  &man.pkg.add.1; will automatically fetch
-      the latest version of the application.
+    Az X11-et természetesen feltelepíthetjük
+      közvetlenül csomagok segítségével is.
+      A &man.pkg.add.1; használatával
+      telepíthetõ bináris csomagok is
+      elérhetõek az X11-hez.  Amikor a &man.pkg.add.1;
+      programra bízzuk a csomag letöltését, ne
+      adjunk meg verziószámot.  A &man.pkg.add.1; ugyanis
+      mindig automatikusan az alkalmazás legfrissebb
+      verzióját tölti le.
 
-    So to fetch and install the package of
-      &xorg;, simply type:
+    Az &xorg; csomagjának
+      letöltéséhez és
+      telepítéséhez egyszerûen csak ennyit
+      írjunk be:
 
     &prompt.root; pkg_add -r xorg
 
-    The examples above will install the complete
-      X11 distribution including the
-      servers, clients, fonts etc.  Separate packages and ports of X11
-      are also
-      available.
+    
+      A fentebb megadott példák a teljes X11
+	rendszert telepíteni fogják, beleértve a
+	szervereket, klienseket, betûtípusokat stb.  Az X11
+	egyes részeihez külön találhatunk
+	csomagokat és portokat.
+    
 
-    The rest of this chapter will explain how to configure
-      X11, and how to set up a productive desktop
-      environment.
+    A fejezet további részében szót
+      ejtünk az X11, valamint egy irodai használatra alkalmas
+      munkakörnyezet
+      beállításáról.
   
 
   
     
       
-        
-          Christopher
-          Shumway
-          Contributed by 
-          
-        
+	
+	  Christopher
+	  Shunway
+	  Írta: 
+	
       
     
-    X11 Configuration
+    Az X11 beállítása
 
-
     &xorg;
     X11
 
     
-      Before Starting
+      Mielõtt nekilátnánk
 
-      Before configuration of X11
-        the following information about the target system is needed:
+      Az X11 beállítása elõtt a
+	célrendszer következõ adataira lesz
+	szükségünk:
 
       
-        Monitor specifications
-        Video Adapter chipset
-        Video Adapter memory
+	A monitor jellemzõi
+	A videókártya
+	  chipkészlete
+	A videókártya
+	  memóriája
       
 
-      horizontal scan rate
-      vertical scan rate
+      függõleges frissítési
+	frekvencia
+      vízszintes frissítési
+	frekvencia
 
-      The specifications for the monitor are used by
-        X11 to determine the resolution and
-        refresh rate to run at.  These specifications can usually be
-        obtained from the documentation that came with the monitor or from
-        the manufacturer's website.  There are two ranges of numbers that
-        are needed, the horizontal scan rate and the vertical synchronization
-        rate.
+      A monitor jellemzõibõl állapítja meg
+	az X11, milyen felbontásban és
+	frissítési frekvenciával
+	mûködtesse.  Ezek általában a monitorhoz
+	tartozó dokumentációból vagy a
+	gyártó honlapjáról
+	deríthetõek ki.  Igazaból két
+	értékre van szükségünk: a
+	függõleges és a vízszintes
+	frissítési frekvenciára.
 
-      The video adapter's chipset defines what driver module
-        X11 uses to talk to the graphics
-        hardware.  With most chipsets, this can be automatically
-        determined, but it is still useful to know in case the automatic
-        detection does not work correctly.
+      A videókártya chipkészlete
+	határozza meg, hogy az X11 melyik meghajtóján
+	keresztül kommunikál a grafikus hardverrel.  Ez a
+	legtöbb chipkészlet esetén
+	magától megállapítható, de
+	ennek ellenére mégis jó tisztában
+	lenni ezzel arra az esetre, ha az automatikus felismerés
+	mégsem mûködne.
 
-      Video memory on the graphic adapter determines the
-        resolution and color depth which the system can run at.  This is
-        important to know so the user knows the limitations of the
-        system.
+      A grafikus kártya memóriája
+	határozza meg a rendszer által
+	kihasználható felbontást és
+	színmélységet.  Ezt fontos tudunk ahhoz,
+	hogy ismerjük a rendszer korlátait.
     
 
     
-      Configuring X11
+      Az X11 beállítása
 
-      Configuration of X11 is
-        a multi-step process.  The first step is to build an initial
-        configuration file.
-        As the super user, simply
-        run:
+      Az X11 beállítása egy
+      többlépcsõs folyamat.  Elsõ
+	lépésünk egy alap konfigurációs
+	állomány összeállítása
+	lesz.  Rendszeradminisztrátorként adjuk ki az
+	alábbi parancsot:
 
       &prompt.root; Xorg -configure
 
-      This will generate an
-        X11 configuration skeleton file in the
-        /root directory called
-	xorg.conf.new (whether you &man.su.1; or
-	do a direct login affects the inherited supervisor
-	$HOME directory variable).  The
-        X11 program will attempt to probe
-        the graphics hardware on the system and write a
-        configuration file to load the proper drivers for the detected
-        hardware on the target system.
+      Ennek segítségével az X11
+	xorg.conf.new néven létrehozza
+	a konfigurációs állomány
+	vázát a /root
+	könyvtárban (akár a &man.su.1; parancsot
+	használjuk, akár közvetlenül így
+	jelentkezünk be, az imigyen örökölt
+	rendszeradminisztrátori szerepkör maga után
+	vonja a $HOME könyvtár
+	átállítását is).  Az X11
+	megpróbálja megkeresni a célrendszerben
+	elérhetõ grafikus eszközöket, és
+	létrehozni egy olyan konfigurációs
+	állományt, amely az észlelt
+	eszközökhöz tartozó meghajtókat
+	tölti be.
 
-      The next step is to test the existing
-        configuration to verify that &xorg;
-        can work with the graphics
-        hardware on the target system.  To perform this task,
-        type:
+      A következõ lépésünk legyen az
+	imént létrehozott beállítás
+	kipróbálása, amin keresztül
+	ellenõrizhetjük, hogy az
+	&xorg; tényleg képes
+	mûködni a célrendszer grafikus
+	eszközén.  Ehhez a következõt kell
+	begépelnünk:
 
       &prompt.root; Xorg -config xorg.conf.new
 
-      If a black and grey grid and an X mouse cursor appear,
-        the configuration was successful.  To exit the test, just press
-        
-          Ctrl
-          Alt
-          Backspace
-         simultaneously.
+      Ha ezután egy fekete-fehér rácsot
+	látunk egy X alakú egérmutatóval a
+	közepén, akkor jó a
+	beállítás.  A próbát a
+	
+	CtrlAltBackspace
+	billentyûk együttes lenyomásával
+	szakíthatjuk meg.
 
-	If the mouse does not work, you will need to first
-	  configure it before proceeding.  See 
-	  in the &os; install chapter.
+      
+	Ha az egér még nem mûködne,
+	  mindenképpen be kell állítanunk a
+	  továbblépés elõtt.  Ezzel
+	  kapcsolatban a &os; telepítésérõl
+	  szóló fejezetben levõ t ajánljuk elolvasásra.
+      
 
-      X11 tuning
+      Az X11
+	finomhangolása
 
-      Next, tune the xorg.conf.new
-        configuration file to taste.  Open the file in a text editor such
-        as &man.emacs.1; or &man.ee.1;.  First, add the
-        frequencies for the target system's monitor.  These are usually
-        expressed as a horizontal and vertical synchronization rate.  These
-        values are added to the xorg.conf.new file
-        under the "Monitor" section:
+      Ezután az ízlésünknek
+	megfelelõen hangoljuk be az
+	xorg.conf.new állományt,
+	nyissuk meg egy szövegszerkesztõben,
+	például az &man.emacs.1;-ben vagy az
+	&man.ee.1;-ben.  Elsõként adjuk meg a
+	célrendszerhez csatlakoztatott monitor frekvencia
+	adatait.  Ezek általában a függõleges
+	és a vízszintes frissítés
+	értékei, melyeket az
+	xorg.conf.new állomány
+	"Monitor" szakaszában kell
+	feltüntetni:
 
       Section "Monitor"
         Identifier   "Monitor0"
@@ -459,32 +644,48 @@
         VertRefresh  48-120
 EndSection
 
-      The HorizSync and
-        VertRefresh keywords may be missing in the
-        configuration file.  If they are, they need to be added, with
-        the correct horizontal synchronization rate placed after the
-        HorizSync keyword and the vertical
-        synchronization rate after the VertRefresh
-        keyword.  In the example above the target monitor's rates were
-        entered.
+      A konfigurációs
+	állományból valószínûleg
+	csak a HorizSync és
+	VertRefresh kulcsszavak fognak
+	hiányozni.  Amennyiben ez tényleg így
+	lenne, a megfelelõ vízszintes
+	frissítés értékét a
+	HorizSync kulcsszó után, a
+	hozzátartozó függõleges
+	frissítés értékét pedig a
+	VertRefresh kulcsszó után kell
+	hozzátennünk a szakaszhoz.  Az iménti
+	példában már megadtuk a célrendszer
+	monitorának frissítési
+	értékeit.
 
-      X allows DPMS (Energy Star) features to be used with capable
-        monitors. The &man.xset.1; program controls the time-outs and can force
-        standby, suspend, or off modes.  If you wish to enable DPMS features
-        for your monitor, you must add the following line to the monitor
-        section:
+      Az X megengedi, hogy DPMS (Energy Star)
+	energiagazdálkodási szabványt ismerõ
+	monitorok lehetõséget is kihasználjuk.  A
+	&man.xset.1; program vezérli a monitorok ki- és
+	bekapcsolását, és
+	segítségével készenléti vagy
+	energiatakarékos &